From d37f5b9aa8547bbacbce1890d4eb0f00cfe2c690 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 21 Jan 2019 09:53:04 +0100
Subject: [PATCH 001/210] Fix schematic pasting offsets

---
 .../plotsquared/plot/config/Settings.java                 | 5 +++++
 .../plotsquared/plot/generator/HybridGen.java             | 8 +++++++-
 .../plotsquared/plot/generator/HybridPlotWorld.java       | 4 ++--
 .../intellectualsites/plotsquared/plot/object/Plot.java   | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index f901744f8..0d5b74671 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -225,6 +225,11 @@ public class Settings extends Config {
         @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
     }
 
+    @Comment("Schematic Settings") public static final class Schematics {
+        @Comment("Whether schematic based generation should paste schematic on top of plots, or from Y=1")
+            public static boolean PASTE_ON_TOP = true;
+    }
+
 
     @Comment("Configure the paths that will be used") public static final class Paths {
         public static String SCHEMATICS = "schematics";
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index 886dd1125..f7e954a06 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -1,6 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
@@ -16,7 +17,12 @@ public class HybridGen extends IndependentPlotGenerator {
 
     private void placeSchem(HybridPlotWorld world, ScopedLocalBlockQueue result, short relativeX,
         short relativeZ, int x, int z) {
-        int minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
+        int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
+        if (Settings.Schematics.PASTE_ON_TOP) {
+            minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
+        } else {
+            minY = 1;
+        }
         BaseBlock[] blocks = world.G_SCH.get(MathMan.pair(relativeX, relativeZ));
         if (blocks != null) {
             for (int y = 0; y < blocks.length; y++) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 4bed2c97a..0a722b4d6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -156,13 +156,13 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             if (w3 > PLOT_WIDTH || h3 > PLOT_WIDTH) {
                 this.ROAD_SCHEMATIC_ENABLED = true;
             }
-            int centerShiftZ = 0;
+            int centerShiftZ;
             if (l3 < this.PLOT_WIDTH) {
                 centerShiftZ = (this.PLOT_WIDTH - l3) / 2;
             } else {
                 centerShiftZ = (PLOT_WIDTH - l3) / 2;
             }
-            int centerShiftX = 0;
+            int centerShiftX;
             if (w3 < this.PLOT_WIDTH) {
                 centerShiftX = (this.PLOT_WIDTH - w3) / 2;
             } else {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index c57299bd8..83af645cf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1443,7 +1443,7 @@ public class Plot {
                 e.printStackTrace();
                 return true;
             }
-            SchematicHandler.manager.paste(sch, this, 0, 1, 0, false, new RunnableVal<Boolean>() {
+            SchematicHandler.manager.paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP, new RunnableVal<Boolean>() {
                 @Override public void run(Boolean value) {
                     if (value) {
                         MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);

From 7edfc313d672c98a3b7e0609d8c632826f9b62f3 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 21 Jan 2019 12:24:34 +0100
Subject: [PATCH 002/210] I did an oopsie

---
 .../plotsquared/bukkit/util/BukkitHybridUtils.java        | 8 +++++++-
 .../plotsquared/plot/commands/Delete.java                 | 1 -
 .../plotsquared/plot/generator/HybridPlotManager.java     | 7 ++++++-
 .../plotsquared/plot/generator/HybridUtils.java           | 8 +++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index b7eebcc04..68b845e58 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -2,6 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.util;
 
 import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -107,7 +108,12 @@ public class BukkitHybridUtils extends HybridUtils {
                     }
                     rz[i] = v;
                 }
-                int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+                int minY;
+                if ( Settings.Schematics.PASTE_ON_TOP) {
+                    minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+                } else {
+                    minY = 1;
+                }
                 for (short x = 0; x < 16; x++) {
                     for (short z = 0; z < 16; z++) {
                         BaseBlock[] blocks = hpw.G_SCH.get(MathMan.pair(rx[x], rz[z]));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
index ede1f14cd..b399f5752 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
@@ -16,7 +16,6 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
     // The syntax also works with any command: /plot <plot> <command>
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-
         Location loc = player.getLocation();
         final Plot plot = loc.getPlotAbs();
         if (plot == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 1f6429dbd..071af627c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -79,7 +79,12 @@ public class HybridPlotManager extends ClassicPlotManager {
     private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
         Location pos2, boolean clear) {
         int size = hpw.SIZE;
-        int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+        int minY;
+        if (Settings.Schematics.PASTE_ON_TOP) {
+            minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+        } else {
+            minY = 1;
+        }
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
             short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
             if (absX < 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 4d46205ad..80b8b0f99 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -2,6 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.WEExtent;
@@ -347,7 +348,12 @@ public abstract class HybridUtils {
                         }
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                            int minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
+                            int minY;
+                            if (Settings.Schematics.PASTE_ON_TOP) {
+                                minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
+                            } else {
+                                minY = 1;
+                            }
                             int maxY = Math.max(extend, blocks.length);
                             if (blocks != null) {
                                 for (int y = 0; y < maxY; y++) {

From 7e56e47046d97d1a750e648347d312658f123e57 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 21 Jan 2019 17:49:36 +0100
Subject: [PATCH 003/210] Fix block list flag permissions

---
 .../plotsquared/plot/commands/FlagCmd.java    | 37 ++++++++++++++-----
 .../plot/flag/PlotBlockListFlag.java          |  8 ++--
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
index d1e8c9d04..b33f672ca 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -8,6 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.*;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
@@ -30,13 +31,37 @@ import java.util.*;
                     int checkRange = PlotSquared.get().getPlatform().equalsIgnoreCase("bukkit") ?
                         numeric :
                         Settings.Limit.MAX_PLOTS;
-                    return player.hasPermissionRange(perm, checkRange) >= numeric;
+                    final boolean result = player.hasPermissionRange(perm, checkRange) >= numeric;
+                    if (!result) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
+                            .f(key.toLowerCase(), value.toLowerCase()));
+                    }
+                    return result;
                 }
 
             } catch (NumberFormatException ignore) {
             }
+        } else if (flag instanceof PlotBlockListFlag) {
+            final PlotBlockListFlag blockListFlag = (PlotBlockListFlag) flag;
+            final HashSet<PlotBlock> parsedBlocks = blockListFlag.parseValue(value);
+            for (final PlotBlock block : parsedBlocks) {
+                final String permission = C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(),
+                    block.getRawId().toString().toLowerCase());
+                final boolean result = Permissions.hasPermission(player, permission);
+                if (!result) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
+                        .f(key.toLowerCase(), value.toLowerCase()));
+                    return false;
+                }
+            }
+            return true;
         }
-        return Permissions.hasPermission(player, perm);
+        final boolean result = Permissions.hasPermission(player, perm);
+        if (!result) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
+                .f(key.toLowerCase(), value.toLowerCase()));
+        }
+        return result;
     }
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
@@ -116,8 +141,6 @@ import java.util.*;
                 }
                 String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
                 if (!checkPermValue(player, flag, args[1], value)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
-                        .f(args[1].toLowerCase(), value.toLowerCase()));
                     return false;
                 }
                 Object parsed = flag.parseValue(value);
@@ -152,8 +175,6 @@ import java.util.*;
                     }
                     for (String entry : args[2].split(",")) {
                         if (!checkPermValue(player, flag, args[1], entry)) {
-                            MainUtil.sendMessage(player, C.NO_PERMISSION,
-                                C.PERMISSION_SET_FLAG_KEY_VALUE.f(args[1].toLowerCase(), entry));
                             return false;
                         }
                     }
@@ -200,8 +221,6 @@ import java.util.*;
                 }
                 for (String entry : args[2].split(",")) {
                     if (!checkPermValue(player, flag, args[1], entry)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_SET_FLAG_KEY_VALUE.f(args[1].toLowerCase(), entry));
                         return false;
                     }
                 }
@@ -246,7 +265,7 @@ import java.util.*;
                 for (Flag<?> flag1 : Flags.getFlags()) {
                     String type = flag1.getClass().getSimpleName();
                     if (!flags.containsKey(type)) {
-                        flags.put(type, new ArrayList<String>());
+                        flags.put(type, new ArrayList<>());
                     }
                     flags.get(type).add(flag1.getName());
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
index 96499d703..56cd0e901 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
@@ -16,10 +16,10 @@ public class PlotBlockListFlag extends ListFlag<HashSet<PlotBlock>> {
         return StringMan.join((HashSet<PlotBlock>) value, ",");
     }
 
-    @Override public HashSet<PlotBlock> parseValue(String value) {
-        HashSet<PlotBlock> list = new HashSet<>();
-        for (String item : value.split(",")) {
-            PlotBlock block = PlotSquared.get().IMP.getLegacyMappings().fromAny(item);
+    @Override public HashSet<PlotBlock> parseValue(final String value) {
+        final HashSet<PlotBlock> list = new HashSet<>();
+        for (final String item : value.split(",")) {
+            final PlotBlock block = PlotSquared.get().IMP.getLegacyMappings().fromAny(item);
             if (block != null) {
                 list.add(block);
             }

From 8733dc6daba3175a28fcac57c6799caa54b7aa7b Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Tue, 22 Jan 2019 10:43:29 +0100
Subject: [PATCH 004/210] Fix deny-teleport flag: Fixes #2128

---
 .../bukkit/listeners/PlayerEvents.java         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 8e4ea13a0..6b172f49e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -619,8 +619,8 @@ import java.util.regex.Pattern;
     public void onTeleport(PlayerTeleportEvent event) {
         if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
             .equals(event.getTo().getWorld())) {
-            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
-            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LAST_PLOT);
+            final Object lastLoc = BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
+            final Object lastPlot = BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LAST_PLOT);
             org.bukkit.Location to = event.getTo();
             if (to != null) {
                 Player player = event.getPlayer();
@@ -632,7 +632,19 @@ import java.util.regex.Pattern;
                 }
                 Plot plot = area.getPlot(loc);
                 if (plot != null) {
-                    plotEntry(pp, plot);
+                    final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
+                    if (!result) {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                        event.setCancelled(true);
+                        if (lastLoc != null) {
+                            pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
+                        }
+                        if (lastPlot != null) {
+                            pp.setMeta(PlotPlayer.META_LAST_PLOT, lastPlot);
+                        }
+                    } else {
+                        plotEntry(pp, plot);
+                    }
                 }
             }
             return;

From e54f964eca6fc4904bdf70205a9361502f9ca3e2 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Tue, 22 Jan 2019 18:51:13 +0100
Subject: [PATCH 005/210] Fix #2009

---
 .../plotsquared/plot/commands/FlagCmd.java           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
index b33f672ca..a3d3e5b85 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -186,7 +186,17 @@ import java.util.*;
                     if (flag1.isPresent()) {
                         boolean o = flag1.get().removeAll((Collection) flag.parseValue(value));
                         if (o) {
-                            MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                            if (flag1.get().isEmpty()) {
+                                final boolean result = plot.removeFlag(flag);
+                                if (result) {
+                                    MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                                } else {
+                                    MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                                }
+                                return true;
+                            } else {
+                                MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                            }
                         } else {
                             MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
                             return false;

From 344a2afeffc9357d519ba772e4fce92b63724339 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Tue, 22 Jan 2019 19:54:31 +0100
Subject: [PATCH 006/210] Use StringBuilder, like a sane person

---
 .../plotsquared/plot/commands/FlagCmd.java                 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
index a3d3e5b85..c875f44b9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -279,16 +279,17 @@ import java.util.*;
                     }
                     flags.get(type).add(flag1.getName());
                 }
-                String message = "";
+                StringBuilder message = new StringBuilder();
                 String prefix = "";
                 for (Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) {
                     String category = entry.getKey();
                     List<String> flagNames = entry.getValue();
                     Collections.sort(flagNames);
-                    message += prefix + "&6" + category + ": &7" + StringMan.join(flagNames, ", ");
+                    message.append(prefix).append("&6").append(category).append(": &7")
+                        .append(StringMan.join(flagNames, ", "));
                     prefix = "\n";
                 }
-                MainUtil.sendMessage(player, message);
+                MainUtil.sendMessage(player, message.toString());
                 return true;
         }
         MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");

From c96a1afaedbda34fadf787aa810267c6559e2e41 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Tue, 22 Jan 2019 21:32:24 +0100
Subject: [PATCH 007/210] Don't fuck up road schematics, I guess

---
 .../plotsquared/plot/generator/HybridGen.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index f7e954a06..82b76f0c9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -16,9 +16,9 @@ public class HybridGen extends IndependentPlotGenerator {
     }
 
     private void placeSchem(HybridPlotWorld world, ScopedLocalBlockQueue result, short relativeX,
-        short relativeZ, int x, int z) {
+        short relativeZ, int x, int z, boolean isRoad) {
         int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
-        if (Settings.Schematics.PASTE_ON_TOP) {
+        if (isRoad || Settings.Schematics.PASTE_ON_TOP) {
             minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
         } else {
             minY = 1;
@@ -131,7 +131,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
                     }
                     if (hpw.ROAD_SCHEMATIC_ENABLED) {
-                        placeSchem(hpw, result, rx[x], rz[z], x, z);
+                        placeSchem(hpw, result, rx[x], rz[z], x, z, true);
                     }
                 }
             } else if (wx[x]) {
@@ -142,7 +142,7 @@ public class HybridGen extends IndependentPlotGenerator {
                             result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
                         }
                         if (hpw.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z);
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
                         }
                     } else {
                         // wall
@@ -152,7 +152,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         if (!hpw.ROAD_SCHEMATIC_ENABLED) {
                             result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
                         } else {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z);
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
                         }
                     }
                 }
@@ -164,7 +164,7 @@ public class HybridGen extends IndependentPlotGenerator {
                             result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
                         }
                         if (hpw.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z);
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
                         }
                     } else if (wz[z]) {
                         // wall
@@ -174,7 +174,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         if (!hpw.ROAD_SCHEMATIC_ENABLED) {
                             result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
                         } else {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z);
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
                         }
                     } else {
                         // plot
@@ -183,7 +183,7 @@ public class HybridGen extends IndependentPlotGenerator {
                         }
                         result.setBlock(x, hpw.PLOT_HEIGHT, z, hpw.TOP_BLOCK.getBlock());
                         if (hpw.PLOT_SCHEMATIC) {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z);
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, false);
                         }
                     }
                 }

From 25ed9d279821e074467b0a81822fc7d9eca570b5 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 23 Jan 2019 12:23:05 +0000
Subject: [PATCH 008/210] Fix road schematic pasting height

---
 .../plotsquared/plot/generator/HybridPlotManager.java     | 7 +------
 .../plotsquared/plot/generator/HybridUtils.java           | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 071af627c..1f6429dbd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -79,12 +79,7 @@ public class HybridPlotManager extends ClassicPlotManager {
     private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
         Location pos2, boolean clear) {
         int size = hpw.SIZE;
-        int minY;
-        if (Settings.Schematics.PASTE_ON_TOP) {
-            minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
-        } else {
-            minY = 1;
-        }
+        int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
             short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
             if (absX < 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 80b8b0f99..4d46205ad 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -2,7 +2,6 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.WEExtent;
@@ -348,12 +347,7 @@ public abstract class HybridUtils {
                         }
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                            int minY;
-                            if (Settings.Schematics.PASTE_ON_TOP) {
-                                minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
-                            } else {
-                                minY = 1;
-                            }
+                            int minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
                             int maxY = Math.max(extend, blocks.length);
                             if (blocks != null) {
                                 for (int y = 0; y < maxY; y++) {

From fd4a5f2aaac52461b5e8d252a381e49720b64d3b Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 23 Jan 2019 13:34:23 +0000
Subject: [PATCH 009/210] Fix item despawning on plots

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java       | 3 ++-
 .../plotsquared/bukkit/listeners/EntitySpawnListener.java      | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index ae95bd371..e2eb005c2 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -431,7 +431,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                 case FIREBALL:
                                 case DRAGON_FIREBALL:
                                 case DROPPED_ITEM:
-                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS
+                                        && BukkitUtil.getPlot(entity.getLocation()) == null) {
                                         entity.remove();
                                     }
                                     // dropped item
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 9f787297d..443e07025 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -75,6 +75,7 @@ import java.util.List;
                 switch (type) {
                     case DROPPED_ITEM:
                         if (Settings.Enabled_Components.KILL_ROAD_ITEMS) {
+                            event.setCancelled(true);
                             break;
                         }
                     case PLAYER:

From a4c3fb26c79f5f3e8fe35e47e8247877beb8a93b Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 23 Jan 2019 14:02:18 +0000
Subject: [PATCH 010/210] Check for road or unowned plot

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index e2eb005c2..a2e6a6cb9 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -431,8 +431,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                 case FIREBALL:
                                 case DRAGON_FIREBALL:
                                 case DROPPED_ITEM:
-                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS
-                                        && BukkitUtil.getPlot(entity.getLocation()) == null) {
+                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS || plotArea
+                                        .getOwnedPlotAbs(
+                                            BukkitUtil.getLocation(entity.getLocation())) == null) {
                                         entity.remove();
                                     }
                                     // dropped item

From cd8a1a0816472e967c39d6feae1a84552a39bed3 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Sun, 27 Jan 2019 00:48:03 +0100
Subject: [PATCH 011/210] Fixed some translation mismatches

---
 Core/src/main/resources/de-DE.yml | 112 +++++++++++++++---------------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/Core/src/main/resources/de-DE.yml b/Core/src/main/resources/de-DE.yml
index 57a22a38a..8a52ce9a6 100644
--- a/Core/src/main/resources/de-DE.yml
+++ b/Core/src/main/resources/de-DE.yml
@@ -1,11 +1,11 @@
 # Translated by: Krauti2 / EvilOlaf
 # Adjusted and updated by: NotMyFault
-BORDER: $2Du befindest dich außerhalb der aktuellen Weltengrenze
+BORDER: $2Du befindest dich außerhalb der aktuellen Weltengrenze.
 confirm:
   failed_confirm: $2Es gibt keine zur Bestätigung ausstehenden Befehle!
   requires_confirm: '$2Bist du sicher, dass du diesen Befehl ausführen willst: $1%s$2?&-$2Die
     Änderung ist unwiderruflich! Wenn du sicher bist: $1/plot confirm'
-  expired_confirm: $2Bestätigung abgelaufgen, führe den Befehl nochmal aus!
+  expired_confirm: $2Bestätigung abgelaufgen, führe den Befehl erneut aus!
 move:
   move_success: $4Plot erfolgreich verschoben.
   copy_success: $4Plot erfolgreich kopiert.
@@ -38,7 +38,7 @@ cluster:
   cluster_teleporting: $4Teleportiere...
   cluster_info: '$1Aktueller Cluster: $2%id%&-$1Name: $2%name%&-$1Besitzer: $2%owner%&-$1Größe:
     $2%size%&-$1Rechte: $2%rights%'
-  cluster_outside: '$2Der Vorgeschlagene Bereich liegt außerhalb der Plot Grenze: %s0'
+  cluster_outside: '$2Der vorgeschlagene Bereich liegt außerhalb der Plot Grenze: %s0'
 unclaim:
   unclaim_success: $4Dieser Plot gehört dir jetzt nicht mehr.
   unclaim_failed: $2Plot konnte nicht enteignet werden.
@@ -52,9 +52,9 @@ worldedit masks:
   worldedit_unsafe: $2Der Zugriff auf diesen Befehl wurde verwehrt.
   worldedit_bypass: $2&oUm die Beschränkung außer Kraft zu setzen, verwende $4/plot
     wea
-  worldedit_unmasked: $1Dein WorldEdit ist jetzt nicht mehr begrenzt.
-  worldedit_restricted: $1Dein WorldEdit ist jetzt begrenzt.
-  worldedit_delayed: $2Bitte warte, während deine WorldEdit Aktion verarbeitet wird...
+  worldedit_unmasked: $1Dein WorldEdit-Bereich ist jetzt nicht mehr begrenzt.
+  worldedit_restricted: $1Dein WorldEdit-Bereich ist jetzt begrenzt.
+  worldedit_delayed: $2Bitte warte während deine WorldEdit Aktion verarbeitet wird...
   worldedit_run: '$2Sorry für die Wartezeit. Starte jetzt: %s'
   worldedit_bypassed: $2Beschränkungen werden nun ignoriert.
 records:
@@ -65,7 +65,7 @@ swap:
   swap_overlap: $2Der geplante Bereich darf nicht überlappen.
   swap_dimensions: $2Die geplanten Bereiche müssen vergleichbare Dimensionen aufweisen.
   swap_syntax: $2/plot swap <plot id>
-  swap_success: $4Plots erfolgreich getauscht
+  swap_success: $4Plots erfolgreich getauscht.
   started_swap: $2Plot swap Aufgabe gestartet. Du erhälst eine Meldung wenn sie beendet
     ist.
 comment:
@@ -73,21 +73,21 @@ comment:
   inbox_item: $2 - $4%s
   comment_syntax: $2Verwende /plot comment [X;Z] <%s> <comment>
   invalid_inbox: '$2Dieses Postfach ist ungültig.&-$1Akzeptierte Werte: %s'
-  no_perm_inbox: $2Du hast keine Berechtigung für dieses Postfach
-  no_perm_inbox_modify: $2Du hast keine Berechtigung
+  no_perm_inbox: $2Du hast keine Berechtigung für dieses Postfach.
+  no_perm_inbox_modify: $2Du hast keine Berechtigung.
   no_plot_inbox: $2Du musst an einem Plot stehen oder einen solchen angeben.
   comment_removed: $4Kommentar/e n$2 - '$3%s$2' erfolgreich gelöscht.
   comment_added: $4Ein Kommentar wurde hinterlassen.
   comment_header: $2------ Kommentare ------
-  inbox_notification: '%s unread messages. Use /plot inbox'
-  inbox_empty: $2Keine Kommentare
+  inbox_notification: '%s ungelesene Nachrichten. Öffne sie mit /plot inbox'
+  inbox_empty: $2Keine Kommentare.
 console:
   not_console: $2Aus Sicherheitsgründen kann dieser Befehl nur von der Konsole ausgeführt
     werden.
   is_console: $2Dieser Befehl kann nur von einem Spieler ausgeführt werden.
 clipboard:
   clipboard_set: $2Der aktuelle Plot wird in die Zwischenablage kopiert. Benutze $1/plot
-    paste$2 um es einzufügen.
+    paste$2 um ihn einzufügen.
   pasted: $4Die Plotauswahl wurde erfolgreich eingefügt. Die Zwischenablage wurde
     geleert.
   paste_failed: '$2Einfügen fehlgeschlagen: $2%s'
@@ -100,28 +100,28 @@ ratings:
   rating_applied: '$4Du hast diesen Plot erfolgreich bewertet: $2%s'
   rating_not_your_own: $2Du kannst deinen eigenen Plot nicht selbst bewerten.
   rating_not_owned: $2Plots ohne Besitzer können nicht bewertet werden.
-  ratings_purged: $2Bewertungen für diesen Plot wurden gelöscht
+  ratings_purged: $2Bewertungen für diesen Plot wurden gelöscht.
   rating_not_done: $2Du kannst nur beendete Plots bewerten.
 economy:
   econ_disabled: $2Ökonomie ist nicht aktiviert.
   cannot_afford_plot: $2Du kannst dir diesen Plot nicht leisten. Er kostet $1%s
   not_for_sale: $2Dieser Plot steht nicht zum Verkauf.
   cannot_buy_own: $2Du kannst deinen eigenen Plot nicht kaufen.
-  plot_sold: $4Dein Plot $1%s$4, wurde an $1%s$4 für $1$%s$4 verkauft.
+  plot_sold: $4Dein Plot $1%s$4 wurde an $1%s$4 für $1$%s$4 verkauft.
   cannot_afford_merge: $2Du kannst dir das Zusammenfügen der Plots nicht leisten.
     Es kostet $1%s
   added_balance: $1%s $2wurden deinem Guthaben hinzugefügt.
   removed_balance: $1%s $2wurden von deinem Guthaben abgezogen.
-  removed_granted_plot: $2You used %s plot grant(s), you've got $1%s $2left
+  removed_granted_plot: $2Du hast %s plot grant(s) benutzt, du hast $1%s $2übrig.
 setup:
   setup_init: '$1Verwendung: $2/plot setup <value>'
   setup_step: '$3[$1Schritt %s$3] $1%s $2- $1Erwarte: $2%s $1Standard: $2%s'
   setup_invalid_arg: '$2%s ist kein gültiger Wert für Schritt %s. Um Setup abzubrechen
     verwende: $1/plot setup cancel'
   setup_valid_arg: $2Wert $1%s $2gesetzt auf %s
-  setup_finished: $3Falls du MULTIVERSE oder MULTIWORLD verwendest sollte die Welt
+  setup_finished: $3Falls du MULTIVERSE oder MULTIWORLD verwendest, sollte die Welt
     generiert worden sein. Andernfalls musst du die Welt manuell über bukkit.yml hinzufügen.
-  setup_world_taken: $2%s ist bereits eine bekannte Plotwelt
+  setup_world_taken: $2%s ist bereits eine bekannte Plotwelt.
   setup_missing_world: $2Du musst einen Namen für die Welt vergeben ($1/plot setup
     &l<world>$1 <generator>$2)&-$1Zusätzliche Befehle:&-$2 - $1/plot setup <value>&-$2
     - $1/plot setup backn$2 - $1/plot setup cancel
@@ -134,9 +134,9 @@ schematics:
     , $1save$2 , $1paste $2, $1exportall'
   schematic_invalid: '$2Diese Schematic ist ungültig: $2%s'
   schematic_valid: $2Diese Schematic ist gültig.
-  schematic_paste_failed: $2Einfügen der Schematic fehlgeschlagen
+  schematic_paste_failed: $2Einfügen der Schematic fehlgeschlagen.
   schematic_paste_success: $4Einfügen der Schematic erfolgreich.
-  schematic_too_large: $2The plot is too large for this action!
+  schematic_too_large: $2Der Plot ist zu groß für diese Aktion.
 titles:
   title_entered_plot: Du betrittst Plot %world%;%x%;%z%
   title_entered_plot_sub: 'Besitzer: %s'
@@ -147,32 +147,32 @@ core:
   enabled: $1PlotSquared wurde aktiviert
   task_start: Starte Aufgabe...
 reload:
-  reloaded_configs: $1Übersetzungen und Welteneinstellungen wurden neu geladen
-  reload_failed: $2Erneutes Laden der Konfiguration fehlgeschlagen
+  reloaded_configs: $1Übersetzungen und Welteneinstellungen wurden neu geladen.
+  reload_failed: $2Erneutes Laden der Konfiguration fehlgeschlagen.
 alias:
-  alias_set_to: $2Plot Alias auf $1%alias% gesetzt
-  missing_alias: $2Du musst einen Alias angeben
-  alias_too_long: $2Der Alias darf nicht länger als 50 Zeichen sein
-  alias_is_taken: $2Dieser Alias wird bereits verwendet
-  alias_removed: $2Der Alias wurde gelöscht
+  alias_set_to: $2Plot Alias auf $1%alias% gesetzt.
+  missing_alias: $2Du musst einen Alias angeben.
+  alias_too_long: $2Der Alias darf nicht länger als 50 Zeichen sein.
+  alias_is_taken: $2Dieser Alias wird bereits verwendet.
+  alias_removed: $2Der Alias wurde gelöscht.
 position:
-  missing_position: '$2Du musst eine Position angeben. Mögliche Werte: $1none'
-  position_set: $1Der Plot Spawn wurde auf deinen aktuellen Standort gesetzt
+  missing_position: '$2Du musst eine Position angeben. Mögliche Werte sind: $1none'
+  position_set: $1Der Plot Spawn wurde auf deinen aktuellen Standort gesetzt.
   home_argument: $2Verwende /plot set home [none]
-  invalid_position: $2Dies ist eine ungültige Position
-  position_unset: $1Home Position zurückgesetzt auf standard Wert
+  invalid_position: $2Dies ist eine ungültige Position.
+  position_unset: $1Home Position zurückgesetzt auf standard Wert.
 time:
   time_format: $1%hours%, %min%, %sec%
 permission:
-  no_schematic_permission: '$2Du hast keine Berechtigung Schematics zu verwenden:
+  no_schematic_permission: '$2Du hast keine Berechtigung um Schematics zu verwenden:
     $1%s'
   no_permission: '$2Dir fehlt folgende Berechtigung: $1%s'
-  no_plot_perms: $2Diese Aktion kann nur der Besitzer des Plots
+  no_plot_perms: $2Diese Aktion kann nur der Besitzer des Plots ausführen.
   cant_claim_more_plots: $2Du kannst keine weiteren Plots besitzen.
-  cant_transfer_more_plots: $2Du kannst keine weiteren Plots diesem Spieler schicken.
+  cant_transfer_more_plots: $2Du kannst keine weiteren Plots diesem Spieler übergeben.
   cant_claim_more_plots_num: $2Du kannst nicht mehr als $1%s $2Plots auf einmal einnehmen.
   you_be_denied: $2Es ist dir nicht gestattet diesen Plot zu betreten.
-  merge_request_confirm: Zusammenführanfrage von %s
+  merge_request_confirm: '%s möchte sein Plot mit deinem verbinden.'
   no_permission_event: '$2Dir fehlt folgende Berechtigung: $1%s'
   cant_claim_more_clusters: $2Du kannst nicht mehr Cluster besitzen.
 merge:
@@ -180,14 +180,14 @@ merge:
   unlink_required: $2Die Plots müssen vorher getrennt (unlink) werden.
   unlink_impossible: $2Die Trennung (unlink) funktioniert nur auf Megaplots.
   unlink_success: $2Trennung erfolgreich.
-  merge_not_valid: $2Diese Zusammenführanfrage ist nicht länger gültig.
-  merge_accepted: $2Die Zusammenführanfrage wurde akzeptiert.
+  merge_not_valid: $2Diese Anfrage ist nicht länger gültig.
+  merge_accepted: $2Die Anfrage wurde akzeptiert.
   success_merge: $2Plots wurden zusammengeführt.
-  merge_requested: $2Zusammenführanfrage erfolgreich verschickt.
+  merge_requested: $2Anfrage erfolgreich verschickt.
   no_available_automerge: $2Dir gehören keine benachbarten Plots oder du darfst die Plot Zusammenführungsgröße nicht überschreiten.
 commandconfig:
   not_valid_subcommand: $2Das ist kein gültiger Parameter.
-  did_you_mean: '$2Meinst du: $1%s'
+  did_you_mean: '$2Meintest du: $1%s'
   name_little: $2%s Name ist zu kurz, $1%s$2<$1%s
   no_commands: $2Du hast für keinen Befehl eine Berechtigung.
   subcommand_set_options_header: '$2Mögliche Werte: '
@@ -205,7 +205,7 @@ errors:
   not_valid_world: $2Das ist keine gültige Welt (Groß- / Kleinschreibung beachten)
   not_valid_plot_world: $2Das ist keine gültige Plotwelt (Groß- / Kleinschreibung
     beachten)
-  no_plots: $2Du hast keine Plots
+  no_plots: $2Du hast keine Plots.
   wait_for_timer: $2Ein Zeitgeber wurde an den Plot oder an dich gebunden. Bitte warte
     bis die Zeit abgelaufen ist.
   invalid_player_wait: '$2Spieler nicht gefunden: $1%s$2. Versuche es später nochmal.'
@@ -234,6 +234,7 @@ debug:
   debug_section: $2>> $1&l%val%
   debug_line: $2>> $1%var%$2:$1 %val%&-
   debug_header: $1Debug Information&-
+  requires_unmerged: Diser Plot kann nicht verbunden werden.
 invalid:
   not_valid_data: $2Das ist kein gültiger Datenwert.
   not_valid_block: $2Das ist kein gültiger Block.
@@ -244,8 +245,8 @@ invalid:
   no_such_plot: $2Ein solcher Plot existiert nicht.
   player_has_not_been_on: $2Dieser Spieler war nicht in der Plotwelt.
   found_no_plots: $2Dein Suchmuster ergab keine Treffer.
-  not_allowed_block: '$2That block is not allowed: %s'
-  found_no_plots_for_player: '$2No plots found for player: %s'
+  not_allowed_block: '$2Dieser Block ist nicht erlaubt: %s'
+  found_no_plots_for_player: '$2Keine Grundstücke für %s gefunden.'
 camera:
   camera_started: $2Du verwendest den Kameramodus für Plot $1%s
   camera_stopped: $2Der Kameramodus wurde abeschaltet.
@@ -292,13 +293,13 @@ working:
   deleting_done: $4Löschung in %sms abgeschlossen.
 list:
   plot_list_header_paged: $2(Seite $1%von$2/$1%max$2) $1Liste Plots nach %word%
-  plot_list_header: $1Liste aller %word% Plots
+  plot_list_header: $1Liste aller %word% Plots.
   plot_list_item: $2>> $1%id$2:$1%Welt $2- $1%owner
   plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%Welt $2- $1%owner
   plot_list_footer: $2>> $1%word% umfasst insgesamt $2%num% $1Plots %plot%.
-  comment_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1List of %amount% comments
+  comment_list_header_paged: $2(Seite $1%cur$2/$1%max$2) $1Liste %amount% Kommentare auf.
   clickable: ' (interactive)'
-  area_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1List of %amount% areas
+  area_list_header_paged: $2(Seite $1%cur$2/$1%max$2) $1Liste %amount% of Plot-Areas auf.
 left:
   left_plot: $2Du hast einen Plot verlassen.
 chat:
@@ -345,6 +346,7 @@ member:
 owner:
   set_owner: $4Plotbesitzer erfolgreich gesetzt.
   now_owner: $4Du bist jetzt Besitzer des Plots %s
+  set_owner_cancelled: Die Plotübergabe wurde abgebrochen.
 signs:
   owner_sign_line_1: '$1ID: $1%id%'
   owner_sign_line_2: '$1Besitzer:'
@@ -355,7 +357,7 @@ help:
   help_info_item: $1/plot help %category% $3- $2%category_desc%
   help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
   direction: '$1Aktuelle Himmelsrichtung: %dir%'
-  help_page_header: '$1Category: $2%category%$2,$1 Page: $2%current%$3/$2%max%$2'
+  help_page_header: '$1Kategorie: $2%category%$2,$1 Seite: $2%current%$3/$2%max%$2'
   help_footer: $3&m---------&r $1Plot² Hilfe $3&m---------
 '-':
   custom_string: '-'
@@ -364,15 +366,15 @@ set:
 web:
   generating_link: $1Lade Plot hoch...
   generating_link_failed: $2Es konnte kein Download Link erstellt werden!
-  save_failed: $2Konnte Plot nicht speichern
-  load_null: $2Benutze $4/plot load $2um eine Liste der Schematics zu bekommen
-  load_failed: $2Fehler beim Laden des Plots
-  load_list: '$2Um eine Schematic zu laden, benutze $1/plot load #'
+  save_failed: $2Konnte Plot nicht speichern.
+  load_null: $2Benutze $4/plot load $2um eine Liste der Schematics zu bekommen.
+  load_failed: $2Fehler beim Laden des Plots.
+  load_list: '$2Um eine Schematic zu laden benutze $1/plot load #'
   save_success: $1Gespeichert!
 gamemode:
-  gamemode_was_bypassed: $1Du ignorierst Spielmodus ($2{gamemode}$1) $1im Plot $2{plot}
+  gamemode_was_bypassed: $1Du ignorierst den Spielmodus ($2{gamemode}$1) $1im Plot $2{plot}
 height limit:
-  height_limit: $1Diese Plot Region hat ein Höhenlimit vonf $2{limit}
+  height_limit: $1Diese Plot Region hat ein Höhenlimit von $2{limit}
 inventory:
   inventory_usage: '&cBenutzung: &6{usage}'
   inventory_desc: '&cBeschreibung: &6{desc}'
@@ -385,18 +387,18 @@ blocked command:
 done:
   done_already_done: $2Dieses Plot ist bereits als fertig markiert.
   done_not_done: $2Dieses Plot ist nicht als fertig markiert.
-  done_insufficient_complexity: $2Dieses Plot ist zu simpel. Füge mehr Struktur und Terrain hinzu befor du den Befehlt erneut benutzt.
+  done_insufficient_complexity: $2Dieses Plot ist zu simpel. Füge mehr Struktur und Terrain hinzu bevor du den Befehl erneut benutzt.
   done_success: $1Plot als fertig markiert.
-  done_removed: $1Vielleicht möchtest du hier weiterbauen.
+  done_removed: $1Du kannst nun weiterbauen.
 tutorial:
-  rate_this: $2Bewerte dieses Plot!
+  rate_this: $2Bewerte dieses Plot.
   comment_this: '$2Hinterlasse deine Meinung über das Plot: %s'
 desc:
   desc_set: $2Plot Beschreibung gesetzt.
   desc_unset: $2Plot Beschreibung gelöscht.
   missing_desc: $2Du musst eine Beschreibung angeben.
 cap:
-  entity_cap: $2Du darfst hier keine Mobs spawnen
+  entity_cap: $2Du darfst hier keine Mobs spawnen.
 paste:
   debug_report_created: '$1Debug-Log hochgeladen: $1%url%'
 unsafe:

From 8ac9b862f8610b02947bf25435024b2a58c30725 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 31 Jan 2019 14:20:48 -0500
Subject: [PATCH 012/210] Major cleanup. Added todo comments to many 1.13
 issues still lingering. Changed access to some methods to be weaker. Removed
 cluster flags (most of it). Java 8 stuff added. Hid more PlotSetting methods.
 etc.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/BukkitMain.java        |   12 +-
 .../plotsquared/bukkit/chat/FancyMessage.java |   28 -
 .../bukkit/events/ClusterFlagRemoveEvent.java |   63 -
 .../bukkit/listeners/ChunkListener.java       |  129 +-
 .../bukkit/listeners/ForceFieldListener.java  |  153 +-
 .../bukkit/listeners/PlayerEvents.java        | 5253 +++++++-------
 .../bukkit/listeners/PlotPlusListener.java    |   73 +-
 .../bukkit/listeners/SingleWorldListener.java |   13 +-
 .../entity/ReplicatingEntityWrapper.java      | 1320 ++--
 .../bukkit/object/schematic/StateWrapper.java |    3 +-
 .../bukkit/titles/TitleManager.java           |    6 +-
 .../bukkit/titles/TitleManager_1_11.java      |    2 +-
 .../bukkit/util/BukkitEventUtil.java          |    4 -
 .../bukkit/util/BukkitInventoryUtil.java      |    4 +-
 .../plotsquared/bukkit/util/SendChunk.java    |  157 +-
 .../bukkit/util/block/BukkitLocalQueue.java   |    3 +-
 .../bukkit/uuid/DefaultUUIDWrapper.java       |   10 +-
 .../bukkit/uuid/FileUUIDHandler.java          |  356 +-
 .../bukkit/uuid/OfflineUUIDWrapper.java       |   25 +-
 .../bukkit/uuid/SQLUUIDHandler.java           |  244 +-
 .../configuration/Configuration.java          |    3 +-
 .../configuration/ConfigurationOptions.java   |    4 +-
 .../configuration/ConfigurationSection.java   |    9 +-
 .../configuration/MemoryConfiguration.java    |    3 +-
 .../configuration/MemorySection.java          | 1448 ++--
 .../configuration/file/FileConfiguration.java |    3 +-
 .../configuration/file/YamlConfiguration.java |    2 +-
 .../file/YamlConfigurationOptions.java        |    2 +-
 .../configuration/file/YamlConstructor.java   |    2 +-
 .../plotsquared/plot/IPlotMain.java           |    4 +-
 .../plotsquared/plot/Platform.java            |    2 +-
 .../plotsquared/plot/PlotSquared.java         | 3883 +++++-----
 .../plotsquared/plot/commands/Area.java       |  112 +-
 .../plotsquared/plot/commands/Claim.java      |   22 +-
 .../plotsquared/plot/commands/Cluster.java    |    7 +-
 .../plotsquared/plot/commands/Condense.java   |   13 +-
 .../plotsquared/plot/commands/Database.java   |  319 +-
 .../plotsquared/plot/commands/Help.java       |    4 +-
 .../plotsquared/plot/commands/Inbox.java      |    5 +-
 .../plotsquared/plot/commands/Merge.java      |    4 +-
 .../plotsquared/plot/commands/Purge.java      |   30 +-
 .../plotsquared/plot/commands/Rate.java       |   70 +-
 .../plotsquared/plot/database/AbstractDB.java |    8 -
 .../plotsquared/plot/database/DBFunc.java     |   67 +-
 .../plotsquared/plot/database/Database.java   |   16 +-
 .../plotsquared/plot/database/MySQL.java      |    2 +-
 .../plotsquared/plot/database/SQLManager.java | 6326 +++++++++--------
 .../plotsquared/plot/database/SQLite.java     |    2 +-
 .../plotsquared/plot/flag/FlagManager.java    |   36 +-
 .../plot/generator/HybridPlotWorld.java       |    6 +-
 .../plotsquared/plot/logger/ILogger.java      |    1 +
 .../plotsquared/plot/object/Expression.java   |    3 +
 .../plotsquared/plot/object/Plot.java         | 5606 +++++++--------
 .../plotsquared/plot/object/PlotArea.java     |    3 +
 .../plotsquared/plot/object/PlotCluster.java  |   15 +-
 .../plotsquared/plot/object/PlotMessage.java  |    1 +
 .../plotsquared/plot/object/PlotPlayer.java   | 1177 ++-
 .../plotsquared/plot/object/PlotSettings.java |    9 +-
 .../stream/AbstractDelegateOutputStream.java  |   41 +-
 .../object/worlds/DefaultPlotAreaManager.java |   16 +-
 .../plot/object/worlds/PlotAreaManager.java   |   20 +-
 .../plot/object/worlds/SinglePlot.java        |    2 +
 .../object/worlds/SinglePlotAreaManager.java  |    3 +-
 .../plot/object/worlds/SinglePlotManager.java |   10 +-
 .../plotsquared/plot/util/AbstractTitle.java  |    2 +-
 .../plotsquared/plot/util/ChunkManager.java   |   78 +-
 .../plotsquared/plot/util/CmdConfirm.java     |    8 +-
 .../plotsquared/plot/util/CommentManager.java |   48 +-
 .../plotsquared/plot/util/EventUtil.java      |    8 +-
 .../plotsquared/plot/util/MainUtil.java       |   69 +-
 .../plot/util/SchematicHandler.java           |    2 +-
 .../plot/util/block/GlobalBlockQueue.java     |  530 +-
 .../plot/util/expiry/ExpireManager.java       |  839 ++-
 .../plot/util/expiry/ExpiryTask.java          |    1 -
 .../plot/util/expiry/PlotAnalysis.java        |   31 +-
 .../plotsquared/plot/uuid/UUIDWrapper.java    |   14 +-
 .../plot/database/AbstractDBTest.java         |    5 +-
 .../plotsquared/plot/util/EventUtilTest.java  |    6 +-
 78 files changed, 14311 insertions(+), 14509 deletions(-)
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index a2e6a6cb9..ab1894a9d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -134,7 +134,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     private final BlockRegistry<Material> blockRegistry =
         new BukkitBlockRegistry(Material.values());
     private int[] version;
-    @Getter private String pluginName;
+    private String pluginName;
     @Getter private SingleWorldListener singleWorldListener;
     private Method methodUnloadChunk0;
     private boolean methodUnloadSetup = false;
@@ -165,9 +165,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return Bukkit.getVersion();
     }
 
+
     @Override public void onEnable() {
         this.pluginName = getDescription().getName();
-        getServer().getName();
 
         PlotPlayer.registerConverter(Player.class, BukkitUtil::getPlayer);
 
@@ -319,6 +319,11 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return getDescription().getVersion();
     }
 
+    @Override
+    public String getPluginName() {
+        return pluginName;
+    }
+
     @Override public void registerCommands() {
         final BukkitCommand bukkitCommand = new BukkitCommand();
         final PluginCommand plotCommand = getCommand("plots");
@@ -586,6 +591,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
     @Override @Nullable
     public final ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
+        PlotSquared.log("DEFAULT WORLD GENERATOR RUN");
         final IndependentPlotGenerator result;
         if (id != null && id.equalsIgnoreCase("single")) {
             result = new SingleWorldGenerator();
@@ -802,7 +808,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         }
         ChunkGenerator gen = world.getGenerator();
         if (gen instanceof BukkitPlotGenerator) {
-            PlotSquared.get().loadWorld(worldName, (BukkitPlotGenerator) gen);
+            PlotSquared.get().loadWorld(worldName, (GeneratorWrapper<?>) gen);
         } else if (gen != null) {
             PlotSquared.get().loadWorld(worldName, new BukkitPlotGenerator(worldName, gen));
         } else if (PlotSquared.get().worlds.contains("worlds." + worldName)) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
index 41ec91e49..69b168b3d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
@@ -320,34 +320,6 @@ public class FancyMessage
         return this;
     }
 
-    /**
-     * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param which The achievement to display.
-     * @return This builder instance.
-     */
-    public FancyMessage achievementTooltip(final Achievement which) {
-        try {
-            Object achievement = Reflection
-                .getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSAchievement",
-                    Achievement.class).invoke(null, which);
-            return achievementTooltip(
-                (String) Reflection.getField(Reflection.getNMSClass("Achievement"), "name")
-                    .get(achievement));
-        } catch (IllegalAccessException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-            return this;
-        } catch (IllegalArgumentException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-            return this;
-        } catch (InvocationTargetException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
-            return this;
-        }
-    }
-
     /**
      * Set the behavior of the current editing component to display information about a parameterless statistic when the client hovers over the text.
      * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
deleted file mode 100644
index 40acef111..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.events;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.PlotCluster;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * Called when a flag is removed from a plot.
- */
-public class ClusterFlagRemoveEvent extends Event implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final PlotCluster cluster;
-    private final Flag flag;
-    private boolean cancelled;
-
-    /**
-     * PlotFlagRemoveEvent: Called when a flag is removed from a plot.
-     *
-     * @param flag    Flag that was removed
-     * @param cluster PlotCluster from which the flag was removed
-     */
-    public ClusterFlagRemoveEvent(Flag flag, PlotCluster cluster) {
-        this.cluster = cluster;
-        this.flag = flag;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the cluster involved.
-     *
-     * @return PlotCluster
-     */
-    public PlotCluster getCluster() {
-        return this.cluster;
-    }
-
-    /**
-     * Get the flag involved.
-     *
-     * @return Flag
-     */
-    public Flag getFlag() {
-        return this.flag;
-    }
-
-    @Override public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override public void setCancelled(boolean b) {
-        this.cancelled = b;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index da1bb49c3..7b56cabfd 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -1,5 +1,7 @@
 package com.github.intellectualsites.plotsquared.bukkit.listeners;
 
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.C;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
@@ -9,6 +11,8 @@ import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefCla
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField;
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import java.lang.reflect.Method;
+import java.util.HashSet;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
@@ -27,11 +31,6 @@ import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
 
-import java.lang.reflect.Method;
-import java.util.HashSet;
-
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
-
 @SuppressWarnings("unused")
 public class ChunkListener implements Listener {
 
@@ -60,48 +59,46 @@ public class ChunkListener implements Listener {
         for (World world : Bukkit.getWorlds()) {
             world.setAutoSave(false);
         }
-        TaskManager.runTaskRepeat(new Runnable() {
-            @Override public void run() {
-                try {
-                    HashSet<Chunk> toUnload = new HashSet<>();
-                    for (World world : Bukkit.getWorlds()) {
-                        String worldName = world.getName();
-                        if (!PlotSquared.get().hasPlotArea(worldName)) {
+        TaskManager.runTaskRepeat(() -> {
+            try {
+                HashSet<Chunk> toUnload = new HashSet<>();
+                for (World world : Bukkit.getWorlds()) {
+                    String worldName = world.getName();
+                    if (!PlotSquared.get().hasPlotArea(worldName)) {
+                        continue;
+                    }
+                    Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
+                    Object chunkMap =
+                        w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
+                    Method methodIsChunkInUse = chunkMap.getClass()
+                        .getDeclaredMethod("isChunkInUse", int.class, int.class);
+                    Chunk[] chunks = world.getLoadedChunks();
+                    for (Chunk chunk : chunks) {
+                        if ((boolean) methodIsChunkInUse
+                            .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
                             continue;
                         }
-                        Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
-                        Object chunkMap =
-                            w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
-                        Method methodIsChunkInUse = chunkMap.getClass()
-                            .getDeclaredMethod("isChunkInUse", int.class, int.class);
-                        Chunk[] chunks = world.getLoadedChunks();
-                        for (Chunk chunk : chunks) {
-                            if ((boolean) methodIsChunkInUse
-                                .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
-                                continue;
-                            }
-                            int x = chunk.getX();
-                            int z = chunk.getZ();
-                            if (!shouldSave(worldName, x, z)) {
-                                unloadChunk(worldName, chunk, false);
-                                continue;
-                            }
-                            toUnload.add(chunk);
+                        int x = chunk.getX();
+                        int z = chunk.getZ();
+                        if (!shouldSave(worldName, x, z)) {
+                            unloadChunk(worldName, chunk, false);
+                            continue;
                         }
+                        toUnload.add(chunk);
                     }
-                    if (toUnload.isEmpty()) {
+                }
+                if (toUnload.isEmpty()) {
+                    return;
+                }
+                long start = System.currentTimeMillis();
+                for (Chunk chunk : toUnload) {
+                    if (System.currentTimeMillis() - start > 5) {
                         return;
                     }
-                    long start = System.currentTimeMillis();
-                    for (Chunk chunk : toUnload) {
-                        if (System.currentTimeMillis() - start > 5) {
-                            return;
-                        }
-                        chunk.unload(true, false);
-                    }
-                } catch (Throwable e) {
-                    e.printStackTrace();
+                    chunk.unload(true, false);
                 }
+            } catch (Throwable e) {
+                e.printStackTrace();
             }
         }, 1);
     }
@@ -112,7 +109,7 @@ public class ChunkListener implements Listener {
         }
         Object c = this.methodGetHandleChunk.of(chunk).call();
         RefField.RefExecutor field = this.mustSave.of(c);
-        if ((Boolean) field.get() == true) {
+        if ((Boolean) field.get()) {
             field.set(false);
             if (chunk.isLoaded()) {
                 ignoreUnload = true;
@@ -226,18 +223,28 @@ public class ChunkListener implements Listener {
     private void cleanChunk(final Chunk chunk) {
         TaskManager.index.incrementAndGet();
         final Integer currentIndex = TaskManager.index.get();
-        Integer task = TaskManager.runTaskRepeat(new Runnable() {
-            @Override public void run() {
-                if (!chunk.isLoaded()) {
-                    Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                    TaskManager.tasks.remove(currentIndex);
-                    PlotSquared
-                            .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                    chunk.unload(true, true);
-                    return;
-                }
-                BlockState[] tiles = chunk.getTileEntities();
-                if (tiles.length == 0) {
+        Integer task = TaskManager.runTaskRepeat(() -> {
+            if (!chunk.isLoaded()) {
+                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
+                TaskManager.tasks.remove(currentIndex);
+                PlotSquared
+                        .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                chunk.unload(true, true);
+                return;
+            }
+            BlockState[] tiles = chunk.getTileEntities();
+            if (tiles.length == 0) {
+                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
+                TaskManager.tasks.remove(currentIndex);
+                PlotSquared
+                    .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                chunk.unload(true, true);
+                return;
+            }
+            long start = System.currentTimeMillis();
+            int i = 0;
+            while (System.currentTimeMillis() - start < 250) {
+                if (i >= tiles.length) {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
                     PlotSquared
@@ -245,20 +252,8 @@ public class ChunkListener implements Listener {
                     chunk.unload(true, true);
                     return;
                 }
-                long start = System.currentTimeMillis();
-                int i = 0;
-                while (System.currentTimeMillis() - start < 250) {
-                    if (i >= tiles.length) {
-                        Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                        TaskManager.tasks.remove(currentIndex);
-                        PlotSquared
-                            .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                        chunk.unload(true, true);
-                        return;
-                    }
-                    tiles[i].getBlock().setType(Material.AIR, false);
-                    i++;
-                }
+                tiles[i].getBlock().setType(Material.AIR, false);
+                i++;
             }
         }, 5);
         TaskManager.tasks.put(currentIndex, task);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
index 97d1bb7d7..bf33577a1 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
@@ -16,89 +16,90 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-@SuppressWarnings("unused") public class ForceFieldListener {
+@SuppressWarnings("unused")
+public class ForceFieldListener {
 
-    private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) {
-        Set<PlotPlayer> players = new HashSet<>();
-        for (Player nearPlayer : Iterables
-            .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
-            PlotPlayer plotPlayer;
-            if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
-                .equals(plotPlayer.getCurrentPlot())) {
-                continue;
-            }
-            if (!plot.isAdded(plotPlayer.getUUID())) {
-                players.add(plotPlayer);
-            }
-        }
-        return players;
+  private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) {
+    Set<PlotPlayer> players = new HashSet<>();
+    for (Player nearPlayer : Iterables
+        .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
+      PlotPlayer plotPlayer;
+      if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
+          .equals(plotPlayer.getCurrentPlot())) {
+        continue;
+      }
+      if (!plot.isAdded(plotPlayer.getUUID())) {
+        players.add(plotPlayer);
+      }
     }
+    return players;
+  }
 
-    private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) {
-        for (Player nearPlayer : Iterables
-            .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
-            PlotPlayer plotPlayer;
-            if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
-                .equals(plotPlayer.getCurrentPlot())) {
-                continue;
-            }
-            if (plot.isAdded(plotPlayer.getUUID())) {
-                return plotPlayer;
-            }
-        }
-        return null;
+  private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) {
+    for (Player nearPlayer : Iterables
+        .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
+      PlotPlayer plotPlayer;
+      if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
+          .equals(plotPlayer.getCurrentPlot())) {
+        continue;
+      }
+      if (plot.isAdded(plotPlayer.getUUID())) {
+        return plotPlayer;
+      }
     }
+    return null;
+  }
 
-    private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) {
-        Location playerLocation = player.getLocationFull();
-        Location oPlayerLocation = e.getLocation();
-        double playerX = playerLocation.getX();
-        double playerY = playerLocation.getY();
-        double playerZ = playerLocation.getZ();
-        double oPlayerX = oPlayerLocation.getX();
-        double oPlayerY = oPlayerLocation.getY();
-        double oPlayerZ = oPlayerLocation.getZ();
-        double x = 0d;
-        if (playerX < oPlayerX) {
-            x = 1.0d;
-        } else if (playerX > oPlayerX) {
-            x = -1.0d;
-        }
-        double y = 0d;
-        if (playerY < oPlayerY) {
-            y = 0.5d;
-        } else if (playerY > oPlayerY) {
-            y = -0.5d;
-        }
-        double z = 0d;
-        if (playerZ < oPlayerZ) {
-            z = 1.0d;
-        } else if (playerZ > oPlayerZ) {
-            z = -1.0d;
-        }
-        return new Vector(x, y, z);
+  private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) {
+    Location playerLocation = player.getLocationFull();
+    Location oPlayerLocation = e.getLocation();
+    double playerX = playerLocation.getX();
+    double playerY = playerLocation.getY();
+    double playerZ = playerLocation.getZ();
+    double oPlayerX = oPlayerLocation.getX();
+    double oPlayerY = oPlayerLocation.getY();
+    double oPlayerZ = oPlayerLocation.getZ();
+    double x = 0d;
+    if (playerX < oPlayerX) {
+      x = 1.0d;
+    } else if (playerX > oPlayerX) {
+      x = -1.0d;
     }
+    double y = 0d;
+    if (playerY < oPlayerY) {
+      y = 0.5d;
+    } else if (playerY > oPlayerY) {
+      y = -0.5d;
+    }
+    double z = 0d;
+    if (playerZ < oPlayerZ) {
+      z = 1.0d;
+    } else if (playerZ > oPlayerZ) {
+      z = -1.0d;
+    }
+    return new Vector(x, y, z);
+  }
 
-    public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) {
-        if (Flags.FORCEFIELD.isTrue(plot)) {
-            UUID uuid = plotPlayer.getUUID();
-            if (plot.isAdded(uuid)) {
-                Set<PlotPlayer> players = getNearbyPlayers(player, plot);
-                for (PlotPlayer oPlayer : players) {
-                    if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
-                        ((BukkitPlayer) oPlayer).player
-                            .setVelocity(calculateVelocity(plotPlayer, oPlayer));
-                    }
-                }
-            } else {
-                PlotPlayer oPlayer = hasNearbyPermitted(player, plot);
-                if (oPlayer == null) {
-                    return;
-                }
-                if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
-                    player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
-                }
-            }
+  public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) {
+    if (Flags.FORCEFIELD.isTrue(plot)) {
+      UUID uuid = plotPlayer.getUUID();
+      if (plot.isAdded(uuid)) {
+        Set<PlotPlayer> players = getNearbyPlayers(player, plot);
+        for (PlotPlayer oPlayer : players) {
+          if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+            ((BukkitPlayer) oPlayer).player
+                .setVelocity(calculateVelocity(plotPlayer, oPlayer));
+          }
         }
+      } else {
+        PlotPlayer oPlayer = hasNearbyPermitted(player, plot);
+        if (oPlayer == null) {
+          return;
+        }
+        if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+          player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
+        }
+      }
     }
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 6b172f49e..ecb6b50ef 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -42,6 +42,7 @@ import org.bukkit.help.HelpTopic;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.material.Directional;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
@@ -57,186 +58,188 @@ import java.util.regex.Pattern;
 /**
  * Player Events involving plots.
  */
-@SuppressWarnings("unused") public class PlayerEvents extends PlotListener implements Listener {
+@SuppressWarnings("unused")
+public class PlayerEvents extends PlotListener implements Listener {
 
-    private boolean pistonBlocks = true;
-    private float lastRadius;
-    // To prevent recursion
-    private boolean tmpTeleport = true;
-    private Field fieldPlayer;
-    private PlayerMoveEvent moveTmp;
+  private boolean pistonBlocks = true;
+  private float lastRadius;
+  // To prevent recursion
+  private boolean tmpTeleport = true;
+  private Field fieldPlayer;
+  private PlayerMoveEvent moveTmp;
 
-    {
-        try {
-            fieldPlayer = PlayerEvent.class.getDeclaredField("player");
-            fieldPlayer.setAccessible(true);
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
-        }
+  {
+    try {
+      fieldPlayer = PlayerEvent.class.getDeclaredField("player");
+      fieldPlayer.setAccessible(true);
+    } catch (NoSuchFieldException e) {
+      e.printStackTrace();
     }
+  }
 
-    public static void sendBlockChange(final org.bukkit.Location bloc, final BlockData data) {
-        TaskManager.runTaskLater(() -> {
-            String world = bloc.getWorld().getName();
-            int x = bloc.getBlockX();
-            int z = bloc.getBlockZ();
-            int distance = Bukkit.getViewDistance() * 16;
-            for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-                PlotPlayer player = entry.getValue();
-                Location loc = player.getLocation();
-                if (loc.getWorld().equals(world)) {
-                    if (16 * Math.abs(loc.getX() - x) / 16 > distance
-                        || 16 * Math.abs(loc.getZ() - z) / 16 > distance) {
-                        continue;
-                    }
-                    ((BukkitPlayer) player).player.sendBlockChange(bloc, data);
-                }
-            }
-        }, 3);
-    }
-
-    public static boolean checkEntity(Entity entity, Plot plot) {
-        if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot
-            .getArea().DEFAULT_FLAGS.isEmpty()) {
-            return false;
+  public static void sendBlockChange(final org.bukkit.Location bloc, final BlockData data) {
+    TaskManager.runTaskLater(() -> {
+      String world = bloc.getWorld().getName();
+      int x = bloc.getBlockX();
+      int z = bloc.getBlockZ();
+      int distance = Bukkit.getViewDistance() * 16;
+      for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+        PlotPlayer player = entry.getValue();
+        Location loc = player.getLocation();
+        if (loc.getWorld().equals(world)) {
+          if (16 * Math.abs(loc.getX() - x) / 16 > distance
+              || 16 * Math.abs(loc.getZ() - z) / 16 > distance) {
+            continue;
+          }
+          ((BukkitPlayer) player).player.sendBlockChange(bloc, data);
         }
-        switch (entity.getType()) {
-            case PLAYER:
-                return false;
-            case ARROW:
-            case DRAGON_FIREBALL:
-            case DROPPED_ITEM:
-            case EGG:
-            case ENDER_PEARL:
-            case FIREBALL:
-            case LINGERING_POTION:
-            case LLAMA_SPIT:
-            case SHULKER_BULLET:
-            case SMALL_FIREBALL:
-            case SNOWBALL:
-            case SPECTRAL_ARROW:
-            case SPLASH_POTION:
-            case THROWN_EXP_BOTTLE:
-            case TIPPED_ARROW:
-                // projectile
-            case FALLING_BLOCK:
-            case PRIMED_TNT:
-                // Block entities
-            case AREA_EFFECT_CLOUD:
-            case COMPLEX_PART:
-            case ENDER_CRYSTAL:
-            case ENDER_SIGNAL:
-            case EVOKER_FANGS:
-            case EXPERIENCE_ORB:
-            case FIREWORK:
-            case FISHING_HOOK:
-            case LEASH_HITCH:
-            case LIGHTNING:
-            case UNKNOWN:
-            case WEATHER:
-            case WITHER_SKULL:
-                // non moving / unmovable
-                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
-            case ARMOR_STAND:
-            case ITEM_FRAME:
-            case PAINTING:
-                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
-            // misc
-            case BOAT:
-            case MINECART:
-            case MINECART_CHEST:
-            case MINECART_COMMAND:
-            case MINECART_FURNACE:
-            case MINECART_HOPPER:
-            case MINECART_MOB_SPAWNER:
-            case MINECART_TNT:
-                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
-            case BAT:
-            case CHICKEN:
-            case COD:
-            case COW:
-            case DOLPHIN:
-            case DONKEY:
-            case HORSE:
-            case IRON_GOLEM:
-            case LLAMA:
-            case MULE:
-            case MUSHROOM_COW:
-            case OCELOT:
-            case PARROT:
-            case PIG:
-            case POLAR_BEAR:
-            case PUFFERFISH:
-            case RABBIT:
-            case SALMON:
-            case SHEEP:
-            case SKELETON_HORSE:
-            case SNOWMAN:
-            case SQUID:
-            case TROPICAL_FISH:
-            case TURTLE:
-            case VILLAGER:
-            case WOLF:
-            case ZOMBIE_HORSE:
-                // animal
-                return EntityUtil
-                    .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
-            case BLAZE:
-            case CAVE_SPIDER:
-            case CREEPER:
-            case DROWNED:
-            case ELDER_GUARDIAN:
-            case ENDERMAN:
-            case ENDERMITE:
-            case ENDER_DRAGON:
-            case EVOKER:
-            case GHAST:
-            case GIANT:
-            case GUARDIAN:
-            case HUSK:
-            case ILLUSIONER:
-            case MAGMA_CUBE:
-            case PIG_ZOMBIE:
-            case SHULKER:
-            case SILVERFISH:
-            case SKELETON:
-            case SLIME:
-            case SPIDER:
-            case STRAY:
-            case VEX:
-            case VINDICATOR:
-            case WITCH:
-            case WITHER:
-            case WITHER_SKELETON:
-            case ZOMBIE:
-            case ZOMBIE_VILLAGER:
-                // monster
-                return EntityUtil
-                    .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
-            default:
-                if (entity instanceof LivingEntity) {
-                    if (entity instanceof Animals || entity instanceof WaterMob) {
-                        return EntityUtil
-                            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
-                    } else if (entity instanceof Monster) {
-                        return EntityUtil
-                            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
-                    } else {
-                        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP);
-                    }
-                }
-                if (entity instanceof Vehicle) {
-                    return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
-                }
-                if (entity instanceof Hanging) {
-                    return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
-                }
-                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
-        }
-    }
+      }
+    }, 3);
+  }
 
-    @EventHandler public void onRedstoneEvent(BlockRedstoneEvent event) {
-        Block block = event.getBlock();
+  public static boolean checkEntity(Entity entity, Plot plot) {
+    if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot
+        .getArea().DEFAULT_FLAGS.isEmpty()) {
+      return false;
+    }
+    switch (entity.getType()) {
+      case PLAYER:
+        return false;
+      case ARROW:
+      case DRAGON_FIREBALL:
+      case DROPPED_ITEM:
+      case EGG:
+      case ENDER_PEARL:
+      case FIREBALL:
+      case LINGERING_POTION:
+      case LLAMA_SPIT:
+      case SHULKER_BULLET:
+      case SMALL_FIREBALL:
+      case SNOWBALL:
+      case SPECTRAL_ARROW:
+      case SPLASH_POTION:
+      case THROWN_EXP_BOTTLE:
+      case TIPPED_ARROW:
+        // projectile
+      case FALLING_BLOCK:
+      case PRIMED_TNT:
+        // Block entities
+      case AREA_EFFECT_CLOUD:
+      case COMPLEX_PART:
+      case ENDER_CRYSTAL:
+      case ENDER_SIGNAL:
+      case EVOKER_FANGS:
+      case EXPERIENCE_ORB:
+      case FIREWORK:
+      case FISHING_HOOK:
+      case LEASH_HITCH:
+      case LIGHTNING:
+      case UNKNOWN:
+      case WEATHER:
+      case WITHER_SKULL:
+        // non moving / unmovable
+        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
+      case ARMOR_STAND:
+      case ITEM_FRAME:
+      case PAINTING:
+        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
+      // misc
+      case BOAT:
+      case MINECART:
+      case MINECART_CHEST:
+      case MINECART_COMMAND:
+      case MINECART_FURNACE:
+      case MINECART_HOPPER:
+      case MINECART_MOB_SPAWNER:
+      case MINECART_TNT:
+        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
+      case BAT:
+      case CHICKEN:
+      case COD:
+      case COW:
+      case DOLPHIN:
+      case DONKEY:
+      case HORSE:
+      case IRON_GOLEM:
+      case LLAMA:
+      case MULE:
+      case MUSHROOM_COW:
+      case OCELOT:
+      case PARROT:
+      case PIG:
+      case POLAR_BEAR:
+      case PUFFERFISH:
+      case RABBIT:
+      case SALMON:
+      case SHEEP:
+      case SKELETON_HORSE:
+      case SNOWMAN:
+      case SQUID:
+      case TROPICAL_FISH:
+      case TURTLE:
+      case VILLAGER:
+      case WOLF:
+      case ZOMBIE_HORSE:
+        // animal
+        return EntityUtil
+            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
+      case BLAZE:
+      case CAVE_SPIDER:
+      case CREEPER:
+      case DROWNED:
+      case ELDER_GUARDIAN:
+      case ENDERMAN:
+      case ENDERMITE:
+      case ENDER_DRAGON:
+      case EVOKER:
+      case GHAST:
+      case GIANT:
+      case GUARDIAN:
+      case HUSK:
+      case ILLUSIONER:
+      case MAGMA_CUBE:
+      case PIG_ZOMBIE:
+      case SHULKER:
+      case SILVERFISH:
+      case SKELETON:
+      case SLIME:
+      case SPIDER:
+      case STRAY:
+      case VEX:
+      case VINDICATOR:
+      case WITCH:
+      case WITHER:
+      case WITHER_SKELETON:
+      case ZOMBIE:
+      case ZOMBIE_VILLAGER:
+        // monster
+        return EntityUtil
+            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
+      default:
+        if (entity instanceof LivingEntity) {
+          if (entity instanceof Animals || entity instanceof WaterMob) {
+            return EntityUtil
+                .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
+          } else if (entity instanceof Monster) {
+            return EntityUtil
+                .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
+          } else {
+            return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP);
+          }
+        }
+        if (entity instanceof Vehicle) {
+          return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
+        }
+        if (entity instanceof Hanging) {
+          return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
+        }
+        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
+    }
+  }
+
+  @EventHandler
+  public void onRedstoneEvent(BlockRedstoneEvent event) {
+    Block block = event.getBlock();
 /*        switch (block.getType()) {
             case OBSERVER:
             case REDSTONE:
@@ -284,2561 +287,2575 @@ import java.util.regex.Pattern;
             case POWERED_RAIL:
                 return;
             default:*/
+    Location loc = BukkitUtil.getLocation(block.getLocation());
+    PlotArea area = loc.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlot(loc);
+    if (plot == null) {
+      return;
+    }
+    if (Flags.REDSTONE.isFalse(plot)) {
+      event.setNewCurrent(0);
+      return;
+    }
+    if (Settings.Redstone.DISABLE_OFFLINE) {
+      boolean disable;
+      if (plot.isMerged()) {
+        disable = true;
+        for (UUID owner : plot.getOwners()) {
+          if (UUIDHandler.getPlayer(owner) != null) {
+            disable = false;
+            break;
+          }
+        }
+      } else {
+        disable = UUIDHandler.getPlayer(plot.guessOwner()) == null;
+      }
+      if (disable) {
+        for (UUID trusted : plot.getTrusted()) {
+          if (UUIDHandler.getPlayer(trusted) != null) {
+            disable = false;
+            break;
+          }
+        }
+        if (disable) {
+          event.setNewCurrent(0);
+          return;
+        }
+      }
+    }
+    if (Settings.Redstone.DISABLE_UNOCCUPIED) {
+      for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+        if (plot.equals(entry.getValue().getCurrentPlot())) {
+          return;
+        }
+      }
+      event.setNewCurrent(0);
+    }
+    //}
+  }
+
+  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+  public void onPhysicsEvent(BlockPhysicsEvent event) {
+    switch (event.getChangedType()) {
+      case COMPARATOR: {
+        Block block = event.getBlock();
         Location loc = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = loc.getPlotArea();
         if (area == null) {
-            return;
+          return;
         }
-        Plot plot = area.getOwnedPlot(loc);
+        Plot plot = area.getOwnedPlotAbs(loc);
         if (plot == null) {
-            return;
+          return;
         }
         if (Flags.REDSTONE.isFalse(plot)) {
-            event.setNewCurrent(0);
-            return;
-        }
-        if (Settings.Redstone.DISABLE_OFFLINE) {
-            boolean disable;
-            if (plot.isMerged()) {
-                disable = true;
-                for (UUID owner : plot.getOwners()) {
-                    if (UUIDHandler.getPlayer(owner) != null) {
-                        disable = false;
-                        break;
-                    }
-                }
-            } else {
-                disable = UUIDHandler.getPlayer(plot.guessOwner()) == null;
-            }
-            if (disable) {
-                for (UUID trusted : plot.getTrusted()) {
-                    if (UUIDHandler.getPlayer(trusted) != null) {
-                        disable = false;
-                        break;
-                    }
-                }
-                if (disable) {
-                    event.setNewCurrent(0);
-                    return;
-                }
-            }
-        }
-        if (Settings.Redstone.DISABLE_UNOCCUPIED) {
-            for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-                if (plot.equals(entry.getValue().getCurrentPlot())) {
-                    return;
-                }
-            }
-            event.setNewCurrent(0);
-        }
-        //}
-    }
-
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onPhysicsEvent(BlockPhysicsEvent event) {
-        switch (event.getChangedType()) {
-            case COMPARATOR: {
-                Block block = event.getBlock();
-                Location loc = BukkitUtil.getLocation(block.getLocation());
-                PlotArea area = loc.getPlotArea();
-                if (area == null) {
-                    return;
-                }
-                Plot plot = area.getOwnedPlotAbs(loc);
-                if (plot == null) {
-                    return;
-                }
-                if (Flags.REDSTONE.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
-            case ANVIL:
-            case DRAGON_EGG:
-            case GRAVEL:
-            case SAND:
-            case TURTLE_EGG:
-            case TURTLE_HELMET:
-            case TURTLE_SPAWN_EGG: {
-                Block block = event.getBlock();
-                Location loc = BukkitUtil.getLocation(block.getLocation());
-                PlotArea area = loc.getPlotArea();
-                if (area == null) {
-                    return;
-                }
-                Plot plot = area.getOwnedPlotAbs(loc);
-                if (plot == null) {
-                    return;
-                }
-                if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                return;
-            }
-            default:
-                if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) {
-                    Block block = event.getBlock();
-                    switch (block.getType()) {
-                        case PISTON:
-                        case STICKY_PISTON:
-                            Piston piston = (Piston) block.getBlockData();
-                            Location loc = BukkitUtil.getLocation(block.getLocation());
-                            PlotArea area = loc.getPlotArea();
-                            if (area == null) {
-                                return;
-                            }
-                            Plot plot = area.getOwnedPlotAbs(loc);
-                            if (plot == null) {
-                                return;
-                            }
-                            switch (piston.getFacing()) {
-                                case EAST:
-                                    loc.setX(loc.getX() + 1);
-                                    break;
-                                case SOUTH:
-                                    loc.setX(loc.getX() - 1);
-                                    break;
-                                case WEST:
-                                    loc.setZ(loc.getZ() + 1);
-                                    break;
-                                case NORTH:
-                                    loc.setZ(loc.getZ() - 1);
-                                    break;
-                            }
-                            Plot newPlot = area.getOwnedPlotAbs(loc);
-                            if (!plot.equals(newPlot)) {
-                                event.setCancelled(true);
-                                return;
-                            }
-                    }
-                }
-                break;
-        }
-    }
-
-    @EventHandler public void onProjectileLaunch(ProjectileLaunchEvent event) {
-        Projectile entity = event.getEntity();
-        if (!(entity instanceof ThrownPotion)) {
-            return;
-        }
-        ProjectileSource shooter = entity.getShooter();
-        if (!(shooter instanceof Player)) {
-            return;
-        }
-        Location l = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-            return;
-        }
-        PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
-        Plot plot = l.getOwnedPlot();
-        if (plot != null && !plot.isAdded(pp.getUUID())) {
-            entity.remove();
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler public boolean onProjectileHit(ProjectileHitEvent event) {
-        Projectile entity = event.getEntity();
-        Location loc = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(loc.getWorld())) {
-            return true;
+          event.setCancelled(true);
         }
+        return;
+      }
+      case ANVIL:
+      case DRAGON_EGG:
+      case GRAVEL:
+      case SAND:
+      case TURTLE_EGG:
+      case TURTLE_HELMET:
+      case TURTLE_SPAWN_EGG: {
+        Block block = event.getBlock();
+        Location loc = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = loc.getPlotArea();
         if (area == null) {
-            return true;
+          return;
         }
-        Plot plot = area.getPlot(loc);
-        ProjectileSource shooter = entity.getShooter();
-        if (shooter instanceof Player) {
-            PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
-            if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED)) {
-                    entity.remove();
-                    return false;
-                }
-                return true;
-            }
-            if (plot.isAdded(pp.getUUID()) || Permissions
-                .hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) {
-                return true;
-            }
-            entity.remove();
-            return false;
+        Plot plot = area.getOwnedPlotAbs(loc);
+        if (plot == null) {
+          return;
         }
-        if (!(shooter instanceof Entity) && shooter != null) {
-            if (plot == null) {
-                entity.remove();
-                return false;
-            }
-            Location sLoc =
-                BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
-            if (!area.contains(sLoc.getX(), sLoc.getZ())) {
-                entity.remove();
-                return false;
-            }
-            Plot sPlot = area.getOwnedPlotAbs(sLoc);
-            if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
-                entity.remove();
-                return false;
-            }
+        if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        return;
+      }
+      default:
+        if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) {
+          Block block = event.getBlock();
+          switch (block.getType()) {
+            case PISTON:
+            case STICKY_PISTON:
+              Piston piston = (Piston) block.getBlockData();
+              Location loc = BukkitUtil.getLocation(block.getLocation());
+              PlotArea area = loc.getPlotArea();
+              if (area == null) {
+                return;
+              }
+              Plot plot = area.getOwnedPlotAbs(loc);
+              if (plot == null) {
+                return;
+              }
+              switch (piston.getFacing()) {
+                case EAST:
+                  loc.setX(loc.getX() + 1);
+                  break;
+                case SOUTH:
+                  loc.setX(loc.getX() - 1);
+                  break;
+                case WEST:
+                  loc.setZ(loc.getZ() + 1);
+                  break;
+                case NORTH:
+                  loc.setZ(loc.getZ() - 1);
+                  break;
+              }
+              Plot newPlot = area.getOwnedPlotAbs(loc);
+              if (!plot.equals(newPlot)) {
+                event.setCancelled(true);
+                return;
+              }
+          }
+        }
+        break;
+    }
+  }
+
+  @EventHandler
+  public void onProjectileLaunch(ProjectileLaunchEvent event) {
+    Projectile entity = event.getEntity();
+    if (!(entity instanceof ThrownPotion)) {
+      return;
+    }
+    ProjectileSource shooter = entity.getShooter();
+    if (!(shooter instanceof Player)) {
+      return;
+    }
+    Location l = BukkitUtil.getLocation(entity);
+    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+      return;
+    }
+    PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
+    Plot plot = l.getOwnedPlot();
+    if (plot != null && !plot.isAdded(pp.getUUID())) {
+      entity.remove();
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler
+  public boolean onProjectileHit(ProjectileHitEvent event) {
+    Projectile entity = event.getEntity();
+    Location loc = BukkitUtil.getLocation(entity);
+    if (!PlotSquared.get().hasPlotArea(loc.getWorld())) {
+      return true;
+    }
+    PlotArea area = loc.getPlotArea();
+    if (area == null) {
+      return true;
+    }
+    Plot plot = area.getPlot(loc);
+    ProjectileSource shooter = entity.getShooter();
+    if (shooter instanceof Player) {
+      PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
+      if (plot == null) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED)) {
+          entity.remove();
+          return false;
         }
         return true;
+      }
+      if (plot.isAdded(pp.getUUID()) || Permissions
+          .hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) {
+        return true;
+      }
+      entity.remove();
+      return false;
     }
+    if (!(shooter instanceof Entity) && shooter != null) {
+      if (plot == null) {
+        entity.remove();
+        return false;
+      }
+      Location sLoc =
+          BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+      if (!area.contains(sLoc.getX(), sLoc.getZ())) {
+        entity.remove();
+        return false;
+      }
+      Plot sPlot = area.getOwnedPlotAbs(sLoc);
+      if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
+        entity.remove();
+        return false;
+      }
+    }
+    return true;
+  }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void playerCommand(PlayerCommandPreprocessEvent event) {
-        String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
-        if (msg.isEmpty()) {
+  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+  public void playerCommand(PlayerCommandPreprocessEvent event) {
+    String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
+    if (msg.isEmpty()) {
+      return;
+    }
+    Player player = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    Location loc = pp.getLocation();
+    PlotArea area = loc.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    String[] parts = msg.split(" ");
+    Plot plot = pp.getCurrentPlot();
+    if (BukkitMain.getWorldEdit() != null) { // Check WorldEdit
+      switch (parts[0].toLowerCase()) {
+        case "up":
+        case "/up":
+        case "worldedit:up":
+        case "worldedit:/up":
+          if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
+              .hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER, true))) {
+            event.setCancelled(true);
             return;
+          }
+      }
+    }
+    if (plot == null) {
+      return;
+    }
+    Optional<List<String>> flag = plot.getFlag(Flags.BLOCKED_CMDS);
+    if (flag.isPresent() && !Permissions
+        .hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
+      List<String> blocked_cmds = flag.get();
+      String c = parts[0];
+      if (parts[0].contains(":")) {
+        c = parts[0].split(":")[1];
+        msg = msg.replace(parts[0].split(":")[0] + ':', "");
+      }
+      String l = c;
+      List<String> aliases = new ArrayList<>();
+      for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
+        if (c.equals(cmdLabel.getName())) {
+          break;
         }
+        String label = cmdLabel.getName().replaceFirst("/", "");
+        if (aliases.contains(label)) {
+          continue;
+        }
+        PluginCommand p;
+        if ((p = Bukkit.getPluginCommand(label)) != null) {
+          for (String a : p.getAliases()) {
+            if (aliases.contains(a)) {
+              continue;
+            }
+            aliases.add(a);
+            a = a.replaceFirst("/", "");
+            if (!a.equals(label) && a.equals(c)) {
+              c = label;
+              break;
+            }
+          }
+        }
+      }
+      if (!l.equals(c)) {
+        msg = msg.replace(l, c);
+      }
+      for (String s : blocked_cmds) {
+        Pattern pattern;
+        if (!RegExUtil.compiledPatterns.containsKey(s)) {
+          RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
+        } else {
+          pattern = RegExUtil.compiledPatterns.get(s);
+        }
+        if (pattern.matcher(msg).matches()) {
+          String perm;
+          if (plot.isAdded(pp.getUUID())) {
+            perm = "plots.admin.command.blocked-cmds.shared";
+          } else {
+            perm = "plots.admin.command.blocked-cmds.other";
+          }
+          if (!Permissions.hasPermission(pp, perm)) {
+            MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
+            event.setCancelled(true);
+          }
+          return;
+        }
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+  public void onConnect(PlayerJoinEvent event) {
+    final Player player = event.getPlayer();
+    UUIDHandler.getPlayers().remove(player.getName());
+    BukkitUtil.removePlayer(player.getName());
+    final PlotPlayer pp = BukkitUtil.getPlayer(player);
+    // Now
+    String name = pp.getName();
+    StringWrapper sw = new StringWrapper(name);
+    UUID uuid = pp.getUUID();
+    UUIDHandler.add(sw, uuid);
+
+    Location loc = pp.getLocation();
+    PlotArea area = loc.getPlotArea();
+    if (area != null) {
+      Plot plot = area.getPlot(loc);
+      if (plot != null) {
+        plotEntry(pp, plot);
+      }
+    }
+    // Delayed
+
+    // Async
+    TaskManager.runTaskLaterAsync(() -> {
+      if (!player.hasPlayedBefore() && player.isOnline()) {
+        player.saveData();
+      }
+      EventUtil.manager.doJoinTask(pp);
+    }, 20);
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void playerRespawn(PlayerRespawnEvent event) {
+    Player player = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    EventUtil.manager.doRespawnTask(pp);
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onTeleport(PlayerTeleportEvent event) {
+    if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
+        .equals(event.getTo().getWorld())) {
+      final Object lastLoc = BukkitUtil.getPlayer(event.getPlayer())
+          .deleteMeta(PlotPlayer.META_LOCATION);
+      final Object lastPlot = BukkitUtil.getPlayer(event.getPlayer())
+          .deleteMeta(PlotPlayer.META_LAST_PLOT);
+      org.bukkit.Location to = event.getTo();
+      if (to != null) {
         Player player = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        Location loc = pp.getLocation();
-        PlotArea area = loc.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        String[] parts = msg.split(" ");
-        Plot plot = pp.getCurrentPlot();
-        if (BukkitMain.getWorldEdit() != null) { // Check WorldEdit
-            switch (parts[0].toLowerCase()) {
-                case "up":
-                case "/up":
-                case "worldedit:up":
-                case "worldedit:/up":
-                    if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
-                        .hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER, true))) {
-                        event.setCancelled(true);
-                        return;
-                    }
-            }
-        }
-        if (plot == null) {
-            return;
-        }
-        Optional<List<String>> flag = plot.getFlag(Flags.BLOCKED_CMDS);
-        if (flag.isPresent() && !Permissions
-            .hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-            List<String> blocked_cmds = flag.get();
-            String c = parts[0];
-            if (parts[0].contains(":")) {
-                c = parts[0].split(":")[1];
-                msg = msg.replace(parts[0].split(":")[0] + ':', "");
-            }
-            String l = c;
-            List<String> aliases = new ArrayList<>();
-            for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
-                if (c.equals(cmdLabel.getName())) {
-                    break;
-                }
-                String label = cmdLabel.getName().replaceFirst("/", "");
-                if (aliases.contains(label)) {
-                    continue;
-                }
-                PluginCommand p;
-                if ((p = Bukkit.getPluginCommand(label)) != null) {
-                    for (String a : p.getAliases()) {
-                        if (aliases.contains(a)) {
-                            continue;
-                        }
-                        aliases.add(a);
-                        a = a.replaceFirst("/", "");
-                        if (!a.equals(label) && a.equals(c)) {
-                            c = label;
-                            break;
-                        }
-                    }
-                }
-            }
-            if (!l.equals(c)) {
-                msg = msg.replace(l, c);
-            }
-            for (String s : blocked_cmds) {
-                Pattern pattern;
-                if (!RegExUtil.compiledPatterns.containsKey(s)) {
-                    RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
-                } else {
-                    pattern = RegExUtil.compiledPatterns.get(s);
-                }
-                if (pattern.matcher(msg).matches()) {
-                    String perm;
-                    if (plot.isAdded(pp.getUUID())) {
-                        perm = "plots.admin.command.blocked-cmds.shared";
-                    } else {
-                        perm = "plots.admin.command.blocked-cmds.other";
-                    }
-                    if (!Permissions.hasPermission(pp, perm)) {
-                        MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
-                        event.setCancelled(true);
-                    }
-                    return;
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onConnect(PlayerJoinEvent event) {
-        final Player player = event.getPlayer();
-        UUIDHandler.getPlayers().remove(player.getName());
-        BukkitUtil.removePlayer(player.getName());
-        final PlotPlayer pp = BukkitUtil.getPlayer(player);
-        // Now
-        String name = pp.getName();
-        StringWrapper sw = new StringWrapper(name);
-        UUID uuid = pp.getUUID();
-        UUIDHandler.add(sw, uuid);
-
-        Location loc = pp.getLocation();
-        PlotArea area = loc.getPlotArea();
-        if (area != null) {
-            Plot plot = area.getPlot(loc);
-            if (plot != null) {
-                plotEntry(pp, plot);
-            }
-        }
-        // Delayed
-
-        // Async
-        TaskManager.runTaskLaterAsync(() -> {
-            if (!player.hasPlayedBefore() && player.isOnline()) {
-                player.saveData();
-            }
-            EventUtil.manager.doJoinTask(pp);
-        }, 20);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void playerRespawn(PlayerRespawnEvent event) {
-        Player player = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        EventUtil.manager.doRespawnTask(pp);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onTeleport(PlayerTeleportEvent event) {
-        if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
-            .equals(event.getTo().getWorld())) {
-            final Object lastLoc = BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
-            final Object lastPlot = BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LAST_PLOT);
-            org.bukkit.Location to = event.getTo();
-            if (to != null) {
-                Player player = event.getPlayer();
-                PlotPlayer pp = PlotPlayer.wrap(player);
-                Location loc = BukkitUtil.getLocation(to);
-                PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
-                if (area == null) {
-                    return;
-                }
-                Plot plot = area.getPlot(loc);
-                if (plot != null) {
-                    final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
-                    if (!result) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                        event.setCancelled(true);
-                        if (lastLoc != null) {
-                            pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
-                        }
-                        if (lastPlot != null) {
-                            pp.setMeta(PlotPlayer.META_LAST_PLOT, lastPlot);
-                        }
-                    } else {
-                        plotEntry(pp, plot);
-                    }
-                }
-            }
-            return;
-        }
-        playerMove(event);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void vehicleMove(VehicleMoveEvent event) throws IllegalAccessException {
-        final org.bukkit.Location from = event.getFrom();
-        final org.bukkit.Location to = event.getTo();
-
-        int toX, toZ;
-        if ((toX = MathMan.roundInt(to.getX())) != MathMan.roundInt(from.getX())
-            | (toZ = MathMan.roundInt(to.getZ())) != MathMan.roundInt(from.getZ())) {
-            Vehicle vehicle = event.getVehicle();
-
-            // Check allowed
-            if (!vehicle.getPassengers().isEmpty()) {
-                Entity passenger = vehicle.getPassengers().get(0);
-
-                if (passenger instanceof Player) {
-                    final Player player = (Player) passenger;
-                    // reset
-                    if (moveTmp == null)
-                        moveTmp = new PlayerMoveEvent(null, from, to);
-                    moveTmp.setFrom(from);
-                    moveTmp.setTo(to);
-                    moveTmp.setCancelled(false);
-                    fieldPlayer.set(moveTmp, player);
-
-                    List<Entity> passengers = vehicle.getPassengers();
-
-                    this.playerMove(moveTmp);
-                    org.bukkit.Location dest;
-                    if (moveTmp.isCancelled()) {
-                        dest = from;
-                    } else if (MathMan.roundInt(moveTmp.getTo().getX()) != toX
-                        || MathMan.roundInt(moveTmp.getTo().getZ()) != toZ) {
-                        dest = to;
-                    } else {
-                        dest = null;
-                    }
-                    if (dest != null) {
-                        if (passengers != null) {
-                            vehicle.eject();
-                            vehicle.setVelocity(new Vector(0d, 0d, 0d));
-                            vehicle.teleport(dest);
-                            passengers.forEach(vehicle::addPassenger);
-                        } else {
-                            vehicle.eject();
-                            vehicle.setVelocity(new Vector(0d, 0d, 0d));
-                            vehicle.teleport(dest);
-                            vehicle.setPassenger(player);
-                        }
-                        return;
-                    }
-                }
-                if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-                    switch (vehicle.getType()) {
-                        case BOAT:
-                        case ENDER_CRYSTAL:
-                        case MINECART:
-                        case MINECART_CHEST:
-                        case MINECART_COMMAND:
-                        case MINECART_FURNACE:
-                        case MINECART_HOPPER:
-                        case MINECART_MOB_SPAWNER:
-                        case MINECART_TNT: {
-                            List<MetadataValue> meta = vehicle.getMetadata("plot");
-                            Plot toPlot = BukkitUtil.getLocation(to).getPlot();
-                            if (!meta.isEmpty()) {
-                                Plot origin = (Plot) meta.get(0).value();
-                                if (!origin.getBasePlot(false).equals(toPlot)) {
-                                    vehicle.remove();
-                                }
-                            } else if (toPlot != null) {
-                                vehicle.setMetadata("plot",
-                                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, toPlot));
-                            }
-                        }
-                    }
-                }
-            }
-
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void playerMove(PlayerMoveEvent event) {
-        org.bukkit.Location from = event.getFrom();
-        org.bukkit.Location to = event.getTo();
-        int x2;
-        if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX()))) {
-            Player player = event.getPlayer();
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            // Cancel teleport
-            TaskManager.TELEPORT_QUEUE.remove(pp.getName());
-            // Set last location
-            Location loc = BukkitUtil.getLocation(to);
-            pp.setMeta(PlotPlayer.META_LOCATION, loc);
-            PlotArea area = loc.getPlotArea();
-            if (area == null) {
-                pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
-                return;
-            }
-            Plot now = area.getPlot(loc);
-            Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
-            if (now == null) {
-                if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
-                    .getMeta("kick", false)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    this.tmpTeleport = false;
-                    if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
-                        player.teleport(from);
-                    } else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    this.tmpTeleport = true;
-                    event.setCancelled(true);
-                    return;
-                }
-            } else if (now.equals(lastPlot)) {
-                ForceFieldListener.handleForcefield(player, pp, now);
-                return;
-            } else if (!plotEntry(pp, now) && this.tmpTeleport) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                this.tmpTeleport = false;
-                to.setX(from.getBlockX());
-                to.setY(from.getBlockY());
-                to.setZ(from.getBlockZ());
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                return;
-            }
-            Integer border = area.getBorder();
-            if (x2 > border && this.tmpTeleport) {
-                to.setX(x2 - 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
-                return;
-            }
-            if (x2 < -border && this.tmpTeleport) {
-                to.setX(x2 + 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
-                return;
-            }
-            return;
-        }
-        int z2;
-        if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ()))) {
-            Player player = event.getPlayer();
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            // Cancel teleport
-            TaskManager.TELEPORT_QUEUE.remove(pp.getName());
-            // Set last location
-            Location loc = BukkitUtil.getLocation(to);
-            pp.setMeta(PlotPlayer.META_LOCATION, loc);
-            PlotArea area = loc.getPlotArea();
-            if (area == null) {
-                pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
-                return;
-            }
-            Plot now = area.getPlot(loc);
-            Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
-            if (now == null) {
-                if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
-                    .getMeta("kick", false)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-                    this.tmpTeleport = false;
-                    if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
-                        player.teleport(from);
-                    } else {
-                        player.teleport(player.getWorld().getSpawnLocation());
-                    }
-                    this.tmpTeleport = true;
-                    event.setCancelled(true);
-                    return;
-                }
-            } else if (now.equals(lastPlot)) {
-                ForceFieldListener.handleForcefield(player, pp, now);
-                return;
-            } else if (!plotEntry(pp, now) && this.tmpTeleport) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-                this.tmpTeleport = false;
-                player.teleport(from);
-                to.setX(from.getBlockX());
-                to.setY(from.getBlockY());
-                to.setZ(from.getBlockZ());
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                return;
-            }
-            Integer border = area.getBorder();
-            if (z2 > border && this.tmpTeleport) {
-                to.setZ(z2 - 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
-            } else if (z2 < -border && this.tmpTeleport) {
-                to.setZ(z2 + 1);
-                this.tmpTeleport = false;
-                player.teleport(event.getTo());
-                this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOW) public void onChat(AsyncPlayerChatEvent event) {
-        if (event.isCancelled())
-            return;
-
-        PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
-        Location location = plotPlayer.getLocation();
-        PlotArea area = location.getPlotArea();
-        if (area == null || (area.PLOT_CHAT == plotPlayer.getAttribute("chat"))) {
-            return;
-        }
-        Plot plot = area.getPlot(location);
-        if (plot == null) {
-            return;
-        }
-        event.setCancelled(true);
-        String message = event.getMessage();
-        String format = C.PLOT_CHAT_FORMAT.s();
-        String sender = event.getPlayer().getDisplayName();
-        PlotId id = plot.getId();
-        Set<Player> recipients = event.getRecipients();
-        Set<Player> spies = new HashSet<>();
-        recipients.clear();
-        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-            PlotPlayer pp = entry.getValue();
-            if (pp.getAttribute("chatspy")) {
-                spies.add(((BukkitPlayer) pp).player);
-            } else {
-                Plot current = pp.getCurrentPlot();
-                if (current != null && current.getBasePlot(false).equals(plot)) {
-                    recipients.add(((BukkitPlayer) pp).player);
-                }
-            }
-        }
-        String partial = ChatColor.translateAlternateColorCodes('&',
-            format.replace("%plot_id%", id.x + ";" + id.y).replace("%sender%", sender));
-        if (plotPlayer.hasPermission("plots.chat.color")) {
-            message = C.color(message);
-        }
-        String full = partial.replace("%msg%", message);
-        for (Player receiver : recipients) {
-            receiver.sendMessage(full);
-        }
-        if (!spies.isEmpty()) {
-            String spyMessage = C.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
-                .replace("%sender%", sender).replace("%msg%", message);
-            for (Player player : spies) {
-                player.sendMessage(spyMessage);
-            }
-        }
-        PlotSquared.debug(full);
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST) public void blockDestroy(BlockBreakEvent event) {
-        Player player = event.getPlayer();
-        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getPlot(location);
-        if (plot != null) {
-            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-            if (event.getBlock().getY() == 0) {
-                if (!Permissions
-                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                        C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL);
-                    event.setCancelled(true);
-                    return;
-                }
-            } else if (
-                (location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
-                    && !Permissions
-                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
-                event.setCancelled(true);
-                MainUtil.sendMessage(plotPlayer,
-                    C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
-            }
-            if (!plot.hasOwner()) {
-                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    return;
-                }
-                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                    C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                event.setCancelled(true);
-                return;
-            }
-            if (!plot.isAdded(plotPlayer.getUUID())) {
-                Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
-                Block block = event.getBlock();
-                if (destroy.isPresent() && destroy.get()
-                    .contains(PlotBlock.get(block.getType().name()))) {
-                    return;
-                }
-                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    return;
-                }
-                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                    C.PERMISSION_ADMIN_DESTROY_OTHER);
-                event.setCancelled(true);
-            } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-                if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                        C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            return;
-        }
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-            return;
-        }
-        if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
-            if (player.getInventory().getItemInMainHand().getType() == Material
-                .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
-                return;
-            }
-        }
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-        event.setCancelled(true);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBigBoom(EntityExplodeEvent event) {
-        Location location = BukkitUtil.getLocation(event.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-                return;
-            }
-            Iterator<Block> iterator = event.blockList().iterator();
-            while (iterator.hasNext()) {
-                iterator.next();
-                if (location.getPlotArea() != null) {
-                    iterator.remove();
-                }
-            }
-            return;
-        }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot != null) {
-            if (Flags.EXPLOSION.isTrue(plot)) {
-                List<MetadataValue> meta = event.getEntity().getMetadata("plot");
-                Plot origin;
-                if (meta.isEmpty()) {
-                    origin = plot;
-                } else {
-                    origin = (Plot) meta.get(0).value();
-                }
-                if (this.lastRadius != 0) {
-                    List<Entity> nearby = event.getEntity()
-                        .getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
-                    for (Entity near : nearby) {
-                        if (near instanceof TNTPrimed || near.getType()
-                            .equals(EntityType.MINECART_TNT)) {
-                            if (!near.hasMetadata("plot")) {
-                                near.setMetadata("plot",
-                                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
-                            }
-                        }
-                    }
-                    this.lastRadius = 0;
-                }
-                Iterator<Block> iterator = event.blockList().iterator();
-                while (iterator.hasNext()) {
-                    Block block = iterator.next();
-                    location = BukkitUtil.getLocation(block.getLocation());
-                    if (!area.contains(location.getX(), location.getZ()) || !origin
-                        .equals(area.getOwnedPlot(location))) {
-                        iterator.remove();
-                    }
-                }
-                return;
-            }
-        }
-        event.setCancelled(true);
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWorldChanged(PlayerChangedWorldEvent event) {
-        Player player = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        // Delete last location
-        pp.deleteMeta(PlotPlayer.META_LOCATION);
-        Plot plot = (Plot) pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
-        if (plot != null) {
-            plotExit(pp, plot);
-        }
-        if (PlotSquared.get().worldedit != null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS)) {
-                if (pp.getAttribute("worldedit")) {
-                    pp.removeAttribute("worldedit");
-                }
-            }
-        }
-        if (Settings.Enabled_Components.PERMISSION_CACHE) {
-            pp.deleteMeta("perm");
-        }
-        Location loc = pp.getLocation();
+        PlotPlayer pp = PlotPlayer.wrap(player);
+        Location loc = BukkitUtil.getLocation(to);
         PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
         if (area == null) {
-            return;
+          return;
         }
-        plot = area.getPlot(loc);
+        Plot plot = area.getPlot(loc);
         if (plot != null) {
+          final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
+          if (!result) {
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+            event.setCancelled(true);
+            if (lastLoc != null) {
+              pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
+            }
+            if (lastPlot != null) {
+              pp.setMeta(PlotPlayer.META_LAST_PLOT, lastPlot);
+            }
+          } else {
             plotEntry(pp, plot);
+          }
         }
+      }
+      return;
     }
+    playerMove(event);
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPeskyMobsChangeTheWorldLikeWTFEvent(EntityChangeBlockEvent event) {
-        Entity e = event.getEntity();
-        if (!(e instanceof FallingBlock)) {
-            Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-            PlotArea area = location.getPlotArea();
-            if (area != null) {
-                Plot plot = area.getOwnedPlot(location);
-                if (plot != null && Flags.MOB_BREAK.isTrue(plot))
-                    return;
-                event.setCancelled(true);
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void vehicleMove(VehicleMoveEvent event) throws IllegalAccessException {
+    final org.bukkit.Location from = event.getFrom();
+    final org.bukkit.Location to = event.getTo();
+
+    int toX, toZ;
+    if ((toX = MathMan.roundInt(to.getX())) != MathMan.roundInt(from.getX())
+        | (toZ = MathMan.roundInt(to.getZ())) != MathMan.roundInt(from.getZ())) {
+      Vehicle vehicle = event.getVehicle();
+
+      // Check allowed
+      if (!vehicle.getPassengers().isEmpty()) {
+        Entity passenger = vehicle.getPassengers().get(0);
+
+        if (passenger instanceof Player) {
+          final Player player = (Player) passenger;
+          // reset
+          if (moveTmp == null) {
+            moveTmp = new PlayerMoveEvent(null, from, to);
+          }
+          moveTmp.setFrom(from);
+          moveTmp.setTo(to);
+          moveTmp.setCancelled(false);
+          fieldPlayer.set(moveTmp, player);
+
+          List<Entity> passengers = vehicle.getPassengers();
+
+          this.playerMove(moveTmp);
+          org.bukkit.Location dest;
+          if (moveTmp.isCancelled()) {
+            dest = from;
+          } else if (MathMan.roundInt(moveTmp.getTo().getX()) != toX
+              || MathMan.roundInt(moveTmp.getTo().getZ()) != toZ) {
+            dest = to;
+          } else {
+            dest = null;
+          }
+          if (dest != null) {
+            if (passengers != null) {
+              vehicle.eject();
+              vehicle.setVelocity(new Vector(0d, 0d, 0d));
+              vehicle.teleport(dest);
+              passengers.forEach(vehicle::addPassenger);
+            } else {
+              vehicle.eject();
+              vehicle.setVelocity(new Vector(0d, 0d, 0d));
+              vehicle.teleport(dest);
+              vehicle.addPassenger(player);
             }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onEntityBlockForm(EntityBlockFormEvent event) {
-        String world = event.getBlock().getWorld().getName();
-        if (!PlotSquared.get().hasPlotArea(world)) {
             return;
+          }
         }
-        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot == null) {
-            event.setCancelled(true);
-            return;
-        }
-        Entity entity = event.getEntity();
-        if (entity instanceof Player) {
-            Player player = (Player) entity;
-            if (!plot.hasOwner()) {
-                PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-                if (Flags.ICE_FORM.isTrue(plot)) {
-                    return;
+        if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+          switch (vehicle.getType()) {
+            case BOAT:
+            case ENDER_CRYSTAL:
+            case MINECART:
+            case MINECART_CHEST:
+            case MINECART_COMMAND:
+            case MINECART_FURNACE:
+            case MINECART_HOPPER:
+            case MINECART_MOB_SPAWNER:
+            case MINECART_TNT: {
+              List<MetadataValue> meta = vehicle.getMetadata("plot");
+              Plot toPlot = BukkitUtil.getLocation(to).getPlot();
+              if (!meta.isEmpty()) {
+                Plot origin = (Plot) meta.get(0).value();
+                if (!origin.getBasePlot(false).equals(toPlot)) {
+                  vehicle.remove();
                 }
-                event.setCancelled(true);
-                return;
+              } else if (toPlot != null) {
+                vehicle.setMetadata("plot",
+                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, toPlot));
+              }
             }
-            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-            if (!plot.isAdded(plotPlayer.getUUID())) {
-                if (Flags.ICE_FORM.isTrue(plot)) {
-                    return;
-                }
-                event.setCancelled(true);
-                return;
-            }
-            return;
+          }
         }
-        if (!Flags.ICE_FORM.isTrue(plot)) {
-            event.setCancelled(true);
+      }
+
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void playerMove(PlayerMoveEvent event) {
+    org.bukkit.Location from = event.getFrom();
+    org.bukkit.Location to = event.getTo();
+    int x2;
+    if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX()))) {
+      Player player = event.getPlayer();
+      PlotPlayer pp = BukkitUtil.getPlayer(player);
+      // Cancel teleport
+      TaskManager.TELEPORT_QUEUE.remove(pp.getName());
+      // Set last location
+      Location loc = BukkitUtil.getLocation(to);
+      pp.setMeta(PlotPlayer.META_LOCATION, loc);
+      PlotArea area = loc.getPlotArea();
+      if (area == null) {
+        pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
+        return;
+      }
+      Plot now = area.getPlot(loc);
+      Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
+      if (now == null) {
+        if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
+            .getMeta("kick", false)) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+          this.tmpTeleport = false;
+          if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
+            player.teleport(from);
+          } else {
+            player.teleport(player.getWorld().getSpawnLocation());
+          }
+          this.tmpTeleport = true;
+          event.setCancelled(true);
+          return;
         }
+      } else if (now.equals(lastPlot)) {
+        ForceFieldListener.handleForcefield(player, pp, now);
+        return;
+      } else if (!plotEntry(pp, now) && this.tmpTeleport) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+        this.tmpTeleport = false;
+        to.setX(from.getBlockX());
+        to.setY(from.getBlockY());
+        to.setZ(from.getBlockZ());
+        player.teleport(event.getTo());
+        this.tmpTeleport = true;
+        return;
+      }
+      int border = area.getBorder();
+      if (x2 > border && this.tmpTeleport) {
+        to.setX(x2 - 1);
+        this.tmpTeleport = false;
+        player.teleport(event.getTo());
+        this.tmpTeleport = true;
+        MainUtil.sendMessage(pp, C.BORDER);
+        return;
+      }
+      if (x2 < -border && this.tmpTeleport) {
+        to.setX(x2 + 1);
+        this.tmpTeleport = false;
+        player.teleport(event.getTo());
+        this.tmpTeleport = true;
+        MainUtil.sendMessage(pp, C.BORDER);
+        return;
+      }
+      return;
+    }
+    int z2;
+    if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ()))) {
+      Player player = event.getPlayer();
+      PlotPlayer pp = BukkitUtil.getPlayer(player);
+      // Cancel teleport
+      TaskManager.TELEPORT_QUEUE.remove(pp.getName());
+      // Set last location
+      Location loc = BukkitUtil.getLocation(to);
+      pp.setMeta(PlotPlayer.META_LOCATION, loc);
+      PlotArea area = loc.getPlotArea();
+      if (area == null) {
+        pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
+        return;
+      }
+      Plot now = area.getPlot(loc);
+      Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
+      if (now == null) {
+        if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
+            .getMeta("kick", false)) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+          this.tmpTeleport = false;
+          if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
+            player.teleport(from);
+          } else {
+            player.teleport(player.getWorld().getSpawnLocation());
+          }
+          this.tmpTeleport = true;
+          event.setCancelled(true);
+          return;
+        }
+      } else if (now.equals(lastPlot)) {
+        ForceFieldListener.handleForcefield(player, pp, now);
+        return;
+      } else if (!plotEntry(pp, now) && this.tmpTeleport) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+        this.tmpTeleport = false;
+        player.teleport(from);
+        to.setX(from.getBlockX());
+        to.setY(from.getBlockY());
+        to.setZ(from.getBlockZ());
+        player.teleport(event.getTo());
+        this.tmpTeleport = true;
+        return;
+      }
+      int border = area.getBorder();
+      if (z2 > border && this.tmpTeleport) {
+        to.setZ(z2 - 1);
+        this.tmpTeleport = false;
+        player.teleport(event.getTo());
+        this.tmpTeleport = true;
+        MainUtil.sendMessage(pp, C.BORDER);
+      } else if (z2 < -border && this.tmpTeleport) {
+        to.setZ(z2 + 1);
+        this.tmpTeleport = false;
+        player.teleport(event.getTo());
+        this.tmpTeleport = true;
+        MainUtil.sendMessage(pp, C.BORDER);
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.LOW)
+  public void onChat(AsyncPlayerChatEvent event) {
+    if (event.isCancelled()) {
+      return;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockSpread(BlockSpreadEvent event) {
+    PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
+    Location location = plotPlayer.getLocation();
+    PlotArea area = location.getPlotArea();
+    if (area == null || (area.PLOT_CHAT == plotPlayer.getAttribute("chat"))) {
+      return;
+    }
+    Plot plot = area.getPlot(location);
+    if (plot == null) {
+      return;
+    }
+    event.setCancelled(true);
+    String message = event.getMessage();
+    String format = C.PLOT_CHAT_FORMAT.s();
+    String sender = event.getPlayer().getDisplayName();
+    PlotId id = plot.getId();
+    Set<Player> recipients = event.getRecipients();
+    Set<Player> spies = new HashSet<>();
+    recipients.clear();
+    for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+      PlotPlayer pp = entry.getValue();
+      if (pp.getAttribute("chatspy")) {
+        spies.add(((BukkitPlayer) pp).player);
+      } else {
+        Plot current = pp.getCurrentPlot();
+        if (current != null && current.getBasePlot(false).equals(plot)) {
+          recipients.add(((BukkitPlayer) pp).player);
+        }
+      }
+    }
+    String partial = ChatColor.translateAlternateColorCodes('&',
+        format.replace("%plot_id%", id.x + ";" + id.y).replace("%sender%", sender));
+    if (plotPlayer.hasPermission("plots.chat.color")) {
+      message = C.color(message);
+    }
+    String full = partial.replace("%msg%", message);
+    for (Player receiver : recipients) {
+      receiver.sendMessage(full);
+    }
+    if (!spies.isEmpty()) {
+      String spyMessage = C.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
+          .replace("%sender%", sender).replace("%msg%", message);
+      for (Player player : spies) {
+        player.sendMessage(spyMessage);
+      }
+    }
+    PlotSquared.debug(full);
+  }
+
+  @EventHandler(priority = EventPriority.LOWEST)
+  public void blockDestroy(BlockBreakEvent event) {
+    Player player = event.getPlayer();
+    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getPlot(location);
+    if (plot != null) {
+      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+      if (event.getBlock().getY() == 0) {
+        if (!Permissions
+            .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
+          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+              C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL);
+          event.setCancelled(true);
+          return;
+        }
+      } else if (
+          (location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
+              && !Permissions
+              .hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+        event.setCancelled(true);
+        MainUtil.sendMessage(plotPlayer,
+            C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+      }
+      if (!plot.hasOwner()) {
+        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+          return;
+        }
+        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+            C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+        event.setCancelled(true);
+        return;
+      }
+      if (!plot.isAdded(plotPlayer.getUUID())) {
+        Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
         Block block = event.getBlock();
-        Location location = BukkitUtil.getLocation(block.getLocation());
-        if (location.isPlotRoad()) {
-            event.setCancelled(true);
-            return;
+        if (destroy.isPresent() && destroy.get()
+            .contains(PlotBlock.get(block.getType().name()))) {
+          return;
         }
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
+        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+          return;
         }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot == null) {
-            return;
-        }
-        switch (event.getSource().getType()) {
-            case GRASS:
-                if (Flags.GRASS_GROW.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                break;
-            case MYCELIUM:
-                if (Flags.MYCEL_GROW.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                break;
-            case VINE:
-                if (Flags.VINE_GROW.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                break;
+        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+            C.PERMISSION_ADMIN_DESTROY_OTHER);
+        event.setCancelled(true);
+      } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+        if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+              C.PERMISSION_ADMIN_BUILD_OTHER);
+          event.setCancelled(true);
+          return;
         }
+      }
+      return;
     }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockForm(BlockFormEvent event) {
-        Block block = event.getBlock();
-        Location location = BukkitUtil.getLocation(block.getLocation());
-        if (location.isPlotRoad()) {
-            event.setCancelled(true);
-            return;
-        }
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot == null) {
-            return;
-        }
-        switch (event.getNewState().getType()) {
-            case SNOW:
-            case SNOW_BLOCK:
-                if (Flags.SNOW_FORM.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                return;
-            case ICE:
-            case FROSTED_ICE:
-            case PACKED_ICE:
-                if (Flags.ICE_FORM.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                return;
-            case STONE:
-            case OBSIDIAN:
-            case COBBLESTONE:
-                // TODO event ?
-                return;
-        }
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+      return;
     }
+    if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
+      if (player.getInventory().getItemInMainHand().getType() == Material
+          .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
+        return;
+      }
+    }
+    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+    event.setCancelled(true);
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockDamage(BlockDamageEvent event) {
-        Player player = event.getPlayer();
-        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-        if (player == null) {
-            if (location.isPlotRoad()) {
-                event.setCancelled(true);
-                return;
-            }
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBigBoom(EntityExplodeEvent event) {
+    Location location = BukkitUtil.getLocation(event.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        return;
+      }
+      Iterator<Block> iterator = event.blockList().iterator();
+      while (iterator.hasNext()) {
+        iterator.next();
+        if (location.getPlotArea() != null) {
+          iterator.remove();
         }
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
+      }
+      return;
+    }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot != null) {
+      if (Flags.EXPLOSION.isTrue(plot)) {
+        List<MetadataValue> meta = event.getEntity().getMetadata("plot");
+        Plot origin;
+        if (meta.isEmpty()) {
+          origin = plot;
+        } else {
+          origin = (Plot) meta.get(0).value();
         }
-        Plot plot = area.getPlot(location);
-        if (plot != null) {
-            if (location.getY() == 0) {
-                event.setCancelled(true);
-                return;
+        if (this.lastRadius != 0) {
+          List<Entity> nearby = event.getEntity()
+              .getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
+          for (Entity near : nearby) {
+            if (near instanceof TNTPrimed || near.getType()
+                .equals(EntityType.MINECART_TNT)) {
+              if (!near.hasMetadata("plot")) {
+                near.setMetadata("plot",
+                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+              }
             }
-            if (!plot.hasOwner()) {
-                PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    return;
-                }
-                event.setCancelled(true);
-                return;
-            }
-            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-            if (!plot.isAdded(plotPlayer.getUUID())) {
-                Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
-                Block block = event.getBlock();
-                if (destroy.isPresent() && destroy.get()
-                    .contains(PlotBlock.get(block.getType().name())) || Permissions
-                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    return;
-                }
-                event.setCancelled(true);
-                return;
-            }
-            return;
+          }
+          this.lastRadius = 0;
         }
-        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-            return;
+        Iterator<Block> iterator = event.blockList().iterator();
+        while (iterator.hasNext()) {
+          Block block = iterator.next();
+          location = BukkitUtil.getLocation(block.getLocation());
+          if (!area.contains(location.getX(), location.getZ()) || !origin
+              .equals(area.getOwnedPlot(location))) {
+            iterator.remove();
+          }
+        }
+        return;
+      }
+    }
+    event.setCancelled(true);
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onWorldChanged(PlayerChangedWorldEvent event) {
+    Player player = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    // Delete last location
+    pp.deleteMeta(PlotPlayer.META_LOCATION);
+    Plot plot = (Plot) pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
+    if (plot != null) {
+      plotExit(pp, plot);
+    }
+    if (PlotSquared.get().worldedit != null) {
+      if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS)) {
+        if (pp.getAttribute("worldedit")) {
+          pp.removeAttribute("worldedit");
+        }
+      }
+    }
+    if (Settings.Enabled_Components.PERMISSION_CACHE) {
+      pp.deleteMeta("perm");
+    }
+    Location loc = pp.getLocation();
+    PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
+    if (area == null) {
+      return;
+    }
+    plot = area.getPlot(loc);
+    if (plot != null) {
+      plotEntry(pp, plot);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onPeskyMobsChangeTheWorldLikeWTFEvent(EntityChangeBlockEvent event) {
+    Entity e = event.getEntity();
+    if (!(e instanceof FallingBlock)) {
+      Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+      PlotArea area = location.getPlotArea();
+      if (area != null) {
+        Plot plot = area.getOwnedPlot(location);
+        if (plot != null && Flags.MOB_BREAK.isTrue(plot)) {
+          return;
         }
         event.setCancelled(true);
+      }
     }
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onFade(BlockFadeEvent event) {
-        Block b = event.getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot == null) {
-            event.setCancelled(true);
-            return;
-        }
-        switch (b.getType()) {
-            case ICE:
-                if (Flags.ICE_MELT.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                break;
-            case SNOW:
-                if (Flags.SNOW_MELT.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                break;
-            case FARMLAND:
-                if (Flags.SOIL_DRY.isFalse(plot)) {
-                    event.setCancelled(true);
-                }
-                break;
-        }
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onEntityBlockForm(EntityBlockFormEvent event) {
+    String world = event.getBlock().getWorld().getName();
+    if (!PlotSquared.get().hasPlotArea(world)) {
+      return;
     }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onChange(BlockFromToEvent event) {
-        Block from = event.getBlock();
-        Block to = event.getToBlock();
-        Location tLocation = BukkitUtil.getLocation(to.getLocation());
-        PlotArea area = tLocation.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getOwnedPlot(tLocation);
-        Location fLocation = BukkitUtil.getLocation(from.getLocation());
-        if (plot != null) {
-            if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
-                event.setCancelled(true);
-                return;
-            } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
-                .equals(plot, area.getOwnedPlot(fLocation))) {
-                event.setCancelled(true);
-                return;
-            }
-            if (Flags.LIQUID_FLOW.isFalse(plot)) {
-                switch (to.getType()) {
-                    case WATER:
-                    case LAVA:
-                        event.setCancelled(true);
-                }
-            }
-        } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
-            .equals(null, area.getOwnedPlot(fLocation))) {
-            event.setCancelled(true);
-        }
+    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
     }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onGrow(BlockGrowEvent event) {
-        Block b = event.getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
-        if (location.isUnownedPlotArea()) {
-            event.setCancelled(true);
-        }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot == null) {
+      event.setCancelled(true);
+      return;
     }
+    Entity entity = event.getEntity();
+    if (entity instanceof Player) {
+      Player player = (Player) entity;
+      if (!plot.hasOwner()) {
+        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+        if (Flags.ICE_FORM.isTrue(plot)) {
+          return;
+        }
+        event.setCancelled(true);
+        return;
+      }
+      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+      if (!plot.isAdded(plotPlayer.getUUID())) {
+        if (Flags.ICE_FORM.isTrue(plot)) {
+          return;
+        }
+        event.setCancelled(true);
+        return;
+      }
+      return;
+    }
+    if (!Flags.ICE_FORM.isTrue(plot)) {
+      event.setCancelled(true);
+    }
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockSpread(BlockSpreadEvent event) {
+    Block block = event.getBlock();
+    Location location = BukkitUtil.getLocation(block.getLocation());
+    if (location.isPlotRoad()) {
+      event.setCancelled(true);
+      return;
+    }
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot == null) {
+      return;
+    }
+    switch (event.getSource().getType()) {
+      case GRASS:
+        if (Flags.GRASS_GROW.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        break;
+      case MYCELIUM:
+        if (Flags.MYCEL_GROW.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        break;
+      case VINE:
+        if (Flags.VINE_GROW.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        break;
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockForm(BlockFormEvent event) {
+    Block block = event.getBlock();
+    Location location = BukkitUtil.getLocation(block.getLocation());
+    if (location.isPlotRoad()) {
+      event.setCancelled(true);
+      return;
+    }
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot == null) {
+      return;
+    }
+    switch (event.getNewState().getType()) {
+      case SNOW:
+      case SNOW_BLOCK:
+        if (Flags.SNOW_FORM.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        return;
+      case ICE:
+      case FROSTED_ICE:
+      case PACKED_ICE:
+        if (Flags.ICE_FORM.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        return;
+      case STONE:
+      case OBSIDIAN:
+      case COBBLESTONE:
+        // TODO event ?
+        return;
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockDamage(BlockDamageEvent event) {
+    Player player = event.getPlayer();
+    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+    if (player == null) {
+      if (location.isPlotRoad()) {
+        event.setCancelled(true);
+        return;
+      }
+    }
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getPlot(location);
+    if (plot != null) {
+      if (location.getY() == 0) {
+        event.setCancelled(true);
+        return;
+      }
+      if (!plot.hasOwner()) {
+        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+          return;
+        }
+        event.setCancelled(true);
+        return;
+      }
+      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+      if (!plot.isAdded(plotPlayer.getUUID())) {
+        Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
         Block block = event.getBlock();
-        Location location = BukkitUtil.getLocation(block.getLocation());
-        BlockFace face = event.getDirection();
-        Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-                return;
-            }
-            for (Block b : event.getBlocks()) {
-                if (BukkitUtil.getLocation(b.getLocation().add(relative)).getPlotArea() != null) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            return;
-        }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot == null) {
-            event.setCancelled(true);
-            return;
-        }
-        List<Block> blocks = event.getBlocks();
-        for (Block b : blocks) {
-            Location bloc = BukkitUtil.getLocation(b.getLocation());
-            if (!area.contains(bloc.getX(), bloc.getZ()) || !area
-                .contains(bloc.getX() + relative.getBlockX(), bloc.getZ() + relative.getBlockZ())) {
-                event.setCancelled(true);
-                return;
-            }
-            if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(
-                bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) {
-                event.setCancelled(true);
-                return;
-            }
+        if (destroy.isPresent() && destroy.get()
+            .contains(PlotBlock.get(block.getType().name())) || Permissions
+            .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+          return;
         }
+        event.setCancelled(true);
+        return;
+      }
+      return;
     }
+    PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+    if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+      return;
+    }
+    event.setCancelled(true);
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        Block block = event.getBlock();
-        Location location = BukkitUtil.getLocation(block.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-                return;
-            }
-            if (this.pistonBlocks) {
-                try {
-                    for (Block pulled : event.getBlocks()) {
-                        location = BukkitUtil.getLocation(pulled.getLocation());
-                        if (location.getPlotArea() != null) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                } catch (Throwable ignored) {
-                    this.pistonBlocks = false;
-                }
-            }
-            if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
-                BlockFace dir = event.getDirection();
-                location = BukkitUtil.getLocation(block.getLocation()
-                    .add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
-                if (location.getPlotArea() != null) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            return;
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onFade(BlockFadeEvent event) {
+    Block b = event.getBlock();
+    Location location = BukkitUtil.getLocation(b.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot == null) {
+      event.setCancelled(true);
+      return;
+    }
+    switch (b.getType()) {
+      case ICE:
+        if (Flags.ICE_MELT.isFalse(plot)) {
+          event.setCancelled(true);
         }
-        Plot plot = area.getOwnedPlot(location);
+        break;
+      case SNOW:
+        if (Flags.SNOW_MELT.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        break;
+      case FARMLAND:
+        if (Flags.SOIL_DRY.isFalse(plot)) {
+          event.setCancelled(true);
+        }
+        break;
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onChange(BlockFromToEvent event) {
+    Block from = event.getBlock();
+    Block to = event.getToBlock();
+    Location tLocation = BukkitUtil.getLocation(to.getLocation());
+    PlotArea area = tLocation.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlot(tLocation);
+    Location fLocation = BukkitUtil.getLocation(from.getLocation());
+    if (plot != null) {
+      if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
+        event.setCancelled(true);
+        return;
+      } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
+          .equals(plot, area.getOwnedPlot(fLocation))) {
+        event.setCancelled(true);
+        return;
+      }
+      if (Flags.LIQUID_FLOW.isFalse(plot)) {
+        switch (to.getType()) {
+          case WATER:
+          case LAVA:
+            event.setCancelled(true);
+        }
+      }
+    } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
+        .equals(null, area.getOwnedPlot(fLocation))) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onGrow(BlockGrowEvent event) {
+    Block b = event.getBlock();
+    Location location = BukkitUtil.getLocation(b.getLocation());
+    if (location.isUnownedPlotArea()) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+    Block block = event.getBlock();
+    Location location = BukkitUtil.getLocation(block.getLocation());
+    BlockFace face = event.getDirection();
+    Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        return;
+      }
+      for (Block b : event.getBlocks()) {
+        if (BukkitUtil.getLocation(b.getLocation().add(relative)).getPlotArea() != null) {
+          event.setCancelled(true);
+          return;
+        }
+      }
+      return;
+    }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot == null) {
+      event.setCancelled(true);
+      return;
+    }
+    List<Block> blocks = event.getBlocks();
+    for (Block b : blocks) {
+      Location bloc = BukkitUtil.getLocation(b.getLocation());
+      if (!area.contains(bloc.getX(), bloc.getZ()) || !area
+          .contains(bloc.getX() + relative.getBlockX(), bloc.getZ() + relative.getBlockZ())) {
+        event.setCancelled(true);
+        return;
+      }
+      if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(
+          bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) {
+        event.setCancelled(true);
+        return;
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+    Block block = event.getBlock();
+    Location location = BukkitUtil.getLocation(block.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+        return;
+      }
+      if (this.pistonBlocks) {
+        try {
+          for (Block pulled : event.getBlocks()) {
+            location = BukkitUtil.getLocation(pulled.getLocation());
+            if (location.getPlotArea() != null) {
+              event.setCancelled(true);
+              return;
+            }
+          }
+        } catch (Throwable ignored) {
+          this.pistonBlocks = false;
+        }
+      }
+      if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
         BlockFace dir = event.getDirection();
-        //        Location head = location.add(-dir.getModX(), -dir.getModY(), -dir.getModZ());
-        //
-        //        if (!Objects.equals(plot, area.getOwnedPlot(head))) {
-        //            // FIXME: cancelling the event doesn't work here. See issue #1484
-        //            event.setCancelled(true);
-        //            return;
-        //        }
-        if (this.pistonBlocks) {
-            try {
-                for (Block pulled : event.getBlocks()) {
-                    Location from = BukkitUtil.getLocation(
-                        pulled.getLocation().add(dir.getModX(), dir.getModY(), dir.getModZ()));
-                    Location to = BukkitUtil.getLocation(pulled.getLocation());
-                    if (!area.contains(to.getX(), to.getZ())) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                    Plot fromPlot = area.getOwnedPlot(from);
-                    Plot toPlot = area.getOwnedPlot(to);
-                    if (!Objects.equals(fromPlot, toPlot)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            } catch (Throwable ignored) {
-                this.pistonBlocks = false;
-            }
-        }
-        if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
-            location = BukkitUtil.getLocation(
-                block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
-            if (!area.contains(location)) {
-                event.setCancelled(true);
-                return;
-            }
-            Plot newPlot = area.getOwnedPlot(location);
-            if (!Objects.equals(plot, newPlot)) {
-                event.setCancelled(true);
-            }
+        location = BukkitUtil.getLocation(block.getLocation()
+            .add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
+        if (location.getPlotArea() != null) {
+          event.setCancelled(true);
+          return;
         }
+      }
+      return;
     }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockDispense(BlockDispenseEvent event) {
-        Material type = event.getItem().getType();
-        switch (type) {
-            case WATER_BUCKET:
-            case LAVA_BUCKET: {
-                if (event.getBlock().getType() == Material.DROPPER)
-                    return;
-                BlockFace targetFace =
-                    ((org.bukkit.material.Dispenser) event.getBlock().getState().getData())
-                        .getFacing();
-                Location location =
-                    BukkitUtil.getLocation(event.getBlock().getRelative(targetFace).getLocation());
-                if (location.isPlotRoad()) {
-                    event.setCancelled(true);
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onStructureGrow(StructureGrowEvent event) {
-        if (!PlotSquared.get().hasPlotArea(event.getWorld().getName())) {
-            return;
-        }
-        List<BlockState> blocks = event.getBlocks();
-        if (blocks.isEmpty()) {
-            return;
-        }
-        Location location = BukkitUtil.getLocation(blocks.get(0).getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            for (int i = blocks.size() - 1; i >= 0; i--) {
-                location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-                if (location.getPlotArea() != null) {
-                    blocks.remove(i);
-                }
-            }
-            return;
-        } else {
-            Plot origin = area.getOwnedPlot(location);
-            if (origin == null) {
-                event.setCancelled(true);
-                return;
-            }
-            for (int i = blocks.size() - 1; i >= 0; i--) {
-                location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-                if (!area.contains(location.getX(), location.getZ())) {
-                    blocks.remove(i);
-                    continue;
-                }
-                Plot plot = area.getOwnedPlot(location);
-                if (!Objects.equals(plot, origin)) {
-                    event.getBlocks().remove(i);
-                }
-            }
-        }
-        Plot origin = area.getPlot(location);
-        if (origin == null) {
+    Plot plot = area.getOwnedPlot(location);
+    BlockFace dir = event.getDirection();
+    //        Location head = location.add(-dir.getModX(), -dir.getModY(), -dir.getModZ());
+    //
+    //        if (!Objects.equals(plot, area.getOwnedPlot(head))) {
+    //            // FIXME: cancelling the event doesn't work here. See issue #1484
+    //            event.setCancelled(true);
+    //            return;
+    //        }
+    if (this.pistonBlocks) {
+      try {
+        for (Block pulled : event.getBlocks()) {
+          Location from = BukkitUtil.getLocation(
+              pulled.getLocation().add(dir.getModX(), dir.getModY(), dir.getModZ()));
+          Location to = BukkitUtil.getLocation(pulled.getLocation());
+          if (!area.contains(to.getX(), to.getZ())) {
             event.setCancelled(true);
             return;
+          }
+          Plot fromPlot = area.getOwnedPlot(from);
+          Plot toPlot = area.getOwnedPlot(to);
+          if (!Objects.equals(fromPlot, toPlot)) {
+            event.setCancelled(true);
+            return;
+          }
         }
-        for (int i = blocks.size() - 1; i >= 0; i--) {
-            location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-            Plot plot = area.getOwnedPlot(location);
-            /*
-             * plot -> the base plot of the merged area
-             * origin -> the plot where the event gets called
-             */
-
-            // Are plot and origin not the same AND are both plots merged
-            if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) {
-                event.getBlocks().remove(i);
-            }
-        }
+      } catch (Throwable ignored) {
+        this.pistonBlocks = false;
+      }
     }
+    if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
+      location = BukkitUtil.getLocation(
+          block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
+      if (!area.contains(location)) {
+        event.setCancelled(true);
+        return;
+      }
+      Plot newPlot = area.getOwnedPlot(location);
+      if (!Objects.equals(plot, newPlot)) {
+        event.setCancelled(true);
+      }
+    }
+  }
 
-    @SuppressWarnings("deprecation")
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInventoryClick(InventoryClickEvent event) {
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockDispense(BlockDispenseEvent event) {
+    Material type = event.getItem().getType();
+    switch (type) {
+      case WATER_BUCKET:
+      case LAVA_BUCKET: {
+        if (event.getBlock().getType() == Material.DROPPER) {
+          return;
+        }
+        BlockFace targetFace =
+            ((Directional) event.getBlock().getState().getData()).getFacing();
+        Location location =
+            BukkitUtil.getLocation(event.getBlock().getRelative(targetFace).getLocation());
+        if (location.isPlotRoad()) {
+          event.setCancelled(true);
+        }
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onStructureGrow(StructureGrowEvent event) {
+    if (!PlotSquared.get().hasPlotArea(event.getWorld().getName())) {
+      return;
+    }
+    List<BlockState> blocks = event.getBlocks();
+    if (blocks.isEmpty()) {
+      return;
+    }
+    Location location = BukkitUtil.getLocation(blocks.get(0).getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      for (int i = blocks.size() - 1; i >= 0; i--) {
+        location = BukkitUtil.getLocation(blocks.get(i).getLocation());
+        if (location.getPlotArea() != null) {
+          blocks.remove(i);
+        }
+      }
+      return;
+    } else {
+      Plot origin = area.getOwnedPlot(location);
+      if (origin == null) {
+        event.setCancelled(true);
+        return;
+      }
+      for (int i = blocks.size() - 1; i >= 0; i--) {
+        location = BukkitUtil.getLocation(blocks.get(i).getLocation());
+        if (!area.contains(location.getX(), location.getZ())) {
+          blocks.remove(i);
+          continue;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (!Objects.equals(plot, origin)) {
+          event.getBlocks().remove(i);
+        }
+      }
+    }
+    Plot origin = area.getPlot(location);
+    if (origin == null) {
+      event.setCancelled(true);
+      return;
+    }
+    for (int i = blocks.size() - 1; i >= 0; i--) {
+      location = BukkitUtil.getLocation(blocks.get(i).getLocation());
+      Plot plot = area.getOwnedPlot(location);
+      /*
+       * plot -> the base plot of the merged area
+       * origin -> the plot where the event gets called
+       */
+
+      // Are plot and origin not the same AND are both plots merged
+      if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) {
+        event.getBlocks().remove(i);
+      }
+    }
+  }
+
+  @SuppressWarnings("deprecation")
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onInventoryClick(InventoryClickEvent event) {
         /*if (!event.isLeftClick() || (event.getAction() != InventoryAction.PLACE_ALL) || event
             .isShiftClick()) {
             return;
         }*/
-        HumanEntity entity = event.getWhoClicked();
-        if (!(entity instanceof Player) || !PlotSquared.get()
-            .hasPlotArea(entity.getWorld().getName())) {
-            return;
-        }
+    HumanEntity entity = event.getWhoClicked();
+    if (!(entity instanceof Player) || !PlotSquared.get()
+        .hasPlotArea(entity.getWorld().getName())) {
+      return;
+    }
 
-        HumanEntity clicker = event.getWhoClicked();
-        if (!(clicker instanceof Player)) {
-            return;
+    HumanEntity clicker = event.getWhoClicked();
+    if (!(clicker instanceof Player)) {
+      return;
+    }
+    Player player = (Player) clicker;
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    final PlotInventory inventory = PlotInventory.getOpenPlotInventory(pp);
+    if (inventory != null && event.getRawSlot() == event.getSlot()) {
+      if (!inventory.onClick(event.getSlot())) {
+        event.setResult(Event.Result.DENY);
+        event.setCancelled(true);
+        inventory.close();
+      }
+    }
+    PlayerInventory inv = player.getInventory();
+    int slot = inv.getHeldItemSlot();
+    if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) {
+      return;
+    }
+    ItemStack current = inv.getItemInHand();
+    ItemStack newItem = event.getCursor();
+    ItemMeta newMeta = newItem.getItemMeta();
+    ItemMeta oldMeta = newItem.getItemMeta();
+    String newLore = "";
+    if (newMeta != null) {
+      List<String> lore = newMeta.getLore();
+      if (lore != null) {
+        newLore = lore.toString();
+      }
+    }
+    String oldLore = "";
+    if (oldMeta != null) {
+      List<String> lore = oldMeta.getLore();
+      if (lore != null) {
+        oldLore = lore.toString();
+      }
+    }
+    if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) {
+      switch (newItem.getType()) {
+        case LEGACY_BANNER:
+        case PLAYER_HEAD:
+          if (newMeta != null) {
+            break;
+          }
+        default:
+          return;
+      }
+    }
+    Block block = player.getTargetBlock(null, 7);
+    BlockState state = block.getState();
+    if (state == null) {
+      return;
+    }
+    Material stateType = state.getType();
+    Material itemType = newItem.getType();
+    if (stateType != itemType) {
+      switch (stateType) {
+        case LEGACY_STANDING_BANNER:
+        case LEGACY_WALL_BANNER:
+          if (itemType == Material.LEGACY_BANNER) {
+            break;
+          }
+        case LEGACY_SKULL:
+          if (itemType == Material.LEGACY_SKULL_ITEM) {
+            break;
+          }
+        default:
+          return;
+      }
+    }
+    Location l = BukkitUtil.getLocation(state.getLocation());
+    PlotArea area = l.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getPlotAbs(l);
+    boolean cancelled = false;
+    if (plot == null) {
+      if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
+        cancelled = true;
+      }
+    } else if (!plot.hasOwner()) {
+      if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+        cancelled = true;
+      }
+    } else {
+      UUID uuid = pp.getUUID();
+      if (!plot.isAdded(uuid)) {
+        if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
+          cancelled = true;
         }
-        Player player = (Player) clicker;
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        final PlotInventory inventory = PlotInventory.getOpenPlotInventory(pp);
-        if (inventory != null && event.getRawSlot() == event.getSlot()) {
-            if (!inventory.onClick(event.getSlot())) {
-                event.setResult(Event.Result.DENY);
-                event.setCancelled(true);
-                inventory.close();
+      }
+    }
+    if (cancelled) {
+      if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem
+          .getDurability())) {
+        event.setCursor(
+            new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
+        event.setCancelled(true);
+        return;
+      }
+      event.setCursor(
+          new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onPotionSplash(LingeringPotionSplashEvent event) {
+    LingeringPotion entity = event.getEntity();
+    Location l = BukkitUtil.getLocation(entity);
+    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+      return;
+    }
+    if (!this.onProjectileHit(event)) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onInteract(PlayerInteractAtEntityEvent e) {
+    Entity entity = e.getRightClicked();
+    if (!(entity instanceof ArmorStand)) {
+      return;
+    }
+    Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
+    PlotArea area = l.getPlotArea();
+    if (area == null) {
+      return;
+    }
+
+    EntitySpawnListener.test(entity);
+
+    Plot plot = area.getPlotAbs(l);
+    PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
+    if (plot == null) {
+      if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
+        e.setCancelled(true);
+      }
+    } else if (!plot.hasOwner()) {
+      if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+        e.setCancelled(true);
+      }
+    } else {
+      UUID uuid = pp.getUUID();
+      if (!plot.isAdded(uuid)) {
+        if (Flags.MISC_INTERACT.isTrue(plot)) {
+          return;
+        }
+        if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
+          e.setCancelled(true);
+        }
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBigBoom(BlockExplodeEvent event) {
+    Block block = event.getBlock();
+    Location location = BukkitUtil.getLocation(block.getLocation());
+    String world = location.getWorld();
+    if (!PlotSquared.get().hasPlotArea(world)) {
+      return;
+    }
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      Iterator<Block> iterator = event.blockList().iterator();
+      while (iterator.hasNext()) {
+        location = BukkitUtil.getLocation(iterator.next().getLocation());
+        if (location.getPlotArea() != null) {
+          iterator.remove();
+        }
+      }
+      return;
+    }
+    Plot plot = area.getOwnedPlot(location);
+    if (plot == null || !plot.getFlag(Flags.EXPLOSION).orElse(false)) {
+      event.setCancelled(true);
+    }
+    event.blockList().removeIf(
+        b -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(b.getLocation()))));
+  }
+
+  @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+  public void onInteract(PlayerInteractEvent event) {
+    Player player = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    PlotArea area = pp.getPlotAreaAbs();
+    if (area == null) {
+      return;
+    }
+    PlayerBlockEventType eventType = null;
+    BukkitLazyBlock lb;
+    Location location;
+    Action action = event.getAction();
+    switch (action) {
+      case PHYSICAL: {
+        eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
+        Block block = event.getClickedBlock();
+        lb = new BukkitLazyBlock(block);
+        location = BukkitUtil.getLocation(block.getLocation());
+        break;
+      }
+      case RIGHT_CLICK_BLOCK: {
+        Block block = event.getClickedBlock();
+        location = BukkitUtil.getLocation(block.getLocation());
+        Material blockType = block.getType();
+        switch (blockType) {
+          case ACACIA_DOOR:
+          case BIRCH_DOOR:
+          case DARK_OAK_DOOR:
+          case IRON_DOOR:
+          case JUNGLE_DOOR:
+          case OAK_DOOR:
+          case SPRUCE_DOOR:
+
+          case ACACIA_TRAPDOOR:
+          case BIRCH_TRAPDOOR:
+          case DARK_OAK_TRAPDOOR:
+          case IRON_TRAPDOOR:
+          case JUNGLE_TRAPDOOR:
+          case OAK_TRAPDOOR:
+          case SPRUCE_TRAPDOOR:
+
+          case CHEST:
+          case ENDER_CHEST:
+          case TRAPPED_CHEST:
+
+          case ACACIA_FENCE_GATE:
+          case BIRCH_FENCE_GATE:
+          case DARK_OAK_FENCE_GATE:
+          case OAK_FENCE_GATE:
+          case JUNGLE_FENCE_GATE:
+          case SPRUCE_FENCE_GATE:
+
+          case ACACIA_BUTTON:
+          case BIRCH_BUTTON:
+          case DARK_OAK_BUTTON:
+          case JUNGLE_BUTTON:
+          case OAK_BUTTON:
+          case SPRUCE_BUTTON:
+          case STONE_BUTTON:
+
+          case BLACK_BED:
+          case BLUE_BED:
+          case BROWN_BED:
+          case CYAN_BED:
+          case GRAY_BED:
+          case GREEN_BED:
+          case LIGHT_BLUE_BED:
+          case LIGHT_GRAY_BED:
+          case LIME_BED:
+          case MAGENTA_BED:
+          case ORANGE_BED:
+          case PINK_BED:
+          case PURPLE_BED:
+          case RED_BED:
+          case WHITE_BED:
+          case YELLOW_BED:
+
+          case BLACK_BANNER:
+          case BLACK_WALL_BANNER:
+          case BLUE_BANNER:
+          case BLUE_WALL_BANNER:
+          case BROWN_BANNER:
+          case BROWN_WALL_BANNER:
+          case CYAN_BANNER:
+          case CYAN_WALL_BANNER:
+          case GRAY_BANNER:
+          case GRAY_WALL_BANNER:
+          case GREEN_BANNER:
+          case GREEN_WALL_BANNER:
+          case LIGHT_BLUE_BANNER:
+          case LIGHT_BLUE_WALL_BANNER:
+          case LIGHT_GRAY_BANNER:
+          case LIGHT_GRAY_WALL_BANNER:
+          case LIME_BANNER:
+          case LIME_WALL_BANNER:
+          case MAGENTA_BANNER:
+          case MAGENTA_WALL_BANNER:
+          case ORANGE_BANNER:
+          case ORANGE_WALL_BANNER:
+          case PINK_BANNER:
+          case PINK_WALL_BANNER:
+          case PURPLE_BANNER:
+          case PURPLE_WALL_BANNER:
+          case RED_BANNER:
+          case RED_WALL_BANNER:
+          case WHITE_BANNER:
+          case WHITE_WALL_BANNER:
+          case YELLOW_BANNER:
+          case YELLOW_WALL_BANNER:
+
+          case BLACK_SHULKER_BOX:
+          case BLUE_SHULKER_BOX:
+          case BROWN_SHULKER_BOX:
+          case CYAN_SHULKER_BOX:
+          case GRAY_SHULKER_BOX:
+          case GREEN_SHULKER_BOX:
+          case LIGHT_BLUE_SHULKER_BOX:
+          case LIGHT_GRAY_SHULKER_BOX:
+          case LIME_SHULKER_BOX:
+          case MAGENTA_SHULKER_BOX:
+          case ORANGE_SHULKER_BOX:
+          case PINK_SHULKER_BOX:
+          case PURPLE_SHULKER_BOX:
+          case RED_SHULKER_BOX:
+          case WHITE_SHULKER_BOX:
+          case YELLOW_SHULKER_BOX:
+
+          case CHAIN_COMMAND_BLOCK:
+          case REPEATING_COMMAND_BLOCK:
+
+          case SIGN:
+          case WALL_SIGN:
+
+          case REDSTONE_TORCH:
+          case REDSTONE_WALL_TORCH:
+
+          case TURTLE_EGG:
+          case TURTLE_HELMET:
+          case TURTLE_SPAWN_EGG:
+
+          case ANVIL:
+          case BEACON:
+          case BREWING_STAND:
+          case CAKE:
+          case COMMAND_BLOCK:
+          case COMPARATOR:
+          case CRAFTING_TABLE:
+          case DISPENSER:
+          case DROPPER:
+          case ENCHANTING_TABLE:
+          case FURNACE:
+          case HOPPER:
+          case JUKEBOX:
+          case LEVER:
+          case NOTE_BLOCK:
+          case REDSTONE_ORE:
+            eventType = PlayerBlockEventType.INTERACT_BLOCK;
+            break;
+          case DRAGON_EGG:
+            eventType = PlayerBlockEventType.TELEPORT_OBJECT;
+            break;
+          default:
+            int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
+                .fromStringToLegacy(blockType.name())).id;
+            if (blockId > 197) {
+              eventType = PlayerBlockEventType.INTERACT_BLOCK;
             }
+            break;
         }
-        PlayerInventory inv = player.getInventory();
-        int slot = inv.getHeldItemSlot();
-        if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) {
-            return;
+        lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString()));
+        ItemStack hand = player.getInventory().getItemInMainHand();
+        if (eventType != null && (eventType != PlayerBlockEventType.INTERACT_BLOCK
+            || !player.isSneaking())) {
+          break;
         }
-        ItemStack current = inv.getItemInHand();
-        ItemStack newItem = event.getCursor();
-        ItemMeta newMeta = newItem.getItemMeta();
-        ItemMeta oldMeta = newItem.getItemMeta();
-        String newLore = "";
-        if (newMeta != null) {
-            List<String> lore = newMeta.getLore();
-            if (lore != null) {
-                newLore = lore.toString();
-            }
+        Material type = (hand == null) ? null : hand.getType();
+        if (type == Material.AIR) {
+          eventType = PlayerBlockEventType.INTERACT_BLOCK;
+          break;
         }
-        String oldLore = "";
-        if (oldMeta != null) {
-            List<String> lore = oldMeta.getLore();
-            if (lore != null) {
-                oldLore = lore.toString();
-            }
+        if (type == null || type.isBlock()) {
+          location = BukkitUtil
+              .getLocation(block.getRelative(event.getBlockFace()).getLocation());
+          eventType = PlayerBlockEventType.PLACE_BLOCK;
+          break;
         }
-        if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) {
-            switch (newItem.getType()) {
-                case LEGACY_BANNER:
-                case PLAYER_HEAD:
-                    if (newMeta != null)
-                        break;
-                default:
-                    return;
-            }
-        }
-        Block block = player.getTargetBlock(null, 7);
-        BlockState state = block.getState();
-        if (state == null) {
-            return;
-        }
-        Material stateType = state.getType();
-        Material itemType = newItem.getType();
-        if (stateType != itemType) {
-            switch (stateType) {
-                case LEGACY_STANDING_BANNER:
-                case LEGACY_WALL_BANNER:
-                    if (itemType == Material.LEGACY_BANNER)
-                        break;
-                case LEGACY_SKULL:
-                    if (itemType == Material.LEGACY_SKULL_ITEM)
-                        break;
-                default:
-                    return;
-            }
-        }
-        Location l = BukkitUtil.getLocation(state.getLocation());
-        PlotArea area = l.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getPlotAbs(l);
-        boolean cancelled = false;
-        if (plot == null) {
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
-                cancelled = true;
-            }
-        } else if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
-                cancelled = true;
-            }
+        Material handType = hand.getType();
+        lb = new BukkitLazyBlock(PlotBlock.get(handType.toString()));
+        if (handType.toString().endsWith("egg")) {
+          eventType = PlayerBlockEventType.SPAWN_MOB;
         } else {
-            UUID uuid = pp.getUUID();
-            if (!plot.isAdded(uuid)) {
-                if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
-                    cancelled = true;
-                }
-            }
-        }
-        if (cancelled) {
-            if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem
-                .getDurability())) {
-                event.setCursor(
-                    new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
-                event.setCancelled(true);
-                return;
-            }
-            event.setCursor(
-                new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPotionSplash(LingeringPotionSplashEvent event) {
-        LingeringPotion entity = event.getEntity();
-        Location l = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-            return;
-        }
-        if (!this.onProjectileHit(event)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onInteract(PlayerInteractAtEntityEvent e) {
-        Entity entity = e.getRightClicked();
-        if (!(entity instanceof ArmorStand)) {
-            return;
-        }
-        Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
-        PlotArea area = l.getPlotArea();
-        if (area == null) {
-            return;
-        }
-
-        EntitySpawnListener.test(entity);
-
-        Plot plot = area.getPlotAbs(l);
-        PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
-        if (plot == null) {
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
-                e.setCancelled(true);
-            }
-        } else if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
-                e.setCancelled(true);
-            }
-        } else {
-            UUID uuid = pp.getUUID();
-            if (!plot.isAdded(uuid)) {
-                if (Flags.MISC_INTERACT.isTrue(plot)) {
-                    return;
-                }
-                if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
-                    e.setCancelled(true);
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBigBoom(BlockExplodeEvent event) {
-        Block block = event.getBlock();
-        Location location = BukkitUtil.getLocation(block.getLocation());
-        String world = location.getWorld();
-        if (!PlotSquared.get().hasPlotArea(world)) {
-            return;
-        }
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            Iterator<Block> iterator = event.blockList().iterator();
-            while (iterator.hasNext()) {
-                location = BukkitUtil.getLocation(iterator.next().getLocation());
-                if (location.getPlotArea() != null) {
-                    iterator.remove();
-                }
-            }
-            return;
-        }
-        Plot plot = area.getOwnedPlot(location);
-        if (plot == null || !plot.getFlag(Flags.EXPLOSION).orElse(false)) {
-            event.setCancelled(true);
-        }
-        event.blockList().removeIf(
-            b -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(b.getLocation()))));
-    }
-
-    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-    public void onInteract(PlayerInteractEvent event) {
-        Player player = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        PlotArea area = pp.getPlotAreaAbs();
-        if (area == null) {
-            return;
-        }
-        PlayerBlockEventType eventType = null;
-        BukkitLazyBlock lb;
-        Location location;
-        Action action = event.getAction();
-        switch (action) {
-            case PHYSICAL: {
-                eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
-                Block block = event.getClickedBlock();
-                lb = new BukkitLazyBlock(block);
-                location = BukkitUtil.getLocation(block.getLocation());
-                break;
-            }
-            case RIGHT_CLICK_BLOCK: {
-                Block block = event.getClickedBlock();
-                location = BukkitUtil.getLocation(block.getLocation());
-                Material blockType = block.getType();
-                switch (blockType) {
-                    case ACACIA_DOOR:
-                    case BIRCH_DOOR:
-                    case DARK_OAK_DOOR:
-                    case IRON_DOOR:
-                    case JUNGLE_DOOR:
-                    case OAK_DOOR:
-                    case SPRUCE_DOOR:
-
-                    case ACACIA_TRAPDOOR:
-                    case BIRCH_TRAPDOOR:
-                    case DARK_OAK_TRAPDOOR:
-                    case IRON_TRAPDOOR:
-                    case JUNGLE_TRAPDOOR:
-                    case OAK_TRAPDOOR:
-                    case SPRUCE_TRAPDOOR:
-
-                    case CHEST:
-                    case ENDER_CHEST:
-                    case TRAPPED_CHEST:
-
-                    case ACACIA_FENCE_GATE:
-                    case BIRCH_FENCE_GATE:
-                    case DARK_OAK_FENCE_GATE:
-                    case OAK_FENCE_GATE:
-                    case JUNGLE_FENCE_GATE:
-                    case SPRUCE_FENCE_GATE:
-
-                    case ACACIA_BUTTON:
-                    case BIRCH_BUTTON:
-                    case DARK_OAK_BUTTON:
-                    case JUNGLE_BUTTON:
-                    case OAK_BUTTON:
-                    case SPRUCE_BUTTON:
-                    case STONE_BUTTON:
-
-                    case BLACK_BED:
-                    case BLUE_BED:
-                    case BROWN_BED:
-                    case CYAN_BED:
-                    case GRAY_BED:
-                    case GREEN_BED:
-                    case LIGHT_BLUE_BED:
-                    case LIGHT_GRAY_BED:
-                    case LIME_BED:
-                    case MAGENTA_BED:
-                    case ORANGE_BED:
-                    case PINK_BED:
-                    case PURPLE_BED:
-                    case RED_BED:
-                    case WHITE_BED:
-                    case YELLOW_BED:
-
-                    case BLACK_BANNER:
-                    case BLACK_WALL_BANNER:
-                    case BLUE_BANNER:
-                    case BLUE_WALL_BANNER:
-                    case BROWN_BANNER:
-                    case BROWN_WALL_BANNER:
-                    case CYAN_BANNER:
-                    case CYAN_WALL_BANNER:
-                    case GRAY_BANNER:
-                    case GRAY_WALL_BANNER:
-                    case GREEN_BANNER:
-                    case GREEN_WALL_BANNER:
-                    case LIGHT_BLUE_BANNER:
-                    case LIGHT_BLUE_WALL_BANNER:
-                    case LIGHT_GRAY_BANNER:
-                    case LIGHT_GRAY_WALL_BANNER:
-                    case LIME_BANNER:
-                    case LIME_WALL_BANNER:
-                    case MAGENTA_BANNER:
-                    case MAGENTA_WALL_BANNER:
-                    case ORANGE_BANNER:
-                    case ORANGE_WALL_BANNER:
-                    case PINK_BANNER:
-                    case PINK_WALL_BANNER:
-                    case PURPLE_BANNER:
-                    case PURPLE_WALL_BANNER:
-                    case RED_BANNER:
-                    case RED_WALL_BANNER:
-                    case WHITE_BANNER:
-                    case WHITE_WALL_BANNER:
-                    case YELLOW_BANNER:
-                    case YELLOW_WALL_BANNER:
-
-                    case BLACK_SHULKER_BOX:
-                    case BLUE_SHULKER_BOX:
-                    case BROWN_SHULKER_BOX:
-                    case CYAN_SHULKER_BOX:
-                    case GRAY_SHULKER_BOX:
-                    case GREEN_SHULKER_BOX:
-                    case LIGHT_BLUE_SHULKER_BOX:
-                    case LIGHT_GRAY_SHULKER_BOX:
-                    case LIME_SHULKER_BOX:
-                    case MAGENTA_SHULKER_BOX:
-                    case ORANGE_SHULKER_BOX:
-                    case PINK_SHULKER_BOX:
-                    case PURPLE_SHULKER_BOX:
-                    case RED_SHULKER_BOX:
-                    case WHITE_SHULKER_BOX:
-                    case YELLOW_SHULKER_BOX:
-
-                    case CHAIN_COMMAND_BLOCK:
-                    case REPEATING_COMMAND_BLOCK:
-
-                    case SIGN:
-                    case WALL_SIGN:
-
-                    case REDSTONE_TORCH:
-                    case REDSTONE_WALL_TORCH:
-
-                    case TURTLE_EGG:
-                    case TURTLE_HELMET:
-                    case TURTLE_SPAWN_EGG:
-
-                    case ANVIL:
-                    case BEACON:
-                    case BREWING_STAND:
-                    case CAKE:
-                    case COMMAND_BLOCK:
-                    case COMPARATOR:
-                    case CRAFTING_TABLE:
-                    case DISPENSER:
-                    case DROPPER:
-                    case ENCHANTING_TABLE:
-                    case FURNACE:
-                    case HOPPER:
-                    case JUKEBOX:
-                    case LEVER:
-                    case NOTE_BLOCK:
-                    case REDSTONE_ORE:
-                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                        break;
-                    case DRAGON_EGG:
-                        eventType = PlayerBlockEventType.TELEPORT_OBJECT;
-                        break;
-                    default:
-                        int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
-                            .fromStringToLegacy(blockType.name())).id;
-                        if (blockId > 197) {
-                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                        }
-                        break;
-                }
-                lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString()));
-                ItemStack hand = player.getInventory().getItemInMainHand();
-                if (eventType != null && (eventType != PlayerBlockEventType.INTERACT_BLOCK
-                    || !player.isSneaking())) {
-                    break;
-                }
-                Material type = (hand == null) ? null : hand.getType();
-                if (type == Material.AIR) {
-                    eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                    break;
-                }
-                if (type == null || type.isBlock()) {
-                    location = BukkitUtil
-                        .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-                    eventType = PlayerBlockEventType.PLACE_BLOCK;
-                    break;
-                }
-                Material handType = hand.getType();
-                lb = new BukkitLazyBlock(PlotBlock.get(handType.toString()));
-                if (handType.toString().endsWith("egg")) {
-                    eventType = PlayerBlockEventType.SPAWN_MOB;
-                } else {
-                    switch (handType) {
-                        case FIREWORK_ROCKET:
-                        case FIREWORK_STAR:
-                            eventType = PlayerBlockEventType.SPAWN_MOB;
-                            break;
-                        case ARMOR_STAND:
-                            location = BukkitUtil
-                                .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-                            eventType = PlayerBlockEventType.PLACE_MISC;
-                            break;
-                        case BOOK:
-                        case ENCHANTED_BOOK:
-                        case KNOWLEDGE_BOOK:
-                        case WRITABLE_BOOK:
-                        case WRITTEN_BOOK:
-                            eventType = PlayerBlockEventType.READ;
-                            break;
-                        case APPLE:
-                        case BAKED_POTATO:
-                        case BEEF:
-                        case BREAD:
-                        case CARROT:
-                        case CHICKEN:
-                        case COD:
-                        case COOKED_BEEF:
-                        case COOKED_CHICKEN:
-                        case COOKED_COD:
-                        case COOKED_MUTTON:
-                        case COOKED_PORKCHOP:
-                        case COOKED_RABBIT:
-                        case COOKED_SALMON:
-                        case COOKIE:
-                        case GOLDEN_CARROT:
-                        case MUSHROOM_STEW:
-                        case MUTTON:
-                        case POISONOUS_POTATO:
-                        case PORKCHOP:
-                        case POTATO:
-                        case POTION:
-                        case PUFFERFISH:
-                        case PUMPKIN_PIE:
-                        case RABBIT:
-                        case RABBIT_FOOT:
-                        case RABBIT_STEW:
-                        case SALMON:
-                        case TROPICAL_FISH:
-                            eventType = PlayerBlockEventType.EAT;
-                            break;
-                        case ACACIA_BOAT:
-                        case BIRCH_BOAT:
-                        case CHEST_MINECART:
-                        case COMMAND_BLOCK_MINECART:
-                        case DARK_OAK_BOAT:
-                        case FURNACE_MINECART:
-                        case HOPPER_MINECART:
-                        case JUNGLE_BOAT:
-                        case MINECART:
-                        case OAK_BOAT:
-                        case SPRUCE_BOAT:
-                        case TNT_MINECART:
-                            eventType = PlayerBlockEventType.PLACE_VEHICLE;
-                            break;
-                        case ITEM_FRAME:
-                        case PAINTING:
-                            location = BukkitUtil
-                                .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-                            eventType = PlayerBlockEventType.PLACE_HANGING;
-                            break;
-                        default:
-                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                            break;
-                    }
-                }
-                break;
-            }
-            case LEFT_CLICK_BLOCK:
-                Block block = event.getClickedBlock();
-                location = BukkitUtil.getLocation(block.getLocation());
-                eventType = PlayerBlockEventType.BREAK_BLOCK;
-                lb = new BukkitLazyBlock(block);
-                break;
+          switch (handType) {
+            case FIREWORK_ROCKET:
+            case FIREWORK_STAR:
+              eventType = PlayerBlockEventType.SPAWN_MOB;
+              break;
+            case ARMOR_STAND:
+              location = BukkitUtil
+                  .getLocation(block.getRelative(event.getBlockFace()).getLocation());
+              eventType = PlayerBlockEventType.PLACE_MISC;
+              break;
+            case BOOK:
+            case ENCHANTED_BOOK:
+            case KNOWLEDGE_BOOK:
+            case WRITABLE_BOOK:
+            case WRITTEN_BOOK:
+              eventType = PlayerBlockEventType.READ;
+              break;
+            case APPLE:
+            case BAKED_POTATO:
+            case BEEF:
+            case BREAD:
+            case CARROT:
+            case CHICKEN:
+            case COD:
+            case COOKED_BEEF:
+            case COOKED_CHICKEN:
+            case COOKED_COD:
+            case COOKED_MUTTON:
+            case COOKED_PORKCHOP:
+            case COOKED_RABBIT:
+            case COOKED_SALMON:
+            case COOKIE:
+            case GOLDEN_CARROT:
+            case MUSHROOM_STEW:
+            case MUTTON:
+            case POISONOUS_POTATO:
+            case PORKCHOP:
+            case POTATO:
+            case POTION:
+            case PUFFERFISH:
+            case PUMPKIN_PIE:
+            case RABBIT:
+            case RABBIT_FOOT:
+            case RABBIT_STEW:
+            case SALMON:
+            case TROPICAL_FISH:
+              eventType = PlayerBlockEventType.EAT;
+              break;
+            case ACACIA_BOAT:
+            case BIRCH_BOAT:
+            case CHEST_MINECART:
+            case COMMAND_BLOCK_MINECART:
+            case DARK_OAK_BOAT:
+            case FURNACE_MINECART:
+            case HOPPER_MINECART:
+            case JUNGLE_BOAT:
+            case MINECART:
+            case OAK_BOAT:
+            case SPRUCE_BOAT:
+            case TNT_MINECART:
+              eventType = PlayerBlockEventType.PLACE_VEHICLE;
+              break;
+            case ITEM_FRAME:
+            case PAINTING:
+              location = BukkitUtil
+                  .getLocation(block.getRelative(event.getBlockFace()).getLocation());
+              eventType = PlayerBlockEventType.PLACE_HANGING;
+              break;
             default:
-                return;
+              eventType = PlayerBlockEventType.INTERACT_BLOCK;
+              break;
+          }
         }
-        if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
-            if (player.getInventory().getItemInMainHand().getType() == Material
-                .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
-                return;
-            }
+        break;
+      }
+      case LEFT_CLICK_BLOCK:
+        Block block = event.getClickedBlock();
+        location = BukkitUtil.getLocation(block.getLocation());
+        eventType = PlayerBlockEventType.BREAK_BLOCK;
+        lb = new BukkitLazyBlock(block);
+        break;
+      default:
+        return;
+    }
+    if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
+      if (player.getInventory().getItemInMainHand().getType() == Material
+          .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
+        return;
+      }
+    }
+    if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, location, lb, true)) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void creatureSpawnEvent(CreatureSpawnEvent event) {
+    Entity entity = event.getEntity();
+    Location location = BukkitUtil.getLocation(entity.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
+    //TODO needs an overhaul for the increased number of spawn reasons added to this event.
+    //I can't believe they waited so damn long to expand this API set.
+    switch (reason) {
+      case DISPENSE_EGG:
+      case EGG:
+      case OCELOT_BABY:
+      case SPAWNER_EGG:
+        if (!area.SPAWN_EGGS) {
+          event.setCancelled(true);
+          return;
         }
-        if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, location, lb, true)) {
-            event.setCancelled(true);
+        break;
+      case REINFORCEMENTS:
+      case NATURAL:
+      case CHUNK_GEN:
+        if (!area.MOB_SPAWNING) {
+          event.setCancelled(true);
+          return;
         }
+      case BREEDING:
+        if (!area.SPAWN_BREEDING) {
+          event.setCancelled(true);
+          return;
+        }
+        break;
+      case BUILD_IRONGOLEM:
+      case BUILD_SNOWMAN:
+      case BUILD_WITHER:
+      case CUSTOM:
+        if (!area.SPAWN_CUSTOM && entity.getType() != EntityType.ARMOR_STAND) {
+          event.setCancelled(true);
+          return;
+        }
+        break;
+      case SPAWNER:
+        if (!area.MOB_SPAWNER_SPAWNING) {
+          event.setCancelled(true);
+          return;
+        }
+        break;
+    }
+    Plot plot = area.getOwnedPlotAbs(location);
+    if (plot == null) {
+      if (!area.MOB_SPAWNING) {
+        event.setCancelled(true);
+      }
+      return;
+    }
+    if (checkEntity(entity, plot)) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+  public void onEntityFall(EntityChangeBlockEvent event) {
+    if (event.getEntityType() != EntityType.FALLING_BLOCK) {
+      return;
+    }
+    Block block = event.getBlock();
+    World world = block.getWorld();
+    String worldName = world.getName();
+    if (!PlotSquared.get().hasPlotArea(worldName)) {
+      return;
+    }
+    Location location = BukkitUtil.getLocation(block.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlotAbs(location);
+    if (plot == null || plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
+      event.setCancelled(true);
+      return;
+    }
+    if (event.getTo().hasGravity()) {
+      Entity entity = event.getEntity();
+      List<MetadataValue> meta = entity.getMetadata("plot");
+      if (meta.isEmpty()) {
+        return;
+      }
+      Plot origin = (Plot) meta.get(0).value();
+      if (origin != null && !origin.equals(plot)) {
+        event.setCancelled(true);
+        entity.remove();
+      }
+    } else if (event.getTo() == Material.AIR) {
+      event.getEntity()
+          .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+    }
+  }
+
+  @EventHandler
+  public void onPrime(ExplosionPrimeEvent event) {
+    this.lastRadius = event.getRadius() + 1;
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockBurn(BlockBurnEvent event) {
+    Block b = event.getBlock();
+    Location location = BukkitUtil.getLocation(b.getLocation());
+
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void creatureSpawnEvent(CreatureSpawnEvent event) {
-        Entity entity = event.getEntity();
-        Location location = BukkitUtil.getLocation(entity.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
-        //TODO needs an overhaul for the increased number of spawn reasons added to this event.
-        //I can't believe they waited so damn long to expand this API set.
-        switch (reason) {
-            case DISPENSE_EGG:
-            case EGG:
-            case OCELOT_BABY:
-            case SPAWNER_EGG:
-                if (!area.SPAWN_EGGS) {
-                    event.setCancelled(true);
-                    return;
-                }
-                break;
-            case REINFORCEMENTS:
-            case NATURAL:
-            case CHUNK_GEN:
-                if (!area.MOB_SPAWNING) {
-                    event.setCancelled(true);
-                    return;
-                }
-            case BREEDING:
-                if (!area.SPAWN_BREEDING) {
-                    event.setCancelled(true);
-                    return;
-                }
-                break;
-            case BUILD_IRONGOLEM:
-            case BUILD_SNOWMAN:
-            case BUILD_WITHER:
-            case CUSTOM:
-                if (!area.SPAWN_CUSTOM && entity.getType() != EntityType.ARMOR_STAND) {
-                    event.setCancelled(true);
-                    return;
-                }
-                break;
-            case SPAWNER:
-                if (!area.MOB_SPAWNER_SPAWNING) {
-                    event.setCancelled(true);
-                    return;
-                }
-                break;
-        }
-        Plot plot = area.getOwnedPlotAbs(location);
-        if (plot == null) {
-            if (!area.MOB_SPAWNING) {
-                event.setCancelled(true);
-            }
-            return;
-        }
-        if (checkEntity(entity, plot)) {
-            event.setCancelled(true);
-        }
+    Plot plot = location.getOwnedPlot();
+    if (plot == null || !plot.getFlag(Flags.BLOCK_BURN, false)) {
+      event.setCancelled(true);
+      return;
     }
 
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onEntityFall(EntityChangeBlockEvent event) {
-        if (event.getEntityType() != EntityType.FALLING_BLOCK) {
-            return;
-        }
-        Block block = event.getBlock();
-        World world = block.getWorld();
-        String worldName = world.getName();
-        if (!PlotSquared.get().hasPlotArea(worldName)) {
-            return;
-        }
-        Location location = BukkitUtil.getLocation(block.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Plot plot = area.getOwnedPlotAbs(location);
-        if (plot == null || plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
-            event.setCancelled(true);
-            return;
-        }
-        if (event.getTo().hasGravity()) {
-            Entity entity = event.getEntity();
-            List<MetadataValue> meta = entity.getMetadata("plot");
-            if (meta.isEmpty()) {
-                return;
-            }
-            Plot origin = (Plot) meta.get(0).value();
-            if (origin != null && !origin.equals(plot)) {
-                event.setCancelled(true);
-                entity.remove();
-            }
-        } else if (event.getTo() == Material.AIR) {
-            event.getEntity()
-                .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
-        }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBlockIgnite(BlockIgniteEvent event) {
+    Player player = event.getPlayer();
+    Entity ignitingEntity = event.getIgnitingEntity();
+    Block block = event.getBlock();
+    BlockIgniteEvent.IgniteCause igniteCause = event.getCause();
+    Location loc;
+    if (block != null) {
+      loc = BukkitUtil.getLocation(block.getLocation());
+    } else if (ignitingEntity != null) {
+      loc = BukkitUtil.getLocation(ignitingEntity);
+    } else if (player != null) {
+      loc = BukkitUtil.getLocation(player);
+    } else {
+      return;
+    }
+    PlotArea area = loc.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    if (igniteCause == BlockIgniteEvent.IgniteCause.LIGHTNING) {
+      event.setCancelled(true);
+      return;
     }
 
-    @EventHandler public void onPrime(ExplosionPrimeEvent event) {
-        this.lastRadius = event.getRadius() + 1;
+    Plot plot = area.getOwnedPlotAbs(loc);
+    if (player != null) {
+      PlotPlayer pp = BukkitUtil.getPlayer(player);
+      if (plot == null) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+          event.setCancelled(true);
+        }
+      } else if (!plot.hasOwner()) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+          event.setCancelled(true);
+        }
+      } else if (!plot.isAdded(pp.getUUID())) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+          event.setCancelled(true);
+        }
+      } else if (Flags.BLOCK_IGNITION.isFalse(plot)) {
+        event.setCancelled(true);
+      }
+    } else {
+      if (plot == null) {
+        event.setCancelled(true);
+        return;
+      }
+      if (ignitingEntity != null) {
+        if (!plot.getFlag(Flags.BLOCK_IGNITION, false)) {
+          event.setCancelled(true);
+          return;
+        }
+        if (igniteCause == BlockIgniteEvent.IgniteCause.FIREBALL) {
+          if (ignitingEntity instanceof Fireball) {
+            Projectile fireball = (Projectile) ignitingEntity;
+            Location location = null;
+            if (fireball.getShooter() instanceof Entity) {
+              Entity shooter = (Entity) fireball.getShooter();
+              location = BukkitUtil.getLocation(shooter.getLocation());
+            } else if (fireball.getShooter() instanceof BlockProjectileSource) {
+              Block shooter =
+                  ((BlockProjectileSource) fireball.getShooter()).getBlock();
+              location = BukkitUtil.getLocation(shooter.getLocation());
+            }
+            if (location != null && !plot.equals(location.getPlot())) {
+              event.setCancelled(true);
+            }
+          }
+        }
+
+      } else if (event.getIgnitingBlock() != null) {
+        Block ignitingBlock = event.getIgnitingBlock();
+        Plot plotIgnited = BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot();
+        if (igniteCause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL && (
+            !plot.getFlag(Flags.BLOCK_IGNITION, false) || plotIgnited == null
+                || !plotIgnited.equals(plot)) ||
+            (igniteCause == BlockIgniteEvent.IgniteCause.SPREAD
+                || igniteCause == BlockIgniteEvent.IgniteCause.LAVA) && (
+                !plot.getFlag(Flags.BLOCK_IGNITION).orElse(false) || plotIgnited == null
+                    || !plotIgnited.equals(plot))) {
+          event.setCancelled(true);
+        }
+      }
     }
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockBurn(BlockBurnEvent event) {
-        Block b = event.getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
-
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-
-        Plot plot = location.getOwnedPlot();
-        if (plot == null || !plot.getFlag(Flags.BLOCK_BURN, false)) {
-            event.setCancelled(true);
-            return;
-        }
-
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBucketEmpty(PlayerBucketEmptyEvent event) {
+    BlockFace bf = event.getBlockFace();
+    Block b =
+        event.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ())
+            .getBlock();
+    Location location = BukkitUtil.getLocation(b.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
     }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBlockIgnite(BlockIgniteEvent event) {
-        Player player = event.getPlayer();
-        Entity ignitingEntity = event.getIgnitingEntity();
-        Block block = event.getBlock();
-        BlockIgniteEvent.IgniteCause igniteCause = event.getCause();
-        Location loc;
-        if (block != null) {
-            loc = BukkitUtil.getLocation(block.getLocation());
-        } else if (ignitingEntity != null) {
-            loc = BukkitUtil.getLocation(ignitingEntity);
-        } else if (player != null) {
-            loc = BukkitUtil.getLocation(player);
-        } else {
-            return;
-        }
-        PlotArea area = loc.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        if (igniteCause == BlockIgniteEvent.IgniteCause.LIGHTNING) {
-            event.setCancelled(true);
-            return;
-        }
-
-        Plot plot = area.getOwnedPlotAbs(loc);
-        if (player != null) {
-            PlotPlayer pp = BukkitUtil.getPlayer(player);
-            if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                    event.setCancelled(true);
-                }
-            } else if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    event.setCancelled(true);
-                }
-            } else if (!plot.isAdded(pp.getUUID())) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                }
-            } else if (Flags.BLOCK_IGNITION.isFalse(plot)) {
-                event.setCancelled(true);
-            }
-        } else {
-            if (plot == null) {
-                event.setCancelled(true);
-                return;
-            }
-            if (ignitingEntity != null) {
-                if (!plot.getFlag(Flags.BLOCK_IGNITION, false)) {
-                    event.setCancelled(true);
-                    return;
-                }
-                if (igniteCause == BlockIgniteEvent.IgniteCause.FIREBALL) {
-                    if (ignitingEntity instanceof Fireball) {
-                        Projectile fireball = (Projectile) ignitingEntity;
-                        Location location = null;
-                        if (fireball.getShooter() instanceof Entity) {
-                            Entity shooter = (Entity) fireball.getShooter();
-                            location = BukkitUtil.getLocation(shooter.getLocation());
-                        } else if (fireball.getShooter() instanceof BlockProjectileSource) {
-                            Block shooter =
-                                ((BlockProjectileSource) fireball.getShooter()).getBlock();
-                            location = BukkitUtil.getLocation(shooter.getLocation());
-                        }
-                        if (location != null && !plot.equals(location.getPlot())) {
-                            event.setCancelled(true);
-                        }
-                    }
-                }
-
-            } else if (event.getIgnitingBlock() != null) {
-                Block ignitingBlock = event.getIgnitingBlock();
-                Plot plotIgnited = BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot();
-                if (igniteCause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL && (
-                    !plot.getFlag(Flags.BLOCK_IGNITION, false) || plotIgnited == null
-                        || !plotIgnited.equals(plot)) ||
-                    (igniteCause == BlockIgniteEvent.IgniteCause.SPREAD
-                        || igniteCause == BlockIgniteEvent.IgniteCause.LAVA) && (
-                        !plot.getFlag(Flags.BLOCK_IGNITION).orElse(false) || plotIgnited == null
-                            || !plotIgnited.equals(plot))) {
-                    event.setCancelled(true);
-                }
-            }
-        }
+    PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
+    Plot plot = area.getPlot(location);
+    if (plot == null) {
+      if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+        return;
+      }
+      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+      event.setCancelled(true);
+    } else if (!plot.hasOwner()) {
+      if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+        return;
+      }
+      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+      event.setCancelled(true);
+    } else if (!plot.isAdded(pp.getUUID())) {
+      if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().getId(), 0))) {
+        return;
+      }
+      if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+        return;
+      }
+      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+      event.setCancelled(true);
+    } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+        event.setCancelled(true);
+      }
     }
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        BlockFace bf = event.getBlockFace();
-        Block b =
-            event.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ())
-                .getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
-        Plot plot = area.getPlot(location);
-        if (plot == null) {
-            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                return;
-            }
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-            event.setCancelled(true);
-        } else if (!plot.hasOwner()) {
-            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                return;
-            }
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-            event.setCancelled(true);
-        } else if (!plot.isAdded(pp.getUUID())) {
-            if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().getId(), 0))) {
-                return;
-            }
-            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                return;
-            }
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-            event.setCancelled(true);
-        } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                event.setCancelled(true);
-            }
-        }
+  @EventHandler(priority = EventPriority.HIGHEST)
+  public void onInventoryClose(InventoryCloseEvent event) {
+    HumanEntity closer = event.getPlayer();
+    if (!(closer instanceof Player)) {
+      return;
     }
+    Player player = (Player) closer;
+    PlotInventory.removePlotInventoryOpen(BukkitUtil.getPlayer(player));
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onInventoryClose(InventoryCloseEvent event) {
-        HumanEntity closer = event.getPlayer();
-        if (!(closer instanceof Player)) {
-            return;
-        }
-        Player player = (Player) closer;
-        PlotInventory.removePlotInventoryOpen(BukkitUtil.getPlayer(player));
+  @EventHandler(priority = EventPriority.MONITOR)
+  public void onLeave(PlayerQuitEvent event) {
+    TaskManager.TELEPORT_QUEUE.remove(event.getPlayer().getName());
+    PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
+    pp.unregister();
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onBucketFill(PlayerBucketFillEvent event) {
+    Block b = event.getBlockClicked();
+    Location location = BukkitUtil.getLocation(b.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
     }
-
-    @EventHandler(priority = EventPriority.MONITOR) public void onLeave(PlayerQuitEvent event) {
-        TaskManager.TELEPORT_QUEUE.remove(event.getPlayer().getName());
-        PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
-        pp.unregister();
+    Player player = event.getPlayer();
+    PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+    Plot plot = area.getPlot(location);
+    if (plot == null) {
+      if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+        return;
+      }
+      MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+      event.setCancelled(true);
+    } else if (!plot.hasOwner()) {
+      if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+        return;
+      }
+      MainUtil
+          .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+      event.setCancelled(true);
+    } else if (!plot.isAdded(plotPlayer.getUUID())) {
+      Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
+      Block block = event.getBlockClicked();
+      if (use.isPresent() && use.get().contains(PlotBlock.get(block.getType().name()))) {
+        return;
+      }
+      if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+        return;
+      }
+      MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+      event.setCancelled(true);
+    } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+      if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+        MainUtil
+            .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+        event.setCancelled(true);
+      }
     }
+  }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onBucketFill(PlayerBucketFillEvent event) {
-        Block b = event.getBlockClicked();
-        Location location = BukkitUtil.getLocation(b.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onVehicleCreate(VehicleCreateEvent event) {
+    Vehicle entity = event.getVehicle();
+    Location location = BukkitUtil.getLocation(entity);
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Plot plot = area.getOwnedPlotAbs(location);
+    if (plot == null || checkEntity(entity, plot)) {
+      entity.remove();
+      return;
+    }
+    if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+      entity
+          .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onHangingPlace(HangingPlaceEvent event) {
+    Block b = event.getBlock().getRelative(event.getBlockFace());
+    Location location = BukkitUtil.getLocation(b.getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Player p = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(p);
+    Plot plot = area.getPlot(location);
+    if (plot == null) {
+      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+        event.setCancelled(true);
+      }
+    } else {
+      if (!plot.hasOwner()) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+          event.setCancelled(true);
         }
-        Player player = event.getPlayer();
-        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        Plot plot = area.getPlot(location);
-        if (plot == null) {
-            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                return;
-            }
-            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-            event.setCancelled(true);
-        } else if (!plot.hasOwner()) {
-            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                return;
-            }
+        return;
+      }
+      if (!plot.isAdded(pp.getUUID())) {
+        if (!plot.getFlag(Flags.HANGING_PLACE, false)) {
+          if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
             MainUtil
-                .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
             event.setCancelled(true);
-        } else if (!plot.isAdded(plotPlayer.getUUID())) {
-            Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
-            Block block = event.getBlockClicked();
-            if (use.isPresent() && use.get().contains(PlotBlock.get(block.getType().name()))) {
-                return;
-            }
-            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                return;
-            }
-            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-            event.setCancelled(true);
-        } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-            if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                MainUtil
-                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                event.setCancelled(true);
-            }
+          }
+          return;
         }
-    }
+      }
+      if (checkEntity(event.getEntity(), plot)) {
+        event.setCancelled(true);
+      }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onVehicleCreate(VehicleCreateEvent event) {
-        Vehicle entity = event.getVehicle();
-        Location location = BukkitUtil.getLocation(entity);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onHangingBreakByEntity(HangingBreakByEntityEvent event) {
+    Entity remover = event.getRemover();
+    if (remover instanceof Player) {
+      Player p = (Player) remover;
+      Location location = BukkitUtil.getLocation(event.getEntity());
+      PlotArea area = location.getPlotArea();
+      if (area == null) {
+        return;
+      }
+      PlotPlayer pp = BukkitUtil.getPlayer(p);
+      Plot plot = area.getPlot(location);
+      if (plot == null) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+          event.setCancelled(true);
+        }
+      } else if (!plot.hasOwner()) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+          event.setCancelled(true);
+        }
+      } else if (!plot.isAdded(pp.getUUID())) {
+        if (plot.getFlag(Flags.HANGING_BREAK, false)) {
+          return;
+        }
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+          event.setCancelled(true);
+        }
+      }
+    } else if (remover instanceof Projectile) {
+      Projectile p = (Projectile) remover;
+      if (p.getShooter() instanceof Player) {
+        Player shooter = (Player) p.getShooter();
+        Location location = BukkitUtil.getLocation(event.getEntity());
         PlotArea area = location.getPlotArea();
         if (area == null) {
-            return;
+          return;
         }
-        Plot plot = area.getOwnedPlotAbs(location);
-        if (plot == null || checkEntity(entity, plot)) {
-            entity.remove();
-            return;
-        }
-        if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-            entity
-                .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onHangingPlace(HangingPlaceEvent event) {
-        Block b = event.getBlock().getRelative(event.getBlockFace());
-        Location location = BukkitUtil.getLocation(b.getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Player p = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(p);
-        Plot plot = area.getPlot(location);
-        if (plot == null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-                event.setCancelled(true);
-            }
-        } else {
-            if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    event.setCancelled(true);
-                }
-                return;
-            }
-            if (!plot.isAdded(pp.getUUID())) {
-                if (!plot.getFlag(Flags.HANGING_PLACE, false)) {
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                        MainUtil
-                            .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                        event.setCancelled(true);
-                    }
-                    return;
-                }
-            }
-            if (checkEntity(event.getEntity(), plot)) {
-                event.setCancelled(true);
-            }
-
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onHangingBreakByEntity(HangingBreakByEntityEvent event) {
-        Entity remover = event.getRemover();
-        if (remover instanceof Player) {
-            Player p = (Player) remover;
-            Location location = BukkitUtil.getLocation(event.getEntity());
-            PlotArea area = location.getPlotArea();
-            if (area == null) {
-                return;
-            }
-            PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = area.getPlot(location);
-            if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-                    event.setCancelled(true);
-                }
-            } else if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                    event.setCancelled(true);
-                }
-            } else if (!plot.isAdded(pp.getUUID())) {
-                if (plot.getFlag(Flags.HANGING_BREAK, false)) {
-                    return;
-                }
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
-                    event.setCancelled(true);
-                }
-            }
-        } else if (remover instanceof Projectile) {
-            Projectile p = (Projectile) remover;
-            if (p.getShooter() instanceof Player) {
-                Player shooter = (Player) p.getShooter();
-                Location location = BukkitUtil.getLocation(event.getEntity());
-                PlotArea area = location.getPlotArea();
-                if (area == null) {
-                    return;
-                }
-                PlotPlayer player = BukkitUtil.getPlayer(shooter);
-                Plot plot = area.getPlot(BukkitUtil.getLocation(event.getEntity()));
-                if (plot != null) {
-                    if (!plot.hasOwner()) {
-                        if (!Permissions
-                            .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                            MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
-                                C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-                            event.setCancelled(true);
-                        }
-                    } else if (!plot.isAdded(player.getUUID())) {
-                        if (!plot.getFlag(Flags.HANGING_BREAK, false)) {
-                            if (!Permissions
-                                .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
-                                    C.PERMISSION_ADMIN_DESTROY_OTHER);
-                                event.setCancelled(true);
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
-        Location location = BukkitUtil.getLocation(event.getRightClicked().getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Player p = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(p);
-        Plot plot = area.getPlot(location);
-        if (plot == null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
-                event.setCancelled(true);
-            }
-        } else if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
-                MainUtil
-                    .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
-                event.setCancelled(true);
-            }
-        } else if (!plot.isAdded(pp.getUUID())) {
-            Entity entity = event.getRightClicked();
-            if (entity instanceof Monster && plot.getFlag(Flags.HOSTILE_INTERACT, false)) {
-                return;
-            }
-            if (entity instanceof Animals && plot.getFlag(Flags.ANIMAL_INTERACT, false)) {
-                return;
-            }
-            if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot
-                .getFlag(Flags.TAMED_INTERACT, false)) {
-                return;
-            }
-            if (entity instanceof Vehicle && plot.getFlag(Flags.VEHICLE_USE, false)) {
-                return;
-            }
-            if (entity instanceof Player && plot.getFlag(Flags.PLAYER_INTERACT, false)) {
-                return;
-            }
-            if (entity instanceof Villager && plot.getFlag(Flags.VILLAGER_INTERACT, false)) {
-                return;
-            }
-            if (entity instanceof ItemFrame && plot.getFlag(Flags.MISC_INTERACT, false)) {
-                return;
-            }
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onVehicleDestroy(VehicleDestroyEvent event) {
-        Location l = BukkitUtil.getLocation(event.getVehicle());
-        PlotArea area = l.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Entity d = event.getAttacker();
-        if (d instanceof Player) {
-            Player p = (Player) d;
-            PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = area.getPlot(l);
-            if (plot == null) {
-                if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
-                    event.setCancelled(true);
-                }
-            } else {
-                if (!plot.hasOwner()) {
-                    if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
-                            "plots.admin.vehicle.break.unowned");
-                        event.setCancelled(true);
-                        return;
-                    }
-                    return;
-                }
-                if (!plot.isAdded(pp.getUUID())) {
-                    if (plot.getFlag(Flags.VEHICLE_BREAK, false)) {
-                        return;
-                    }
-                    if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
-                            "plots.admin.vehicle.break.other");
-                        event.setCancelled(true);
-                    }
-                }
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPotionSplash(PotionSplashEvent event) {
-        ThrownPotion damager = event.getPotion();
-        Location l = BukkitUtil.getLocation(damager);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-            return;
-        }
-        int count = 0;
-        for (LivingEntity victim : event.getAffectedEntities()) {
-            if (!entityDamage(damager, victim)) {
-                event.setIntensity(victim, 0);
-                count++;
-            }
-        }
-        if ((count > 0 && count == event.getAffectedEntities().size()) || !onProjectileHit(event)) {
-            event.setCancelled(true);
-        }
-    }
-
-    @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.HIGHEST)
-    public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
-        EntityDamageByEntityEvent eventChange = null;
-        eventChange = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
-            EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
-        onEntityDamageByEntityEvent(eventChange);
-        if (eventChange.isCancelled()) {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
-        Entity damager = event.getDamager();
-        Location l = BukkitUtil.getLocation(damager);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-            return;
-        }
-        Entity victim = event.getEntity();
-        if (!entityDamage(damager, victim)) {
-            if (event.isCancelled()) {
-                if (victim instanceof Ageable) {
-                    Ageable ageable = (Ageable) victim;
-                    if (ageable.getAge() == -24000) {
-                        ageable.setAge(0);
-                        ageable.setAdult();
-                    }
-                }
-            }
-            event.setCancelled(true);
-        }
-    }
-
-    public boolean entityDamage(Entity damager, Entity victim) {
-        Location dloc = BukkitUtil.getLocation(damager);
-        Location vloc = BukkitUtil.getLocation(victim);
-        PlotArea dArea = dloc.getPlotArea();
-        PlotArea vArea =
-            dArea != null && dArea.contains(vloc.getX(), vloc.getZ()) ? dArea : vloc.getPlotArea();
-        if (dArea == null && vArea == null) {
-            return true;
-        }
-
-        Plot dplot = dArea != null ? dArea.getPlot(dloc) : null;
-        Plot vplot = vArea != null ? vArea.getPlot(vloc) : null;
-
-        Plot plot;
-        String stub;
-        if (dplot == null && vplot == null) {
-            if (dArea == null) {
-                return true;
-            }
-            plot = null;
-            stub = "road";
-        } else {
-            // Prioritize plots for close to seamless pvp zones
-            if (victim.getTicksLived() > damager.getTicksLived()) {
-                if (dplot == null || !(victim instanceof Player)) {
-                    if (vplot == null) {
-                        plot = dplot;
-                    } else {
-                        plot = vplot;
-                    }
-                } else {
-                    plot = dplot;
-                }
-            } else if (dplot == null || !(victim instanceof Player)) {
-                if (vplot == null) {
-                    plot = dplot;
-                } else {
-                    plot = vplot;
-                }
-            } else if (vplot == null) {
-                plot = dplot;
-            } else {
-                plot = vplot;
-            }
-            if (plot.hasOwner()) {
-                stub = "other";
-            } else {
-                stub = "unowned";
-            }
-        }
-
-        Player player;
-        if (damager instanceof Player) { // attacker is player
-            player = (Player) damager;
-        } else if (damager instanceof Projectile) {
-            Projectile projectile = (Projectile) damager;
-            ProjectileSource shooter = projectile.getShooter();
-            if (shooter instanceof Player) { // shooter is player
-                player = (Player) shooter;
-            } else { // shooter is not player
-                if (shooter instanceof BlockProjectileSource) {
-                    Location sLoc = BukkitUtil
-                        .getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
-                    dplot = dArea.getPlot(sLoc);
-                }
-                player = null;
-            }
-        } else { // Attacker is not player
-            player = null;
-        }
-        if (player != null) {
-            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-            if (victim instanceof Hanging) { // hanging
-                if (plot != null && (plot.getFlag(Flags.HANGING_BREAK, false) || plot
-                    .isAdded(plotPlayer.getUUID()))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                        "plots.admin.destroy." + stub);
-                    return false;
-                }
-            } else if (victim.getEntityId() == 30) {
-                if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot
-                    .isAdded(plotPlayer.getUUID()))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                        "plots.admin.destroy." + stub);
-                    return false;
-                }
-            } else if (victim instanceof Monster
-                || victim instanceof EnderDragon) { // victim is monster
-                if (plot != null && (plot.getFlag(Flags.HOSTILE_ATTACK, false) || plot
-                    .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            } else if (victim instanceof Tameable) { // victim is tameable
-                if (plot != null && (plot.getFlag(Flags.TAMED_ATTACK, false) || plot
-                    .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            } else if (victim instanceof Player) {
-                if (plot != null) {
-                    if (Flags.PVP.isFalse(plot) && !Permissions
-                        .hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-                        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                            "plots.admin.pvp." + stub);
-                        return false;
-                    } else {
-                        return true;
-                    }
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
-                    return false;
-                }
-            } else if (victim instanceof Creature) { // victim is animal
-                if (plot != null && (plot.getFlag(Flags.ANIMAL_ATTACK, false) || plot
-                    .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            } else if (victim instanceof Vehicle) { // Vehicles are managed in vehicle destroy event
-                return true;
-            } else { // victim is something else
-                if (plot != null && (plot.getFlag(Flags.PVE, false) || plot
-                    .isAdded(plotPlayer.getUUID()))) {
-                    return true;
-                }
-                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-                    return false;
-                }
-            }
-            return true;
-        } else if (dplot != null && (!dplot.equals(vplot) || Objects
-            .equals(dplot.guessOwner(), vplot.guessOwner()))) {
-            return vplot != null && Flags.PVE.isTrue(vplot);
-        }
-        return ((vplot != null && Flags.PVE.isTrue(vplot)) || !(damager instanceof Arrow
-            && !(victim instanceof Creature)));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onPlayerEggThrow(PlayerEggThrowEvent event) {
-        Location l = BukkitUtil.getLocation(event.getEgg().getLocation());
-        PlotArea area = l.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Player player = event.getPlayer();
-        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        Plot plot = area.getPlot(l);
-        if (plot == null) {
-            if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.road")) {
-                MainUtil
-                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
-                event.setHatching(false);
-            }
-        } else if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.unowned")) {
-                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                    "plots.admin.projectile.unowned");
-                event.setHatching(false);
-            }
-        } else if (!plot.isAdded(plotPlayer.getUUID())) {
-            if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.other")) {
-                MainUtil
-                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
-                event.setHatching(false);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void blockCreate(BlockPlaceEvent event) {
-        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-        PlotArea area = location.getPlotArea();
-        if (area == null) {
-            return;
-        }
-        Player player = event.getPlayer();
-        PlotPlayer pp = BukkitUtil.getPlayer(player);
-        Plot plot = area.getPlot(location);
+        PlotPlayer player = BukkitUtil.getPlayer(shooter);
+        Plot plot = area.getPlot(BukkitUtil.getLocation(event.getEntity()));
         if (plot != null) {
-            if ((location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
-                && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+          if (!plot.hasOwner()) {
+            if (!Permissions
+                .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+              MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
+                  C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+              event.setCancelled(true);
+            }
+          } else if (!plot.isAdded(player.getUUID())) {
+            if (!plot.getFlag(Flags.HANGING_BREAK, false)) {
+              if (!Permissions
+                  .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
+                    C.PERMISSION_ADMIN_DESTROY_OTHER);
                 event.setCancelled(true);
-                MainUtil.sendMessage(pp,
-                    C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+              }
             }
-            if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-                    event.setCancelled(true);
-                    return;
-                }
-            } else if (!plot.isAdded(pp.getUUID())) {
-                Set<PlotBlock> place = plot.getFlag(Flags.PLACE, null);
-                if (place != null) {
-                    Block block = event.getBlock();
-                    if (place.contains(PlotBlock.get(block.getType().name()))) {
-                        return;
-                    }
-                }
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                    return;
-                }
-            } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            if (plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
-                Block block = event.getBlockPlaced();
-                if (block.getType().hasGravity()) {
-                    sendBlockChange(block.getLocation(), block.getBlockData());
-                }
-            }
-        } else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-            event.setCancelled(true);
+          }
         }
+      }
+    } else {
+      event.setCancelled(true);
     }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
+    Location location = BukkitUtil.getLocation(event.getRightClicked().getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Player p = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(p);
+    Plot plot = area.getPlot(location);
+    if (plot == null) {
+      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
+        event.setCancelled(true);
+      }
+    } else if (!plot.hasOwner()) {
+      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
+        MainUtil
+            .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
+        event.setCancelled(true);
+      }
+    } else if (!plot.isAdded(pp.getUUID())) {
+      Entity entity = event.getRightClicked();
+      if (entity instanceof Monster && plot.getFlag(Flags.HOSTILE_INTERACT, false)) {
+        return;
+      }
+      if (entity instanceof Animals && plot.getFlag(Flags.ANIMAL_INTERACT, false)) {
+        return;
+      }
+      if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot
+          .getFlag(Flags.TAMED_INTERACT, false)) {
+        return;
+      }
+      if (entity instanceof Vehicle && plot.getFlag(Flags.VEHICLE_USE, false)) {
+        return;
+      }
+      if (entity instanceof Player && plot.getFlag(Flags.PLAYER_INTERACT, false)) {
+        return;
+      }
+      if (entity instanceof Villager && plot.getFlag(Flags.VILLAGER_INTERACT, false)) {
+        return;
+      }
+      if (entity instanceof ItemFrame && plot.getFlag(Flags.MISC_INTERACT, false)) {
+        return;
+      }
+      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
+        event.setCancelled(true);
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onVehicleDestroy(VehicleDestroyEvent event) {
+    Location l = BukkitUtil.getLocation(event.getVehicle());
+    PlotArea area = l.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Entity d = event.getAttacker();
+    if (d instanceof Player) {
+      Player p = (Player) d;
+      PlotPlayer pp = BukkitUtil.getPlayer(p);
+      Plot plot = area.getPlot(l);
+      if (plot == null) {
+        if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
+          event.setCancelled(true);
+        }
+      } else {
+        if (!plot.hasOwner()) {
+          if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) {
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                "plots.admin.vehicle.break.unowned");
+            event.setCancelled(true);
+            return;
+          }
+          return;
+        }
+        if (!plot.isAdded(pp.getUUID())) {
+          if (plot.getFlag(Flags.VEHICLE_BREAK, false)) {
+            return;
+          }
+          if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) {
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                "plots.admin.vehicle.break.other");
+            event.setCancelled(true);
+          }
+        }
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onPotionSplash(PotionSplashEvent event) {
+    ThrownPotion damager = event.getPotion();
+    Location l = BukkitUtil.getLocation(damager);
+    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+      return;
+    }
+    int count = 0;
+    for (LivingEntity victim : event.getAffectedEntities()) {
+      if (!entityDamage(damager, victim)) {
+        event.setIntensity(victim, 0);
+        count++;
+      }
+    }
+    if ((count > 0 && count == event.getAffectedEntities().size()) || !onProjectileHit(event)) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST)
+  public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
+    EntityDamageByEntityEvent eventChange = new EntityDamageByEntityEvent(event.getCombuster(),
+        event.getEntity(),
+        EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
+    onEntityDamageByEntityEvent(eventChange);
+    if (eventChange.isCancelled()) {
+      event.setCancelled(true);
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST)
+  public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
+    Entity damager = event.getDamager();
+    Location l = BukkitUtil.getLocation(damager);
+    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+      return;
+    }
+    Entity victim = event.getEntity();
+    if (!entityDamage(damager, victim)) {
+      if (event.isCancelled()) {
+        if (victim instanceof Ageable) {
+          Ageable ageable = (Ageable) victim;
+          if (ageable.getAge() == -24000) {
+            ageable.setAge(0);
+            ageable.setAdult();
+          }
+        }
+      }
+      event.setCancelled(true);
+    }
+  }
+
+  public boolean entityDamage(Entity damager, Entity victim) {
+    Location dloc = BukkitUtil.getLocation(damager);
+    Location vloc = BukkitUtil.getLocation(victim);
+    PlotArea dArea = dloc.getPlotArea();
+    PlotArea vArea =
+        dArea != null && dArea.contains(vloc.getX(), vloc.getZ()) ? dArea : vloc.getPlotArea();
+    if (dArea == null && vArea == null) {
+      return true;
+    }
+
+    Plot dplot = dArea != null ? dArea.getPlot(dloc) : null;
+    Plot vplot = vArea != null ? vArea.getPlot(vloc) : null;
+
+    Plot plot;
+    String stub;
+    if (dplot == null && vplot == null) {
+      if (dArea == null) {
+        return true;
+      }
+      plot = null;
+      stub = "road";
+    } else {
+      // Prioritize plots for close to seamless pvp zones
+      if (victim.getTicksLived() > damager.getTicksLived()) {
+        if (dplot == null || !(victim instanceof Player)) {
+          if (vplot == null) {
+            plot = dplot;
+          } else {
+            plot = vplot;
+          }
+        } else {
+          plot = dplot;
+        }
+      } else if (dplot == null || !(victim instanceof Player)) {
+        if (vplot == null) {
+          plot = dplot;
+        } else {
+          plot = vplot;
+        }
+      } else if (vplot == null) {
+        plot = dplot;
+      } else {
+        plot = vplot;
+      }
+      if (plot.hasOwner()) {
+        stub = "other";
+      } else {
+        stub = "unowned";
+      }
+    }
+
+    Player player;
+    if (damager instanceof Player) { // attacker is player
+      player = (Player) damager;
+    } else if (damager instanceof Projectile) {
+      Projectile projectile = (Projectile) damager;
+      ProjectileSource shooter = projectile.getShooter();
+      if (shooter instanceof Player) { // shooter is player
+        player = (Player) shooter;
+      } else { // shooter is not player
+        if (shooter instanceof BlockProjectileSource) {
+          Location sLoc = BukkitUtil
+              .getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+          dplot = dArea.getPlot(sLoc);
+        }
+        player = null;
+      }
+    } else { // Attacker is not player
+      player = null;
+    }
+    if (player != null) {
+      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+      if (victim instanceof Hanging) { // hanging
+        if (plot != null && (plot.getFlag(Flags.HANGING_BREAK, false) || plot
+            .isAdded(plotPlayer.getUUID()))) {
+          return true;
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
+          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+              "plots.admin.destroy." + stub);
+          return false;
+        }
+      } else if (victim.getEntityId() == 30) {
+        if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot
+            .isAdded(plotPlayer.getUUID()))) {
+          return true;
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
+          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+              "plots.admin.destroy." + stub);
+          return false;
+        }
+      } else if (victim instanceof Monster
+          || victim instanceof EnderDragon) { // victim is monster
+        if (plot != null && (plot.getFlag(Flags.HOSTILE_ATTACK, false) || plot
+            .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
+          return true;
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+          MainUtil
+              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+          return false;
+        }
+      } else if (victim instanceof Tameable) { // victim is tameable
+        if (plot != null && (plot.getFlag(Flags.TAMED_ATTACK, false) || plot
+            .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
+          return true;
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+          MainUtil
+              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+          return false;
+        }
+      } else if (victim instanceof Player) {
+        if (plot != null) {
+          if (Flags.PVP.isFalse(plot) && !Permissions
+              .hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
+            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                "plots.admin.pvp." + stub);
+            return false;
+          } else {
+            return true;
+          }
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
+          MainUtil
+              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
+          return false;
+        }
+      } else if (victim instanceof Creature) { // victim is animal
+        if (plot != null && (plot.getFlag(Flags.ANIMAL_ATTACK, false) || plot
+            .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
+          return true;
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+          MainUtil
+              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+          return false;
+        }
+      } else if (victim instanceof Vehicle) { // Vehicles are managed in vehicle destroy event
+        return true;
+      } else { // victim is something else
+        if (plot != null && (plot.getFlag(Flags.PVE, false) || plot
+            .isAdded(plotPlayer.getUUID()))) {
+          return true;
+        }
+        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+          MainUtil
+              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+          return false;
+        }
+      }
+      return true;
+    } else if (dplot != null && (!dplot.equals(vplot) || Objects
+        .equals(dplot.guessOwner(), vplot.guessOwner()))) {
+      return vplot != null && Flags.PVE.isTrue(vplot);
+    }
+    return ((vplot != null && Flags.PVE.isTrue(vplot)) || !(damager instanceof Arrow
+        && !(victim instanceof Creature)));
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onPlayerEggThrow(PlayerEggThrowEvent event) {
+    Location l = BukkitUtil.getLocation(event.getEgg().getLocation());
+    PlotArea area = l.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Player player = event.getPlayer();
+    PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+    Plot plot = area.getPlot(l);
+    if (plot == null) {
+      if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.road")) {
+        MainUtil
+            .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
+        event.setHatching(false);
+      }
+    } else if (!plot.hasOwner()) {
+      if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.unowned")) {
+        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+            "plots.admin.projectile.unowned");
+        event.setHatching(false);
+      }
+    } else if (!plot.isAdded(plotPlayer.getUUID())) {
+      if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.other")) {
+        MainUtil
+            .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
+        event.setHatching(false);
+      }
+    }
+  }
+
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void blockCreate(BlockPlaceEvent event) {
+    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+    PlotArea area = location.getPlotArea();
+    if (area == null) {
+      return;
+    }
+    Player player = event.getPlayer();
+    PlotPlayer pp = BukkitUtil.getPlayer(player);
+    Plot plot = area.getPlot(location);
+    if (plot != null) {
+      if ((location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
+          && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+        event.setCancelled(true);
+        MainUtil.sendMessage(pp,
+            C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+      }
+      if (!plot.hasOwner()) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+          MainUtil
+              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+          event.setCancelled(true);
+          return;
+        }
+      } else if (!plot.isAdded(pp.getUUID())) {
+        Set<PlotBlock> place = plot.getFlag(Flags.PLACE, null);
+        if (place != null) {
+          Block block = event.getBlock();
+          if (place.contains(PlotBlock.get(block.getType().name()))) {
+            return;
+          }
+        }
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+          event.setCancelled(true);
+          return;
+        }
+      } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+          event.setCancelled(true);
+          return;
+        }
+      }
+      if (plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
+        Block block = event.getBlockPlaced();
+        if (block.getType().hasGravity()) {
+          sendBlockChange(block.getLocation(), block.getBlockData());
+        }
+      }
+    } else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+      event.setCancelled(true);
+    }
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index a4df7c6b3..19cd4c554 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -10,6 +10,7 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -37,45 +38,43 @@ public class PlotPlusListener extends PlotListener implements Listener {
     private static final HashMap<UUID, Interval> healRunnable = new HashMap<>();
 
     public static void startRunnable(JavaPlugin plugin) {
-        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
-            @Override public void run() {
-                if (!healRunnable.isEmpty()) {
-                    for (Iterator<Entry<UUID, Interval>> iterator =
-                         healRunnable.entrySet().iterator(); iterator.hasNext(); ) {
-                        Entry<UUID, Interval> entry = iterator.next();
-                        Interval value = entry.getValue();
-                        ++value.count;
-                        if (value.count == value.interval) {
-                            value.count = 0;
-                            Player player = Bukkit.getPlayer(entry.getKey());
-                            if (player == null) {
-                                iterator.remove();
-                                continue;
-                            }
-                            double level = player.getHealth();
-                            if (level != value.max) {
-                                player.setHealth(Math.min(level + value.amount, value.max));
-                            }
+        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+            if (!healRunnable.isEmpty()) {
+                for (Iterator<Entry<UUID, Interval>> iterator =
+                     healRunnable.entrySet().iterator(); iterator.hasNext(); ) {
+                    Entry<UUID, Interval> entry = iterator.next();
+                    Interval value = entry.getValue();
+                    ++value.count;
+                    if (value.count == value.interval) {
+                        value.count = 0;
+                        Player player = Bukkit.getPlayer(entry.getKey());
+                        if (player == null) {
+                            iterator.remove();
+                            continue;
+                        }
+                        double level = player.getHealth();
+                        if (level != value.max) {
+                            player.setHealth(Math.min(level + value.amount, value.max));
                         }
                     }
                 }
-                if (!feedRunnable.isEmpty()) {
-                    for (Iterator<Entry<UUID, Interval>> iterator =
-                         feedRunnable.entrySet().iterator(); iterator.hasNext(); ) {
-                        Entry<UUID, Interval> entry = iterator.next();
-                        Interval value = entry.getValue();
-                        ++value.count;
-                        if (value.count == value.interval) {
-                            value.count = 0;
-                            Player player = Bukkit.getPlayer(entry.getKey());
-                            if (player == null) {
-                                iterator.remove();
-                                continue;
-                            }
-                            int level = player.getFoodLevel();
-                            if (level != value.max) {
-                                player.setFoodLevel(Math.min(level + value.amount, value.max));
-                            }
+            }
+            if (!feedRunnable.isEmpty()) {
+                for (Iterator<Entry<UUID, Interval>> iterator =
+                     feedRunnable.entrySet().iterator(); iterator.hasNext(); ) {
+                    Entry<UUID, Interval> entry = iterator.next();
+                    Interval value = entry.getValue();
+                    ++value.count;
+                    if (value.count == value.interval) {
+                        value.count = 0;
+                        Player player = Bukkit.getPlayer(entry.getKey());
+                        if (player == null) {
+                            iterator.remove();
+                            continue;
+                        }
+                        int level = player.getFoodLevel();
+                        if (level != value.max) {
+                            player.setFoodLevel(Math.min(level + value.amount, value.max));
                         }
                     }
                 }
@@ -108,7 +107,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
         if (event.getEntityType() != EntityType.PLAYER) {
             return;
         }
-        Player player = (Player) event.getEntity();
+        Entity player = event.getEntity();
         Plot plot = BukkitUtil.getLocation(player).getOwnedPlot();
         if (plot == null) {
             return;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index 6a3e26d59..321dde939 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -1,9 +1,13 @@
 package com.github.intellectualsites.plotsquared.bukkit.listeners;
 
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -14,11 +18,6 @@ import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.plugin.Plugin;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
-
 @SuppressWarnings("unused") public class SingleWorldListener implements Listener {
 
     private Method methodGetHandleChunk;
@@ -33,8 +32,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
             this.done = classChunk.getField("done").getRealField();
             this.lit = classChunk.getField("lit").getRealField();
             this.s = classChunk.getField("s").getRealField();
-        } catch (Throwable ignore) {
-            ignore.printStackTrace();
+        } catch (NoSuchFieldException exception) {
+            exception.printStackTrace();
         }
         Bukkit.getPluginManager().registerEvents(this, plugin);
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index e71373771..c06b66b71 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -12,685 +12,697 @@ import org.bukkit.util.Vector;
 
 public final class ReplicatingEntityWrapper extends EntityWrapper {
 
-    private final short depth;
-    private final int hash;
-    private final EntityBaseStats base = new EntityBaseStats();
+  private final short depth;
+  private final int hash;
+  private final EntityBaseStats base = new EntityBaseStats();
 
-    public ItemStack[] inventory;
-    // Extended
-    private ItemStack stack;
-    private byte dataByte;
-    private byte dataByte2;
-    private String dataString;
-    private LivingEntityStats lived;
-    private AgeableStats aged;
-    private TameableStats tamed;
-    private ArmorStandStats stand;
-    private HorseStats horse;
-    private boolean noGravity;
+  public ItemStack[] inventory;
+  // Extended
+  private ItemStack stack;
+  private byte dataByte;
+  private byte dataByte2;
+  private String dataString;
+  private LivingEntityStats lived;
+  private AgeableStats aged;
+  private TameableStats tamed;
+  private ArmorStandStats stand;
+  private HorseStats horse;
+  private boolean noGravity;
 
-    public ReplicatingEntityWrapper(Entity entity, short depth) {
-        super(entity);
+  public ReplicatingEntityWrapper(Entity entity, short depth) {
+    super(entity);
 
-        this.hash = entity.getEntityId();
-        this.depth = depth;
+    this.hash = entity.getEntityId();
+    this.depth = depth;
 
-        if (depth == 0) {
-            return;
-        }
-        Entity passenger = entity.getPassenger();
-        if (passenger != null) {
-            this.base.passenger = new ReplicatingEntityWrapper(passenger, depth);
-        }
-        this.base.fall = entity.getFallDistance();
-        this.base.fire = (short) entity.getFireTicks();
-        this.base.age = entity.getTicksLived();
-        Vector velocity = entity.getVelocity();
-        this.base.vX = velocity.getX();
-        this.base.vY = velocity.getY();
-        this.base.vZ = velocity.getZ();
-        if (depth == 1) {
-            return;
-        }
-        if (!entity.hasGravity()) {
-            this.noGravity = true;
-        }
-        switch (entity.getType()) {
-            case BOAT:
-                Boat boat = (Boat) entity;
-                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
-                return;
-            case ARROW:
-            case COMPLEX_PART:
-            case EGG:
-            case ENDER_CRYSTAL:
-            case ENDER_PEARL:
-            case ENDER_SIGNAL:
-            case EXPERIENCE_ORB:
-            case FALLING_BLOCK:
-            case FIREBALL:
-            case FIREWORK:
-            case FISHING_HOOK:
-            case LEASH_HITCH:
-            case LIGHTNING:
-            case MINECART:
-            case MINECART_COMMAND:
-            case MINECART_MOB_SPAWNER:
-            case MINECART_TNT:
-            case PLAYER:
-            case PRIMED_TNT:
-            case SLIME:
-            case SMALL_FIREBALL:
-            case SNOWBALL:
-            case MINECART_FURNACE:
-            case SPLASH_POTION:
-            case THROWN_EXP_BOTTLE:
-            case WEATHER:
-            case WITHER_SKULL:
-            case UNKNOWN:
-            case TIPPED_ARROW:
-            case SPECTRAL_ARROW:
-            case SHULKER_BULLET:
-            case DRAGON_FIREBALL:
-            case LINGERING_POTION:
-            case AREA_EFFECT_CLOUD:
-                // Do this stuff later
-                return;
-            // MISC //
-            case DROPPED_ITEM:
-                Item item = (Item) entity;
-                this.stack = item.getItemStack();
-                return;
-            case ITEM_FRAME:
-                this.x = Math.floor(this.x);
-                this.y = Math.floor(this.y);
-                this.z = Math.floor(this.z);
-                ItemFrame itemFrame = (ItemFrame) entity;
-                this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
-                this.stack = itemFrame.getItem().clone();
-                return;
-            case PAINTING:
-                this.x = Math.floor(this.x);
-                this.y = Math.floor(this.y);
-                this.z = Math.floor(this.z);
-                Painting painting = (Painting) entity;
-                Art art = painting.getArt();
-                this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
-                int h = art.getBlockHeight();
-                if (h % 2 == 0) {
-                    this.y -= 1;
-                }
-                this.dataString = art.name();
-                return;
-            // END MISC //
-            // INVENTORY HOLDER //
-            case MINECART_CHEST:
-            case MINECART_HOPPER:
-                storeInventory((InventoryHolder) entity);
-                return;
-            // START LIVING ENTITY //
-            // START AGEABLE //
-            // START TAMEABLE //
-            case HORSE:
-                Horse horse = (Horse) entity;
-                this.horse = new HorseStats();
-                this.horse.jump = horse.getJumpStrength();
-                this.horse.chest = horse.isCarryingChest();
-                this.horse.variant = horse.getVariant();
-                this.horse.style = horse.getStyle();
-                this.horse.color = horse.getColor();
-                storeTameable(horse);
-                storeAgeable(horse);
-                storeLiving(horse);
-                storeInventory(horse);
-                return;
-            // END INVENTORY HOLDER //
-            case WOLF:
-            case OCELOT:
-                storeTameable((Tameable) entity);
-                storeAgeable((Ageable) entity);
-                storeLiving((LivingEntity) entity);
-                return;
-            // END TAMEABLE //
-            case SHEEP:
-                Sheep sheep = (Sheep) entity;
-                this.dataByte = (byte) (sheep.isSheared() ? 1 : 0);
-                this.dataByte2 = sheep.getColor().getDyeData();
-                storeAgeable(sheep);
-                storeLiving(sheep);
-                return;
-            case VILLAGER:
-            case CHICKEN:
-            case COW:
-            case MUSHROOM_COW:
-            case PIG:
-            case POLAR_BEAR:
-                storeAgeable((Ageable) entity);
-                storeLiving((LivingEntity) entity);
-                return;
-            case RABBIT:
-                this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
-                storeAgeable((Ageable) entity);
-                storeLiving((LivingEntity) entity);
-                return;
-            // END AGEABLE //
-            case GUARDIAN:
-                this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
-                storeLiving((LivingEntity) entity);
-                return;
-            case SKELETON:
-                this.dataByte = getOrdinal(Skeleton.SkeletonType.values(),
-                    ((Skeleton) entity).getSkeletonType());
-                storeLiving((LivingEntity) entity);
-                return;
-            case ARMOR_STAND:
-                ArmorStand stand = (ArmorStand) entity;
-                this.inventory =
-                    new ItemStack[] {stand.getItemInHand().clone(), stand.getHelmet().clone(),
-                        stand.getChestplate().clone(), stand.getLeggings().clone(),
-                        stand.getBoots().clone()};
-                storeLiving(stand);
-                this.stand = new ArmorStandStats();
-
-                EulerAngle head = stand.getHeadPose();
-                this.stand.head[0] = (float) head.getX();
-                this.stand.head[1] = (float) head.getY();
-                this.stand.head[2] = (float) head.getZ();
-
-                EulerAngle body = stand.getBodyPose();
-                this.stand.body[0] = (float) body.getX();
-                this.stand.body[1] = (float) body.getY();
-                this.stand.body[2] = (float) body.getZ();
-
-                EulerAngle leftLeg = stand.getLeftLegPose();
-                this.stand.leftLeg[0] = (float) leftLeg.getX();
-                this.stand.leftLeg[1] = (float) leftLeg.getY();
-                this.stand.leftLeg[2] = (float) leftLeg.getZ();
-
-                EulerAngle rightLeg = stand.getRightLegPose();
-                this.stand.rightLeg[0] = (float) rightLeg.getX();
-                this.stand.rightLeg[1] = (float) rightLeg.getY();
-                this.stand.rightLeg[2] = (float) rightLeg.getZ();
-
-                EulerAngle leftArm = stand.getLeftArmPose();
-                this.stand.leftArm[0] = (float) leftArm.getX();
-                this.stand.leftArm[1] = (float) leftArm.getY();
-                this.stand.leftArm[2] = (float) leftArm.getZ();
-
-                EulerAngle rightArm = stand.getRightArmPose();
-                this.stand.rightArm[0] = (float) rightArm.getX();
-                this.stand.rightArm[1] = (float) rightArm.getY();
-                this.stand.rightArm[2] = (float) rightArm.getZ();
-
-                if (stand.hasArms()) {
-                    this.stand.arms = true;
-                }
-                if (!stand.hasBasePlate()) {
-                    this.stand.noPlate = true;
-                }
-                if (!stand.isVisible()) {
-                    this.stand.invisible = true;
-                }
-                if (stand.isSmall()) {
-                    this.stand.small = true;
-                }
-                return;
-            case ENDERMITE:
-                return;
-            case BAT:
-                if (((Bat) entity).isAwake()) {
-                    this.dataByte = (byte) 1;
-                } else {
-                    this.dataByte = (byte) 0;
-                }
-                return;
-            case ENDER_DRAGON:
-                EnderDragon entity1 = (EnderDragon) entity;
-                this.dataByte = (byte) entity1.getPhase().ordinal();
-                return;
-            case GHAST:
-            case MAGMA_CUBE:
-            case SQUID:
-            case PIG_ZOMBIE:
-            case ZOMBIE:
-            case WITHER:
-            case WITCH:
-            case SPIDER:
-            case CAVE_SPIDER:
-            case SILVERFISH:
-            case GIANT:
-            case ENDERMAN:
-            case CREEPER:
-            case BLAZE:
-            case SHULKER:
-            case SNOWMAN:
-                storeLiving((LivingEntity) entity);
-                return;
-            case IRON_GOLEM:
-                if (((IronGolem) entity).isPlayerCreated()) {
-                    this.dataByte = (byte) 1;
-                } else {
-                    this.dataByte = (byte) 0;
-                }
-                storeLiving((LivingEntity) entity);
-                // END LIVING //
-            default:
-                PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
-        }
+    if (depth == 0) {
+      return;
     }
-
-    @Override public boolean equals(Object obj) {
-        return this.hash == obj.hashCode();
+    Entity passenger = entity.getPassenger();
+    if (passenger != null) {
+      this.base.passenger = new ReplicatingEntityWrapper(passenger, depth);
     }
-
-    @Override public int hashCode() {
-        return this.hash;
+    this.base.fall = entity.getFallDistance();
+    this.base.fire = (short) entity.getFireTicks();
+    this.base.age = entity.getTicksLived();
+    Vector velocity = entity.getVelocity();
+    this.base.vX = velocity.getX();
+    this.base.vY = velocity.getY();
+    this.base.vZ = velocity.getZ();
+    if (depth == 1) {
+      return;
     }
-
-    public void storeInventory(InventoryHolder held) {
-        this.inventory = held.getInventory().getContents().clone();
+    if (!entity.hasGravity()) {
+      this.noGravity = true;
     }
+    switch (entity.getType()) {
+      case BOAT:
+        Boat boat = (Boat) entity;
+        this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
+        return;
+      case ARROW:
+      case COMPLEX_PART:
+      case EGG:
+      case ENDER_CRYSTAL:
+      case ENDER_PEARL:
+      case ENDER_SIGNAL:
+      case EXPERIENCE_ORB:
+      case FALLING_BLOCK:
+      case FIREBALL:
+      case FIREWORK:
+      case FISHING_HOOK:
+      case LEASH_HITCH:
+      case LIGHTNING:
+      case MINECART:
+      case MINECART_COMMAND:
+      case MINECART_MOB_SPAWNER:
+      case MINECART_TNT:
+      case PLAYER:
+      case PRIMED_TNT:
+      case SLIME:
+      case SMALL_FIREBALL:
+      case SNOWBALL:
+      case MINECART_FURNACE:
+      case SPLASH_POTION:
+      case THROWN_EXP_BOTTLE:
+      case WEATHER:
+      case WITHER_SKULL:
+      case UNKNOWN:
+      case TIPPED_ARROW:
+      case SPECTRAL_ARROW:
+      case SHULKER_BULLET:
+      case DRAGON_FIREBALL:
+      case LINGERING_POTION:
+      case AREA_EFFECT_CLOUD:
+        // Do this stuff later
+        return;
+      // MISC //
+      case DROPPED_ITEM:
+        Item item = (Item) entity;
+        this.stack = item.getItemStack();
+        return;
+      case ITEM_FRAME:
+        this.x = Math.floor(this.x);
+        this.y = Math.floor(this.y);
+        this.z = Math.floor(this.z);
+        ItemFrame itemFrame = (ItemFrame) entity;
+        this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
+        this.stack = itemFrame.getItem().clone();
+        return;
+      case PAINTING:
+        this.x = Math.floor(this.x);
+        this.y = Math.floor(this.y);
+        this.z = Math.floor(this.z);
+        Painting painting = (Painting) entity;
+        Art art = painting.getArt();
+        this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
+        int h = art.getBlockHeight();
+        if (h % 2 == 0) {
+          this.y -= 1;
+        }
+        this.dataString = art.name();
+        return;
+      // END MISC //
+      // INVENTORY HOLDER //
+      case MINECART_CHEST:
+      case MINECART_HOPPER:
+        storeInventory((InventoryHolder) entity);
+        return;
+      // START LIVING ENTITY //
+      // START AGEABLE //
+      // START TAMEABLE //
+      case HORSE:
+        Horse horse = (Horse) entity;
+        this.horse = new HorseStats();
+        this.horse.jump = horse.getJumpStrength();
+        if (horse instanceof ChestedHorse) {
+          this.horse.chest = ((ChestedHorse) horse).isCarryingChest();
+        } else {
+          this.horse.chest = false;
+        }
+        this.horse.variant = horse.getVariant();
+        this.horse.style = horse.getStyle();
+        this.horse.color = horse.getColor();
+        storeTameable(horse);
+        storeAgeable(horse);
+        storeLiving(horse);
+        storeInventory(horse);
+        return;
+      // END INVENTORY HOLDER //
+      case WOLF:
+      case OCELOT:
+        storeTameable((Tameable) entity);
+        storeAgeable((Ageable) entity);
+        storeLiving((LivingEntity) entity);
+        return;
+      // END TAMEABLE //
+      case SHEEP:
+        Sheep sheep = (Sheep) entity;
+        this.dataByte = (byte) (sheep.isSheared() ? 1 : 0);
+        this.dataByte2 = sheep.getColor().getDyeData();
+        storeAgeable(sheep);
+        storeLiving(sheep);
+        return;
+      case VILLAGER:
+      case CHICKEN:
+      case COW:
+      case MUSHROOM_COW:
+      case PIG:
+      case POLAR_BEAR:
+        storeAgeable((Ageable) entity);
+        storeLiving((LivingEntity) entity);
+        return;
+      case RABBIT:
+        this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
+        storeAgeable((Ageable) entity);
+        storeLiving((LivingEntity) entity);
+        return;
+      // END AGEABLE //
+      case GUARDIAN:
+        //todo no longer works (possible exception thrown)
+        this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
+        storeLiving((LivingEntity) entity);
+        return;
+      case SKELETON:
+        //todo no longer works (possible exception thrown)
+        this.dataByte = getOrdinal(Skeleton.SkeletonType.values(),
+            ((Skeleton) entity).getSkeletonType());
+        storeLiving((LivingEntity) entity);
+        return;
+      case ARMOR_STAND:
+        ArmorStand stand = (ArmorStand) entity;
+        this.inventory =
+            new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
+                stand.getChestplate().clone(), stand.getLeggings().clone(),
+                stand.getBoots().clone()};
+        storeLiving(stand);
+        this.stand = new ArmorStandStats();
 
-    void restoreLiving(LivingEntity entity) {
-        entity.setCanPickupItems(this.lived.loot);
-        if (this.lived.name != null) {
-            entity.setCustomName(this.lived.name);
-            entity.setCustomNameVisible(this.lived.visible);
-        }
-        if (this.lived.potions != null && !this.lived.potions.isEmpty()) {
-            entity.addPotionEffects(this.lived.potions);
-        }
-        entity.setRemainingAir(this.lived.air);
-        entity.setRemoveWhenFarAway(this.lived.persistent);
-        if (this.lived.equipped) {
-            this.restoreEquipment(entity);
-        }
-        if (this.lived.leashed) {
-            // TODO leashes
-            //            World world = entity.getWorld();
-            //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) + lived.leashX, Math.floor(y) + lived.leashY, Math
-            // .floor(z) + lived.leashZ), EntityType.LEASH_HITCH);
-            //            entity.setLeashHolder(leash);
-        }
-    }
+        EulerAngle head = stand.getHeadPose();
+        this.stand.head[0] = (float) head.getX();
+        this.stand.head[1] = (float) head.getY();
+        this.stand.head[2] = (float) head.getZ();
 
-    void restoreEquipment(LivingEntity entity) {
-        EntityEquipment equipment = entity.getEquipment();
-        equipment.setItemInMainHand(this.lived.mainHand);
-        equipment.setItemInOffHand(this.lived.offHand);
-        equipment.setHelmet(this.lived.helmet);
-        equipment.setChestplate(this.lived.chestplate);
-        equipment.setLeggings(this.lived.leggings);
-        equipment.setBoots(this.lived.boots);
-    }
+        EulerAngle body = stand.getBodyPose();
+        this.stand.body[0] = (float) body.getX();
+        this.stand.body[1] = (float) body.getY();
+        this.stand.body[2] = (float) body.getZ();
 
-    private void restoreInventory(InventoryHolder entity) {
-        try {
-            entity.getInventory().setContents(this.inventory);
-        } catch (IllegalArgumentException e) {
-            PlotSquared.debug("&c[WARN] Failed to restore inventory.\n Reason: " + e.getMessage());
-        }
-    }
+        EulerAngle leftLeg = stand.getLeftLegPose();
+        this.stand.leftLeg[0] = (float) leftLeg.getX();
+        this.stand.leftLeg[1] = (float) leftLeg.getY();
+        this.stand.leftLeg[2] = (float) leftLeg.getZ();
 
-    public void storeLiving(LivingEntity lived) {
-        this.lived = new LivingEntityStats();
-        this.lived.potions = lived.getActivePotionEffects();
-        this.lived.loot = lived.getCanPickupItems();
-        this.lived.name = lived.getCustomName();
-        this.lived.visible = lived.isCustomNameVisible();
-        this.lived.health = (float) lived.getHealth();
-        this.lived.air = (short) lived.getRemainingAir();
-        this.lived.persistent = lived.getRemoveWhenFarAway();
-        this.lived.leashed = lived.isLeashed();
-        if (this.lived.leashed) {
-            Location location = lived.getLeashHolder().getLocation();
-            this.lived.leashX = (short) (this.x - location.getBlockX());
-            this.lived.leashY = (short) (this.y - location.getBlockY());
-            this.lived.leashZ = (short) (this.z - location.getBlockZ());
-        }
-        EntityEquipment equipment = lived.getEquipment();
-        this.lived.equipped = equipment != null;
-        if (this.lived.equipped) {
-            storeEquipment(equipment);
-        }
-    }
+        EulerAngle rightLeg = stand.getRightLegPose();
+        this.stand.rightLeg[0] = (float) rightLeg.getX();
+        this.stand.rightLeg[1] = (float) rightLeg.getY();
+        this.stand.rightLeg[2] = (float) rightLeg.getZ();
 
-    void storeEquipment(EntityEquipment equipment) {
-        this.lived.mainHand = equipment.getItemInMainHand().clone();
-        this.lived.offHand = equipment.getItemInOffHand().clone();
-        this.lived.boots = equipment.getBoots().clone();
-        this.lived.leggings = equipment.getLeggings().clone();
-        this.lived.chestplate = equipment.getChestplate().clone();
-        this.lived.helmet = equipment.getHelmet().clone();
-    }
+        EulerAngle leftArm = stand.getLeftArmPose();
+        this.stand.leftArm[0] = (float) leftArm.getX();
+        this.stand.leftArm[1] = (float) leftArm.getY();
+        this.stand.leftArm[2] = (float) leftArm.getZ();
 
-    private void restoreTameable(Tameable entity) {
-        if (this.tamed.tamed) {
-            if (this.tamed.owner != null) {
-                entity.setTamed(true);
-                entity.setOwner(this.tamed.owner);
-            }
-        }
-    }
+        EulerAngle rightArm = stand.getRightArmPose();
+        this.stand.rightArm[0] = (float) rightArm.getX();
+        this.stand.rightArm[1] = (float) rightArm.getY();
+        this.stand.rightArm[2] = (float) rightArm.getZ();
 
-    private void restoreAgeable(Ageable entity) {
-        if (!this.aged.adult) {
-            entity.setBaby();
+        if (stand.hasArms()) {
+          this.stand.arms = true;
         }
-        entity.setAgeLock(this.aged.locked);
-        if (this.aged.age > 0) {
-            entity.setAge(this.aged.age);
+        if (!stand.hasBasePlate()) {
+          this.stand.noPlate = true;
         }
+        if (!stand.isVisible()) {
+          this.stand.invisible = true;
+        }
+        if (stand.isSmall()) {
+          this.stand.small = true;
+        }
+        return;
+      case ENDERMITE:
+        return;
+      case BAT:
+        if (((Bat) entity).isAwake()) {
+          this.dataByte = (byte) 1;
+        } else {
+          this.dataByte = (byte) 0;
+        }
+        return;
+      case ENDER_DRAGON:
+        EnderDragon entity1 = (EnderDragon) entity;
+        this.dataByte = (byte) entity1.getPhase().ordinal();
+        return;
+      case GHAST:
+      case MAGMA_CUBE:
+      case SQUID:
+      case PIG_ZOMBIE:
+      case ZOMBIE:
+      case WITHER:
+      case WITCH:
+      case SPIDER:
+      case CAVE_SPIDER:
+      case SILVERFISH:
+      case GIANT:
+      case ENDERMAN:
+      case CREEPER:
+      case BLAZE:
+      case SHULKER:
+      case SNOWMAN:
+        storeLiving((LivingEntity) entity);
+        return;
+      case IRON_GOLEM:
+        if (((IronGolem) entity).isPlayerCreated()) {
+          this.dataByte = (byte) 1;
+        } else {
+          this.dataByte = (byte) 0;
+        }
+        storeLiving((LivingEntity) entity);
+        // END LIVING //
+      default:
+        PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
     }
+  }
 
-    public void storeAgeable(Ageable aged) {
-        this.aged = new AgeableStats();
-        this.aged.age = aged.getAge();
-        this.aged.locked = aged.getAgeLock();
-        this.aged.adult = aged.isAdult();
-    }
+  @Override
+  public boolean equals(Object obj) {
+    return this.hash == obj.hashCode();
+  }
 
-    public void storeTameable(Tameable tamed) {
-        this.tamed = new TameableStats();
-        this.tamed.owner = tamed.getOwner();
-        this.tamed.tamed = tamed.isTamed();
-    }
+  @Override
+  public int hashCode() {
+    return this.hash;
+  }
 
-    @Override public Entity spawn(World world, int xOffset, int zOffset) {
-        Location location = new Location(world, this.x + xOffset, this.y, this.z + zOffset);
-        location.setYaw(this.yaw);
-        location.setPitch(this.pitch);
-        if (!this.getType().isSpawnable()) {
-            return null;
-        }
-        Entity entity;
-        switch (this.getType()) {
-            case DROPPED_ITEM:
-                return world.dropItem(location, this.stack);
-            case PLAYER:
-            case LEASH_HITCH:
-                return null;
-            case ITEM_FRAME:
-                entity = world.spawn(location, ItemFrame.class);
-                break;
-            case PAINTING:
-                entity = world.spawn(location, Painting.class);
-                break;
-            default:
-                entity = world.spawnEntity(location, this.getType());
-                break;
-        }
-        if (this.depth == 0) {
-            return entity;
-        }
-        if (this.base.passenger != null) {
-            try {
-                entity.setPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
-            } catch (Exception ignored) {
-            }
-        }
-        if (this.base.fall != 0) {
-            entity.setFallDistance(this.base.fall);
-        }
-        if (this.base.fire != 0) {
-            entity.setFireTicks(this.base.fire);
-        }
-        if (this.base.age != 0) {
-            entity.setTicksLived(this.base.age);
-        }
-        entity.setVelocity(new Vector(this.base.vX, this.base.vY, this.base.vZ));
-        if (this.depth == 1) {
-            return entity;
-        }
-        if (this.noGravity) {
-            entity.setGravity(false);
-        }
-        switch (entity.getType()) {
-            case BOAT:
-                Boat boat = (Boat) entity;
-                boat.setWoodType(TreeSpecies.values()[dataByte]);
-                return entity;
-            case SLIME:
-                ((Slime) entity).setSize(this.dataByte);
-                return entity;
-            case ARROW:
-            case COMPLEX_PART:
-            case EGG:
-            case ENDER_CRYSTAL:
-            case ENDER_PEARL:
-            case ENDER_SIGNAL:
-            case DROPPED_ITEM:
-            case EXPERIENCE_ORB:
-            case FALLING_BLOCK:
-            case FIREBALL:
-            case FIREWORK:
-            case FISHING_HOOK:
-            case LEASH_HITCH:
-            case LIGHTNING:
-            case MINECART:
-            case MINECART_COMMAND:
-            case MINECART_MOB_SPAWNER:
-            case MINECART_TNT:
-            case PLAYER:
-            case PRIMED_TNT:
-            case SMALL_FIREBALL:
-            case SNOWBALL:
-            case SPLASH_POTION:
-            case THROWN_EXP_BOTTLE:
-            case WEATHER:
-            case TIPPED_ARROW:
-            case SPECTRAL_ARROW:
-            case SHULKER_BULLET:
-            case LINGERING_POTION:
-            case AREA_EFFECT_CLOUD:
-            case DRAGON_FIREBALL:
-            case WITHER_SKULL:
-            case MINECART_FURNACE:
-            case UNKNOWN:
-                // Do this stuff later
-                return entity;
-            // MISC //
-            case ITEM_FRAME:
-                ItemFrame itemframe = (ItemFrame) entity;
-                itemframe.setRotation(Rotation.values()[this.dataByte]);
-                itemframe.setItem(this.stack);
-                return entity;
-            case PAINTING:
-                Painting painting = (Painting) entity;
-                painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
-                painting.setArt(Art.getByName(this.dataString), true);
-                return entity;
-            // END MISC //
-            // INVENTORY HOLDER //
-            case MINECART_CHEST:
-            case MINECART_HOPPER:
-                restoreInventory((InventoryHolder) entity);
-                return entity;
-            // START LIVING ENTITY //
-            // START AGEABLE //
-            // START TAMEABLE //
-            case HORSE:
-                Horse horse = (Horse) entity;
-                horse.setJumpStrength(this.horse.jump);
-                horse.setCarryingChest(this.horse.chest);
-                horse.setVariant(this.horse.variant);
-                horse.setStyle(this.horse.style);
-                horse.setColor(this.horse.color);
-                restoreTameable(horse);
-                restoreAgeable(horse);
-                restoreLiving(horse);
-                restoreInventory(horse);
-                return entity;
-            // END INVENTORY HOLDER //
-            case WOLF:
-            case OCELOT:
-                restoreTameable((Tameable) entity);
-                restoreAgeable((Ageable) entity);
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            // END AGEABLE //
-            case SHEEP:
-                Sheep sheep = (Sheep) entity;
-                if (this.dataByte == 1) {
-                    sheep.setSheared(true);
-                }
-                if (this.dataByte2 != 0) {
-                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
-                }
-                restoreAgeable(sheep);
-                restoreLiving(sheep);
-                return sheep;
-            case VILLAGER:
-            case CHICKEN:
-            case COW:
-            case POLAR_BEAR:
-            case MUSHROOM_COW:
-            case PIG:
-                restoreAgeable((Ageable) entity);
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            // END AGEABLE //
-            case RABBIT:
-                if (this.dataByte != 0) {
-                    ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
-                }
-                restoreAgeable((Ageable) entity);
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            case GUARDIAN:
-                if (this.dataByte != 0) {
-                    ((Guardian) entity).setElder(true);
-                }
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            case SKELETON:
-                if (this.dataByte != 0) {
-                    ((Skeleton) entity)
-                        .setSkeletonType(Skeleton.SkeletonType.values()[this.dataByte]);
-                }
-                storeLiving((LivingEntity) entity);
-                return entity;
-            case ARMOR_STAND:
-                // CHECK positions
-                ArmorStand stand = (ArmorStand) entity;
-                if (this.inventory[0] != null) {
-                    stand.setItemInHand(this.inventory[0]);
-                }
-                if (this.inventory[1] != null) {
-                    stand.setHelmet(this.inventory[1]);
-                }
-                if (this.inventory[2] != null) {
-                    stand.setChestplate(this.inventory[2]);
-                }
-                if (this.inventory[3] != null) {
-                    stand.setLeggings(this.inventory[3]);
-                }
-                if (this.inventory[4] != null) {
-                    stand.setBoots(this.inventory[4]);
-                }
-                if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
-                    EulerAngle pose =
-                        new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
-                    stand.setHeadPose(pose);
-                }
-                if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
-                    EulerAngle pose =
-                        new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
-                    stand.setBodyPose(pose);
-                }
-                if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0
-                    || this.stand.leftLeg[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1],
-                        this.stand.leftLeg[2]);
-                    stand.setLeftLegPose(pose);
-                }
-                if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0
-                    || this.stand.rightLeg[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1],
-                        this.stand.rightLeg[2]);
-                    stand.setRightLegPose(pose);
-                }
-                if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0
-                    || this.stand.leftArm[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1],
-                        this.stand.leftArm[2]);
-                    stand.setLeftArmPose(pose);
-                }
-                if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0
-                    || this.stand.rightArm[2] != 0) {
-                    EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1],
-                        this.stand.rightArm[2]);
-                    stand.setRightArmPose(pose);
-                }
-                if (this.stand.invisible) {
-                    stand.setVisible(false);
-                }
-                if (this.stand.arms) {
-                    stand.setArms(true);
-                }
-                if (this.stand.noPlate) {
-                    stand.setBasePlate(false);
-                }
-                if (this.stand.small) {
-                    stand.setSmall(true);
-                }
-                restoreLiving(stand);
-                return stand;
-            case BAT:
-                if (this.dataByte != 0) {
-                    ((Bat) entity).setAwake(true);
-                }
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            case ENDER_DRAGON:
-                if (this.dataByte != 0) {
-                    ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
-                }
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            case ENDERMITE:
-            case GHAST:
-            case MAGMA_CUBE:
-            case SQUID:
-            case PIG_ZOMBIE:
-            case ZOMBIE:
-            case WITHER:
-            case WITCH:
-            case SPIDER:
-            case CAVE_SPIDER:
-            case SILVERFISH:
-            case GIANT:
-            case ENDERMAN:
-            case CREEPER:
-            case BLAZE:
-            case SNOWMAN:
-            case SHULKER:
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            case IRON_GOLEM:
-                if (this.dataByte != 0) {
-                    ((IronGolem) entity).setPlayerCreated(true);
-                }
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            default:
-                PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
-                return entity;
-            // END LIVING
-        }
-    }
+  public void storeInventory(InventoryHolder held) {
+    this.inventory = held.getInventory().getContents().clone();
+  }
 
-    public void saveEntity() {
+  void restoreLiving(LivingEntity entity) {
+    entity.setCanPickupItems(this.lived.loot);
+    if (this.lived.name != null) {
+      entity.setCustomName(this.lived.name);
+      entity.setCustomNameVisible(this.lived.visible);
     }
+    if (this.lived.potions != null && !this.lived.potions.isEmpty()) {
+      entity.addPotionEffects(this.lived.potions);
+    }
+    entity.setRemainingAir(this.lived.air);
+    entity.setRemoveWhenFarAway(this.lived.persistent);
+    if (this.lived.equipped) {
+      this.restoreEquipment(entity);
+    }
+    if (this.lived.leashed) {
+      // TODO leashes
+      //            World world = entity.getWorld();
+      //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) + lived.leashX, Math.floor(y) + lived.leashY, Math
+      // .floor(z) + lived.leashZ), EntityType.LEASH_HITCH);
+      //            entity.setLeashHolder(leash);
+    }
+  }
 
-    private byte getOrdinal(Object[] list, Object value) {
-        for (byte i = 0; i < list.length; i++) {
-            if (list[i].equals(value)) {
-                return i;
-            }
-        }
-        return 0;
+  void restoreEquipment(LivingEntity entity) {
+    EntityEquipment equipment = entity.getEquipment();
+    equipment.setItemInMainHand(this.lived.mainHand);
+    equipment.setItemInOffHand(this.lived.offHand);
+    equipment.setHelmet(this.lived.helmet);
+    equipment.setChestplate(this.lived.chestplate);
+    equipment.setLeggings(this.lived.leggings);
+    equipment.setBoots(this.lived.boots);
+  }
+
+  private void restoreInventory(InventoryHolder entity) {
+    try {
+      entity.getInventory().setContents(this.inventory);
+    } catch (IllegalArgumentException e) {
+      PlotSquared.debug("&c[WARN] Failed to restore inventory.\n Reason: " + e.getMessage());
     }
+  }
+
+  public void storeLiving(LivingEntity lived) {
+    this.lived = new LivingEntityStats();
+    this.lived.potions = lived.getActivePotionEffects();
+    this.lived.loot = lived.getCanPickupItems();
+    this.lived.name = lived.getCustomName();
+    this.lived.visible = lived.isCustomNameVisible();
+    this.lived.health = (float) lived.getHealth();
+    this.lived.air = (short) lived.getRemainingAir();
+    this.lived.persistent = lived.getRemoveWhenFarAway();
+    this.lived.leashed = lived.isLeashed();
+    if (this.lived.leashed) {
+      Location location = lived.getLeashHolder().getLocation();
+      this.lived.leashX = (short) (this.x - location.getBlockX());
+      this.lived.leashY = (short) (this.y - location.getBlockY());
+      this.lived.leashZ = (short) (this.z - location.getBlockZ());
+    }
+    EntityEquipment equipment = lived.getEquipment();
+    this.lived.equipped = equipment != null;
+    if (this.lived.equipped) {
+      storeEquipment(equipment);
+    }
+  }
+
+  void storeEquipment(EntityEquipment equipment) {
+    this.lived.mainHand = equipment.getItemInMainHand().clone();
+    this.lived.offHand = equipment.getItemInOffHand().clone();
+    this.lived.boots = equipment.getBoots().clone();
+    this.lived.leggings = equipment.getLeggings().clone();
+    this.lived.chestplate = equipment.getChestplate().clone();
+    this.lived.helmet = equipment.getHelmet().clone();
+  }
+
+  private void restoreTameable(Tameable entity) {
+    if (this.tamed.tamed) {
+      if (this.tamed.owner != null) {
+        entity.setTamed(true);
+        entity.setOwner(this.tamed.owner);
+      }
+    }
+  }
+
+  private void restoreAgeable(Ageable entity) {
+    if (!this.aged.adult) {
+      entity.setBaby();
+    }
+    entity.setAgeLock(this.aged.locked);
+    if (this.aged.age > 0) {
+      entity.setAge(this.aged.age);
+    }
+  }
+
+  public void storeAgeable(Ageable aged) {
+    this.aged = new AgeableStats();
+    this.aged.age = aged.getAge();
+    this.aged.locked = aged.getAgeLock();
+    this.aged.adult = aged.isAdult();
+  }
+
+  public void storeTameable(Tameable tamed) {
+    this.tamed = new TameableStats();
+    this.tamed.owner = tamed.getOwner();
+    this.tamed.tamed = tamed.isTamed();
+  }
+
+  @Override
+  public Entity spawn(World world, int xOffset, int zOffset) {
+    Location location = new Location(world, this.x + xOffset, this.y, this.z + zOffset);
+    location.setYaw(this.yaw);
+    location.setPitch(this.pitch);
+    if (!this.getType().isSpawnable()) {
+      return null;
+    }
+    Entity entity;
+    switch (this.getType()) {
+      case DROPPED_ITEM:
+        return world.dropItem(location, this.stack);
+      case PLAYER:
+      case LEASH_HITCH:
+        return null;
+      case ITEM_FRAME:
+        entity = world.spawn(location, ItemFrame.class);
+        break;
+      case PAINTING:
+        entity = world.spawn(location, Painting.class);
+        break;
+      default:
+        entity = world.spawnEntity(location, this.getType());
+        break;
+    }
+    if (this.depth == 0) {
+      return entity;
+    }
+    if (this.base.passenger != null) {
+      entity.addPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
+    }
+    if (this.base.fall != 0) {
+      entity.setFallDistance(this.base.fall);
+    }
+    if (this.base.fire != 0) {
+      entity.setFireTicks(this.base.fire);
+    }
+    if (this.base.age != 0) {
+      entity.setTicksLived(this.base.age);
+    }
+    entity.setVelocity(new Vector(this.base.vX, this.base.vY, this.base.vZ));
+    if (this.depth == 1) {
+      return entity;
+    }
+    if (this.noGravity) {
+      entity.setGravity(false);
+    }
+    switch (entity.getType()) {
+      case BOAT:
+        Boat boat = (Boat) entity;
+        boat.setWoodType(TreeSpecies.values()[dataByte]);
+        return entity;
+      case SLIME:
+        ((Slime) entity).setSize(this.dataByte);
+        return entity;
+      case ARROW:
+      case COMPLEX_PART:
+      case EGG:
+      case ENDER_CRYSTAL:
+      case ENDER_PEARL:
+      case ENDER_SIGNAL:
+      case DROPPED_ITEM:
+      case EXPERIENCE_ORB:
+      case FALLING_BLOCK:
+      case FIREBALL:
+      case FIREWORK:
+      case FISHING_HOOK:
+      case LEASH_HITCH:
+      case LIGHTNING:
+      case MINECART:
+      case MINECART_COMMAND:
+      case MINECART_MOB_SPAWNER:
+      case MINECART_TNT:
+      case PLAYER:
+      case PRIMED_TNT:
+      case SMALL_FIREBALL:
+      case SNOWBALL:
+      case SPLASH_POTION:
+      case THROWN_EXP_BOTTLE:
+      case WEATHER:
+      case TIPPED_ARROW:
+      case SPECTRAL_ARROW:
+      case SHULKER_BULLET:
+      case LINGERING_POTION:
+      case AREA_EFFECT_CLOUD:
+      case DRAGON_FIREBALL:
+      case WITHER_SKULL:
+      case MINECART_FURNACE:
+      case UNKNOWN:
+        // Do this stuff later
+        return entity;
+      // MISC //
+      case ITEM_FRAME:
+        ItemFrame itemframe = (ItemFrame) entity;
+        itemframe.setRotation(Rotation.values()[this.dataByte]);
+        itemframe.setItem(this.stack);
+        return entity;
+      case PAINTING:
+        Painting painting = (Painting) entity;
+        painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
+        painting.setArt(Art.getByName(this.dataString), true);
+        return entity;
+      // END MISC //
+      // INVENTORY HOLDER //
+      case MINECART_CHEST:
+      case MINECART_HOPPER:
+        restoreInventory((InventoryHolder) entity);
+        return entity;
+      // START LIVING ENTITY //
+      // START AGEABLE //
+      // START TAMEABLE //
+      case HORSE:
+        Horse horse = (Horse) entity;
+        horse.setJumpStrength(this.horse.jump);
+        if (horse instanceof ChestedHorse && this.horse.chest) {
+          ((ChestedHorse) horse).setCarryingChest(true);
+        }
+        //todo broken in 1.13 possible exception thrown
+        horse.setVariant(this.horse.variant);
+        horse.setStyle(this.horse.style);
+        horse.setColor(this.horse.color);
+        restoreTameable(horse);
+        restoreAgeable(horse);
+        restoreLiving(horse);
+        restoreInventory(horse);
+        return entity;
+      // END INVENTORY HOLDER //
+      case WOLF:
+      case OCELOT:
+        restoreTameable((Tameable) entity);
+        restoreAgeable((Ageable) entity);
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      // END AGEABLE //
+      case SHEEP:
+        Sheep sheep = (Sheep) entity;
+        if (this.dataByte == 1) {
+          sheep.setSheared(true);
+        }
+        if (this.dataByte2 != 0) {
+          sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
+        }
+        restoreAgeable(sheep);
+        restoreLiving(sheep);
+        return sheep;
+      case VILLAGER:
+      case CHICKEN:
+      case COW:
+      case POLAR_BEAR:
+      case MUSHROOM_COW:
+      case PIG:
+        restoreAgeable((Ageable) entity);
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      // END AGEABLE //
+      case RABBIT:
+        if (this.dataByte != 0) {
+          ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
+        }
+        restoreAgeable((Ageable) entity);
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      case GUARDIAN:
+        if (this.dataByte != 0) {
+          //todo broken in 1.13 possible exception thrown
+
+          ((Guardian) entity).setElder(true);
+        }
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      case SKELETON:
+        if (this.dataByte != 0) {
+          //todo broken in 1.13 possible exception thrown
+          ((Skeleton) entity)
+              .setSkeletonType(Skeleton.SkeletonType.values()[this.dataByte]);
+        }
+        storeLiving((LivingEntity) entity);
+        return entity;
+      case ARMOR_STAND:
+        // CHECK positions
+        ArmorStand stand = (ArmorStand) entity;
+        if (this.inventory[0] != null) {
+          stand.setItemInHand(this.inventory[0]);
+        }
+        if (this.inventory[1] != null) {
+          stand.setHelmet(this.inventory[1]);
+        }
+        if (this.inventory[2] != null) {
+          stand.setChestplate(this.inventory[2]);
+        }
+        if (this.inventory[3] != null) {
+          stand.setLeggings(this.inventory[3]);
+        }
+        if (this.inventory[4] != null) {
+          stand.setBoots(this.inventory[4]);
+        }
+        if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
+          EulerAngle pose =
+              new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
+          stand.setHeadPose(pose);
+        }
+        if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
+          EulerAngle pose =
+              new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
+          stand.setBodyPose(pose);
+        }
+        if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0
+            || this.stand.leftLeg[2] != 0) {
+          EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1],
+              this.stand.leftLeg[2]);
+          stand.setLeftLegPose(pose);
+        }
+        if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0
+            || this.stand.rightLeg[2] != 0) {
+          EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1],
+              this.stand.rightLeg[2]);
+          stand.setRightLegPose(pose);
+        }
+        if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0
+            || this.stand.leftArm[2] != 0) {
+          EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1],
+              this.stand.leftArm[2]);
+          stand.setLeftArmPose(pose);
+        }
+        if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0
+            || this.stand.rightArm[2] != 0) {
+          EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1],
+              this.stand.rightArm[2]);
+          stand.setRightArmPose(pose);
+        }
+        if (this.stand.invisible) {
+          stand.setVisible(false);
+        }
+        if (this.stand.arms) {
+          stand.setArms(true);
+        }
+        if (this.stand.noPlate) {
+          stand.setBasePlate(false);
+        }
+        if (this.stand.small) {
+          stand.setSmall(true);
+        }
+        restoreLiving(stand);
+        return stand;
+      case BAT:
+        if (this.dataByte != 0) {
+          ((Bat) entity).setAwake(true);
+        }
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      case ENDER_DRAGON:
+        if (this.dataByte != 0) {
+          ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
+        }
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      case ENDERMITE:
+      case GHAST:
+      case MAGMA_CUBE:
+      case SQUID:
+      case PIG_ZOMBIE:
+      case ZOMBIE:
+      case WITHER:
+      case WITCH:
+      case SPIDER:
+      case CAVE_SPIDER:
+      case SILVERFISH:
+      case GIANT:
+      case ENDERMAN:
+      case CREEPER:
+      case BLAZE:
+      case SNOWMAN:
+      case SHULKER:
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      case IRON_GOLEM:
+        if (this.dataByte != 0) {
+          ((IronGolem) entity).setPlayerCreated(true);
+        }
+        restoreLiving((LivingEntity) entity);
+        return entity;
+      default:
+        PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
+        return entity;
+      // END LIVING
+    }
+  }
+
+  public void saveEntity() {
+  }
+
+  private byte getOrdinal(Object[] list, Object value) {
+    for (byte i = 0; i < list.length; i++) {
+      if (list[i].equals(value)) {
+        return i;
+      }
+    }
+    return 0;
+  }
 
 
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
index 3557f33af..d1eaa9081 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import org.bukkit.inventory.meta.Damageable;
 
 public class StateWrapper {
 
@@ -241,7 +242,7 @@ public class StateWrapper {
     public Map<String, Tag> serializeItem(ItemStack item) {
         Map<String, Tag> data = new HashMap<>();
         data.put("id", new StringTag(item.getType().name()));
-        data.put("Damage", new ShortTag(item.getDurability()));
+        data.put("Damage", new ShortTag((short) ((Damageable)item.getItemMeta()).getDamage()));
         data.put("Count", new ByteTag((byte) item.getAmount()));
         if (!item.getEnchantments().isEmpty()) {
             List<CompoundTag> enchantmentList = new ArrayList<>();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
index f4c249f97..df16d07a2 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
@@ -187,11 +187,7 @@ public abstract class TitleManager {
         throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
 
     private Class<?> getPrimitiveType(Class<?> clazz) {
-        if (CORRESPONDING_TYPES.containsKey(clazz)) {
-            return CORRESPONDING_TYPES.get(clazz);
-        } else {
-            return clazz;
-        }
+        return CORRESPONDING_TYPES.getOrDefault(clazz, clazz);
     }
 
     private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
index 92155ba45..817417087 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
@@ -335,7 +335,7 @@ public class TitleManager_1_11 {
     }
 
     private Class<?> getPrimitiveType(Class<?> clazz) {
-        return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
+        return CORRESPONDING_TYPES.getOrDefault(clazz, clazz);
     }
 
     private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
index 808dabb7a..34e392a27 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
@@ -99,10 +99,6 @@ public final class BukkitEventUtil extends EventUtil {
             new PlotChangeOwnerEvent(getPlayer(initiator), plot, oldOwner, newOwner, hasOldOwner));
     }
 
-    @Override public boolean callFlagRemove(Flag flag, Object object, PlotCluster cluster) {
-        return callEvent(new ClusterFlagRemoveEvent(flag, cluster));
-    }
-
     @Override @Nullable public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
         PlotRateEvent event = new PlotRateEvent(player, rating, plot);
         Bukkit.getServer().getPluginManager().callEvent(event);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
index c40e13d09..d855f9e39 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
@@ -83,7 +83,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
         }
         // int id = item.getTypeId();
         Material id = item.getType();
-        short data = item.getDurability();
+        //short data = item.getDurability();
         int amount = item.getAmount();
         String name = null;
         String[] lore = null;
@@ -94,7 +94,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
             }
             if (meta.hasLore()) {
                 List<String> itemLore = meta.getLore();
-                lore = itemLore.toArray(new String[itemLore.size()]);
+                lore = itemLore.toArray(new String[0]);
             }
         }
         return new PlotItemStack(id.name(), amount, name, lore);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
index f0987b219..41e515cc7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
@@ -1,5 +1,7 @@
 package com.github.intellectualsites.plotsquared.bukkit.util;
 
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
@@ -12,52 +14,49 @@ import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefFie
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map.Entry;
-
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
 
 /**
- * An utility that can be used to send chunks, rather than using bukkit code
- * to do so (uses heavy NMS).
+ * An utility that can be used to send chunks, rather than using bukkit code to do so (uses heavy
+ * NMS).
  */
 public class SendChunk {
 
-    private final RefMethod methodGetHandlePlayer;
-    private final RefMethod methodGetHandleChunk;
-    private final RefConstructor mapChunk;
-    private final RefField connection;
-    private final RefMethod send;
-    private final RefMethod methodInitLighting;
+  private final RefMethod methodGetHandlePlayer;
+  private final RefMethod methodGetHandleChunk;
+  private final RefConstructor mapChunk;
+  private final RefField connection;
+  private final RefMethod send;
+  private final RefMethod methodInitLighting;
 
-    /**
-     * Constructor.
-     */
-    public SendChunk() throws ClassNotFoundException, NoSuchMethodException, NoSuchFieldException {
-        RefConstructor tempMapChunk;
-        RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
-        this.methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
-        RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-        this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
-        RefClass classChunk = getRefClass("{nms}.Chunk");
-        this.methodInitLighting = classChunk.getMethod("initLighting");
-        RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
-        tempMapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), int.class);
-        this.mapChunk = tempMapChunk;
-        RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
-        this.connection = classEntityPlayer.getField("playerConnection");
-        RefClass classPacket = getRefClass("{nms}.Packet");
-        RefClass classConnection = getRefClass("{nms}.PlayerConnection");
-        this.send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
-    }
+  /**
+   * Constructor.
+   */
+  public SendChunk() throws ClassNotFoundException, NoSuchMethodException, NoSuchFieldException {
+    RefConstructor tempMapChunk;
+    RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
+    this.methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
+    RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
+    this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
+    RefClass classChunk = getRefClass("{nms}.Chunk");
+    this.methodInitLighting = classChunk.getMethod("initLighting");
+    RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
+    tempMapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), int.class);
+    this.mapChunk = tempMapChunk;
+    RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
+    this.connection = classEntityPlayer.getField("playerConnection");
+    RefClass classPacket = getRefClass("{nms}.Packet");
+    RefClass classConnection = getRefClass("{nms}.PlayerConnection");
+    this.send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
+  }
 
     public void sendChunk(Collection<Chunk> input) {
         HashSet<Chunk> chunks = new HashSet<>(input);
@@ -97,54 +96,52 @@ public class SendChunk {
             Player player = ((BukkitPlayer) pp).player;
             Object entity = this.methodGetHandlePlayer.of(player).call();
 
-            for (Chunk chunk : list) {
-                int dx = Math.abs(cx - chunk.getX());
-                int dz = Math.abs(cz - chunk.getZ());
-                if ((dx > view) || (dz > view)) {
-                    continue;
-                }
-                Object c = this.methodGetHandleChunk.of(chunk).call();
-                chunks.remove(chunk);
-                Object con = this.connection.of(entity).get();
-                Object packet = null;
-                try {
-                    packet = this.mapChunk.create(c, 65535);
-                } catch (Exception ignored) {
-                }
-                if (packet == null) {
-                    PlotSquared.debug("Error with PacketPlayOutMapChunk reflection.");
-                }
-                this.send.of(con).call(packet);
-            }
+      for (Chunk chunk : list) {
+        int dx = Math.abs(cx - chunk.getX());
+        int dz = Math.abs(cz - chunk.getZ());
+        if ((dx > view) || (dz > view)) {
+          continue;
         }
-        for (final Chunk chunk : chunks) {
-            TaskManager.runTask(new Runnable() {
-                @Override public void run() {
-                    try {
-                        chunk.unload(true, false);
-                    } catch (Throwable ignored) {
-                        String worldName = chunk.getWorld().getName();
-                        PlotSquared.debug(
-                            "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";"
-                                + chunk.getZ());
-                        PlotSquared
-                            .debug("$3 - $4File may be open in another process (e.g. MCEdit)");
-                        PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
-                            + "/level_old.dat may be corrupt (try repairing or removing these)");
-                    }
-                }
-            });
+        Object c = this.methodGetHandleChunk.of(chunk).call();
+        chunks.remove(chunk);
+        Object con = this.connection.of(entity).get();
+        Object packet = null;
+        try {
+          packet = this.mapChunk.create(c, 65535);
+        } catch (Exception ignored) {
         }
+        if (packet == null) {
+          PlotSquared.debug("Error with PacketPlayOutMapChunk reflection.");
+        }
+        this.send.of(con).call(packet);
+      }
     }
+    for (final Chunk chunk : chunks) {
+      TaskManager.runTask(() -> {
+        try {
+          chunk.unload(true, false);
+        } catch (Throwable ignored) {
+          String worldName = chunk.getWorld().getName();
+          PlotSquared.debug(
+              "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";"
+                  + chunk.getZ());
+          PlotSquared
+              .debug("$3 - $4File may be open in another process (e.g. MCEdit)");
+          PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
+              + "/level_old.dat may be corrupt (try repairing or removing these)");
+        }
+      });
+    }
+  }
 
-    public void sendChunk(String worldName, Collection<ChunkLoc> chunkLocations) {
-        World myWorld = Bukkit.getWorld(worldName);
-        ArrayList<Chunk> chunks = new ArrayList<>();
-        for (ChunkLoc loc : chunkLocations) {
-            if (myWorld.isChunkLoaded(loc.x, loc.z)) {
-                chunks.add(myWorld.getChunkAt(loc.x, loc.z));
-            }
-        }
-        sendChunk(chunks);
+  public void sendChunk(String worldName, Collection<ChunkLoc> chunkLocations) {
+    World myWorld = Bukkit.getWorld(worldName);
+    ArrayList<Chunk> chunks = new ArrayList<>();
+    for (ChunkLoc loc : chunkLocations) {
+      if (myWorld.isChunkLoaded(loc.x, loc.z)) {
+        chunks.add(myWorld.getChunkAt(loc.x, loc.z));
+      }
     }
+    sendChunk(chunks);
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index 77518690d..eee467db1 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -192,8 +192,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
             for (int x = 0; x < lc.biomes.length; x++) {
                 String[] biomes2 = lc.biomes[x];
                 if (biomes2 != null) {
-                    for (int y = 0; y < biomes2.length; y++) {
-                        String biomeStr = biomes2[y];
+                    for (String biomeStr : biomes2) {
                         if (biomeStr != null) {
                             if (last == null || !StringMan.isEqual(last, biomeStr)) {
                                 biome = Biome.valueOf(biomeStr.toUpperCase());
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index 3660bef92..aaa94dbeb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -5,12 +5,13 @@ import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
+import java.util.Arrays;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
 import java.util.UUID;
 
-public class DefaultUUIDWrapper extends UUIDWrapper {
+public class DefaultUUIDWrapper implements UUIDWrapper {
 
     @Override public UUID getUUID(PlotPlayer player) {
         return ((BukkitPlayer) player).player.getUniqueId();
@@ -30,11 +31,8 @@ public class DefaultUUIDWrapper extends UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
-        for (int i = 0; i < ops.length; i++) {
-            toReturn[i] = new BukkitOfflinePlayer(ops[i]);
-        }
-        return toReturn;
+        return Arrays.stream(ops).map(BukkitOfflinePlayer::new)
+            .toArray(BukkitOfflinePlayer[]::new);
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index 2223feceb..a8e2278b4 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -47,204 +47,200 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
         } else {
             world = worlds.get(0).getName();
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
-                File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
-                if (uuidFile.exists()) {
-                    try {
-                        List<String> lines =
-                            Files.readAllLines(uuidFile.toPath(), StandardCharsets.UTF_8);
-                        for (String line : lines) {
-                            try {
-                                line = line.trim();
-                                if (line.isEmpty()) {
-                                    continue;
-                                }
-                                line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
-                                String[] split = line.split("\\|");
-                                String name = split[0];
-                                if (name.isEmpty() || (name.length() > 16) || !StringMan
-                                    .isAlphanumericUnd(name)) {
-                                    continue;
-                                }
-                                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                                if (uuid == null) {
-                                    continue;
-                                }
-                                UUIDHandler.add(new StringWrapper(name), uuid);
-                            } catch (Exception e2) {
-                                e2.printStackTrace();
+        TaskManager.runTaskAsync(() -> {
+            PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
+            File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
+            if (uuidFile.exists()) {
+                try {
+                    List<String> lines =
+                        Files.readAllLines(uuidFile.toPath(), StandardCharsets.UTF_8);
+                    for (String line : lines) {
+                        try {
+                            line = line.trim();
+                            if (line.isEmpty()) {
+                                continue;
                             }
+                            line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
+                            String[] split = line.split("\\|");
+                            String name = split[0];
+                            if (name.isEmpty() || (name.length() > 16) || !StringMan
+                                .isAlphanumericUnd(name)) {
+                                continue;
+                            }
+                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                            if (uuid == null) {
+                                continue;
+                            }
+                            UUIDHandler.add(new StringWrapper(name), uuid);
+                        } catch (Exception e2) {
+                            e2.printStackTrace();
                         }
-                    } catch (IOException e) {
-                        e.printStackTrace();
                     }
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
-                HashBiMap<StringWrapper, UUID> toAdd =
-                    HashBiMap.create(new HashMap<StringWrapper, UUID>());
-                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-                    HashSet<UUID> all = UUIDHandler.getAllUUIDS();
-                    PlotSquared.debug("&aFast mode UUID caching enabled!");
-                    File playerDataFolder =
-                        new File(container, world + File.separator + "playerdata");
-                    String[] dat = playerDataFolder.list(new DatFileFilter());
-                    boolean check = all.isEmpty();
-                    if (dat != null) {
-                        for (String current : dat) {
-                            String s = current.replaceAll(".dat$", "");
-                            try {
-                                UUID uuid = UUID.fromString(s);
-                                if (check || all.remove(uuid)) {
-                                    File file = new File(playerDataFolder, current);
-                                    NbtFactory.NbtCompound compound = NbtFactory
-                                        .fromStream(new FileInputStream(file),
-                                            NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                                    if (!compound.containsKey("bukkit")) {
-                                        PlotSquared.debug("ERROR: Player data (" + uuid.toString()
-                                            + ".dat) does not contain the the key \"bukkit\"");
-                                    } else {
-                                        NbtFactory.NbtCompound bukkit =
-                                            (NbtFactory.NbtCompound) compound.get("bukkit");
-                                        String name = (String) bukkit.get("lastKnownName");
-                                        long last = (long) bukkit.get("lastPlayed");
-                                        long first = (long) bukkit.get("firstPlayed");
-                                        if (ExpireManager.IMP != null) {
-                                            ExpireManager.IMP.storeDate(uuid, last);
-                                            ExpireManager.IMP.storeAccountAge(uuid, last - first);
-                                        }
-                                        toAdd.put(new StringWrapper(name), uuid);
+            }
+            HashBiMap<StringWrapper, UUID> toAdd =
+                HashBiMap.create(new HashMap<>());
+            if (Settings.UUID.NATIVE_UUID_PROVIDER) {
+                HashSet<UUID> all = UUIDHandler.getAllUUIDS();
+                PlotSquared.debug("&aFast mode UUID caching enabled!");
+                File playerDataFolder =
+                    new File(container, world + File.separator + "playerdata");
+                String[] dat = playerDataFolder.list(new DatFileFilter());
+                boolean check = all.isEmpty();
+                if (dat != null) {
+                    for (String current : dat) {
+                        String s = current.replaceAll(".dat$", "");
+                        try {
+                            UUID uuid = UUID.fromString(s);
+                            if (check || all.remove(uuid)) {
+                                File file = new File(playerDataFolder, current);
+                                NbtFactory.NbtCompound compound = NbtFactory
+                                    .fromStream(new FileInputStream(file),
+                                        NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                                if (!compound.containsKey("bukkit")) {
+                                    PlotSquared.debug("ERROR: Player data (" + uuid.toString()
+                                        + ".dat) does not contain the the key \"bukkit\"");
+                                } else {
+                                    NbtFactory.NbtCompound bukkit =
+                                        (NbtFactory.NbtCompound) compound.get("bukkit");
+                                    String name = (String) bukkit.get("lastKnownName");
+                                    long last = (long) bukkit.get("lastPlayed");
+                                    long first = (long) bukkit.get("firstPlayed");
+                                    if (ExpireManager.IMP != null) {
+                                        ExpireManager.IMP.storeDate(uuid, last);
+                                        ExpireManager.IMP.storeAccountAge(uuid, last - first);
                                     }
-                                }
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
-                            }
-                        }
-                    }
-                    add(toAdd);
-                    if (all.isEmpty()) {
-                        if (whenDone != null) {
-                            whenDone.run();
-                        }
-                        return;
-                    } else {
-                        PlotSquared.debug("Failed to cache: " + all.size()
-                            + " uuids - slowly processing all files");
-                    }
-                }
-                HashSet<String> worlds = Sets.newHashSet(world, "world");
-                HashSet<UUID> uuids = new HashSet<>();
-                HashSet<String> names = new HashSet<>();
-                File playerDataFolder = null;
-                for (String worldName : worlds) {
-                    // Getting UUIDs
-                    playerDataFolder =
-                        new File(container, worldName + File.separator + "playerdata");
-                    String[] dat = playerDataFolder.list(new DatFileFilter());
-                    if ((dat != null) && (dat.length != 0)) {
-                        for (String current : dat) {
-                            String s = current.replaceAll(".dat$", "");
-                            try {
-                                UUID uuid = UUID.fromString(s);
-                                uuids.add(uuid);
-                            } catch (Exception ignored) {
-                                PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
-                            }
-                        }
-                        break;
-                    }
-                    // Getting names
-                    File playersFolder = new File(worldName + File.separator + "players");
-                    dat = playersFolder.list(new DatFileFilter());
-                    if ((dat != null) && (dat.length != 0)) {
-                        for (String current : dat) {
-                            names.add(current.replaceAll(".dat$", ""));
-                        }
-                        break;
-                    }
-                }
-                for (UUID uuid : uuids) {
-                    try {
-                        File file =
-                            new File(playerDataFolder + File.separator + uuid.toString() + ".dat");
-                        if (!file.exists()) {
-                            continue;
-                        }
-                        NbtFactory.NbtCompound compound = NbtFactory
-                            .fromStream(new FileInputStream(file),
-                                NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                        if (!compound.containsKey("bukkit")) {
-                            PlotSquared.debug("ERROR: Player data (" + uuid.toString()
-                                + ".dat) does not contain the the key \"bukkit\"");
-                        } else {
-                            NbtFactory.NbtCompound bukkit =
-                                (NbtFactory.NbtCompound) compound.get("bukkit");
-                            String name = (String) bukkit.get("lastKnownName");
-                            StringWrapper wrap = new StringWrapper(name);
-                            if (!toAdd.containsKey(wrap)) {
-                                long last = (long) bukkit.get("lastPlayed");
-                                long first = (long) bukkit.get("firstPlayed");
-                                if (Settings.UUID.OFFLINE) {
-                                    if (Settings.UUID.FORCE_LOWERCASE && !name.toLowerCase()
-                                        .equals(name)) {
-                                        uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                                    } else {
-                                        long most = (long) compound.get("UUIDMost");
-                                        long least = (long) compound.get("UUIDLeast");
-                                        uuid = new UUID(most, least);
-                                    }
-                                }
-                                if (ExpireManager.IMP != null) {
-                                    ExpireManager.IMP.storeDate(uuid, last);
-                                    ExpireManager.IMP.storeAccountAge(uuid, last - first);
-                                }
-                                toAdd.put(wrap, uuid);
-                            }
-                        }
-                    } catch (Exception ignored) {
-                        PlotSquared
-                            .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
-                    }
-                }
-                for (String name : names) {
-                    UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                    StringWrapper nameWrap = new StringWrapper(name);
-                    toAdd.put(nameWrap, uuid);
-                }
-
-                if (getUUIDMap().isEmpty()) {
-                    for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
-                        .getOfflinePlayers()) {
-                        long last = op.getLastPlayed();
-                        if (last != 0) {
-                            String name = op.getName();
-                            StringWrapper wrap = new StringWrapper(name);
-                            if (!toAdd.containsKey(wrap)) {
-                                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
-                                toAdd.put(wrap, uuid);
-                                if (ExpireManager.IMP != null) {
-                                    ExpireManager.IMP.storeDate(uuid, last);
+                                    toAdd.put(new StringWrapper(name), uuid);
                                 }
                             }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
                         }
                     }
                 }
                 add(toAdd);
-                if (whenDone != null) {
-                    whenDone.run();
+                if (all.isEmpty()) {
+                    if (whenDone != null) {
+                        whenDone.run();
+                    }
+                    return;
+                } else {
+                    PlotSquared.debug("Failed to cache: " + all.size()
+                        + " uuids - slowly processing all files");
                 }
             }
+            HashSet<String> worlds1 = Sets.newHashSet(world, "world");
+            HashSet<UUID> uuids = new HashSet<>();
+            HashSet<String> names = new HashSet<>();
+            File playerDataFolder = null;
+            for (String worldName : worlds1) {
+                // Getting UUIDs
+                playerDataFolder =
+                    new File(container, worldName + File.separator + "playerdata");
+                String[] dat = playerDataFolder.list(new DatFileFilter());
+                if ((dat != null) && (dat.length != 0)) {
+                    for (String current : dat) {
+                        String s = current.replaceAll(".dat$", "");
+                        try {
+                            UUID uuid = UUID.fromString(s);
+                            uuids.add(uuid);
+                        } catch (Exception ignored) {
+                            PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
+                        }
+                    }
+                    break;
+                }
+                // Getting names
+                File playersFolder = new File(worldName + File.separator + "players");
+                dat = playersFolder.list(new DatFileFilter());
+                if ((dat != null) && (dat.length != 0)) {
+                    for (String current : dat) {
+                        names.add(current.replaceAll(".dat$", ""));
+                    }
+                    break;
+                }
+            }
+            for (UUID uuid : uuids) {
+                try {
+                    File file =
+                        new File(playerDataFolder + File.separator + uuid.toString() + ".dat");
+                    if (!file.exists()) {
+                        continue;
+                    }
+                    NbtFactory.NbtCompound compound = NbtFactory
+                        .fromStream(new FileInputStream(file),
+                            NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                    if (!compound.containsKey("bukkit")) {
+                        PlotSquared.debug("ERROR: Player data (" + uuid.toString()
+                            + ".dat) does not contain the the key \"bukkit\"");
+                    } else {
+                        NbtFactory.NbtCompound bukkit =
+                            (NbtFactory.NbtCompound) compound.get("bukkit");
+                        String name = (String) bukkit.get("lastKnownName");
+                        StringWrapper wrap = new StringWrapper(name);
+                        if (!toAdd.containsKey(wrap)) {
+                            long last = (long) bukkit.get("lastPlayed");
+                            long first = (long) bukkit.get("firstPlayed");
+                            if (Settings.UUID.OFFLINE) {
+                                if (Settings.UUID.FORCE_LOWERCASE && !name.toLowerCase()
+                                    .equals(name)) {
+                                    uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                                } else {
+                                    long most = (long) compound.get("UUIDMost");
+                                    long least = (long) compound.get("UUIDLeast");
+                                    uuid = new UUID(most, least);
+                                }
+                            }
+                            if (ExpireManager.IMP != null) {
+                                ExpireManager.IMP.storeDate(uuid, last);
+                                ExpireManager.IMP.storeAccountAge(uuid, last - first);
+                            }
+                            toAdd.put(wrap, uuid);
+                        }
+                    }
+                } catch (Exception ignored) {
+                    PlotSquared
+                        .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
+                }
+            }
+            for (String name : names) {
+                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                StringWrapper nameWrap = new StringWrapper(name);
+                toAdd.put(nameWrap, uuid);
+            }
+
+            if (getUUIDMap().isEmpty()) {
+                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
+                    .getOfflinePlayers()) {
+                    long last = op.getLastPlayed();
+                    if (last != 0) {
+                        String name = op.getName();
+                        StringWrapper wrap = new StringWrapper(name);
+                        if (!toAdd.containsKey(wrap)) {
+                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
+                            toAdd.put(wrap, uuid);
+                            if (ExpireManager.IMP != null) {
+                                ExpireManager.IMP.storeDate(uuid, last);
+                            }
+                        }
+                    }
+                }
+            }
+            add(toAdd);
+            if (whenDone != null) {
+                whenDone.run();
+            }
         });
         return true;
     }
 
     @Override public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                ifFetch.value = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                TaskManager.runTask(ifFetch);
-            }
+        TaskManager.runTaskAsync(() -> {
+            ifFetch.value = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+            TaskManager.runTask(ifFetch);
         });
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index c44fa6e72..c06c7a3cc 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -9,6 +9,7 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
+import java.util.Arrays;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
@@ -19,7 +20,7 @@ import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.UUID;
 
-public class OfflineUUIDWrapper extends UUIDWrapper {
+public class OfflineUUIDWrapper implements UUIDWrapper {
 
     private final Object[] arg = new Object[0];
     private Method getOnline = null;
@@ -59,18 +60,15 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
                 return new BukkitOfflinePlayer(op);
             }
         }
-        for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-            if (getUUID(player).equals(uuid)) {
-                return new BukkitOfflinePlayer(player);
-            }
-        }
-        return null;
+        return Arrays.stream(Bukkit.getOfflinePlayers())
+            .filter(player -> getUUID(player).equals(uuid)).findFirst()
+            .map(BukkitOfflinePlayer::new).orElse(null);
     }
 
     public Player[] getOnlinePlayers() {
         if (this.getOnline == null) {
             Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
-            return onlinePlayers.toArray(new Player[onlinePlayers.size()]);
+            return onlinePlayers.toArray(new Player[0]);
         }
         try {
             Object players = this.getOnline.invoke(Bukkit.getServer(), this.arg);
@@ -79,13 +77,13 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
             } else {
                 @SuppressWarnings("unchecked") Collection<? extends Player> p =
                     (Collection<? extends Player>) players;
-                return p.toArray(new Player[p.size()]);
+                return p.toArray(new Player[0]);
             }
         } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {
             PlotSquared.debug("Failed to resolve online players");
             this.getOnline = null;
             Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
-            return onlinePlayers.toArray(new Player[onlinePlayers.size()]);
+            return onlinePlayers.toArray(new Player[0]);
         }
     }
 
@@ -95,11 +93,8 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
-        for (int i = 0; i < ops.length; i++) {
-            toReturn[i] = new BukkitOfflinePlayer(ops[i]);
-        }
-        return toReturn;
+        return Arrays.stream(ops).map(BukkitOfflinePlayer::new)
+            .toArray(BukkitOfflinePlayer[]::new);
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 1c9a30bba..04f0b146c 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -71,96 +71,90 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         if (!super.startCaching(whenDone)) {
             return false;
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try {
-                    HashBiMap<StringWrapper, UUID> toAdd =
-                        HashBiMap.create(new HashMap<StringWrapper, UUID>());
-                    try (PreparedStatement statement = getConnection()
-                        .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
-                        ResultSet resultSet = statement.executeQuery()) {
-                        while (resultSet.next()) {
-                            StringWrapper username =
-                                new StringWrapper(resultSet.getString("username"));
-                            UUID uuid = UUID.fromString(resultSet.getString("uuid"));
-                            toAdd.put(new StringWrapper(username.value), uuid);
-                        }
+        TaskManager.runTaskAsync(() -> {
+            try {
+                HashBiMap<StringWrapper, UUID> toAdd =
+                    HashBiMap.create(new HashMap<>());
+                try (PreparedStatement statement = getConnection()
+                    .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
+                    ResultSet resultSet = statement.executeQuery()) {
+                    while (resultSet.next()) {
+                        StringWrapper username =
+                            new StringWrapper(resultSet.getString("username"));
+                        UUID uuid = UUID.fromString(resultSet.getString("uuid"));
+                        toAdd.put(new StringWrapper(username.value), uuid);
                     }
-                    add(toAdd);
-                    // This should be called as long as there are some unknown plots
-                    final ArrayDeque<UUID> toFetch = new ArrayDeque<>();
-                    for (UUID u : UUIDHandler.getAllUUIDS()) {
-                        if (!uuidExists(u)) {
-                            toFetch.add(u);
-                        }
+                }
+                add(toAdd);
+                // This should be called as long as there are some unknown plots
+                final ArrayDeque<UUID> toFetch = new ArrayDeque<>();
+                for (UUID u : UUIDHandler.getAllUUIDS()) {
+                    if (!uuidExists(u)) {
+                        toFetch.add(u);
                     }
-                    if (toFetch.isEmpty()) {
+                }
+                if (toFetch.isEmpty()) {
+                    if (whenDone != null) {
+                        whenDone.run();
+                    }
+                    return;
+                }
+                FileUUIDHandler fileHandler =
+                    new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
+                fileHandler.startCaching(() -> {
+                    // If the file based UUID handler didn't cache it, then we can't cache offline mode
+                    // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
+                    if (Settings.UUID.OFFLINE) {
                         if (whenDone != null) {
                             whenDone.run();
                         }
                         return;
                     }
-                    FileUUIDHandler fileHandler =
-                        new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
-                    fileHandler.startCaching(new Runnable() {
-                        @Override public void run() {
-                            // If the file based UUID handler didn't cache it, then we can't cache offline mode
-                            // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
-                            if (Settings.UUID.OFFLINE) {
-                                if (whenDone != null) {
-                                    whenDone.run();
-                                }
-                                return;
-                            }
 
-                            TaskManager.runTaskAsync(new Runnable() {
-                                @Override public void run() {
-                                    while (!toFetch.isEmpty()) {
-                                        try {
-                                            for (int i = 0;
-                                                 i < Math.min(500, toFetch.size()); i++) {
-                                                UUID uuid = toFetch.pop();
-                                                HttpURLConnection connection =
-                                                    (HttpURLConnection) new URL(
-                                                        SQLUUIDHandler.this.PROFILE_URL + uuid
-                                                            .toString().replace("-", ""))
-                                                        .openConnection();
-                                                try (InputStream con = connection
-                                                    .getInputStream()) {
-                                                    InputStreamReader reader =
-                                                        new InputStreamReader(con);
-                                                    JSONObject response =
-                                                        (JSONObject) SQLUUIDHandler.this.jsonParser
-                                                            .parse(reader);
-                                                    String name = (String) response.get("name");
-                                                    if (name != null) {
-                                                        add(new StringWrapper(name), uuid);
-                                                    }
-                                                }
-                                                connection.disconnect();
-                                            }
-                                        } catch (IOException | ParseException e) {
-                                            PlotSquared.debug(
-                                                "Invalid response from Mojang: Some UUIDs will be cached later. (`unknown` until then or player joins)");
-                                        }
-                                        try {
-                                            Thread.sleep(INTERVAL * 50);
-                                        } catch (InterruptedException e) {
-                                            e.printStackTrace();
-                                            break;
+                    TaskManager.runTaskAsync(() -> {
+                        while (!toFetch.isEmpty()) {
+                            try {
+                                for (int i = 0;
+                                    i < Math.min(500, toFetch.size()); i++) {
+                                    UUID uuid = toFetch.pop();
+                                    HttpURLConnection connection =
+                                        (HttpURLConnection) new URL(
+                                            SQLUUIDHandler.this.PROFILE_URL + uuid
+                                                .toString().replace("-", ""))
+                                            .openConnection();
+                                    try (InputStream con = connection
+                                        .getInputStream()) {
+                                        InputStreamReader reader =
+                                            new InputStreamReader(con);
+                                        JSONObject response =
+                                            (JSONObject) SQLUUIDHandler.this.jsonParser
+                                                .parse(reader);
+                                        String name = (String) response.get("name");
+                                        if (name != null) {
+                                            add(new StringWrapper(name), uuid);
                                         }
                                     }
-                                    if (whenDone != null) {
-                                        whenDone.run();
-                                    }
-                                    return;
+                                    connection.disconnect();
                                 }
-                            });
+                            } catch (IOException | ParseException e) {
+                                PlotSquared.debug(
+                                    "Invalid response from Mojang: Some UUIDs will be cached later. (`unknown` until then or player joins)");
+                            }
+                            try {
+                                Thread.sleep(INTERVAL * 50);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                                break;
+                            }
                         }
+                        if (whenDone != null) {
+                            whenDone.run();
+                        }
+                        return;
                     });
-                } catch (SQLException e) {
-                    throw new SQLUUIDHandlerException("Couldn't select :s", e);
-                }
+                });
+            } catch (SQLException e) {
+                throw new SQLUUIDHandlerException("Couldn't select :s", e);
             }
         });
         return true;
@@ -172,34 +166,32 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         if (ifFetch == null) {
             return;
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try {
-                    URL url = new URL(SQLUUIDHandler.this.PROFILE_URL);
-                    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                    connection.setRequestMethod("POST");
-                    connection.setRequestProperty("Content-Type", "application/json");
-                    connection.setUseCaches(false);
-                    connection.setDoInput(true);
-                    connection.setDoOutput(true);
-                    String body = JSONArray.toJSONString(Collections.singletonList(name));
-                    OutputStream stream = connection.getOutputStream();
-                    stream.write(body.getBytes());
-                    stream.flush();
-                    stream.close();
-                    JSONArray array = (JSONArray) SQLUUIDHandler.this.jsonParser
-                        .parse(new InputStreamReader(connection.getInputStream()));
-                    JSONObject jsonProfile = (JSONObject) array.get(0);
-                    String id = (String) jsonProfile.get("id");
-                    String name = (String) jsonProfile.get("name");
-                    ifFetch.value = UUID.fromString(
-                        id.substring(0, 8) + '-' + id.substring(8, 12) + '-' + id.substring(12, 16)
-                            + '-' + id.substring(16, 20) + '-' + id.substring(20, 32));
-                } catch (IOException | ParseException e) {
-                    e.printStackTrace();
-                }
-                TaskManager.runTask(ifFetch);
+        TaskManager.runTaskAsync(() -> {
+            try {
+                URL url = new URL(SQLUUIDHandler.this.PROFILE_URL);
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                connection.setRequestMethod("POST");
+                connection.setRequestProperty("Content-Type", "application/json");
+                connection.setUseCaches(false);
+                connection.setDoInput(true);
+                connection.setDoOutput(true);
+                String body = JSONArray.toJSONString(Collections.singletonList(name));
+                OutputStream stream = connection.getOutputStream();
+                stream.write(body.getBytes());
+                stream.flush();
+                stream.close();
+                JSONArray array = (JSONArray) SQLUUIDHandler.this.jsonParser
+                    .parse(new InputStreamReader(connection.getInputStream()));
+                JSONObject jsonProfile = (JSONObject) array.get(0);
+                String id = (String) jsonProfile.get("id");
+                String name1 = (String) jsonProfile.get("name");
+                ifFetch.value = UUID.fromString(
+                    id.substring(0, 8) + '-' + id.substring(8, 12) + '-' + id.substring(12, 16)
+                        + '-' + id.substring(16, 20) + '-' + id.substring(20, 32));
+            } catch (IOException | ParseException e) {
+                e.printStackTrace();
             }
+            TaskManager.runTask(ifFetch);
         });
     }
 
@@ -215,18 +207,16 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
     @Override public boolean add(final StringWrapper name, final UUID uuid) {
         // Ignoring duplicates
         if (super.add(name, uuid)) {
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    try (PreparedStatement statement = getConnection().prepareStatement(
-                        "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
-                        statement.setString(1, uuid.toString());
-                        statement.setString(2, name.toString());
-                        statement.execute();
-                        PlotSquared
-                            .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
+            TaskManager.runTaskAsync(() -> {
+                try (PreparedStatement statement = getConnection().prepareStatement(
+                    "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
+                    statement.setString(1, uuid.toString());
+                    statement.setString(2, name.toString());
+                    statement.execute();
+                    PlotSquared
+                        .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
+                } catch (SQLException e) {
+                    e.printStackTrace();
                 }
             });
             return true;
@@ -239,18 +229,16 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
      */
     @Override public void rename(final UUID uuid, final StringWrapper name) {
         super.rename(uuid, name);
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try (PreparedStatement statement = getConnection()
-                    .prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?")) {
-                    statement.setString(1, name.value);
-                    statement.setString(2, uuid.toString());
-                    statement.execute();
-                    PlotSquared.debug(
-                        C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
+        TaskManager.runTaskAsync(() -> {
+            try (PreparedStatement statement = getConnection()
+                .prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?")) {
+                statement.setString(1, name.value);
+                statement.setString(2, uuid.toString());
+                statement.execute();
+                PlotSquared.debug(
+                    C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
+            } catch (SQLException e) {
+                e.printStackTrace();
             }
         });
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
index c2b4b4d95..8f3446487 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
@@ -1,6 +1,7 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
 import java.util.Map;
+import javax.annotation.Nonnull;
 
 /**
  * Represents a source of configurable options and settings.
@@ -20,7 +21,7 @@ public interface Configuration extends ConfigurationSection {
      * @param value Value to set the default to.
      * @throws IllegalArgumentException Thrown if path is null.
      */
-    @Override void addDefault(String path, Object value);
+    @Override void addDefault(@Nonnull String path, Object value);
 
     /**
      * Sets the default values of the given paths as provided.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
index 5d13920e4..f86016031 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
@@ -31,7 +31,7 @@ class ConfigurationOptions {
      *
      * @return Path separator
      */
-    public char pathSeparator() {
+    char pathSeparator() {
         return pathSeparator;
     }
 
@@ -64,7 +64,7 @@ class ConfigurationOptions {
      *
      * @return Whether or not defaults are directly copied
      */
-    public boolean copyDefaults() {
+    boolean copyDefaults() {
         return copyDefaults;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
index 0752dfb57..ac9d2d536 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
@@ -3,6 +3,7 @@ package com.github.intellectualsites.plotsquared.configuration;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.annotation.Nonnull;
 
 /**
  * Represents a section of a {@link Configuration}.
@@ -52,7 +53,7 @@ public interface ConfigurationSection {
      * default or being set.
      * @throws IllegalArgumentException Thrown when path is {@code null}.
      */
-    boolean contains(String path);
+    boolean contains(@Nonnull String path);
 
     /**
      * Checks if this {@link ConfigurationSection} has a value set for the
@@ -66,7 +67,7 @@ public interface ConfigurationSection {
      * having a default.
      * @throws IllegalArgumentException Thrown when path is {@code null}.
      */
-    boolean isSet(String path);
+    boolean isSet(@Nonnull String path);
 
     /**
      * Gets the path of this {@link ConfigurationSection} from its root {@link
@@ -151,7 +152,7 @@ public interface ConfigurationSection {
      * @param defaultValue The default value to return if the path is not found.
      * @return Requested Object.
      */
-    Object get(String path, Object defaultValue);
+    Object getOrDefault(@Nonnull String path, Object defaultValue);
 
     /**
      * Sets the specified path to the given value.
@@ -644,5 +645,5 @@ public interface ConfigurationSection {
      * @param value Value to set the default to
      * @throws IllegalArgumentException Thrown if path is {@code null}
      */
-    void addDefault(String path, Object value);
+    void addDefault(@Nonnull String path, Object value);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
index 20131cbe1..d44c0f3b2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
@@ -1,6 +1,7 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
 import java.util.Map;
+import javax.annotation.Nonnull;
 
 /**
  * This is a {@link Configuration} implementation that does not save or load
@@ -28,7 +29,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
         this.defaults = defaults;
     }
 
-    @Override public void addDefault(String path, Object value) {
+    @Override public void addDefault(@Nonnull String path, Object value) {
         if (this.defaults == null) {
             this.defaults = new MemoryConfiguration();
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
index 0f87931f4..73f50476d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
@@ -1,777 +1,817 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
 import java.util.*;
+import javax.annotation.Nonnull;
 
 /**
  * A type of {@link ConfigurationSection} that is stored in memory.
  */
 public class MemorySection implements ConfigurationSection {
 
-    protected final Map<String, Object> map = new LinkedHashMap<>();
-    private final Configuration root;
-    private final ConfigurationSection parent;
-    private final String path;
-    private final String fullPath;
+  protected final Map<String, Object> map = new LinkedHashMap<>();
+  private final Configuration root;
+  private final ConfigurationSection parent;
+  private final String path;
+  private final String fullPath;
 
-    /**
-     * Creates an empty MemorySection for use as a root {@link Configuration}
-     * section.
-     *
-     * <p>Note that calling this without being yourself a {@link Configuration}
-     * will throw an exception!
-     *
-     * @throws IllegalStateException Thrown if this is not a {@link
-     *                               Configuration} root.
-     */
-    protected MemorySection() {
-        if (!(this instanceof Configuration)) {
-            throw new IllegalStateException(
-                "Cannot construct a root MemorySection when not a Configuration");
-        }
-
-        this.path = "";
-        this.fullPath = "";
-        this.parent = null;
-        this.root = (Configuration) this;
+  /**
+   * Creates an empty MemorySection for use as a root {@link Configuration} section.
+   *
+   * <p>Note that calling this without being yourself a {@link Configuration}
+   * will throw an exception!
+   *
+   * @throws IllegalStateException Thrown if this is not a {@link Configuration} root.
+   */
+  protected MemorySection() {
+    if (!(this instanceof Configuration)) {
+      throw new IllegalStateException(
+          "Cannot construct a root MemorySection when not a Configuration");
     }
 
-    /**
-     * Creates an empty MemorySection with the specified parent and path.
-     *
-     * @param parent Parent section that contains this own section.
-     * @param path   Path that you may access this section from via the root
-     *               {@link Configuration}.
-     * @throws IllegalArgumentException Thrown is parent or path is null, or
-     *                                  if parent contains no root Configuration.
-     */
-    protected MemorySection(ConfigurationSection parent, String path) {
-        this.path = path;
-        this.parent = parent;
-        this.root = parent.getRoot();
+    this.path = "";
+    this.fullPath = "";
+    this.parent = null;
+    this.root = (Configuration) this;
+  }
 
-        if (this.root == null) {
-            throw new NullPointerException("Path may not be orphaned");
-        }
+  /**
+   * Creates an empty MemorySection with the specified parent and path.
+   *
+   * @param parent Parent section that contains this own section.
+   * @param path Path that you may access this section from via the root {@link Configuration}.
+   * @throws IllegalArgumentException Thrown is parent or path is null, or if parent contains no
+   * root Configuration.
+   */
+  protected MemorySection(ConfigurationSection parent, String path) {
+    this.path = path;
+    this.parent = parent;
+    this.root = parent.getRoot();
 
-        this.fullPath = createPath(parent, path);
+    if (this.root == null) {
+      throw new NullPointerException("Path may not be orphaned");
     }
 
-    public static double toDouble(Object obj, double def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).doubleValue();
-        }
-        if (obj instanceof String) {
-            try {
-                return Double.parseDouble((String) obj);
-            } catch (NumberFormatException ignored) {
-            }
-        } else if (obj instanceof List) {
-            List<?> val = (List<?>) obj;
-            if (!val.isEmpty()) {
-                return toDouble(val.get(0), def);
-            }
-        }
-        return def;
+    this.fullPath = createPath(parent, path);
+  }
+
+  public static double toDouble(Object obj, double def) {
+    if (obj instanceof Number) {
+      return ((Number) obj).doubleValue();
+    }
+    if (obj instanceof String) {
+      try {
+        return Double.parseDouble((String) obj);
+      } catch (NumberFormatException ignored) {
+      }
+    } else if (obj instanceof List) {
+      List<?> val = (List<?>) obj;
+      if (!val.isEmpty()) {
+        return toDouble(val.get(0), def);
+      }
+    }
+    return def;
+  }
+
+  public static int toInt(Object obj, int def) {
+    if (obj instanceof Number) {
+      return ((Number) obj).intValue();
+    }
+    if (obj instanceof String) {
+      try {
+        return Integer.parseInt((String) obj);
+      } catch (NumberFormatException ignored) {
+      }
+    } else if (obj instanceof List) {
+      List<?> val = (List<?>) obj;
+      if (!val.isEmpty()) {
+        return toInt(val.get(0), def);
+      }
+    }
+    return def;
+  }
+
+  public static long toLong(Object obj, long def) {
+    if (obj instanceof Number) {
+      return ((Number) obj).longValue();
+    }
+    if (obj instanceof String) {
+      try {
+        return Long.parseLong((String) obj);
+      } catch (NumberFormatException ignored) {
+      }
+    } else if (obj instanceof List) {
+      List<?> val = (List<?>) obj;
+      if (!val.isEmpty()) {
+        return toLong(val.get(0), def);
+      }
+    }
+    return def;
+  }
+
+  /**
+   * Creates a full path to the given {@link ConfigurationSection} from its root {@link
+   * Configuration}.
+   *
+   * <p>You may use this method for any given {@link ConfigurationSection}, not
+   * only {@link MemorySection}.
+   *
+   * @param section Section to create a path for.
+   * @param key Name of the specified section.
+   * @return Full path of the section from its root.
+   */
+  public static String createPath(ConfigurationSection section, String key) {
+    return createPath(section, key, section.getRoot());
+  }
+
+  /**
+   * Creates a relative path to the given {@link ConfigurationSection} from the given relative
+   * section.
+   *
+   * <p>You may use this method for any given {@link ConfigurationSection}, not
+   * only {@link MemorySection}.
+   *
+   * @param section Section to create a path for.
+   * @param key Name of the specified section.
+   * @param relativeTo Section to create the path relative to.
+   * @return Full path of the section from its root.
+   */
+  public static String createPath(ConfigurationSection section, String key,
+      ConfigurationSection relativeTo) {
+    Configuration root = section.getRoot();
+    if (root == null) {
+      throw new IllegalStateException("Cannot create path without a root");
+    }
+    char separator = root.options().pathSeparator();
+
+    StringBuilder builder = new StringBuilder();
+    for (ConfigurationSection parent = section;
+        (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
+      if (builder.length() > 0) {
+        builder.insert(0, separator);
+      }
+
+      builder.insert(0, parent.getName());
     }
 
-    public static int toInt(Object obj, int def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).intValue();
-        }
-        if (obj instanceof String) {
-            try {
-                return Integer.parseInt((String) obj);
-            } catch (NumberFormatException ignored) {
-            }
-        } else if (obj instanceof List) {
-            List<?> val = (List<?>) obj;
-            if (!val.isEmpty()) {
-                return toInt(val.get(0), def);
-            }
-        }
-        return def;
+    if ((key != null) && !key.isEmpty()) {
+      if (builder.length() > 0) {
+        builder.append(separator);
+      }
+
+      builder.append(key);
     }
 
-    public static long toLong(Object obj, long def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).longValue();
-        }
-        if (obj instanceof String) {
-            try {
-                return Long.parseLong((String) obj);
-            } catch (NumberFormatException ignored) {
-            }
-        } else if (obj instanceof List) {
-            List<?> val = (List<?>) obj;
-            if (!val.isEmpty()) {
-                return toLong(val.get(0), def);
-            }
-        }
-        return def;
+    return builder.toString();
+  }
+
+  @Override
+  public Set<String> getKeys(boolean deep) {
+    Set<String> result = new LinkedHashSet<>();
+
+    Configuration root = getRoot();
+    if ((root != null) && root.options().copyDefaults()) {
+      ConfigurationSection defaults = getDefaultSection();
+
+      if (defaults != null) {
+        result.addAll(defaults.getKeys(deep));
+      }
     }
 
-    /**
-     * Creates a full path to the given {@link ConfigurationSection} from its
-     * root {@link Configuration}.
-     *
-     * <p>You may use this method for any given {@link ConfigurationSection}, not
-     * only {@link MemorySection}.
-     *
-     * @param section Section to create a path for.
-     * @param key     Name of the specified section.
-     * @return Full path of the section from its root.
-     */
-    public static String createPath(ConfigurationSection section, String key) {
-        return createPath(section, key, section.getRoot());
+    mapChildrenKeys(result, this, deep);
+
+    return result;
+  }
+
+  @Override
+  public Map<String, Object> getValues(boolean deep) {
+    Map<String, Object> result = new LinkedHashMap<>();
+
+    Configuration root = getRoot();
+    if ((root != null) && root.options().copyDefaults()) {
+      ConfigurationSection defaults = getDefaultSection();
+
+      if (defaults != null) {
+        result.putAll(defaults.getValues(deep));
+      }
     }
 
-    /**
-     * Creates a relative path to the given {@link ConfigurationSection} from
-     * the given relative section.
-     *
-     * <p>You may use this method for any given {@link ConfigurationSection}, not
-     * only {@link MemorySection}.
-     *
-     * @param section    Section to create a path for.
-     * @param key        Name of the specified section.
-     * @param relativeTo Section to create the path relative to.
-     * @return Full path of the section from its root.
-     */
-    public static String createPath(ConfigurationSection section, String key,
-        ConfigurationSection relativeTo) {
-        Configuration root = section.getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot create path without a root");
-        }
-        char separator = root.options().pathSeparator();
+    mapChildrenValues(result, this, deep);
 
-        StringBuilder builder = new StringBuilder();
-        for (ConfigurationSection parent = section;
-             (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
-            if (builder.length() > 0) {
-                builder.insert(0, separator);
-            }
+    return result;
+  }
 
-            builder.insert(0, parent.getName());
-        }
+  @Override
+  public boolean contains(@Nonnull String path) {
+    return get(path) != null;
+  }
 
-        if ((key != null) && !key.isEmpty()) {
-            if (builder.length() > 0) {
-                builder.append(separator);
-            }
+  @Override
+  public boolean isSet(@Nonnull String path) {
+    Configuration root = getRoot();
+    if (root == null) {
+      return false;
+    }
+    if (root.options().copyDefaults()) {
+      return contains(path);
+    }
+    return getOrDefault(path, null) != null;
+  }
 
-            builder.append(key);
-        }
+  @Override
+  public String getCurrentPath() {
+    return this.fullPath;
+  }
 
-        return builder.toString();
+  @Override
+  public String getName() {
+    return this.path;
+  }
+
+  @Override
+  public Configuration getRoot() {
+    return this.root;
+  }
+
+  @Override
+  public ConfigurationSection getParent() {
+    return this.parent;
+  }
+
+  @Override
+  public void addDefault(@Nonnull String path, Object value) {
+    Configuration root = getRoot();
+    if (root == null) {
+      throw new IllegalStateException("Cannot add default without root");
+    }
+    if (root == this) {
+      throw new UnsupportedOperationException(
+          "Unsupported addDefault(String, Object) implementation");
+    }
+    root.addDefault(createPath(this, path), value);
+  }
+
+  @Override
+  public ConfigurationSection getDefaultSection() {
+    Configuration root = getRoot();
+    Configuration defaults = root == null ? null : root.getDefaults();
+
+    if (defaults != null) {
+      if (defaults.isConfigurationSection(getCurrentPath())) {
+        return defaults.getConfigurationSection(getCurrentPath());
+      }
     }
 
-    @Override public Set<String> getKeys(boolean deep) {
-        Set<String> result = new LinkedHashSet<>();
+    return null;
+  }
 
-        Configuration root = getRoot();
-        if ((root != null) && root.options().copyDefaults()) {
-            ConfigurationSection defaults = getDefaultSection();
+  @Override
+  public void set(String path, Object value) {
+    Configuration root = getRoot();
+    if (root == null) {
+      throw new IllegalStateException("Cannot use section without a root");
+    }
 
-            if (defaults != null) {
-                result.addAll(defaults.getKeys(deep));
-            }
-        }
+    char separator = root.options().pathSeparator();
+    // i1 is the leading (higher) index
+    // i2 is the trailing (lower) index
+    int i1 = -1;
+    int i2;
+    ConfigurationSection section = this;
+    while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+      String node = path.substring(i2, i1);
+      ConfigurationSection subSection = section.getConfigurationSection(node);
+      if (subSection == null) {
+        section = section.createSection(node);
+      } else {
+        section = subSection;
+      }
+    }
 
-        mapChildrenKeys(result, this, deep);
+    String key = path.substring(i2);
+    if (section == this) {
+      if (value == null) {
+        this.map.remove(key);
+      } else {
+        this.map.put(key, value);
+      }
+    } else {
+      section.set(key, value);
+    }
+  }
 
+  @Override
+  public Object get(String path) {
+    return getOrDefault(path, getDefault(path));
+  }
+
+  @Override
+  public Object getOrDefault(@Nonnull String path, Object defaultValue) {
+    if (path.isEmpty()) {
+      return this;
+    }
+
+    Configuration root = getRoot();
+    if (root == null) {
+      throw new IllegalStateException("Cannot access section without a root");
+    }
+
+    char separator = root.options().pathSeparator();
+    // i1 is the leading (higher) index
+    // i2 is the trailing (lower) index
+    int i1 = -1;
+    int i2;
+    ConfigurationSection section = this;
+    while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+      section = section.getConfigurationSection(path.substring(i2, i1));
+      if (section == null) {
+        return defaultValue;
+      }
+    }
+
+    String key = path.substring(i2);
+    if (section == this) {
+      Object result = this.map.get(key);
+      if (result == null) {
+        return defaultValue;
+      } else {
         return result;
+      }
+    }
+    return section.getOrDefault(key, defaultValue);
+  }
+
+  @Override
+  public ConfigurationSection createSection(String path) {
+    Configuration root = getRoot();
+    if (root == null) {
+      throw new IllegalStateException("Cannot create section without a root");
     }
 
-    @Override public Map<String, Object> getValues(boolean deep) {
-        Map<String, Object> result = new LinkedHashMap<>();
+    char separator = root.options().pathSeparator();
+    // i1 is the leading (higher) index
+    // i2 is the trailing (lower) index
+    int i1 = -1;
+    int i2;
+    ConfigurationSection section = this;
+    while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+      String node = path.substring(i2, i1);
+      ConfigurationSection subSection = section.getConfigurationSection(node);
+      if (subSection == null) {
+        section = section.createSection(node);
+      } else {
+        section = subSection;
+      }
+    }
 
-        Configuration root = getRoot();
-        if ((root != null) && root.options().copyDefaults()) {
-            ConfigurationSection defaults = getDefaultSection();
+    String key = path.substring(i2);
+    if (section == this) {
+      ConfigurationSection result = new MemorySection(this, key);
+      this.map.put(key, result);
+      return result;
+    }
+    return section.createSection(key);
+  }
 
-            if (defaults != null) {
-                result.putAll(defaults.getValues(deep));
-            }
+  @Override
+  public ConfigurationSection createSection(String path, Map<?, ?> map) {
+    ConfigurationSection section = createSection(path);
+
+    for (Map.Entry<?, ?> entry : map.entrySet()) {
+      if (entry.getValue() instanceof Map) {
+        section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
+      } else {
+        section.set(entry.getKey().toString(), entry.getValue());
+      }
+    }
+
+    return section;
+  }
+
+  // Primitives
+  @Override
+  public String getString(String path) {
+    Object def = getDefault(path);
+    return getString(path, def != null ? def.toString() : null);
+  }
+
+  @Override
+  public String getString(String path, String def) {
+    Object val = getOrDefault(path, def);
+    if (val != null) {
+      return val.toString();
+    } else {
+      return def;
+    }
+  }
+
+  @Override
+  public boolean isString(String path) {
+    Object val = get(path);
+    return val instanceof String;
+  }
+
+  @Override
+  public int getInt(String path) {
+    Object def = getDefault(path);
+    return getInt(path, toInt(def, 0));
+  }
+
+  @Override
+  public int getInt(String path, int def) {
+    Object val = getOrDefault(path, def);
+    return toInt(val, def);
+  }
+
+  @Override
+  public boolean isInt(String path) {
+    Object val = get(path);
+    return val instanceof Integer;
+  }
+
+  @Override
+  public boolean getBoolean(String path) {
+    Object def = getDefault(path);
+    if (def instanceof Boolean) {
+      return getBoolean(path, (Boolean) def);
+    } else {
+      return getBoolean(path, false);
+    }
+  }
+
+  @Override
+  public boolean getBoolean(String path, boolean defaultValue) {
+    Object val = getOrDefault(path, defaultValue);
+    if (val instanceof Boolean) {
+      return (Boolean) val;
+    } else {
+      return defaultValue;
+    }
+  }
+
+  @Override
+  public boolean isBoolean(String path) {
+    Object val = get(path);
+    return val instanceof Boolean;
+  }
+
+  @Override
+  public double getDouble(String path) {
+    Object def = getDefault(path);
+    return getDouble(path, toDouble(def, 0));
+  }
+
+  @Override
+  public double getDouble(String path, double defaultValue) {
+    Object val = getOrDefault(path, defaultValue);
+    return toDouble(val, defaultValue);
+  }
+
+  @Override
+  public boolean isDouble(String path) {
+    Object val = get(path);
+    return val instanceof Double;
+  }
+
+  @Override
+  public long getLong(String path) {
+    Object def = getDefault(path);
+    return getLong(path, toLong(def, 0));
+  }
+
+  @Override
+  public long getLong(String path, long def) {
+    Object val = getOrDefault(path, def);
+    return toLong(val, def);
+  }
+
+  @Override
+  public boolean isLong(String path) {
+    Object val = get(path);
+    return val instanceof Long;
+  }
+
+  // Java
+  @Override
+  public List<?> getList(String path) {
+    Object def = getDefault(path);
+    return getList(path, def instanceof List ? (List<?>) def : null);
+  }
+
+  @Override
+  public List<?> getList(String path, List<?> def) {
+    Object val = getOrDefault(path, def);
+    return (List<?>) ((val instanceof List) ? val : def);
+  }
+
+  @Override
+  public boolean isList(String path) {
+    Object val = get(path);
+    return val instanceof List;
+  }
+
+  @Override
+  public List<String> getStringList(String path) {
+    List<?> list = getList(path);
+
+    if (list == null) {
+      return new ArrayList<>(0);
+    }
+
+    List<String> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if ((object instanceof String) || isPrimitiveWrapper(object)) {
+        result.add(String.valueOf(object));
+      }
+    }
+
+    return result;
+  }
+
+  @Override
+  public List<Integer> getIntegerList(String path) {
+    List<?> list = getList(path);
+
+    List<Integer> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Integer) {
+        result.add((Integer) object);
+      } else if (object instanceof String) {
+        try {
+          result.add(Integer.valueOf((String) object));
+        } catch (NumberFormatException ignored) {
         }
-
-        mapChildrenValues(result, this, deep);
-
-        return result;
+      } else if (object instanceof Character) {
+        result.add((int) (Character) object);
+      } else if (object instanceof Number) {
+        result.add(((Number) object).intValue());
+      }
     }
 
-    @Override public boolean contains(String path) {
-        return get(path) != null;
-    }
+    return result;
+  }
 
-    @Override public boolean isSet(String path) {
-        Configuration root = getRoot();
-        if (root == null) {
-            return false;
+  @Override
+  public List<Boolean> getBooleanList(String path) {
+    List<?> list = getList(path);
+
+    List<Boolean> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Boolean) {
+        result.add((Boolean) object);
+      } else if (object instanceof String) {
+        if (Boolean.TRUE.toString().equals(object)) {
+          result.add(true);
+        } else if (Boolean.FALSE.toString().equals(object)) {
+          result.add(false);
         }
-        if (root.options().copyDefaults()) {
-            return contains(path);
+      }
+    }
+
+    return result;
+  }
+
+  @Override
+  public List<Double> getDoubleList(String path) {
+    List<?> list = getList(path);
+
+    List<Double> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Double) {
+        result.add((Double) object);
+      } else if (object instanceof String) {
+        try {
+          result.add(Double.valueOf((String) object));
+        } catch (NumberFormatException ignored) {
         }
-        return get(path, null) != null;
+      } else if (object instanceof Character) {
+        result.add((double) (Character) object);
+      } else if (object instanceof Number) {
+        result.add(((Number) object).doubleValue());
+      }
     }
 
-    @Override public String getCurrentPath() {
-        return this.fullPath;
-    }
+    return result;
+  }
 
-    @Override public String getName() {
-        return this.path;
-    }
+  @Override
+  public List<Float> getFloatList(String path) {
+    List<?> list = getList(path);
 
-    @Override public Configuration getRoot() {
-        return this.root;
-    }
+    List<Float> result = new ArrayList<>();
 
-    @Override public ConfigurationSection getParent() {
-        return this.parent;
-    }
-
-    @Override public void addDefault(String path, Object value) {
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot add default without root");
+    for (Object object : list) {
+      if (object instanceof Float) {
+        result.add((Float) object);
+      } else if (object instanceof String) {
+        try {
+          result.add(Float.valueOf((String) object));
+        } catch (NumberFormatException ignored) {
         }
-        if (root == this) {
-            throw new UnsupportedOperationException(
-                "Unsupported addDefault(String, Object) implementation");
+      } else if (object instanceof Character) {
+        result.add((float) (Character) object);
+      } else if (object instanceof Number) {
+        result.add(((Number) object).floatValue());
+      }
+    }
+
+    return result;
+  }
+
+  @Override
+  public List<Long> getLongList(String path) {
+    List<?> list = getList(path);
+
+    List<Long> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Long) {
+        result.add((Long) object);
+      } else if (object instanceof String) {
+        try {
+          result.add(Long.valueOf((String) object));
+        } catch (NumberFormatException ignored) {
         }
-        root.addDefault(createPath(this, path), value);
+      } else if (object instanceof Character) {
+        result.add((long) (Character) object);
+      } else if (object instanceof Number) {
+        result.add(((Number) object).longValue());
+      }
     }
 
-    @Override public ConfigurationSection getDefaultSection() {
-        Configuration root = getRoot();
-        Configuration defaults = root == null ? null : root.getDefaults();
+    return result;
+  }
 
-        if (defaults != null) {
-            if (defaults.isConfigurationSection(getCurrentPath())) {
-                return defaults.getConfigurationSection(getCurrentPath());
-            }
+  @Override
+  public List<Byte> getByteList(String path) {
+    List<?> list = getList(path);
+
+    List<Byte> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Byte) {
+        result.add((Byte) object);
+      } else if (object instanceof String) {
+        try {
+          result.add(Byte.valueOf((String) object));
+        } catch (NumberFormatException ignored) {
         }
-
-        return null;
+      } else if (object instanceof Character) {
+        result.add((byte) ((Character) object).charValue());
+      } else if (object instanceof Number) {
+        result.add(((Number) object).byteValue());
+      }
     }
 
-    @Override public void set(String path, Object value) {
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot use section without a root");
+    return result;
+  }
+
+  @Override
+  public List<Character> getCharacterList(String path) {
+    List<?> list = getList(path);
+
+    List<Character> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Character) {
+        result.add((Character) object);
+      } else if (object instanceof String) {
+        String str = (String) object;
+
+        if (str.length() == 1) {
+          result.add(str.charAt(0));
         }
+      } else if (object instanceof Number) {
+        result.add((char) ((Number) object).intValue());
+      }
+    }
 
-        char separator = root.options().pathSeparator();
-        // i1 is the leading (higher) index
-        // i2 is the trailing (lower) index
-        int i1 = -1;
-        int i2;
-        ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            String node = path.substring(i2, i1);
-            ConfigurationSection subSection = section.getConfigurationSection(node);
-            if (subSection == null) {
-                section = section.createSection(node);
-            } else {
-                section = subSection;
-            }
+    return result;
+  }
+
+  @Override
+  public List<Short> getShortList(String path) {
+    List<?> list = getList(path);
+
+    List<Short> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Short) {
+        result.add((Short) object);
+      } else if (object instanceof String) {
+        try {
+          result.add(Short.valueOf((String) object));
+        } catch (NumberFormatException ignored) {
         }
+      } else if (object instanceof Character) {
+        result.add((short) ((Character) object).charValue());
+      } else if (object instanceof Number) {
+        result.add(((Number) object).shortValue());
+      }
+    }
 
-        String key = path.substring(i2);
-        if (section == this) {
-            if (value == null) {
-                this.map.remove(key);
-            } else {
-                this.map.put(key, value);
-            }
-        } else {
-            section.set(key, value);
+    return result;
+  }
+
+  @Override
+  public List<Map<?, ?>> getMapList(String path) {
+    List<?> list = getList(path);
+    List<Map<?, ?>> result = new ArrayList<>();
+
+    for (Object object : list) {
+      if (object instanceof Map) {
+        result.add((Map<?, ?>) object);
+      }
+    }
+
+    return result;
+  }
+
+  @Override
+  public ConfigurationSection getConfigurationSection(String path) {
+    Object val = getOrDefault(path, null);
+    if (val != null) {
+      return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
+    }
+
+    val = getOrDefault(path, getDefault(path));
+    return (val instanceof ConfigurationSection) ? createSection(path) : null;
+  }
+
+  @Override
+  public boolean isConfigurationSection(String path) {
+    Object val = get(path);
+    return val instanceof ConfigurationSection;
+  }
+
+  protected boolean isPrimitiveWrapper(Object input) {
+    return (input instanceof Integer) || (input instanceof Boolean)
+        || (input instanceof Character) || (input instanceof Byte) || (input instanceof Short)
+        || (input instanceof Double) || (input instanceof Long) || (input instanceof Float);
+  }
+
+  protected Object getDefault(String path) {
+    Configuration root = getRoot();
+    Configuration defaults = root == null ? null : root.getDefaults();
+    return (defaults == null) ? null : defaults.get(createPath(this, path));
+  }
+
+  protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
+    if (section instanceof MemorySection) {
+      MemorySection sec = (MemorySection) section;
+
+      for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+        output.add(createPath(section, entry.getKey(), this));
+
+        if (deep && (entry.getValue() instanceof ConfigurationSection)) {
+          ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
+          mapChildrenKeys(output, subsection, deep);
         }
-    }
+      }
+    } else {
+      Set<String> keys = section.getKeys(deep);
 
-    @Override public Object get(String path) {
-        return get(path, getDefault(path));
+      for (String key : keys) {
+        output.add(createPath(section, key, this));
+      }
     }
+  }
 
-    @Override public Object get(String path, Object defaultValue) {
-        if (path == null) {
-            throw new NullPointerException("Path cannot be null");
+  protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section,
+      boolean deep) {
+    if (section instanceof MemorySection) {
+      MemorySection sec = (MemorySection) section;
+
+      for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+        output.put(createPath(section, entry.getKey(), this), entry.getValue());
+
+        if (entry.getValue() instanceof ConfigurationSection) {
+          if (deep) {
+            mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
+          }
         }
+      }
+    } else {
+      Map<String, Object> values = section.getValues(deep);
 
-        if (path.isEmpty()) {
-            return this;
-        }
-
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot access section without a root");
-        }
-
-        char separator = root.options().pathSeparator();
-        // i1 is the leading (higher) index
-        // i2 is the trailing (lower) index
-        int i1 = -1;
-        int i2;
-        ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            section = section.getConfigurationSection(path.substring(i2, i1));
-            if (section == null) {
-                return defaultValue;
-            }
-        }
-
-        String key = path.substring(i2);
-        if (section == this) {
-            Object result = this.map.get(key);
-            if (result == null) {
-                return defaultValue;
-            } else {
-                return result;
-            }
-        }
-        return section.get(key, defaultValue);
+      for (Map.Entry<String, Object> entry : values.entrySet()) {
+        output.put(createPath(section, entry.getKey(), this), entry.getValue());
+      }
     }
+  }
 
-    @Override public ConfigurationSection createSection(String path) {
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot create section without a root");
-        }
-
-        char separator = root.options().pathSeparator();
-        // i1 is the leading (higher) index
-        // i2 is the trailing (lower) index
-        int i1 = -1;
-        int i2;
-        ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            String node = path.substring(i2, i1);
-            ConfigurationSection subSection = section.getConfigurationSection(node);
-            if (subSection == null) {
-                section = section.createSection(node);
-            } else {
-                section = subSection;
-            }
-        }
-
-        String key = path.substring(i2);
-        if (section == this) {
-            ConfigurationSection result = new MemorySection(this, key);
-            this.map.put(key, result);
-            return result;
-        }
-        return section.createSection(key);
-    }
-
-    @Override public ConfigurationSection createSection(String path, Map<?, ?> map) {
-        ConfigurationSection section = createSection(path);
-
-        for (Map.Entry<?, ?> entry : map.entrySet()) {
-            if (entry.getValue() instanceof Map) {
-                section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
-            } else {
-                section.set(entry.getKey().toString(), entry.getValue());
-            }
-        }
-
-        return section;
-    }
-
-    // Primitives
-    @Override public String getString(String path) {
-        Object def = getDefault(path);
-        return getString(path, def != null ? def.toString() : null);
-    }
-
-    @Override public String getString(String path, String def) {
-        Object val = get(path, def);
-        if (val != null) {
-            return val.toString();
-        } else {
-            return def;
-        }
-    }
-
-    @Override public boolean isString(String path) {
-        Object val = get(path);
-        return val instanceof String;
-    }
-
-    @Override public int getInt(String path) {
-        Object def = getDefault(path);
-        return getInt(path, toInt(def, 0));
-    }
-
-    @Override public int getInt(String path, int def) {
-        Object val = get(path, def);
-        return toInt(val, def);
-    }
-
-    @Override public boolean isInt(String path) {
-        Object val = get(path);
-        return val instanceof Integer;
-    }
-
-    @Override public boolean getBoolean(String path) {
-        Object def = getDefault(path);
-        if (def instanceof Boolean) {
-            return getBoolean(path, (Boolean) def);
-        } else {
-            return getBoolean(path, false);
-        }
-    }
-
-    @Override public boolean getBoolean(String path, boolean defaultValue) {
-        Object val = get(path, defaultValue);
-        if (val instanceof Boolean) {
-            return (Boolean) val;
-        } else {
-            return defaultValue;
-        }
-    }
-
-    @Override public boolean isBoolean(String path) {
-        Object val = get(path);
-        return val instanceof Boolean;
-    }
-
-    @Override public double getDouble(String path) {
-        Object def = getDefault(path);
-        return getDouble(path, toDouble(def, 0));
-    }
-
-    @Override public double getDouble(String path, double defaultValue) {
-        Object val = get(path, defaultValue);
-        return toDouble(val, defaultValue);
-    }
-
-    @Override public boolean isDouble(String path) {
-        Object val = get(path);
-        return val instanceof Double;
-    }
-
-    @Override public long getLong(String path) {
-        Object def = getDefault(path);
-        return getLong(path, toLong(def, 0));
-    }
-
-    @Override public long getLong(String path, long def) {
-        Object val = get(path, def);
-        return toLong(val, def);
-    }
-
-    @Override public boolean isLong(String path) {
-        Object val = get(path);
-        return val instanceof Long;
-    }
-
-    // Java
-    @Override public List<?> getList(String path) {
-        Object def = getDefault(path);
-        return getList(path, def instanceof List ? (List<?>) def : null);
-    }
-
-    @Override public List<?> getList(String path, List<?> def) {
-        Object val = get(path, def);
-        return (List<?>) ((val instanceof List) ? val : def);
-    }
-
-    @Override public boolean isList(String path) {
-        Object val = get(path);
-        return val instanceof List;
-    }
-
-    @Override public List<String> getStringList(String path) {
-        List<?> list = getList(path);
-
-        if (list == null) {
-            return new ArrayList<>(0);
-        }
-
-        List<String> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if ((object instanceof String) || isPrimitiveWrapper(object)) {
-                result.add(String.valueOf(object));
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Integer> getIntegerList(String path) {
-        List<?> list = getList(path);
-
-        List<Integer> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Integer) {
-                result.add((Integer) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Integer.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((int) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).intValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Boolean> getBooleanList(String path) {
-        List<?> list = getList(path);
-
-        List<Boolean> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Boolean) {
-                result.add((Boolean) object);
-            } else if (object instanceof String) {
-                if (Boolean.TRUE.toString().equals(object)) {
-                    result.add(true);
-                } else if (Boolean.FALSE.toString().equals(object)) {
-                    result.add(false);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Double> getDoubleList(String path) {
-        List<?> list = getList(path);
-
-        List<Double> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Double) {
-                result.add((Double) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Double.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((double) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).doubleValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Float> getFloatList(String path) {
-        List<?> list = getList(path);
-
-        List<Float> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Float) {
-                result.add((Float) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Float.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((float) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).floatValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Long> getLongList(String path) {
-        List<?> list = getList(path);
-
-        List<Long> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Long) {
-                result.add((Long) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Long.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((long) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).longValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Byte> getByteList(String path) {
-        List<?> list = getList(path);
-
-        List<Byte> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Byte) {
-                result.add((Byte) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Byte.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((byte) ((Character) object).charValue());
-            } else if (object instanceof Number) {
-                result.add(((Number) object).byteValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Character> getCharacterList(String path) {
-        List<?> list = getList(path);
-
-        List<Character> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Character) {
-                result.add((Character) object);
-            } else if (object instanceof String) {
-                String str = (String) object;
-
-                if (str.length() == 1) {
-                    result.add(str.charAt(0));
-                }
-            } else if (object instanceof Number) {
-                result.add((char) ((Number) object).intValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Short> getShortList(String path) {
-        List<?> list = getList(path);
-
-        List<Short> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Short) {
-                result.add((Short) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Short.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((short) ((Character) object).charValue());
-            } else if (object instanceof Number) {
-                result.add(((Number) object).shortValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Map<?, ?>> getMapList(String path) {
-        List<?> list = getList(path);
-        List<Map<?, ?>> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Map) {
-                result.add((Map<?, ?>) object);
-            }
-        }
-
-        return result;
-    }
-
-    @Override public ConfigurationSection getConfigurationSection(String path) {
-        Object val = get(path, null);
-        if (val != null) {
-            return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
-        }
-
-        val = get(path, getDefault(path));
-        return (val instanceof ConfigurationSection) ? createSection(path) : null;
-    }
-
-    @Override public boolean isConfigurationSection(String path) {
-        Object val = get(path);
-        return val instanceof ConfigurationSection;
-    }
-
-    protected boolean isPrimitiveWrapper(Object input) {
-        return (input instanceof Integer) || (input instanceof Boolean)
-            || (input instanceof Character) || (input instanceof Byte) || (input instanceof Short)
-            || (input instanceof Double) || (input instanceof Long) || (input instanceof Float);
-    }
-
-    protected Object getDefault(String path) {
-        Configuration root = getRoot();
-        Configuration defaults = root == null ? null : root.getDefaults();
-        return (defaults == null) ? null : defaults.get(createPath(this, path));
-    }
-
-    protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
-        if (section instanceof MemorySection) {
-            MemorySection sec = (MemorySection) section;
-
-            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
-                output.add(createPath(section, entry.getKey(), this));
-
-                if (deep && (entry.getValue() instanceof ConfigurationSection)) {
-                    ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
-                    mapChildrenKeys(output, subsection, deep);
-                }
-            }
-        } else {
-            Set<String> keys = section.getKeys(deep);
-
-            for (String key : keys) {
-                output.add(createPath(section, key, this));
-            }
-        }
-    }
-
-    protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section,
-        boolean deep) {
-        if (section instanceof MemorySection) {
-            MemorySection sec = (MemorySection) section;
-
-            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
-                output.put(createPath(section, entry.getKey(), this), entry.getValue());
-
-                if (entry.getValue() instanceof ConfigurationSection) {
-                    if (deep) {
-                        mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
-                    }
-                }
-            }
-        } else {
-            Map<String, Object> values = section.getValues(deep);
-
-            for (Map.Entry<String, Object> entry : values.entrySet()) {
-                output.put(createPath(section, entry.getKey(), this), entry.getValue());
-            }
-        }
-    }
-
-    @Override public String toString() {
-        Configuration root = getRoot();
-        if (root == null) {
-            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + null
-                + "']";
-        } else {
-            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + root
-                .getClass().getSimpleName() + "']";
-        }
+  @Override
+  public String toString() {
+    Configuration root = getRoot();
+    if (root == null) {
+      return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + null
+          + "']";
+    } else {
+      return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + root
+          .getClass().getSimpleName() + "']";
     }
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
index 668509bf3..97643f7ee 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
@@ -6,6 +6,7 @@ import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguratio
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import javax.annotation.Nonnull;
 
 /**
  * This is a base class for all File based implementations of {@link
@@ -82,7 +83,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *                                       a valid Configuration.
      * @throws IllegalArgumentException      Thrown when file is null.
      */
-    public void load(File file) throws IOException, InvalidConfigurationException {
+    public void load(@Nonnull File file) throws IOException, InvalidConfigurationException {
 
         FileInputStream stream = new FileInputStream(file);
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
index d8c41c3da..1e694f05a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
@@ -83,7 +83,7 @@ public class YamlConfiguration extends FileConfiguration {
 
         Map<?, ?> input;
         try {
-            input = (Map<?, ?>) yaml.load(contents);
+            input = yaml.load(contents);
         } catch (YAMLException e) {
             throw new InvalidConfigurationException(e);
         } catch (ClassCastException ignored) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
index a17bc3538..730527652 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
@@ -42,7 +42,7 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
      *
      * @return How much to indent by
      */
-    public int indent() {
+    int indent() {
         return indent;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
index 1f52f7abb..cdc5eb821 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
@@ -9,7 +9,7 @@ import org.yaml.snakeyaml.nodes.Tag;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class YamlConstructor extends SafeConstructor {
+class YamlConstructor extends SafeConstructor {
 
     YamlConstructor() {
         yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
index e50ec9e8e..7fa0ec41a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -76,7 +76,9 @@ public interface IPlotMain extends ILogger {
      *
      * @return
      */
-    String getPluginName();
+    default String getPluginName() {
+      return "PlotSquared";
+    }
 
     /**
      * Get the version of Minecraft that is running.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
index b7eb33b83..9dfbf2ffb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot;
 
 public enum Platform {
-    Bukkit, Sponge, Spigot, Cauldron
+    Bukkit, Sponge, Spigot
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 2d55e9048..84991d2b4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -47,179 +47,182 @@ import java.util.zip.ZipInputStream;
 /**
  * An implementation of the core, with a static getter for easy access.
  */
-@SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
-    private static final Set<Plot> EMPTY_SET =
-        Collections.unmodifiableSet(Collections.<Plot>emptySet());
-    private static PlotSquared instance;
-    // Implementation
-    public final IPlotMain IMP;
-    // Current thread
-    private final Thread thread;
-    // WorldEdit instance
-    public WorldEdit worldedit;
-    public File styleFile;
-    public File configFile;
-    public File worldsFile;
-    public File commandsFile;
-    public File translationFile;
-    public YamlConfiguration style;
-    public YamlConfiguration config;
-    public YamlConfiguration worlds;
-    public YamlConfiguration storage;
-    public YamlConfiguration commands;
-    // Temporary hold the plots/clusters before the worlds load
-    public HashMap<String, Set<PlotCluster>> clusters_tmp;
-    public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
-    // Implementation logger
-    @Setter @Getter private ILogger logger;
-    // Platform / Version / Update URL
-    private PlotVersion version;
-    // Files and configuration
-    @Getter private File jarFile = null; // This file
-    private File storageFile;
-    @Getter private PlotAreaManager plotAreaManager;
+@SuppressWarnings({"unused", "WeakerAccess"})
+public class PlotSquared {
 
-    /**
-     * Initialize PlotSquared with the desired Implementation class.
-     *
-     * @param iPlotMain Implementation of {@link IPlotMain} used
-     * @param platform  The platform being used
-     */
-    public PlotSquared(final IPlotMain iPlotMain, final String platform) {
-        if (instance != null) {
-            throw new IllegalStateException("Cannot re-initialize the PlotSquared singleton");
+  private static final Set<Plot> EMPTY_SET =
+      Collections.unmodifiableSet(Collections.emptySet());
+  private static PlotSquared instance;
+  // Implementation
+  public final IPlotMain IMP;
+  // Current thread
+  private final Thread thread;
+  // WorldEdit instance
+  public WorldEdit worldedit;
+  public File styleFile;
+  public File configFile;
+  public File worldsFile;
+  public File commandsFile;
+  public File translationFile;
+  public YamlConfiguration style;
+  public YamlConfiguration config;
+  public YamlConfiguration worlds;
+  public YamlConfiguration storage;
+  public YamlConfiguration commands;
+  // Temporary hold the plots/clusters before the worlds load
+  public HashMap<String, Set<PlotCluster>> clusters_tmp;
+  public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
+  // Implementation logger
+  @Setter
+  @Getter
+  private ILogger logger;
+  // Platform / Version / Update URL
+  private PlotVersion version;
+  // Files and configuration
+  @Getter
+  private File jarFile = null; // This file
+  private File storageFile;
+  @Getter
+  private PlotAreaManager plotAreaManager;
+
+  /**
+   * Initialize PlotSquared with the desired Implementation class.
+   *
+   * @param iPlotMain Implementation of {@link IPlotMain} used
+   * @param platform The platform being used
+   */
+  public PlotSquared(final IPlotMain iPlotMain, final String platform) {
+    if (instance != null) {
+      throw new IllegalStateException("Cannot re-initialize the PlotSquared singleton");
+    }
+    instance = this;
+
+    this.thread = Thread.currentThread();
+    this.IMP = iPlotMain;
+    this.logger = iPlotMain;
+    Settings.PLATFORM = platform;
+
+    //
+    // Register configuration serializable classes
+    //
+    ConfigurationSerialization.registerClass(PlotBlock.class, "PlotBlock");
+    ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
+
+    try {
+      new ReflectionUtils(this.IMP.getNMSPackage());
+      try {
+        URL url = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
+        this.jarFile = new File(
+            new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
+                .toURI().getPath());
+      } catch (MalformedURLException | URISyntaxException | SecurityException e) {
+        e.printStackTrace();
+        this.jarFile = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar");
+        if (!this.jarFile.exists()) {
+          this.jarFile = new File(this.IMP.getDirectory().getParentFile(),
+              "PlotSquared-" + platform + ".jar");
         }
-        instance = this;
+      }
+      TaskManager.IMP = this.IMP.getTaskManager();
 
-        this.thread = Thread.currentThread();
-        this.IMP = iPlotMain;
-        this.logger = iPlotMain;
-        Settings.PLATFORM = platform;
+      // World Util. Has to be done before config files are loaded
+      WorldUtil.IMP = this.IMP.initWorldUtil();
 
-        //
-        // Register configuration serializable classes
-        //
-        ConfigurationSerialization.registerClass(PlotBlock.class, "PlotBlock");
-        ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
+      if (!setupConfigs()) {
+        return;
+      }
+      this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
+          Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
+              + ".use_THIS.yml");
+      C.load(this.translationFile);
 
+      // Setup plotAreaManager
+      if (Settings.Enabled_Components.WORLDS) {
+        this.plotAreaManager = new SinglePlotAreaManager();
+      } else {
+        this.plotAreaManager = new DefaultPlotAreaManager();
+      }
+
+      // Database
+      if (Settings.Enabled_Components.DATABASE) {
+        setupDatabase();
+      }
+      // Comments
+      CommentManager.registerDefaultInboxes();
+      // Kill entities
+      if (Settings.Enabled_Components.KILL_ROAD_MOBS
+          || Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+        this.IMP.runEntityTask();
+      }
+      if (Settings.Enabled_Components.EVENTS) {
+        this.IMP.registerPlayerEvents();
+        this.IMP.registerInventoryEvents();
+        this.IMP.registerPlotPlusEvents();
+      }
+      // Required
+      this.IMP.registerWorldEvents();
+      if (Settings.Enabled_Components.METRICS) {
+        this.IMP.startMetrics();
+      } else {
+        PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
+      }
+      if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
+        this.IMP.registerChunkProcessor();
+      }
+      // create UUIDWrapper
+      UUIDHandler.implementation = this.IMP.initUUIDHandler();
+      if (Settings.Enabled_Components.UUID_CACHE) {
+        startUuidCatching();
+      } else {
+        // Start these separately
+        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+        startExpiryTasks();
+      }
+      // create event util class
+      EventUtil.manager = this.IMP.initEventUtil();
+      // create Hybrid utility class
+      HybridUtils.manager = this.IMP.initHybridUtils();
+      // Inventory utility class
+      InventoryUtil.manager = this.IMP.initInventoryUtil();
+      // create setup util class
+      SetupUtils.manager = this.IMP.initSetupUtils();
+      // Set block
+      GlobalBlockQueue.IMP = new GlobalBlockQueue(IMP.initBlockQueue(), 1);
+      GlobalBlockQueue.IMP.runTask();
+      // Set chunk
+      ChunkManager.manager = this.IMP.initChunkManager();
+      // Schematic handler
+      SchematicHandler.manager = this.IMP.initSchematicHandler();
+      // Titles
+      AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
+      // Chat
+      ChatManager.manager = this.IMP.initChatManager();
+      // Commands
+      if (Settings.Enabled_Components.COMMANDS) {
+        this.IMP.registerCommands();
+      }
+      // WorldEdit
+      if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
         try {
-            new ReflectionUtils(this.IMP.getNMSPackage());
-            try {
-                URL url = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
-                this.jarFile = new File(
-                    new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
-                        .toURI().getPath());
-            } catch (MalformedURLException | URISyntaxException | SecurityException e) {
-                e.printStackTrace();
-                this.jarFile = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar");
-                if (!this.jarFile.exists()) {
-                    this.jarFile = new File(this.IMP.getDirectory().getParentFile(),
-                        "PlotSquared-" + platform + ".jar");
-                }
-            }
-            TaskManager.IMP = this.IMP.getTaskManager();
-
-            // World Util. Has to be done before config files are loaded
-            WorldUtil.IMP = this.IMP.initWorldUtil();
-
-            if (!setupConfigs()) {
-                return;
-            }
-            this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
-                Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
-                    + ".use_THIS.yml");
-            C.load(this.translationFile);
-
-            // Setup plotAreaManager
-            if (Settings.Enabled_Components.WORLDS) {
-                this.plotAreaManager = new SinglePlotAreaManager();
-            } else {
-                this.plotAreaManager = new DefaultPlotAreaManager();
-            }
-
-            // Database
-            if (Settings.Enabled_Components.DATABASE) {
-                setupDatabase();
-            }
-            // Comments
-            CommentManager.registerDefaultInboxes();
-            // Kill entities
-            if (Settings.Enabled_Components.KILL_ROAD_MOBS
-                || Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-                this.IMP.runEntityTask();
-            }
-            if (Settings.Enabled_Components.EVENTS) {
-                this.IMP.registerPlayerEvents();
-                this.IMP.registerInventoryEvents();
-                this.IMP.registerPlotPlusEvents();
-            }
-            // Required
-            this.IMP.registerWorldEvents();
-            if (Settings.Enabled_Components.METRICS) {
-                this.IMP.startMetrics();
-            } else {
-                PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
-            }
-            if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
-                this.IMP.registerChunkProcessor();
-            }
-            // create UUIDWrapper
-            UUIDHandler.implementation = this.IMP.initUUIDHandler();
-            if (Settings.Enabled_Components.UUID_CACHE) {
-                startUuidCatching();
-            } else {
-                // Start these separately
-                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                startExpiryTasks();
-            }
-            // create event util class
-            EventUtil.manager = this.IMP.initEventUtil();
-            // create Hybrid utility class
-            HybridUtils.manager = this.IMP.initHybridUtils();
-            // Inventory utility class
-            InventoryUtil.manager = this.IMP.initInventoryUtil();
-            // create setup util class
-            SetupUtils.manager = this.IMP.initSetupUtils();
-            // Set block
-            GlobalBlockQueue.IMP = new GlobalBlockQueue(IMP.initBlockQueue(), 1);
-            GlobalBlockQueue.IMP.runTask();
-            // Set chunk
-            ChunkManager.manager = this.IMP.initChunkManager();
-            // Schematic handler
-            SchematicHandler.manager = this.IMP.initSchematicHandler();
-            // Titles
-            AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
-            // Chat
-            ChatManager.manager = this.IMP.initChatManager();
-            // Commands
+          if (this.IMP.initWorldEdit()) {
+            PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
+            this.worldedit = WorldEdit.getInstance();
+            WorldEdit.getInstance().getEventBus().register(new WESubscriber());
             if (Settings.Enabled_Components.COMMANDS) {
-                this.IMP.registerCommands();
+              new WE_Anywhere();
             }
-            // WorldEdit
-            if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
-                try {
-                    if (this.IMP.initWorldEdit()) {
-                        PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
-                        this.worldedit = WorldEdit.getInstance();
-                        WorldEdit.getInstance().getEventBus().register(new WESubscriber());
-                        if (Settings.Enabled_Components.COMMANDS) {
-                            new WE_Anywhere();
-                        }
 
-                    }
-                } catch (Throwable e) {
-                    PlotSquared.debug(
-                        "Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
-                }
-            }
-            // Economy
-            if (Settings.Enabled_Components.ECONOMY) {
-                TaskManager.runTask(new Runnable() {
-                    @Override public void run() {
-                        EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler();
-                    }
-                });
-            }
+          }
+        } catch (Throwable e) {
+          PlotSquared.debug(
+              "Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
+        }
+      }
+      // Economy
+      if (Settings.Enabled_Components.ECONOMY) {
+        TaskManager.runTask(
+            () -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
+      }
 
 /*            // Check for updates
             if (Settings.Enabled_Components.UPDATER) {
@@ -236,1810 +239,1864 @@ import java.util.zip.ZipInputStream;
                 }, 36000);
             }*/
 
-            // World generators:
-            final ConfigurationSection section = this.worlds.getConfigurationSection("worlds");
-            if (section != null) {
-                for (String world : section.getKeys(false)) {
-                    if (world.equals("CheckingPlotSquaredGenerator")) {
-                        continue;
-                    }
-                    if (WorldUtil.IMP.isWorld(world)) {
-                        this.IMP.setGenerator(world);
-                    }
-                }
-                TaskManager.runTaskLater(new Runnable() {
-                    @Override public void run() {
-                        for (String world : section.getKeys(false)) {
-                            if (world.equals("CheckingPlotSquaredGenerator")) {
-                                continue;
-                            }
-                            if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
-                                debug("&c`" + world + "` was not properly loaded - " + IMP
-                                    .getPluginName() + " will now try to load it properly: ");
-                                debug(
-                                    "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
-                                debug(
-                                    "&8 - &7Your world management plugin may be faulty (or non existent)");
-                                PlotSquared.this.IMP.setGenerator(world);
-                            }
-                        }
-                    }
-                }, 1);
+      // World generators:
+      final ConfigurationSection section = this.worlds.getConfigurationSection("worlds");
+      if (section != null) {
+        for (String world : section.getKeys(false)) {
+          if (world.equals("CheckingPlotSquaredGenerator")) {
+            continue;
+          }
+          if (WorldUtil.IMP.isWorld(world)) {
+            this.IMP.setGenerator(world);
+          }
+        }
+        TaskManager.runTaskLater(() -> {
+          for (String world : section.getKeys(false)) {
+            if (world.equals("CheckingPlotSquaredGenerator")) {
+              continue;
             }
+            if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
+              debug("&c`" + world + "` was not properly loaded - " + IMP
+                  .getPluginName() + " will now try to load it properly: ");
+              debug(
+                  "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
+              debug(
+                  "&8 - &7Your world management plugin may be faulty (or non existent)");
+              PlotSquared.this.IMP.setGenerator(world);
+            }
+          }
+        }, 1);
+      }
 
-            // Copy files
-            copyFile("addplots.js", Settings.Paths.SCRIPTS);
-            copyFile("addsigns.js", Settings.Paths.SCRIPTS);
-            copyFile("automerge.js", Settings.Paths.SCRIPTS);
-            copyFile("furthest.js", Settings.Paths.SCRIPTS);
-            copyFile("mycommand.js", Settings.Paths.SCRIPTS);
-            copyFile("setbiomes.js", Settings.Paths.SCRIPTS);
-            copyFile("start.js", Settings.Paths.SCRIPTS);
-            copyFile("town.template", Settings.Paths.TEMPLATES);
-            copyFile("skyblock.template", Settings.Paths.TEMPLATES);
-            copyFile("bridge.template", Settings.Paths.TEMPLATES);
-            copyFile("de-DE.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("es-ES.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("zh-CN.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("it-IT.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("ko-KR.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("fr-FR.yml", Settings.Paths.TRANSLATIONS);
-            showDebug();
-        } catch (Throwable e) {
-            e.printStackTrace();
+      // Copy files
+      copyFile("addplots.js", Settings.Paths.SCRIPTS);
+      copyFile("addsigns.js", Settings.Paths.SCRIPTS);
+      copyFile("automerge.js", Settings.Paths.SCRIPTS);
+      copyFile("furthest.js", Settings.Paths.SCRIPTS);
+      copyFile("mycommand.js", Settings.Paths.SCRIPTS);
+      copyFile("setbiomes.js", Settings.Paths.SCRIPTS);
+      copyFile("start.js", Settings.Paths.SCRIPTS);
+      copyFile("town.template", Settings.Paths.TEMPLATES);
+      copyFile("skyblock.template", Settings.Paths.TEMPLATES);
+      copyFile("bridge.template", Settings.Paths.TEMPLATES);
+      copyFile("de-DE.yml", Settings.Paths.TRANSLATIONS);
+      copyFile("es-ES.yml", Settings.Paths.TRANSLATIONS);
+      copyFile("zh-CN.yml", Settings.Paths.TRANSLATIONS);
+      copyFile("it-IT.yml", Settings.Paths.TRANSLATIONS);
+      copyFile("ko-KR.yml", Settings.Paths.TRANSLATIONS);
+      copyFile("fr-FR.yml", Settings.Paths.TRANSLATIONS);
+      showDebug();
+    } catch (Throwable e) {
+      e.printStackTrace();
+    }
+
+    PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
+  }
+
+  /**
+   * Get an instance of PlotSquared.
+   *
+   * @return instance of PlotSquared
+   */
+  public static PlotSquared get() {
+    return PlotSquared.instance;
+  }
+
+  public static IPlotMain imp() {
+    if (instance != null) {
+      return instance.IMP;
+    }
+    return null;
+  }
+
+  /**
+   * Log a message to the IPlotMain logger.
+   *
+   * @param message Message to log
+   * @see IPlotMain#log(String)
+   */
+  public static void log(Object message) {
+    if (message == null || message.toString().isEmpty()) {
+      return;
+    }
+    if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
+      System.out.printf("[P2][Info] %s\n", StringMan.getString(message));
+    } else {
+      PlotSquared.get().getLogger().log(StringMan.getString(message));
+    }
+  }
+
+  /**
+   * Log a message to the IPlotMain logger.
+   *
+   * @param message Message to log
+   * @see IPlotMain#log(String)
+   */
+  public static void debug(@Nullable Object message) {
+    if (Settings.DEBUG) {
+      if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
+        System.out.printf("[P2][Debug] %s\n", StringMan.getString(message));
+      } else {
+        PlotSquared.get().getLogger().log(StringMan.getString(message));
+      }
+    }
+  }
+
+  private void startUuidCatching() {
+    TaskManager.runTaskLater(() -> {
+      debug("Starting UUID caching");
+      UUIDHandler.startCaching(() -> {
+        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+        foreachPlotRaw(new RunnableVal<Plot>() {
+          @Override
+          public void run(Plot plot) {
+            if (plot.hasOwner() && plot.temp != -1) {
+              if (UUIDHandler.getName(plot.owner) == null) {
+                UUIDHandler.implementation.unknown.add(plot.owner);
+              }
+            }
+          }
+        });
+        startExpiryTasks();
+      });
+    }, 20);
+  }
+
+  private void startExpiryTasks() {
+    if (Settings.Enabled_Components.PLOT_EXPIRY) {
+      ExpireManager.IMP = new ExpireManager();
+      ExpireManager.IMP.runAutomatedTask();
+      for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
+        ExpiryTask task = new ExpiryTask(settings);
+        ExpireManager.IMP.addTask(task);
+      }
+    }
+  }
+
+  public boolean isMainThread(Thread thread) {
+    return this.thread == thread;
+  }
+
+  /**
+   * Check if `version` is >= `version2`.
+   *
+   * @param version First version
+   * @param version2 Second version
+   * @return true if `version` is >= `version2`
+   */
+  public boolean checkVersion(int[] version, int... version2) {
+    return version[0] > version2[0] || version[0] == version2[0] && version[1] > version2[1]
+        || version[0] == version2[0] && version[1] == version2[1] && version[2] >= version2[2];
+  }
+
+  /**
+   * Get the current PlotSquared version.
+   *
+   * @return current version in config or null
+   */
+  public PlotVersion getVersion() {
+    return this.version;
+  }
+
+  /**
+   * Get the server platform this plugin is running on this is running on.
+   * <p>
+   * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
+   *
+   * @return the server implementation
+   */
+  public String getPlatform() {
+    return Settings.PLATFORM;
+  }
+
+  public PlotManager getPlotManager(Plot plot) {
+    return plot.getArea().manager;
+  }
+
+  public PlotManager getPlotManager(Location location) {
+    PlotArea pa = getPlotAreaAbs(location);
+    return pa != null ? pa.manager : null;
+  }
+
+  /**
+   * Add a global reference to a plot world.
+   *
+   * @param plotArea the {@code PlotArea} to add.
+   * @see #removePlotArea(PlotArea) To remove the reference
+   */
+  public void addPlotArea(PlotArea plotArea) {
+    HashMap<PlotId, Plot> plots;
+    if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
+      if (plotArea.TYPE == 2) {
+        plots = this.plots_tmp != null ? this.plots_tmp.get(plotArea.worldname) : null;
+        if (plots != null) {
+          Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
+          while (iterator.hasNext()) {
+            Entry<PlotId, Plot> next = iterator.next();
+            PlotId id = next.getKey();
+            if (plotArea.contains(id)) {
+              next.getValue().setArea(plotArea);
+              iterator.remove();
+            }
+          }
         }
-
-        PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
+      }
+    } else {
+      for (Plot entry : plots.values()) {
+        entry.setArea(plotArea);
+      }
     }
-
-    /**
-     * Get an instance of PlotSquared.
-     *
-     * @return instance of PlotSquared
-     */
-    public static PlotSquared get() {
-        return PlotSquared.instance;
-    }
-
-    public static IPlotMain imp() {
-        if (instance != null) {
-            return instance.IMP;
+    Set<PlotCluster> clusters;
+    if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
+      if (plotArea.TYPE == 2) {
+        clusters =
+            this.clusters_tmp != null ? this.clusters_tmp.get(plotArea.worldname) : null;
+        if (clusters != null) {
+          Iterator<PlotCluster> iterator = clusters.iterator();
+          while (iterator.hasNext()) {
+            PlotCluster next = iterator.next();
+            if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
+              next.setArea(plotArea);
+              iterator.remove();
+            }
+          }
         }
-        return null;
+      }
+    } else {
+      for (PlotCluster cluster : clusters) {
+        cluster.setArea(plotArea);
+      }
     }
+    plotAreaManager.addPlotArea(plotArea);
+    plotArea.setupBorder();
+  }
 
-    /**
-     * Log a message to the IPlotMain logger.
-     *
-     * @param message Message to log
-     * @see IPlotMain#log(String)
-     */
-    public static void log(Object message) {
-        if (message == null || message.toString().isEmpty()) {
+  /**
+   * Remove a plot world reference.
+   *
+   * @param area the {@code PlotArea} to remove
+   */
+  public void removePlotArea(PlotArea area) {
+    plotAreaManager.removePlotArea(area);
+    setPlotsTmp(area);
+  }
+
+  public void removePlotAreas(String world) {
+    for (PlotArea area : getPlotAreas(world)) {
+      if (area.worldname.equals(world)) {
+        removePlotArea(area);
+      }
+    }
+  }
+
+  private void setPlotsTmp(PlotArea area) {
+    if (this.plots_tmp == null) {
+      this.plots_tmp = new HashMap<>();
+    }
+    HashMap<PlotId, Plot> map = this.plots_tmp
+        .computeIfAbsent(area.toString(), k -> new HashMap<>());
+    for (Plot plot : area.getPlots()) {
+      map.put(plot.getId(), plot);
+    }
+    if (this.clusters_tmp == null) {
+      this.clusters_tmp = new HashMap<>();
+    }
+    this.clusters_tmp.put(area.toString(), area.getClusters());
+  }
+
+  public Set<PlotCluster> getClusters(String world) {
+    Set<PlotCluster> set = new HashSet<>();
+    for (PlotArea area : getPlotAreas(world)) {
+      set.addAll(area.getClusters());
+    }
+    return Collections.unmodifiableSet(set);
+
+  }
+
+  /**
+   * Get all the base plots in a single set (for merged plots it just returns the bottom plot).
+   *
+   * @return Set of base Plots
+   */
+  public Set<Plot> getBasePlots() {
+    int size = getPlotCount();
+    final Set<Plot> result = new HashSet<>(size);
+    foreachPlotArea(new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        for (Plot plot : value.getPlots()) {
+          if (!plot.isBasePlot()) {
+            continue;
+          }
+          result.add(plot);
+        }
+      }
+    });
+    return Collections.unmodifiableSet(result);
+  }
+
+  public List<Plot> sortPlotsByTemp(Collection<Plot> plots) {
+    int max = 0;
+    int overflowCount = 0;
+    for (Plot plot : plots) {
+      if (plot.temp > 0) {
+        if (plot.temp > max) {
+          max = plot.temp;
+        }
+      } else {
+        overflowCount++;
+      }
+    }
+    Plot[] array = new Plot[max + 1];
+    List<Plot> overflow = new ArrayList<>(overflowCount);
+    for (Plot plot : plots) {
+      if (plot.temp <= 0) {
+        overflow.add(plot);
+      } else {
+        array[plot.temp] = plot;
+      }
+    }
+    ArrayList<Plot> result = new ArrayList<>(plots.size());
+    for (Plot plot : array) {
+      if (plot != null) {
+        result.add(plot);
+      }
+    }
+    overflow.sort(Comparator.comparingInt(Plot::hashCode));
+    result.addAll(overflow);
+    return result;
+  }
+
+  /**
+   * Sort plots by hashcode.
+   *
+   * @param plots the collection of plots to sort
+   * @return the sorted collection {@link #sortPlots(Collection, SortType, PlotArea)} which has
+   * additional checks before calling this
+   */
+  // TODO: Re-evaluate this (previously public and deprecated), as it's being used internally
+  private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
+    int hardmax = 256000;
+    int max = 0;
+    int overflowSize = 0;
+    for (Plot plot : plots) {
+      int hash = MathMan.getPositiveId(plot.hashCode());
+      if (hash > max) {
+        if (hash >= hardmax) {
+          overflowSize++;
+        } else {
+          max = hash;
+        }
+      }
+    }
+    hardmax = Math.min(hardmax, max);
+    Plot[] cache = new Plot[hardmax + 1];
+    List<Plot> overflow = new ArrayList<>(overflowSize);
+    ArrayList<Plot> extra = new ArrayList<>();
+    for (Plot plot : plots) {
+      int hash = MathMan.getPositiveId(plot.hashCode());
+      if (hash < hardmax) {
+        if (hash >= 0) {
+          cache[hash] = plot;
+        } else {
+          extra.add(plot);
+        }
+      } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
+        extra.add(plot);
+      } else {
+        overflow.add(plot);
+      }
+    }
+    Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+    sortPlotsByHash(overflowArray);
+    ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
+    for (Plot plot : cache) {
+      if (plot != null) {
+        result.add(plot);
+      }
+    }
+    Collections.addAll(result, overflowArray);
+    result.addAll(extra);
+    return result;
+  }
+
+  private void sortPlotsByHash(Plot[] input) {
+    List<Plot>[] bucket = new ArrayList[32];
+    for (int i = 0; i < bucket.length; i++) {
+      bucket[i] = new ArrayList<>();
+    }
+    boolean maxLength = false;
+    int placement = 1;
+    while (!maxLength) {
+      maxLength = true;
+      for (Plot i : input) {
+        int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
+        bucket[tmp & 31].add(i);
+        if (maxLength && tmp > 0) {
+          maxLength = false;
+        }
+      }
+      int a = 0;
+      for (int b = 0; b < 32; b++) {
+        for (Plot i : bucket[b]) {
+          input[a++] = i;
+        }
+        bucket[b].clear();
+      }
+      placement *= 32;
+    }
+  }
+
+  private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
+    int hardMax = 256000;
+    int max = 0;
+    int overflowSize = 0;
+    for (Plot plot : plots) {
+      int hash = MathMan.getPositiveId(plot.hashCode());
+      if (hash > max) {
+        if (hash >= hardMax) {
+          overflowSize++;
+        } else {
+          max = hash;
+        }
+      }
+    }
+    hardMax = Math.min(hardMax, max);
+    Plot[] cache = new Plot[hardMax + 1];
+    List<Plot> overflow = new ArrayList<>(overflowSize);
+    ArrayList<Plot> extra = new ArrayList<>();
+    for (Plot plot : plots) {
+      int hash = MathMan.getPositiveId(plot.hashCode());
+      if (hash < hardMax) {
+        if (hash >= 0) {
+          cache[hash] = plot;
+        } else {
+          extra.add(plot);
+        }
+      } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
+        extra.add(plot);
+      } else {
+        overflow.add(plot);
+      }
+    }
+    Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+    sortPlotsByHash(overflowArray);
+    ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
+    for (Plot plot : cache) {
+      if (plot != null) {
+        result.add(plot);
+      }
+    }
+    Collections.addAll(result, overflowArray);
+    result.addAll(extra);
+    return result;
+  }
+
+  /**
+   * Sort plots by creation timestamp.
+   */
+
+  private List<Plot> sortPlotsByModified(Collection<Plot> input) {
+    List<Plot> list;
+    if (input instanceof List) {
+      list = (List<Plot>) input;
+    } else {
+      list = new ArrayList<>(input);
+    }
+    list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
+    return list;
+  }
+
+  /**
+   * Sort a collection of plots by world (with a priority world), then by hashcode.
+   *
+   * @param plots the plots to sort
+   * @param type The sorting method to use for each world (timestamp, or hash)
+   * @param priorityArea Use null, "world", or "gibberish" if you want default world order
+   * @return ArrayList of plot
+   */
+  public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
+      final PlotArea priorityArea) {
+    // group by world
+    // sort each
+    HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
+    int totalSize = getPlotCount();
+    if (plots.size() == totalSize) {
+      for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+        map.put(area, area.getPlots());
+      }
+    } else {
+      for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+        map.put(area, new ArrayList<>(0));
+      }
+      Collection<Plot> lastList = null;
+      PlotArea lastWorld = null;
+      for (Plot plot : plots) {
+        if (lastWorld == plot.getArea()) {
+          lastList.add(plot);
+        } else {
+          lastWorld = plot.getArea();
+          lastList = map.get(lastWorld);
+          lastList.add(plot);
+        }
+      }
+    }
+    List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
+    areas.sort((a, b) -> {
+      if (priorityArea != null) {
+        if (a.equals(priorityArea)) {
+          return -1;
+        } else if (b.equals(priorityArea)) {
+          return 1;
+        }
+      }
+      return a.hashCode() - b.hashCode();
+    });
+    ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
+    for (PlotArea area : areas) {
+      switch (type) {
+        case CREATION_DATE:
+          toReturn.addAll(sortPlotsByTemp(map.get(area)));
+          break;
+        case CREATION_DATE_TIMESTAMP:
+          toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
+          break;
+        case DISTANCE_FROM_ORIGIN:
+          toReturn.addAll(sortPlotsByHash(map.get(area)));
+          break;
+        case LAST_MODIFIED:
+          toReturn.addAll(sortPlotsByModified(map.get(area)));
+          break;
+        default:
+          break;
+      }
+    }
+    return toReturn;
+  }
+
+  /**
+   * A more generic way to filter plots - make your own method if you need complex filters.
+   *
+   * @param filters the filter
+   * @return a filtered set of plots
+   */
+  public Set<Plot> getPlots(final PlotFilter... filters) {
+    final HashSet<Plot> set = new HashSet<>();
+    foreachPlotArea(new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        for (PlotFilter filter : filters) {
+          if (!filter.allowsArea(value)) {
             return;
+          }
         }
-        if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
-            System.out.printf("[P2][Info] %s\n", StringMan.getString(message));
-        } else {
-            PlotSquared.get().getLogger().log(StringMan.getString(message));
+        loop:
+        for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
+          Plot plot = entry2.getValue();
+          for (PlotFilter filter : filters) {
+            if (!filter.allowsPlot(plot)) {
+              continue loop;
+            }
+          }
+          set.add(plot);
         }
-    }
+      }
+    });
+    return set;
+  }
 
-    /**
-     * Log a message to the IPlotMain logger.
-     *
-     * @param message Message to log
-     * @see IPlotMain#log(String)
-     */
-    public static void debug(@Nullable Object message) {
-        if (Settings.DEBUG) {
-            if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
-                System.out.printf("[P2][Debug] %s\n", StringMan.getString(message));
-            } else {
-                PlotSquared.get().getLogger().log(StringMan.getString(message));
-            }
+  /**
+   * Get all the plots in a single set.
+   *
+   * @return Set of Plots
+   */
+  public Set<Plot> getPlots() {
+    int size = getPlotCount();
+    final Set<Plot> result = new HashSet<>(size);
+    foreachPlotArea(new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        result.addAll(value.getPlots());
+      }
+    });
+    return result;
+  }
+
+  //TODO look at uncommenting or deleting tis. Is it useful and will it work?
+  //If it is readded make sure there is proper javadoc documentation for it.
+/*
+  public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
+    if (this.plots_tmp == null) {
+      this.plots_tmp = new HashMap<>();
+    }
+    for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
+      String world = entry.getKey();
+      PlotArea area = getPlotArea(world, null);
+      if (area == null) {
+        HashMap<PlotId, Plot> map = this.plots_tmp
+            .computeIfAbsent(world, k -> new HashMap<>());
+        map.putAll(entry.getValue());
+      } else {
+        for (Plot plot : entry.getValue().values()) {
+          plot.setArea(area);
+          area.addPlot(plot);
         }
+      }
     }
+  }
+*/
 
-    private void startUuidCatching() {
-        TaskManager.runTaskLater(new Runnable() {
-            @Override public void run() {
-                debug("Starting UUID caching");
-                UUIDHandler.startCaching(new Runnable() {
-                    @Override public void run() {
-                        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                        foreachPlotRaw(new RunnableVal<Plot>() {
-                            @Override public void run(Plot plot) {
-                                if (plot.hasOwner() && plot.temp != -1) {
-                                    if (UUIDHandler.getName(plot.owner) == null) {
-                                        UUIDHandler.implementation.unknown.add(plot.owner);
-                                    }
-                                }
-                            }
-                        });
-                        startExpiryTasks();
-                    }
-                });
-            }
-        }, 20);
+  /**
+   * Get all the plots owned by a player name.
+   *
+   * @param world the world
+   * @param player the plot owner
+   * @return Set of Plot
+   */
+  public Set<Plot> getPlots(String world, String player) {
+    final UUID uuid = UUIDHandler.getUUID(player, null);
+    return getPlots(world, uuid);
+  }
+
+  /**
+   * Get all the plots owned by a player name.
+   *
+   * @param area the PlotArea
+   * @param player the plot owner
+   * @return Set of Plot
+   */
+  public Set<Plot> getPlots(PlotArea area, String player) {
+    UUID uuid = UUIDHandler.getUUID(player, null);
+    return getPlots(area, uuid);
+  }
+
+  /**
+   * Get all plots by a PlotPlayer.
+   *
+   * @param world the world
+   * @param player the plot owner
+   * @return Set of plot
+   */
+  public Set<Plot> getPlots(String world, PlotPlayer player) {
+    return getPlots(world, player.getUUID());
+  }
+
+  /**
+   * Get all plots by a PlotPlayer.
+   *
+   * @param area the PlotArea
+   * @param player the plot owner
+   * @return Set of plot
+   */
+  public Set<Plot> getPlots(PlotArea area, PlotPlayer player) {
+    return getPlots(area, player.getUUID());
+  }
+
+  /**
+   * Get all plots by a UUID in a world.
+   *
+   * @param world the world
+   * @param uuid the plot owner
+   * @return Set of plot
+   */
+  public Set<Plot> getPlots(String world, UUID uuid) {
+    final Set<Plot> plots = new HashSet<>();
+    for (final Plot plot : getPlots(world)) {
+      if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
+        plots.add(plot);
+      }
     }
+    return Collections.unmodifiableSet(plots);
+  }
 
-    private void startExpiryTasks() {
-        if (Settings.Enabled_Components.PLOT_EXPIRY) {
-            ExpireManager.IMP = new ExpireManager();
-            ExpireManager.IMP.runAutomatedTask();
-            for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
-                ExpiryTask task = new ExpiryTask(settings);
-                ExpireManager.IMP.addTask(task);
-            }
+  /**
+   * Get all plots by a UUID in an area.
+   *
+   * @param area the {@code PlotArea}
+   * @param uuid the plot owner
+   * @return Set of plots
+   */
+  public Set<Plot> getPlots(PlotArea area, UUID uuid) {
+    final Set<Plot> plots = new HashSet<>();
+    for (Plot plot : getPlots(area)) {
+      if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
+        plots.add(plot);
+      }
+    }
+    return Collections.unmodifiableSet(plots);
+  }
+
+  /**
+   * Check if a plot world.
+   *
+   * @param world the world
+   * @return if a plot world is registered
+   * @see #getPlotAreaByString(String) to get the PlotArea object
+   */
+  public boolean hasPlotArea(String world) {
+    return plotAreaManager.getPlotAreas(world, null).length != 0;
+  }
+
+  public Collection<Plot> getPlots(String world) {
+    final Set<Plot> set = new HashSet<>();
+    foreachPlotArea(world, new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        set.addAll(value.getPlots());
+      }
+    });
+    return set;
+  }
+
+  /**
+   * Get the plots for a PlotPlayer.
+   *
+   * @param player the player to retrieve the plots for
+   * @return Set of Plot
+   */
+  public Set<Plot> getPlots(PlotPlayer player) {
+    return getPlots(player.getUUID());
+  }
+
+  public Collection<Plot> getPlots(PlotArea area) {
+    return area == null ? EMPTY_SET : area.getPlots();
+  }
+
+  public Plot getPlot(PlotArea area, PlotId id) {
+    return area == null ? null : id == null ? null : area.getPlot(id);
+  }
+
+  public Set<Plot> getBasePlots(PlotPlayer player) {
+    return getBasePlots(player.getUUID());
+  }
+
+  /**
+   * Get the plots for a UUID.
+   *
+   * @param uuid the plot owner
+   * @return Set of Plot's owned by the player
+   */
+  public Set<Plot> getPlots(final UUID uuid) {
+    final Set<Plot> plots = new HashSet<>();
+    foreachPlot(new RunnableVal<Plot>() {
+      @Override
+      public void run(Plot value) {
+        if (value.isOwnerAbs(uuid)) {
+          plots.add(value);
         }
-    }
+      }
+    });
+    return Collections.unmodifiableSet(plots);
+  }
 
-    public boolean isMainThread(Thread thread) {
-        return this.thread == thread;
-    }
-
-    /**
-     * Check if `version` is >= `version2`.
-     *
-     * @param version  First version
-     * @param version2 Second version
-     * @return true if `version` is >= `version2`
-     */
-    public boolean checkVersion(int[] version, int... version2) {
-        return version[0] > version2[0] || version[0] == version2[0] && version[1] > version2[1]
-            || version[0] == version2[0] && version[1] == version2[1] && version[2] >= version2[2];
-    }
-
-    /**
-     * Get the current PlotSquared version.
-     *
-     * @return current version in config or null
-     */
-    public PlotVersion getVersion() {
-        return this.version;
-    }
-
-    /**
-     * Get the server platform this plugin is running on this is running on.
-     * <p>
-     * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
-     *
-     * @return the server implementation
-     */
-    public String getPlatform() {
-        return Settings.PLATFORM;
-    }
-
-    public PlotManager getPlotManager(Plot plot) {
-        return plot.getArea().manager;
-    }
-
-    public PlotManager getPlotManager(Location location) {
-        PlotArea pa = getPlotAreaAbs(location);
-        return pa != null ? pa.manager : null;
-    }
-
-    /**
-     * Add a global reference to a plot world.
-     *
-     * @param plotArea the {@code PlotArea} to add.
-     * @see #removePlotArea(PlotArea) To remove the reference
-     */
-    public void addPlotArea(PlotArea plotArea) {
-        HashMap<PlotId, Plot> plots;
-        if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
-            if (plotArea.TYPE == 2) {
-                plots = this.plots_tmp != null ? this.plots_tmp.get(plotArea.worldname) : null;
-                if (plots != null) {
-                    Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
-                    while (iterator.hasNext()) {
-                        Entry<PlotId, Plot> next = iterator.next();
-                        PlotId id = next.getKey();
-                        if (plotArea.contains(id)) {
-                            next.getValue().setArea(plotArea);
-                            iterator.remove();
-                        }
-                    }
-                }
-            }
-        } else {
-            for (Plot entry : plots.values()) {
-                entry.setArea(plotArea);
-            }
-        }
-        Set<PlotCluster> clusters;
-        if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
-            if (plotArea.TYPE == 2) {
-                clusters =
-                    this.clusters_tmp != null ? this.clusters_tmp.get(plotArea.worldname) : null;
-                if (clusters != null) {
-                    Iterator<PlotCluster> iterator = clusters.iterator();
-                    while (iterator.hasNext()) {
-                        PlotCluster next = iterator.next();
-                        if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
-                            next.setArea(plotArea);
-                            iterator.remove();
-                        }
-                    }
-                }
-            }
-        } else {
-            for (PlotCluster cluster : clusters) {
-                cluster.setArea(plotArea);
-            }
-        }
-        plotAreaManager.addPlotArea(plotArea);
-        plotArea.setupBorder();
-    }
-
-    /**
-     * Remove a plot world reference.
-     *
-     * @param area the {@code PlotArea} to remove
-     */
-    public void removePlotArea(PlotArea area) {
-        plotAreaManager.removePlotArea(area);
-        setPlotsTmp(area);
-    }
-
-    public void removePlotAreas(String world) {
-        for (PlotArea area : getPlotAreas(world)) {
-            if (area.worldname.equals(world)) {
-                removePlotArea(area);
-            }
-        }
-    }
-
-    private void setPlotsTmp(PlotArea area) {
-        if (this.plots_tmp == null) {
-            this.plots_tmp = new HashMap<>();
-        }
-        HashMap<PlotId, Plot> map = this.plots_tmp.get(area.toString());
-        if (map == null) {
-            map = new HashMap<>();
-            this.plots_tmp.put(area.toString(), map);
-        }
-        for (Plot plot : area.getPlots()) {
-            map.put(plot.getId(), plot);
-        }
-        if (this.clusters_tmp == null) {
-            this.clusters_tmp = new HashMap<>();
-        }
-        this.clusters_tmp.put(area.toString(), area.getClusters());
-    }
-
-    public Set<PlotCluster> getClusters(String world) {
-        Set<PlotCluster> set = new HashSet<>();
-        for (PlotArea area : getPlotAreas(world)) {
-            set.addAll(area.getClusters());
-        }
-        return Collections.unmodifiableSet(set);
-
-    }
-
-    /**
-     * Get all the base plots in a single set (for merged plots it just returns
-     * the bottom plot).
-     *
-     * @return Set of base Plots
-     */
-    public Set<Plot> getBasePlots() {
-        int size = getPlotCount();
-        final Set<Plot> result = new HashSet<>(size);
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (Plot plot : value.getPlots()) {
-                    if (!plot.isBasePlot()) {
-                        continue;
-                    }
-                    result.add(plot);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(result);
-    }
-
-    public List<Plot> sortPlotsByTemp(Collection<Plot> plots) {
-        int max = 0;
-        int overflowCount = 0;
-        for (Plot plot : plots) {
-            if (plot.temp > 0) {
-                if (plot.temp > max) {
-                    max = plot.temp;
-                }
-            } else {
-                overflowCount++;
-            }
-        }
-        Plot[] array = new Plot[max + 1];
-        List<Plot> overflow = new ArrayList<>(overflowCount);
-        for (Plot plot : plots) {
-            if (plot.temp <= 0) {
-                overflow.add(plot);
-            } else {
-                array[plot.temp] = plot;
-            }
-        }
-        ArrayList<Plot> result = new ArrayList<>(plots.size());
-        for (Plot plot : array) {
-            if (plot != null) {
-                result.add(plot);
-            }
-        }
-        Collections.sort(overflow, new Comparator<Plot>() {
-            @Override public int compare(Plot a, Plot b) {
-                return a.hashCode() - b.hashCode();
-            }
-        });
-        result.addAll(overflow);
-        return result;
-    }
-
-    /**
-     * Sort plots by hashcode.
-     *
-     * @param plots the collection of plots to sort
-     * @return the sorted collection
-     * @deprecated Unchecked, please use
-     * {@link #sortPlots(Collection, SortType, PlotArea)} which has
-     * additional checks before calling this
-     */
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
-        int hardmax = 256000;
-        int max = 0;
-        int overflowSize = 0;
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash > max) {
-                if (hash >= hardmax) {
-                    overflowSize++;
-                } else {
-                    max = hash;
-                }
-            }
-        }
-        hardmax = Math.min(hardmax, max);
-        Plot[] cache = new Plot[hardmax + 1];
-        List<Plot> overflow = new ArrayList<>(overflowSize);
-        ArrayList<Plot> extra = new ArrayList<>();
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash < hardmax) {
-                if (hash >= 0) {
-                    cache[hash] = plot;
-                } else {
-                    extra.add(plot);
-                }
-            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
-                extra.add(plot);
-            } else {
-                overflow.add(plot);
-            }
-        }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
-        sortPlotsByHash(overflowArray);
-        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
-        for (Plot plot : cache) {
-            if (plot != null) {
-                result.add(plot);
-            }
-        }
-        Collections.addAll(result, overflowArray);
-        for (Plot plot : extra) {
-            result.add(plot);
-        }
-        return result;
-    }
-
-    /**
-     * Unchecked, use {@link #sortPlots(Collection, SortType, PlotArea)} instead which will in turn call this.
-     *
-     * @param input an array of plots to sort
-     */
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public void sortPlotsByHash(Plot[] input) {
-        List<Plot>[] bucket = new ArrayList[32];
-        for (int i = 0; i < bucket.length; i++) {
-            bucket[i] = new ArrayList<>();
-        }
-        boolean maxLength = false;
-        int placement = 1;
-        while (!maxLength) {
-            maxLength = true;
-            for (Plot i : input) {
-                int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
-                bucket[tmp & 31].add(i);
-                if (maxLength && tmp > 0) {
-                    maxLength = false;
-                }
-            }
-            int a = 0;
-            for (int b = 0; b < 32; b++) {
-                for (Plot i : bucket[b]) {
-                    input[a++] = i;
-                }
-                bucket[b].clear();
-            }
-            placement *= 32;
-        }
-    }
-
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
-        int hardMax = 256000;
-        int max = 0;
-        int overflowSize = 0;
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash > max) {
-                if (hash >= hardMax) {
-                    overflowSize++;
-                } else {
-                    max = hash;
-                }
-            }
-        }
-        hardMax = Math.min(hardMax, max);
-        Plot[] cache = new Plot[hardMax + 1];
-        List<Plot> overflow = new ArrayList<>(overflowSize);
-        ArrayList<Plot> extra = new ArrayList<>();
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash < hardMax) {
-                if (hash >= 0) {
-                    cache[hash] = plot;
-                } else {
-                    extra.add(plot);
-                }
-            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
-                extra.add(plot);
-            } else {
-                overflow.add(plot);
-            }
-        }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
-        sortPlotsByHash(overflowArray);
-        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
-        for (Plot plot : cache) {
-            if (plot != null) {
-                result.add(plot);
-            }
-        }
-        Collections.addAll(result, overflowArray);
-        for (Plot plot : extra) {
-            result.add(plot);
-        }
-        return result;
-    }
-
-    /**
-     * Sort plots by creation timestamp.
-     *
-     * @param input
-     * @return
-     * @deprecated Unchecked, use {@link #sortPlots(Collection, SortType, PlotArea)} instead which will call this after checks
-     */
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public List<Plot> sortPlotsByModified(Collection<Plot> input) {
-        List<Plot> list;
-        if (input instanceof List) {
-            list = (List<Plot>) input;
-        } else {
-            list = new ArrayList<>(input);
-        }
-        Collections.sort(list, new Comparator<Plot>() {
-            @Override public int compare(Plot a, Plot b) {
-                return Long.compare(ExpireManager.IMP.getTimestamp(a.owner),
-                    ExpireManager.IMP.getTimestamp(b.owner));
-            }
-        });
-        return list;
-    }
-
-    public ArrayList<Plot> sortPlots(Collection<Plot> plots) {
-        return sortPlots(plots, SortType.DISTANCE_FROM_ORIGIN, null);
-    }
-
-    /**
-     * Sort a collection of plots by world (with a priority world), then
-     * by hashcode.
-     *
-     * @param plots        the plots to sort
-     * @param type         The sorting method to use for each world (timestamp, or hash)
-     * @param priorityArea Use null, "world", or "gibberish" if you
-     *                     want default world order
-     * @return ArrayList of plot
-     */
-    public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
-        final PlotArea priorityArea) {
-        // group by world
-        // sort each
-        HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
-        int totalSize = getPlotCount();
-        if (plots.size() == totalSize) {
-            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                map.put(area, area.getPlots());
-            }
-        } else {
-            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                map.put(area, new ArrayList<Plot>(0));
-            }
-            Collection<Plot> lastList = null;
-            PlotArea lastWorld = null;
-            for (Plot plot : plots) {
-                if (lastWorld == plot.getArea()) {
-                    lastList.add(plot);
-                } else {
-                    lastWorld = plot.getArea();
-                    lastList = map.get(lastWorld);
-                    lastList.add(plot);
-                }
-            }
-        }
-        List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
-        Collections.sort(areas, new Comparator<PlotArea>() {
-            @Override public int compare(PlotArea a, PlotArea b) {
-                if (priorityArea != null) {
-                    if (a.equals(priorityArea)) {
-                        return -1;
-                    } else if (b.equals(priorityArea)) {
-                        return 1;
-                    }
-                }
-                return a.hashCode() - b.hashCode();
-            }
-        });
-        ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
-        for (PlotArea area : areas) {
-            switch (type) {
-                case CREATION_DATE:
-                    toReturn.addAll(sortPlotsByTemp(map.get(area)));
-                    break;
-                case CREATION_DATE_TIMESTAMP:
-                    toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
-                    break;
-                case DISTANCE_FROM_ORIGIN:
-                    toReturn.addAll(sortPlotsByHash(map.get(area)));
-                    break;
-                case LAST_MODIFIED:
-                    toReturn.addAll(sortPlotsByModified(map.get(area)));
-                    break;
-                default:
-                    break;
-            }
-        }
-        return toReturn;
-    }
-
-    /**
-     * A more generic way to filter plots - make your own method
-     * if you need complex filters.
-     *
-     * @param filters the filter
-     * @return a filtered set of plots
-     */
-    public Set<Plot> getPlots(final PlotFilter... filters) {
-        final HashSet<Plot> set = new HashSet<>();
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (PlotFilter filter : filters) {
-                    if (!filter.allowsArea(value)) {
-                        return;
-                    }
-                }
-                loop:
-                for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
-                    Plot plot = entry2.getValue();
-                    for (PlotFilter filter : filters) {
-                        if (!filter.allowsPlot(plot)) {
-                            continue loop;
-                        }
-                    }
-                    set.add(plot);
-                }
-            }
-        });
-        return set;
-    }
-
-    /**
-     * Get all the plots in a single set.
-     *
-     * @return Set of Plots
-     */
-    public Set<Plot> getPlots() {
-        int size = getPlotCount();
-        final Set<Plot> result = new HashSet<>(size);
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                result.addAll(value.getPlots());
-            }
-        });
-        return result;
-    }
-
-    public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
-        if (this.plots_tmp == null) {
-            this.plots_tmp = new HashMap<>();
-        }
-        for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
-            String world = entry.getKey();
-            PlotArea area = getPlotArea(world, null);
-            if (area == null) {
-                HashMap<PlotId, Plot> map = this.plots_tmp.get(world);
-                if (map == null) {
-                    map = new HashMap<>();
-                    this.plots_tmp.put(world, map);
-                }
-                map.putAll(entry.getValue());
-            } else {
-                for (Plot plot : entry.getValue().values()) {
-                    plot.setArea(area);
-                    area.addPlot(plot);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get all the plots owned by a player name.
-     *
-     * @param world  the world
-     * @param player the plot owner
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlots(String world, String player) {
-        final UUID uuid = UUIDHandler.getUUID(player, null);
-        return getPlots(world, uuid);
-    }
-
-    /**
-     * Get all the plots owned by a player name.
-     *
-     * @param area   the PlotArea
-     * @param player the plot owner
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlots(PlotArea area, String player) {
-        UUID uuid = UUIDHandler.getUUID(player, null);
-        return getPlots(area, uuid);
-    }
-
-    /**
-     * Get all plots by a PlotPlayer.
-     *
-     * @param world  the world
-     * @param player the plot owner
-     * @return Set of plot
-     */
-    public Set<Plot> getPlots(String world, PlotPlayer player) {
-        return getPlots(world, player.getUUID());
-    }
-
-    /**
-     * Get all plots by a PlotPlayer.
-     *
-     * @param area   the PlotArea
-     * @param player the plot owner
-     * @return Set of plot
-     */
-    public Set<Plot> getPlots(PlotArea area, PlotPlayer player) {
-        return getPlots(area, player.getUUID());
-    }
-
-    /**
-     * Get all plots by a UUID in a world.
-     *
-     * @param world the world
-     * @param uuid  the plot owner
-     * @return Set of plot
-     */
-    public Set<Plot> getPlots(String world, UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        for (final Plot plot : getPlots(world)) {
-            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Get all plots by a UUID in an area.
-     *
-     * @param area the {@code PlotArea}
-     * @param uuid the plot owner
-     * @return Set of plots
-     */
-    public Set<Plot> getPlots(PlotArea area, UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        for (Plot plot : getPlots(area)) {
-            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Check if a plot world.
-     *
-     * @param world the world
-     * @return if a plot world is registered
-     * @see #getPlotAreaByString(String) to get the PlotArea object
-     */
-    public boolean hasPlotArea(String world) {
-        return plotAreaManager.getPlotAreas(world, null).length != 0;
-    }
-
-    public Collection<Plot> getPlots(String world) {
-        final Set<Plot> set = new HashSet<>();
-        foreachPlotArea(world, new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                set.addAll(value.getPlots());
-            }
-        });
-        return set;
-    }
-
-    /**
-     * Get the plots for a PlotPlayer.
-     *
-     * @param player the player to retrieve the plots for
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlots(PlotPlayer player) {
-        return getPlots(player.getUUID());
-    }
-
-    public Collection<Plot> getPlots(PlotArea area) {
-        return area == null ? EMPTY_SET : area.getPlots();
-    }
-
-    public Plot getPlot(PlotArea area, PlotId id) {
-        return area == null ? null : id == null ? null : area.getPlot(id);
-    }
-
-    public Set<Plot> getBasePlots(PlotPlayer player) {
-        return getBasePlots(player.getUUID());
-    }
-
-    /**
-     * Get the plots for a UUID.
-     *
-     * @param uuid the plot owner
-     * @return Set of Plot's owned by the player
-     */
-    public Set<Plot> getPlots(final UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        foreachPlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwnerAbs(uuid)) {
-                    plots.add(value);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(plots);
-    }
-
-    public boolean hasPlot(final UUID uuid) {
-        for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
-            if (area.hasPlot(uuid))
-                return true;
-        }
-        return false;
-    }
-
-    public Set<Plot> getBasePlots(final UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        foreachBasePlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwner(uuid)) {
-                    plots.add(value);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Get the plots for a UUID.
-     *
-     * @param uuid the UUID of the owner
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlotsAbs(final UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        foreachPlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwnerAbs(uuid)) {
-                    plots.add(value);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Unregister a plot from local memory (does not call DB).
-     *
-     * @param plot      the plot to remove
-     * @param callEvent If to call an event about the plot being removed
-     * @return true if plot existed | false if it didn't
-     */
-    public boolean removePlot(Plot plot, boolean callEvent) {
-        if (plot == null) {
-            return false;
-        }
-        if (callEvent) {
-            EventUtil.manager.callDelete(plot);
-        }
-        if (plot.getArea().removePlot(plot.getId())) {
-            PlotId last = (PlotId) plot.getArea().getMeta("lastPlot");
-            int last_max = Math.max(Math.abs(last.x), Math.abs(last.y));
-            int this_max = Math.max(Math.abs(plot.getId().x), Math.abs(plot.getId().y));
-            if (this_max < last_max) {
-                plot.getArea().setMeta("lastPlot", plot.getId());
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * This method is called by the PlotGenerator class normally.
-     * <ul>
-     * <li>Initializes the PlotArea and PlotManager classes
-     * <li>Registers the PlotArea and PlotManager classes
-     * <li>Loads (and/or generates) the PlotArea configuration
-     * <li>Sets up the world border if configured
-     * </ul>
-     *
-     * <p>If loading an augmented plot world:
-     * <ul>
-     * <li>Creates the AugmentedPopulator classes
-     * <li>Injects the AugmentedPopulator classes if required
-     * </ul>
-     *
-     * @param world         the world to load
-     * @param baseGenerator The generator for that world, or null
-     */
-    public void loadWorld(String world, GeneratorWrapper<?> baseGenerator) {
-        if (world.equals("CheckingPlotSquaredGenerator")) {
-            return;
-        }
-        this.plotAreaManager.addWorld(world);
-        Set<String> worlds;
-        if (this.worlds.contains("worlds")) {
-            worlds = this.worlds.getConfigurationSection("worlds").getKeys(false);
-        } else {
-            worlds = new HashSet<>();
-        }
-        String path = "worlds." + world;
-        ConfigurationSection worldSection = this.worlds.getConfigurationSection(path);
-        int type;
-        if (worldSection != null) {
-            type = worldSection.getInt("generator.type", 0);
-        } else {
-            type = 0;
-        }
-        if (type == 0) {
-            if (plotAreaManager.getPlotAreas(world, null).length != 0) {
-                debug("World possibly already loaded: " + world);
-                return;
-            }
-            IndependentPlotGenerator plotGenerator;
-            if (baseGenerator != null && baseGenerator.isFull()) {
-                plotGenerator = baseGenerator.getPlotGenerator();
-            } else if (worldSection != null) {
-                String secondaryGeneratorName = worldSection.getString("generator.plugin");
-                GeneratorWrapper<?> secondaryGenerator =
-                    this.IMP.getGenerator(world, secondaryGeneratorName);
-                if (secondaryGenerator != null && secondaryGenerator.isFull()) {
-                    plotGenerator = secondaryGenerator.getPlotGenerator();
-                } else {
-                    String primaryGeneratorName = worldSection.getString("generator.init");
-                    GeneratorWrapper<?> primaryGenerator =
-                        this.IMP.getGenerator(world, primaryGeneratorName);
-                    if (primaryGenerator != null && primaryGenerator.isFull()) {
-                        plotGenerator = primaryGenerator.getPlotGenerator();
-                    } else {
-                        return;
-                    }
-                }
-            } else {
-                return;
-            }
-            // Conventional plot generator
-            PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
-            PlotManager plotManager = plotGenerator.getNewPlotManager();
-            PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-            PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
-            PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
-            PlotSquared
-                .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
-            if (!this.worlds.contains(path)) {
-                this.worlds.createSection(path);
-                worldSection = this.worlds.getConfigurationSection(path);
-            }
-            plotArea.saveConfiguration(worldSection);
-            plotArea.loadDefaultConfiguration(worldSection);
-            try {
-                this.worlds.save(this.worldsFile);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            // Now add it
-            addPlotArea(plotArea);
-            plotGenerator.initialize(plotArea);
-        } else {
-            if (!worlds.contains(world)) {
-                return;
-            }
-            ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
-            if (areasSection == null) {
-                if (plotAreaManager.getPlotAreas(world, null).length != 0) {
-                    debug("World possibly already loaded: " + world);
-                    return;
-                }
-                PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-                String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
-                if (type == 2) {
-                    Set<PlotCluster> clusters = this.clusters_tmp != null ?
-                        this.clusters_tmp.get(world) :
-                        new HashSet<PlotCluster>();
-                    if (clusters == null) {
-                        throw new IllegalArgumentException("No cluster exists for world: " + world);
-                    }
-                    ArrayDeque<PlotArea> toLoad = new ArrayDeque<>();
-                    for (PlotCluster cluster : clusters) {
-                        PlotId pos1 = cluster.getP1(); // Cluster pos1
-                        PlotId pos2 = cluster.getP2(); // Cluster pos2
-                        String name = cluster.getName(); // Cluster name
-                        String fullId = name + "-" + pos1 + "-" + pos2;
-                        worldSection.createSection("areas." + fullId);
-                        DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
-
-                        PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
-                        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-                        if (areaGen == null) {
-                            throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-                        }
-                        PlotArea pa =
-                            areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
-                        pa.saveConfiguration(worldSection);
-                        pa.loadDefaultConfiguration(worldSection);
-                        try {
-                            this.worlds.save(this.worldsFile);
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                        PlotSquared
-                            .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
-                        PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
-                            + " (invalid or old configuration?)");
-                        areaGen.getPlotGenerator().initialize(pa);
-                        areaGen.augment(pa);
-                        toLoad.add(pa);
-                    }
-                    for (PlotArea area : toLoad) {
-                        addPlotArea(area);
-                    }
-                    return;
-                }
-                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-                if (areaGen == null) {
-                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-                }
-                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
-                pa.saveConfiguration(worldSection);
-                pa.loadDefaultConfiguration(worldSection);
-                try {
-                    this.worlds.save(this.worldsFile);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
-                PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
-                PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
-                areaGen.getPlotGenerator().initialize(pa);
-                areaGen.augment(pa);
-                addPlotArea(pa);
-                return;
-            }
-            if (type == 1) {
-                throw new IllegalArgumentException(
-                    "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
-            }
-            for (String areaId : areasSection.getKeys(false)) {
-                PlotSquared.log(C.PREFIX + "&3 - " + areaId);
-                String[] split = areaId.split("(?<=[^;-])-");
-                if (split.length != 3) {
-                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
-                        + ". Expected form `<name>-<pos1>-<pos2>`");
-                }
-                String name = split[0];
-                PlotId pos1 = PlotId.fromString(split[1]);
-                PlotId pos2 = PlotId.fromString(split[2]);
-                if (pos1 == null || pos2 == null || name.isEmpty()) {
-                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
-                        + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
-                }
-                PlotArea existing = getPlotArea(world, name);
-                if (existing != null && name.equals(existing.id)) {
-                    continue;
-                }
-                ConfigurationSection section = areasSection.getConfigurationSection(areaId);
-                YamlConfiguration clone = new YamlConfiguration();
-                for (String key : section.getKeys(true)) {
-                    if (section.get(key) instanceof MemorySection) {
-                        continue;
-                    }
-                    if (!clone.contains(key)) {
-                        clone.set(key, section.get(key));
-                    }
-                }
-                for (String key : worldSection.getKeys(true)) {
-                    if (worldSection.get(key) instanceof MemorySection) {
-                        continue;
-                    }
-                    if (!key.startsWith("areas") && !clone.contains(key)) {
-                        clone.set(key, worldSection.get(key));
-                    }
-                }
-                String gen_string = clone.getString("generator.plugin", IMP.getPluginName());
-                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-                if (areaGen == null) {
-                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-                }
-                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
-                pa.saveConfiguration(clone);
-                // netSections is the combination of
-                for (String key : clone.getKeys(true)) {
-                    if (clone.get(key) instanceof MemorySection) {
-                        continue;
-                    }
-                    if (!worldSection.contains(key)) {
-                        worldSection.set(key, clone.get(key));
-                    } else {
-                        Object value = worldSection.get(key);
-                        if (!Objects.equals(value, clone.get(key))) {
-                            section.set(key, clone.get(key));
-                        }
-                    }
-                }
-                pa.loadDefaultConfiguration(clone);
-                try {
-                    this.worlds.save(this.worldsFile);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
-                PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
-                areaGen.getPlotGenerator().initialize(pa);
-                areaGen.augment(pa);
-                addPlotArea(pa);
-            }
-        }
-    }
-
-    /**
-     * Setup the configuration for a plot world based on world arguments.
-     *
-     *
-     * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
-     *
-     * @param world     The name of the world
-     * @param args      The arguments
-     * @param generator the plot generator
-     * @return boolean | if valid arguments were provided
-     */
-    public boolean setupPlotWorld(String world, String args, IndependentPlotGenerator generator) {
-        if (args != null && !args.isEmpty()) {
-            // save configuration
-
-            final List<String> validArguments = Arrays
-                .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
-                    "w=", "wall=", "b=", "border=");
-
-            // Calculate the number of expected arguments
-            int expected = 0;
-            for (final String validArgument : validArguments) {
-                if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
-                    expected += 1;
-                }
-            }
-
-            String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
-
-            if (split.length > expected) {
-                // This means we have multi-block block buckets
-                String[] combinedArgs = new String[expected];
-                int index = 0;
-
-                StringBuilder argBuilder = new StringBuilder();
-                outer:
-                for (final String string : split) {
-                    for (final String validArgument : validArguments) {
-                        if (string.contains(validArgument)) {
-                            if (!argBuilder.toString().isEmpty()) {
-                                combinedArgs[index++] = argBuilder.toString();
-                                argBuilder = new StringBuilder();
-                            }
-                            argBuilder.append(string);
-                            continue outer;
-                        }
-                    }
-                    if (argBuilder.toString().charAt(argBuilder.length() - 1) != '=') {
-                        argBuilder.append(",");
-                    }
-                    argBuilder.append(string);
-                }
-
-                if (!argBuilder.toString().isEmpty()) {
-                    combinedArgs[index] = argBuilder.toString();
-                }
-
-                split = combinedArgs;
-            }
-
-            HybridPlotWorld plotworld = new HybridPlotWorld(world, null, generator, null, null);
-            for (String element : split) {
-                String[] pair = element.split("=");
-                if (pair.length != 2) {
-                    PlotSquared.log("&cNo value provided for: &7" + element);
-                    return false;
-                }
-                String key = pair[0].toLowerCase();
-                String value = pair[1];
-                String base = "worlds." + world + ".";
-                try {
-                    switch (key) {
-                        case "s":
-                        case "size":
-                            this.worlds.set(base + "plot.size",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            break;
-                        case "g":
-                        case "gap":
-                            this.worlds.set(base + "road.width",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            break;
-                        case "h":
-                        case "height":
-                            this.worlds.set(base + "road.height",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            this.worlds.set(base + "plot.height",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            this.worlds.set(base + "wall.height",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            break;
-                        case "f":
-                        case "floor":
-                            this.worlds.set(base + "plot.floor",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        case "m":
-                        case "main":
-                            this.worlds.set(base + "plot.filling",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        case "w":
-                        case "wall":
-                            this.worlds.set(base + "wall.filling",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        case "b":
-                        case "border":
-                            this.worlds.set(base + "wall.block",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        default:
-                            PlotSquared.log("&cKey not found: &7" + element);
-                            return false;
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    PlotSquared.log("&cInvalid value: &7" + value + " in arg " + element);
-                    return false;
-                }
-            }
-            try {
-                ConfigurationSection section =
-                    this.worlds.getConfigurationSection("worlds." + world);
-                plotworld.saveConfiguration(section);
-                plotworld.loadConfiguration(section);
-                this.worlds.save(this.worldsFile);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+  public boolean hasPlot(final UUID uuid) {
+    for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
+      if (area.hasPlot(uuid)) {
         return true;
+      }
     }
+    return false;
+  }
 
-    public boolean canUpdate(@NonNull final String current, @NonNull final String other) {
-        final String s1 = normalisedVersion(current);
-        final String s2 = normalisedVersion(other);
-        return s1.compareTo(s2) < 0;
-    }
-
-    public String normalisedVersion(@NonNull final String version) {
-        final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
-        final StringBuilder sb = new StringBuilder();
-        for (final String s : split) {
-            sb.append(String.format("%" + 4 + 's', s));
+  public Set<Plot> getBasePlots(final UUID uuid) {
+    final Set<Plot> plots = new HashSet<>();
+    foreachBasePlot(new RunnableVal<Plot>() {
+      @Override
+      public void run(Plot value) {
+        if (value.isOwner(uuid)) {
+          plots.add(value);
         }
-        return sb.toString();
-    }
+      }
+    });
+    return Collections.unmodifiableSet(plots);
+  }
 
-    public boolean update(PlotPlayer sender, URL url) {
-        try {
-            String name = this.jarFile.getName();
-            File newJar = new File("plugins/update/" + name);
-            MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
-            URLConnection con = url.openConnection();
-            try (InputStream stream = con.getInputStream()) {
-                File parent = newJar.getParentFile();
-                if (!parent.exists()) {
-                    parent.mkdirs();
-                }
-                MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
-                if (!newJar.delete()) {
-                    MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
-                    MainUtil.sendMessage(sender, "Jar file failed to delete.");
-                    MainUtil.sendMessage(sender, " - Please update manually");
-                }
-                Files.copy(stream, newJar.toPath());
-            }
-            MainUtil.sendMessage(sender,
-                "$1The update will take effect when the server is restarted next");
-            return true;
-        } catch (IOException e) {
-            MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
-            MainUtil.sendMessage(sender, " - Please update manually");
-            PlotSquared.log("============ Stacktrace ============");
-            e.printStackTrace();
-            PlotSquared.log("====================================");
+  /**
+   * Get the plots for a UUID.
+   *
+   * @param uuid the UUID of the owner
+   * @return Set of Plot
+   */
+  public Set<Plot> getPlotsAbs(final UUID uuid) {
+    final Set<Plot> plots = new HashSet<>();
+    foreachPlot(new RunnableVal<Plot>() {
+      @Override
+      public void run(Plot value) {
+        if (value.isOwnerAbs(uuid)) {
+          plots.add(value);
         }
-        return false;
-    }
+      }
+    });
+    return Collections.unmodifiableSet(plots);
+  }
 
-    /**
-     * Copy a file from inside the jar to a location
-     *
-     * @param file   Name of the file inside PlotSquared.jar
-     * @param folder The output location relative to /plugins/PlotSquared/
-     */
-    public void copyFile(String file, String folder) {
-        try {
-            File output = this.IMP.getDirectory();
-            if (!output.exists()) {
-                output.mkdirs();
-            }
-            File newFile = MainUtil.getFile(output, folder + File.separator + file);
-            if (newFile.exists()) {
-                return;
-            }
-            try (InputStream stream = this.IMP.getClass().getResourceAsStream(file)) {
-                byte[] buffer = new byte[2048];
-                if (stream == null) {
-                    try (ZipInputStream zis = new ZipInputStream(
-                        new FileInputStream(this.jarFile))) {
-                        ZipEntry ze = zis.getNextEntry();
-                        while (ze != null) {
-                            String name = ze.getName();
-                            if (name.equals(file)) {
-                                new File(newFile.getParent()).mkdirs();
-                                try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                                    int len;
-                                    while ((len = zis.read(buffer)) > 0) {
-                                        fos.write(buffer, 0, len);
-                                    }
-                                }
-                                ze = null;
-                            } else {
-                                ze = zis.getNextEntry();
-                            }
-                        }
-                        zis.closeEntry();
-                    }
-                    return;
-                }
-                newFile.createNewFile();
-                try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                    int len;
-                    while ((len = stream.read(buffer)) > 0) {
-                        fos.write(buffer, 0, len);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            PlotSquared.log("&cCould not save " + file);
+  /**
+   * Unregister a plot from local memory (does not call DB).
+   *
+   * @param plot the plot to remove
+   * @param callEvent If to call an event about the plot being removed
+   * @return true if plot existed | false if it didn't
+   */
+  public boolean removePlot(Plot plot, boolean callEvent) {
+    if (plot == null) {
+      return false;
+    }
+    if (callEvent) {
+      EventUtil.manager.callDelete(plot);
+    }
+    if (plot.getArea().removePlot(plot.getId())) {
+      PlotId last = (PlotId) plot.getArea().getMeta("lastPlot");
+      int last_max = Math.max(Math.abs(last.x), Math.abs(last.y));
+      int this_max = Math.max(Math.abs(plot.getId().x), Math.abs(plot.getId().y));
+      if (this_max < last_max) {
+        plot.getArea().setMeta("lastPlot", plot.getId());
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * This method is called by the PlotGenerator class normally.
+   * <ul>
+   * <li>Initializes the PlotArea and PlotManager classes
+   * <li>Registers the PlotArea and PlotManager classes
+   * <li>Loads (and/or generates) the PlotArea configuration
+   * <li>Sets up the world border if configured
+   * </ul>
+   *
+   * <p>If loading an augmented plot world:
+   * <ul>
+   * <li>Creates the AugmentedPopulator classes
+   * <li>Injects the AugmentedPopulator classes if required
+   * </ul>
+   *
+   * @param world the world to load
+   * @param baseGenerator The generator for that world, or null
+   */
+  public void loadWorld(String world, GeneratorWrapper<?> baseGenerator) {
+    if (world.equals("CheckingPlotSquaredGenerator")) {
+      return;
+    }
+    this.plotAreaManager.addWorld(world);
+    Set<String> worlds;
+    if (this.worlds.contains("worlds")) {
+      worlds = this.worlds.getConfigurationSection("worlds").getKeys(false);
+    } else {
+      worlds = new HashSet<>();
+    }
+    String path = "worlds." + world;
+    ConfigurationSection worldSection = this.worlds.getConfigurationSection(path);
+    int type;
+    if (worldSection != null) {
+      type = worldSection.getInt("generator.type", 0);
+    } else {
+      type = 0;
+    }
+    if (type == 0) {
+      if (plotAreaManager.getPlotAreas(world, null).length != 0) {
+        debug("World possibly already loaded: " + world);
+        return;
+      }
+      IndependentPlotGenerator plotGenerator;
+      if (baseGenerator != null && baseGenerator.isFull()) {
+        plotGenerator = baseGenerator.getPlotGenerator();
+      } else if (worldSection != null) {
+        String secondaryGeneratorName = worldSection.getString("generator.plugin");
+        GeneratorWrapper<?> secondaryGenerator =
+            this.IMP.getGenerator(world, secondaryGeneratorName);
+        if (secondaryGenerator != null && secondaryGenerator.isFull()) {
+          plotGenerator = secondaryGenerator.getPlotGenerator();
+        } else {
+          String primaryGeneratorName = worldSection.getString("generator.init");
+          GeneratorWrapper<?> primaryGenerator =
+              this.IMP.getGenerator(world, primaryGeneratorName);
+          if (primaryGenerator != null && primaryGenerator.isFull()) {
+            plotGenerator = primaryGenerator.getPlotGenerator();
+          } else {
+            return;
+          }
         }
-    }
-
-    private Map<String, Map<PlotId, Plot>> getPlotsRaw() {
-        HashMap<String, Map<PlotId, Plot>> map = new HashMap<>();
-        for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            Map<PlotId, Plot> map2 = map.get(area.toString());
-            if (map2 == null) {
-                map.put(area.toString(), area.getPlotsRaw());
-            } else {
-                map2.putAll(area.getPlotsRaw());
-            }
+      } else {
+        return;
+      }
+      // Conventional plot generator
+      PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
+      PlotManager plotManager = plotGenerator.getNewPlotManager();
+      PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+      PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
+      PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
+      PlotSquared
+          .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
+      if (!this.worlds.contains(path)) {
+        this.worlds.createSection(path);
+        worldSection = this.worlds.getConfigurationSection(path);
+      }
+      plotArea.saveConfiguration(worldSection);
+      plotArea.loadDefaultConfiguration(worldSection);
+      try {
+        this.worlds.save(this.worldsFile);
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+      // Now add it
+      addPlotArea(plotArea);
+      plotGenerator.initialize(plotArea);
+    } else {
+      if (!worlds.contains(world)) {
+        return;
+      }
+      ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
+      if (areasSection == null) {
+        if (plotAreaManager.getPlotAreas(world, null).length != 0) {
+          debug("World possibly already loaded: " + world);
+          return;
         }
-        return map;
-    }
+        PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+        String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
+        if (type == 2) {
+          Set<PlotCluster> clusters = this.clusters_tmp != null ?
+              this.clusters_tmp.get(world) :
+              new HashSet<>();
+          if (clusters == null) {
+            throw new IllegalArgumentException("No cluster exists for world: " + world);
+          }
+          ArrayDeque<PlotArea> toLoad = new ArrayDeque<>();
+          for (PlotCluster cluster : clusters) {
+            PlotId pos1 = cluster.getP1(); // Cluster pos1
+            PlotId pos2 = cluster.getP2(); // Cluster pos2
+            String name = cluster.getName(); // Cluster name
+            String fullId = name + "-" + pos1 + "-" + pos2;
+            worldSection.createSection("areas." + fullId);
+            DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
 
-    /**
-     * Close the database connection.
-     */
-    public void disable() {
-        try {
-            // Validate that all data in the db is correct
-            final HashSet<Plot> plots = new HashSet<>();
+            PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
+            GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+            if (areaGen == null) {
+              throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+            }
+            PlotArea pa =
+                areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
+            pa.saveConfiguration(worldSection);
+            pa.loadDefaultConfiguration(worldSection);
             try {
-                foreachPlotRaw(new RunnableVal<Plot>() {
-                    @Override public void run(Plot value) {
-                        plots.add(value);
-                    }
-                });
-            } catch (final Exception ignored) {
+              this.worlds.save(this.worldsFile);
+            } catch (IOException e) {
+              e.printStackTrace();
             }
-            DBFunc.validatePlots(plots);
-
-            // Close the connection
-            DBFunc.close();
-            UUIDHandler.handleShutdown();
-        } catch (NullPointerException ignored) {
-            ignored.printStackTrace();
-            PlotSquared.log("&cCould not close database connection!");
+            PlotSquared
+                .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+            PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+            PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
+            PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
+                + " (invalid or old configuration?)");
+            areaGen.getPlotGenerator().initialize(pa);
+            areaGen.augment(pa);
+            toLoad.add(pa);
+          }
+          for (PlotArea area : toLoad) {
+            addPlotArea(area);
+          }
+          return;
         }
-    }
-
-    /**
-     * Setup the database connection.
-     */
-    public void setupDatabase() {
+        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+        if (areaGen == null) {
+          throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+        }
+        PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
+        pa.saveConfiguration(worldSection);
+        pa.loadDefaultConfiguration(worldSection);
         try {
-            if (DBFunc.dbManager != null) {
-                DBFunc.dbManager.close();
+          this.worlds.save(this.worldsFile);
+        } catch (IOException e) {
+          e.printStackTrace();
+        }
+        PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
+        PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
+        PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
+        areaGen.getPlotGenerator().initialize(pa);
+        areaGen.augment(pa);
+        addPlotArea(pa);
+        return;
+      }
+      if (type == 1) {
+        throw new IllegalArgumentException(
+            "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
+      }
+      for (String areaId : areasSection.getKeys(false)) {
+        PlotSquared.log(C.PREFIX + "&3 - " + areaId);
+        String[] split = areaId.split("(?<=[^;-])-");
+        if (split.length != 3) {
+          throw new IllegalArgumentException("Invalid Area identifier: " + areaId
+              + ". Expected form `<name>-<pos1>-<pos2>`");
+        }
+        String name = split[0];
+        PlotId pos1 = PlotId.fromString(split[1]);
+        PlotId pos2 = PlotId.fromString(split[2]);
+        if (pos1 == null || pos2 == null || name.isEmpty()) {
+          throw new IllegalArgumentException("Invalid Area identifier: " + areaId
+              + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
+        }
+        PlotArea existing = getPlotArea(world, name);
+        if (existing != null && name.equals(existing.id)) {
+          continue;
+        }
+        ConfigurationSection section = areasSection.getConfigurationSection(areaId);
+        YamlConfiguration clone = new YamlConfiguration();
+        for (String key : section.getKeys(true)) {
+          if (section.get(key) instanceof MemorySection) {
+            continue;
+          }
+          if (!clone.contains(key)) {
+            clone.set(key, section.get(key));
+          }
+        }
+        for (String key : worldSection.getKeys(true)) {
+          if (worldSection.get(key) instanceof MemorySection) {
+            continue;
+          }
+          if (!key.startsWith("areas") && !clone.contains(key)) {
+            clone.set(key, worldSection.get(key));
+          }
+        }
+        String gen_string = clone.getString("generator.plugin", IMP.getPluginName());
+        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+        if (areaGen == null) {
+          throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+        }
+        PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
+        pa.saveConfiguration(clone);
+        // netSections is the combination of
+        for (String key : clone.getKeys(true)) {
+          if (clone.get(key) instanceof MemorySection) {
+            continue;
+          }
+          if (!worldSection.contains(key)) {
+            worldSection.set(key, clone.get(key));
+          } else {
+            Object value = worldSection.get(key);
+            if (!Objects.equals(value, clone.get(key))) {
+              section.set(key, clone.get(key));
             }
-            Database database;
-            if (Storage.MySQL.USE) {
-                database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
-                    Storage.MySQL.USER, Storage.MySQL.PASSWORD);
-            } else if (Storage.SQLite.USE) {
-                File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
-                database = new SQLite(file);
-            } else {
-                PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
-                this.IMP.disable();
-                return;
+          }
+        }
+        pa.loadDefaultConfiguration(clone);
+        try {
+          this.worlds.save(this.worldsFile);
+        } catch (IOException e) {
+          e.printStackTrace();
+        }
+        PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
+        PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
+        areaGen.getPlotGenerator().initialize(pa);
+        areaGen.augment(pa);
+        addPlotArea(pa);
+      }
+    }
+  }
+
+  /**
+   * Setup the configuration for a plot world based on world arguments.
+   *
+   *
+   * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
+   *
+   * @param world The name of the world
+   * @param args The arguments
+   * @param generator the plot generator
+   * @return boolean | if valid arguments were provided
+   */
+  public boolean setupPlotWorld(String world, String args, IndependentPlotGenerator generator) {
+    if (args != null && !args.isEmpty()) {
+      // save configuration
+
+      final List<String> validArguments = Arrays
+          .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
+              "w=", "wall=", "b=", "border=");
+
+      // Calculate the number of expected arguments
+      int expected = 0;
+      for (final String validArgument : validArguments) {
+        if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
+          expected += 1;
+        }
+      }
+
+      String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
+
+      if (split.length > expected) {
+        // This means we have multi-block block buckets
+        String[] combinedArgs = new String[expected];
+        int index = 0;
+
+        StringBuilder argBuilder = new StringBuilder();
+        outer:
+        for (final String string : split) {
+          for (final String validArgument : validArguments) {
+            if (string.contains(validArgument)) {
+              if (!argBuilder.toString().isEmpty()) {
+                combinedArgs[index++] = argBuilder.toString();
+                argBuilder = new StringBuilder();
+              }
+              argBuilder.append(string);
+              continue outer;
             }
-            DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
-            this.plots_tmp = DBFunc.getPlots();
-            if (plotAreaManager instanceof SinglePlotAreaManager) {
-                SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
-                addPlotArea(area);
-                ConfigurationSection section = worlds.getConfigurationSection("worlds.*");
-                if (section == null) {
-                    section = worlds.createSection("worlds.*");
+          }
+          if (argBuilder.toString().charAt(argBuilder.length() - 1) != '=') {
+            argBuilder.append(",");
+          }
+          argBuilder.append(string);
+        }
+
+        if (!argBuilder.toString().isEmpty()) {
+          combinedArgs[index] = argBuilder.toString();
+        }
+
+        split = combinedArgs;
+      }
+
+      HybridPlotWorld plotworld = new HybridPlotWorld(world, null, generator, null, null);
+      for (String element : split) {
+        String[] pair = element.split("=");
+        if (pair.length != 2) {
+          PlotSquared.log("&cNo value provided for: &7" + element);
+          return false;
+        }
+        String key = pair[0].toLowerCase();
+        String value = pair[1];
+        String base = "worlds." + world + ".";
+        try {
+          switch (key) {
+            case "s":
+            case "size":
+              this.worlds.set(base + "plot.size",
+                  Configuration.INTEGER.parseString(value).shortValue());
+              break;
+            case "g":
+            case "gap":
+              this.worlds.set(base + "road.width",
+                  Configuration.INTEGER.parseString(value).shortValue());
+              break;
+            case "h":
+            case "height":
+              this.worlds.set(base + "road.height",
+                  Configuration.INTEGER.parseString(value).shortValue());
+              this.worlds.set(base + "plot.height",
+                  Configuration.INTEGER.parseString(value).shortValue());
+              this.worlds.set(base + "wall.height",
+                  Configuration.INTEGER.parseString(value).shortValue());
+              break;
+            case "f":
+            case "floor":
+              this.worlds.set(base + "plot.floor",
+                  Configuration.BLOCK_BUCKET.parseString(value).toString());
+              break;
+            case "m":
+            case "main":
+              this.worlds.set(base + "plot.filling",
+                  Configuration.BLOCK_BUCKET.parseString(value).toString());
+              break;
+            case "w":
+            case "wall":
+              this.worlds.set(base + "wall.filling",
+                  Configuration.BLOCK_BUCKET.parseString(value).toString());
+              break;
+            case "b":
+            case "border":
+              this.worlds.set(base + "wall.block",
+                  Configuration.BLOCK_BUCKET.parseString(value).toString());
+              break;
+            default:
+              PlotSquared.log("&cKey not found: &7" + element);
+              return false;
+          }
+        } catch (Exception e) {
+          e.printStackTrace();
+          PlotSquared.log("&cInvalid value: &7" + value + " in arg " + element);
+          return false;
+        }
+      }
+      try {
+        ConfigurationSection section =
+            this.worlds.getConfigurationSection("worlds." + world);
+        plotworld.saveConfiguration(section);
+        plotworld.loadConfiguration(section);
+        this.worlds.save(this.worldsFile);
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+    }
+    return true;
+  }
+
+  public boolean canUpdate(@NonNull final String current, @NonNull final String other) {
+    final String s1 = normalisedVersion(current);
+    final String s2 = normalisedVersion(other);
+    return s1.compareTo(s2) < 0;
+  }
+
+  public String normalisedVersion(@NonNull final String version) {
+    final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
+    final StringBuilder sb = new StringBuilder();
+    for (final String s : split) {
+      sb.append(String.format("%" + 4 + 's', s));
+    }
+    return sb.toString();
+  }
+
+  public boolean update(PlotPlayer sender, URL url) {
+    try {
+      String name = this.jarFile.getName();
+      File newJar = new File("plugins/update/" + name);
+      MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
+      URLConnection con = url.openConnection();
+      try (InputStream stream = con.getInputStream()) {
+        File parent = newJar.getParentFile();
+        if (!parent.exists()) {
+          parent.mkdirs();
+        }
+        MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
+        if (!newJar.delete()) {
+          MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
+          MainUtil.sendMessage(sender, "Jar file failed to delete.");
+          MainUtil.sendMessage(sender, " - Please update manually");
+        }
+        Files.copy(stream, newJar.toPath());
+      }
+      MainUtil.sendMessage(sender,
+          "$1The update will take effect when the server is restarted next");
+      return true;
+    } catch (IOException e) {
+      MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
+      MainUtil.sendMessage(sender, " - Please update manually");
+      PlotSquared.log("============ Stacktrace ============");
+      e.printStackTrace();
+      PlotSquared.log("====================================");
+    }
+    return false;
+  }
+
+  /**
+   * Copy a file from inside the jar to a location
+   *
+   * @param file Name of the file inside PlotSquared.jar
+   * @param folder The output location relative to /plugins/PlotSquared/
+   */
+  public void copyFile(String file, String folder) {
+    try {
+      File output = this.IMP.getDirectory();
+      if (!output.exists()) {
+        output.mkdirs();
+      }
+      File newFile = MainUtil.getFile(output, folder + File.separator + file);
+      if (newFile.exists()) {
+        return;
+      }
+      try (InputStream stream = this.IMP.getClass().getResourceAsStream(file)) {
+        byte[] buffer = new byte[2048];
+        if (stream == null) {
+          try (ZipInputStream zis = new ZipInputStream(
+              new FileInputStream(this.jarFile))) {
+            ZipEntry ze = zis.getNextEntry();
+            while (ze != null) {
+              String name = ze.getName();
+              if (name.equals(file)) {
+                new File(newFile.getParent()).mkdirs();
+                try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                  int len;
+                  while ((len = zis.read(buffer)) > 0) {
+                    fos.write(buffer, 0, len);
+                  }
                 }
-                area.saveConfiguration(section);
-                area.loadDefaultConfiguration(section);
+                ze = null;
+              } else {
+                ze = zis.getNextEntry();
+              }
             }
-            this.clusters_tmp = DBFunc.getClusters();
-        } catch (ClassNotFoundException | SQLException e) {
-            PlotSquared.log(
-                C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
-            if (Storage.MySQL.USE) {
-                PlotSquared.log("$4MYSQL");
-            } else if (Storage.SQLite.USE) {
-                PlotSquared.log("$4SQLITE");
-            }
-            PlotSquared.log(
-                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+            zis.closeEntry();
+          }
+          return;
+        }
+        newFile.createNewFile();
+        try (FileOutputStream fos = new FileOutputStream(newFile)) {
+          int len;
+          while ((len = stream.read(buffer)) > 0) {
+            fos.write(buffer, 0, len);
+          }
+        }
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+      PlotSquared.log("&cCould not save " + file);
+    }
+  }
+
+  private Map<String, Map<PlotId, Plot>> getPlotsRaw() {
+    HashMap<String, Map<PlotId, Plot>> map = new HashMap<>();
+    for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+      Map<PlotId, Plot> map2 = map.get(area.toString());
+      if (map2 == null) {
+        map.put(area.toString(), area.getPlotsRaw());
+      } else {
+        map2.putAll(area.getPlotsRaw());
+      }
+    }
+    return map;
+  }
+
+  /**
+   * Close the database connection.
+   */
+  public void disable() {
+    try {
+      // Validate that all data in the db is correct
+      final HashSet<Plot> plots = new HashSet<>();
+      try {
+        foreachPlotRaw(new RunnableVal<Plot>() {
+          @Override
+          public void run(Plot value) {
+            plots.add(value);
+          }
+        });
+      } catch (final Exception ignored) {
+      }
+      DBFunc.validatePlots(plots);
+
+      // Close the connection
+      DBFunc.close();
+      UUIDHandler.handleShutdown();
+    } catch (NullPointerException exception) {
+      exception.printStackTrace();
+      PlotSquared.log("&cCould not close database connection!");
+    }
+  }
+
+  /**
+   * Setup the database connection.
+   */
+  public void setupDatabase() {
+    try {
+      if (DBFunc.dbManager != null) {
+        DBFunc.dbManager.close();
+      }
+      Database database;
+      if (Storage.MySQL.USE) {
+        database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
+            Storage.MySQL.USER, Storage.MySQL.PASSWORD);
+      } else if (Storage.SQLite.USE) {
+        File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
+        database = new SQLite(file);
+      } else {
+        PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
+        this.IMP.disable();
+        return;
+      }
+      DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
+      PlotSquared.log("GETTING PLOTS NOW AND STORING TO PLOTS_TMP");
+      for (PlotArea allPlotArea : plotAreaManager.getAllPlotAreas()) {
+        PlotSquared.log(allPlotArea.toString());
+      }
+
+      this.plots_tmp = DBFunc.getPlots();
+      if (plotAreaManager instanceof SinglePlotAreaManager) {
+        SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
+        addPlotArea(area);
+        ConfigurationSection section = worlds.getConfigurationSection("worlds.*");
+        if (section == null) {
+          section = worlds.createSection("worlds.*");
+        }
+        area.saveConfiguration(section);
+        area.loadDefaultConfiguration(section);
+      }
+      this.clusters_tmp = DBFunc.getClusters();
+    } catch (ClassNotFoundException | SQLException e) {
+      PlotSquared.log(
+          C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
+      if (Storage.MySQL.USE) {
+        PlotSquared.log("$4MYSQL");
+      } else if (Storage.SQLite.USE) {
+        PlotSquared.log("$4SQLITE");
+      }
+      PlotSquared.log(
+          "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+      e.printStackTrace();
+      PlotSquared.log("&d==== End of stacktrace ====");
+      PlotSquared.log("&6Please go to the " + IMP.getPluginName()
+          + " 'storage.yml' and configure the database correctly.");
+      this.IMP.disable();
+    }
+  }
+
+  /**
+   * Setup the default configuration.
+   *
+   * @throws IOException if the config failed to save
+   */
+  public void setupConfig() throws IOException {
+    String lastVersionString = this.config.getString("version");
+    if (lastVersionString != null) {
+      String[] split = lastVersionString.split("\\.");
+      int[] lastVersion = new int[]{Integer.parseInt(split[0]), Integer.parseInt(split[1]),
+          Integer.parseInt(split[2])};
+      if (checkVersion(new int[]{3, 4, 0}, lastVersion)) {
+        Settings.convertLegacy(configFile);
+        if (config.contains("worlds")) {
+          ConfigurationSection worldSection = config.getConfigurationSection("worlds");
+          worlds.set("worlds", worldSection);
+          try {
+            worlds.save(worldsFile);
+          } catch (IOException e) {
+            PlotSquared.debug("Failed to save " + IMP.getPluginName() + " worlds.yml");
             e.printStackTrace();
-            PlotSquared.log("&d==== End of stacktrace ====");
-            PlotSquared.log("&6Please go to the " + IMP.getPluginName()
-                + " 'storage.yml' and configure the database correctly.");
-            this.IMP.disable();
-        }
-    }
-
-    /**
-     * Setup the default configuration.
-     *
-     * @throws IOException if the config failed to save
-     */
-    public void setupConfig() throws IOException {
-        String lastVersionString = this.config.getString("version");
-        if (lastVersionString != null) {
-            String[] split = lastVersionString.split("\\.");
-            int[] lastVersion = new int[] {Integer.parseInt(split[0]), Integer.parseInt(split[1]),
-                Integer.parseInt(split[2])};
-            if (checkVersion(new int[] {3, 4, 0}, lastVersion)) {
-                Settings.convertLegacy(configFile);
-                if (config.contains("worlds")) {
-                    ConfigurationSection worldSection = config.getConfigurationSection("worlds");
-                    worlds.set("worlds", worldSection);
-                    try {
-                        worlds.save(worldsFile);
-                    } catch (IOException e) {
-                        PlotSquared.debug("Failed to save " + IMP.getPluginName() + " worlds.yml");
-                        e.printStackTrace();
-                    }
-                }
-                Settings.save(configFile);
-            }
-        }
-        Settings.load(configFile);
-        try {
-            InputStream stream = getClass().getResourceAsStream("/plugin.properties");
-            BufferedReader br = new BufferedReader(new InputStreamReader(stream));
-            //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
-            String versionString = br.readLine();
-            String commitString = br.readLine();
-            String dateString = br.readLine();
-            //scanner.close();
-            br.close();
-            this.version = PlotVersion.tryParse(versionString, commitString, dateString);
-            Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
-            Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
-            Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
-                .toHexString(version.hash);
-            System.out.println("Version is " + this.version);
-        } catch (Throwable ignore) {
-            ignore.printStackTrace();
+          }
         }
         Settings.save(configFile);
-        config = YamlConfiguration.loadConfiguration(configFile);
+      }
     }
+    Settings.load(configFile);
+    try {
+      InputStream stream = getClass().getResourceAsStream("/plugin.properties");
+      BufferedReader br = new BufferedReader(new InputStreamReader(stream));
+      //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
+      String versionString = br.readLine();
+      String commitString = br.readLine();
+      String dateString = br.readLine();
+      //scanner.close();
+      br.close();
+      this.version = PlotVersion.tryParse(versionString, commitString, dateString);
+      Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
+      Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
+      Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
+          .toHexString(version.hash);
+      System.out.println("Version is " + this.version);
+    } catch (IOException exception) {
+      exception.printStackTrace();
+    }
+    Settings.save(configFile);
+    config = YamlConfiguration.loadConfiguration(configFile);
+  }
 
-    /**
-     * Setup all configuration files<br>
-     * - Config: settings.yml<br>
-     * - Storage: storage.yml<br>
-     * - Translation: PlotSquared.use_THIS.yml, style.yml<br>
-     */
-    public boolean setupConfigs() {
-        File folder = new File(this.IMP.getDirectory(), "config");
-        if (!folder.exists() && !folder.mkdirs()) {
-            PlotSquared.log(C.PREFIX
-                + "&cFailed to create the /plugins/config folder. Please create it manually.");
-        }
-        try {
-            this.worldsFile = new File(folder, "worlds.yml");
-            if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not create the worlds file, please create \"worlds.yml\" manually.");
-            }
-            this.worlds = YamlConfiguration.loadConfiguration(this.worldsFile);
+  /**
+   * Setup all configuration files<br> - Config: settings.yml<br> - Storage: storage.yml<br> -
+   * Translation: PlotSquared.use_THIS.yml, style.yml<br>
+   */
+  public boolean setupConfigs() {
+    File folder = new File(this.IMP.getDirectory(), "config");
+    if (!folder.exists() && !folder.mkdirs()) {
+      PlotSquared.log(C.PREFIX
+          + "&cFailed to create the /plugins/config folder. Please create it manually.");
+    }
+    try {
+      this.worldsFile = new File(folder, "worlds.yml");
+      if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
+        PlotSquared.log(
+            "Could not create the worlds file, please create \"worlds.yml\" manually.");
+      }
+      this.worlds = YamlConfiguration.loadConfiguration(this.worldsFile);
 
-            if (this.worlds.contains("worlds")) {
-                if (!this.worlds.contains("configuration_version") || !this.worlds
-                    .getString("configuration_version")
-                    .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
-                    // Conversion needed
-                    log(C.LEGACY_CONFIG_FOUND.s());
-                    try {
-                        com.google.common.io.Files
-                            .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
-                        log(C.LEGACY_CONFIG_BACKUP.s());
-                        final ConfigurationSection worlds =
-                            this.worlds.getConfigurationSection("worlds");
-                        final LegacyConverter converter = new LegacyConverter(worlds);
-                        converter.convert();
-                        this.worlds
-                            .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
-                        this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
-                        this.worlds.save(this.worldsFile);
-                        log(C.LEGACY_CONFIG_DONE.s());
-                    } catch (final Exception e) {
-                        log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
-                        e.printStackTrace();
-                    }
-                    // Disable plugin
-                    this.IMP.shutdown();
-                    return false;
-                }
-            } else {
-                this.worlds.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
-            }
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save settings.yml");
-        }
-        try {
-            this.configFile = new File(folder, "settings.yml");
-            if (!this.configFile.exists() && !this.configFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not create the settings file, please create \"settings.yml\" manually.");
-            }
-            this.config = YamlConfiguration.loadConfiguration(this.configFile);
-            setupConfig();
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save settings.yml");
-        }
-        try {
-            this.styleFile = MainUtil.getFile(IMP.getDirectory(),
-                Settings.Paths.TRANSLATIONS + File.separator + "style.yml");
-            if (!this.styleFile.exists()) {
-                if (!this.styleFile.getParentFile().exists()) {
-                    this.styleFile.getParentFile().mkdirs();
-                }
-                if (!this.styleFile.createNewFile()) {
-                    PlotSquared.log(
-                        "Could not create the style file, please create \"translations/style.yml\" manually");
-                }
-            }
-            this.style = YamlConfiguration.loadConfiguration(this.styleFile);
-            setupStyle();
-        } catch (IOException err) {
-            err.printStackTrace();
-            PlotSquared.log("failed to save style.yml");
-        }
-        try {
-            this.storageFile = new File(folder, "storage.yml");
-            if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not the storage settings file, please create \"storage.yml\" manually.");
-            }
-            this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
-            setupStorage();
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save storage.yml");
-        }
-        try {
-            this.commandsFile = new File(folder, "commands.yml");
-            if (!this.commandsFile.exists() && !this.commandsFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not the storage settings file, please create \"commands.yml\" manually.");
-            }
-            this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save commands.yml");
-        }
-        try {
-            this.style.save(this.styleFile);
-            this.commands.save(this.commandsFile);
-        } catch (IOException e) {
-            PlotSquared.log("Configuration file saving failed");
+      if (this.worlds.contains("worlds")) {
+        if (!this.worlds.contains("configuration_version") || !this.worlds
+            .getString("configuration_version")
+            .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
+          // Conversion needed
+          log(C.LEGACY_CONFIG_FOUND.s());
+          try {
+            com.google.common.io.Files
+                .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
+            log(C.LEGACY_CONFIG_BACKUP.s());
+            final ConfigurationSection worlds =
+                this.worlds.getConfigurationSection("worlds");
+            final LegacyConverter converter = new LegacyConverter(worlds);
+            converter.convert();
+            this.worlds
+                .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
+            this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
+            this.worlds.save(this.worldsFile);
+            log(C.LEGACY_CONFIG_DONE.s());
+          } catch (final Exception e) {
+            log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
             e.printStackTrace();
+          }
+          // Disable plugin
+          this.IMP.shutdown();
+          return false;
         }
-        return true;
+      } else {
+        this.worlds.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
+      }
+    } catch (IOException ignored) {
+      PlotSquared.log("Failed to save settings.yml");
     }
-
-    /**
-     * Setup the storage file (load + save missing nodes).
-     */
-    private void setupStorage() {
-        Storage.load(storageFile);
-        Storage.save(storageFile);
-        storage = YamlConfiguration.loadConfiguration(storageFile);
+    try {
+      this.configFile = new File(folder, "settings.yml");
+      if (!this.configFile.exists() && !this.configFile.createNewFile()) {
+        PlotSquared.log(
+            "Could not create the settings file, please create \"settings.yml\" manually.");
+      }
+      this.config = YamlConfiguration.loadConfiguration(this.configFile);
+      setupConfig();
+    } catch (IOException ignored) {
+      PlotSquared.log("Failed to save settings.yml");
     }
-
-    /**
-     * Show startup debug information.
-     */
-    private void showDebug() {
-        if (Settings.DEBUG) {
-            Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
-            for (Entry<String, Object> component : components.entrySet()) {
-                PlotSquared.log(C.PREFIX + String
-                    .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
-                        component.getValue()));
-            }
+    try {
+      this.styleFile = MainUtil.getFile(IMP.getDirectory(),
+          Settings.Paths.TRANSLATIONS + File.separator + "style.yml");
+      if (!this.styleFile.exists()) {
+        if (!this.styleFile.getParentFile().exists()) {
+          this.styleFile.getParentFile().mkdirs();
         }
-    }
-
-    /**
-     * Setup the style.yml file
-     */
-    private void setupStyle() {
-        if (this.version != null) {
-            this.style.set("version", this.version.toString());
+        if (!this.styleFile.createNewFile()) {
+          PlotSquared.log(
+              "Could not create the style file, please create \"translations/style.yml\" manually");
         }
-        Map<String, Object> o = new HashMap<>(4);
-        o.put("color.1", "6");
-        o.put("color.2", "7");
-        o.put("color.3", "8");
-        o.put("color.4", "3");
-        if (!this.style.contains("color")) {
-            for (Entry<String, Object> node : o.entrySet()) {
-                this.style.set(node.getKey(), node.getValue());
-            }
+      }
+      this.style = YamlConfiguration.loadConfiguration(this.styleFile);
+      setupStyle();
+    } catch (IOException err) {
+      err.printStackTrace();
+      PlotSquared.log("failed to save style.yml");
+    }
+    try {
+      this.storageFile = new File(folder, "storage.yml");
+      if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
+        PlotSquared.log(
+            "Could not the storage settings file, please create \"storage.yml\" manually.");
+      }
+      this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
+      setupStorage();
+    } catch (IOException ignored) {
+      PlotSquared.log("Failed to save storage.yml");
+    }
+    try {
+      this.commandsFile = new File(folder, "commands.yml");
+      if (!this.commandsFile.exists() && !this.commandsFile.createNewFile()) {
+        PlotSquared.log(
+            "Could not the storage settings file, please create \"commands.yml\" manually.");
+      }
+      this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
+    } catch (IOException ignored) {
+      PlotSquared.log("Failed to save commands.yml");
+    }
+    try {
+      this.style.save(this.styleFile);
+      this.commands.save(this.commandsFile);
+    } catch (IOException e) {
+      PlotSquared.log("Configuration file saving failed");
+      e.printStackTrace();
+    }
+    return true;
+  }
+
+  /**
+   * Setup the storage file (load + save missing nodes).
+   */
+  private void setupStorage() {
+    Storage.load(storageFile);
+    Storage.save(storageFile);
+    storage = YamlConfiguration.loadConfiguration(storageFile);
+  }
+
+  /**
+   * Show startup debug information.
+   */
+  private void showDebug() {
+    if (Settings.DEBUG) {
+      Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
+      for (Entry<String, Object> component : components.entrySet()) {
+        PlotSquared.log(C.PREFIX + String
+            .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
+                component.getValue()));
+      }
+    }
+  }
+
+  /**
+   * Setup the style.yml file
+   */
+  private void setupStyle() {
+    if (this.version != null) {
+      this.style.set("version", this.version.toString());
+    }
+    Map<String, Object> o = new HashMap<>(4);
+    o.put("color.1", "6");
+    o.put("color.2", "7");
+    o.put("color.3", "8");
+    o.put("color.4", "3");
+    if (!this.style.contains("color")) {
+      for (Entry<String, Object> node : o.entrySet()) {
+        this.style.set(node.getKey(), node.getValue());
+      }
+    }
+  }
+
+  /**
+   * Get the Java version.
+   *
+   * @return the java version
+   */
+  public double getJavaVersion() {
+    return Double.parseDouble(System.getProperty("java.specification.version"));
+  }
+
+  public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
+    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+      runnable.run(area);
+    }
+  }
+
+  public void foreachPlotArea(@NonNull final String world,
+      @NonNull final RunnableVal<PlotArea> runnable) {
+    final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
+    if (array == null) {
+      return;
+    }
+    for (final PlotArea area : array) {
+      runnable.run(area);
+    }
+  }
+
+  public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
+    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+      area.getPlots().forEach(runnable::run);
+    }
+  }
+
+  public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
+    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+      area.getPlots().forEach(runnable::run);
+    }
+    if (this.plots_tmp != null) {
+      for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
+        entry.values().forEach(runnable::run);
+      }
+    }
+  }
+
+  public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
+    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+      area.foreachBasePlot(run);
+    }
+  }
+
+  public PlotArea getFirstPlotArea() {
+    PlotArea[] areas = plotAreaManager.getAllPlotAreas();
+    return areas.length > 0 ? areas[0] : null;
+  }
+
+  public int getPlotAreaCount() {
+    return this.plotAreaManager.getAllPlotAreas().length;
+  }
+
+  public int getPlotCount() {
+    int count = 0;
+    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+      count += area.getPlotCount();
+    }
+    return count;
+  }
+
+  public Set<PlotArea> getPlotAreas() {
+    final Set<PlotArea> set = new HashSet<>();
+    Collections.addAll(set, plotAreaManager.getAllPlotAreas());
+    return Collections.unmodifiableSet(set);
+  }
+
+  public boolean isAugmented(@NonNull final String world) {
+    final PlotArea[] areas = plotAreaManager.getPlotAreas(world, null);
+    return areas != null && (areas.length > 1 || areas[0].TYPE != 0);
+  }
+
+  /**
+   * Get a list of PlotArea objects.
+   *
+   * @param world the world
+   * @return Collection of PlotArea objects
+   */
+  public Set<PlotArea> getPlotAreas(@NonNull final String world) {
+    final Set<PlotArea> set = new HashSet<>();
+    Collections.addAll(set, plotAreaManager.getPlotAreas(world, null));
+    return set;
+  }
+
+  /**
+   * Get the relevant plot area for a specified location.
+   * <ul>
+   * <li>If there is only one plot area globally that will be returned.
+   * <li>If there is only one plot area in the world, it will return that.
+   * <li>If the plot area for a location cannot be unambiguously
+   * resolved, null will be returned.
+   * </ul>
+   * Note: An applicable plot area may not include the location i.e. clusters
+   *
+   * @param location the location
+   */
+  public PlotArea getApplicablePlotArea(@NonNull final Location location) {
+    return plotAreaManager.getApplicablePlotArea(location);
+  }
+
+  public PlotArea getPlotArea(@NonNull final String world, final String id) {
+    return plotAreaManager.getPlotArea(world, id);
+  }
+
+  /**
+   * Get the {@code PlotArea} which contains a location.
+   * <ul>
+   * <li>If the plot area does not contain a location, null
+   * will be returned.
+   * </ul>
+   *
+   * @param location the location
+   * @return the {@link PlotArea} in the location, null if non existent
+   */
+  public PlotArea getPlotAreaAbs(@NonNull final Location location) {
+    return plotAreaManager.getPlotArea(location);
+  }
+
+  public PlotArea getPlotAreaByString(@NonNull final String search) {
+    String[] split = search.split("[;,]");
+    PlotArea[] areas = plotAreaManager.getPlotAreas(split[0], null);
+    if (areas == null) {
+      for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+        if (area.worldname.equalsIgnoreCase(split[0])) {
+          if (area.id == null || split.length == 2 && area.id
+              .equalsIgnoreCase(split[1])) {
+            return area;
+          }
         }
+      }
+      return null;
     }
-
-    /**
-     * Get the Java version.
-     *
-     * @return the java version
-     */
-    public double getJavaVersion() {
-        return Double.parseDouble(System.getProperty("java.specification.version"));
-    }
-
-    public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            runnable.run(area);
+    if (areas.length == 1) {
+      return areas[0];
+    } else if (split.length == 1) {
+      return null;
+    } else {
+      for (PlotArea area : areas) {
+        if (StringMan.isEqual(split[1], area.id)) {
+          return area;
         }
+      }
+      return null;
     }
+  }
 
-    public void foreachPlotArea(@NonNull final String world,
-        @NonNull final RunnableVal<PlotArea> runnable) {
-        final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
-        if (array == null) {
-            return;
-        }
-        for (final PlotArea area : array) {
-            runnable.run(area);
+  /**
+   * Get Plots based on alias
+   *
+   * @param alias to search plots
+   * @param worldname to filter alias to a specific world [optional] null means all worlds
+   * @return Set<{
+               *       @
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *                                                                                                                                       link
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *                   Plot
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *
+               *       }> empty if nothing found
+   */
+  public Set<Plot> getPlotsByAlias(@Nullable final String alias,
+      @NonNull final String worldname) {
+    final Set<Plot> result = new HashSet<>();
+    if (alias != null) {
+      for (final Plot plot : getPlots()) {
+        if (alias.equals(plot.getAlias()) && (worldname == null || worldname
+            .equals(plot.getWorldName()))) {
+          result.add(plot);
         }
+      }
     }
+    return Collections.unmodifiableSet(result);
+  }
 
-    public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable::run);
-        }
-    }
+  public Set<PlotArea> getPlotAreas(final String world, final RegionWrapper region) {
+    final PlotArea[] areas = plotAreaManager.getPlotAreas(world, region);
+    final Set<PlotArea> set = new HashSet<>();
+    Collections.addAll(set, areas);
+    return Collections.unmodifiableSet(set);
+  }
 
-    public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable::run);
-        }
-        if (this.plots_tmp != null) {
-            for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
-                entry.values().forEach(runnable::run);
-            }
-        }
-    }
-
-    public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.foreachBasePlot(run);
-        }
-    }
-
-    public PlotArea getFirstPlotArea() {
-        PlotArea[] areas = plotAreaManager.getAllPlotAreas();
-        return areas.length > 0 ? areas[0] : null;
-    }
-
-    public int getPlotAreaCount() {
-        return this.plotAreaManager.getAllPlotAreas().length;
-    }
-
-    public int getPlotCount() {
-        int count = 0;
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            count += area.getPlotCount();
-        }
-        return count;
-    }
-
-    public Set<PlotArea> getPlotAreas() {
-        final Set<PlotArea> set = new HashSet<>();
-        Collections.addAll(set, plotAreaManager.getAllPlotAreas());
-        return Collections.unmodifiableSet(set);
-    }
-
-    public boolean isAugmented(@NonNull final String world) {
-        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, null);
-        return areas != null && (areas.length > 1 || areas[0].TYPE != 0);
-    }
-
-    /**
-     * Get a list of PlotArea objects.
-     *
-     * @param world the world
-     * @return Collection of PlotArea objects
-     */
-    public Set<PlotArea> getPlotAreas(@NonNull final String world) {
-        final Set<PlotArea> set = new HashSet<>();
-        Collections.addAll(set, plotAreaManager.getPlotAreas(world, null));
-        return set;
-    }
-
-    /**
-     * Get the relevant plot area for a specified location.
-     * <ul>
-     * <li>If there is only one plot area globally that will be returned.
-     * <li>If there is only one plot area in the world, it will return that.
-     * <li>If the plot area for a location cannot be unambiguously
-     * resolved, null will be returned.
-     * </ul>
-     * Note: An applicable plot area may not include the location i.e. clusters
-     *
-     * @param location the location
-     * @return
-     */
-    public PlotArea getApplicablePlotArea(@NonNull final Location location) {
-        return plotAreaManager.getApplicablePlotArea(location);
-    }
-
-    public PlotArea getPlotArea(@NonNull final String world, final String id) {
-        return plotAreaManager.getPlotArea(world, id);
-    }
-
-    /**
-     * Get the {@code PlotArea} which contains a location.
-     * <ul>
-     * <li>If the plot area does not contain a location, null
-     * will be returned.
-     * </ul>
-     *
-     * @param location the location
-     * @return the {@link PlotArea} in the location, null if non existent
-     */
-    public PlotArea getPlotAreaAbs(@NonNull final Location location) {
-        return plotAreaManager.getPlotArea(location);
-    }
-
-    public PlotArea getPlotAreaByString(@NonNull final String search) {
-        String[] split = search.split("[;,]");
-        PlotArea[] areas = plotAreaManager.getPlotAreas(split[0], null);
-        if (areas == null) {
-            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                if (area.worldname.equalsIgnoreCase(split[0])) {
-                    if (area.id == null || split.length == 2 && area.id
-                        .equalsIgnoreCase(split[1])) {
-                        return area;
-                    }
-                }
-            }
-            return null;
-        }
-        if (areas.length == 1) {
-            return areas[0];
-        } else if (split.length == 1) {
-            return null;
-        } else {
-            for (PlotArea area : areas) {
-                if (StringMan.isEqual(split[1], area.id)) {
-                    return area;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Get Plots based on alias
-     *
-     * @param alias     to search plots
-     * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
-     */
-    public Set<Plot> getPlotsByAlias(@Nullable final String alias,
-        @NonNull final String worldname) {
-        final Set<Plot> result = new HashSet<>();
-        if (alias != null) {
-            for (final Plot plot : getPlots()) {
-                if (alias.equals(plot.getAlias()) && (worldname == null || worldname
-                    .equals(plot.getWorldName()))) {
-                    result.add(plot);
-                }
-            }
-        }
-        return Collections.unmodifiableSet(result);
-    }
-
-    public Set<PlotArea> getPlotAreas(final String world, final RegionWrapper region) {
-        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, region);
-        final Set<PlotArea> set = new HashSet<>();
-        Collections.addAll(set, areas);
-        return Collections.unmodifiableSet(set);
-    }
-
-    public enum SortType {
-        CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
-    }
+  public enum SortType {
+    CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
index 9dc5ce20e..ee7c1cb23 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -104,36 +104,34 @@ import java.util.Set;
                                 final String path =
                                     "worlds." + area.worldname + ".areas." + area.id + '-'
                                         + object.min + '-' + object.max;
-                                Runnable run = new Runnable() {
-                                    @Override public void run() {
-                                        if (offsetX != 0) {
-                                            PlotSquared.get().worlds
-                                                .set(path + ".road.offset.x", offsetX);
-                                        }
-                                        if (offsetZ != 0) {
-                                            PlotSquared.get().worlds
-                                                .set(path + ".road.offset.z", offsetZ);
-                                        }
-                                        final String world = SetupUtils.manager.setupWorld(object);
-                                        if (WorldUtil.IMP.isWorld(world)) {
-                                            PlotSquared.get().loadWorld(world, null);
-                                            C.SETUP_FINISHED.send(player);
-                                            player.teleport(WorldUtil.IMP.getSpawn(world));
-                                            if (area.TERRAIN != 3) {
-                                                ChunkManager.largeRegionTask(world, region,
-                                                    new RunnableVal<ChunkLoc>() {
-                                                        @Override public void run(ChunkLoc value) {
-                                                            AugmentedUtils
-                                                                .generate(world, value.x, value.z,
-                                                                    null);
-                                                        }
-                                                    }, null);
-                                            }
-                                        } else {
-                                            MainUtil.sendMessage(player,
-                                                "An error occurred while creating the world: "
-                                                    + area.worldname);
+                                Runnable run = () -> {
+                                    if (offsetX != 0) {
+                                        PlotSquared.get().worlds
+                                            .set(path + ".road.offset.x", offsetX);
+                                    }
+                                    if (offsetZ != 0) {
+                                        PlotSquared.get().worlds
+                                            .set(path + ".road.offset.z", offsetZ);
+                                    }
+                                    final String world = SetupUtils.manager.setupWorld(object);
+                                    if (WorldUtil.IMP.isWorld(world)) {
+                                        PlotSquared.get().loadWorld(world, null);
+                                        C.SETUP_FINISHED.send(player);
+                                        player.teleport(WorldUtil.IMP.getSpawn(world));
+                                        if (area.TERRAIN != 3) {
+                                            ChunkManager.largeRegionTask(world, region,
+                                                new RunnableVal<ChunkLoc>() {
+                                                    @Override public void run(ChunkLoc value) {
+                                                        AugmentedUtils
+                                                            .generate(world, value.x, value.z,
+                                                                null);
+                                                    }
+                                                }, null);
                                         }
+                                    } else {
+                                        MainUtil.sendMessage(player,
+                                            "An error occurred while creating the world: "
+                                                + area.worldname);
                                     }
                                 };
                                 if (hasConfirmation(player)) {
@@ -228,32 +226,30 @@ import java.util.Set;
                                 C.SETUP_WORLD_TAKEN.send(player, pa.worldname);
                                 return false;
                             }
-                            Runnable run = new Runnable() {
-                                @Override public void run() {
-                                    String path = "worlds." + pa.worldname;
-                                    if (!PlotSquared.get().worlds.contains(path)) {
-                                        PlotSquared.get().worlds.createSection(path);
-                                    }
-                                    ConfigurationSection section =
-                                        PlotSquared.get().worlds.getConfigurationSection(path);
-                                    pa.saveConfiguration(section);
-                                    pa.loadConfiguration(section);
-                                    object.plotManager = PlotSquared.imp().getPluginName();
-                                    object.setupGenerator = PlotSquared.imp().getPluginName();
-                                    String world = SetupUtils.manager.setupWorld(object);
-                                    if (WorldUtil.IMP.isWorld(world)) {
-                                        C.SETUP_FINISHED.send(player);
-                                        player.teleport(WorldUtil.IMP.getSpawn(world));
-                                    } else {
-                                        MainUtil.sendMessage(player,
-                                            "An error occurred while creating the world: "
-                                                + pa.worldname);
-                                    }
-                                    try {
-                                        PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-                                    } catch (IOException e) {
-                                        e.printStackTrace();
-                                    }
+                            Runnable run = () -> {
+                                String path = "worlds." + pa.worldname;
+                                if (!PlotSquared.get().worlds.contains(path)) {
+                                    PlotSquared.get().worlds.createSection(path);
+                                }
+                                ConfigurationSection section =
+                                    PlotSquared.get().worlds.getConfigurationSection(path);
+                                pa.saveConfiguration(section);
+                                pa.loadConfiguration(section);
+                                object.plotManager = PlotSquared.imp().getPluginName();
+                                object.setupGenerator = PlotSquared.imp().getPluginName();
+                                String world = SetupUtils.manager.setupWorld(object);
+                                if (WorldUtil.IMP.isWorld(world)) {
+                                    C.SETUP_FINISHED.send(player);
+                                    player.teleport(WorldUtil.IMP.getSpawn(world));
+                                } else {
+                                    MainUtil.sendMessage(player,
+                                        "An error occurred while creating the world: "
+                                            + pa.worldname);
+                                }
+                                try {
+                                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+                                } catch (IOException e) {
+                                    e.printStackTrace();
                                 }
                             };
                             if (hasConfirmation(player)) {
@@ -422,11 +418,7 @@ import java.util.Set;
                         @Override public void run(ChunkLoc value) {
                             AugmentedUtils.generate(area.worldname, value.x, value.z, null);
                         }
-                    }, new Runnable() {
-                        @Override public void run() {
-                            player.sendMessage("Regen complete");
-                        }
-                    });
+                    }, () -> player.sendMessage("Regen complete"));
                 return true;
             }
             case "goto":
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
index 88f102967..e49155b8d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
@@ -82,22 +82,14 @@ public class Claim extends SubCommand {
         if (plot.canClaim(player)) {
             plot.owner = player.getUUID();
             final String finalSchematic = schematic;
-            DBFunc.createPlotSafe(plot, new Runnable() {
-                @Override public void run() {
-                    TaskManager.IMP.sync(new RunnableVal<Object>() {
-                        @Override public void run(Object value) {
-                            plot.claim(player, true, finalSchematic, false);
-                            if (area.AUTO_MERGE) {
-                                plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
-                            }
-                        }
-                    });
+            DBFunc.createPlotSafe(plot, () -> TaskManager.IMP.sync(new RunnableVal<Object>() {
+                @Override public void run(Object value) {
+                    plot.claim(player, true, finalSchematic, false);
+                    if (area.AUTO_MERGE) {
+                        plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
+                    }
                 }
-            }, new Runnable() {
-                @Override public void run() {
-                    sendMessage(player, C.PLOT_NOT_CLAIMED);
-                }
-            });
+            }), () -> sendMessage(player, C.PLOT_NOT_CLAIMED));
             return true;
         } else {
             sendMessage(player, C.PLOT_NOT_CLAIMED);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index c8360f696..2ead96b4f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -302,6 +302,7 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
@@ -347,6 +348,7 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
@@ -405,6 +407,7 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
@@ -440,7 +443,6 @@ import java.util.UUID;
                     PlotSquared.get().getPlots(player.getLocation().getWorld(), uuid))) {
                     PlotCluster current = plot.getCluster();
                     if (current != null && current.equals(cluster)) {
-                        player.getLocation().getWorld();
                         plot.unclaim();
                     }
                 }
@@ -462,6 +464,7 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
@@ -534,6 +537,7 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
@@ -581,6 +585,7 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
index 040fd97b8..44d0e5593 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
@@ -65,6 +65,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
                     sizes.add(size - 1);
                 }
                 // Sort plots by size (buckets?)]
+                //noinspection unchecked
                 ArrayList<Plot>[] buckets = new ArrayList[maxSize];
                 for (int i = 0; i < plots.size(); i++) {
                     Plot plot = plots.get(i);
@@ -126,13 +127,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
                             }
                             i++;
                             final AtomicBoolean result = new AtomicBoolean(false);
-                            result.set(origin.move(possible, new Runnable() {
-                                @Override public void run() {
-                                    if (result.get()) {
-                                        MainUtil.sendMessage(player,
-                                            "Moving: " + origin + " -> " + possible);
-                                        TaskManager.runTaskLater(task, 1);
-                                    }
+                            result.set(origin.move(possible, () -> {
+                                if (result.get()) {
+                                    MainUtil.sendMessage(player,
+                                        "Moving: " + origin + " -> " + possible);
+                                    TaskManager.runTaskLater(task, 1);
                                 }
                             }, false));
                             if (result.get()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
index b760bc282..d945f122a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -25,174 +25,163 @@ import java.util.Map.Entry;
 @CommandDeclaration(command = "database", aliases = {"convert"},
     category = CommandCategory.ADMINISTRATION, permission = "plots.database",
     description = "Convert/Backup Storage", requiredType = RequiredType.CONSOLE,
-    usage = "/plot database [area] <sqlite|mysql|import>") public class Database
+    usage = "/plot database [area] <sqlite|mysql|import>")
+public class Database
     extends SubCommand {
 
-    public static void insertPlots(final SQLManager manager, final List<Plot> plots,
-        final PlotPlayer player) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try {
-                    ArrayList<Plot> ps = new ArrayList<>();
-                    for (Plot p : plots) {
-                        ps.add(p);
-                    }
-                    MainUtil.sendMessage(player, "&6Starting...");
-                    manager.createPlotsAndData(ps, new Runnable() {
-                        @Override public void run() {
-                            MainUtil.sendMessage(player, "&6Database conversion finished!");
-                            manager.close();
-                        }
-                    });
-                } catch (Exception e) {
-                    MainUtil.sendMessage(player,
-                        "Failed to insert plot objects, see stacktrace for info");
-                    e.printStackTrace();
-                }
-            }
+  public static void insertPlots(final SQLManager manager, final List<Plot> plots,
+      final PlotPlayer player) {
+    TaskManager.runTaskAsync(() -> {
+      try {
+        ArrayList<Plot> ps = new ArrayList<>(plots);
+        MainUtil.sendMessage(player, "&6Starting...");
+        manager.createPlotsAndData(ps, () -> {
+          MainUtil.sendMessage(player, "&6Database conversion finished!");
+          manager.close();
         });
-    }
+      } catch (Exception e) {
+        MainUtil.sendMessage(player,
+            "Failed to insert plot objects, see stacktrace for info");
+        e.printStackTrace();
+      }
+    });
+  }
 
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length < 1) {
-            MainUtil.sendMessage(player, "/plot database [area] <sqlite|mysql|import>");
-            return false;
-        }
-        List<Plot> plots;
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        if (area != null) {
-            plots = PlotSquared.get().sortPlotsByTemp(area.getPlots());
-            args = Arrays.copyOfRange(args, 1, args.length);
-        } else {
-            plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots());
-        }
-        if (args.length < 1) {
-            MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
-            MainUtil.sendMessage(player, "[arg] indicates an optional argument");
-            return false;
-        }
-        try {
-            com.github.intellectualsites.plotsquared.plot.database.Database implementation;
-            String prefix = "";
-            switch (args[0].toLowerCase()) {
-                case "import":
-                    if (args.length < 2) {
-                        MainUtil
-                            .sendMessage(player, "/plot database import <sqlite file> [prefix]");
-                        return false;
-                    }
-                    File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-                        args[1].endsWith(".db") ? args[1] : args[1] + ".db");
-                    if (!file.exists()) {
-                        MainUtil.sendMessage(player, "&6Database does not exist: " + file);
-                        return false;
-                    }
-                    MainUtil.sendMessage(player, "&6Starting...");
-                    implementation = new SQLite(file);
-                    SQLManager manager =
-                        new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
-                    HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
-                    plots = new ArrayList<>();
-                    for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
-                        String areaname = entry.getKey();
-                        PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
-                        if (pa != null) {
-                            for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                                Plot plot = entry2.getValue();
-                                if (pa.getOwnedPlotAbs(plot.getId()) != null) {
-                                    if (pa instanceof SinglePlotArea) {
-                                        Plot newPlot = pa.getNextFreePlot(null, plot.getId());
-                                        if (newPlot != null) {
-                                            PlotId newId = newPlot.getId();
-                                            PlotId id = plot.getId();
-                                            File worldFile =
-                                                new File(PlotSquared.imp().getWorldContainer(),
-                                                    id.toCommaSeparatedString());
-                                            if (worldFile.exists()) {
-                                                File newFile =
-                                                    new File(PlotSquared.imp().getWorldContainer(),
-                                                        newId.toCommaSeparatedString());
-                                                worldFile.renameTo(newFile);
-                                            }
-                                            id.x = newId.x;
-                                            id.y = newId.y;
-                                            id.recalculateHash();
-                                            plot.setArea(pa);
-                                            plots.add(plot);
-                                            continue;
-                                        }
-                                    }
-                                    MainUtil.sendMessage(player,
-                                        "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
-                                    continue;
-                                }
-                                plot.setArea(pa);
-                                plots.add(plot);
-                            }
-                        } else {
-                            HashMap<PlotId, Plot> plotmap =
-                                PlotSquared.get().plots_tmp.get(areaname);
-                            if (plotmap == null) {
-                                plotmap = new HashMap<>();
-                                PlotSquared.get().plots_tmp.put(areaname, plotmap);
-                            }
-                            plotmap.putAll(entry.getValue());
-                        }
-                    }
-                    DBFunc.createPlotsAndData(plots, new Runnable() {
-                        @Override public void run() {
-                            MainUtil.sendMessage(player, "&6Database conversion finished!");
-                        }
-                    });
-                    return true;
-                case "mysql":
-                    if (args.length < 6) {
-                        return MainUtil.sendMessage(player,
-                            "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
-                    }
-                    String host = args[1];
-                    String port = args[2];
-                    String username = args[3];
-                    String password = args[4];
-                    String database = args[5];
-                    if (args.length > 6) {
-                        prefix = args[6];
-                    }
-                    implementation = new MySQL(host, port, database, username, password);
-                    break;
-                case "sqlite":
-                    if (args.length < 2) {
-                        return MainUtil.sendMessage(player, "/plot database sqlite [file]");
-                    }
-                    File sqliteFile =
-                        MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), args[1] + ".db");
-                    implementation = new SQLite(sqliteFile);
-                    break;
-                default:
-                    return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
-            }
-            try {
-                SQLManager manager = new SQLManager(implementation, prefix, true);
-                Database.insertPlots(manager, plots, player);
-                return true;
-            } catch (ClassNotFoundException | SQLException e) {
-                MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
-                MainUtil.sendMessage(player,
-                    "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-                e.printStackTrace();
-                MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
-                MainUtil
-                    .sendMessage(player, "$1Please make sure you are using the correct arguments!");
-                return false;
-            }
-        } catch (ClassNotFoundException | SQLException e) {
-            MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
-            MainUtil.sendMessage(player,
-                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-            e.printStackTrace();
-            MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
-            MainUtil.sendMessage(player, "$1Please make sure you are using the correct arguments!");
-            return false;
-        }
+  @Override
+  public boolean onCommand(final PlotPlayer player, String[] args) {
+    if (args.length < 1) {
+      MainUtil.sendMessage(player, "/plot database [area] <sqlite|mysql|import>");
+      return false;
     }
+    List<Plot> plots;
+    PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+    if (area != null) {
+      plots = PlotSquared.get().sortPlotsByTemp(area.getPlots());
+      args = Arrays.copyOfRange(args, 1, args.length);
+    } else {
+      plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots());
+    }
+    if (args.length < 1) {
+      MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
+      MainUtil.sendMessage(player, "[arg] indicates an optional argument");
+      return false;
+    }
+    try {
+      com.github.intellectualsites.plotsquared.plot.database.Database implementation;
+      String prefix = "";
+      switch (args[0].toLowerCase()) {
+        case "import":
+          if (args.length < 2) {
+            MainUtil
+                .sendMessage(player, "/plot database import <sqlite file> [prefix]");
+            return false;
+          }
+          File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+              args[1].endsWith(".db") ? args[1] : args[1] + ".db");
+          if (!file.exists()) {
+            MainUtil.sendMessage(player, "&6Database does not exist: " + file);
+            return false;
+          }
+          MainUtil.sendMessage(player, "&6Starting...");
+          implementation = new SQLite(file);
+          SQLManager manager =
+              new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
+          HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
+          plots = new ArrayList<>();
+          for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
+            String areaname = entry.getKey();
+            PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
+            if (pa != null) {
+              for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
+                Plot plot = entry2.getValue();
+                if (pa.getOwnedPlotAbs(plot.getId()) != null) {
+                  if (pa instanceof SinglePlotArea) {
+                    Plot newPlot = pa.getNextFreePlot(null, plot.getId());
+                    if (newPlot != null) {
+                      PlotId newId = newPlot.getId();
+                      PlotId id = plot.getId();
+                      File worldFile =
+                          new File(PlotSquared.imp().getWorldContainer(),
+                              id.toCommaSeparatedString());
+                      if (worldFile.exists()) {
+                        File newFile =
+                            new File(PlotSquared.imp().getWorldContainer(),
+                                newId.toCommaSeparatedString());
+                        worldFile.renameTo(newFile);
+                      }
+                      id.x = newId.x;
+                      id.y = newId.y;
+                      id.recalculateHash();
+                      plot.setArea(pa);
+                      plots.add(plot);
+                      continue;
+                    }
+                  }
+                  MainUtil.sendMessage(player,
+                      "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
+                  continue;
+                }
+                plot.setArea(pa);
+                plots.add(plot);
+              }
+            } else {
+              HashMap<PlotId, Plot> plotmap =
+                  PlotSquared.get().plots_tmp
+                      .computeIfAbsent(areaname, k -> new HashMap<>());
+              plotmap.putAll(entry.getValue());
+            }
+          }
+          DBFunc.createPlotsAndData(plots,
+              () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
+          return true;
+        case "mysql":
+          if (args.length < 6) {
+            return MainUtil.sendMessage(player,
+                "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
+          }
+          String host = args[1];
+          String port = args[2];
+          String username = args[3];
+          String password = args[4];
+          String database = args[5];
+          if (args.length > 6) {
+            prefix = args[6];
+          }
+          implementation = new MySQL(host, port, database, username, password);
+          break;
+        case "sqlite":
+          if (args.length < 2) {
+            return MainUtil.sendMessage(player, "/plot database sqlite [file]");
+          }
+          File sqliteFile =
+              MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), args[1] + ".db");
+          implementation = new SQLite(sqliteFile);
+          break;
+        default:
+          return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
+      }
+      try {
+        SQLManager manager = new SQLManager(implementation, prefix, true);
+        Database.insertPlots(manager, plots, player);
+        return true;
+      } catch (ClassNotFoundException | SQLException e) {
+        MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
+        MainUtil.sendMessage(player,
+            "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+        e.printStackTrace();
+        MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
+        MainUtil
+            .sendMessage(player, "$1Please make sure you are using the correct arguments!");
+        return false;
+      }
+    } catch (ClassNotFoundException | SQLException e) {
+      MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
+      MainUtil.sendMessage(player,
+          "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+      e.printStackTrace();
+      MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
+      MainUtil.sendMessage(player, "$1Please make sure you are using the correct arguments!");
+      return false;
+    }
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
index f0ff64af1..ff697953c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -57,9 +57,7 @@ public class Help extends Command {
     public void displayHelp(PlotPlayer player, String cat, int page) {
         CommandCategory catEnum = null;
         if (cat != null) {
-            if (StringMan.isEqualIgnoreCase(cat, "all")) {
-                catEnum = null;
-            } else {
+            if (!StringMan.isEqualIgnoreCase(cat, "all")) {
                 for (CommandCategory c : CommandCategory.values()) {
                     if (StringMan.isEqualIgnoreCaseToAny(cat, c.name(), c.toString())) {
                         catEnum = c;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
index 5c7cfc0ac..908e35afc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -165,9 +165,8 @@ import java.util.Optional;
                     inbox.clearInbox(plot);
                     Optional<ArrayList<PlotComment>> comments =
                         plot.getSettings().getComments(inbox.toString());
-                    if (comments.isPresent()) {
-                        plot.getSettings().removeComments(comments.get());
-                    }
+                    comments
+                        .ifPresent(plotComments -> plot.getSettings().removeComments(plotComments));
                     MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
                     return true;
                 default:
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
index 42075f2d2..39d368865 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
@@ -60,9 +60,9 @@ public class Merge extends SubCommand {
         }
         final PlotArea plotArea = plot.getArea();
         Expression<Double> priceExr =
-            plotArea.PRICES.containsKey("merge") ? plotArea.PRICES.get("merge") : null;
+            plotArea.PRICES.getOrDefault("merge", Expression.constant(0d));
         final int size = plot.getConnectedPlots().size();
-        final double price = priceExr == null ? 0d : priceExr.evaluate((double) size);
+        final double price = priceExr.evaluate((double) size);
         if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d
             && EconHandler.manager.getMoney(player) < price) {
             sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
index b8b38e298..8cd4d9e56 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -108,9 +108,7 @@ import java.util.UUID;
             if (unknown && UUIDHandler.getName(plot.owner) != null) {
                 continue;
             }
-            for (Plot current : plot.getConnectedPlots()) {
-                toDelete.add(current);
-            }
+            toDelete.addAll(plot.getConnectedPlots());
         }
         if (PlotSquared.get().plots_tmp != null) {
             for (Entry<String, HashMap<PlotId, Plot>> entry : PlotSquared.get().plots_tmp
@@ -143,23 +141,21 @@ import java.util.UUID;
         }
         String cmd =
             "/plot purge " + StringMan.join(args, " ") + " (" + toDelete.size() + " plots)";
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                PlotSquared.debug("Calculating plots to purge, please wait...");
-                HashSet<Integer> ids = new HashSet<>();
-                for (Plot plot : toDelete) {
-                    if (plot.temp != Integer.MAX_VALUE) {
-                        ids.add(plot.temp);
-                        plot.getArea().removePlot(plot.getId());
-                        for (PlotPlayer pp : plot.getPlayersInPlot()) {
-                            PlotListener.plotEntry(pp, plot);
-                        }
-                        plot.removeSign();
+        Runnable run = () -> {
+            PlotSquared.debug("Calculating plots to purge, please wait...");
+            HashSet<Integer> ids = new HashSet<>();
+            for (Plot plot : toDelete) {
+                if (plot.temp != Integer.MAX_VALUE) {
+                    ids.add(plot.temp);
+                    plot.getArea().removePlot(plot.getId());
+                    for (PlotPlayer pp : plot.getPlayersInPlot()) {
+                        PlotListener.plotEntry(pp, plot);
                     }
+                    plot.removeSign();
                 }
-                DBFunc.purgeIds(ids);
-                C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
             }
+            DBFunc.purgeIds(ids);
+            C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, cmd, run);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 7141df96e..33570b9b6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -22,25 +22,23 @@ import java.util.Map.Entry;
             switch (args[0].toLowerCase()) {
                 case "next": {
                     ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getBasePlots());
-                    Collections.sort(plots, new Comparator<Plot>() {
-                        @Override public int compare(Plot p1, Plot p2) {
-                            double v1 = 0;
-                            if (!p1.getRatings().isEmpty()) {
-                                for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                    v1 -= 11 - entry.getValue().getAverageRating();
-                                }
+                    plots.sort((p1, p2) -> {
+                        double v1 = 0;
+                        if (!p1.getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
+                                v1 -= 11 - entry.getValue().getAverageRating();
                             }
-                            double v2 = 0;
-                            if (!p2.getRatings().isEmpty()) {
-                                for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                    v2 -= 11 - entry.getValue().getAverageRating();
-                                }
-                            }
-                            if (v1 == v2) {
-                                return -0;
-                            }
-                            return v2 > v1 ? 1 : -1;
                         }
+                        double v2 = 0;
+                        if (!p2.getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                                v2 -= 11 - entry.getValue().getAverageRating();
+                            }
+                        }
+                        if (v1 == v2) {
+                            return -0;
+                        }
+                        return v2 > v1 ? 1 : -1;
                     });
                     UUID uuid = player.getUUID();
                     for (Plot p : plots) {
@@ -123,7 +121,7 @@ import java.util.Map.Entry;
                             return true;
                         }
                     };
-                    inventory.setItem(0, new PlotItemStack(35, (short) 12, 0, "0/8"));
+                    inventory.setItem(0, new PlotItemStack("minecraft:brown_wool", 0, "0/8"));
                     inventory.setItem(1, new PlotItemStack(35, (short) 14, 1, "1/8"));
                     inventory.setItem(2, new PlotItemStack(35, (short) 1, 2, "2/8"));
                     inventory.setItem(3, new PlotItemStack(35, (short) 4, 3, "3/8"));
@@ -137,11 +135,9 @@ import java.util.Map.Entry;
             };
             if (plot.getSettings().ratings == null) {
                 if (!Settings.Enabled_Components.RATING_CACHE) {
-                    TaskManager.runTaskAsync(new Runnable() {
-                        @Override public void run() {
-                            plot.getSettings().ratings = DBFunc.getRatings(plot);
-                            run.run();
-                        }
+                    TaskManager.runTaskAsync(() -> {
+                        plot.getSettings().ratings = DBFunc.getRatings(plot);
+                        run.run();
                     });
                     return true;
                 }
@@ -167,26 +163,22 @@ import java.util.Map.Entry;
             return false;
         }
         final UUID uuid = player.getUUID();
-        final Runnable run = new Runnable() {
-            @Override public void run() {
-                if (plot.getRatings().containsKey(uuid)) {
-                    sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
-                    return;
-                }
-                Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
-                if (result != null) {
-                    plot.addRating(uuid, result);
-                    sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
-                }
+        final Runnable run = () -> {
+            if (plot.getRatings().containsKey(uuid)) {
+                sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                return;
+            }
+            Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
+            if (result != null) {
+                plot.addRating(uuid, result);
+                sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
             }
         };
         if (plot.getSettings().ratings == null) {
             if (!Settings.Enabled_Components.RATING_CACHE) {
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        plot.getSettings().ratings = DBFunc.getRatings(plot);
-                        run.run();
-                    }
+                TaskManager.runTaskAsync(() -> {
+                    plot.getSettings().ratings = DBFunc.getRatings(plot);
+                    run.run();
                 });
                 return true;
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
index a26d4d02e..e5341103d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -143,14 +143,6 @@ public interface AbstractDB {
      */
     void setFlags(Plot plot, HashMap<Flag<?>, Object> flags);
 
-    /**
-     * Set cluster flags.
-     *
-     * @param cluster PlotCluster Object
-     * @param flags   flags to set (flag[])
-     */
-    void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags);
-
     /**
      * Rename a cluster to the given name.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
index 5050c699f..6571a328c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
@@ -13,6 +13,7 @@ import java.util.*;
  * Database Functions
  * - These functions do not update the local plot objects and only make changes to the DB
  */
+@SuppressWarnings("deprecation")
 public class DBFunc {
     /**
      * The "global" uuid.
@@ -298,17 +299,6 @@ public class DBFunc {
         DBFunc.dbManager.setFlags(plot, flags);
     }
 
-    public static void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setFlags(cluster, flags);
-    }
-
-    /**
-     * @param plot
-     * @param alias
-     */
     public static void setAlias(Plot plot, String alias) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -330,10 +320,6 @@ public class DBFunc {
         DBFunc.dbManager.purge(area, plotIds);
     }
 
-    /**
-     * @param plot
-     * @param position
-     */
     public static void setPosition(Plot plot, String position) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -341,10 +327,6 @@ public class DBFunc {
         DBFunc.dbManager.setPosition(plot, position);
     }
 
-    /**
-     * @param plot
-     * @param comment
-     */
     public static void removeComment(Plot plot, PlotComment comment) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -359,10 +341,6 @@ public class DBFunc {
         DBFunc.dbManager.clearInbox(plot, inbox);
     }
 
-    /**
-     * @param plot
-     * @param comment
-     */
     public static void setComment(Plot plot, PlotComment comment) {
         if (plot != null && plot.temp == -1 || dbManager == null) {
             return;
@@ -370,9 +348,6 @@ public class DBFunc {
         DBFunc.dbManager.setComment(plot, comment);
     }
 
-    /**
-     * @param plot
-     */
     public static void getComments(Plot plot, String inbox,
         RunnableVal<List<PlotComment>> whenDone) {
         if (plot != null && plot.temp == -1 || dbManager == null) {
@@ -381,10 +356,6 @@ public class DBFunc {
         DBFunc.dbManager.getComments(plot, inbox, whenDone);
     }
 
-    /**
-     * @param plot
-     * @param uuid
-     */
     public static void removeTrusted(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -392,10 +363,6 @@ public class DBFunc {
         DBFunc.dbManager.removeTrusted(plot, uuid);
     }
 
-    /**
-     * @param cluster
-     * @param uuid
-     */
     public static void removeHelper(PlotCluster cluster, UUID uuid) {
         if (dbManager == null) {
             return;
@@ -403,9 +370,6 @@ public class DBFunc {
         DBFunc.dbManager.removeHelper(cluster, uuid);
     }
 
-    /**
-     * @param cluster
-     */
     public static void createCluster(PlotCluster cluster) {
         if (dbManager == null) {
             return;
@@ -413,11 +377,6 @@ public class DBFunc {
         DBFunc.dbManager.createCluster(cluster);
     }
 
-    /**
-     * @param current
-     * @param min
-     * @param max
-     */
     public static void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
         if (dbManager == null) {
             return;
@@ -425,10 +384,6 @@ public class DBFunc {
         DBFunc.dbManager.resizeCluster(current, min, max);
     }
 
-    /**
-     * @param plot
-     * @param uuid
-     */
     public static void removeMember(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -436,10 +391,6 @@ public class DBFunc {
         DBFunc.dbManager.removeMember(plot, uuid);
     }
 
-    /**
-     * @param cluster
-     * @param uuid
-     */
     public static void removeInvited(PlotCluster cluster, UUID uuid) {
         if (dbManager == null) {
             return;
@@ -447,10 +398,6 @@ public class DBFunc {
         DBFunc.dbManager.removeInvited(cluster, uuid);
     }
 
-    /**
-     * @param plot
-     * @param uuid
-     */
     public static void setTrusted(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -465,10 +412,6 @@ public class DBFunc {
         DBFunc.dbManager.setHelper(cluster, uuid);
     }
 
-    /**
-     * @param plot
-     * @param uuid
-     */
     public static void setMember(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -483,10 +426,6 @@ public class DBFunc {
         DBFunc.dbManager.setInvited(cluster, uuid);
     }
 
-    /**
-     * @param plot
-     * @param uuid
-     */
     public static void removeDenied(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -494,10 +433,6 @@ public class DBFunc {
         DBFunc.dbManager.removeDenied(plot, uuid);
     }
 
-    /**
-     * @param plot
-     * @param uuid
-     */
     public static void setDenied(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
index 4acecc01f..8626a1a24 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
@@ -11,9 +11,9 @@ import java.sql.Statement;
  * @author -_Husky_-
  * @author tips48
  */
-public abstract class Database {
+public interface Database {
 
-    public abstract Connection forceConnection() throws SQLException, ClassNotFoundException;
+    Connection forceConnection() throws SQLException, ClassNotFoundException;
 
     /**
      * Opens a connection with the database.
@@ -22,7 +22,7 @@ public abstract class Database {
      * @throws SQLException           if the connection can not be opened
      * @throws ClassNotFoundException if the driver cannot be found
      */
-    public abstract Connection openConnection() throws SQLException, ClassNotFoundException;
+    Connection openConnection() throws SQLException, ClassNotFoundException;
 
     /**
      * Checks if a connection is open with the database.
@@ -30,14 +30,14 @@ public abstract class Database {
      * @return true if the connection is open
      * @throws SQLException if the connection cannot be checked
      */
-    public abstract boolean checkConnection() throws SQLException;
+    boolean checkConnection() throws SQLException;
 
     /**
      * Gets the connection with the database.
      *
      * @return Connection with the database, null if none
      */
-    public abstract Connection getConnection();
+    Connection getConnection();
 
     /**
      * Closes the connection with the database.
@@ -45,7 +45,7 @@ public abstract class Database {
      * @return true if successful
      * @throws SQLException if the connection cannot be closed
      */
-    public abstract boolean closeConnection() throws SQLException;
+    boolean closeConnection() throws SQLException;
 
     /**
      * Executes a SQL Query.
@@ -56,7 +56,7 @@ public abstract class Database {
      * @throws SQLException           If the query cannot be executed
      * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
      */
-    public abstract ResultSet querySQL(String query) throws SQLException, ClassNotFoundException;
+    ResultSet querySQL(String query) throws SQLException, ClassNotFoundException;
 
     /**
      * Executes an Update SQL Query.
@@ -68,5 +68,5 @@ public abstract class Database {
      * @throws SQLException           If the query cannot be executed
      * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
      */
-    public abstract int updateSQL(String query) throws SQLException, ClassNotFoundException;
+    int updateSQL(String query) throws SQLException, ClassNotFoundException;
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
index 7e7df9124..4a0e655c5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
@@ -11,7 +11,7 @@ import java.sql.*;
  * @author -_Husky_-
  * @author tips48
  */
-public class MySQL extends Database {
+public class MySQL implements Database {
 
     private final String user;
     private final String database;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 66a21174d..ed460450d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -7,3204 +7,3296 @@ import com.github.intellectualsites.plotsquared.plot.config.Storage;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.StringFlag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.BlockLoc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotCluster;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.google.common.base.Charsets;
-
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Nonnull;
 
 
-@SuppressWarnings("SqlDialectInspection") public class SQLManager implements AbstractDB {
+@SuppressWarnings("SqlDialectInspection")
+public class SQLManager implements AbstractDB {
 
-    // Public final
-    public final String SET_OWNER;
-    public final String GET_ALL_PLOTS;
-    public final String CREATE_PLOTS;
-    public final String CREATE_SETTINGS;
-    public final String CREATE_TIERS;
-    public final String CREATE_PLOT;
-    public final String CREATE_PLOT_SAFE;
-    public final String CREATE_CLUSTER;
-    private final String prefix;
-    // Private Final
-    private final Database database;
-    private final boolean mySQL;
-    /**
-     * important tasks
-     */
-    public volatile Queue<Runnable> globalTasks;
-    /**
-     * Notify tasks
-     */
-    public volatile Queue<Runnable> notifyTasks;
-    /**
-     * plot
-     * plot_denied
-     * plot_helpers
-     * plot_trusted
-     * plot_comments
-     * plot_settings
-     * plot_rating
-     */
-    public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
-    /**
-     * player_meta
-     */
-    public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
-    /**
-     * cluster
-     * cluster_helpers
-     * cluster_invited
-     * cluster_settings
-     */
-    public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
-    // Private
-    private Connection connection;
-    private boolean closed = false;
+  // Public final
+  public final String SET_OWNER;
+  public final String GET_ALL_PLOTS;
+  public final String CREATE_PLOTS;
+  public final String CREATE_SETTINGS;
+  public final String CREATE_TIERS;
+  public final String CREATE_PLOT;
+  public final String CREATE_PLOT_SAFE;
+  public final String CREATE_CLUSTER;
+  private final String prefix;
+  // Private Final
+  private final Database database;
+  private final boolean mySQL;
+  /**
+   * important tasks
+   */
+  public volatile Queue<Runnable> globalTasks;
+  /**
+   * Notify tasks
+   */
+  public volatile Queue<Runnable> notifyTasks;
+  /**
+   * plot plot_denied plot_helpers plot_trusted plot_comments plot_settings plot_rating
+   */
+  public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
+  /**
+   * player_meta
+   */
+  public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
+  /**
+   * cluster cluster_helpers cluster_invited cluster_settings
+   */
+  public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
+  // Private
+  private Connection connection;
+  private boolean closed = false;
 
-    /**
-     * Constructor
-     *
-     * @param database
-     * @param p        prefix
-     * @throws SQLException
-     * @throws ClassNotFoundException
-     */
-    public SQLManager(final Database database, String p, boolean debug)
-        throws SQLException, ClassNotFoundException {
-        // Private final
-        this.database = database;
-        this.connection = database.openConnection();
-        this.mySQL = database instanceof MySQL;
-        this.globalTasks = new ConcurrentLinkedQueue<>();
-        this.notifyTasks = new ConcurrentLinkedQueue<>();
-        this.plotTasks = new ConcurrentHashMap<>();
-        this.playerTasks = new ConcurrentHashMap<>();
-        this.clusterTasks = new ConcurrentHashMap<>();
-        this.prefix = p;
-        this.SET_OWNER = "UPDATE `" + this.prefix
-            + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
-        this.GET_ALL_PLOTS =
-            "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
-        this.CREATE_PLOTS = "INSERT INTO `" + this.prefix
-            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
-        this.CREATE_SETTINGS =
-            "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
-        this.CREATE_TIERS =
-            "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
-        this.CREATE_PLOT = "INSERT INTO `" + this.prefix
-            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
+  /**
+   * Constructor
+   *
+   * @param p prefix
+   */
+  public SQLManager(final Database database, String p, boolean debug)
+      throws SQLException, ClassNotFoundException {
+    // Private final
+    this.database = database;
+    this.connection = database.openConnection();
+    this.mySQL = database instanceof MySQL;
+    this.globalTasks = new ConcurrentLinkedQueue<>();
+    this.notifyTasks = new ConcurrentLinkedQueue<>();
+    this.plotTasks = new ConcurrentHashMap<>();
+    this.playerTasks = new ConcurrentHashMap<>();
+    this.clusterTasks = new ConcurrentHashMap<>();
+    this.prefix = p;
+    this.SET_OWNER = "UPDATE `" + this.prefix
+        + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
+    this.GET_ALL_PLOTS =
+        "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
+    this.CREATE_PLOTS = "INSERT INTO `" + this.prefix
+        + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
+    this.CREATE_SETTINGS =
+        "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
+    this.CREATE_TIERS =
+        "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
+    this.CREATE_PLOT = "INSERT INTO `" + this.prefix
+        + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
 
-        if (mySQL) {
-            this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
-                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
-                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+    if (mySQL) {
+      this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
+          + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
+          + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+    } else {
+      this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
+          + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
+          + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+    }
+    this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
+        + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
+    try {
+      createTables();
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+    TaskManager.runTaskAsync(() -> {
+      long last = System.currentTimeMillis();
+      while (true) {
+        if (SQLManager.this.closed) {
+          break;
+        }
+        boolean hasTask =
+            !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
+                || !clusterTasks.isEmpty();
+        if (hasTask) {
+          if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
+              || !isValid()) {
+            last = System.currentTimeMillis();
+            reconnect();
+          }
+          if (!sendBatch()) {
+            try {
+              if (!getNotifyTasks().isEmpty()) {
+                for (Runnable task : getNotifyTasks()) {
+                  TaskManager.runTask(task);
+                }
+                getNotifyTasks().clear();
+              }
+              Thread.sleep(50);
+            } catch (InterruptedException e) {
+              e.printStackTrace();
+            }
+          }
         } else {
-            this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
-                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
-                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
-        }
-        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
-            + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
-        try {
-            createTables();
-        } catch (SQLException e) {
+          try {
+            Thread.sleep(1000);
+          } catch (InterruptedException e) {
             e.printStackTrace();
+          }
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                long last = System.currentTimeMillis();
-                while (true) {
-                    if (SQLManager.this.closed) {
-                        break;
-                    }
-                    boolean hasTask =
-                        !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
-                            || !clusterTasks.isEmpty();
-                    if (hasTask) {
-                        if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
-                            || !isValid()) {
-                            last = System.currentTimeMillis();
-                            reconnect();
-                        }
-                        if (!sendBatch()) {
-                            try {
-                                if (!getNotifyTasks().isEmpty()) {
-                                    for (Runnable task : getNotifyTasks()) {
-                                        TaskManager.runTask(task);
-                                    }
-                                    getNotifyTasks().clear();
-                                }
-                                Thread.sleep(50);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    } else {
-                        try {
-                            Thread.sleep(1000);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            }
-        });
+      }
+    });
+  }
+
+  public boolean isValid() {
+    try {
+      if (connection.isClosed()) {
+        return false;
+      }
+    } catch (SQLException e) {
+      return false;
     }
-
-    public boolean isValid() {
-        try {
-            if (connection.isClosed()) {
-                return false;
-            }
-        } catch (SQLException e) {
-            return false;
-        }
-        try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
-            stmt.executeQuery();
-            return true;
-        } catch (Throwable e) {
-            return false;
-        }
+    try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
+      stmt.executeQuery();
+      return true;
+    } catch (Throwable e) {
+      return false;
     }
+  }
 
-    public void reconnect() {
-        try {
-            close();
-            SQLManager.this.closed = false;
-            SQLManager.this.connection = database.forceConnection();
-        } catch (SQLException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
+  public void reconnect() {
+    try {
+      close();
+      SQLManager.this.closed = false;
+      SQLManager.this.connection = database.forceConnection();
+    } catch (SQLException | ClassNotFoundException e) {
+      e.printStackTrace();
     }
+  }
 
-    public synchronized Queue<Runnable> getGlobalTasks() {
-        return this.globalTasks;
+  public synchronized Queue<Runnable> getGlobalTasks() {
+    return this.globalTasks;
+  }
+
+  public synchronized Queue<Runnable> getNotifyTasks() {
+    return this.notifyTasks;
+  }
+
+  public synchronized void addPlotTask(@Nonnull Plot plot, UniqueStatement task) {
+    Queue<UniqueStatement> tasks = this.plotTasks.computeIfAbsent(plot, plot1 -> new ConcurrentLinkedQueue<>());
+    if (task == null) {
+      task = new UniqueStatement(String.valueOf(plot.hashCode())) {
+
+        @Override
+        public PreparedStatement get() {
+          return null;
+        }
+
+        @Override
+        public void set(PreparedStatement stmt) {
+        }
+
+        @Override
+        public void addBatch(PreparedStatement statement) {
+        }
+
+        @Override
+        public void execute(PreparedStatement statement) {
+        }
+
+      };
     }
+    tasks.add(task);
+  }
 
-    public synchronized Queue<Runnable> getNotifyTasks() {
-        return this.notifyTasks;
+  public synchronized void addPlayerTask(UUID uuid, UniqueStatement task) {
+    if (uuid == null) {
+      return;
     }
+    Queue<UniqueStatement> tasks = this.playerTasks.computeIfAbsent(uuid, uuid1 -> new ConcurrentLinkedQueue<>());
+    if (task == null) {
+      task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
 
-    public synchronized void addPlotTask(Plot plot, UniqueStatement task) {
-        if (plot == null) {
-            plot = new Plot(null, new PlotId(Integer.MAX_VALUE, Integer.MAX_VALUE));
+        @Override
+        public PreparedStatement get() {
+          return null;
         }
-        Queue<UniqueStatement> tasks = this.plotTasks.get(plot);
-        if (tasks == null) {
-            tasks = new ConcurrentLinkedQueue<>();
-            this.plotTasks.put(plot, tasks);
+
+        @Override
+        public void set(PreparedStatement stmt) {
         }
-        if (task == null) {
-            task = new UniqueStatement(String.valueOf(plot.hashCode())) {
 
-                @Override public PreparedStatement get() {
-                    return null;
-                }
-
-                @Override public void set(PreparedStatement stmt) {
-                }
-
-                @Override public void addBatch(PreparedStatement statement) {
-                }
-
-                @Override public void execute(PreparedStatement statement) {
-                }
-
-            };
+        @Override
+        public void addBatch(PreparedStatement statement) {
         }
-        tasks.add(task);
+
+        @Override
+        public void execute(PreparedStatement statement) {
+        }
+
+      };
     }
+    tasks.add(task);
+  }
 
-    public synchronized void addPlayerTask(UUID uuid, UniqueStatement task) {
-        if (uuid == null) {
-            return;
+  public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
+    Queue<UniqueStatement> tasks = this.clusterTasks.computeIfAbsent(cluster, plotCluster -> new ConcurrentLinkedQueue<>());
+    if (task == null) {
+      task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
+
+        @Override
+        public PreparedStatement get() {
+          return null;
         }
-        Queue<UniqueStatement> tasks = this.playerTasks.get(uuid);
-        if (tasks == null) {
-            tasks = new ConcurrentLinkedQueue<>();
-            this.playerTasks.put(uuid, tasks);
+
+        @Override
+        public void set(PreparedStatement stmt) {
         }
-        if (task == null) {
-            task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
 
-                @Override public PreparedStatement get() {
-                    return null;
-                }
-
-                @Override public void set(PreparedStatement stmt) {
-                }
-
-                @Override public void addBatch(PreparedStatement statement) {
-                }
-
-                @Override public void execute(PreparedStatement statement) {
-                }
-
-            };
+        @Override
+        public void addBatch(PreparedStatement statement) {
         }
-        tasks.add(task);
+
+        @Override
+        public void execute(PreparedStatement statement) {
+        }
+
+      };
     }
+    tasks.add(task);
+  }
 
-    public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
-        Queue<UniqueStatement> tasks = this.clusterTasks.get(cluster);
-        if (tasks == null) {
-            tasks = new ConcurrentLinkedQueue<>();
-            this.clusterTasks.put(cluster, tasks);
-        }
-        if (task == null) {
-            task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
+  public synchronized void addGlobalTask(Runnable task) {
+    getGlobalTasks().add(task);
+  }
 
-                @Override public PreparedStatement get() {
-                    return null;
-                }
-
-                @Override public void set(PreparedStatement stmt) {
-                }
-
-                @Override public void addBatch(PreparedStatement statement) {
-                }
-
-                @Override public void execute(PreparedStatement statement) {
-                }
-
-            };
-        }
-        tasks.add(task);
+  public synchronized void addNotifyTask(Runnable task) {
+    if (task != null) {
+      getNotifyTasks().add(task);
     }
+  }
 
-    public synchronized void addGlobalTask(Runnable task) {
-        getGlobalTasks().add(task);
-    }
-
-    public synchronized void addNotifyTask(Runnable task) {
+  public boolean sendBatch() {
+    try {
+      if (!getGlobalTasks().isEmpty()) {
+        if (this.connection.getAutoCommit()) {
+          this.connection.setAutoCommit(false);
+        }
+        Runnable task = getGlobalTasks().remove();
         if (task != null) {
-            getNotifyTasks().add(task);
-        }
-    }
-
-    public boolean sendBatch() {
-        try {
-            if (!getGlobalTasks().isEmpty()) {
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                Runnable task = getGlobalTasks().remove();
-                if (task != null) {
-                    try {
-                        task.run();
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                commit();
-                return true;
-            }
-            int count = -1;
-            if (!this.plotTasks.isEmpty()) {
-                count = 0;
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement statement = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
-                    this.plotTasks.entrySet().iterator();
-                while (iter.hasNext()) {
-                    try {
-                        Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
-                        Plot plot = entry.getKey();
-                        Queue<UniqueStatement> tasks = entry.getValue();
-                        if (tasks.isEmpty()) {
-                            iter.remove();
-                            continue;
-                        }
-                        task = tasks.remove();
-                        count++;
-                        if (task != null) {
-                            if (task.method == null || !task.method.equals(method)
-                                || statement == null) {
-                                if (statement != null) {
-                                    lastTask.execute(statement);
-                                    statement.close();
-                                }
-                                method = task.method;
-                                statement = task.get();
-                            }
-                            task.set(statement);
-                            task.addBatch(statement);
-                            try {
-                                if (statement.isClosed()) {
-                                    statement = null;
-                                }
-                            } catch (AbstractMethodError ignore) {
-                            }
-                        }
-                        lastTask = task;
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                if (statement != null && task != null) {
-                    task.execute(statement);
-                    statement.close();
-                }
-            }
-            if (!this.playerTasks.isEmpty()) {
-                count = 0;
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement statement = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
-                    try {
-                        UUID uuid = entry.getKey();
-                        if (this.playerTasks.get(uuid).isEmpty()) {
-                            this.playerTasks.remove(uuid);
-                            continue;
-                        }
-                        task = this.playerTasks.get(uuid).remove();
-                        count++;
-                        if (task != null) {
-                            if (task.method == null || !task.method.equals(method)) {
-                                if (statement != null) {
-                                    lastTask.execute(statement);
-                                    statement.close();
-                                }
-                                method = task.method;
-                                statement = task.get();
-                            }
-                            task.set(statement);
-                            task.addBatch(statement);
-                        }
-                        lastTask = task;
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                if (statement != null && task != null) {
-                    task.execute(statement);
-                    statement.close();
-                }
-            }
-            if (!this.clusterTasks.isEmpty()) {
-                count = 0;
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement statement = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks
-                    .entrySet()) {
-                    try {
-                        PlotCluster cluster = entry.getKey();
-                        if (this.clusterTasks.get(cluster).isEmpty()) {
-                            this.clusterTasks.remove(cluster);
-                            continue;
-                        }
-                        task = this.clusterTasks.get(cluster).remove();
-                        count++;
-                        if (task != null) {
-                            if (task.method == null || !task.method.equals(method)) {
-                                if (statement != null) {
-                                    lastTask.execute(statement);
-                                    statement.close();
-                                }
-                                method = task.method;
-                                statement = task.get();
-                            }
-                            task.set(statement);
-                            task.addBatch(statement);
-                        }
-                        lastTask = task;
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                if (statement != null && task != null) {
-                    task.execute(statement);
-                    statement.close();
-                }
-            }
-            if (count > 0) {
-                commit();
-                return true;
-            }
-            if (count != -1) {
-                if (!this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(true);
-                }
-            }
-            if (!this.clusterTasks.isEmpty()) {
-                this.clusterTasks.clear();
-            }
-            if (!this.plotTasks.isEmpty()) {
-                this.plotTasks.clear();
-            }
-        } catch (Throwable e) {
+          try {
+            task.run();
+          } catch (Throwable e) {
             PlotSquared.debug("============ DATABASE ERROR ============");
             PlotSquared.debug("There was an error updating the database.");
             PlotSquared.debug(" - It will be corrected on shutdown");
             PlotSquared.debug("========================================");
             e.printStackTrace();
             PlotSquared.debug("========================================");
+          }
         }
-        return false;
-    }
-
-    public Connection getConnection() {
-        return this.connection;
-    }
-
-    /**
-     * Set Plot owner
-     *
-     * @param plot Plot Object
-     * @param uuid Owner UUID
-     */
-    @Override public void setOwner(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setOwner") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, uuid.toString());
-                statement.setInt(2, plot.getId().x);
-                statement.setInt(3, plot.getId().y);
-                statement.setString(4, plot.getArea().toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
-            }
-        });
-    }
-
-    @Override public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                try {
-                    // Create the plots
-                    createPlots(myList, new Runnable() {
-                        @Override public void run() {
-                            try {
-                                // Creating datastructures
-                                HashMap<PlotId, Plot> plotMap = new HashMap<>();
-                                for (Plot plot : myList) {
-                                    plotMap.put(plot.getId(), plot);
-                                }
-                                ArrayList<SettingsPair> settings = new ArrayList<>();
-                                final ArrayList<UUIDPair> helpers = new ArrayList<>();
-                                final ArrayList<UUIDPair> trusted = new ArrayList<>();
-                                final ArrayList<UUIDPair> denied = new ArrayList<>();
-
-                                // Populating structures
-                                try (PreparedStatement stmt = SQLManager.this.connection
-                                    .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
-                                    ResultSet result = stmt.executeQuery()) {
-                                    while (result.next()) {
-                                        int id = result.getInt("id");
-                                        int x = result.getInt("plot_id_x");
-                                        int y = result.getInt("plot_id_z");
-                                        PlotId plotId = new PlotId(x, y);
-                                        Plot plot = plotMap.get(plotId);
-                                        if (plot != null) {
-                                            settings.add(new SettingsPair(id, plot.getSettings()));
-                                            for (UUID uuid : plot.getDenied()) {
-                                                denied.add(new UUIDPair(id, uuid));
-                                            }
-                                            for (UUID uuid : plot.getMembers()) {
-                                                trusted.add(new UUIDPair(id, uuid));
-                                            }
-                                            for (UUID uuid : plot.getTrusted()) {
-                                                helpers.add(new UUIDPair(id, uuid));
-                                            }
-                                        }
-                                    }
-                                }
-                                createSettings(settings, new Runnable() {
-                                    @Override public void run() {
-                                        createTiers(helpers, "helpers", new Runnable() {
-                                            @Override public void run() {
-                                                createTiers(trusted, "trusted", new Runnable() {
-                                                    @Override public void run() {
-                                                        createTiers(denied, "denied",
-                                                            new Runnable() {
-                                                                @Override public void run() {
-                                                                    try {
-                                                                        SQLManager.this.connection
-                                                                            .commit();
-                                                                    } catch (SQLException e) {
-                                                                        e.printStackTrace();
-                                                                    }
-                                                                    if (whenDone != null) {
-                                                                        whenDone.run();
-                                                                    }
-                                                                }
-                                                            });
-                                                    }
-                                                });
-                                            }
-                                        });
-                                    }
-                                });
-                            } catch (SQLException e) {
-                                e.printStackTrace();
-                                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                                try {
-                                    SQLManager.this.connection.commit();
-                                } catch (SQLException e1) {
-                                    e1.printStackTrace();
-                                }
-                            }
-                        }
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                    try {
-                        SQLManager.this.connection.commit();
-                    } catch (SQLException e1) {
-                        e1.printStackTrace();
-                    }
-                }
-            }
-        });
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param myList list of plots to be created
-     */
-    public void createTiers(ArrayList<UUIDPair> myList, final String tier, Runnable whenDone) {
-        StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, SQLManager.this.CREATE_TIERS.replaceAll("%tier%", tier),
-                    2);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size,
-                    "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
-                        + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
-            }
-
-            @Override public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
-                    + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair)
-                throws SQLException {
-                stmt.setInt(i * 2 + 1, pair.id);
-                stmt.setString(i * 2 + 2, pair.uuid.toString());
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair)
-                throws SQLException {
-                stmt.setInt(i * 2 + 1, pair.id);
-                stmt.setString(i * 2 + 2, pair.uuid.toString());
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, UUIDPair pair)
-                throws SQLException {
-                stmt.setInt(1, pair.id);
-                stmt.setString(2, pair.uuid.toString());
-            }
-        };
-        setBulk(myList, mod, whenDone);
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param myList list of plots to be created
-     */
-    public void createPlots(List<Plot> myList, Runnable whenDone) {
-        StmtMod<Plot> mod = new StmtMod<Plot>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, SQLManager.this.CREATE_PLOTS, 5);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ",
-                    6);
-            }
-
-            @Override public String getCreateSQL() {
-                return SQLManager.this.CREATE_PLOT;
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, Plot plot)
-                throws SQLException {
-                stmt.setInt(i * 5 + 1, plot.getId().x);
-                stmt.setInt(i * 5 + 2, plot.getId().y);
-                try {
-                    stmt.setString(i * 5 + 3, plot.owner.toString());
-                } catch (SQLException ignored) {
-                    stmt.setString(i * 5 + 3, everyone.toString());
-                }
-                stmt.setString(i * 5 + 4, plot.getArea().toString());
-                stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, Plot plot)
-                throws SQLException {
-                stmt.setNull(i * 6 + 1, 4);
-                stmt.setInt(i * 6 + 2, plot.getId().x);
-                stmt.setInt(i * 6 + 3, plot.getId().y);
-                try {
-                    stmt.setString(i * 6 + 4, plot.owner.toString());
-                } catch (SQLException ignored) {
-                    stmt.setString(i * 6 + 4, everyone.toString());
-                }
-                stmt.setString(i * 6 + 5, plot.getArea().toString());
-                stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-
-            }
-        };
-        setBulk(myList, mod, whenDone);
-    }
-
-    public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
-        int size = objList.size();
-        if (size == 0) {
-            if (whenDone != null) {
-                whenDone.run();
-            }
-            return;
-        }
-        int packet;
-        if (this.mySQL) {
-            packet = Math.min(size, 5000);
-        } else {
-            packet = Math.min(size, 50);
-        }
-        int amount = size / packet;
-        try {
-            int count = 0;
-            PreparedStatement preparedStmt = null;
-            int last = -1;
-            for (int j = 0; j <= amount; j++) {
-                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                if (subList.isEmpty()) {
-                    break;
-                }
-                String statement;
-                if (last == -1) {
-                    last = subList.size();
-                    statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                if (subList.size() != last || count % 5000 == 0 && count > 0) {
-                    preparedStmt.executeBatch();
-                    preparedStmt.close();
-                    statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                for (int i = 0; i < subList.size(); i++) {
-                    count++;
-                    T obj = subList.get(i);
-                    mod.setMySQL(preparedStmt, i, obj);
-                }
-                last = subList.size();
-                preparedStmt.addBatch();
-            }
-            PlotSquared.debug(
-                "&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-            preparedStmt.executeBatch();
-            preparedStmt.clearParameters();
-            preparedStmt.close();
-            if (whenDone != null) {
-                whenDone.run();
-            }
-            return;
-        } catch (SQLException e) {
-            if (this.mySQL) {
-                e.printStackTrace();
-                PlotSquared.debug("&cERROR 1:  | " + objList.get(0).getClass().getCanonicalName());
-            }
-        }
-        try {
-            int count = 0;
-            PreparedStatement preparedStmt = null;
-            int last = -1;
-            for (int j = 0; j <= amount; j++) {
-                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                if (subList.isEmpty()) {
-                    break;
-                }
-                String statement;
-                if (last == -1) {
-                    last = subList.size();
-                    statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                if (subList.size() != last || count % 5000 == 0 && count > 0) {
-                    preparedStmt.executeBatch();
-                    preparedStmt.clearParameters();
-                    statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                for (int i = 0; i < subList.size(); i++) {
-                    count++;
-                    T obj = subList.get(i);
-                    mod.setSQLite(preparedStmt, i, obj);
-                }
-                last = subList.size();
-                preparedStmt.addBatch();
-            }
-            PlotSquared.debug(
-                "&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-            preparedStmt.executeBatch();
-            preparedStmt.clearParameters();
-            preparedStmt.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-            PlotSquared.debug("&cERROR 2:  | " + objList.get(0).getClass().getCanonicalName());
-            PlotSquared.debug("&6[WARN] Could not bulk save!");
-            try (PreparedStatement preparedStmt = this.connection
-                .prepareStatement(mod.getCreateSQL())) {
-                for (T obj : objList) {
-                    mod.setSQL(preparedStmt, obj);
-                    preparedStmt.addBatch();
-                }
-                PlotSquared.debug("&aBatch 3");
-                preparedStmt.executeBatch();
-            } catch (SQLException e3) {
-                e3.printStackTrace();
-                PlotSquared.debug("&c[ERROR] Failed to save all!");
-            }
-        }
-        if (whenDone != null) {
-            whenDone.run();
-        }
-    }
-
-    public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
-        final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
-                    + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
-                    + "`position`) VALUES ", 10);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
-                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
-                    10);
-            }
-
-            @Override public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix
-                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
-            }
-
-            @Override public void setMySQL(PreparedStatement statement, int i, SettingsPair pair)
-                throws SQLException {
-                statement.setInt(i * 10 + 1, pair.id); // id
-                statement.setNull(i * 10 + 2, 4); // biome
-                statement.setNull(i * 10 + 3, 4); // rain
-                statement.setNull(i * 10 + 4, 4); // custom_time
-                statement.setNull(i * 10 + 5, 4); // time
-                statement.setNull(i * 10 + 6, 4); // deny_entry
-                if (pair.settings.getAlias().isEmpty()) {
-                    statement.setNull(i * 10 + 7, 4);
-                } else {
-                    statement.setString(i * 10 + 7, pair.settings.getAlias());
-                }
-                StringBuilder flag_string = new StringBuilder();
-                int k = 0;
-                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
-                    if (k != 0) {
-                        flag_string.append(',');
-                    }
-                    flag_string.append(flag.getKey().getName()).append(':').append(
-                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
-                            .replaceAll(",", "´"));
-                    k++;
-                }
-                statement.setString(i * 10 + 8, flag_string.toString());
-                boolean[] merged = pair.settings.getMerged();
-                int hash = MainUtil.hash(merged);
-                statement.setInt(i * 10 + 9, hash);
-                BlockLoc loc = pair.settings.getPosition();
-                String position;
-                if (loc.y == 0) {
-                    position = "DEFAULT";
-                } else {
-                    position = loc.x + "," + loc.y + ',' + loc.z;
-                }
-                statement.setString(i * 10 + 10, position);
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair)
-                throws SQLException {
-                stmt.setInt(i * 10 + 1, pair.id); // id
-                stmt.setNull(i * 10 + 2, 4); // biome
-                stmt.setNull(i * 10 + 3, 4); // rain
-                stmt.setNull(i * 10 + 4, 4); // custom_time
-                stmt.setNull(i * 10 + 5, 4); // time
-                stmt.setNull(i * 10 + 6, 4); // deny_entry
-                if (pair.settings.getAlias().isEmpty()) {
-                    stmt.setNull(i * 10 + 7, 4);
-                } else {
-                    stmt.setString(i * 10 + 7, pair.settings.getAlias());
-                }
-                StringBuilder flag_string = new StringBuilder();
-                int k = 0;
-                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
-                    if (k != 0) {
-                        flag_string.append(',');
-                    }
-                    flag_string.append(flag.getKey().getName()).append(':').append(
-                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
-                            .replaceAll(",", "´"));
-                    k++;
-                }
-                stmt.setString(i * 10 + 8, flag_string.toString());
-                boolean[] merged = pair.settings.getMerged();
-                int n = 0;
-                for (int j = 0; j < 4; ++j) {
-                    n = (n << 1) + (merged[j] ? 1 : 0);
-                }
-                stmt.setInt(i * 10 + 9, n);
-                BlockLoc loc = pair.settings.getPosition();
-                String position;
-                if (loc.y == 0) {
-                    position = "DEFAULT";
-                } else {
-                    position = loc.x + "," + loc.y + ',' + loc.z;
-                }
-                stmt.setString(i * 10 + 10, position);
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, SettingsPair pair)
-                throws SQLException {
-                stmt.setInt(1, pair.id);
-            }
-        };
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                setBulk(myList, mod, whenDone);
-            }
-        });
-    }
-
-    public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
-        final StmtMod<Integer> mod = new StmtMod<Integer>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, SQLManager.this.CREATE_SETTINGS, 1);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
-                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
-                    10);
-            }
-
-            @Override public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix
-                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, Integer id)
-                throws SQLException {
-                stmt.setInt(i + 1, id);
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, Integer id)
-                throws SQLException {
-                stmt.setInt(i * 10 + 1, id);
-                stmt.setNull(i * 10 + 2, 4);
-                stmt.setNull(i * 10 + 3, 4);
-                stmt.setNull(i * 10 + 4, 4);
-                stmt.setNull(i * 10 + 5, 4);
-                stmt.setNull(i * 10 + 6, 4);
-                stmt.setNull(i * 10 + 7, 4);
-                stmt.setNull(i * 10 + 8, 4);
-                stmt.setNull(i * 10 + 9, 4);
-                stmt.setString(i * 10 + 10, "DEFAULT");
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
-                stmt.setInt(1, id);
-            }
-        };
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                setBulk(myList, mod, whenDone);
-            }
-        });
-    }
-
-    public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
-        final long timestamp = plot.getTimestamp();
-        addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-                stmt.setString(6, plot.getArea().toString());
-                stmt.setInt(7, plot.getId().x);
-                stmt.setInt(8, plot.getId().y);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT_SAFE,
-                    Statement.RETURN_GENERATED_KEYS);
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                int inserted = statement.executeUpdate();
-                if (inserted > 0) {
-                    try (ResultSet keys = statement.getGeneratedKeys()) {
-                        if (keys.next()) {
-                            plot.temp = keys.getInt(1);
-                            addPlotTask(plot, new UniqueStatement(
-                                "createPlotAndSettings_settings_" + plot.hashCode()) {
-                                @Override public void set(PreparedStatement stmt)
-                                    throws SQLException {
-                                    stmt.setInt(1, getId(plot));
-                                }
-
-                                @Override public PreparedStatement get() throws SQLException {
-                                    return SQLManager.this.connection.prepareStatement(
-                                        "INSERT INTO `" + SQLManager.this.prefix
-                                            + "plot_settings`(`plot_plot_id`) VALUES(?)");
-                                }
-                            });
-                            if (success != null)
-                                addNotifyTask(success);
-                            return;
-                        }
-                    }
-                }
-                if (failure != null)
-                    failure.run();
-            }
-        });
-    }
-
-    public void commit() {
-        if (this.closed) {
-            return;
-        }
-        try {
-            if (!this.connection.getAutoCommit()) {
-                this.connection.commit();
-                this.connection.setAutoCommit(true);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
-        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection
-                    .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
-                    if (keys.next()) {
-                        plot.temp = keys.getInt(1);
-                    }
-                }
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
-            }
-        });
-        addNotifyTask(whenDone);
-    }
-
-    /**
-     * Create tables.
-     *
-     * @throws SQLException
-     */
-    @Override public void createTables() throws SQLException {
-        String[] tables =
-            new String[] {"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
-                "plot_rating", "plot_settings", "cluster", "player_meta"};
-        DatabaseMetaData meta = this.connection.getMetaData();
-        int create = 0;
-        for (String s : tables) {
-            ResultSet set = meta.getTables(null, null, this.prefix + s, new String[] {"TABLE"});
-            //            ResultSet set = meta.getTables(null, null, prefix + s, null);
-            if (!set.next()) {
-                create++;
-            }
-            set.close();
-        }
-        if (create == 0) {
-            return;
-        }
-        boolean addConstraint = create == tables.length;
-        PlotSquared.debug("Creating tables");
-        try (Statement stmt = this.connection.createStatement()) {
-            if (this.mySQL) {
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
-                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
-                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
-                    + "PRIMARY KEY (`id`)"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` ("
-                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                    + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL,"
-                    + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` ("
-                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
-                    + "  `plot_plot_id` INT(11) NOT NULL,"
-                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
-                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
-                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`plot_plot_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB "
-                    + "DEFAULT CHARSET=utf8");
-                if (addConstraint) {
-                    stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `"
-                        + this.prefix
-                        + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
-                        + this.prefix + "plot` (`id`) ON DELETE CASCADE");
-                }
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
-                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL,"
-                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
-                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
-                    + "PRIMARY KEY (`id`)"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` ("
-                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` ("
-                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
-                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
-                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
-                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
-                    + " `meta_id` INT(11) NOT NULL AUTO_INCREMENT,"
-                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
-                    + " `value` blob NOT NULL," + " PRIMARY KEY (`meta_id`)"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            } else {
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
-                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
-                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_helpers` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_trusted` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                    + "`comment` VARCHAR(40) NOT NULL,"
-                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
-                    + "`sender` VARCHAR(40) NOT NULL" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
-                    + "  `plot_plot_id` INT(11) NOT NULL,"
-                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
-                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
-                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`plot_plot_id`)" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
-                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL,"
-                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
-                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "cluster_helpers` (`cluster_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "cluster_invited` (`cluster_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
-                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
-                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
-                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`cluster_id`)" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
-                    + " `meta_id` INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
-                    + " `value` blob NOT NULL" + ')');
-            }
-            stmt.executeBatch();
-            stmt.clearBatch();
-        }
-    }
-
-    @Override public void deleteSettings(final Plot plot) {
-        addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_settings` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteHelpers(final Plot plot) {
-        if (plot.getTrusted().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_helpers` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteTrusted(final Plot plot) {
-        if (plot.getMembers().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_trusted` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteDenied(final Plot plot) {
-        if (plot.getDenied().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_denied` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteComments(final Plot plot) {
-        addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, plot.getArea().toString());
-                stmt.setInt(2, plot.hashCode());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteRatings(final Plot plot) {
-        if (Settings.Enabled_Components.RATING_CACHE && plot.getSettings().getRatings().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_rating` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Delete a plot.
-     *
-     * @param plot
-     */
-    @Override public void delete(final Plot plot) {
-        PlotSquared.debug(
-            "Deleting plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
-                + plot.owner + " Index: " + plot.temp);
-        deleteSettings(plot);
-        deleteDenied(plot);
-        deleteHelpers(plot);
-        deleteTrusted(plot);
-        deleteComments(plot);
-        deleteRatings(plot);
-        addPlotTask(plot, new UniqueStatement("delete_plot") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Create plot settings
-     *
-     * @param id
-     * @param plot
-     */
-    @Override public void createPlotSettings(final int id, Plot plot) {
-        PlotSquared.debug(
-            "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
-                + plot.owner + " Index: " + id);
-        addPlotTask(plot, new UniqueStatement("createPlotSettings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
-            }
-        });
-    }
-
-    @Override public int getClusterId(PlotCluster cluster) {
-        if (cluster.temp > 0) {
-            return cluster.temp;
-        }
-        try {
-            commit();
-            if (cluster.temp > 0) {
-                return cluster.temp;
-            }
-            int c_id;
-            try (PreparedStatement stmt = this.connection.prepareStatement(
-                "SELECT `id` FROM `" + this.prefix
-                    + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
-                stmt.setInt(1, cluster.getP1().x);
-                stmt.setInt(2, cluster.getP1().y);
-                stmt.setInt(3, cluster.getP2().x);
-                stmt.setInt(4, cluster.getP2().y);
-                stmt.setString(5, cluster.area.toString());
-                try (ResultSet resultSet = stmt.executeQuery()) {
-                    c_id = Integer.MAX_VALUE;
-                    while (resultSet.next()) {
-                        c_id = resultSet.getInt("id");
-                    }
-                }
-            }
-            if (c_id == Integer.MAX_VALUE || c_id == 0) {
-                if (cluster.temp > 0) {
-                    return cluster.temp;
-                }
-                throw new SQLException("Cluster does not exist in database");
-            }
-            cluster.temp = c_id;
-            return c_id;
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override public int getId(Plot plot) {
-        if (plot.temp > 0) {
-            return plot.temp;
-        }
-        try {
-            commit();
-            if (plot.temp > 0) {
-                return plot.temp;
-            }
-            int id;
-            try (PreparedStatement statement = this.connection.prepareStatement(
-                "SELECT `id` FROM `" + this.prefix
-                    + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
-                statement.setInt(1, plot.getId().x);
-                statement.setInt(2, plot.getId().y);
-                statement.setString(3, plot.getArea().toString());
-                try (ResultSet resultSet = statement.executeQuery()) {
-                    id = Integer.MAX_VALUE;
-                    while (resultSet.next()) {
-                        id = resultSet.getInt("id");
-                    }
-                }
-            }
-            if (id == Integer.MAX_VALUE || id == 0) {
-                if (plot.temp > 0) {
-                    return plot.temp;
-                }
-                throw new SQLException("Plot does not exist in database");
-            }
-            plot.temp = id;
-            return id;
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override public void updateTables(int[] oldVersion) {
-        try {
-            if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
-                try (Statement stmt = this.connection.createStatement()) {
-                    stmt.executeUpdate(
-                        "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
-                } catch (SQLException ignored) {
-                }
-            }
-            DatabaseMetaData data = this.connection.getMetaData();
-            ResultSet rs =
-                data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
-            if (rs.next()) {
-                rs.close();
-                rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
-                if (!rs.next()) {
-                    rs.close();
-                    try (Statement statement = this.connection.createStatement()) {
-                        statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-                        if (Storage.MySQL.USE) {
-                            statement.addBatch(
-                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                                    + "`comment` VARCHAR(40) NOT NULL,"
-                                    + "`inbox` VARCHAR(40) NOT NULL,"
-                                    + "`timestamp` INT(11) NOT NULL,"
-                                    + "`sender` VARCHAR(40) NOT NULL"
-                                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                        } else {
-                            statement.addBatch(
-                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                                    + "`comment` VARCHAR(40) NOT NULL,"
-                                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
-                                    + "`sender` VARCHAR(40) NOT NULL" + ')');
-                        }
-                        statement.executeBatch();
-                    } catch (SQLException ignored) {
-                        try (Statement statement = this.connection.createStatement()) {
-                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
-                                + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
-                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
-                                + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
-                            statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
-                            statement.executeBatch();
-                        }
-                    }
-                }
-            }
-            rs.close();
-            rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
-            if (rs.next()) {
-                try (Statement statement = this.connection.createStatement()) {
-                    statement.executeUpdate("DELETE FROM `" + this.prefix
-                        + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
-                        + this.prefix + "plot`)");
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-
-                rs.close();
-                try (Statement statement = this.connection.createStatement()) {
-                    for (String table : new String[] {"plot_denied", "plot_helpers",
-                        "plot_trusted"}) {
-                        ResultSet result = statement.executeQuery(
-                            "SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table
-                                + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
-                        if (result.next()) {
-                            PlotSquared.debug("BACKING UP: " + this.prefix + table);
-                            result.close();
-                            statement.executeUpdate(
-                                "CREATE TABLE " + this.prefix + table + "_tmp AS SELECT * FROM "
-                                    + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
-                            statement.executeUpdate("DROP TABLE " + this.prefix + table);
-                            statement.executeUpdate(
-                                "CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "
-                                    + this.prefix + table + "_tmp");
-                            statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
-                            PlotSquared.debug("RESTORING: " + this.prefix + table);
-                        }
-                    }
-                } catch (SQLException e2) {
-                    e2.printStackTrace();
-                }
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public void deleteRows(ArrayList<Integer> rowIds, final String table, final String column) {
-        setBulk(rowIds, new StmtMod<Integer>() {
-
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
-                    size);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
-                    size);
-            }
-
-            @Override public String getCreateSQL() {
-                return "DELETE FROM `" + table + "` WHERE `" + column + "` = ?";
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, Integer obj)
-                throws SQLException {
-                stmt.setInt(i + 1, obj);
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, Integer obj)
-                throws SQLException {
-                stmt.setInt(i + 1, obj);
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, Integer obj) throws SQLException {
-                stmt.setInt(1, obj);
-            }
-        }, null);
-    }
-
-    /**
-     * Load all plots, helpers, denied, trusted, and every setting from DB into a {@link HashMap}.
-     */
-    @Override public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
-        HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
-        HashMap<Integer, Plot> plots = new HashMap<>();
-        try {
-            HashSet<String> areas = new HashSet<>();
-            if (PlotSquared.get().worlds.contains("worlds")) {
-                ConfigurationSection worldSection =
-                    PlotSquared.get().worlds.getConfigurationSection("worlds");
-                if (worldSection != null) {
-                    for (String worldKey : worldSection.getKeys(false)) {
-                        areas.add(worldKey);
-                        ConfigurationSection areaSection =
-                            worldSection.getConfigurationSection(worldKey + ".areas");
-                        if (areaSection != null) {
-                            for (String areaKey : areaSection.getKeys(false)) {
-                                String[] split = areaKey.split("(?<![;])-");
-                                if (split.length == 3) {
-                                    areas.add(worldKey + ';' + split[0]);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            HashMap<String, UUID> uuids = new HashMap<>();
-            HashMap<String, AtomicInteger> noExist = new HashMap<>();
-
-            /*
-             * Getting plots
-             */
-            try (Statement statement = this.connection.createStatement()) {
-                int id;
-                String o;
-                UUID user;
-                try (ResultSet resultSet = statement.executeQuery(
-                    "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
-                        + this.prefix + "plot`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (resultSet.next()) {
-                        PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
-                            resultSet.getInt("plot_id_z"));
-                        id = resultSet.getInt("id");
-                        String areaid = resultSet.getString("world");
-                        if (!areas.contains(areaid)) {
-                            if (Settings.Enabled_Components.DATABASE_PURGER) {
-                                toDelete.add(id);
-                                continue;
-                            } else {
-                                AtomicInteger value = noExist.get(areaid);
-                                if (value != null) {
-                                    value.incrementAndGet();
-                                } else {
-                                    noExist.put(areaid, new AtomicInteger(1));
-                                }
-                            }
-                        }
-                        o = resultSet.getString("owner");
-                        user = uuids.get(o);
-                        if (user == null) {
-                            try {
-                                user = UUID.fromString(o);
-                            } catch (IllegalArgumentException e) {
-                                if (Settings.UUID.FORCE_LOWERCASE) {
-                                    user = UUID.nameUUIDFromBytes(
-                                        ("OfflinePlayer:" + o.toLowerCase())
-                                            .getBytes(Charsets.UTF_8));
-                                } else {
-                                    user = UUID.nameUUIDFromBytes(
-                                        ("OfflinePlayer:" + o).getBytes(Charsets.UTF_8));
-                                }
-                            }
-                            uuids.put(o, user);
-                        }
-                        long time;
-                        try {
-                            Timestamp timestamp = resultSet.getTimestamp("timestamp");
-                            time = timestamp.getTime();
-                        } catch (SQLException exception) {
-                            String parsable = resultSet.getString("timestamp");
-                            try {
-                                time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
-                                    .getTime();
-                            } catch (ParseException e) {
-                                PlotSquared.debug(
-                                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
-                                        + plot_id + ") (" + parsable + ")");
-                                time = System.currentTimeMillis() + id;
-                            }
-                        }
-                        Plot p = new Plot(plot_id, user, new HashSet<UUID>(), new HashSet<UUID>(),
-                            new HashSet<UUID>(), "", null, null, null,
-                            new boolean[] {false, false, false, false}, time, id);
-                        HashMap<PlotId, Plot> map = newPlots.get(areaid);
-                        if (map != null) {
-                            Plot last = map.put(p.getId(), p);
-                            if (last != null) {
-                                if (Settings.Enabled_Components.DATABASE_PURGER) {
-                                    toDelete.add(last.temp);
-                                } else {
-                                    PlotSquared.debug(
-                                        "&cPLOT #" + id + "(" + last + ") in `" + this.prefix
-                                            + "plot` is a duplicate. Delete this plot or set `database-purger: true` in the settings.yml.");
-                                }
-                            }
-                        } else {
-                            map = new HashMap<>();
-                            newPlots.put(areaid, map);
-                            map.put(p.getId(), p);
-                        }
-                        plots.put(id, p);
-                    }
-                    deleteRows(toDelete, this.prefix + "plot", "id");
-                }
-                if (Settings.Enabled_Components.RATING_CACHE) {
-                    try (ResultSet r = statement.executeQuery(
-                        "SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix
-                            + "plot_rating`")) {
-                        ArrayList<Integer> toDelete = new ArrayList<>();
-                        while (r.next()) {
-                            id = r.getInt("plot_plot_id");
-                            o = r.getString("player");
-                            user = uuids.get(o);
-                            if (user == null) {
-                                user = UUID.fromString(o);
-                                uuids.put(o, user);
-                            }
-                            Plot plot = plots.get(id);
-                            if (plot != null) {
-                                plot.getSettings().getRatings().put(user, r.getInt("rating"));
-                            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                                toDelete.add(id);
-                            } else {
-                                PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                    + ") in `plot_rating` does not exist. Create this plot or set `database-purger: true` in the "
-                                    + "settings.yml.");
-                            }
-                        }
-                        deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id");
-                    }
-                }
-
-                /*
-                 * Getting helpers
-                 */
-                try (ResultSet r = statement.executeQuery(
-                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        o = r.getString("user_uuid");
-                        user = uuids.get(o);
-                        if (user == null) {
-                            user = UUID.fromString(o);
-                            uuids.put(o, user);
-                        }
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plot.getTrusted().add(user);
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                + ") in `plot_helpers` does not exist. Create this plot or set `database-purger: true` in the settings"
-                                + ".yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id");
-                }
-
-                /*
-                 * Getting trusted
-                 */
-                try (ResultSet r = statement.executeQuery(
-                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        o = r.getString("user_uuid");
-                        user = uuids.get(o);
-                        if (user == null) {
-                            user = UUID.fromString(o);
-                            uuids.put(o, user);
-                        }
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plot.getMembers().add(user);
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                + ") in `plot_trusted` does not exist. Create this plot or set `database-purger: true` in the settings"
-                                + ".yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id");
-                }
-
-                /*
-                 * Getting denied
-                 */
-                try (ResultSet r = statement.executeQuery(
-                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        o = r.getString("user_uuid");
-                        user = uuids.get(o);
-                        if (user == null) {
-                            user = UUID.fromString(o);
-                            uuids.put(o, user);
-                        }
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plot.getDenied().add(user);
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY " + id
-                                + " in `plot_denied` does not exist. Create this plot or set `database-purger: true` in the settings.yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id");
-                }
-
-                try (ResultSet resultSet = statement
-                    .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (resultSet.next()) {
-                        id = resultSet.getInt("plot_plot_id");
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plots.remove(id);
-                            String alias = resultSet.getString("alias");
-                            if (alias != null) {
-                                plot.getSettings().setAlias(alias);
-                            }
-                            String pos = resultSet.getString("position");
-                            switch (pos.toLowerCase()) {
-                                case "":
-                                case "default":
-                                case "0,0,0":
-                                case "center":
-                                    break;
-                                default:
-                                    try {
-                                        plot.getSettings().setPosition(BlockLoc.fromString(pos));
-                                    } catch (Exception ignored) {
-                                    }
-                            }
-                            Integer m = resultSet.getInt("merged");
-                            boolean[] merged = new boolean[4];
-                            for (int i = 0; i < 4; i++) {
-                                merged[3 - i] = (m & 1 << i) != 0;
-                            }
-                            plot.getSettings().setMerged(merged);
-                            String[] flags_string;
-                            String myflags = resultSet.getString("flags");
-                            if (myflags == null || myflags.isEmpty()) {
-                                flags_string = new String[] {};
-                            } else {
-                                flags_string = myflags.split(",");
-                            }
-                            HashMap<Flag<?>, Object> flags = new HashMap<>();
-                            boolean exception = false;
-                            for (String element : flags_string) {
-                                if (element.contains(":")) {
-                                    String[] split = element.split(":");
-                                    try {
-                                        String flag_str =
-                                            split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
-                                        Flag<?> flag = FlagManager.getOrCreateFlag(split[0]);
-                                        flags.put(flag, flag.parseValue(flag_str));
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                        exception = true;
-                                    }
-                                } else {
-                                    element =
-                                        element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
-                                    if (StringMan
-                                        .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
-                                        Flag flag = FlagManager.getOrCreateFlag(element);
-                                        if (flag == null) {
-                                            flag = new StringFlag(element) {
-                                                @Override public String getValueDescription() {
-                                                    return "Generic Filler Flag";
-                                                }
-                                            };
-                                        }
-                                        flags.put(flag, flag.parseValue(""));
-                                    } else {
-                                        PlotSquared.debug("INVALID FLAG: " + element);
-                                    }
-                                }
-                            }
-                            if (exception) {
-                                PlotSquared.debug("&cPlot #" + id + "(" + plot + ") | " + plot
-                                    + " had an invalid flag. A fix has been attempted.");
-                                PlotSquared.debug("&c" + myflags);
-                                this.setFlags(plot, flags);
-                            }
-                            plot.getSettings().flags = flags;
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                + ") in `plot_settings` does not exist. Create this plot or set `database-purger: true` in the settings"
-                                + ".yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id");
-                }
-            }
-            if (!plots.entrySet().isEmpty()) {
-                createEmptySettings(new ArrayList<>(plots.keySet()), null);
-                for (Entry<Integer, Plot> entry : plots.entrySet()) {
-                    entry.getValue().getSettings();
-                }
-            }
-            boolean invalidPlot = false;
-            for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
-                String worldName = entry.getKey();
-                invalidPlot = true;
-                PlotSquared.debug("&c[WARNING] Found " + entry.getValue().intValue()
-                    + " plots in DB for non existent world; '" + worldName + "'.");
-            }
-            if (invalidPlot) {
-                PlotSquared.debug(
-                    "&c[WARNING] - Please create the world/s or remove the plots using the purge command");
-            }
-        } catch (SQLException e) {
-            PlotSquared.debug("&7[WARN] Failed to load plots.");
-            e.printStackTrace();
-        }
-        return newPlots;
-    }
-
-    @Override public void setMerged(final Plot plot, final boolean[] merged) {
-        plot.getSettings().setMerged(merged);
-        addPlotTask(plot, new UniqueStatement("setMerged") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                int hash = MainUtil.hash(merged);
-                stmt.setInt(1, hash);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void swapPlots(Plot plot1, Plot plot2) {
-        final int id1 = getId(plot1);
-        final int id2 = getId(plot2);
-        final PlotId pos1 = plot1.getId();
-        final PlotId pos2 = plot2.getId();
-        addPlotTask(plot1, new UniqueStatement("swapPlots") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos2.x);
-                stmt.setInt(2, pos2.y);
-                stmt.setInt(3, id1);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-        addPlotTask(plot2, new UniqueStatement("swapPlots") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, id2);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override public void movePlot(final Plot original, final Plot newPlot) {
-        addPlotTask(original, new UniqueStatement("movePlot") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, newPlot.getId().x);
-                stmt.setInt(2, newPlot.getId().y);
-                stmt.setString(3, newPlot.getArea().toString());
-                stmt.setInt(4, getId(original));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ?, `world` = ? WHERE `id` = ?");
-            }
-        });
-        addPlotTask(newPlot, null);
-    }
-
-    @Override public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
-        final String flag_string = FlagManager.toString(flags);
-        addPlotTask(plot, new UniqueStatement("setFlags") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void setAlias(final Plot plot, final String alias) {
-        addPlotTask(plot, new UniqueStatement("setAlias") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, alias);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Purge all plots with the following database IDs
-     */
-    @Override public void purgeIds(final Set<Integer> uniqueIds) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                if (!uniqueIds.isEmpty()) {
-                    try {
-                        ArrayList<Integer> uniqueIdsList = new ArrayList<Integer>(uniqueIds);
-                        String stmt_prefix = "";
-                        int size = uniqueIdsList.size();
-                        int packet = 990;
-                        int amount = size / packet;
-                        int count = 0;
-                        int last = -1;
-                        for (int j = 0; j <= amount; j++) {
-                            PlotSquared.debug("Purging " + (j * packet) + " / " + size);
-                            List<Integer> subList =
-                                uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                            if (subList.isEmpty()) {
-                                break;
-                            }
-                            StringBuilder idstr2 = new StringBuilder("");
-                            stmt_prefix = "";
-                            for (Integer id : subList) {
-                                idstr2.append(stmt_prefix).append(id);
-                                stmt_prefix = " OR `id` = ";
-                            }
-                            stmt_prefix = "";
-                            StringBuilder idstr = new StringBuilder();
-                            for (Integer id : subList) {
-                                idstr.append(stmt_prefix).append(id);
-                                stmt_prefix = " OR `plot_plot_id` = ";
-                            }
-                            PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                                "DELETE FROM `" + SQLManager.this.prefix
-                                    + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
-                            stmt.executeUpdate();
-                            stmt.close();
-                            stmt = SQLManager.this.connection.prepareStatement(
-                                "DELETE FROM `" + SQLManager.this.prefix
-                                    + "plot_denied` WHERE `plot_plot_id` = " + idstr);
-                            stmt.executeUpdate();
-                            stmt.close();
-                            stmt = SQLManager.this.connection.prepareStatement(
-                                "DELETE FROM `" + SQLManager.this.prefix
-                                    + "plot_settings` WHERE `plot_plot_id` = " + idstr);
-                            stmt.executeUpdate();
-                            stmt.close();
-                            stmt = SQLManager.this.connection.prepareStatement(
-                                "DELETE FROM `" + SQLManager.this.prefix
-                                    + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
-                            stmt.executeUpdate();
-                            stmt.close();
-                            stmt = SQLManager.this.connection.prepareStatement(
-                                "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
-                                    + idstr2);
-                            stmt.executeUpdate();
-                            stmt.close();
-                            commit();
-                        }
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                        PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
-                        return;
-                    }
-                }
-                PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
-            }
-        });
-    }
-
-    @Override public void purge(final PlotArea area, final Set<PlotId> plots) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
-                        + "plot` WHERE `world` = ?")) {
-                    stmt.setString(1, area.toString());
-                    Set<Integer> ids;
-                    try (ResultSet r = stmt.executeQuery()) {
-                        ids = new HashSet<>();
-                        while (r.next()) {
-                            PlotId plot_id =
-                                new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-                            if (plots.contains(plot_id)) {
-                                ids.add(r.getInt("id"));
-                            }
-                        }
-                    }
-                    purgeIds(ids);
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
-                }
-                for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
-                    PlotId plotId = iterator.next();
-                    iterator.remove();
-                    PlotId id = new PlotId(plotId.x, plotId.y);
-                    area.removePlot(id);
-                }
-            }
-        });
-    }
-
-    @Override public void setPosition(final Plot plot, final String position) {
-        addPlotTask(plot, new UniqueStatement("setPosition") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position == null ? "" : position);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void removeComment(final Plot plot, final PlotComment comment) {
-        addPlotTask(plot, new UniqueStatement("removeComment") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.getArea().toString());
-                    statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, comment.comment);
-                    statement.setString(4, comment.inbox);
-                    statement.setString(5, comment.senderName);
-                } else {
-                    statement.setString(1, comment.comment);
-                    statement.setString(2, comment.inbox);
-                    statement.setString(3, comment.senderName);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "DELETE FROM `" + SQLManager.this.prefix
-                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
-            }
-        });
-    }
-
-    @Override public void clearInbox(final Plot plot, final String inbox) {
-        addPlotTask(plot, new UniqueStatement("clearInbox") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.getArea().toString());
-                    statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, inbox);
-                } else {
-                    statement.setString(1, inbox);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "DELETE FROM `" + SQLManager.this.prefix
-                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
-            }
-        });
-    }
-
-    @Override public void getComments(final Plot plot, final String inbox,
-        final RunnableVal<List<PlotComment>> whenDone) {
-        addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.getArea().toString());
-                    statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, inbox);
-                } else {
-                    statement.setString(1, inbox);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "SELECT * FROM `" + SQLManager.this.prefix
-                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement(
-                    "SELECT * FROM `" + SQLManager.this.prefix
-                        + "plot_comments` WHERE `inbox` = ?");
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                ArrayList<PlotComment> comments = new ArrayList<>();
-                try (ResultSet set = statement.executeQuery()) {
-                    while (set.next()) {
-                        String sender = set.getString("sender");
-                        String world = set.getString("world");
-                        int hash = set.getInt("hashcode");
-                        PlotId id;
-                        if (hash != 0) {
-                            id = PlotId.unpair(hash);
-                        } else {
-                            id = null;
-                        }
-                        String msg = set.getString("comment");
-                        long timestamp = set.getInt("timestamp") * 1000;
-                        PlotComment comment =
-                            new PlotComment(world, id, msg, sender, inbox, timestamp);
-                        comments.add(comment);
-                        whenDone.value = comments;
-                    }
-                }
-                TaskManager.runTask(whenDone);
-            }
-        });
-    }
-
-    @Override public void setComment(final Plot plot, final PlotComment comment) {
-        addPlotTask(plot, new UniqueStatement("setComment") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, plot.getArea().toString());
-                statement.setInt(2, plot.getId().hashCode());
-                statement.setString(3, comment.comment);
-                statement.setString(4, comment.inbox);
-                statement.setInt(5, (int) (comment.timestamp / 1000));
-                statement.setString(6, comment.senderName);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
-            }
-        });
-    }
-
-    @Override public void removeTrusted(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeTrusted") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void removeMember(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeMember") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setTrusted(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setTrusted") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public void setMember(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setMember") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public void removeDenied(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeDenied") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setDenied(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setDenied") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public HashMap<UUID, Integer> getRatings(Plot plot) {
-        HashMap<UUID, Integer> map = new HashMap<>();
-        try (PreparedStatement statement = this.connection.prepareStatement(
-            "SELECT `rating`, `player` FROM `" + this.prefix
-                + "plot_rating` WHERE `plot_plot_id` = ? ")) {
-            statement.setInt(1, getId(plot));
-            try (ResultSet resultSet = statement.executeQuery()) {
-                while (resultSet.next()) {
-                    UUID uuid = UUID.fromString(resultSet.getString("player"));
-                    int rating = resultSet.getInt("rating");
-                    map.put(uuid, rating);
-                }
-            }
-        } catch (SQLException e) {
-            PlotSquared
-                .debug("&7[WARN] Failed to fetch rating for plot " + plot.getId().toString());
-            e.printStackTrace();
-        }
-        return map;
-    }
-
-    @Override public void setRating(final Plot plot, final UUID rater, final int value) {
-        addPlotTask(plot, new UniqueStatement("setRating") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setInt(2, value);
-                statement.setString(3, rater.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
-            }
-        });
-    }
-
-    @Override public void delete(PlotCluster cluster) {
-        final int id = getClusterId(cluster);
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_settings` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_helpers` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_invited` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
-        final boolean replace) {
-        addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                if (replace) {
-                    stmt.setBytes(1, meta);
-                    stmt.setString(2, uuid.toString());
-                    stmt.setString(3, key);
-                } else {
-                    stmt.setString(1, uuid.toString());
-                    stmt.setString(2, key);
-                    stmt.setBytes(3, meta);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (replace) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "player_meta` SET `value` = ? WHERE `uuid` = ? AND `key` = ?");
-                } else {
-                    return SQLManager.this.connection.prepareStatement(
-                        "INSERT INTO `" + SQLManager.this.prefix
-                            + "player_meta`(`uuid`, `key`, `value`) VALUES(?, ? ,?)");
-                }
-            }
-        });
-    }
-
-    @Override public void removePersistentMeta(final UUID uuid, final String key) {
-        addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, uuid.toString());
-                stmt.setString(2, key);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "player_meta` WHERE `uuid` = ? AND `key` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
-        addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "SELECT * FROM `" + SQLManager.this.prefix
-                        + "player_meta` WHERE `uuid` = ? ORDER BY `meta_id` ASC");
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                ResultSet resultSet = statement.executeQuery();
-
-                final Map<String, byte[]> metaMap = new HashMap<>();
-
-                while (resultSet.next()) {
-                    String key = resultSet.getString("key");
-                    byte[] bytes = resultSet.getBytes("value");
-                    metaMap.put(key, bytes);
-                }
-
-                resultSet.close();
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        result.run(metaMap);
-                    }
-                });
-            }
-
-        });
-    }
-
-    @Override public HashMap<String, Set<PlotCluster>> getClusters() {
-        LinkedHashMap<String, Set<PlotCluster>> newClusters = new LinkedHashMap<>();
-        HashMap<Integer, PlotCluster> clusters = new HashMap<>();
-        try {
-            HashSet<String> areas = new HashSet<>();
-            if (PlotSquared.get().worlds.contains("worlds")) {
-                ConfigurationSection worldSection =
-                    PlotSquared.get().worlds.getConfigurationSection("worlds");
-                if (worldSection != null) {
-                    for (String worldKey : worldSection.getKeys(false)) {
-                        areas.add(worldKey);
-                        ConfigurationSection areaSection =
-                            worldSection.getConfigurationSection(worldKey + ".areas");
-                        if (areaSection != null) {
-                            for (String areaKey : areaSection.getKeys(false)) {
-                                String[] split = areaKey.split("(?<![;])-");
-                                if (split.length == 3) {
-                                    areas.add(worldKey + ';' + split[0]);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            HashMap<String, UUID> uuids = new HashMap<>();
-            HashMap<String, Integer> noExist = new HashMap<>();
-            /*
-             * Getting clusters
-             */
-            try (Statement stmt = this.connection.createStatement()) {
-                ResultSet resultSet =
-                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
-                PlotCluster cluster;
-                String owner;
-                UUID user;
-                int id;
-                while (resultSet.next()) {
-                    PlotId pos1 =
-                        new PlotId(resultSet.getInt("pos1_x"), resultSet.getInt("pos1_z"));
-                    PlotId pos2 =
-                        new PlotId(resultSet.getInt("pos2_x"), resultSet.getInt("pos2_z"));
-                    id = resultSet.getInt("id");
-                    String areaid = resultSet.getString("world");
-                    if (!areas.contains(areaid)) {
-                        if (noExist.containsKey(areaid)) {
-                            noExist.put(areaid, noExist.get(areaid) + 1);
-                        } else {
-                            noExist.put(areaid, 1);
-                        }
-                    }
-                    owner = resultSet.getString("owner");
-                    user = uuids.get(owner);
-                    if (user == null) {
-                        user = UUID.fromString(owner);
-                        uuids.put(owner, user);
-                    }
-                    cluster = new PlotCluster(null, pos1, pos2, user, id);
-                    clusters.put(id, cluster);
-                    Set<PlotCluster> set = newClusters.get(areaid);
-                    if (set == null) {
-                        set = new HashSet<>();
-                        newClusters.put(areaid, set);
-                    }
-                    set.add(cluster);
-                }
-                //Getting helpers
-                resultSet = stmt.executeQuery(
-                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
-                while (resultSet.next()) {
-                    id = resultSet.getInt("cluster_id");
-                    owner = resultSet.getString("user_uuid");
-                    user = uuids.get(owner);
-                    if (user == null) {
-                        user = UUID.fromString(owner);
-                        uuids.put(owner, user);
-                    }
-                    cluster = clusters.get(id);
-                    if (cluster != null) {
-                        cluster.helpers.add(user);
-                    } else {
-                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                            + ") in cluster_helpers does not exist. Please create the cluster or remove this entry.");
-                    }
-                }
-                // Getting invited
-                resultSet = stmt.executeQuery(
-                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
-                while (resultSet.next()) {
-                    id = resultSet.getInt("cluster_id");
-                    owner = resultSet.getString("user_uuid");
-                    user = uuids.get(owner);
-                    if (user == null) {
-                        user = UUID.fromString(owner);
-                        uuids.put(owner, user);
-                    }
-                    cluster = clusters.get(id);
-                    if (cluster != null) {
-                        cluster.invited.add(user);
-                    } else {
-                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                            + ") in cluster_invited does not exist. Please create the cluster or remove this entry.");
-                    }
-                }
-                resultSet =
-                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
-                while (resultSet.next()) {
-                    id = resultSet.getInt("cluster_id");
-                    cluster = clusters.get(id);
-                    if (cluster != null) {
-                        String alias = resultSet.getString("alias");
-                        if (alias != null) {
-                            cluster.settings.setAlias(alias);
-                        }
-                        String pos = resultSet.getString("position");
-                        switch (pos.toLowerCase()) {
-                            case "":
-                            case "default":
-                            case "0,0,0":
-                            case "center":
-                                break;
-                            default:
-                                try {
-                                    BlockLoc loc = BlockLoc.fromString(pos);
-                                    cluster.settings.setPosition(loc);
-                                } catch (Exception ignored) {
-                                }
-                        }
-                        Integer m = resultSet.getInt("merged");
-                        boolean[] merged = new boolean[4];
-                        for (int i = 0; i < 4; i++) {
-                            merged[3 - i] = (m & 1 << i) != 0;
-                        }
-                        cluster.settings.setMerged(merged);
-                        String[] flags_string;
-                        String myflags = resultSet.getString("flags");
-                        if (myflags == null || myflags.isEmpty()) {
-                            flags_string = new String[] {};
-                        } else {
-                            flags_string = myflags.split(",");
-                        }
-                        HashMap<Flag<?>, Object> flags = new HashMap<>();
-                        for (String element : flags_string) {
-                            if (element.contains(":")) {
-                                String[] split = element.split(":");
-                                String flag_str =
-                                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
-                                Flag flag = FlagManager.getOrCreateFlag(split[0]);
-                                if (flag == null) {
-                                    flag = new StringFlag(split[0]) {
-                                        @Override public String getValueDescription() {
-                                            return "Generic Filler Flag";
-                                        }
-                                    };
-                                }
-                                flags.put(flag, flag.parseValue(flag_str));
-                            } else {
-                                Flag flag = FlagManager.getOrCreateFlag(element);
-                                if (flag == null) {
-                                    flag = new StringFlag(element) {
-                                        @Override public String getValueDescription() {
-                                            return "Generic Filler Flag";
-                                        }
-                                    };
-                                }
-                                flags.put(flag, flag.parseValue(""));
-                            }
-                        }
-                        cluster.settings.flags = flags;
-                    } else {
-                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                            + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
-                    }
-                }
-                resultSet.close();
-            }
-            boolean invalidPlot = false;
-            for (Entry<String, Integer> entry : noExist.entrySet()) {
-                String a = entry.getKey();
-                invalidPlot = true;
-                PlotSquared.debug("&c[WARNING] Found " + noExist.get(a)
-                    + " clusters in DB for non existent area; '" + a + "'.");
-            }
-            if (invalidPlot) {
-                PlotSquared.debug(
-                    "&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
-            }
-        } catch (SQLException e) {
-            PlotSquared.debug("&7[WARN] Failed to load clusters.");
-            e.printStackTrace();
-        }
-        return newClusters;
-    }
-
-    @Override public void setFlags(final PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
-        final StringBuilder flag_string = new StringBuilder();
-        int i = 0;
-        for (Entry<Flag<?>, Object> flag : flags.entrySet()) {
-            if (i != 0) {
-                flag_string.append(',');
-            }
-            flag_string.append(flag.getKey().getName()).append(':').append(
-                flag.getKey().valueToString(flag.getValue()).replaceAll(":", "\u00AF")
-                    .replaceAll(",", "´"));
-            i++;
-        }
-        addClusterTask(cluster, new UniqueStatement("setFlags") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string.toString());
-                stmt.setInt(2, getClusterId(cluster));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster_settings` SET `flags` = ? WHERE `cluster_id` = ?");
-            }
-        });
-    }
-
-    @Override public void setClusterName(final PlotCluster cluster, final String name) {
-        addClusterTask(cluster, new UniqueStatement("setClusterName") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, name);
-                stmt.setInt(2, getClusterId(cluster));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
-            }
-        });
-        cluster.settings.setAlias(name);
-    }
-
-    @Override public void removeHelper(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("removeHelper") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setHelper(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("setHelper") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public void createCluster(final PlotCluster cluster) {
-        addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, cluster.getP1().x);
-                stmt.setInt(2, cluster.getP1().y);
-                stmt.setInt(3, cluster.getP2().x);
-                stmt.setInt(4, cluster.getP2().y);
-                stmt.setString(5, cluster.owner.toString());
-                stmt.setString(6, cluster.area.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER,
-                    Statement.RETURN_GENERATED_KEYS);
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
-                    if (keys.next()) {
-                        cluster.temp = keys.getInt(1);
-                    }
-                }
-            }
-        });
-        addClusterTask(cluster,
-            new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
-                @Override public void set(PreparedStatement stmt) throws SQLException {
-                    stmt.setInt(1, getClusterId(cluster));
-                    stmt.setString(2, cluster.settings.getAlias());
-                }
-
-                @Override public PreparedStatement get() throws SQLException {
-                    return SQLManager.this.connection.prepareStatement(
-                        "INSERT INTO `" + SQLManager.this.prefix
-                            + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?)");
-                }
-            });
-    }
-
-    @Override public void resizeCluster(final PlotCluster current, PlotId min, PlotId max) {
-        final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
-        final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
-        current.setP1(min);
-        current.setP2(max);
-
-        addClusterTask(current, new UniqueStatement("resizeCluster") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, pos2.x);
-                stmt.setInt(4, pos2.y);
-                stmt.setInt(5, getClusterId(current));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override public void setPosition(final PlotCluster cluster, final String position) {
-        addClusterTask(cluster, new UniqueStatement("setPosition") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position);
-                stmt.setInt(2, getClusterId(cluster));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
-            }
-        });
-    }
-
-    @Override public void removeInvited(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("removeInvited") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setInvited(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("setInvited") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public boolean deleteTables() {
-        try (Statement stmt = this.connection.createStatement();
-            PreparedStatement statement = this.connection
-                .prepareStatement("DROP TABLE `" + this.prefix + "plot`")) {
-            close();
-            this.closed = false;
-            SQLManager.this.connection = this.database.forceConnection();
-            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_invited`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_helpers`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_rating`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_settings`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_trusted`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_helpers`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_denied`");
-            stmt.executeBatch();
-            stmt.clearBatch();
-            statement.executeUpdate();
-        } catch (ClassNotFoundException | SQLException e) {
-            e.printStackTrace();
-
-        }
+        commit();
         return true;
-    }
-
-    @Override public void validateAllPlots(Set<Plot> toValidate) {
-        if (!isValid()) {
-            reconnect();
+      }
+      int count = -1;
+      if (!this.plotTasks.isEmpty()) {
+        count = 0;
+        if (this.connection.getAutoCommit()) {
+          this.connection.setAutoCommit(false);
         }
-        PlotSquared.debug(
-            "$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
-        commit();
-        while (true) {
-            if (!sendBatch()) {
-                break;
+        String method = null;
+        PreparedStatement statement = null;
+        UniqueStatement task = null;
+        UniqueStatement lastTask = null;
+        Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
+            this.plotTasks.entrySet().iterator();
+        while (iter.hasNext()) {
+          try {
+            Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
+            Plot plot = entry.getKey();
+            Queue<UniqueStatement> tasks = entry.getValue();
+            if (tasks.isEmpty()) {
+              iter.remove();
+              continue;
             }
-        }
-        try {
-            if (this.connection.getAutoCommit()) {
-                this.connection.setAutoCommit(false);
+            task = tasks.remove();
+            count++;
+            if (task != null) {
+              if (task.method == null || !task.method.equals(method) || statement == null) {
+                if (statement != null) {
+                  lastTask.execute(statement);
+                  statement.close();
+                }
+                method = task.method;
+                statement = task.get();
+              }
+              task.set(statement);
+              task.addBatch(statement);
+              try {
+                if (statement.isClosed()) {
+                  statement = null;
+                }
+              } catch (AbstractMethodError ignore) {
+              }
             }
-        } catch (SQLException e) {
+            lastTask = task;
+          } catch (Throwable e) {
+            PlotSquared.debug("============ DATABASE ERROR ============");
+            PlotSquared.debug("There was an error updating the database.");
+            PlotSquared.debug(" - It will be corrected on shutdown");
+            PlotSquared.debug("========================================");
             e.printStackTrace();
+            PlotSquared.debug("========================================");
+          }
         }
-        HashMap<String, HashMap<PlotId, Plot>> database = getPlots();
-        ArrayList<Plot> toCreate = new ArrayList<>();
-        for (Plot plot : toValidate) {
-            if (plot.temp == -1) {
-                continue;
-            }
-            HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
-            if (worldPlots == null) {
-                PlotSquared.debug("&8 - &7Creating plot (1): " + plot);
-                toCreate.add(plot);
-                continue;
-            }
-            Plot dataPlot = worldPlots.remove(plot.getId());
-            if (dataPlot == null) {
-                PlotSquared.debug("&8 - &7Creating plot (2): " + plot);
-                toCreate.add(plot);
-                continue;
-            }
-            // owner
-            if (!plot.owner.equals(dataPlot.owner)) {
-                PlotSquared
-                    .debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
-                setOwner(plot, plot.owner);
-            }
-            // trusted
-            if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
-                toRemove.removeAll(plot.getTrusted());
-                toAdd.removeAll(dataPlot.getTrusted());
-                PlotSquared.debug(
-                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: "
-                        + plot);
-                if (!toRemove.isEmpty()) {
-                    for (UUID uuid : toRemove) {
-                        removeTrusted(plot, uuid);
-                    }
-                }
-                if (!toAdd.isEmpty()) {
-                    for (UUID uuid : toAdd) {
-                        setTrusted(plot, uuid);
-                    }
-                }
-            }
-            if (!plot.getMembers().equals(dataPlot.getMembers())) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
-                toRemove.removeAll(plot.getMembers());
-                toAdd.removeAll(dataPlot.getMembers());
-                PlotSquared.debug(
-                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: "
-                        + plot);
-                if (!toRemove.isEmpty()) {
-                    for (UUID uuid : toRemove) {
-                        removeMember(plot, uuid);
-                    }
-                }
-                if (!toAdd.isEmpty()) {
-                    for (UUID uuid : toAdd) {
-                        setMember(plot, uuid);
-                    }
-                }
-            }
-            if (!plot.getDenied().equals(dataPlot.getDenied())) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
-                toRemove.removeAll(plot.getDenied());
-                toAdd.removeAll(dataPlot.getDenied());
-                PlotSquared.debug(
-                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: "
-                        + plot);
-                if (!toRemove.isEmpty()) {
-                    for (UUID uuid : toRemove) {
-                        removeDenied(plot, uuid);
-                    }
-                }
-                if (!toAdd.isEmpty()) {
-                    for (UUID uuid : toAdd) {
-                        setDenied(plot, uuid);
-                    }
-                }
-            }
-            boolean[] pm = plot.getMerged();
-            boolean[] dm = dataPlot.getMerged();
-            if (pm[0] != dm[0] || pm[1] != dm[1]) {
-                PlotSquared.debug("&8 - &7Correcting merge for: " + plot);
-                setMerged(dataPlot, plot.getMerged());
-            }
-            HashMap<Flag<?>, Object> pf = plot.getFlags();
-            HashMap<Flag<?>, Object> df = dataPlot.getFlags();
-            if (!pf.isEmpty() && !df.isEmpty()) {
-                if (pf.size() != df.size() || !StringMan
-                    .isEqual(StringMan.joinOrdered(pf.values(), ","),
-                        StringMan.joinOrdered(df.values(), ","))) {
-                    PlotSquared.debug("&8 - &7Correcting flags for: " + plot);
-                    setFlags(plot, pf);
-                }
-            }
+        if (statement != null && task != null) {
+          task.execute(statement);
+          statement.close();
         }
-
-        for (Entry<String, HashMap<PlotId, Plot>> entry : database.entrySet()) {
-            HashMap<PlotId, Plot> map = entry.getValue();
-            if (!map.isEmpty()) {
-                for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
-                    PlotSquared.debug("$1Plot was deleted: " + entry2.getValue().toString()
-                        + "// TODO implement this when sure safe");
-                }
-            }
+      }
+      if (!this.playerTasks.isEmpty()) {
+        count = 0;
+        if (this.connection.getAutoCommit()) {
+          this.connection.setAutoCommit(false);
         }
-        commit();
-    }
-
-    @Override
-    public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
-        final PlotId max) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                if (min == null) {
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "plot` SET `world` = ? WHERE `world` = ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "cluster` SET `world` = ? WHERE `world` = ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.setInt(3, min.x);
-                        stmt.setInt(4, max.x);
-                        stmt.setInt(5, min.y);
-                        stmt.setInt(6, max.y);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.setInt(3, max.x);
-                        stmt.setInt(4, max.y);
-                        stmt.setInt(5, min.x);
-                        stmt.setInt(6, min.y);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                }
+        String method = null;
+        PreparedStatement statement = null;
+        UniqueStatement task = null;
+        UniqueStatement lastTask = null;
+        for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
+          try {
+            UUID uuid = entry.getKey();
+            if (this.playerTasks.get(uuid).isEmpty()) {
+              this.playerTasks.remove(uuid);
+              continue;
             }
-        });
-    }
-
-    @Override public void replaceUUID(final UUID old, final UUID now) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                try (Statement stmt = SQLManager.this.connection.createStatement()) {
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
-                            .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
-                            .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                } catch (SQLException e) {
-                    e.printStackTrace();
+            task = this.playerTasks.get(uuid).remove();
+            count++;
+            if (task != null) {
+              if (task.method == null || !task.method.equals(method)) {
+                if (statement != null) {
+                  lastTask.execute(statement);
+                  statement.close();
                 }
+                method = task.method;
+                statement = task.get();
+              }
+              task.set(statement);
+              task.addBatch(statement);
             }
-        });
-    }
-
-    @Override public void close() {
-        try {
-            this.closed = true;
-            this.connection.close();
-        } catch (SQLException e) {
+            lastTask = task;
+          } catch (Throwable e) {
+            PlotSquared.debug("============ DATABASE ERROR ============");
+            PlotSquared.debug("There was an error updating the database.");
+            PlotSquared.debug(" - It will be corrected on shutdown");
+            PlotSquared.debug("========================================");
             e.printStackTrace();
+            PlotSquared.debug("========================================");
+          }
         }
+        if (statement != null && task != null) {
+          task.execute(statement);
+          statement.close();
+        }
+      }
+      if (!this.clusterTasks.isEmpty()) {
+        count = 0;
+        if (this.connection.getAutoCommit()) {
+          this.connection.setAutoCommit(false);
+        }
+        String method = null;
+        PreparedStatement statement = null;
+        UniqueStatement task = null;
+        UniqueStatement lastTask = null;
+        for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks
+            .entrySet()) {
+          try {
+            PlotCluster cluster = entry.getKey();
+            if (this.clusterTasks.get(cluster).isEmpty()) {
+              this.clusterTasks.remove(cluster);
+              continue;
+            }
+            task = this.clusterTasks.get(cluster).remove();
+            count++;
+            if (task != null) {
+              if (task.method == null || !task.method.equals(method)) {
+                if (statement != null) {
+                  lastTask.execute(statement);
+                  statement.close();
+                }
+                method = task.method;
+                statement = task.get();
+              }
+              task.set(statement);
+              task.addBatch(statement);
+            }
+            lastTask = task;
+          } catch (Throwable e) {
+            PlotSquared.debug("============ DATABASE ERROR ============");
+            PlotSquared.debug("There was an error updating the database.");
+            PlotSquared.debug(" - It will be corrected on shutdown");
+            PlotSquared.debug("========================================");
+            e.printStackTrace();
+            PlotSquared.debug("========================================");
+          }
+        }
+        if (statement != null && task != null) {
+          task.execute(statement);
+          statement.close();
+        }
+      }
+      if (count > 0) {
+        commit();
+        return true;
+      }
+      if (count != -1) {
+        if (!this.connection.getAutoCommit()) {
+          this.connection.setAutoCommit(true);
+        }
+      }
+      if (!this.clusterTasks.isEmpty()) {
+        this.clusterTasks.clear();
+      }
+      if (!this.plotTasks.isEmpty()) {
+        this.plotTasks.clear();
+      }
+    } catch (Throwable e) {
+      PlotSquared.debug("============ DATABASE ERROR ============");
+      PlotSquared.debug("There was an error updating the database.");
+      PlotSquared.debug(" - It will be corrected on shutdown");
+      PlotSquared.debug("========================================");
+      e.printStackTrace();
+      PlotSquared.debug("========================================");
     }
+    return false;
+  }
 
-    public abstract class UniqueStatement {
+  public Connection getConnection() {
+    return this.connection;
+  }
 
-        public final String method;
+  /**
+   * Set Plot owner
+   *
+   * @param plot Plot Object
+   * @param uuid Owner UUID
+   */
+  @Override
+  public void setOwner(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("setOwner") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setString(1, uuid.toString());
+        statement.setInt(2, plot.getId().x);
+        statement.setInt(3, plot.getId().y);
+        statement.setString(4, plot.getArea().toString());
+      }
 
-        public UniqueStatement(String method) {
-            this.method = method;
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
+      }
+    });
+  }
+
+  @Override
+  public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
+    addGlobalTask(() -> {
+      try {
+        // Create the plots
+        createPlots(myList, () -> {
+          try {
+            // Creating datastructures
+            HashMap<PlotId, Plot> plotMap = new HashMap<>();
+            for (Plot plot : myList) {
+              plotMap.put(plot.getId(), plot);
+            }
+            ArrayList<SettingsPair> settings = new ArrayList<>();
+            final ArrayList<UUIDPair> helpers = new ArrayList<>();
+            final ArrayList<UUIDPair> trusted = new ArrayList<>();
+            final ArrayList<UUIDPair> denied = new ArrayList<>();
+
+            // Populating structures
+            try (PreparedStatement stmt = SQLManager.this.connection
+                .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
+                ResultSet result = stmt.executeQuery()) {
+              while (result.next()) {
+                int id = result.getInt("id");
+                int x = result.getInt("plot_id_x");
+                int y = result.getInt("plot_id_z");
+                PlotId plotId = new PlotId(x, y);
+                Plot plot = plotMap.get(plotId);
+                if (plot != null) {
+                  settings.add(new SettingsPair(id, plot.getSettings()));
+                  for (UUID uuid : plot.getDenied()) {
+                    denied.add(new UUIDPair(id, uuid));
+                  }
+                  for (UUID uuid : plot.getMembers()) {
+                    trusted.add(new UUIDPair(id, uuid));
+                  }
+                  for (UUID uuid : plot.getTrusted()) {
+                    helpers.add(new UUIDPair(id, uuid));
+                  }
+                }
+              }
+            }
+            createSettings(settings, () -> createTiers(helpers, "helpers",
+                () -> createTiers(trusted, "trusted",
+                    () -> createTiers(denied, "denied",
+                        () -> {
+                          try {
+                            SQLManager.this.connection.commit();
+                          } catch (SQLException e) {
+                            e.printStackTrace();
+                          }
+                          if (whenDone != null) {
+                            whenDone.run();
+                          }
+                        }))));
+          } catch (SQLException e) {
+            e.printStackTrace();
+            PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+            try {
+              SQLManager.this.connection.commit();
+            } catch (SQLException e1) {
+              e1.printStackTrace();
+            }
+          }
+        });
+      } catch (Exception e) {
+        e.printStackTrace();
+        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+        try {
+          SQLManager.this.connection.commit();
+        } catch (SQLException e1) {
+          e1.printStackTrace();
         }
+      }
+    });
+  }
 
-        public void addBatch(PreparedStatement statement) throws SQLException {
-            statement.addBatch();
+  /**
+   * Create a plot
+   *
+   * @param myList list of plots to be created
+   */
+  public void createTiers(ArrayList<UUIDPair> myList, final String tier, Runnable whenDone) {
+    StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
+      @Override
+      public String getCreateMySQL(int size) {
+        return getCreateMySQL(size, SQLManager.this.CREATE_TIERS.replaceAll("%tier%", tier),
+            2);
+      }
+
+      @Override
+      public String getCreateSQLite(int size) {
+        return getCreateSQLite(size,
+            "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
+                + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
+      }
+
+      @Override
+      public String getCreateSQL() {
+        return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
+            + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
+      }
+
+      @Override
+      public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair)
+          throws SQLException {
+        stmt.setInt(i * 2 + 1, pair.id);
+        stmt.setString(i * 2 + 2, pair.uuid.toString());
+      }
+
+      @Override
+      public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair)
+          throws SQLException {
+        stmt.setInt(i * 2 + 1, pair.id);
+        stmt.setString(i * 2 + 2, pair.uuid.toString());
+      }
+
+      @Override
+      public void setSQL(PreparedStatement stmt, UUIDPair pair)
+          throws SQLException {
+        stmt.setInt(1, pair.id);
+        stmt.setString(2, pair.uuid.toString());
+      }
+    };
+    setBulk(myList, mod, whenDone);
+  }
+
+  /**
+   * Create a plot
+   *
+   * @param myList list of plots to be created
+   */
+  public void createPlots(List<Plot> myList, Runnable whenDone) {
+    StmtMod<Plot> mod = new StmtMod<Plot>() {
+      @Override
+      public String getCreateMySQL(int size) {
+        return getCreateMySQL(size, SQLManager.this.CREATE_PLOTS, 5);
+      }
+
+      @Override
+      public String getCreateSQLite(int size) {
+        return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ",
+            6);
+      }
+
+      @Override
+      public String getCreateSQL() {
+        return SQLManager.this.CREATE_PLOT;
+      }
+
+      @Override
+      public void setMySQL(PreparedStatement stmt, int i, Plot plot)
+          throws SQLException {
+        stmt.setInt(i * 5 + 1, plot.getId().x);
+        stmt.setInt(i * 5 + 2, plot.getId().y);
+        try {
+          stmt.setString(i * 5 + 3, plot.owner.toString());
+        } catch (SQLException ignored) {
+          stmt.setString(i * 5 + 3, everyone.toString());
         }
+        stmt.setString(i * 5 + 4, plot.getArea().toString());
+        stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
+      }
 
-        public void execute(PreparedStatement statement) throws SQLException {
+      @Override
+      public void setSQLite(PreparedStatement stmt, int i, Plot plot)
+          throws SQLException {
+        stmt.setNull(i * 6 + 1, 4);
+        stmt.setInt(i * 6 + 2, plot.getId().x);
+        stmt.setInt(i * 6 + 3, plot.getId().y);
+        try {
+          stmt.setString(i * 6 + 4, plot.owner.toString());
+        } catch (SQLException ignored) {
+          stmt.setString(i * 6 + 4, everyone.toString());
+        }
+        stmt.setString(i * 6 + 5, plot.getArea().toString());
+        stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
+      }
+
+      @Override
+      public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
+        stmt.setInt(1, plot.getId().x);
+        stmt.setInt(2, plot.getId().y);
+        stmt.setString(3, plot.owner.toString());
+        stmt.setString(4, plot.getArea().toString());
+        stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+
+      }
+    };
+    setBulk(myList, mod, whenDone);
+  }
+
+  public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
+    int size = objList.size();
+    if (size == 0) {
+      if (whenDone != null) {
+        whenDone.run();
+      }
+      return;
+    }
+    int packet;
+    if (this.mySQL) {
+      packet = Math.min(size, 5000);
+    } else {
+      packet = Math.min(size, 50);
+    }
+    int amount = size / packet;
+    try {
+      int count = 0;
+      PreparedStatement preparedStmt = null;
+      int last = -1;
+      for (int j = 0; j <= amount; j++) {
+        List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+        if (subList.isEmpty()) {
+          break;
+        }
+        String statement;
+        if (last == -1) {
+          last = subList.size();
+          statement = mod.getCreateMySQL(subList.size());
+          preparedStmt = this.connection.prepareStatement(statement);
+        }
+        if (subList.size() != last || count % 5000 == 0 && count > 0) {
+          preparedStmt.executeBatch();
+          preparedStmt.close();
+          statement = mod.getCreateMySQL(subList.size());
+          preparedStmt = this.connection.prepareStatement(statement);
+        }
+        for (int i = 0; i < subList.size(); i++) {
+          count++;
+          T obj = subList.get(i);
+          mod.setMySQL(preparedStmt, i, obj);
+        }
+        last = subList.size();
+        preparedStmt.addBatch();
+      }
+      PlotSquared.debug(
+          "&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+      preparedStmt.executeBatch();
+      preparedStmt.clearParameters();
+      preparedStmt.close();
+      if (whenDone != null) {
+        whenDone.run();
+      }
+      return;
+    } catch (SQLException e) {
+      if (this.mySQL) {
+        e.printStackTrace();
+        PlotSquared.debug("&cERROR 1:  | " + objList.get(0).getClass().getCanonicalName());
+      }
+    }
+    try {
+      int count = 0;
+      PreparedStatement preparedStmt = null;
+      int last = -1;
+      for (int j = 0; j <= amount; j++) {
+        List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+        if (subList.isEmpty()) {
+          break;
+        }
+        String statement;
+        if (last == -1) {
+          last = subList.size();
+          statement = mod.getCreateSQLite(subList.size());
+          preparedStmt = this.connection.prepareStatement(statement);
+        }
+        if (subList.size() != last || count % 5000 == 0 && count > 0) {
+          preparedStmt.executeBatch();
+          preparedStmt.clearParameters();
+          statement = mod.getCreateSQLite(subList.size());
+          preparedStmt = this.connection.prepareStatement(statement);
+        }
+        for (int i = 0; i < subList.size(); i++) {
+          count++;
+          T obj = subList.get(i);
+          mod.setSQLite(preparedStmt, i, obj);
+        }
+        last = subList.size();
+        preparedStmt.addBatch();
+      }
+      PlotSquared.debug(
+          "&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+      preparedStmt.executeBatch();
+      preparedStmt.clearParameters();
+      preparedStmt.close();
+    } catch (SQLException e) {
+      e.printStackTrace();
+      PlotSquared.debug("&cERROR 2:  | " + objList.get(0).getClass().getCanonicalName());
+      PlotSquared.debug("&6[WARN] Could not bulk save!");
+      try (PreparedStatement preparedStmt = this.connection
+          .prepareStatement(mod.getCreateSQL())) {
+        for (T obj : objList) {
+          mod.setSQL(preparedStmt, obj);
+          preparedStmt.addBatch();
+        }
+        PlotSquared.debug("&aBatch 3");
+        preparedStmt.executeBatch();
+      } catch (SQLException e3) {
+        e3.printStackTrace();
+        PlotSquared.debug("&c[ERROR] Failed to save all!");
+      }
+    }
+    if (whenDone != null) {
+      whenDone.run();
+    }
+  }
+
+  public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
+    final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
+      @Override
+      public String getCreateMySQL(int size) {
+        return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
+            + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
+            + "`position`) VALUES ", 10);
+      }
+
+      @Override
+      public String getCreateSQLite(int size) {
+        return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
+                + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
+            10);
+      }
+
+      @Override
+      public String getCreateSQL() {
+        return "INSERT INTO `" + SQLManager.this.prefix
+            + "plot_settings`(`plot_plot_id`) VALUES(?)";
+      }
+
+      @Override
+      public void setMySQL(PreparedStatement statement, int i, SettingsPair pair)
+          throws SQLException {
+        statement.setInt(i * 10 + 1, pair.id); // id
+        statement.setNull(i * 10 + 2, 4); // biome
+        statement.setNull(i * 10 + 3, 4); // rain
+        statement.setNull(i * 10 + 4, 4); // custom_time
+        statement.setNull(i * 10 + 5, 4); // time
+        statement.setNull(i * 10 + 6, 4); // deny_entry
+        if (pair.settings.getAlias().isEmpty()) {
+          statement.setNull(i * 10 + 7, 4);
+        } else {
+          statement.setString(i * 10 + 7, pair.settings.getAlias());
+        }
+        StringBuilder flag_string = new StringBuilder();
+        int k = 0;
+        for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
+          if (k != 0) {
+            flag_string.append(',');
+          }
+          flag_string.append(flag.getKey().getName()).append(':').append(
+              flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
+                  .replaceAll(",", "´"));
+          k++;
+        }
+        statement.setString(i * 10 + 8, flag_string.toString());
+        boolean[] merged = pair.settings.getMerged();
+        int hash = MainUtil.hash(merged);
+        statement.setInt(i * 10 + 9, hash);
+        BlockLoc loc = pair.settings.getPosition();
+        String position;
+        if (loc.y == 0) {
+          position = "DEFAULT";
+        } else {
+          position = loc.x + "," + loc.y + ',' + loc.z;
+        }
+        statement.setString(i * 10 + 10, position);
+      }
+
+      @Override
+      public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair)
+          throws SQLException {
+        stmt.setInt(i * 10 + 1, pair.id); // id
+        stmt.setNull(i * 10 + 2, 4); // biome
+        stmt.setNull(i * 10 + 3, 4); // rain
+        stmt.setNull(i * 10 + 4, 4); // custom_time
+        stmt.setNull(i * 10 + 5, 4); // time
+        stmt.setNull(i * 10 + 6, 4); // deny_entry
+        if (pair.settings.getAlias().isEmpty()) {
+          stmt.setNull(i * 10 + 7, 4);
+        } else {
+          stmt.setString(i * 10 + 7, pair.settings.getAlias());
+        }
+        StringBuilder flag_string = new StringBuilder();
+        int k = 0;
+        for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
+          if (k != 0) {
+            flag_string.append(',');
+          }
+          flag_string.append(flag.getKey().getName()).append(':').append(
+              flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
+                  .replaceAll(",", "´"));
+          k++;
+        }
+        stmt.setString(i * 10 + 8, flag_string.toString());
+        boolean[] merged = pair.settings.getMerged();
+        int n = 0;
+        for (int j = 0; j < 4; ++j) {
+          n = (n << 1) + (merged[j] ? 1 : 0);
+        }
+        stmt.setInt(i * 10 + 9, n);
+        BlockLoc loc = pair.settings.getPosition();
+        String position;
+        if (loc.y == 0) {
+          position = "DEFAULT";
+        } else {
+          position = loc.x + "," + loc.y + ',' + loc.z;
+        }
+        stmt.setString(i * 10 + 10, position);
+      }
+
+      @Override
+      public void setSQL(PreparedStatement stmt, SettingsPair pair)
+          throws SQLException {
+        stmt.setInt(1, pair.id);
+      }
+    };
+    addGlobalTask(() -> setBulk(myList, mod, whenDone));
+  }
+
+  public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
+    final StmtMod<Integer> mod = new StmtMod<Integer>() {
+      @Override
+      public String getCreateMySQL(int size) {
+        return getCreateMySQL(size, SQLManager.this.CREATE_SETTINGS, 1);
+      }
+
+      @Override
+      public String getCreateSQLite(int size) {
+        return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
+                + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
+            10);
+      }
+
+      @Override
+      public String getCreateSQL() {
+        return "INSERT INTO `" + SQLManager.this.prefix
+            + "plot_settings`(`plot_plot_id`) VALUES(?)";
+      }
+
+      @Override
+      public void setMySQL(PreparedStatement stmt, int i, Integer id)
+          throws SQLException {
+        stmt.setInt(i + 1, id);
+      }
+
+      @Override
+      public void setSQLite(PreparedStatement stmt, int i, Integer id)
+          throws SQLException {
+        stmt.setInt(i * 10 + 1, id);
+        stmt.setNull(i * 10 + 2, 4);
+        stmt.setNull(i * 10 + 3, 4);
+        stmt.setNull(i * 10 + 4, 4);
+        stmt.setNull(i * 10 + 5, 4);
+        stmt.setNull(i * 10 + 6, 4);
+        stmt.setNull(i * 10 + 7, 4);
+        stmt.setNull(i * 10 + 8, 4);
+        stmt.setNull(i * 10 + 9, 4);
+        stmt.setString(i * 10 + 10, "DEFAULT");
+      }
+
+      @Override
+      public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
+        stmt.setInt(1, id);
+      }
+    };
+    addGlobalTask(() -> setBulk(myList, mod, whenDone));
+  }
+
+  public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
+    final long timestamp = plot.getTimestamp();
+    addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, plot.getId().x);
+        stmt.setInt(2, plot.getId().y);
+        stmt.setString(3, plot.owner.toString());
+        stmt.setString(4, plot.getArea().toString());
+        stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+        stmt.setString(6, plot.getArea().toString());
+        stmt.setInt(7, plot.getId().x);
+        stmt.setInt(8, plot.getId().y);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT_SAFE,
+            Statement.RETURN_GENERATED_KEYS);
+      }
+
+      @Override
+      public void execute(PreparedStatement statement) {
+
+      }
+
+      @Override
+      public void addBatch(PreparedStatement statement) throws SQLException {
+        int inserted = statement.executeUpdate();
+        if (inserted > 0) {
+          try (ResultSet keys = statement.getGeneratedKeys()) {
+            if (keys.next()) {
+              plot.temp = keys.getInt(1);
+              addPlotTask(plot, new UniqueStatement(
+                  "createPlotAndSettings_settings_" + plot.hashCode()) {
+                @Override
+                public void set(PreparedStatement stmt)
+                    throws SQLException {
+                  stmt.setInt(1, getId(plot));
+                }
+
+                @Override
+                public PreparedStatement get() throws SQLException {
+                  return SQLManager.this.connection.prepareStatement(
+                      "INSERT INTO `" + SQLManager.this.prefix
+                          + "plot_settings`(`plot_plot_id`) VALUES(?)");
+                }
+              });
+              if (success != null) {
+                addNotifyTask(success);
+              }
+              return;
+            }
+          }
+        }
+        if (failure != null) {
+          failure.run();
+        }
+      }
+    });
+  }
+
+  public void commit() {
+    if (this.closed) {
+      return;
+    }
+    try {
+      if (!this.connection.getAutoCommit()) {
+        this.connection.commit();
+        this.connection.setAutoCommit(true);
+      }
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+  }
+
+  @Override
+  public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
+    addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, plot.getId().x);
+        stmt.setInt(2, plot.getId().y);
+        stmt.setString(3, plot.owner.toString());
+        stmt.setString(4, plot.getArea().toString());
+        stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection
+            .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
+      }
+
+      @Override
+      public void execute(PreparedStatement statement) {
+      }
+
+      @Override
+      public void addBatch(PreparedStatement statement) throws SQLException {
+        statement.executeUpdate();
+        try (ResultSet keys = statement.getGeneratedKeys()) {
+          if (keys.next()) {
+            plot.temp = keys.getInt(1);
+          }
+        }
+      }
+    });
+    addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_settings`(`plot_plot_id`) VALUES(?)");
+      }
+    });
+    addNotifyTask(whenDone);
+  }
+
+  /**
+   * Create tables.
+   */
+  @Override
+  public void createTables() throws SQLException {
+    String[] tables =
+        new String[]{"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
+            "plot_rating", "plot_settings", "cluster", "player_meta"};
+    DatabaseMetaData meta = this.connection.getMetaData();
+    int create = 0;
+    for (String s : tables) {
+      ResultSet set = meta.getTables(null, null, this.prefix + s, new String[]{"TABLE"});
+      //            ResultSet set = meta.getTables(null, null, prefix + s, null);
+      if (!set.next()) {
+        create++;
+      }
+      set.close();
+    }
+    if (create == 0) {
+      return;
+    }
+    boolean addConstraint = create == tables.length;
+    PlotSquared.debug("Creating tables");
+    try (Statement stmt = this.connection.createStatement()) {
+      if (this.mySQL) {
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
+            + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
+            + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+            + "PRIMARY KEY (`id`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` ("
+            + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+            + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL,"
+            + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` ("
+            + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
+            + "  `plot_plot_id` INT(11) NOT NULL,"
+            + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
+            + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
+            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`plot_plot_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB "
+            + "DEFAULT CHARSET=utf8");
+        if (addConstraint) {
+          stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `"
+              + this.prefix
+              + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
+              + this.prefix + "plot` (`id`) ON DELETE CASCADE");
+        }
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
+            + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL,"
+            + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
+            + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+            + "PRIMARY KEY (`id`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` ("
+            + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` ("
+            + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
+            + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+            + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
+            + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
+            + " `meta_id` INT(11) NOT NULL AUTO_INCREMENT,"
+            + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
+            + " `value` blob NOT NULL," + " PRIMARY KEY (`meta_id`)"
+            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+      } else {
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
+            + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
+            + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "plot_helpers` (`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "plot_trusted` (`plot_plot_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+            + "`comment` VARCHAR(40) NOT NULL,"
+            + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+            + "`sender` VARCHAR(40) NOT NULL" + ')');
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
+            + "  `plot_plot_id` INT(11) NOT NULL,"
+            + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
+            + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
+            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`plot_plot_id`)" + ')');
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
+            + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL,"
+            + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
+            + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+            + "`world` VARCHAR(45) NOT NULL,"
+            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ')');
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "cluster_helpers` (`cluster_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+            + "cluster_invited` (`cluster_id` INT(11) NOT NULL,"
+            + "`user_uuid` VARCHAR(40) NOT NULL)");
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
+            + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+            + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
+            + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+            + "  `merged` INT(11) DEFAULT NULL,"
+            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+            + "  PRIMARY KEY (`cluster_id`)" + ')');
+        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
+            + " `meta_id` INTEGER PRIMARY KEY AUTOINCREMENT,"
+            + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
+            + " `value` blob NOT NULL" + ')');
+      }
+      stmt.executeBatch();
+      stmt.clearBatch();
+    }
+  }
+
+  @Override
+  public void deleteSettings(final Plot plot) {
+    addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_settings` WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void deleteHelpers(final Plot plot) {
+    if (plot.getTrusted().isEmpty()) {
+      return;
+    }
+    addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_helpers` WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void deleteTrusted(final Plot plot) {
+    if (plot.getMembers().isEmpty()) {
+      return;
+    }
+    addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_trusted` WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void deleteDenied(final Plot plot) {
+    if (plot.getDenied().isEmpty()) {
+      return;
+    }
+    addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_denied` WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void deleteComments(final Plot plot) {
+    addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, plot.getArea().toString());
+        stmt.setInt(2, plot.hashCode());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void deleteRatings(final Plot plot) {
+    if (Settings.Enabled_Components.RATING_CACHE && plot.getSettings().getRatings().isEmpty()) {
+      return;
+    }
+    addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_rating` WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  /**
+   * Delete a plot.
+   */
+  @Override
+  public void delete(final Plot plot) {
+    PlotSquared.debug(
+        "Deleting plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
+            + plot.owner + " Index: " + plot.temp);
+    deleteSettings(plot);
+    deleteDenied(plot);
+    deleteHelpers(plot);
+    deleteTrusted(plot);
+    deleteComments(plot);
+    deleteRatings(plot);
+    addPlotTask(plot, new UniqueStatement("delete_plot") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
+      }
+    });
+  }
+
+  /**
+   * Create plot settings
+   */
+  @Override
+  public void createPlotSettings(final int id, Plot plot) {
+    PlotSquared.debug(
+        "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
+            + plot.owner + " Index: " + id);
+    addPlotTask(plot, new UniqueStatement("createPlotSettings") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, id);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_settings`(`plot_plot_id`) VALUES(?)");
+      }
+    });
+  }
+
+  @Override
+  public int getClusterId(PlotCluster cluster) {
+    if (cluster.temp > 0) {
+      return cluster.temp;
+    }
+    try {
+      commit();
+      if (cluster.temp > 0) {
+        return cluster.temp;
+      }
+      int c_id;
+      try (PreparedStatement stmt = this.connection.prepareStatement(
+          "SELECT `id` FROM `" + this.prefix
+              + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
+        stmt.setInt(1, cluster.getP1().x);
+        stmt.setInt(2, cluster.getP1().y);
+        stmt.setInt(3, cluster.getP2().x);
+        stmt.setInt(4, cluster.getP2().y);
+        stmt.setString(5, cluster.area.toString());
+        try (ResultSet resultSet = stmt.executeQuery()) {
+          c_id = Integer.MAX_VALUE;
+          while (resultSet.next()) {
+            c_id = resultSet.getInt("id");
+          }
+        }
+      }
+      if (c_id == Integer.MAX_VALUE || c_id == 0) {
+        if (cluster.temp > 0) {
+          return cluster.temp;
+        }
+        throw new SQLException("Cluster does not exist in database");
+      }
+      cluster.temp = c_id;
+      return c_id;
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+    return Integer.MAX_VALUE;
+  }
+
+  @Override
+  public int getId(Plot plot) {
+    if (plot.temp > 0) {
+      return plot.temp;
+    }
+    try {
+      commit();
+      if (plot.temp > 0) {
+        return plot.temp;
+      }
+      int id;
+      try (PreparedStatement statement = this.connection.prepareStatement(
+          "SELECT `id` FROM `" + this.prefix
+              + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
+        statement.setInt(1, plot.getId().x);
+        statement.setInt(2, plot.getId().y);
+        statement.setString(3, plot.getArea().toString());
+        try (ResultSet resultSet = statement.executeQuery()) {
+          id = Integer.MAX_VALUE;
+          while (resultSet.next()) {
+            id = resultSet.getInt("id");
+          }
+        }
+      }
+      if (id == Integer.MAX_VALUE || id == 0) {
+        if (plot.temp > 0) {
+          return plot.temp;
+        }
+        throw new SQLException("Plot does not exist in database");
+      }
+      plot.temp = id;
+      return id;
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+    return Integer.MAX_VALUE;
+  }
+
+  @Override
+  public void updateTables(int[] oldVersion) {
+    try {
+      if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
+        try (Statement stmt = this.connection.createStatement()) {
+          stmt.executeUpdate(
+              "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
+        } catch (SQLException ignored) {
+        }
+      }
+      DatabaseMetaData data = this.connection.getMetaData();
+      ResultSet rs =
+          data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
+      if (rs.next()) {
+        rs.close();
+        rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
+        if (!rs.next()) {
+          rs.close();
+          try (Statement statement = this.connection.createStatement()) {
+            statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
+            if (Storage.MySQL.USE) {
+              statement.addBatch(
+                  "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                      + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                      + "`comment` VARCHAR(40) NOT NULL,"
+                      + "`inbox` VARCHAR(40) NOT NULL,"
+                      + "`timestamp` INT(11) NOT NULL,"
+                      + "`sender` VARCHAR(40) NOT NULL"
+                      + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            } else {
+              statement.addBatch(
+                  "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                      + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                      + "`comment` VARCHAR(40) NOT NULL,"
+                      + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+                      + "`sender` VARCHAR(40) NOT NULL" + ')');
+            }
             statement.executeBatch();
+          } catch (SQLException ignored) {
+            try (Statement statement = this.connection.createStatement()) {
+              statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
+                  + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
+              statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
+                  + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
+              statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
+              statement.executeBatch();
+            }
+          }
+        }
+      }
+      rs.close();
+      rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
+      if (rs.next()) {
+        try (Statement statement = this.connection.createStatement()) {
+          statement.executeUpdate("DELETE FROM `" + this.prefix
+              + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
+              + this.prefix + "plot`)");
+        } catch (SQLException e) {
+          e.printStackTrace();
         }
 
-        public abstract PreparedStatement get() throws SQLException;
-
-        public abstract void set(PreparedStatement stmt) throws SQLException;
-    }
-
-
-    private class UUIDPair {
-
-        public final int id;
-        public final UUID uuid;
-
-        public UUIDPair(int id, UUID uuid) {
-            this.id = id;
-            this.uuid = uuid;
+        rs.close();
+        try (Statement statement = this.connection.createStatement()) {
+          for (String table : new String[]{"plot_denied", "plot_helpers",
+              "plot_trusted"}) {
+            ResultSet result = statement.executeQuery(
+                "SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table
+                    + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
+            if (result.next()) {
+              PlotSquared.debug("BACKING UP: " + this.prefix + table);
+              result.close();
+              statement.executeUpdate(
+                  "CREATE TABLE " + this.prefix + table + "_tmp AS SELECT * FROM "
+                      + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
+              statement.executeUpdate("DROP TABLE " + this.prefix + table);
+              statement.executeUpdate(
+                  "CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "
+                      + this.prefix + table + "_tmp");
+              statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
+              PlotSquared.debug("RESTORING: " + this.prefix + table);
+            }
+          }
+        } catch (SQLException e2) {
+          e2.printStackTrace();
         }
+      }
+    } catch (SQLException e) {
+      e.printStackTrace();
     }
 
+  }
 
-    private class SettingsPair {
+  public void deleteRows(ArrayList<Integer> rowIds, final String table, final String column) {
+    setBulk(rowIds, new StmtMod<Integer>() {
 
-        public final int id;
-        public final PlotSettings settings;
+      @Override
+      public String getCreateMySQL(int size) {
+        return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
+            size);
+      }
 
-        public SettingsPair(int id, PlotSettings settings) {
-            this.id = id;
-            this.settings = settings;
+      @Override
+      public String getCreateSQLite(int size) {
+        return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
+            size);
+      }
+
+      @Override
+      public String getCreateSQL() {
+        return "DELETE FROM `" + table + "` WHERE `" + column + "` = ?";
+      }
+
+      @Override
+      public void setMySQL(PreparedStatement stmt, int i, Integer obj)
+          throws SQLException {
+        stmt.setInt(i + 1, obj);
+      }
+
+      @Override
+      public void setSQLite(PreparedStatement stmt, int i, Integer obj)
+          throws SQLException {
+        stmt.setInt(i + 1, obj);
+      }
+
+      @Override
+      public void setSQL(PreparedStatement stmt, Integer obj) throws SQLException {
+        stmt.setInt(1, obj);
+      }
+    }, null);
+  }
+
+  /**
+   * Load all plots, helpers, denied, trusted, and every setting from DB into a {@link HashMap}.
+   */
+  @Override
+  public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
+    HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
+    HashMap<Integer, Plot> plots = new HashMap<>();
+    try {
+      HashSet<String> areas = new HashSet<>();
+      if (PlotSquared.get().worlds.contains("worlds")) {
+        ConfigurationSection worldSection =
+            PlotSquared.get().worlds.getConfigurationSection("worlds");
+        if (worldSection != null) {
+          for (String worldKey : worldSection.getKeys(false)) {
+            areas.add(worldKey);
+            ConfigurationSection areaSection =
+                worldSection.getConfigurationSection(worldKey + ".areas");
+            if (areaSection != null) {
+              areaSection.getKeys(false).forEach(s -> {
+                String[] split = s.split("(?<![;])-");
+                if (split.length == 3) {
+                  areas.add(worldKey + ';' + split[0]);
+                }
+              });
+            }
+          }
         }
+      }
+      HashMap<String, UUID> uuids = new HashMap<>();
+      HashMap<String, AtomicInteger> noExist = new HashMap<>();
+
+      /*
+       * Getting plots
+       */
+      try (Statement statement = this.connection.createStatement()) {
+        int id;
+        String owner;
+        UUID user;
+        try (ResultSet resultSet = statement.executeQuery(
+            "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
+                + this.prefix + "plot`")) {
+          ArrayList<Integer> toDelete = new ArrayList<>();
+          while (resultSet.next()) {
+            PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
+                resultSet.getInt("plot_id_z"));
+            id = resultSet.getInt("id");
+            String areaid = resultSet.getString("world");
+            if (!areas.contains(areaid)) {
+              if (Settings.Enabled_Components.DATABASE_PURGER) {
+                toDelete.add(id);
+                continue;
+              } else {
+                AtomicInteger value = noExist.get(areaid);
+                if (value != null) {
+                  value.incrementAndGet();
+                } else {
+                  noExist.put(areaid, new AtomicInteger(1));
+                }
+              }
+            }
+            owner = resultSet.getString("owner");
+            user = uuids.computeIfAbsent(owner, s -> {
+              try {
+                return UUID.fromString(s);
+              } catch (IllegalArgumentException ignored) {
+                if (Settings.UUID.FORCE_LOWERCASE) {
+                  return UUID.nameUUIDFromBytes(
+                      ("OfflinePlayer:" + s.toLowerCase())
+                          .getBytes(Charsets.UTF_8));
+                } else {
+                  return UUID.nameUUIDFromBytes(
+                      ("OfflinePlayer:" + s).getBytes(Charsets.UTF_8));
+                }
+              }
+            });
+            long time;
+            try {
+              Timestamp timestamp = resultSet.getTimestamp("timestamp");
+              time = timestamp.getTime();
+            } catch (SQLException exception) {
+              String parsable = resultSet.getString("timestamp");
+              try {
+                time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
+                    .getTime();
+              } catch (ParseException e) {
+                PlotSquared.debug(
+                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
+                        + plot_id + ") (" + parsable + ")");
+                time = System.currentTimeMillis() + id;
+              }
+            }
+            Plot plot = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
+                new HashSet<>(), "", null, null, null,
+                new boolean[]{false, false, false, false}, time, id);
+            HashMap<PlotId, Plot> map = newPlots.get(areaid);
+            if (map != null) {
+              Plot last = map.put(plot.getId(), plot);
+              if (last != null) {
+                if (Settings.Enabled_Components.DATABASE_PURGER) {
+                  toDelete.add(last.temp);
+                } else {
+                  PlotSquared.debug(
+                      "&cPLOT #" + id + "(" + last + ") in `" + this.prefix
+                          + "plot` is a duplicate. Delete this plot or set `database-purger: true` in the settings.yml.");
+                }
+              }
+            } else {
+              map = new HashMap<>();
+              newPlots.put(areaid, map);
+              map.put(plot.getId(), plot);
+            }
+            plots.put(id, plot);
+          }
+          deleteRows(toDelete, this.prefix + "plot", "id");
+        }
+        if (Settings.Enabled_Components.RATING_CACHE) {
+          try (ResultSet r = statement.executeQuery(
+              "SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix
+                  + "plot_rating`")) {
+            ArrayList<Integer> toDelete = new ArrayList<>();
+            while (r.next()) {
+              id = r.getInt("plot_plot_id");
+              owner = r.getString("player");
+              user = uuids.computeIfAbsent(owner, UUID::fromString);
+              Plot plot = plots.get(id);
+              if (plot != null) {
+                plot.getSettings().getRatings().put(user, r.getInt("rating"));
+              } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                toDelete.add(id);
+              } else {
+                PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                    + ") in `plot_rating` does not exist. Create this plot or set `database-purger: true` in the "
+                    + "settings.yml.");
+              }
+            }
+            deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id");
+          }
+        }
+
+        /*
+         * Getting helpers
+         */
+        try (ResultSet r = statement.executeQuery(
+            "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
+          ArrayList<Integer> toDelete = new ArrayList<>();
+          while (r.next()) {
+            id = r.getInt("plot_plot_id");
+            owner = r.getString("user_uuid");
+            user = uuids.computeIfAbsent(owner, UUID::fromString);
+            Plot plot = plots.get(id);
+            if (plot != null) {
+              plot.getTrusted().add(user);
+            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+              toDelete.add(id);
+            } else {
+              PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                  + ") in `plot_helpers` does not exist. Create this plot or set `database-purger: true` in the settings"
+                  + ".yml.");
+            }
+          }
+          deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id");
+        }
+
+        /*
+         * Getting trusted
+         */
+        try (ResultSet r = statement.executeQuery(
+            "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
+          ArrayList<Integer> toDelete = new ArrayList<>();
+          while (r.next()) {
+            id = r.getInt("plot_plot_id");
+            owner = r.getString("user_uuid");
+            user = uuids.computeIfAbsent(owner,UUID::fromString);
+            Plot plot = plots.get(id);
+            if (plot != null) {
+              plot.getMembers().add(user);
+            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+              toDelete.add(id);
+            } else {
+              PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                  + ") in `plot_trusted` does not exist. Create this plot or set `database-purger: true` in the settings"
+                  + ".yml.");
+            }
+          }
+          deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id");
+        }
+
+        /*
+         * Getting denied
+         */
+        try (ResultSet r = statement.executeQuery(
+            "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
+          ArrayList<Integer> toDelete = new ArrayList<>();
+          while (r.next()) {
+            id = r.getInt("plot_plot_id");
+            owner = r.getString("user_uuid");
+            user = uuids.computeIfAbsent(owner, UUID::fromString);
+            Plot plot = plots.get(id);
+            if (plot != null) {
+              plot.getDenied().add(user);
+            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+              toDelete.add(id);
+            } else {
+              PlotSquared.debug("&cENTRY " + id
+                  + " in `plot_denied` does not exist. Create this plot or set `database-purger: true` in the settings.yml.");
+            }
+          }
+          deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id");
+        }
+
+        try (ResultSet resultSet = statement
+            .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
+          ArrayList<Integer> toDelete = new ArrayList<>();
+          while (resultSet.next()) {
+            id = resultSet.getInt("plot_plot_id");
+            Plot plot = plots.get(id);
+            if (plot != null) {
+              plots.remove(id);
+              String alias = resultSet.getString("alias");
+              if (alias != null) {
+                plot.getSettings().setAlias(alias);
+              }
+              String pos = resultSet.getString("position");
+              switch (pos.toLowerCase()) {
+                case "":
+                case "default":
+                case "0,0,0":
+                case "center":
+                  break;
+                default:
+                  try {
+                    plot.getSettings().setPosition(BlockLoc.fromString(pos));
+                  } catch (Exception ignored) {
+                  }
+              }
+              int m = resultSet.getInt("merged");
+              boolean[] merged = new boolean[4];
+              for (int i = 0; i < 4; i++) {
+                merged[3 - i] = (m & 1 << i) != 0;
+              }
+              plot.getSettings().setMerged(merged);
+              String[] flags_string;
+              String myflags = resultSet.getString("flags");
+              if (myflags == null || myflags.isEmpty()) {
+                flags_string = new String[]{};
+              } else {
+                flags_string = myflags.split(",");
+              }
+              HashMap<Flag<?>, Object> flags = new HashMap<>();
+              boolean exception = false;
+              for (String element : flags_string) {
+                if (element.contains(":")) {
+                  String[] split = element.split(":");
+                  try {
+                    String flag_str =
+                        split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
+                    Flag<?> flag = FlagManager.getOrCreateFlag(split[0]);
+                    flags.put(flag, flag.parseValue(flag_str));
+                  } catch (Exception e) {
+                    e.printStackTrace();
+                    exception = true;
+                  }
+                } else {
+                  element =
+                      element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
+                  if (StringMan
+                      .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
+                    Flag flag = FlagManager.getOrCreateFlag(element);
+                    if (flag == null) {
+                      flag = new StringFlag(element) {
+                        @Override
+                        public String getValueDescription() {
+                          return "Generic Filler Flag";
+                        }
+                      };
+                    }
+                    flags.put(flag, flag.parseValue(""));
+                  } else {
+                    PlotSquared.debug("INVALID FLAG: " + element);
+                  }
+                }
+              }
+              if (exception) {
+                PlotSquared.debug("&cPlot #" + id + "(" + plot + ") | " + plot
+                    + " had an invalid flag. A fix has been attempted.");
+                PlotSquared.debug("&c" + myflags);
+                this.setFlags(plot, flags);
+              }
+              plot.getSettings().flags = flags;
+            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+              toDelete.add(id);
+            } else {
+              PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                  + ") in `plot_settings` does not exist. Create this plot or set `database-purger: true` in the settings"
+                  + ".yml.");
+            }
+          }
+          deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id");
+        }
+      }
+      if (!plots.entrySet().isEmpty()) {
+        createEmptySettings(new ArrayList<>(plots.keySet()), null);
+        for (Entry<Integer, Plot> entry : plots.entrySet()) {
+          entry.getValue().getSettings();
+        }
+      }
+      boolean invalidPlot = false;
+      for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
+        String worldName = entry.getKey();
+        invalidPlot = true;
+        PlotSquared.debug("&c[WARNING] Found " + entry.getValue().intValue()
+            + " plots in DB for non existent world; '" + worldName + "'.");
+      }
+      if (invalidPlot) {
+        PlotSquared.debug(
+            "&c[WARNING] - Please create the world/s or remove the plots using the purge command");
+      }
+    } catch (SQLException e) {
+      PlotSquared.debug("&7[WARN] Failed to load plots.");
+      e.printStackTrace();
     }
+    return newPlots;
+  }
+
+  @Override
+  public void setMerged(final Plot plot, final boolean[] merged) {
+    plot.getSettings().setMerged(merged);
+    addPlotTask(plot, new UniqueStatement("setMerged") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        int hash = MainUtil.hash(merged);
+        stmt.setInt(1, hash);
+        stmt.setInt(2, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void swapPlots(Plot plot1, Plot plot2) {
+    final int id1 = getId(plot1);
+    final int id2 = getId(plot2);
+    final PlotId pos1 = plot1.getId();
+    final PlotId pos2 = plot2.getId();
+    addPlotTask(plot1, new UniqueStatement("swapPlots") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, pos2.x);
+        stmt.setInt(2, pos2.y);
+        stmt.setInt(3, id1);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+      }
+    });
+    addPlotTask(plot2, new UniqueStatement("swapPlots") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, pos1.x);
+        stmt.setInt(2, pos1.y);
+        stmt.setInt(3, id2);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void movePlot(final Plot original, final Plot newPlot) {
+    addPlotTask(original, new UniqueStatement("movePlot") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, newPlot.getId().x);
+        stmt.setInt(2, newPlot.getId().y);
+        stmt.setString(3, newPlot.getArea().toString());
+        stmt.setInt(4, getId(original));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot` SET `plot_id_x` = ?, `plot_id_z` = ?, `world` = ? WHERE `id` = ?");
+      }
+    });
+    addPlotTask(newPlot, null);
+  }
+
+  @Override
+  public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
+    final String flag_string = FlagManager.toString(flags);
+    addPlotTask(plot, new UniqueStatement("setFlags") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, flag_string);
+        stmt.setInt(2, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void setAlias(final Plot plot, final String alias) {
+    addPlotTask(plot, new UniqueStatement("setAlias") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, alias);
+        stmt.setInt(2, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  /**
+   * Purge all plots with the following database IDs
+   */
+  @Override
+  public void purgeIds(final Set<Integer> uniqueIds) {
+    addGlobalTask(() -> {
+      if (!uniqueIds.isEmpty()) {
+        try {
+          ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
+          String stmt_prefix = "";
+          int size = uniqueIdsList.size();
+          int packet = 990;
+          int amount = size / packet;
+          int count = 0;
+          int last = -1;
+          for (int j = 0; j <= amount; j++) {
+            PlotSquared.debug("Purging " + (j * packet) + " / " + size);
+            List<Integer> subList =
+                uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
+            if (subList.isEmpty()) {
+              break;
+            }
+            StringBuilder idstr2 = new StringBuilder();
+            stmt_prefix = "";
+            for (Integer id : subList) {
+              idstr2.append(stmt_prefix).append(id);
+              stmt_prefix = " OR `id` = ";
+            }
+            stmt_prefix = "";
+            StringBuilder idstr = new StringBuilder();
+            for (Integer id : subList) {
+              idstr.append(stmt_prefix).append(id);
+              stmt_prefix = " OR `plot_plot_id` = ";
+            }
+            PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                "DELETE FROM `" + SQLManager.this.prefix
+                    + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
+            stmt.executeUpdate();
+            stmt.close();
+            stmt = SQLManager.this.connection.prepareStatement(
+                "DELETE FROM `" + SQLManager.this.prefix
+                    + "plot_denied` WHERE `plot_plot_id` = " + idstr);
+            stmt.executeUpdate();
+            stmt.close();
+            stmt = SQLManager.this.connection.prepareStatement(
+                "DELETE FROM `" + SQLManager.this.prefix
+                    + "plot_settings` WHERE `plot_plot_id` = " + idstr);
+            stmt.executeUpdate();
+            stmt.close();
+            stmt = SQLManager.this.connection.prepareStatement(
+                "DELETE FROM `" + SQLManager.this.prefix
+                    + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
+            stmt.executeUpdate();
+            stmt.close();
+            stmt = SQLManager.this.connection.prepareStatement(
+                "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
+                    + idstr2);
+            stmt.executeUpdate();
+            stmt.close();
+            commit();
+          }
+        } catch (SQLException e) {
+          e.printStackTrace();
+          PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
+          return;
+        }
+      }
+      PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
+    });
+  }
+
+  @Override
+  public void purge(final PlotArea area, final Set<PlotId> plots) {
+    addGlobalTask(() -> {
+      try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+          "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
+              + "plot` WHERE `world` = ?")) {
+        stmt.setString(1, area.toString());
+        Set<Integer> ids;
+        try (ResultSet r = stmt.executeQuery()) {
+          ids = new HashSet<>();
+          while (r.next()) {
+            PlotId plot_id =
+                new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+            if (plots.contains(plot_id)) {
+              ids.add(r.getInt("id"));
+            }
+          }
+        }
+        purgeIds(ids);
+      } catch (SQLException e) {
+        e.printStackTrace();
+        PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
+      }
+      for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
+        PlotId plotId = iterator.next();
+        iterator.remove();
+        PlotId id = new PlotId(plotId.x, plotId.y);
+        area.removePlot(id);
+      }
+    });
+  }
+
+  @Override
+  public void setPosition(final Plot plot, final String position) {
+    addPlotTask(plot, new UniqueStatement("setPosition") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, position == null ? "" : position);
+        stmt.setInt(2, getId(plot));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void removeComment(final Plot plot, final PlotComment comment) {
+    addPlotTask(plot, new UniqueStatement("removeComment") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        if (plot != null) {
+          statement.setString(1, plot.getArea().toString());
+          statement.setInt(2, plot.getId().hashCode());
+          statement.setString(3, comment.comment);
+          statement.setString(4, comment.inbox);
+          statement.setString(5, comment.senderName);
+        } else {
+          statement.setString(1, comment.comment);
+          statement.setString(2, comment.inbox);
+          statement.setString(3, comment.senderName);
+        }
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        if (plot != null) {
+          return SQLManager.this.connection.prepareStatement(
+              "DELETE FROM `" + SQLManager.this.prefix
+                  + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
+        }
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void clearInbox(final Plot plot, final String inbox) {
+    addPlotTask(plot, new UniqueStatement("clearInbox") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        if (plot != null) {
+          statement.setString(1, plot.getArea().toString());
+          statement.setInt(2, plot.getId().hashCode());
+          statement.setString(3, inbox);
+        } else {
+          statement.setString(1, inbox);
+        }
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        if (plot != null) {
+          return SQLManager.this.connection.prepareStatement(
+              "DELETE FROM `" + SQLManager.this.prefix
+                  + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+        }
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void getComments(final Plot plot, final String inbox,
+      final RunnableVal<List<PlotComment>> whenDone) {
+    addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        if (plot != null) {
+          statement.setString(1, plot.getArea().toString());
+          statement.setInt(2, plot.getId().hashCode());
+          statement.setString(3, inbox);
+        } else {
+          statement.setString(1, inbox);
+        }
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        if (plot != null) {
+          return SQLManager.this.connection.prepareStatement(
+              "SELECT * FROM `" + SQLManager.this.prefix
+                  + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+        }
+        return SQLManager.this.connection.prepareStatement(
+            "SELECT * FROM `" + SQLManager.this.prefix
+                + "plot_comments` WHERE `inbox` = ?");
+      }
+
+      @Override
+      public void execute(PreparedStatement statement) {
+      }
+
+      @Override
+      public void addBatch(PreparedStatement statement) throws SQLException {
+        ArrayList<PlotComment> comments = new ArrayList<>();
+        try (ResultSet set = statement.executeQuery()) {
+          while (set.next()) {
+            String sender = set.getString("sender");
+            String world = set.getString("world");
+            int hash = set.getInt("hashcode");
+            PlotId id;
+            if (hash != 0) {
+              id = PlotId.unpair(hash);
+            } else {
+              id = null;
+            }
+            String msg = set.getString("comment");
+            long timestamp = set.getInt("timestamp") * 1000;
+            PlotComment comment =
+                new PlotComment(world, id, msg, sender, inbox, timestamp);
+            comments.add(comment);
+            whenDone.value = comments;
+          }
+        }
+        TaskManager.runTask(whenDone);
+      }
+    });
+  }
+
+  @Override
+  public void setComment(final Plot plot, final PlotComment comment) {
+    addPlotTask(plot, new UniqueStatement("setComment") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setString(1, plot.getArea().toString());
+        statement.setInt(2, plot.getId().hashCode());
+        statement.setString(3, comment.comment);
+        statement.setString(4, comment.inbox);
+        statement.setInt(5, (int) (comment.timestamp / 1000));
+        statement.setString(6, comment.senderName);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
+      }
+    });
+  }
+
+  @Override
+  public void removeTrusted(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("removeTrusted") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void removeMember(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("removeMember") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void setTrusted(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("setTrusted") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+      }
+    });
+  }
+
+  @Override
+  public void setMember(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("setMember") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+      }
+    });
+  }
+
+  @Override
+  public void removeDenied(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("removeDenied") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void setDenied(final Plot plot, final UUID uuid) {
+    addPlotTask(plot, new UniqueStatement("setDenied") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+      }
+    });
+  }
+
+  @Override
+  public HashMap<UUID, Integer> getRatings(Plot plot) {
+    HashMap<UUID, Integer> map = new HashMap<>();
+    try (PreparedStatement statement = this.connection.prepareStatement(
+        "SELECT `rating`, `player` FROM `" + this.prefix
+            + "plot_rating` WHERE `plot_plot_id` = ? ")) {
+      statement.setInt(1, getId(plot));
+      try (ResultSet resultSet = statement.executeQuery()) {
+        while (resultSet.next()) {
+          UUID uuid = UUID.fromString(resultSet.getString("player"));
+          int rating = resultSet.getInt("rating");
+          map.put(uuid, rating);
+        }
+      }
+    } catch (SQLException e) {
+      PlotSquared
+          .debug("&7[WARN] Failed to fetch rating for plot " + plot.getId().toString());
+      e.printStackTrace();
+    }
+    return map;
+  }
+
+  @Override
+  public void setRating(final Plot plot, final UUID rater, final int value) {
+    addPlotTask(plot, new UniqueStatement("setRating") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getId(plot));
+        statement.setInt(2, value);
+        statement.setString(3, rater.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
+      }
+    });
+  }
+
+  @Override
+  public void delete(PlotCluster cluster) {
+    final int id = getClusterId(cluster);
+    addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, id);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "cluster_settings` WHERE `cluster_id` = ?");
+      }
+    });
+    addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, id);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "cluster_helpers` WHERE `cluster_id` = ?");
+      }
+    });
+    addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, id);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "cluster_invited` WHERE `cluster_id` = ?");
+      }
+    });
+    addClusterTask(cluster, new UniqueStatement("delete_cluster") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, id);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
+      final boolean replace) {
+    addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        if (replace) {
+          stmt.setBytes(1, meta);
+          stmt.setString(2, uuid.toString());
+          stmt.setString(3, key);
+        } else {
+          stmt.setString(1, uuid.toString());
+          stmt.setString(2, key);
+          stmt.setBytes(3, meta);
+        }
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        if (replace) {
+          return SQLManager.this.connection.prepareStatement(
+              "UPDATE `" + SQLManager.this.prefix
+                  + "player_meta` SET `value` = ? WHERE `uuid` = ? AND `key` = ?");
+        } else {
+          return SQLManager.this.connection.prepareStatement(
+              "INSERT INTO `" + SQLManager.this.prefix
+                  + "player_meta`(`uuid`, `key`, `value`) VALUES(?, ? ,?)");
+        }
+      }
+    });
+  }
+
+  @Override
+  public void removePersistentMeta(final UUID uuid, final String key) {
+    addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, uuid.toString());
+        stmt.setString(2, key);
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "player_meta` WHERE `uuid` = ? AND `key` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
+    addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "SELECT * FROM `" + SQLManager.this.prefix
+                + "player_meta` WHERE `uuid` = ? ORDER BY `meta_id` ASC");
+      }
+
+      @Override
+      public void execute(PreparedStatement statement) {
+      }
+
+      @Override
+      public void addBatch(PreparedStatement statement) throws SQLException {
+        ResultSet resultSet = statement.executeQuery();
+
+        final Map<String, byte[]> metaMap = new HashMap<>();
+
+        while (resultSet.next()) {
+          String key = resultSet.getString("key");
+          byte[] bytes = resultSet.getBytes("value");
+          metaMap.put(key, bytes);
+        }
+
+        resultSet.close();
+        TaskManager.runTaskAsync(() -> result.run(metaMap));
+      }
+
+    });
+  }
+
+  @Override
+  public HashMap<String, Set<PlotCluster>> getClusters() {
+    LinkedHashMap<String, Set<PlotCluster>> newClusters = new LinkedHashMap<>();
+    HashMap<Integer, PlotCluster> clusters = new HashMap<>();
+    try {
+      HashSet<String> areas = new HashSet<>();
+      if (PlotSquared.get().worlds.contains("worlds")) {
+        ConfigurationSection worldSection =
+            PlotSquared.get().worlds.getConfigurationSection("worlds");
+        if (worldSection != null) {
+          for (String worldKey : worldSection.getKeys(false)) {
+            areas.add(worldKey);
+            ConfigurationSection areaSection =
+                worldSection.getConfigurationSection(worldKey + ".areas");
+            if (areaSection != null) {
+              for (String areaKey : areaSection.getKeys(false)) {
+                String[] split = areaKey.split("(?<![;])-");
+                if (split.length == 3) {
+                  areas.add(worldKey + ';' + split[0]);
+                }
+              }
+            }
+          }
+        }
+      }
+      HashMap<String, UUID> uuids = new HashMap<>();
+      HashMap<String, Integer> noExist = new HashMap<>();
+      /*
+       * Getting clusters
+       */
+      try (Statement stmt = this.connection.createStatement()) {
+        ResultSet resultSet =
+            stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
+        PlotCluster cluster;
+        String owner;
+        UUID user;
+        int id;
+        while (resultSet.next()) {
+          PlotId pos1 =
+              new PlotId(resultSet.getInt("pos1_x"), resultSet.getInt("pos1_z"));
+          PlotId pos2 =
+              new PlotId(resultSet.getInt("pos2_x"), resultSet.getInt("pos2_z"));
+          id = resultSet.getInt("id");
+          String areaid = resultSet.getString("world");
+          if (!areas.contains(areaid)) {
+            if (noExist.containsKey(areaid)) {
+              noExist.put(areaid, noExist.get(areaid) + 1);
+            } else {
+              noExist.put(areaid, 1);
+            }
+          }
+          owner = resultSet.getString("owner");
+          user = uuids.computeIfAbsent(owner, UUID::fromString);
+          cluster = new PlotCluster(null, pos1, pos2, user, id);
+          clusters.put(id, cluster);
+          Set<PlotCluster> set = newClusters
+              .computeIfAbsent(areaid, k -> new HashSet<>());
+          set.add(cluster);
+        }
+        //Getting helpers
+        resultSet = stmt.executeQuery(
+            "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
+        while (resultSet.next()) {
+          id = resultSet.getInt("cluster_id");
+          owner = resultSet.getString("user_uuid");
+          user = uuids.computeIfAbsent(owner,UUID::fromString);
+          cluster = clusters.get(id);
+          if (cluster != null) {
+            cluster.helpers.add(user);
+          } else {
+            PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                + ") in cluster_helpers does not exist. Please create the cluster or remove this entry.");
+          }
+        }
+        // Getting invited
+        resultSet = stmt.executeQuery(
+            "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
+        while (resultSet.next()) {
+          id = resultSet.getInt("cluster_id");
+          owner = resultSet.getString("user_uuid");
+          user = uuids.computeIfAbsent(owner,UUID::fromString);
+          cluster = clusters.get(id);
+          if (cluster != null) {
+            cluster.invited.add(user);
+          } else {
+            PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                + ") in cluster_invited does not exist. Please create the cluster or remove this entry.");
+          }
+        }
+        resultSet =
+            stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
+        while (resultSet.next()) {
+          id = resultSet.getInt("cluster_id");
+          cluster = clusters.get(id);
+          if (cluster != null) {
+            String alias = resultSet.getString("alias");
+            if (alias != null) {
+              cluster.settings.setAlias(alias);
+            }
+            String pos = resultSet.getString("position");
+            switch (pos.toLowerCase()) {
+              case "":
+              case "default":
+              case "0,0,0":
+              case "center":
+                break;
+              default:
+                try {
+                  BlockLoc loc = BlockLoc.fromString(pos);
+                  cluster.settings.setPosition(loc);
+                } catch (Exception ignored) {
+                }
+            }
+            int m = resultSet.getInt("merged");
+            boolean[] merged = new boolean[4];
+            for (int i = 0; i < 4; i++) {
+              merged[3 - i] = (m & 1 << i) != 0;
+            }
+            cluster.settings.setMerged(merged);
+            String[] flags_string;
+            String myflags = resultSet.getString("flags");
+            if (myflags == null || myflags.isEmpty()) {
+              flags_string = new String[]{};
+            } else {
+              flags_string = myflags.split(",");
+            }
+            HashMap<Flag<?>, Object> flags = new HashMap<>();
+            for (String element : flags_string) {
+              if (element.contains(":")) {
+                String[] split = element.split(":");
+                String flag_str =
+                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
+                Flag flag = FlagManager.getOrCreateFlag(split[0]);
+                if (flag == null) {
+                  flag = new StringFlag(split[0]) {
+                    @Override
+                    public String getValueDescription() {
+                      return "Generic Filler Flag";
+                    }
+                  };
+                }
+                flags.put(flag, flag.parseValue(flag_str));
+              } else {
+                Flag flag = FlagManager.getOrCreateFlag(element);
+                if (flag == null) {
+                  flag = new StringFlag(element) {
+                    @Override
+                    public String getValueDescription() {
+                      return "Generic Filler Flag";
+                    }
+                  };
+                }
+                flags.put(flag, flag.parseValue(""));
+              }
+            }
+            cluster.settings.flags = flags;
+          } else {
+            PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
+          }
+        }
+        resultSet.close();
+      }
+      boolean invalidPlot = false;
+      for (Entry<String, Integer> entry : noExist.entrySet()) {
+        String a = entry.getKey();
+        invalidPlot = true;
+        PlotSquared.debug("&c[WARNING] Found " + noExist.get(a)
+            + " clusters in DB for non existent area; '" + a + "'.");
+      }
+      if (invalidPlot) {
+        PlotSquared.debug(
+            "&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
+      }
+    } catch (SQLException e) {
+      PlotSquared.debug("&7[WARN] Failed to load clusters.");
+      e.printStackTrace();
+    }
+    return newClusters;
+  }
+
+  @Override
+  public void setClusterName(final PlotCluster cluster, final String name) {
+    addClusterTask(cluster, new UniqueStatement("setClusterName") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, name);
+        stmt.setInt(2, getClusterId(cluster));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
+      }
+    });
+    cluster.settings.setAlias(name);
+  }
+
+  @Override
+  public void removeHelper(final PlotCluster cluster, final UUID uuid) {
+    addClusterTask(cluster, new UniqueStatement("removeHelper") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getClusterId(cluster));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void setHelper(final PlotCluster cluster, final UUID uuid) {
+    addClusterTask(cluster, new UniqueStatement("setHelper") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getClusterId(cluster));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+      }
+    });
+  }
+
+  @Override
+  public void createCluster(final PlotCluster cluster) {
+    addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, cluster.getP1().x);
+        stmt.setInt(2, cluster.getP1().y);
+        stmt.setInt(3, cluster.getP2().x);
+        stmt.setInt(4, cluster.getP2().y);
+        stmt.setString(5, cluster.owner.toString());
+        stmt.setString(6, cluster.area.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER,
+            Statement.RETURN_GENERATED_KEYS);
+      }
+
+      @Override
+      public void execute(PreparedStatement statement) {
+      }
+
+      @Override
+      public void addBatch(PreparedStatement statement) throws SQLException {
+        statement.executeUpdate();
+        try (ResultSet keys = statement.getGeneratedKeys()) {
+          if (keys.next()) {
+            cluster.temp = keys.getInt(1);
+          }
+        }
+      }
+    });
+    addClusterTask(cluster,
+        new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
+          @Override
+          public void set(PreparedStatement stmt) throws SQLException {
+            stmt.setInt(1, getClusterId(cluster));
+            stmt.setString(2, cluster.getAlias());
+          }
+
+          @Override
+          public PreparedStatement get() throws SQLException {
+            return SQLManager.this.connection.prepareStatement(
+                "INSERT INTO `" + SQLManager.this.prefix
+                    + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?)");
+          }
+        });
+  }
+
+  @Override
+  public void resizeCluster(final PlotCluster current, PlotId min, PlotId max) {
+    final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
+    final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
+    current.setP1(min);
+    current.setP2(max);
+
+    addClusterTask(current, new UniqueStatement("resizeCluster") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setInt(1, pos1.x);
+        stmt.setInt(2, pos1.y);
+        stmt.setInt(3, pos2.x);
+        stmt.setInt(4, pos2.y);
+        stmt.setInt(5, getClusterId(current));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void setPosition(final PlotCluster cluster, final String position) {
+    addClusterTask(cluster, new UniqueStatement("setPosition") {
+      @Override
+      public void set(PreparedStatement stmt) throws SQLException {
+        stmt.setString(1, position);
+        stmt.setInt(2, getClusterId(cluster));
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void removeInvited(final PlotCluster cluster, final UUID uuid) {
+    addClusterTask(cluster, new UniqueStatement("removeInvited") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getClusterId(cluster));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "DELETE FROM `" + SQLManager.this.prefix
+                + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+      }
+    });
+  }
+
+  @Override
+  public void setInvited(final PlotCluster cluster, final UUID uuid) {
+    addClusterTask(cluster, new UniqueStatement("setInvited") {
+      @Override
+      public void set(PreparedStatement statement) throws SQLException {
+        statement.setInt(1, getClusterId(cluster));
+        statement.setString(2, uuid.toString());
+      }
+
+      @Override
+      public PreparedStatement get() throws SQLException {
+        return SQLManager.this.connection.prepareStatement(
+            "INSERT INTO `" + SQLManager.this.prefix
+                + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+      }
+    });
+  }
+
+  @Override
+  public boolean deleteTables() {
+    try (Statement stmt = this.connection.createStatement();
+        PreparedStatement statement = this.connection
+            .prepareStatement("DROP TABLE `" + this.prefix + "plot`")) {
+      close();
+      this.closed = false;
+      SQLManager.this.connection = this.database.forceConnection();
+      stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_invited`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_helpers`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "cluster`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_rating`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_settings`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_trusted`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_helpers`");
+      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_denied`");
+      stmt.executeBatch();
+      stmt.clearBatch();
+      statement.executeUpdate();
+    } catch (ClassNotFoundException | SQLException e) {
+      e.printStackTrace();
+
+    }
+    return true;
+  }
+
+  @Override
+  public void validateAllPlots(Set<Plot> toValidate) {
+    if (!isValid()) {
+      reconnect();
+    }
+    PlotSquared.debug(
+        "$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
+    commit();
+    while (true) {
+      if (!sendBatch()) {
+        break;
+      }
+    }
+    try {
+      if (this.connection.getAutoCommit()) {
+        this.connection.setAutoCommit(false);
+      }
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+    HashMap<String, HashMap<PlotId, Plot>> database = getPlots();
+    ArrayList<Plot> toCreate = new ArrayList<>();
+    for (Plot plot : toValidate) {
+      if (plot.temp == -1) {
+        continue;
+      }
+      HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
+      if (worldPlots == null) {
+        PlotSquared.debug("&8 - &7Creating plot (1): " + plot);
+        toCreate.add(plot);
+        continue;
+      }
+      Plot dataPlot = worldPlots.remove(plot.getId());
+      if (dataPlot == null) {
+        PlotSquared.debug("&8 - &7Creating plot (2): " + plot);
+        toCreate.add(plot);
+        continue;
+      }
+      // owner
+      if (!plot.owner.equals(dataPlot.owner)) {
+        PlotSquared
+            .debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
+        setOwner(plot, plot.owner);
+      }
+      // trusted
+      if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
+        HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
+        HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
+        toRemove.removeAll(plot.getTrusted());
+        toAdd.removeAll(dataPlot.getTrusted());
+        PlotSquared.debug(
+            "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: "
+                + plot);
+        if (!toRemove.isEmpty()) {
+          for (UUID uuid : toRemove) {
+            removeTrusted(plot, uuid);
+          }
+        }
+        if (!toAdd.isEmpty()) {
+          for (UUID uuid : toAdd) {
+            setTrusted(plot, uuid);
+          }
+        }
+      }
+      if (!plot.getMembers().equals(dataPlot.getMembers())) {
+        HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
+        HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
+        toRemove.removeAll(plot.getMembers());
+        toAdd.removeAll(dataPlot.getMembers());
+        PlotSquared.debug(
+            "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: "
+                + plot);
+        if (!toRemove.isEmpty()) {
+          for (UUID uuid : toRemove) {
+            removeMember(plot, uuid);
+          }
+        }
+        if (!toAdd.isEmpty()) {
+          for (UUID uuid : toAdd) {
+            setMember(plot, uuid);
+          }
+        }
+      }
+      if (!plot.getDenied().equals(dataPlot.getDenied())) {
+        HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
+        HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
+        toRemove.removeAll(plot.getDenied());
+        toAdd.removeAll(dataPlot.getDenied());
+        PlotSquared.debug(
+            "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: "
+                + plot);
+        if (!toRemove.isEmpty()) {
+          for (UUID uuid : toRemove) {
+            removeDenied(plot, uuid);
+          }
+        }
+        if (!toAdd.isEmpty()) {
+          for (UUID uuid : toAdd) {
+            setDenied(plot, uuid);
+          }
+        }
+      }
+      boolean[] pm = plot.getMerged();
+      boolean[] dm = dataPlot.getMerged();
+      if (pm[0] != dm[0] || pm[1] != dm[1]) {
+        PlotSquared.debug("&8 - &7Correcting merge for: " + plot);
+        setMerged(dataPlot, plot.getMerged());
+      }
+      HashMap<Flag<?>, Object> pf = plot.getFlags();
+      HashMap<Flag<?>, Object> df = dataPlot.getFlags();
+      if (!pf.isEmpty() && !df.isEmpty()) {
+        if (pf.size() != df.size() || !StringMan
+            .isEqual(StringMan.joinOrdered(pf.values(), ","),
+                StringMan.joinOrdered(df.values(), ","))) {
+          PlotSquared.debug("&8 - &7Correcting flags for: " + plot);
+          setFlags(plot, pf);
+        }
+      }
+    }
+
+    for (Entry<String, HashMap<PlotId, Plot>> entry : database.entrySet()) {
+      HashMap<PlotId, Plot> map = entry.getValue();
+      if (!map.isEmpty()) {
+        for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
+          PlotSquared.debug("$1Plot was deleted: " + entry2.getValue().toString()
+              + "// TODO implement this when sure safe");
+        }
+      }
+    }
+    commit();
+  }
+
+  @Override
+  public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
+      final PlotId max) {
+    addGlobalTask(() -> {
+      if (min == null) {
+        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot` SET `world` = ? WHERE `world` = ?")) {
+          stmt.setString(1, newWorld);
+          stmt.setString(2, oldWorld);
+          stmt.executeUpdate();
+        } catch (SQLException e) {
+          e.printStackTrace();
+        }
+        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "cluster` SET `world` = ? WHERE `world` = ?")) {
+          stmt.setString(1, newWorld);
+          stmt.setString(2, oldWorld);
+          stmt.executeUpdate();
+        } catch (SQLException e) {
+          e.printStackTrace();
+        }
+      } else {
+        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
+          stmt.setString(1, newWorld);
+          stmt.setString(2, oldWorld);
+          stmt.setInt(3, min.x);
+          stmt.setInt(4, max.x);
+          stmt.setInt(5, min.y);
+          stmt.setInt(6, max.y);
+          stmt.executeUpdate();
+        } catch (SQLException e) {
+          e.printStackTrace();
+        }
+        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+            "UPDATE `" + SQLManager.this.prefix
+                + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
+          stmt.setString(1, newWorld);
+          stmt.setString(2, oldWorld);
+          stmt.setInt(3, max.x);
+          stmt.setInt(4, max.y);
+          stmt.setInt(5, min.x);
+          stmt.setInt(6, min.y);
+          stmt.executeUpdate();
+        } catch (SQLException e) {
+          e.printStackTrace();
+        }
+      }
+    });
+  }
+
+  @Override
+  public void replaceUUID(final UUID old, final UUID now) {
+    addGlobalTask(() -> {
+      try (Statement stmt = SQLManager.this.connection.createStatement()) {
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
+                .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
+                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
+                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
+                .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
+                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
+                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+        stmt.executeUpdate(
+            "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
+                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+      } catch (SQLException e) {
+        e.printStackTrace();
+      }
+    });
+  }
+
+  @Override
+  public void close() {
+    try {
+      this.closed = true;
+      this.connection.close();
+    } catch (SQLException e) {
+      e.printStackTrace();
+    }
+  }
+
+  public abstract class UniqueStatement {
+
+    public final String method;
+
+    public UniqueStatement(String method) {
+      this.method = method;
+    }
+
+    public void addBatch(PreparedStatement statement) throws SQLException {
+      statement.addBatch();
+    }
+
+    public void execute(PreparedStatement statement) throws SQLException {
+      statement.executeBatch();
+    }
+
+    public abstract PreparedStatement get() throws SQLException;
+
+    public abstract void set(PreparedStatement stmt) throws SQLException;
+  }
+
+
+  private class UUIDPair {
+
+    public final int id;
+    public final UUID uuid;
+
+    public UUIDPair(int id, UUID uuid) {
+      this.id = id;
+      this.uuid = uuid;
+    }
+  }
+
+
+  private class SettingsPair {
+
+    public final int id;
+    public final PlotSettings settings;
+
+    public SettingsPair(int id, PlotSettings settings) {
+      this.id = id;
+      this.settings = settings;
+    }
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
index 3675ad0cd..d42b1d67b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
@@ -9,7 +9,7 @@ import java.sql.*;
 /**
  * Connects to and uses a SQLite database.
  */
-public class SQLite extends Database {
+public class SQLite implements Database {
 
     private final String dbLocation;
     private Connection connection;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
index 06be89e15..2c0746d13 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -114,6 +114,7 @@ public class FlagManager {
      * @param flag
      * @return
      */
+    @SuppressWarnings("deprecation")
     public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
         if (plot.owner == null) {
             return null;
@@ -141,13 +142,6 @@ public class FlagManager {
         return true;
     }
 
-    public static <V> boolean addClusterFlag(PlotCluster cluster, Flag<V> flag, V value) {
-        getSettingFlag(cluster.area, cluster.settings, flag);
-        cluster.settings.flags.put(flag, value);
-        DBFunc.setFlags(cluster, cluster.settings.flags);
-        return true;
-    }
-
     /**
      * Returns a map of the {@link Flag}s and their values for the specified plot.
      *
@@ -217,20 +211,6 @@ public class FlagManager {
         return true;
     }
 
-    public static boolean removeClusterFlag(PlotCluster cluster, Flag id) {
-        Object object = cluster.settings.flags.remove(id);
-        if (object == null) {
-            return false;
-        }
-        boolean result = EventUtil.manager.callFlagRemove(id, object, cluster);
-        if (!result) {
-            cluster.settings.flags.put(id, object);
-            return false;
-        }
-        DBFunc.setFlags(cluster, cluster.settings.flags);
-        return true;
-    }
-
     public static void setPlotFlags(Plot origin, HashMap<Flag<?>, Object> flags) {
         for (Plot plot : origin.getConnectedPlots()) {
             if (flags != null && !flags.isEmpty()) {
@@ -248,20 +228,6 @@ public class FlagManager {
         }
     }
 
-    public static void setClusterFlags(PlotCluster cluster, Set<Flag> flags) {
-        if (flags != null && !flags.isEmpty()) {
-            cluster.settings.flags.clear();
-            for (Flag flag : flags) {
-                cluster.settings.flags.put(flag, flag);
-            }
-        } else if (cluster.settings.flags.isEmpty()) {
-            return;
-        } else {
-            cluster.settings.flags.clear();
-        }
-        DBFunc.setFlags(cluster, cluster.settings.flags);
-    }
-
     /**
      * Get a list of registered {@link Flag} objects based on player permissions.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 0a722b4d6..5466df8bc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -277,11 +277,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             id = rotate(id);
         }
         int pair = MathMan.pair(x, z);
-        BaseBlock[] existing = this.G_SCH.get(pair);
-        if (existing == null) {
-            existing = new BaseBlock[height];
-            this.G_SCH.put(pair, existing);
-        }
+        BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
         existing[y] = id;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
index 16fb343bf..3a4645cac 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
@@ -1,5 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.logger;
 
+@FunctionalInterface
 public interface ILogger {
     void log(String message);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
index bb466c082..1214a2769 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
@@ -4,9 +4,12 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.DebugExec;
 import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
 
+import javax.annotation.Nonnull;
 import javax.script.ScriptException;
 
 public abstract class Expression<T> {
+
+    @Nonnull
     public static <U> Expression<U> constant(final U value) {
         return new Expression<U>() {
             @Override public U evaluate(U arg) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 83af645cf..5a6f1c2ba 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -20,6 +20,7 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableSet;
 import com.sk89q.jnbt.CompoundTag;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.awt.geom.Area;
 import java.awt.geom.PathIterator;
@@ -32,2971 +33,2880 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * The plot class<br>
- * [IMPORTANT]
- * - Unclaimed plots will not have persistent information.
- * - Any information set/modified in an unclaimed object may not be reflected in other instances
- * - Using the `new` operator will create an unclaimed plot instance
- * - Use the methods from the PlotArea/PS/Location etc to get existing plots
+ * The plot class<br> [IMPORTANT] - Unclaimed plots will not have persistent information. - Any
+ * information set/modified in an unclaimed object may not be reflected in other instances - Using
+ * the `new` operator will create an unclaimed plot instance - Use the methods from the
+ * PlotArea/PS/Location etc to get existing plots
  */
 public class Plot {
 
-    /**
-     * @deprecated raw access is deprecated
-     */
-    @Deprecated private static HashSet<Plot> connected_cache;
-    private static HashSet<RegionWrapper> regions_cache;
-    /**
-     * The {@link PlotId}.
-     */
-    private final PlotId id;
-    /**
-     * plot owner
-     * (Merged plots can have multiple owners)
-     * Direct access is Deprecated: use getOwners()
-     */
-    @Deprecated public UUID owner;
-    /**
-     * Has the plot changed since the last save cycle?
-     */
-    public boolean countsTowardsMax = true;
-    /**
-     * Represents whatever the database manager needs it to: <br>
-     * - A value of -1 usually indicates the plot will not be stored in the DB<br>
-     * - A value of 0 usually indicates that the DB manager hasn't set a value<br>
-     *
-     * @deprecated magical
-     */
-    @Deprecated public int temp;
-    /**
-     * Plot creation timestamp (not accurate if the plot was created before this was implemented)<br>
-     * - Milliseconds since the epoch<br>
-     */
-    private long timestamp;
-    /**
-     * List of trusted (with plot permissions).
-     */
-    private HashSet<UUID> trusted;
-    /**
-     * List of members users (with plot permissions).
-     */
-    private HashSet<UUID> members;
-    /**
-     * List of denied players.
-     */
-    private HashSet<UUID> denied;
-    /**
-     * External settings class.
-     * - Please favor the methods over direct access to this class<br>
-     * - The methods are more likely to be left unchanged from version changes<br>
-     */
-    private PlotSettings settings;
-    /**
-     * The {@link PlotArea}.
-     */
-    private PlotArea area;
-    /**
-     * Session only plot metadata (session is until the server stops)<br>
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @see FlagManager
-     */
-    private ConcurrentHashMap<String, Object> meta;
-    /**
-     * The cached origin plot.
-     * - The origin plot is used for plot grouping and relational data
-     */
-    private Plot origin;
+  /**
+   * @deprecated raw access is deprecated
+   */
+  @Deprecated
+  private static HashSet<Plot> connected_cache;
+  private static HashSet<RegionWrapper> regions_cache;
+  /**
+   * The {@link PlotId}.
+   */
+  private final PlotId id;
+  /**
+   * plot owner (Merged plots can have multiple owners) Direct access is Deprecated: use
+   * getOwners()
+   */
+  @Deprecated
+  public UUID owner;
+  /**
+   * Has the plot changed since the last save cycle?
+   */
+  public boolean countsTowardsMax = true;
+  /**
+   * Represents whatever the database manager needs it to: <br> - A value of -1 usually indicates
+   * the plot will not be stored in the DB<br> - A value of 0 usually indicates that the DB manager
+   * hasn't set a value<br>
+   *
+   * @deprecated magical
+   */
+  @Deprecated
+  public int temp;
+  /**
+   * Plot creation timestamp (not accurate if the plot was created before this was implemented)<br>
+   * - Milliseconds since the epoch<br>
+   */
+  private long timestamp;
+  /**
+   * List of trusted (with plot permissions).
+   */
+  private HashSet<UUID> trusted;
+  /**
+   * List of members users (with plot permissions).
+   */
+  private HashSet<UUID> members;
+  /**
+   * List of denied players.
+   */
+  private HashSet<UUID> denied;
+  /**
+   * External settings class. - Please favor the methods over direct access to this class<br> - The
+   * methods are more likely to be left unchanged from version changes<br>
+   */
+  private PlotSettings settings;
+  /**
+   * The {@link PlotArea}.
+   */
+  @Nonnull
+  private PlotArea area;
+  /**
+   * Session only plot metadata (session is until the server stops)<br>
+   * <br>
+   * For persistent metadata use the flag system
+   *
+   * @see FlagManager
+   */
+  private ConcurrentHashMap<String, Object> meta;
+  /**
+   * The cached origin plot. - The origin plot is used for plot grouping and relational data
+   */
+  private Plot origin;
 
-    /**
-     * Constructor for a new plot.
-     * (Only changes after plot.create() will be properly set in the database)
-     *
-     * @param area  the PlotArea where the plot is located
-     * @param id    the plot id
-     * @param owner the plot owner
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(PlotArea area, PlotId id, UUID owner) {
-        this.area = area;
-        this.id = id;
-        this.owner = owner;
+  /**
+   * Constructor for a new plot. (Only changes after plot.create() will be properly set in the
+   * database)
+   *
+   * @param area the PlotArea where the plot is located
+   * @param id the plot id
+   * @param owner the plot owner
+   * @see Plot#getPlot(Location) for existing plots
+   */
+  public Plot(@Nonnull PlotArea area, PlotId id, UUID owner) {
+    this.area = area;
+    this.id = id;
+    this.owner = owner;
+  }
+
+  /**
+   * Constructor for an unowned plot. (Only changes after plot.create() will be properly set in the
+   * database)
+   *
+   * @param area the PlotArea where the plot is located
+   * @param id the plot id
+   * @see Plot#getPlot(Location) for existing plots
+   */
+  public Plot(@Nonnull PlotArea area, PlotId id) {
+    this.area = area;
+    this.id = id;
+  }
+
+  /**
+   * Constructor for a temporary plot (use -1 for temp)<br> The database will ignore any queries
+   * regarding temporary plots. Please note that some bulk plot management functions may still
+   * affect temporary plots (TODO: fix this)
+   *
+   * @param area the PlotArea where the plot is located
+   * @param id the plot id
+   * @param owner the owner of the plot
+   * @param temp Represents whatever the database manager needs it to
+   * @see Plot#getPlot(Location) for existing plots
+   */
+  public Plot(@Nonnull PlotArea area, PlotId id, UUID owner, int temp) {
+    this.area = area;
+    this.id = id;
+    this.owner = owner;
+    this.temp = temp;
+  }
+
+  /**
+   * Constructor for a saved plots (Used by the database manager when plots are fetched)
+   *
+   * @param id the plot id
+   * @param owner the plot owner
+   * @param trusted the plot trusted players
+   * @param denied the plot denied players
+   * @param merged array giving merged plots
+   * @see Plot#getPlot(Location) for existing plots
+   */
+  public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
+      HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
+      @Nonnull PlotArea area, boolean[] merged, long timestamp, int temp) {
+    this.id = id;
+    this.area = area;
+    this.owner = owner;
+    this.settings = new PlotSettings();
+    this.members = members;
+    this.trusted = trusted;
+    this.denied = denied;
+    this.settings.setAlias(alias);
+    this.settings.setPosition(position);
+    this.settings.setMerged(merged);
+    if (flags != null) {
+      for (Flag flag : flags) {
+        this.settings.flags.put(flag, flag);
+      }
     }
+    this.timestamp = timestamp;
+    this.temp = temp;
+  }
 
-    /**
-     * Constructor for an unowned plot.
-     * (Only changes after plot.create() will be properly set in the database)
-     *
-     * @param area the PlotArea where the plot is located
-     * @param id   the plot id
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(PlotArea area, PlotId id) {
-        this.area = area;
-        this.id = id;
+  /**
+   * Get a plot from a string e.g. [area];[id]
+   *
+   * @param defaultArea If no area is specified
+   * @param string plot id/area + id
+   * @return New or existing plot object
+   */
+  public static Plot fromString(PlotArea defaultArea, String string) {
+    String[] split = string.split(";|,");
+    if (split.length == 2) {
+      if (defaultArea != null) {
+        PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
+        return id != null ? defaultArea.getPlotAbs(id) : null;
+      }
+    } else if (split.length == 3) {
+      PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
+      if (pa != null) {
+        PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
+        return pa.getPlotAbs(id);
+      }
+    } else if (split.length == 4) {
+      PlotArea pa = PlotSquared.get().getPlotArea(split[0], split[1]);
+      if (pa != null) {
+        PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
+        return pa.getPlotAbs(id);
+      }
     }
+    return null;
+  }
 
-    /**
-     * Constructor for a temporary plot (use -1 for temp)<br>
-     * The database will ignore any queries regarding temporary plots.
-     * Please note that some bulk plot management functions may still affect temporary plots (TODO: fix this)
-     *
-     * @param area  the PlotArea where the plot is located
-     * @param id    the plot id
-     * @param owner the owner of the plot
-     * @param temp  Represents whatever the database manager needs it to
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(PlotArea area, PlotId id, UUID owner, int temp) {
-        this.area = area;
-        this.id = id;
-        this.owner = owner;
-        this.temp = temp;
+  /**
+   * Return a new/cached plot object at a given location.
+   *
+   * @param location the location of the plot
+   * @return plot at location or null
+   * @see PlotPlayer#getCurrentPlot() if a player is expected here.
+   */
+  public static Plot getPlot(Location location) {
+    PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
+    if (pa != null) {
+      return pa.getPlot(location);
     }
+    return null;
+  }
 
-    /**
-     * Constructor for a saved plots (Used by the database manager when plots are fetched)
-     *
-     * @param id      the plot id
-     * @param owner   the plot owner
-     * @param trusted the plot trusted players
-     * @param denied  the plot denied players
-     * @param merged  array giving merged plots
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
-        HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
-        PlotArea area, boolean[] merged, long timestamp, int temp) {
-        this.id = id;
-        this.area = area;
-        this.owner = owner;
-        this.settings = new PlotSettings();
-        this.members = members;
-        this.trusted = trusted;
-        this.denied = denied;
-        this.settings.setAlias(alias);
-        this.settings.setPosition(position);
-        this.settings.setMerged(merged);
-        if (flags != null) {
-            for (Flag flag : flags) {
-                this.settings.flags.put(flag, flag);
-            }
+  public String getWorldName() {
+    return area.worldname;
+  }
+
+  /**
+   * Session only plot metadata (session is until the server stops)<br>
+   * <br>
+   * For persistent metadata use the flag system
+   *
+   * @param key metadata key
+   * @param value metadata value
+   * @see FlagManager
+   */
+  public void setMeta(String key, Object value) {
+    if (this.meta == null) {
+      this.meta = new ConcurrentHashMap<>();
+    }
+    this.meta.put(key, value);
+  }
+
+  /**
+   * Get the metadata for a key<br>
+   * <br>
+   * For persistent metadata use the flag system
+   *
+   * @param key metadata key to get value for
+   * @return Object value
+   */
+  public Object getMeta(String key) {
+    if (this.meta != null) {
+      return this.meta.get(key);
+    }
+    return null;
+  }
+
+  /**
+   * Delete the metadata for a key<br> - metadata is session only - deleting other plugin's metadata
+   * may cause issues
+   *
+   * @param key key to delete
+   */
+  public void deleteMeta(String key) {
+    if (this.meta != null) {
+      this.meta.remove(key);
+    }
+  }
+
+  /**
+   * Get the cluster this plot is associated with
+   *
+   * @return the PlotCluster object, or null
+   */
+  public PlotCluster getCluster() {
+    return this.getArea().getCluster(this.id);
+  }
+
+  /**
+   * Efficiently get the players currently inside this plot<br> - Will return an empty list if no
+   * players are in the plot<br> - Remember, you can cast a PlotPlayer to it's respective
+   * implementation (BukkitPlayer, SpongePlayer) to obtain the player object
+   *
+   * @return list of PlotPlayer(s) or an empty list
+   */
+  public List<PlotPlayer> getPlayersInPlot() {
+    ArrayList<PlotPlayer> players = new ArrayList<>();
+    for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+      PlotPlayer pp = entry.getValue();
+      if (this.equals(pp.getCurrentPlot())) {
+        players.add(pp);
+      }
+    }
+    return players;
+  }
+
+  /**
+   * Check if the plot has an owner.
+   *
+   * @return false if there is no owner
+   */
+  public boolean hasOwner() {
+    return this.owner != null;
+  }
+
+  /**
+   * Check if a UUID is a plot owner (merged plots may have multiple owners)
+   *
+   * @param uuid the player uuid
+   * @return if the provided uuid is the owner of the plot
+   */
+  public boolean isOwner(UUID uuid) {
+    if (uuid.equals(this.owner)) {
+      return true;
+    }
+    if (!isMerged()) {
+      return false;
+    }
+    Set<Plot> connected = getConnectedPlots();
+    for (Plot current : connected) {
+      if (uuid.equals(current.owner)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public boolean isOwnerAbs(UUID uuid) {
+    return uuid.equals(this.owner);
+  }
+
+  /**
+   * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
+   *
+   * @return the plot owners
+   */
+  public Set<UUID> getOwners() {
+    if (this.owner == null) {
+      return ImmutableSet.of();
+    }
+    if (isMerged()) {
+      Set<Plot> plots = getConnectedPlots();
+      Plot[] array = plots.toArray(new Plot[0]);
+      ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
+      UUID last = this.owner;
+      owners.add(this.owner);
+      for (Plot current : array) {
+        if (last == null || current.owner.getMostSignificantBits() != last
+            .getMostSignificantBits()) {
+          owners.add(current.owner);
+          last = current.owner;
         }
-        this.timestamp = timestamp;
-        this.temp = temp;
+      }
+      return owners.build();
     }
+    return ImmutableSet.of(this.owner);
+  }
 
-    /**
-     * Get a plot from a string e.g. [area];[id]
-     *
-     * @param defaultArea If no area is specified
-     * @param string      plot id/area + id
-     * @return New or existing plot object
-     */
-    public static Plot fromString(PlotArea defaultArea, String string) {
-        String[] split = string.split(";|,");
-        if (split.length == 2) {
-            if (defaultArea != null) {
-                PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
-                return id != null ? defaultArea.getPlotAbs(id) : null;
-            }
-        } else if (split.length == 3) {
-            PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
-            if (pa != null) {
-                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
-                return pa.getPlotAbs(id);
-            }
-        } else if (split.length == 4) {
-            PlotArea pa = PlotSquared.get().getPlotArea(split[0], split[1]);
-            if (pa != null) {
-                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
-                return pa.getPlotAbs(id);
-            }
-        }
-        return null;
+  /**
+   * Check if the player is either the owner or on the trusted/added list.
+   *
+   * @param uuid uuid to check
+   * @return true if the player is added/trusted or is the owner
+   */
+  public boolean isAdded(UUID uuid) {
+    if (this.owner == null || getDenied().contains(uuid)) {
+      return false;
     }
-
-    /**
-     * Return a new/cached plot object at a given location.
-     *
-     * @param location the location of the plot
-     * @return plot at location or null
-     * @see PlotPlayer#getCurrentPlot() if a player is expected here.
-     */
-    public static Plot getPlot(Location location) {
-        PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
-        if (pa != null) {
-            return pa.getPlot(location);
-        }
-        return null;
+    if (isOwner(uuid)) {
+      return true;
     }
-
-    public String getWorldName() {
-        return area.worldname;
+    if (getMembers().contains(uuid)) {
+      return isOnline();
     }
-
-    /**
-     * Session only plot metadata (session is until the server stops)<br>
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @param key   metadata key
-     * @param value metadata value
-     * @see FlagManager
-     */
-    public void setMeta(String key, Object value) {
-        if (this.meta == null) {
-            this.meta = new ConcurrentHashMap<>();
-        }
-        this.meta.put(key, value);
+    if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.EVERYONE)) {
+      return true;
     }
-
-    /**
-     * Get the metadata for a key<br>
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @param key metadata key to get value for
-     * @return Object value
-     */
-    public Object getMeta(String key) {
-        if (this.meta != null) {
-            return this.meta.get(key);
-        }
-        return null;
+    if (getMembers().contains(DBFunc.EVERYONE)) {
+      return isOnline();
     }
+    return false;
+  }
 
-    /**
-     * Delete the metadata for a key<br>
-     * - metadata is session only
-     * - deleting other plugin's metadata may cause issues
-     *
-     * @param key key to delete
-     */
-    public void deleteMeta(String key) {
-        if (this.meta != null) {
-            this.meta.remove(key);
-        }
+  /**
+   * Should the player be denied from entering.
+   *
+   * @param uuid uuid to check
+   * @return boolean false if the player is allowed to enter
+   */
+  public boolean isDenied(UUID uuid) {
+    return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid)
+        || !this.isAdded(uuid) && this.denied.contains(uuid));
+  }
+
+  /**
+   * Get the {@link PlotId}.
+   */
+  @Nonnull
+  public PlotId getId() {
+    return this.id;
+  }
+
+  /**
+   * Get the plot world object for this plot<br> - The generic PlotArea object can be casted to its
+   * respective class for more control (e.g. HybridPlotWorld)
+   *
+   * @return PlotArea
+   */
+  @Nonnull
+  public PlotArea getArea() {
+    return this.area;
+  }
+
+  /**
+   * Assign this plot to a plot area.<br> (Mostly used during startup when worlds are being
+   * created)<br> Note: Using this when it doesn't make sense will result in strange behavior
+   *
+   * @param area area to assign to
+   */
+  public void setArea(@Nonnull PlotArea area) {
+    if (this.getArea() == area) {
+      return;
     }
+    this.area.removePlot(this.id);
+    this.area = area;
+    area.addPlot(this);
+  }
 
-    /**
-     * Get the cluster this plot is associated with
-     *
-     * @return the PlotCluster object, or null
-     */
-    public PlotCluster getCluster() {
-        return this.getArea().getCluster(this.id);
+  /**
+   * Get the plot manager object for this plot<br> - The generic PlotManager object can be casted to
+   * its respective class for more control (e.g. HybridPlotManager)
+   *
+   * @return PlotManager
+   */
+  public PlotManager getManager() {
+    return this.area.getPlotManager();
+  }
+
+  /**
+   * Get or create plot settings.
+   *
+   * @return PlotSettings
+   * @deprecated use equivalent plot method;
+   */
+  @Deprecated
+  @Nonnull
+  public PlotSettings getSettings() {
+    if (this.settings == null) {
+      this.settings = new PlotSettings();
     }
+    return this.settings;
+  }
 
-    /**
-     * Efficiently get the players currently inside this plot<br>
-     * - Will return an empty list if no players are in the plot<br>
-     * - Remember, you can cast a PlotPlayer to it's respective implementation (BukkitPlayer, SpongePlayer) to obtain the player object
-     *
-     * @return list of PlotPlayer(s) or an empty list
-     */
-    public List<PlotPlayer> getPlayersInPlot() {
-        ArrayList<PlotPlayer> players = new ArrayList<>();
-        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-            PlotPlayer pp = entry.getValue();
-            if (this.equals(pp.getCurrentPlot())) {
-                players.add(pp);
-            }
-        }
-        return players;
+  /**
+   * Returns true if the plot is not merged, or it is the base plot of multiple merged plots.
+   *
+   * @return Boolean
+   */
+  public boolean isBasePlot() {
+    return !this.isMerged() || this.equals(this.getBasePlot(false));
+  }
+
+  /**
+   * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
+   * - Merged plots need to be treated as a single plot for most purposes<br> - Some data such as
+   * home location needs to be associated with the group rather than each plot<br> - If the plot is
+   * not merged it will return itself.<br> - The result is cached locally
+   *
+   * @return base Plot
+   */
+  public Plot getBasePlot(boolean recalculate) {
+    if (this.origin != null && !recalculate) {
+      if (this.equals(this.origin)) {
+        return this;
+      }
+      return this.origin.getBasePlot(false);
     }
-
-    /**
-     * Check if the plot has an owner.
-     *
-     * @return false if there is no owner
-     */
-    public boolean hasOwner() {
-        return this.owner != null;
+    if (!this.isMerged()) {
+      this.origin = this;
+      return this.origin;
     }
+    this.origin = this;
+    PlotId min = this.id;
+    for (Plot plot : this.getConnectedPlots()) {
+      if (plot.id.y < min.y || plot.id.y == min.y && plot.id.x < min.x) {
+        this.origin = plot;
+        min = plot.id;
+      }
+    }
+    for (Plot plot : this.getConnectedPlots()) {
+      plot.origin = this.origin;
+    }
+    return this.origin;
+  }
 
-    /**
-     * Check if a UUID is a plot owner (merged plots may have multiple owners)
-     *
-     * @param uuid the player uuid
-     * @return if the provided uuid is the owner of the plot
-     */
-    public boolean isOwner(UUID uuid) {
-        if (uuid.equals(this.owner)) {
-            return true;
-        }
-        if (!isMerged()) {
-            return false;
-        }
-        Set<Plot> connected = getConnectedPlots();
-        for (Plot current : connected) {
-            if (uuid.equals(current.owner)) {
+  /**
+   * Check if the plot is merged in any direction.
+   *
+   * @return is the plot merged or not
+   */
+  public boolean isMerged() {
+    return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
+        .getMerged(1) || getSettings().getMerged(3);
+  }
+
+  /**
+   * Get the timestamp of when the plot was created (unreliable)<br> - not accurate if the plot was
+   * created before this was implemented<br> - Milliseconds since the epoch<br>
+   *
+   * @return the creation date of the plot
+   */
+  public long getTimestamp() {
+    if (this.timestamp == 0) {
+      this.timestamp = System.currentTimeMillis();
+    }
+    return this.timestamp;
+  }
+
+  /**
+   * Get if the plot is merged in a direction<br> ------- Actual -------<br> 0 = north<br> 1 =
+   * east<br> 2 = south<br> 3 = west<br> ----- Artificial -----<br> 4 = north-east<br> 5 =
+   * south-east<br> 6 = south-west<br> 7 = north-west<br> ----------<br> Note: A plot that is merged
+   * north and east will not be merged northeast if the northeast plot is not part of the same
+   * group<br>
+   *
+   * @param direction direction to check for merged plot
+   * @return true if merged in that direction
+   */
+  public boolean getMerged(int direction) {
+    if (this.settings == null) {
+      return false;
+    }
+    switch (direction) {
+      case 0:
+      case 1:
+      case 2:
+      case 3:
+        return this.getSettings().getMerged(direction);
+      case 7:
+        int i = direction - 4;
+        int i2 = 0;
+        if (this.getSettings().getMerged(i2)) {
+          if (this.getSettings().getMerged(i)) {
+            if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
+              if (this.area.getPlotAbs(this.id.getRelative(i2)).getMerged(i)) {
                 return true;
+              }
             }
+          }
         }
         return false;
-    }
+      case 4:
+      case 5:
+      case 6:
+        i = direction - 4;
+        i2 = direction - 3;
+        return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
+            && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
+            .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
 
-    public boolean isOwnerAbs(UUID uuid) {
-        return uuid.equals(this.owner);
     }
+    return false;
+  }
 
-    /**
-     * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
-     *
-     * @return the plot owners
-     */
-    public Set<UUID> getOwners() {
-        if (this.owner == null) {
-            return ImmutableSet.of();
-        }
-        if (isMerged()) {
-            Set<Plot> plots = getConnectedPlots();
-            Plot[] array = plots.toArray(new Plot[plots.size()]);
-            ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
-            UUID last = this.owner;
-            owners.add(this.owner);
-            for (Plot current : array) {
-                if (last == null || current.owner.getMostSignificantBits() != last
-                    .getMostSignificantBits()) {
-                    owners.add(current.owner);
-                    last = current.owner;
-                }
-            }
-            return owners.build();
-        }
-        return ImmutableSet.of(this.owner);
+  /**
+   * Get the denied users.
+   *
+   * @return a set of denied users
+   */
+  public HashSet<UUID> getDenied() {
+    if (this.denied == null) {
+      this.denied = new HashSet<>();
     }
+    return this.denied;
+  }
 
-    /**
-     * Check if the player is either the owner or on the trusted/added list.
-     *
-     * @param uuid uuid to check
-     * @return true if the player is added/trusted or is the owner
-     */
-    public boolean isAdded(UUID uuid) {
-        if (this.owner == null || getDenied().contains(uuid)) {
-            return false;
-        }
-        if (isOwner(uuid)) {
-            return true;
-        }
-        if (getMembers().contains(uuid)) {
-            return isOnline();
-        }
-        if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.EVERYONE)) {
-            return true;
-        }
-        if (getMembers().contains(DBFunc.EVERYONE)) {
-            return isOnline();
-        }
+  /**
+   * Set the denied users for this plot.
+   *
+   * @param uuids uuids to deny
+   */
+  public void setDenied(Set<UUID> uuids) {
+    boolean larger = uuids.size() > getDenied().size();
+    HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
+    intersection.retainAll(larger ? uuids : getDenied());
+    uuids.removeAll(intersection);
+    HashSet<UUID> toRemove = new HashSet<>(getDenied());
+    toRemove.removeAll(intersection);
+    for (UUID uuid : toRemove) {
+      removeDenied(uuid);
+    }
+    for (UUID uuid : uuids) {
+      addDenied(uuid);
+    }
+  }
+
+  /**
+   * Get the trusted users.
+   *
+   * @return a set of trusted users
+   */
+  public HashSet<UUID> getTrusted() {
+    if (this.trusted == null) {
+      this.trusted = new HashSet<>();
+    }
+    return this.trusted;
+  }
+
+  /**
+   * Set the trusted users for this plot.
+   *
+   * @param uuids uuids to trust
+   */
+  public void setTrusted(Set<UUID> uuids) {
+    boolean larger = uuids.size() > getTrusted().size();
+    HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
+    intersection.retainAll(larger ? uuids : getTrusted());
+    uuids.removeAll(intersection);
+    HashSet<UUID> toRemove = new HashSet<>(getTrusted());
+    toRemove.removeAll(intersection);
+    for (UUID uuid : toRemove) {
+      removeTrusted(uuid);
+    }
+    for (UUID uuid : uuids) {
+      addTrusted(uuid);
+    }
+  }
+
+  /**
+   * Get the members
+   *
+   * @return a set of members
+   */
+  public HashSet<UUID> getMembers() {
+    if (this.members == null) {
+      this.members = new HashSet<>();
+    }
+    return this.members;
+  }
+
+  /**
+   * Set the members for this plot
+   *
+   * @param uuids uuids to set member status for
+   */
+  public void setMembers(Set<UUID> uuids) {
+    boolean larger = uuids.size() > getMembers().size();
+    HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
+    intersection.retainAll(larger ? uuids : getMembers());
+    uuids.removeAll(intersection);
+    HashSet<UUID> toRemove = new HashSet<>(getMembers());
+    toRemove.removeAll(intersection);
+    for (UUID uuid : toRemove) {
+      removeMember(uuid);
+    }
+    for (UUID uuid : uuids) {
+      addMember(uuid);
+    }
+  }
+
+  /**
+   * Deny someone (updates database as well)
+   *
+   * @param uuid the uuid of the player to deny.
+   */
+  public void addDenied(UUID uuid) {
+    for (Plot current : getConnectedPlots()) {
+      if (current.getDenied().add(uuid)) {
+        DBFunc.setDenied(current, uuid);
+      }
+    }
+  }
+
+  /**
+   * Add someone as a helper (updates database as well)
+   *
+   * @param uuid the uuid of the player to trust
+   */
+  public void addTrusted(UUID uuid) {
+    for (Plot current : getConnectedPlots()) {
+      if (current.getTrusted().add(uuid)) {
+        DBFunc.setTrusted(current, uuid);
+      }
+    }
+  }
+
+  /**
+   * Add someone as a trusted user (updates database as well)
+   *
+   * @param uuid the uuid of the player to add as a member
+   */
+  public void addMember(UUID uuid) {
+    for (Plot current : getConnectedPlots()) {
+      if (current.getMembers().add(uuid)) {
+        DBFunc.setMember(current, uuid);
+      }
+    }
+  }
+
+  /**
+   * Set the plot owner (and update the database)
+   *
+   * @param owner uuid to set as owner
+   */
+  public void setOwner(UUID owner) {
+    if (!hasOwner()) {
+      this.owner = owner;
+      create();
+      return;
+    }
+    if (!isMerged()) {
+      if (!this.owner.equals(owner)) {
+        this.owner = owner;
+        DBFunc.setOwner(this, owner);
+      }
+      return;
+    }
+    for (Plot current : getConnectedPlots()) {
+      if (!owner.equals(current.owner)) {
+        current.owner = owner;
+        DBFunc.setOwner(current, owner);
+      }
+    }
+  }
+
+  /**
+   * Set the plot owner (and update the database)
+   *
+   * @param owner uuid to set as owner
+   * @param initiator player initiating set owner
+   * @return boolean
+   */
+  public boolean setOwner(UUID owner, PlotPlayer initiator) {
+    boolean result = EventUtil.manager
+        .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
+    if (!result) {
+      return false;
+    }
+    if (!hasOwner()) {
+      this.owner = owner;
+      create();
+      return true;
+    }
+    if (!isMerged()) {
+      if (!this.owner.equals(owner)) {
+        this.owner = owner;
+        DBFunc.setOwner(this, owner);
+      }
+      return true;
+    }
+    for (Plot current : getConnectedPlots()) {
+      if (!owner.equals(current.owner)) {
+        current.owner = owner;
+        DBFunc.setOwner(current, owner);
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Clear a plot.
+   *
+   * @param whenDone A runnable to execute when clearing finishes, or null
+   * @see this#clear(boolean, boolean, Runnable)
+   * @see #deletePlot(Runnable) to clear and delete a plot
+   */
+  public void clear(Runnable whenDone) {
+    this.clear(false, false, whenDone);
+  }
+
+  public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
+    if (checkRunning && this.getRunning() != 0) {
+      return false;
+    }
+    if (isDelete) {
+      if (!EventUtil.manager.callDelete(this)) {
         return false;
-    }
-
-    /**
-     * Should the player be denied from entering.
-     *
-     * @param uuid uuid to check
-     * @return boolean false if the player is allowed to enter
-     */
-    public boolean isDenied(UUID uuid) {
-        return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid)
-            || !this.isAdded(uuid) && this.denied.contains(uuid));
-    }
-
-    /**
-     * Get the {@link PlotId}.
-     */
-    public PlotId getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the plot world object for this plot<br>
-     * - The generic PlotArea object can be casted to its respective class for more control (e.g. HybridPlotWorld)
-     *
-     * @return PlotArea
-     */
-    public PlotArea getArea() {
-        return this.area;
-    }
-
-    /**
-     * Assign this plot to a plot area.<br>
-     * (Mostly used during startup when worlds are being created)<br>
-     * Note: Using this when it doesn't make sense will result in strange behavior
-     *
-     * @param area area to assign to
-     */
-    public void setArea(PlotArea area) {
-        if (this.getArea() == area) {
-            return;
-        }
-        if (this.getArea() != null) {
-            this.area.removePlot(this.id);
-        }
-        this.area = area;
-        area.addPlot(this);
-    }
-
-    /**
-     * Get the plot manager object for this plot<br>
-     * - The generic PlotManager object can be casted to its respective class for more control (e.g. HybridPlotManager)
-     *
-     * @return PlotManager
-     */
-    public PlotManager getManager() {
-        return this.area.getPlotManager();
-    }
-
-    /**
-     * Get or create plot settings.
-     *
-     * @return PlotSettings
-     * @deprecated use equivalent plot method;
-     */
-    @Deprecated public PlotSettings getSettings() {
-        if (this.settings == null) {
-            this.settings = new PlotSettings();
-        }
-        return this.settings;
-    }
-
-    /**
-     * Returns true if the plot is not merged, or it is the base
-     * plot of multiple merged plots.
-     *
-     * @return Boolean
-     */
-    public boolean isBasePlot() {
-        return !this.isMerged() || this.equals(this.getBasePlot(false));
-    }
-
-    /**
-     * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
-     * - Merged plots need to be treated as a single plot for most purposes<br>
-     * - Some data such as home location needs to be associated with the group rather than each plot<br>
-     * - If the plot is not merged it will return itself.<br>
-     * - The result is cached locally
-     *
-     * @return base Plot
-     */
-    public Plot getBasePlot(boolean recalculate) {
-        if (this.origin != null && !recalculate) {
-            if (this.equals(this.origin)) {
-                return this;
-            }
-            return this.origin.getBasePlot(false);
-        }
-        if (!this.isMerged()) {
-            this.origin = this;
-            return this.origin;
-        }
-        this.origin = this;
-        PlotId min = this.id;
-        for (Plot plot : this.getConnectedPlots()) {
-            if (plot.id.y < min.y || plot.id.y == min.y && plot.id.x < min.x) {
-                this.origin = plot;
-                min = plot.id;
-            }
-        }
-        for (Plot plot : this.getConnectedPlots()) {
-            plot.origin = this.origin;
-        }
-        return this.origin;
-    }
-
-    /**
-     * Check if the plot is merged in any direction.
-     *
-     * @return is the plot merged or not
-     */
-    public boolean isMerged() {
-        return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
-            .getMerged(1) || getSettings().getMerged(3);
-    }
-
-    /**
-     * Get the timestamp of when the plot was created (unreliable)<br>
-     * - not accurate if the plot was created before this was implemented<br>
-     * - Milliseconds since the epoch<br>
-     *
-     * @return the creation date of the plot
-     */
-    public long getTimestamp() {
-        if (this.timestamp == 0) {
-            this.timestamp = System.currentTimeMillis();
-        }
-        return this.timestamp;
-    }
-
-    /**
-     * Get if the plot is merged in a direction<br>
-     * ------- Actual -------<br>
-     * 0 = north<br>
-     * 1 = east<br>
-     * 2 = south<br>
-     * 3 = west<br>
-     * ----- Artificial -----<br>
-     * 4 = north-east<br>
-     * 5 = south-east<br>
-     * 6 = south-west<br>
-     * 7 = north-west<br>
-     * ----------<br>
-     * Note: A plot that is merged north and east will not be merged northeast if the northeast plot is not part of the same group<br>
-     *
-     * @param direction direction to check for merged plot
-     * @return true if merged in that direction
-     */
-    public boolean getMerged(int direction) {
-        if (this.settings == null) {
-            return false;
-        }
-        switch (direction) {
-            case 0:
-            case 1:
-            case 2:
-            case 3:
-                return this.getSettings().getMerged(direction);
-            case 7:
-                int i = direction - 4;
-                int i2 = 0;
-                if (this.getSettings().getMerged(i2)) {
-                    if (this.getSettings().getMerged(i)) {
-                        if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
-                            if (this.area.getPlotAbs(this.id.getRelative(i2)).getMerged(i)) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-                return false;
-            case 4:
-            case 5:
-            case 6:
-                i = direction - 4;
-                i2 = direction - 3;
-                return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
-                    && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
-                    .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
-
-        }
+      }
+    } else {
+      if (!EventUtil.manager.callClear(this)) {
         return false;
+      }
     }
-
-    /**
-     * Get the denied users.
-     *
-     * @return a set of denied users
-     */
-    public HashSet<UUID> getDenied() {
-        if (this.denied == null) {
-            this.denied = new HashSet<>();
-        }
-        return this.denied;
+    final HashSet<RegionWrapper> regions = this.getRegions();
+    final Set<Plot> plots = this.getConnectedPlots();
+    final ArrayDeque<Plot> queue = new ArrayDeque<>(plots);
+    if (isDelete) {
+      this.removeSign();
     }
-
-    /**
-     * Set the denied users for this plot.
-     *
-     * @param uuids uuids to deny
-     */
-    public void setDenied(Set<UUID> uuids) {
-        boolean larger = uuids.size() > getDenied().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
-        intersection.retainAll(larger ? uuids : getDenied());
-        uuids.removeAll(intersection);
-        HashSet<UUID> toRemove = new HashSet<>(getDenied());
-        toRemove.removeAll(intersection);
-        for (UUID uuid : toRemove) {
-            removeDenied(uuid);
-        }
-        for (UUID uuid : uuids) {
-            addDenied(uuid);
-        }
-    }
-
-    /**
-     * Get the trusted users.
-     *
-     * @return a set of trusted users
-     */
-    public HashSet<UUID> getTrusted() {
-        if (this.trusted == null) {
-            this.trusted = new HashSet<>();
-        }
-        return this.trusted;
-    }
-
-    /**
-     * Set the trusted users for this plot.
-     *
-     * @param uuids uuids to trust
-     */
-    public void setTrusted(Set<UUID> uuids) {
-        boolean larger = uuids.size() > getTrusted().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
-        intersection.retainAll(larger ? uuids : getTrusted());
-        uuids.removeAll(intersection);
-        HashSet<UUID> toRemove = new HashSet<>(getTrusted());
-        toRemove.removeAll(intersection);
-        for (UUID uuid : toRemove) {
-            removeTrusted(uuid);
-        }
-        for (UUID uuid : uuids) {
-            addTrusted(uuid);
-        }
-    }
-
-    /**
-     * Get the members
-     *
-     * @return a set of members
-     */
-    public HashSet<UUID> getMembers() {
-        if (this.members == null) {
-            this.members = new HashSet<>();
-        }
-        return this.members;
-    }
-
-    /**
-     * Set the members for this plot
-     *
-     * @param uuids uuids to set member status for
-     */
-    public void setMembers(Set<UUID> uuids) {
-        boolean larger = uuids.size() > getMembers().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
-        intersection.retainAll(larger ? uuids : getMembers());
-        uuids.removeAll(intersection);
-        HashSet<UUID> toRemove = new HashSet<>(getMembers());
-        toRemove.removeAll(intersection);
-        for (UUID uuid : toRemove) {
-            removeMember(uuid);
-        }
-        for (UUID uuid : uuids) {
-            addMember(uuid);
-        }
-    }
-
-    /**
-     * Deny someone (updates database as well)
-     *
-     * @param uuid the uuid of the player to deny.
-     */
-    public void addDenied(UUID uuid) {
-        for (Plot current : getConnectedPlots()) {
-            if (current.getDenied().add(uuid)) {
-                DBFunc.setDenied(current, uuid);
+    this.unlinkPlot(true, !isDelete);
+    final PlotManager manager = this.area.getPlotManager();
+    Runnable run = new Runnable() {
+      @Override
+      public void run() {
+        if (queue.isEmpty()) {
+          Runnable run = () -> {
+            for (RegionWrapper region : regions) {
+              Location[] corners = region.getCorners(getWorldName());
+              ChunkManager.manager.clearAllEntities(corners[0], corners[1]);
             }
+            TaskManager.runTask(whenDone);
+          };
+          for (Plot current : plots) {
+            if (isDelete || current.owner == null) {
+              manager.unclaimPlot(Plot.this.area, current, null);
+            } else {
+              manager.claimPlot(Plot.this.area, current);
+            }
+          }
+          GlobalBlockQueue.IMP.addTask(run);
+          return;
         }
+        Plot current = queue.poll();
+        if (Plot.this.area.TERRAIN != 0) {
+          ChunkManager.manager
+              .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
+          return;
+        }
+        manager.clearPlot(Plot.this.area, current, this);
+      }
+    };
+    run.run();
+    return true;
+  }
+
+  /**
+   * Set the biome for a plot asynchronously
+   *
+   * @param biome The biome e.g. "forest"
+   * @param whenDone The task to run when finished, or null
+   */
+  public void setBiome(final String biome, final Runnable whenDone) {
+    final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+    final int extendBiome;
+    if (area instanceof SquarePlotWorld) {
+      extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
+    } else {
+      extendBiome = 0;
     }
-
-    /**
-     * Add someone as a helper (updates database as well)
-     *
-     * @param uuid the uuid of the player to trust
-     */
-    public void addTrusted(UUID uuid) {
-        for (Plot current : getConnectedPlots()) {
-            if (current.getTrusted().add(uuid)) {
-                DBFunc.setTrusted(current, uuid);
-            }
+    Runnable run = new Runnable() {
+      @Override
+      public void run() {
+        if (regions.isEmpty()) {
+          Plot.this.refreshChunks();
+          TaskManager.runTask(whenDone);
+          return;
         }
+        RegionWrapper region = regions.poll();
+        Location pos1 = new Location(getWorldName(), region.minX - extendBiome, region.minY,
+            region.minZ - extendBiome);
+        Location pos2 = new Location(getWorldName(), region.maxX + extendBiome, region.maxY,
+            region.maxZ + extendBiome);
+        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+          @Override
+          public void run(int[] value) {
+            ChunkLoc loc = new ChunkLoc(value[0], value[1]);
+            ChunkManager.manager.loadChunk(getWorldName(), loc, false);
+            MainUtil.setBiome(getWorldName(), value[2], value[3], value[4], value[5],
+                biome);
+            ChunkManager.manager.unloadChunk(getWorldName(), loc, true, true);
+          }
+        }, this, 5);
+
+      }
+    };
+    run.run();
+  }
+
+  /**
+   * Unlink the plot and all connected plots.
+   *
+   * @param createSign whether to recreate signs
+   * @param createRoad whether to recreate road
+   * @return success/!cancelled
+   */
+  public boolean unlinkPlot(boolean createRoad, boolean createSign) {
+    if (!this.isMerged()) {
+      return false;
     }
-
-    /**
-     * Add someone as a trusted user (updates database as well)
-     *
-     * @param uuid the uuid of the player to add as a member
-     */
-    public void addMember(UUID uuid) {
-        for (Plot current : getConnectedPlots()) {
-            if (current.getMembers().add(uuid)) {
-                DBFunc.setMember(current, uuid);
-            }
-        }
+    final Set<Plot> plots = this.getConnectedPlots();
+    ArrayList<PlotId> ids = new ArrayList<>(plots.size());
+    for (Plot current : plots) {
+      current.setHome(null);
+      ids.add(current.getId());
     }
-
-    /**
-     * Set the plot owner (and update the database)
-     *
-     * @param owner uuid to set as owner
-     */
-    public void setOwner(UUID owner) {
-        if (!hasOwner()) {
-            this.owner = owner;
-            create();
-            return;
-        }
-        if (!isMerged()) {
-            if (!this.owner.equals(owner)) {
-                this.owner = owner;
-                DBFunc.setOwner(this, owner);
-            }
-            return;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (!owner.equals(current.owner)) {
-                current.owner = owner;
-                DBFunc.setOwner(current, owner);
-            }
-        }
+    boolean result = EventUtil.manager.callUnlink(this.area, ids);
+    if (!result) {
+      return false;
     }
-
-    /**
-     * Set the plot owner (and update the database)
-     *
-     * @param owner     uuid to set as owner
-     * @param initiator player initiating set owner
-     * @return boolean
-     */
-    public boolean setOwner(UUID owner, PlotPlayer initiator) {
-        boolean result = EventUtil.manager
-            .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
-        if (!result)
-            return false;
-        if (!hasOwner()) {
-            this.owner = owner;
-            create();
-            return true;
-        }
-        if (!isMerged()) {
-            if (!this.owner.equals(owner)) {
-                this.owner = owner;
-                DBFunc.setOwner(this, owner);
-            }
-            return true;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (!owner.equals(current.owner)) {
-                current.owner = owner;
-                DBFunc.setOwner(current, owner);
-            }
-        }
-        return true;
+    this.clearRatings();
+    if (createSign) {
+      this.removeSign();
     }
-
-    /**
-     * Clear a plot.
-     *
-     * @param whenDone A runnable to execute when clearing finishes, or null
-     * @see this#clear(boolean, boolean, Runnable)
-     * @see #deletePlot(Runnable) to clear and delete a plot
-     */
-    public void clear(Runnable whenDone) {
-        this.clear(false, false, whenDone);
+    PlotManager manager = this.area.getPlotManager();
+    if (createRoad) {
+      manager.startPlotUnlink(this.area, ids);
     }
-
-    public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
-        if (checkRunning && this.getRunning() != 0) {
-            return false;
-        }
-        if (isDelete) {
-            if (!EventUtil.manager.callDelete(this)) {
-                return false;
-            }
-        } else {
-            if (!EventUtil.manager.callClear(this)) {
-                return false;
+    if (this.area.TERRAIN != 3 && createRoad) {
+      for (Plot current : plots) {
+        if (current.getMerged(1)) {
+          manager.createRoadEast(current.area, current);
+          if (current.getMerged(2)) {
+            manager.createRoadSouth(current.area, current);
+            if (current.getMerged(5)) {
+              manager.createRoadSouthEast(current.area, current);
             }
+          }
+        } else if (current.getMerged(2)) {
+          manager.createRoadSouth(current.area, current);
         }
-        final HashSet<RegionWrapper> regions = this.getRegions();
-        final Set<Plot> plots = this.getConnectedPlots();
-        final ArrayDeque<Plot> queue = new ArrayDeque<>(plots);
-        if (isDelete) {
-            this.removeSign();
-        }
-        this.unlinkPlot(true, !isDelete);
-        final PlotManager manager = this.area.getPlotManager();
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (queue.isEmpty()) {
-                    Runnable run = () -> {
-                        for (RegionWrapper region : regions) {
-                            Location[] corners = region.getCorners(getWorldName());
-                            ChunkManager.manager.clearAllEntities(corners[0], corners[1]);
-                        }
-                        TaskManager.runTask(whenDone);
-                    };
-                    for (Plot current : plots) {
-                        if (isDelete || current.owner == null) {
-                            manager.unclaimPlot(Plot.this.area, current, null);
-                        } else {
-                            manager.claimPlot(Plot.this.area, current);
-                        }
-                    }
-                    GlobalBlockQueue.IMP.addTask(run);
-                    return;
-                }
-                Plot current = queue.poll();
-                if (Plot.this.area.TERRAIN != 0) {
-                    ChunkManager.manager
-                        .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
-                    return;
-                }
-                manager.clearPlot(Plot.this.area, current, this);
-            }
-        };
-        run.run();
-        return true;
+      }
     }
-
-    /**
-     * Set the biome for a plot asynchronously
-     *
-     * @param biome    The biome e.g. "forest"
-     * @param whenDone The task to run when finished, or null
-     */
-    public void setBiome(final String biome, final Runnable whenDone) {
-        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-        final int extendBiome;
-        if (area instanceof SquarePlotWorld) {
-            extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
-        } else {
-            extendBiome = 0;
-        }
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    Plot.this.refreshChunks();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location pos1 = new Location(getWorldName(), region.minX - extendBiome, region.minY,
-                    region.minZ - extendBiome);
-                Location pos2 = new Location(getWorldName(), region.maxX + extendBiome, region.maxY,
-                    region.maxZ + extendBiome);
-                ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-                    @Override public void run(int[] value) {
-                        ChunkLoc loc = new ChunkLoc(value[0], value[1]);
-                        ChunkManager.manager.loadChunk(getWorldName(), loc, false);
-                        MainUtil.setBiome(getWorldName(), value[2], value[3], value[4], value[5],
-                            biome);
-                        ChunkManager.manager.unloadChunk(getWorldName(), loc, true, true);
-                    }
-                }, this, 5);
-
-            }
-        };
-        run.run();
+    for (Plot current : plots) {
+      boolean[] merged = new boolean[]{false, false, false, false};
+      current.setMerged(merged);
     }
-
-    /**
-     * Unlink the plot and all connected plots.
-     *
-     * @param createSign whether to recreate signs
-     * @param createRoad whether to recreate road
-     * @return success/!cancelled
-     */
-    public boolean unlinkPlot(boolean createRoad, boolean createSign) {
-        if (!this.isMerged()) {
-            return false;
-        }
-        final Set<Plot> plots = this.getConnectedPlots();
-        ArrayList<PlotId> ids = new ArrayList<>(plots.size());
+    if (createSign) {
+      GlobalBlockQueue.IMP.addTask(() -> {
         for (Plot current : plots) {
-            current.setHome(null);
-            ids.add(current.getId());
+          current.setSign(MainUtil.getName(current.owner));
         }
-        boolean result = EventUtil.manager.callUnlink(this.area, ids);
-        if (!result) {
-            return false;
+      });
+    }
+    if (createRoad) {
+      manager.finishPlotUnlink(this.area, ids);
+    }
+    return true;
+  }
+
+  /**
+   * Set the sign for a plot to a specific name
+   *
+   * @param name name
+   */
+  public void setSign(final String name) {
+    if (!isLoaded()) {
+      return;
+    }
+    if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+      TaskManager.runTask(() -> Plot.this.setSign(name));
+      return;
+    }
+    if (name == null) {
+      PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
+      return;
+    }
+    PlotManager manager = this.area.getPlotManager();
+    if (this.area.ALLOW_SIGNS) {
+      Location loc = manager.getSignLoc(this.area, this);
+      String id = this.id.x + ";" + this.id.y;
+      String[] lines = new String[]{C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
+          C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
+          C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
+          C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
+      WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
+    }
+  }
+
+  protected boolean isLoaded() {
+    return WorldUtil.IMP.isWorld(getWorldName());
+  }
+
+  /**
+   * This will return null if the plot hasn't been analyzed
+   *
+   * @return analysis of plot
+   */
+  public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
+    return PlotAnalysis.getAnalysis(this, settings);
+  }
+
+  public void analyze(RunnableVal<PlotAnalysis> whenDone) {
+    PlotAnalysis.analyzePlot(this, whenDone);
+  }
+
+  /**
+   * Set a flag for this plot
+   *
+   * @param flag Flag to set
+   * @param value Flag value
+   */
+  public <V> boolean setFlag(Flag<V> flag, Object value) {
+    if (flag == Flags.KEEP && ExpireManager.IMP != null) {
+      ExpireManager.IMP.updateExpired(this);
+    }
+    return FlagManager.addPlotFlag(this, flag, value);
+  }
+
+  /**
+   * Remove a flag from this plot
+   *
+   * @param flag the flag to remove
+   * @return success
+   */
+  public boolean removeFlag(Flag<?> flag) {
+    return FlagManager.removePlotFlag(this, flag);
+  }
+
+  /**
+   * Get the flag for a given key
+   *
+   * @param key Flag to get value for
+   */
+  public <V> Optional<V> getFlag(Flag<V> key) {
+    return FlagManager.getPlotFlag(this, key);
+  }
+
+  /**
+   * Get the flag for a given key
+   *
+   * @param key the flag
+   * @param defaultValue if the key is null, the value to return
+   */
+  public <V> V getFlag(Flag<V> key, V defaultValue) {
+    V value = FlagManager.getPlotFlagRaw(this, key);
+    if (value == null) {
+      return defaultValue;
+    } else {
+      return value;
+    }
+  }
+
+  /**
+   * Delete a plot (use null for the runnable if you don't need to be notified on completion)
+   *
+   * @see PlotSquared#removePlot(Plot, boolean)
+   * @see #clear(Runnable) to simply clear a plot
+   */
+  public boolean deletePlot(final Runnable whenDone) {
+    if (!this.hasOwner()) {
+      return false;
+    }
+    final Set<Plot> plots = this.getConnectedPlots();
+    this.clear(false, true, () -> {
+      for (Plot current : plots) {
+        current.unclaim();
+      }
+      TaskManager.runTask(whenDone);
+    });
+    return true;
+  }
+
+  /**
+   * Count the entities in a plot
+   *
+   * @return array of entity counts
+   * @see ChunkManager#countEntities(Plot) 0 = Entity 1 = Animal 2 = Monster 3 = Mob 4 = Boat 5 =
+   * Misc
+   */
+  public int[] countEntities() {
+    int[] count = new int[6];
+    for (Plot current : this.getConnectedPlots()) {
+      int[] result = ChunkManager.manager.countEntities(current);
+      count[0] += result[0];
+      count[1] += result[1];
+      count[2] += result[2];
+      count[3] += result[3];
+      count[4] += result[4];
+      count[5] += result[5];
+    }
+    return count;
+  }
+
+  /**
+   * Returns true if a previous task was running
+   *
+   * @return true if a previous task is running
+   */
+  public int addRunning() {
+    int value = this.getRunning();
+    for (Plot plot : this.getConnectedPlots()) {
+      plot.setMeta("running", value + 1);
+    }
+    return value;
+  }
+
+  /**
+   * Decrement the number of tracked tasks this plot is running<br> - Used to track/limit the number
+   * of things a player can do on the plot at once
+   *
+   * @return previous number of tasks (int)
+   */
+  public int removeRunning() {
+    int value = this.getRunning();
+    if (value < 2) {
+      for (Plot plot : this.getConnectedPlots()) {
+        plot.deleteMeta("running");
+      }
+    } else {
+      for (Plot plot : this.getConnectedPlots()) {
+        plot.setMeta("running", value - 1);
+      }
+    }
+    return value;
+  }
+
+  /**
+   * Get the number of tracked running tasks for this plot<br> - Used to track/limit the number of
+   * things a player can do on the plot at once
+   *
+   * @return number of tasks (int)
+   */
+  public int getRunning() {
+    Integer value = (Integer) this.getMeta("running");
+    return value == null ? 0 : value;
+  }
+
+  /**
+   * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in
+   * unclaimed plot objects.
+   *
+   * @return false if the Plot has no owner, otherwise true.
+   */
+  public boolean unclaim() {
+    if (this.owner == null) {
+      return false;
+    }
+    for (Plot current : getConnectedPlots()) {
+      List<PlotPlayer> players = current.getPlayersInPlot();
+      for (PlotPlayer pp : players) {
+        PlotListener.plotExit(pp, current);
+      }
+      getArea().removePlot(getId());
+      DBFunc.delete(current);
+      current.owner = null;
+      current.settings = null;
+      for (PlotPlayer pp : players) {
+        PlotListener.plotEntry(pp, current);
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Unlink a plot and remove the roads
+   *
+   * @return true if plot was linked
+   * @see this#unlinkPlot(boolean, boolean)
+   */
+  public boolean unlink() {
+    return this.unlinkPlot(true, true);
+  }
+
+  public Location getCenter() {
+    Location[] corners = getCorners();
+    Location top = corners[0];
+    Location bot = corners[1];
+    Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
+        MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
+    if (!isLoaded()) {
+      return loc;
+    }
+    int y =
+        isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
+    if (area.ALLOW_SIGNS) {
+      y = Math.max(y, getManager().getSignLoc(area, this).getY());
+    }
+    loc.setY(1 + y);
+    return loc;
+  }
+
+  public Location getSide() {
+    RegionWrapper largest = getLargestRegion();
+    int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
+    int z = largest.minZ - 1;
+    PlotManager manager = getManager();
+    int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
+    if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
+      y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
+    }
+    return new Location(getWorldName(), x, y + 1, z);
+  }
+
+  /**
+   * Return the home location for the plot
+   *
+   * @return Home location
+   */
+  public Location getHome() {
+    BlockLoc home = this.getPosition();
+    if (home == null || home.x == 0 && home.z == 0) {
+      return this.getDefaultHome(true);
+    } else {
+      Location bot = this.getBottomAbs();
+      Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
+          bot.getZ() + home.z, home.yaw, home.pitch);
+      if (!isLoaded()) {
+        return loc;
+      }
+      if (!WorldUtil.IMP.getBlock(loc).isAir()) {
+        loc.setY(Math.max(
+            1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
+            bot.getY()));
+      }
+      return loc;
+    }
+  }
+
+  /**
+   * Set the home location
+   *
+   * @param location location to set as home
+   */
+  public void setHome(BlockLoc location) {
+    Plot plot = this.getBasePlot(false);
+    if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
+      return;
+    }
+    plot.getSettings().setPosition(location);
+    if (location != null) {
+      DBFunc.setPosition(plot, plot.getSettings().getPosition().toString());
+      return;
+    }
+    DBFunc.setPosition(plot, null);
+  }
+
+  /**
+   * Get the default home location for a plot<br> - Ignores any home location set for that specific
+   * plot
+   *
+   * @return Location
+   */
+  public Location getDefaultHome() {
+    return getDefaultHome(false);
+  }
+
+  public Location getDefaultHome(boolean member) {
+    Plot plot = this.getBasePlot(false);
+    PlotLoc loc = member ? area.DEFAULT_HOME : area.NONMEMBER_HOME;
+    if (loc != null) {
+      int x;
+      int z;
+      if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
+        // center
+        RegionWrapper largest = plot.getLargestRegion();
+        x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
+        z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
+      } else {
+        // specific
+        Location bot = plot.getBottomAbs();
+        x = bot.getX() + loc.x;
+        z = bot.getZ() + loc.z;
+      }
+      int y = loc.y < 1 ?
+          (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
+          loc.y;
+      PlotSquared.log("Getting home with Y " + y);
+      return new Location(plot.getWorldName(), x, y, z);
+    }
+    // Side
+    return plot.getSide();
+  }
+
+  public double getVolume() {
+    double count = 0;
+    for (RegionWrapper region : getRegions()) {
+      count +=
+          (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
+              * 256;
+    }
+    return count;
+  }
+
+  /**
+   * Get the average rating of the plot. This is the value displayed in /plot info
+   *
+   * @return average rating as double
+   */
+  public double getAverageRating() {
+    double sum = 0;
+    Collection<Rating> ratings = this.getRatings().values();
+    for (Rating rating : ratings) {
+      sum += rating.getAverageRating();
+    }
+    return sum / ratings.size();
+  }
+
+  /**
+   * Set a rating for a user<br> - If the user has already rated, the following will return false
+   *
+   * @param uuid uuid of rater
+   * @param rating rating
+   * @return success
+   */
+  public boolean addRating(UUID uuid, Rating rating) {
+    Plot base = this.getBasePlot(false);
+    PlotSettings baseSettings = base.getSettings();
+    if (baseSettings.getRatings().containsKey(uuid)) {
+      return false;
+    }
+    int aggregate = rating.getAggregate();
+    baseSettings.getRatings().put(uuid, aggregate);
+    DBFunc.setRating(base, uuid, aggregate);
+    return true;
+  }
+
+  /**
+   * Clear the ratings for this plot
+   */
+  public void clearRatings() {
+    Plot base = this.getBasePlot(false);
+    PlotSettings baseSettings = base.getSettings();
+    if (baseSettings.ratings != null && !baseSettings.getRatings().isEmpty()) {
+      DBFunc.deleteRatings(base);
+      baseSettings.ratings = null;
+    }
+  }
+
+  /**
+   * Get the ratings associated with a plot<br> - The rating object may contain multiple categories
+   *
+   * @return Map of user who rated to the rating
+   */
+  public HashMap<UUID, Rating> getRatings() {
+    Plot base = this.getBasePlot(false);
+    HashMap<UUID, Rating> map = new HashMap<>();
+    if (!base.hasRatings()) {
+      return map;
+    }
+    for (Entry<UUID, Integer> entry : base.getSettings().getRatings().entrySet()) {
+      map.put(entry.getKey(), new Rating(entry.getValue()));
+    }
+    return map;
+  }
+
+  public boolean hasRatings() {
+    Plot base = this.getBasePlot(false);
+    return base.settings != null && base.settings.ratings != null;
+  }
+
+  /**
+   * Resend all chunks inside the plot to nearby players<br> This should not need to be called
+   */
+  public void refreshChunks() {
+    LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
+    HashSet<ChunkLoc> chunks = new HashSet<>();
+    for (RegionWrapper region : Plot.this.getRegions()) {
+      for (int x = region.minX >> 4; x <= region.maxX >> 4; x++) {
+        for (int z = region.minZ >> 4; z <= region.maxZ >> 4; z++) {
+          if (chunks.add(new ChunkLoc(x, z))) {
+            queue.refreshChunk(x, z);
+          }
         }
-        this.clearRatings();
-        if (createSign) {
-            this.removeSign();
-        }
-        PlotManager manager = this.area.getPlotManager();
-        if (createRoad) {
-            manager.startPlotUnlink(this.area, ids);
-        }
-        if (this.area.TERRAIN != 3 && createRoad) {
-            for (Plot current : plots) {
-                if (current.getMerged(1)) {
-                    manager.createRoadEast(current.area, current);
-                    if (current.getMerged(2)) {
-                        manager.createRoadSouth(current.area, current);
-                        if (current.getMerged(5)) {
-                            manager.createRoadSouthEast(current.area, current);
-                        }
-                    }
-                } else if (current.getMerged(2)) {
-                    manager.createRoadSouth(current.area, current);
-                }
-            }
-        }
-        for (Plot current : plots) {
-            boolean[] merged = new boolean[] {false, false, false, false};
-            current.setMerged(merged);
-        }
-        if (createSign) {
-            GlobalBlockQueue.IMP.addTask(() -> {
-                for (Plot current : plots) {
-                    current.setSign(MainUtil.getName(current.owner));
-                }
-            });
-        }
-        if (createRoad) {
-            manager.finishPlotUnlink(this.area, ids);
+      }
+    }
+  }
+
+  /**
+   * Remove the plot sign if it is set.
+   */
+  public void removeSign() {
+    PlotManager manager = this.area.getPlotManager();
+    if (!this.area.ALLOW_SIGNS) {
+      return;
+    }
+    Location loc = manager.getSignLoc(this.area, this);
+    LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
+    queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
+    queue.flush();
+  }
+
+  /**
+   * Set the plot sign if plot signs are enabled.
+   */
+  public void setSign() {
+    if (this.owner == null) {
+      this.setSign("unknown");
+      return;
+    }
+    this.setSign(UUIDHandler.getName(this.owner));
+  }
+
+  /**
+   * Register a plot and create it in the database<br> - The plot will not be created if the owner
+   * is null<br> - Any setting from before plot creation will not be saved until the server is
+   * stopped properly. i.e. Set any values/options after plot creation.
+   *
+   * @return true if plot was created successfully
+   */
+  public boolean create() {
+    return this.create(this.owner, true);
+  }
+
+  public boolean claim(final PlotPlayer player, boolean teleport, String schematic) {
+    if (!canClaim(player)) {
+      return false;
+    }
+    return claim(player, teleport, schematic, true);
+  }
+
+  public boolean claim(final PlotPlayer player, boolean teleport, String schematic,
+      boolean updateDB) {
+    boolean result = EventUtil.manager.callClaim(player, this, false);
+    if (updateDB) {
+      if (!result || (!create(player.getUUID(), true))) {
+        return false;
+      }
+    } else {
+      area.addPlot(this);
+    }
+    setSign(player.getName());
+    MainUtil.sendMessage(player, C.CLAIMED);
+    if (teleport) {
+      teleportPlayer(player);
+    }
+    PlotArea plotworld = getArea();
+    if (plotworld.SCHEMATIC_ON_CLAIM) {
+      Schematic sch;
+      try {
+        if (schematic == null || schematic.isEmpty()) {
+          sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
+        } else {
+          sch = SchematicHandler.manager.getSchematic(schematic);
+          if (sch == null) {
+            sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
+          }
         }
+      } catch (SchematicHandler.UnsupportedFormatException e) {
+        e.printStackTrace();
         return true;
+      }
+      SchematicHandler.manager
+          .paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP, new RunnableVal<Boolean>() {
+            @Override
+            public void run(Boolean value) {
+              if (value) {
+                MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+              } else {
+                MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+              }
+            }
+          });
     }
+    plotworld.getPlotManager().claimPlot(plotworld, this);
+    return true;
+  }
 
-    /**
-     * Set the sign for a plot to a specific name
-     *
-     * @param name name
-     */
-    public void setSign(final String name) {
-        if (!isLoaded())
-            return;
-        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-            TaskManager.runTask(() -> Plot.this.setSign(name));
-            return;
-        }
-        if(name == null) {
-            PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
-            return;
-        }
-        PlotManager manager = this.area.getPlotManager();
-        if (this.area.ALLOW_SIGNS) {
-            Location loc = manager.getSignLoc(this.area, this);
-            String id = this.id.x + ";" + this.id.y;
-            String[] lines = new String[] {C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
-                C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-                C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-                C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
-            WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
+  /**
+   * Register a plot and create it in the database<br> - The plot will not be created if the owner
+   * is null<br> - Any setting from before plot creation will not be saved until the server is
+   * stopped properly. i.e. Set any values/options after plot creation.
+   *
+   * @param uuid the uuid of the plot owner
+   * @param notify notify
+   * @return true if plot was created successfully
+   */
+  public boolean create(final UUID uuid, final boolean notify) {
+    if (uuid == null) {
+      throw new IllegalArgumentException("UUID cannot be null");
+    }
+    this.owner = uuid;
+    Plot existing = this.area.getOwnedPlotAbs(this.id);
+    if (existing != null) {
+      throw new IllegalStateException("Plot already exists!");
+    }
+    if (notify) {
+      Integer meta = (Integer) this.area.getMeta("worldBorder");
+      if (meta != null) {
+        this.updateWorldBorder();
+      }
+    }
+    connected_cache = null;
+    regions_cache = null;
+    this.getTrusted().clear();
+    this.getMembers().clear();
+    this.getDenied().clear();
+    this.settings = new PlotSettings();
+    if (this.area.addPlot(this)) {
+      DBFunc.createPlotAndSettings(this, () -> {
+        PlotArea plotworld = Plot.this.area;
+        if (notify && plotworld.AUTO_MERGE) {
+          Plot.this.autoMerge(-1, Integer.MAX_VALUE, uuid, true);
         }
+      });
+      return true;
     }
+    return false;
+  }
 
-    protected boolean isLoaded() {
-        return WorldUtil.IMP.isWorld(getWorldName());
+  /**
+   * Set components such as border, wall, floor. (components are generator specific)
+   */
+  public boolean setComponent(String component, String blocks) {
+    BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
+    return !(parsed == null || parsed.isEmpty()) && this.setComponent(component, parsed);
+  }
+
+  /**
+   * Retrieve the biome of the plot.
+   *
+   * @return the name of the biome
+   */
+  public String getBiome() {
+    Location loc = this.getCenter();
+    return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
+  }
+
+  /**
+   * Return the top location for the plot.
+   */
+  public Location getTopAbs() {
+    Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
+    top.setWorld(getWorldName());
+    return top;
+  }
+
+  /**
+   * Return the bottom location for the plot.
+   */
+  public Location getBottomAbs() {
+    Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
+    loc.setWorld(getWorldName());
+    return loc;
+  }
+
+  /**
+   * Swap the settings for two plots.
+   *
+   * @param plot the plot to swap data with
+   * @param whenDone the task to run at the end of this method.
+   */
+  public boolean swapData(Plot plot, Runnable whenDone) {
+    if (this.owner == null) {
+      if (plot != null && plot.hasOwner()) {
+        plot.moveData(this, whenDone);
+        return true;
+      }
+      return false;
     }
-
-    /**
-     * This will return null if the plot hasn't been analyzed
-     *
-     * @return analysis of plot
-     */
-    public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
-        return PlotAnalysis.getAnalysis(this, settings);
+    if (plot == null || plot.owner == null) {
+      this.moveData(plot, whenDone);
+      return true;
     }
+    // Swap cached
+    PlotId temp = new PlotId(this.getId().x, this.getId().y);
+    this.getId().x = plot.getId().x;
+    this.getId().y = plot.getId().y;
+    plot.getId().x = temp.x;
+    plot.getId().y = temp.y;
+    this.area.removePlot(this.getId());
+    plot.area.removePlot(plot.getId());
+    this.getId().recalculateHash();
+    plot.getId().recalculateHash();
+    this.area.addPlotAbs(this);
+    plot.area.addPlotAbs(plot);
+    // Swap database
+    DBFunc.swapPlots(plot, this);
+    TaskManager.runTaskLater(whenDone, 1);
+    return true;
+  }
 
-    public void analyze(RunnableVal<PlotAnalysis> whenDone) {
-        PlotAnalysis.analyzePlot(this, whenDone);
+  /**
+   * Move the settings for a plot.
+   *
+   * @param plot the plot to move
+   */
+  public boolean moveData(Plot plot, Runnable whenDone) {
+    if (this.owner == null) {
+      PlotSquared.debug(plot + " is unowned (single)");
+      TaskManager.runTask(whenDone);
+      return false;
     }
-
-    /**
-     * Set a flag for this plot
-     *
-     * @param flag  Flag to set
-     * @param value Flag value
-     */
-    public <V> boolean setFlag(Flag<V> flag, Object value) {
-        if (flag == Flags.KEEP && ExpireManager.IMP != null) {
-            ExpireManager.IMP.updateExpired(this);
-        }
-        return FlagManager.addPlotFlag(this, flag, value);
+    if (plot.hasOwner()) {
+      PlotSquared.debug(plot + " is unowned (multi)");
+      TaskManager.runTask(whenDone);
+      return false;
     }
+    this.area.removePlot(this.id);
+    this.getId().x = plot.getId().x;
+    this.getId().y = plot.getId().y;
+    this.getId().recalculateHash();
+    this.area.addPlotAbs(this);
+    DBFunc.movePlot(this, plot);
+    TaskManager.runTaskLater(whenDone, 1);
+    return true;
+  }
 
-    /**
-     * Remove a flag from this plot
-     *
-     * @param flag the flag to remove
-     * @return success
-     */
-    public boolean removeFlag(Flag<?> flag) {
-        return FlagManager.removePlotFlag(this, flag);
+  /**
+   * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like
+   * each plot treated as a small plot use getPlotTopLocAbs(...)
+   *
+   * @return Location top of mega plot
+   */
+  public Location getExtendedTopAbs() {
+    Location top = this.getTopAbs();
+    if (!this.isMerged()) {
+      return top;
     }
-
-    /**
-     * Get the flag for a given key
-     *
-     * @param key Flag to get value for
-     */
-    public <V> Optional<V> getFlag(Flag<V> key) {
-        return FlagManager.getPlotFlag(this, key);
+    if (this.getMerged(2)) {
+      top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
     }
+    if (this.getMerged(1)) {
+      top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
+    }
+    return top;
+  }
 
-    /**
-     * Get the flag for a given key
-     *
-     * @param key          the flag
-     * @param defaultValue if the key is null, the value to return
-     */
-    public <V> V getFlag(Flag<V> key, V defaultValue) {
-        V value = FlagManager.getPlotFlagRaw(this, key);
+  /**
+   * Gets the bottom location for a plot.<br> - Does not respect mega plots<br> - Merged plots, only
+   * the road will be considered part of the plot<br>
+   *
+   * @return Location bottom of mega plot
+   */
+  public Location getExtendedBottomAbs() {
+    Location bot = this.getBottomAbs();
+    if (!this.isMerged()) {
+      return bot;
+    }
+    if (this.getMerged(0)) {
+      bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
+    }
+    if (this.getMerged(3)) {
+      bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
+    }
+    return bot;
+  }
+
+  /**
+   * Returns the top and bottom location.<br> - If the plot is not connected, it will return its own
+   * corners<br> - the returned locations will not necessarily correspond to claimed plots if the
+   * connected plots do not form a rectangular shape
+   *
+   * @return new Location[] { bottom, top }
+   * @deprecated as merged plots no longer need to be rectangular
+   */
+  @Deprecated
+  public Location[] getCorners() {
+    if (!this.isMerged()) {
+      return new Location[]{this.getBottomAbs(), this.getTopAbs()};
+    }
+    return MainUtil.getCorners(this.getWorldName(), this.getRegions());
+  }
+
+  /**
+   * Remove the east road section of a plot<br> - Used when a plot is merged<br>
+   */
+  public void removeRoadEast() {
+    if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+      if (this.area.TERRAIN == 3) {
+        return;
+      }
+      Plot other = this.getRelative(1);
+      Location bot = other.getBottomAbs();
+      Location top = this.getTopAbs();
+      Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
+      Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
+      ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+    } else {
+      this.area.getPlotManager().removeRoadEast(this.area, this);
+    }
+  }
+
+  /**
+   * @deprecated in favor of getCorners()[0];<br>
+   */
+  // Won't remove as suggestion also points to deprecated method
+  @Deprecated
+  public Location getBottom() {
+    return this.getCorners()[0];
+  }
+
+  /**
+   * @return the top corner of the plot
+   * @deprecated in favor of getCorners()[1];
+   */
+  // Won't remove as suggestion also points to deprecated method
+  @Deprecated
+  public Location getTop() {
+    return this.getCorners()[1];
+  }
+
+  /**
+   * Swap the plot contents and settings with another location<br> - The destination must correspond
+   * to a valid plot of equal dimensions
+   *
+   * @param destination The other plot to swap with
+   * @param whenDone A task to run when finished, or null
+   * @return boolean if swap was successful
+   * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain
+   * @see this#swapData(Plot, Runnable) to swap plot settings
+   * @see this#swapData(Plot, Runnable)
+   */
+  public boolean swap(Plot destination, Runnable whenDone) {
+    return this.move(destination, whenDone, true);
+  }
+
+  /**
+   * Move the plot to an empty location<br> - The location must be empty
+   *
+   * @param destination Where to move the plot
+   * @param whenDone A task to run when done, or null
+   * @return if the move was successful
+   */
+  public boolean move(Plot destination, Runnable whenDone) {
+    return this.move(destination, whenDone, false);
+  }
+
+  /**
+   * Get plot display name.
+   *
+   * @return alias if set, else id
+   */
+  @Override
+  public String toString() {
+    if (this.settings != null && this.settings.getAlias().length() > 1) {
+      return this.settings.getAlias();
+    }
+    return this.area + ";" + this.id.x + ";" + this.id.y;
+  }
+
+
+  /**
+   * Remove a denied player (use DBFunc as well)<br> Using the * uuid will remove all users
+   */
+  public boolean removeDenied(UUID uuid) {
+    if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
+      boolean result = false;
+      for (UUID other : new HashSet<>(getDenied())) {
+        result = rmvDenied(other) || result;
+      }
+      return result;
+    }
+    return rmvDenied(uuid);
+  }
+
+  private boolean rmvDenied(UUID uuid) {
+    for (Plot current : this.getConnectedPlots()) {
+      if (current.getDenied().remove(uuid)) {
+        DBFunc.removeDenied(current, uuid);
+      } else {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Remove a helper (use DBFunc as well)<br> Using the * uuid will remove all users
+   */
+  public boolean removeTrusted(UUID uuid) {
+    if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
+      boolean result = false;
+      for (UUID other : new HashSet<>(getTrusted())) {
+        result = rmvTrusted(other) || result;
+      }
+      return result;
+    }
+    return rmvTrusted(uuid);
+  }
+
+  private boolean rmvTrusted(UUID uuid) {
+    for (Plot plot : this.getConnectedPlots()) {
+      if (plot.getTrusted().remove(uuid)) {
+        DBFunc.removeTrusted(plot, uuid);
+      } else {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Remove a trusted user (use DBFunc as well)<br> Using the * uuid will remove all users
+   */
+  public boolean removeMember(UUID uuid) {
+    if (this.members == null) {
+      return false;
+    }
+    if (uuid == DBFunc.EVERYONE && !members.contains(uuid)) {
+      boolean result = false;
+      for (UUID other : new HashSet<>(this.members)) {
+        result = rmvMember(other) || result;
+      }
+      return result;
+    }
+    return rmvMember(uuid);
+  }
+
+  private boolean rmvMember(UUID uuid) {
+    for (Plot current : this.getConnectedPlots()) {
+      if (current.getMembers().remove(uuid)) {
+        DBFunc.removeMember(current, uuid);
+      } else {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * Export the plot as a schematic to the configured output directory.
+   */
+  public void export(final RunnableVal<Boolean> whenDone) {
+    SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
+      @Override
+      public void run(final CompoundTag value) {
         if (value == null) {
-            return defaultValue;
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * Delete a plot (use null for the runnable if you don't need to be notified on completion)
-     *
-     * @see PlotSquared#removePlot(Plot, boolean)
-     * @see #clear(Runnable) to simply clear a plot
-     */
-    public boolean deletePlot(final Runnable whenDone) {
-        if (!this.hasOwner()) {
-            return false;
-        }
-        final Set<Plot> plots = this.getConnectedPlots();
-        this.clear(false, true, () -> {
-            for (Plot current : plots) {
-                current.unclaim();
-            }
+          if (whenDone != null) {
+            whenDone.value = false;
             TaskManager.runTask(whenDone);
-        });
-        return true;
-    }
-
-    /**
-     * Count the entities in a plot
-     *
-     * @return array of entity counts
-     * @see ChunkManager#countEntities(Plot)
-     * 0 = Entity
-     * 1 = Animal
-     * 2 = Monster
-     * 3 = Mob
-     * 4 = Boat
-     * 5 = Misc
-     */
-    public int[] countEntities() {
-        int[] count = new int[6];
-        for (Plot current : this.getConnectedPlots()) {
-            int[] result = ChunkManager.manager.countEntities(current);
-            count[0] += result[0];
-            count[1] += result[1];
-            count[2] += result[2];
-            count[3] += result[3];
-            count[4] += result[4];
-            count[5] += result[5];
-        }
-        return count;
-    }
-
-    /**
-     * Returns true if a previous task was running
-     *
-     * @return true if a previous task is running
-     */
-    public int addRunning() {
-        int value = this.getRunning();
-        for (Plot plot : this.getConnectedPlots()) {
-            plot.setMeta("running", value + 1);
-        }
-        return value;
-    }
-
-    /**
-     * Decrement the number of tracked tasks this plot is running<br>
-     * - Used to track/limit the number of things a player can do on the plot at once
-     *
-     * @return previous number of tasks (int)
-     */
-    public int removeRunning() {
-        int value = this.getRunning();
-        if (value < 2) {
-            for (Plot plot : this.getConnectedPlots()) {
-                plot.deleteMeta("running");
-            }
+          }
         } else {
-            for (Plot plot : this.getConnectedPlots()) {
-                plot.setMeta("running", value - 1);
+          TaskManager.runTaskAsync(() -> {
+            String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
+                .getName(Plot.this.owner);
+            boolean result = SchematicHandler.manager.save(value,
+                Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
+            if (whenDone != null) {
+              whenDone.value = result;
+              TaskManager.runTask(whenDone);
             }
+          });
         }
-        return value;
-    }
+      }
+    });
+  }
 
-    /**
-     * Get the number of tracked running tasks for this plot<br>
-     * - Used to track/limit the number of things a player can do on the plot at once
-     *
-     * @return number of tasks (int)
-     */
-    public int getRunning() {
-        Integer value = (Integer) this.getMeta("running");
-        return value == null ? 0 : value;
-    }
+  /**
+   * Upload the plot as a schematic to the configured web interface.
+   *
+   * @param whenDone value will be null if uploading fails
+   */
+  public void upload(final RunnableVal<URL> whenDone) {
+    SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
+      @Override
+      public void run(CompoundTag value) {
+        SchematicHandler.manager.upload(value, null, null, whenDone);
+      }
+    });
+  }
 
-    /**
-     * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in unclaimed plot objects.
-     *
-     * @return false if the Plot has no owner, otherwise true.
-     */
-    public boolean unclaim() {
-        if (this.owner == null) {
-            return false;
+  /**
+   * Upload this plot as a world file<br> - The mca files are each 512x512, so depending on the plot
+   * size it may also download adjacent plots<br> - Works best when (plot width + road width) % 512
+   * == 0<br>
+   *
+   * @see WorldUtil
+   */
+  public void uploadWorld(RunnableVal<URL> whenDone) {
+    WorldUtil.IMP.upload(this, null, null, whenDone);
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (obj == null) {
+      return false;
+    }
+    if (this.getClass() != obj.getClass()) {
+      return false;
+    }
+    Plot other = (Plot) obj;
+    return this.hashCode() == other.hashCode() && this.id.equals(other.id)
+        && this.area == other.area;
+  }
+
+  /**
+   * Get the plot hashcode<br> Note: The hashcode is unique if:<br> - Plots are in the same
+   * world<br> - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
+   *
+   * @return integer.
+   */
+  @Override
+  public int hashCode() {
+    return this.id.hashCode();
+  }
+
+  /**
+   * Get the flags specific to this plot<br> - Does not take default flags into account<br>
+   */
+  public HashMap<Flag<?>, Object> getFlags() {
+    return this.getSettings().flags;
+  }
+
+  /**
+   * Set a flag for this plot.
+   */
+  public void setFlags(HashMap<Flag<?>, Object> flags) {
+    FlagManager.setPlotFlags(this, flags);
+  }
+
+  /**
+   * Get the plot alias. - Returns an empty string if no alias is set
+   *
+   * @return The plot alias
+   */
+  public String getAlias() {
+    if (this.settings == null) {
+      return "";
+    }
+    return this.settings.getAlias();
+  }
+
+  /**
+   * Set the plot alias.
+   *
+   * @param alias The alias
+   */
+  public void setAlias(String alias) {
+    for (Plot current : this.getConnectedPlots()) {
+      String name = this.getSettings().getAlias();
+      if (alias == null) {
+        alias = "";
+      }
+      if (name.equals(alias)) {
+        return;
+      }
+      current.getSettings().setAlias(alias);
+      DBFunc.setAlias(current, alias);
+    }
+  }
+
+  /**
+   * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> ----------<br> 0 =
+   * north<br> 1 = east<br> 2 = south<br> 3 = west<br> ----------<br>
+   */
+  private void setMerged(int direction, boolean value) {
+    if (this.getSettings().setMerged(direction, value)) {
+      if (value) {
+        Plot other = this.getRelative(direction).getBasePlot(false);
+        if (!other.equals(this.getBasePlot(false))) {
+          Plot base = other.id.y < this.id.y
+              || other.id.y == this.id.y && other.id.x < this.id.x ? other : this.origin;
+          this.origin.origin = base;
+          other.origin = base;
+          this.origin = base;
+          connected_cache = null;
         }
-        for (Plot current : getConnectedPlots()) {
-            List<PlotPlayer> players = current.getPlayersInPlot();
-            for (PlotPlayer pp : players) {
-                PlotListener.plotExit(pp, current);
-            }
-            getArea().removePlot(getId());
-            DBFunc.delete(current);
-            current.owner = null;
-            current.settings = null;
-            for (PlotPlayer pp : players) {
-                PlotListener.plotEntry(pp, current);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Unlink a plot and remove the roads
-     *
-     * @return true if plot was linked
-     * @see this#unlinkPlot(boolean, boolean)
-     */
-    public boolean unlink() {
-        return this.unlinkPlot(true, true);
-    }
-
-    public Location getCenter() {
-        Location[] corners = getCorners();
-        Location top = corners[0];
-        Location bot = corners[1];
-        Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
-            MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
-        if (!isLoaded())
-            return loc;
-        int y =
-            isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
-        if (area.ALLOW_SIGNS) {
-            y = Math.max(y, getManager().getSignLoc(area, this).getY());
-        }
-        loc.setY(1 + y);
-        return loc;
-    }
-
-    public Location getSide() {
-        RegionWrapper largest = getLargestRegion();
-        int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
-        int z = largest.minZ - 1;
-        PlotManager manager = getManager();
-        int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
-        if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
-            y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
-        }
-        return new Location(getWorldName(), x, y + 1, z);
-    }
-
-    /**
-     * Return the home location for the plot
-     *
-     * @return Home location
-     */
-    public Location getHome() {
-        BlockLoc home = this.getPosition();
-        if (home == null || home.x == 0 && home.z == 0) {
-            return this.getDefaultHome(true);
-        } else {
-            Location bot = this.getBottomAbs();
-            Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
-                bot.getZ() + home.z, home.yaw, home.pitch);
-            if (!isLoaded())
-                return loc;
-            if (!WorldUtil.IMP.getBlock(loc).isAir()) {
-                loc.setY(Math.max(
-                    1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
-                    bot.getY()));
-            }
-            return loc;
-        }
-    }
-
-    /**
-     * Set the home location
-     *
-     * @param location location to set as home
-     */
-    public void setHome(BlockLoc location) {
-        Plot plot = this.getBasePlot(false);
-        if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
-            return;
-        }
-        plot.getSettings().setPosition(location);
-        if (location != null) {
-            DBFunc.setPosition(plot, plot.getSettings().getPosition().toString());
-            return;
-        }
-        DBFunc.setPosition(plot, null);
-    }
-
-    /**
-     * Get the default home location for a plot<br>
-     * - Ignores any home location set for that specific plot
-     *
-     * @return Location
-     */
-    public Location getDefaultHome() {
-        return getDefaultHome(false);
-    }
-
-    public Location getDefaultHome(boolean member) {
-        Plot plot = this.getBasePlot(false);
-        PlotLoc loc = member ? area.DEFAULT_HOME : area.NONMEMBER_HOME;
-        if (loc != null) {
-            int x;
-            int z;
-            if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
-                // center
-                RegionWrapper largest = plot.getLargestRegion();
-                x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
-                z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
-            } else {
-                // specific
-                Location bot = plot.getBottomAbs();
-                x = bot.getX() + loc.x;
-                z = bot.getZ() + loc.z;
-            }
-            int y = loc.y < 1 ?
-                (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
-                loc.y;
-            PlotSquared.log("Getting home with Y " + y);
-            return new Location(plot.getWorldName(), x, y, z);
-        }
-        // Side
-        return plot.getSide();
-    }
-
-    public double getVolume() {
-        double count = 0;
-        for (RegionWrapper region : getRegions()) {
-            count +=
-                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
-                    * 256;
-        }
-        return count;
-    }
-
-    /**
-     * Get the average rating of the plot. This is the value displayed in /plot info
-     *
-     * @return average rating as double
-     */
-    public double getAverageRating() {
-        double sum = 0;
-        Collection<Rating> ratings = this.getRatings().values();
-        for (Rating rating : ratings) {
-            sum += rating.getAverageRating();
-        }
-        return sum / ratings.size();
-    }
-
-    /**
-     * Set a rating for a user<br>
-     * - If the user has already rated, the following will return false
-     *
-     * @param uuid   uuid of rater
-     * @param rating rating
-     * @return success
-     */
-    public boolean addRating(UUID uuid, Rating rating) {
-        Plot base = this.getBasePlot(false);
-        PlotSettings baseSettings = base.getSettings();
-        if (baseSettings.getRatings().containsKey(uuid)) {
-            return false;
-        }
-        int aggregate = rating.getAggregate();
-        baseSettings.getRatings().put(uuid, aggregate);
-        DBFunc.setRating(base, uuid, aggregate);
-        return true;
-    }
-
-    /**
-     * Clear the ratings for this plot
-     */
-    public void clearRatings() {
-        Plot base = this.getBasePlot(false);
-        PlotSettings baseSettings = base.getSettings();
-        if (baseSettings.ratings != null && !baseSettings.getRatings().isEmpty()) {
-            DBFunc.deleteRatings(base);
-            baseSettings.ratings = null;
-        }
-    }
-
-    /**
-     * Get the ratings associated with a plot<br>
-     * - The rating object may contain multiple categories
-     *
-     * @return Map of user who rated to the rating
-     */
-    public HashMap<UUID, Rating> getRatings() {
-        Plot base = this.getBasePlot(false);
-        HashMap<UUID, Rating> map = new HashMap<>();
-        if (!base.hasRatings()) {
-            return map;
-        }
-        for (Entry<UUID, Integer> entry : base.getSettings().getRatings().entrySet()) {
-            map.put(entry.getKey(), new Rating(entry.getValue()));
-        }
-        return map;
-    }
-
-    public boolean hasRatings() {
-        Plot base = this.getBasePlot(false);
-        return base.settings != null && base.settings.ratings != null;
-    }
-
-    /**
-     * Resend all chunks inside the plot to nearby players<br>
-     * This should not need to be called
-     */
-    public void refreshChunks() {
-        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
-        HashSet<ChunkLoc> chunks = new HashSet<>();
-        for (RegionWrapper region : Plot.this.getRegions()) {
-            for (int x = region.minX >> 4; x <= region.maxX >> 4; x++) {
-                for (int z = region.minZ >> 4; z <= region.maxZ >> 4; z++) {
-                    if (chunks.add(new ChunkLoc(x, z))) {
-                        queue.refreshChunk(x, z);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Remove the plot sign if it is set.
-     */
-    public void removeSign() {
-        PlotManager manager = this.area.getPlotManager();
-        if (!this.area.ALLOW_SIGNS) {
-            return;
-        }
-        Location loc = manager.getSignLoc(this.area, this);
-        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
-        queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
-        queue.flush();
-    }
-
-    /**
-     * Set the plot sign if plot signs are enabled.
-     */
-    public void setSign() {
-        if (this.owner == null) {
-            this.setSign("unknown");
-            return;
-        }
-        this.setSign(UUIDHandler.getName(this.owner));
-    }
-
-    /**
-     * Register a plot and create it in the database<br>
-     * - The plot will not be created if the owner is null<br>
-     * - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot
-     * creation.
-     *
-     * @return true if plot was created successfully
-     */
-    public boolean create() {
-        return this.create(this.owner, true);
-    }
-
-    public boolean claim(final PlotPlayer player, boolean teleport, String schematic) {
-        if (!canClaim(player)) {
-            return false;
-        }
-        return claim(player, teleport, schematic, true);
-    }
-
-    public boolean claim(final PlotPlayer player, boolean teleport, String schematic,
-        boolean updateDB) {
-        boolean result = EventUtil.manager.callClaim(player, this, false);
-        if (updateDB) {
-            if (!result || (!create(player.getUUID(), true))) {
-                return false;
-            }
-        } else {
-            area.addPlot(this);
-        }
-        setSign(player.getName());
-        MainUtil.sendMessage(player, C.CLAIMED);
-        if (teleport) {
-            teleportPlayer(player);
-        }
-        PlotArea plotworld = getArea();
-        if (plotworld.SCHEMATIC_ON_CLAIM) {
-            Schematic sch;
-            try {
-                if (schematic == null || schematic.isEmpty()) {
-                    sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-                } else {
-                    sch = SchematicHandler.manager.getSchematic(schematic);
-                    if (sch == null) {
-                        sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-                    }
-                }
-            } catch (SchematicHandler.UnsupportedFormatException e) {
-                e.printStackTrace();
-                return true;
-            }
-            SchematicHandler.manager.paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP, new RunnableVal<Boolean>() {
-                @Override public void run(Boolean value) {
-                    if (value) {
-                        MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
-                    } else {
-                        MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
-                    }
-                }
-            });
-        }
-        plotworld.getPlotManager().claimPlot(plotworld, this);
-        return true;
-    }
-
-    /**
-     * Register a plot and create it in the database<br>
-     * - The plot will not be created if the owner is null<br>
-     * - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot
-     * creation.
-     *
-     * @param uuid   the uuid of the plot owner
-     * @param notify notify
-     * @return true if plot was created successfully
-     */
-    public boolean create(final UUID uuid, final boolean notify) {
-        if (uuid == null) {
-            throw new IllegalArgumentException("UUID cannot be null");
-        }
-        this.owner = uuid;
-        Plot existing = this.area.getOwnedPlotAbs(this.id);
-        if (existing != null) {
-            throw new IllegalStateException("Plot already exists!");
-        }
-        if (notify) {
-            Integer meta = (Integer) this.area.getMeta("worldBorder");
-            if (meta != null) {
-                this.updateWorldBorder();
-            }
-        }
-        connected_cache = null;
-        regions_cache = null;
-        this.getTrusted().clear();
-        this.getMembers().clear();
-        this.getDenied().clear();
-        this.settings = new PlotSettings();
-        if (this.area.addPlot(this)) {
-            DBFunc.createPlotAndSettings(this, () -> {
-                PlotArea plotworld = Plot.this.area;
-                if (notify && plotworld.AUTO_MERGE) {
-                    Plot.this.autoMerge(-1, Integer.MAX_VALUE, uuid, true);
-                }
-            });
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Set components such as border, wall, floor.
-     * (components are generator specific)
-     */
-    public boolean setComponent(String component, String blocks) {
-        BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
-        return !(parsed == null || parsed.isEmpty()) && this.setComponent(component, parsed);
-    }
-
-    /**
-     * Retrieve the biome of the plot.
-     *
-     * @return the name of the biome
-     */
-    public String getBiome() {
-        Location loc = this.getCenter();
-        return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
-    }
-
-    /**
-     * Return the top location for the plot.
-     *
-     * @return
-     */
-    public Location getTopAbs() {
-        Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
-        top.setWorld(getWorldName());
-        return top;
-    }
-
-    /**
-     * Return the bottom location for the plot.
-     *
-     * @return
-     */
-    public Location getBottomAbs() {
-        Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
-        loc.setWorld(getWorldName());
-        return loc;
-    }
-
-    /**
-     * Swap the settings for two plots.
-     *
-     * @param plot     the plot to swap data with
-     * @param whenDone the task to run at the end of this method.
-     * @return
-     */
-    public boolean swapData(Plot plot, Runnable whenDone) {
-        if (this.owner == null) {
-            if (plot != null && plot.hasOwner()) {
-                plot.moveData(this, whenDone);
-                return true;
-            }
-            return false;
-        }
-        if (plot == null || plot.owner == null) {
-            this.moveData(plot, whenDone);
-            return true;
-        }
-        // Swap cached
-        PlotId temp = new PlotId(this.getId().x, this.getId().y);
-        this.getId().x = plot.getId().x;
-        this.getId().y = plot.getId().y;
-        plot.getId().x = temp.x;
-        plot.getId().y = temp.y;
-        this.area.removePlot(this.getId());
-        plot.area.removePlot(plot.getId());
-        this.getId().recalculateHash();
-        plot.getId().recalculateHash();
-        this.area.addPlotAbs(this);
-        plot.area.addPlotAbs(plot);
-        // Swap database
-        DBFunc.swapPlots(plot, this);
-        TaskManager.runTaskLater(whenDone, 1);
-        return true;
-    }
-
-    /**
-     * Move the settings for a plot.
-     *
-     * @param plot     the plot to move
-     * @param whenDone
-     * @return
-     */
-    public boolean moveData(Plot plot, Runnable whenDone) {
-        if (this.owner == null) {
-            PlotSquared.debug(plot + " is unowned (single)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        if (plot.hasOwner()) {
-            PlotSquared.debug(plot + " is unowned (multi)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        this.area.removePlot(this.id);
-        this.getId().x = plot.getId().x;
-        this.getId().y = plot.getId().y;
-        this.getId().recalculateHash();
-        this.area.addPlotAbs(this);
-        DBFunc.movePlot(this, plot);
-        TaskManager.runTaskLater(whenDone, 1);
-        return true;
-    }
-
-    /**
-     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like each plot treated as
-     * a small plot use getPlotTopLocAbs(...)
-     *
-     * @return Location top of mega plot
-     */
-    public Location getExtendedTopAbs() {
-        Location top = this.getTopAbs();
-        if (!this.isMerged()) {
-            return top;
-        }
-        if (this.getMerged(2)) {
-            top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
-        }
-        if (this.getMerged(1)) {
-            top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
-        }
-        return top;
-    }
-
-    /**
-     * Gets the bottom location for a plot.<br>
-     * - Does not respect mega plots<br>
-     * - Merged plots, only the road will be considered part of the plot<br>
-     *
-     * @return Location bottom of mega plot
-     */
-    public Location getExtendedBottomAbs() {
-        Location bot = this.getBottomAbs();
-        if (!this.isMerged()) {
-            return bot;
-        }
-        if (this.getMerged(0)) {
-            bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
-        }
-        if (this.getMerged(3)) {
-            bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
-        }
-        return bot;
-    }
-
-    /**
-     * Returns the top and bottom location.<br>
-     * - If the plot is not connected, it will return its own corners<br>
-     * - the returned locations will not necessarily correspond to claimed plots if the connected plots do not form a rectangular shape
-     *
-     * @return new Location[] { bottom, top }
-     * @deprecated as merged plots no longer need to be rectangular
-     */
-    @Deprecated public Location[] getCorners() {
-        if (!this.isMerged()) {
-            return new Location[] {this.getBottomAbs(), this.getTopAbs()};
-        }
-        return MainUtil.getCorners(this.getWorldName(), this.getRegions());
-    }
-
-    /**
-     * Remove the east road section of a plot<br>
-     * - Used when a plot is merged<br>
-     */
-    public void removeRoadEast() {
-        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-            if (this.area.TERRAIN == 3) {
-                return;
-            }
-            Plot other = this.getRelative(1);
-            Location bot = other.getBottomAbs();
-            Location top = this.getTopAbs();
-            Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
-            Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
-            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-        } else {
-            this.area.getPlotManager().removeRoadEast(this.area, this);
-        }
-    }
-
-    /**
-     * @return
-     * @deprecated in favor of getCorners()[0];<br>
-     */
-    // Won't remove as suggestion also points to deprecated method
-    @Deprecated public Location getBottom() {
-        return this.getCorners()[0];
-    }
-
-    /**
-     * @return the top corner of the plot
-     * @deprecated in favor of getCorners()[1];
-     */
-    // Won't remove as suggestion also points to deprecated method
-    @Deprecated public Location getTop() {
-        return this.getCorners()[1];
-    }
-
-    /**
-     * Swap the plot contents and settings with another location<br>
-     * - The destination must correspond to a valid plot of equal dimensions
-     *
-     * @param destination The other plot to swap with
-     * @param whenDone    A task to run when finished, or null
-     * @return boolean if swap was successful
-     * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain
-     * @see this#swapData(Plot, Runnable) to swap plot settings
-     * @see this#swapData(Plot, Runnable)
-     */
-    public boolean swap(Plot destination, Runnable whenDone) {
-        return this.move(destination, whenDone, true);
-    }
-
-    /**
-     * Move the plot to an empty location<br>
-     * - The location must be empty
-     *
-     * @param destination Where to move the plot
-     * @param whenDone    A task to run when done, or null
-     * @return if the move was successful
-     */
-    public boolean move(Plot destination, Runnable whenDone) {
-        return this.move(destination, whenDone, false);
-    }
-
-    /**
-     * Get plot display name.
-     *
-     * @return alias if set, else id
-     */
-    @Override public String toString() {
-        if (this.settings != null && this.settings.getAlias().length() > 1) {
-            return this.settings.getAlias();
-        }
-        return this.area + ";" + this.id.x + ";" + this.id.y;
-    }
-
-
-    /**
-     * Remove a denied player (use DBFunc as well)<br>
-     * Using the * uuid will remove all users
-     *
-     * @param uuid
-     */
-    public boolean removeDenied(UUID uuid) {
-        if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
-            boolean result = false;
-            for (UUID other : new HashSet<>(getDenied())) {
-                result = rmvDenied(other) || result;
-            }
-            return result;
-        }
-        return rmvDenied(uuid);
-    }
-
-    private boolean rmvDenied(UUID uuid) {
-        for (Plot current : this.getConnectedPlots()) {
-            if (current.getDenied().remove(uuid)) {
-                DBFunc.removeDenied(current, uuid);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Remove a helper (use DBFunc as well)<br>
-     * Using the * uuid will remove all users
-     *
-     * @param uuid
-     */
-    public boolean removeTrusted(UUID uuid) {
-        if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
-            boolean result = false;
-            for (UUID other : new HashSet<>(getTrusted())) {
-                result = rmvTrusted(other) || result;
-            }
-            return result;
-        }
-        return rmvTrusted(uuid);
-    }
-
-    private boolean rmvTrusted(UUID uuid) {
-        for (Plot plot : this.getConnectedPlots()) {
-            if (plot.getTrusted().remove(uuid)) {
-                DBFunc.removeTrusted(plot, uuid);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Remove a trusted user (use DBFunc as well)<br>
-     * Using the * uuid will remove all users
-     *
-     * @param uuid
-     */
-    public boolean removeMember(UUID uuid) {
-        if (this.members == null) {
-            return false;
-        }
-        if (uuid == DBFunc.EVERYONE && !members.contains(uuid)) {
-            boolean result = false;
-            for (UUID other : new HashSet<>(this.members)) {
-                result = rmvMember(other) || result;
-            }
-            return result;
-        }
-        return rmvMember(uuid);
-    }
-
-    private boolean rmvMember(UUID uuid) {
-        for (Plot current : this.getConnectedPlots()) {
-            if (current.getMembers().remove(uuid)) {
-                DBFunc.removeMember(current, uuid);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Export the plot as a schematic to the configured output directory.
-     *
-     * @return
-     */
-    public void export(final RunnableVal<Boolean> whenDone) {
-        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
-            @Override public void run(final CompoundTag value) {
-                if (value == null) {
-                    if (whenDone != null) {
-                        whenDone.value = false;
-                        TaskManager.runTask(whenDone);
-                    }
-                } else {
-                    TaskManager.runTaskAsync(() -> {
-                        String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
-                            .getName(Plot.this.owner);
-                        boolean result = SchematicHandler.manager.save(value,
-                            Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
-                        if (whenDone != null) {
-                            whenDone.value = result;
-                            TaskManager.runTask(whenDone);
-                        }
-                    });
-                }
-            }
-        });
-    }
-
-    /**
-     * Upload the plot as a schematic to the configured web interface.
-     *
-     * @param whenDone value will be null if uploading fails
-     */
-    public void upload(final RunnableVal<URL> whenDone) {
-        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
-            @Override public void run(CompoundTag value) {
-                SchematicHandler.manager.upload(value, null, null, whenDone);
-            }
-        });
-    }
-
-    /**
-     * Upload this plot as a world file<br>
-     * - The mca files are each 512x512, so depending on the plot size it may also download adjacent plots<br>
-     * - Works best when (plot width + road width) % 512 == 0<br>
-     *
-     * @param whenDone
-     * @see WorldUtil
-     */
-    public void uploadWorld(RunnableVal<URL> whenDone) {
-        WorldUtil.IMP.upload(this, null, null, whenDone);
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (this.getClass() != obj.getClass()) {
-            return false;
-        }
-        Plot other = (Plot) obj;
-        return this.hashCode() == other.hashCode() && this.id.equals(other.id)
-            && this.area == other.area;
-    }
-
-    /**
-     * Get the plot hashcode<br>
-     * Note: The hashcode is unique if:<br>
-     * - Plots are in the same world<br>
-     * - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
-     *
-     * @return integer.
-     */
-    @Override public int hashCode() {
-        return this.id.hashCode();
-    }
-
-    /**
-     * Get the flags specific to this plot<br>
-     * - Does not take default flags into account<br>
-     *
-     * @return
-     */
-    public HashMap<Flag<?>, Object> getFlags() {
-        return this.getSettings().flags;
-    }
-
-    /**
-     * Set a flag for this plot.
-     *
-     * @param flags
-     */
-    public void setFlags(HashMap<Flag<?>, Object> flags) {
-        FlagManager.setPlotFlags(this, flags);
-    }
-
-    /**
-     * Get the plot alias.
-     * - Returns an empty string if no alias is set
-     *
-     * @return The plot alias
-     */
-    public String getAlias() {
-        if (this.settings == null) {
-            return "";
-        }
-        return this.settings.getAlias();
-    }
-
-    /**
-     * Set the plot alias.
-     *
-     * @param alias The alias
-     */
-    public void setAlias(String alias) {
-        for (Plot current : this.getConnectedPlots()) {
-            String name = this.getSettings().getAlias();
-            if (alias == null) {
-                alias = "";
-            }
-            if (name.equals(alias)) {
-                return;
-            }
-            current.getSettings().setAlias(alias);
-            DBFunc.setAlias(current, alias);
-        }
-    }
-
-    /**
-     * Set the raw merge data<br>
-     * - Updates DB<br>
-     * - Does not modify terrain<br>
-     * ----------<br>
-     * 0 = north<br>
-     * 1 = east<br>
-     * 2 = south<br>
-     * 3 = west<br>
-     * ----------<br>
-     *
-     * @param direction
-     * @param value
-     */
-    public void setMerged(int direction, boolean value) {
-        if (this.getSettings().setMerged(direction, value)) {
-            if (value) {
-                Plot other = this.getRelative(direction).getBasePlot(false);
-                if (!other.equals(this.getBasePlot(false))) {
-                    Plot base = other.id.y < this.id.y
-                        || other.id.y == this.id.y && other.id.x < this.id.x ? other : this.origin;
-                    this.origin.origin = base;
-                    other.origin = base;
-                    this.origin = base;
-                    connected_cache = null;
-                }
-            } else {
-                if (this.origin != null) {
-                    this.origin.origin = null;
-                    this.origin = null;
-                }
-                connected_cache = null;
-            }
-            DBFunc.setMerged(this, this.getSettings().getMerged());
-            regions_cache = null;
-        }
-    }
-
-    /**
-     * Get the merged array.
-     *
-     * @return boolean [ north, east, south, west ]
-     */
-    public boolean[] getMerged() {
-        return this.getSettings().getMerged();
-    }
-
-    /**
-     * Set the raw merge data<br>
-     * - Updates DB<br>
-     * - Does not modify terrain<br>
-     * Get if the plot is merged in a direction<br>
-     * ----------<br>
-     * 0 = north<br>
-     * 1 = east<br>
-     * 2 = south<br>
-     * 3 = west<br>
-     * ----------<br>
-     * Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
-     *
-     * @param merged
-     */
-    public void setMerged(boolean[] merged) {
-        this.getSettings().setMerged(merged);
-        DBFunc.setMerged(this, merged);
-        clearCache();
-    }
-
-    public void clearCache() {
-        connected_cache = null;
-        regions_cache = null;
+      } else {
         if (this.origin != null) {
-            this.origin.origin = null;
-            this.origin = null;
+          this.origin.origin = null;
+          this.origin = null;
         }
+        connected_cache = null;
+      }
+      DBFunc.setMerged(this, this.getSettings().getMerged());
+      regions_cache = null;
+    }
+  }
+
+  /**
+   * Get the merged array.
+   *
+   * @return boolean [ north, east, south, west ]
+   */
+  public boolean[] getMerged() {
+    return this.getSettings().getMerged();
+  }
+
+  /**
+   * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> Get if the plot is
+   * merged in a direction<br> ----------<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+   * ----------<br> Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
+   */
+  public void setMerged(boolean[] merged) {
+    this.getSettings().setMerged(merged);
+    DBFunc.setMerged(this, merged);
+    clearCache();
+  }
+
+  private void clearCache() {
+    connected_cache = null;
+    regions_cache = null;
+    if (this.origin != null) {
+      this.origin.origin = null;
+      this.origin = null;
+    }
+  }
+
+  /**
+   * Get the set home location or 0,0,0 if no location is set<br> - Does not take the default home
+   * location into account
+   *
+   * @see #getHome()
+   */
+  public BlockLoc getPosition() {
+    return this.getSettings().getPosition();
+  }
+
+  /**
+   * Check if a plot can be claimed by the provided player.
+   *
+   * @param player the claiming player
+   */
+  public boolean canClaim(@Nullable PlotPlayer player) {
+    PlotCluster cluster = this.getCluster();
+    if (cluster != null && player != null) {
+      if (!cluster.isAdded(player.getUUID()) && !Permissions
+          .hasPermission(player, "plots.admin.command.claim")) {
+        return false;
+      }
+    }
+    return this.guessOwner() == null && !isMerged();
+  }
+
+  /**
+   * Guess the owner of a plot either by the value in memory, or the sign data<br> Note: Recovering
+   * from sign information is useful if e.g. PlotMe conversion wasn't successful
+   *
+   * @return UUID
+   */
+  public UUID guessOwner() {
+    if (this.hasOwner()) {
+      return this.owner;
+    }
+    if (!this.area.ALLOW_SIGNS) {
+      return null;
+    }
+    try {
+      final Location loc = this.getManager().getSignLoc(this.area, this);
+      String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
+        @Override
+        public void run(String[] value) {
+          ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
+          this.value = WorldUtil.IMP.getSign(loc);
+        }
+      });
+      if (lines == null) {
+        return null;
+      }
+      loop:
+      for (int i = 4; i > 0; i--) {
+        String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
+        int index = caption.indexOf("%plr%");
+        if (index < 0) {
+          continue;
+        }
+        String line = lines[i - 1];
+        if (line.length() <= index) {
+          return null;
+        }
+        String name = line.substring(index);
+        if (name.isEmpty()) {
+          return null;
+        }
+        UUID owner = UUIDHandler.getUUID(name, null);
+        if (owner != null) {
+          this.owner = owner;
+          break;
+        }
+        if (lines[i - 1].length() == 15) {
+          BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
+          for (Entry<StringWrapper, UUID> entry : map.entrySet()) {
+            String key = entry.getKey().value;
+            if (key.length() > name.length() && key.startsWith(name)) {
+              this.owner = entry.getValue();
+              break loop;
+            }
+          }
+        }
+        this.owner = UUID.nameUUIDFromBytes(
+            ("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
+        break;
+      }
+      if (this.hasOwner()) {
+        this.create();
+      }
+      return this.owner;
+    } catch (IllegalArgumentException ignored) {
+      return null;
+    }
+  }
+
+  /**
+   * Remove the south road section of a plot<br> - Used when a plot is merged<br>
+   */
+  public void removeRoadSouth() {
+    if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+      if (this.area.TERRAIN == 3) {
+        return;
+      }
+      Plot other = this.getRelative(2);
+      Location bot = other.getBottomAbs();
+      Location top = this.getTopAbs();
+      Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
+      Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
+      ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+    } else {
+      this.getManager().removeRoadSouth(this.area, this);
+    }
+  }
+
+  /**
+   * Auto merge a plot in a specific direction<br>
+   *
+   * @param dir The direction to merge<br> -1 = All directions<br> 0 = north<br> 1 = east<br> 2 =
+   * south<br> 3 = west<br>
+   * @param max The max number of merges to do
+   * @param uuid The UUID it is allowed to merge with
+   * @param removeRoads Whether to remove roads
+   * @return true if a merge takes place
+   */
+  public boolean autoMerge(int dir, int max, UUID uuid, boolean removeRoads) {
+    if (this.owner == null) {
+      return false;
+    }
+    if (!EventUtil.manager.callMerge(this, dir, max)) {
+      return false;
+    }
+    HashSet<Plot> visited = new HashSet<>();
+    HashSet<PlotId> merged = new HashSet<>();
+    Set<Plot> connected = this.getConnectedPlots();
+    for (Plot current : connected) {
+      merged.add(current.getId());
+    }
+    ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
+    Plot current;
+    boolean toReturn = false;
+    while ((current = frontier.poll()) != null && max >= 0) {
+      if (visited.contains(current)) {
+        continue;
+      }
+      visited.add(current);
+      Set<Plot> plots;
+      if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
+        Plot other = current.getRelative(0);
+        if (other != null && other.isOwner(uuid) && (
+            other.getBasePlot(false).equals(current.getBasePlot(false))
+                || (plots = other.getConnectedPlots()).size() <= max && frontier
+                .addAll(plots) && (max -= plots.size()) != -1)) {
+          current.mergePlot(other, removeRoads);
+          merged.add(current.getId());
+          merged.add(other.getId());
+          toReturn = true;
+        }
+      }
+      if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
+        Plot other = current.getRelative(1);
+        if (other != null && other.isOwner(uuid) && (
+            other.getBasePlot(false).equals(current.getBasePlot(false))
+                || (plots = other.getConnectedPlots()).size() <= max && frontier
+                .addAll(plots) && (max -= plots.size()) != -1)) {
+          current.mergePlot(other, removeRoads);
+          merged.add(current.getId());
+          merged.add(other.getId());
+          toReturn = true;
+        }
+      }
+      if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
+        Plot other = current.getRelative(2);
+        if (other != null && other.isOwner(uuid) && (
+            other.getBasePlot(false).equals(current.getBasePlot(false))
+                || (plots = other.getConnectedPlots()).size() <= max && frontier
+                .addAll(plots) && (max -= plots.size()) != -1)) {
+          current.mergePlot(other, removeRoads);
+          merged.add(current.getId());
+          merged.add(other.getId());
+          toReturn = true;
+        }
+      }
+      if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
+        Plot other = current.getRelative(3);
+        if (other != null && other.isOwner(uuid) && (
+            other.getBasePlot(false).equals(current.getBasePlot(false))
+                || (plots = other.getConnectedPlots()).size() <= max && frontier
+                .addAll(plots) && (max -= plots.size()) != -1)) {
+          current.mergePlot(other, removeRoads);
+          merged.add(current.getId());
+          merged.add(other.getId());
+          toReturn = true;
+        }
+      }
+    }
+    if (removeRoads && toReturn) {
+      ArrayList<PlotId> ids = new ArrayList<>(merged);
+      this.getManager().finishPlotMerge(this.area, ids);
+    }
+    return toReturn;
+  }
+
+  /**
+   * Merge the plot settings<br> - Used when a plot is merged<br>
+   */
+  public void mergeData(Plot b) {
+    HashMap<Flag<?>, Object> flags1 = this.getFlags();
+    HashMap<Flag<?>, Object> flags2 = b.getFlags();
+    if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
+      boolean greater = flags1.size() > flags2.size();
+      if (greater) {
+        flags1.putAll(flags2);
+      } else {
+        flags2.putAll(flags1);
+      }
+      HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
+      this.setFlags(net);
+      b.setFlags(net);
+    }
+    if (!this.getAlias().isEmpty()) {
+      b.setAlias(this.getAlias());
+    } else if (!b.getAlias().isEmpty()) {
+      this.setAlias(b.getAlias());
+    }
+    for (UUID uuid : this.getTrusted()) {
+      b.addTrusted(uuid);
+    }
+    for (UUID uuid : b.getTrusted()) {
+      this.addTrusted(uuid);
+    }
+    for (UUID uuid : this.getMembers()) {
+      b.addMember(uuid);
+    }
+    for (UUID uuid : b.getMembers()) {
+      this.addMember(uuid);
     }
 
-    /**
-     * Get the set home location or 0,0,0 if no location is set<br>
-     * - Does not take the default home location into account
-     *
-     * @return
-     * @see #getHome()
-     */
-    public BlockLoc getPosition() {
-        return this.getSettings().getPosition();
+    for (UUID uuid : this.getDenied()) {
+      b.addDenied(uuid);
     }
-
-    /**
-     * Check if a plot can be claimed by the provided player.
-     *
-     * @param player the claiming player
-     * @return
-     */
-    public boolean canClaim(@Nullable PlotPlayer player) {
-        PlotCluster cluster = this.getCluster();
-        if (cluster != null && player != null) {
-            if (!cluster.isAdded(player.getUUID()) && !Permissions
-                .hasPermission(player, "plots.admin.command.claim")) {
-                return false;
-            }
-        }
-        return this.guessOwner() == null && !isMerged();
+    for (UUID uuid : b.getDenied()) {
+      this.addDenied(uuid);
     }
+  }
 
-    /**
-     * Guess the owner of a plot either by the value in memory, or the sign data<br>
-     * Note: Recovering from sign information is useful if e.g. PlotMe conversion wasn't successful
-     *
-     * @return UUID
-     */
-    public UUID guessOwner() {
-        if (this.hasOwner()) {
-            return this.owner;
-        }
-        if (!this.area.ALLOW_SIGNS) {
-            return null;
-        }
-        try {
-            final Location loc = this.getManager().getSignLoc(this.area, this);
-            String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
-                @Override public void run(String[] value) {
-                    ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
-                    this.value = WorldUtil.IMP.getSign(loc);
-                }
-            });
-            if (lines == null) {
-                return null;
-            }
-            loop:
-            for (int i = 4; i > 0; i--) {
-                String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
-                int index = caption.indexOf("%plr%");
-                if (index < 0) {
-                    continue;
-                }
-                String line = lines[i - 1];
-                if (line.length() <= index) {
-                    return null;
-                }
-                String name = line.substring(index);
-                if (name.isEmpty()) {
-                    return null;
-                }
-                UUID owner = UUIDHandler.getUUID(name, null);
-                if (owner != null) {
-                    this.owner = owner;
-                    break;
-                }
-                if (lines[i - 1].length() == 15) {
-                    BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
-                    for (Entry<StringWrapper, UUID> entry : map.entrySet()) {
-                        String key = entry.getKey().value;
-                        if (key.length() > name.length() && key.startsWith(name)) {
-                            this.owner = entry.getValue();
-                            break loop;
-                        }
-                    }
-                }
-                this.owner = UUID.nameUUIDFromBytes(
-                    ("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
-                break;
-            }
-            if (this.hasOwner()) {
-                this.create();
-            }
-            return this.owner;
-        } catch (IllegalArgumentException ignored) {
-            return null;
-        }
+  /**
+   * Remove the SE road (only effects terrain)
+   */
+  public void removeRoadSouthEast() {
+    if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+      if (this.area.TERRAIN == 3) {
+        return;
+      }
+      Plot other = this.getRelative(1, 1);
+      Location pos1 = this.getTopAbs().add(1, 0, 1);
+      Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
+      pos1.setY(0);
+      pos2.setY(256);
+      ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+    } else {
+      this.area.getPlotManager().removeRoadSouthEast(this.area, this);
     }
+  }
 
-    /**
-     * Remove the south road section of a plot<br>
-     * - Used when a plot is merged<br>
-     */
-    public void removeRoadSouth() {
-        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-            if (this.area.TERRAIN == 3) {
-                return;
-            }
-            Plot other = this.getRelative(2);
-            Location bot = other.getBottomAbs();
-            Location top = this.getTopAbs();
-            Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
-            Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
-            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+  /**
+   * Get the plot in a relative location<br> Note: May be null if the partial plot area does not
+   * include the relative location
+   *
+   * @return Plot
+   */
+  public Plot getRelative(int x, int y) {
+    return this.area.getPlotAbs(this.id.getRelative(x, y));
+  }
+
+  public Plot getRelative(PlotArea area, int x, int y) {
+    return area.getPlotAbs(this.id.getRelative(x, y));
+  }
+
+  /**
+   * Get the plot in a relative direction<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+   * Note: May be null if the partial plot area does not include the relative location
+   */
+  public Plot getRelative(int direction) {
+    return this.area.getPlotAbs(this.id.getRelative(direction));
+  }
+
+  /**
+   * Get a set of plots connected (and including) this plot<br> - This result is cached globally
+   */
+  public Set<Plot> getConnectedPlots() {
+    if (this.settings == null || !this.isMerged()) {
+      return Collections.singleton(this);
+    }
+    boolean[] merged = this.getMerged();
+    int hash = MainUtil.hash(merged);
+    if (hash == 0) {
+      return Collections.singleton(this);
+    }
+    if (connected_cache != null && connected_cache.contains(this)) {
+      return connected_cache;
+    }
+    regions_cache = null;
+
+    HashSet<Plot> tmpSet = new HashSet<>();
+    ArrayDeque<Plot> frontier = new ArrayDeque<>();
+    HashSet<Object> queuecache = new HashSet<>();
+    tmpSet.add(this);
+    Plot tmp;
+    if (merged[0]) {
+      tmp = this.area.getPlotAbs(this.id.getRelative(0));
+      if (!tmp.getMerged(2)) {
+        // invalid merge
+        PlotSquared.debug("Fixing invalid merge: " + this);
+        if (tmp.isOwnerAbs(this.owner)) {
+          tmp.getSettings().setMerged(2, true);
+          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
         } else {
-            this.getManager().removeRoadSouth(this.area, this);
+          this.getSettings().setMerged(0, false);
+          DBFunc.setMerged(this, this.getSettings().getMerged());
         }
+      }
+      queuecache.add(tmp);
+      frontier.add(tmp);
     }
-
-    /**
-     * Auto merge a plot in a specific direction<br>
-     *
-     * @param dir         The direction to merge<br>
-     *                    -1 = All directions<br>
-     *                    0 = north<br>
-     *                    1 = east<br>
-     *                    2 = south<br>
-     *                    3 = west<br>
-     * @param max         The max number of merges to do
-     * @param uuid        The UUID it is allowed to merge with
-     * @param removeRoads Whether to remove roads
-     * @return true if a merge takes place
-     */
-    public boolean autoMerge(int dir, int max, UUID uuid, boolean removeRoads) {
-        if (this.owner == null) {
-            return false;
-        }
-        if (!EventUtil.manager.callMerge(this, dir, max)) {
-            return false;
-        }
-        HashSet<Plot> visited = new HashSet<>();
-        HashSet<PlotId> merged = new HashSet<>();
-        Set<Plot> connected = this.getConnectedPlots();
-        for (Plot current : connected) {
-            merged.add(current.getId());
-        }
-        ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
-        Plot current;
-        boolean toReturn = false;
-        while ((current = frontier.poll()) != null && max >= 0) {
-            if (visited.contains(current)) {
-                continue;
-            }
-            visited.add(current);
-            Set<Plot> plots;
-            if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
-                Plot other = current.getRelative(0);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-            if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
-                Plot other = current.getRelative(1);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-            if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
-                Plot other = current.getRelative(2);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-            if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
-                Plot other = current.getRelative(3);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-        }
-        if (removeRoads && toReturn) {
-            ArrayList<PlotId> ids = new ArrayList<>(merged);
-            this.getManager().finishPlotMerge(this.area, ids);
-        }
-        return toReturn;
-    }
-
-    /**
-     * Merge the plot settings<br>
-     * - Used when a plot is merged<br>
-     *
-     * @param b
-     */
-    public void mergeData(Plot b) {
-        HashMap<Flag<?>, Object> flags1 = this.getFlags();
-        HashMap<Flag<?>, Object> flags2 = b.getFlags();
-        if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
-            boolean greater = flags1.size() > flags2.size();
-            if (greater) {
-                flags1.putAll(flags2);
-            } else {
-                flags2.putAll(flags1);
-            }
-            HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
-            this.setFlags(net);
-            b.setFlags(net);
-        }
-        if (!this.getAlias().isEmpty()) {
-            b.setAlias(this.getAlias());
-        } else if (!b.getAlias().isEmpty()) {
-            this.setAlias(b.getAlias());
-        }
-        for (UUID uuid : this.getTrusted()) {
-            b.addTrusted(uuid);
-        }
-        for (UUID uuid : b.getTrusted()) {
-            this.addTrusted(uuid);
-        }
-        for (UUID uuid : this.getMembers()) {
-            b.addMember(uuid);
-        }
-        for (UUID uuid : b.getMembers()) {
-            this.addMember(uuid);
-        }
-
-        for (UUID uuid : this.getDenied()) {
-            b.addDenied(uuid);
-        }
-        for (UUID uuid : b.getDenied()) {
-            this.addDenied(uuid);
-        }
-    }
-
-    /**
-     * Remove the SE road (only effects terrain)
-     */
-    public void removeRoadSouthEast() {
-        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-            if (this.area.TERRAIN == 3) {
-                return;
-            }
-            Plot other = this.getRelative(1, 1);
-            Location pos1 = this.getTopAbs().add(1, 0, 1);
-            Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
-            pos1.setY(0);
-            pos2.setY(256);
-            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+    if (merged[1]) {
+      tmp = this.area.getPlotAbs(this.id.getRelative(1));
+      if (!tmp.getMerged(3)) {
+        // invalid merge
+        PlotSquared.debug("Fixing invalid merge: " + this);
+        if (tmp.isOwnerAbs(this.owner)) {
+          tmp.getSettings().setMerged(3, true);
+          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
         } else {
-            this.area.getPlotManager().removeRoadSouthEast(this.area, this);
+          this.getSettings().setMerged(1, false);
+          DBFunc.setMerged(this, this.getSettings().getMerged());
         }
+      }
+      queuecache.add(tmp);
+      frontier.add(tmp);
     }
-
-    /**
-     * Get the plot in a relative location<br>
-     * Note: May be null if the partial plot area does not include the relative location
-     *
-     * @param x
-     * @param y
-     * @return Plot
-     */
-    public Plot getRelative(int x, int y) {
-        return this.area.getPlotAbs(this.id.getRelative(x, y));
+    if (merged[2]) {
+      tmp = this.area.getPlotAbs(this.id.getRelative(2));
+      if (!tmp.getMerged(0)) {
+        // invalid merge
+        PlotSquared.debug("Fixing invalid merge: " + this);
+        if (tmp.isOwnerAbs(this.owner)) {
+          tmp.getSettings().setMerged(0, true);
+          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+        } else {
+          this.getSettings().setMerged(2, false);
+          DBFunc.setMerged(this, this.getSettings().getMerged());
+        }
+      }
+      queuecache.add(tmp);
+      frontier.add(tmp);
     }
-
-    public Plot getRelative(PlotArea area, int x, int y) {
-        return area.getPlotAbs(this.id.getRelative(x, y));
+    if (merged[3]) {
+      tmp = this.area.getPlotAbs(this.id.getRelative(3));
+      if (!tmp.getMerged(1)) {
+        // invalid merge
+        PlotSquared.debug("Fixing invalid merge: " + this);
+        if (tmp.isOwnerAbs(this.owner)) {
+          tmp.getSettings().setMerged(1, true);
+          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+        } else {
+          this.getSettings().setMerged(3, false);
+          DBFunc.setMerged(this, this.getSettings().getMerged());
+        }
+      }
+      queuecache.add(tmp);
+      frontier.add(tmp);
     }
-
-    /**
-     * Get the plot in a relative direction<br>
-     * 0 = north<br>
-     * 1 = east<br>
-     * 2 = south<br>
-     * 3 = west<br>
-     * Note: May be null if the partial plot area does not include the relative location
-     *
-     * @param direction
-     * @return
-     */
-    public Plot getRelative(int direction) {
-        return this.area.getPlotAbs(this.id.getRelative(direction));
+    Plot current;
+    while ((current = frontier.poll()) != null) {
+      if (current.owner == null || current.settings == null) {
+        // Invalid plot
+        // merged onto unclaimed plot
+        PlotSquared
+            .debug("Ignoring invalid merged plot: " + current + " | " + current.owner);
+        continue;
+      }
+      tmpSet.add(current);
+      queuecache.remove(current);
+      merged = current.getMerged();
+      if (merged[0]) {
+        tmp = current.area.getPlotAbs(current.id.getRelative(0));
+        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+          queuecache.add(tmp);
+          frontier.add(tmp);
+        }
+      }
+      if (merged[1]) {
+        tmp = current.area.getPlotAbs(current.id.getRelative(1));
+        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+          queuecache.add(tmp);
+          frontier.add(tmp);
+        }
+      }
+      if (merged[2]) {
+        tmp = current.area.getPlotAbs(current.id.getRelative(2));
+        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+          queuecache.add(tmp);
+          frontier.add(tmp);
+        }
+      }
+      if (merged[3]) {
+        tmp = current.area.getPlotAbs(current.id.getRelative(3));
+        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+          queuecache.add(tmp);
+          frontier.add(tmp);
+        }
+      }
     }
+    connected_cache = tmpSet;
+    return tmpSet;
+  }
 
-    /**
-     * Get a set of plots connected (and including) this plot<br>
-     * - This result is cached globally
-     *
-     * @return
-     */
-    public Set<Plot> getConnectedPlots() {
-        if (this.settings == null) {
-            return Collections.singleton(this);
-        }
-        boolean[] merged = this.getMerged();
-        int hash = MainUtil.hash(merged);
-        if (hash == 0) {
-            return Collections.singleton(this);
-        }
-        if (connected_cache != null && connected_cache.contains(this)) {
-            return connected_cache;
-        }
-        regions_cache = null;
-
-        HashSet<Plot> tmpSet = new HashSet<>();
-        ArrayDeque<Plot> frontier = new ArrayDeque<>();
-        HashSet<Object> queuecache = new HashSet<>();
-        tmpSet.add(this);
-        Plot tmp;
-        if (merged[0]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(0));
-            if (!tmp.getMerged(2)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(2, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(0, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (merged[1]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(1));
-            if (!tmp.getMerged(3)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(3, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(1, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (merged[2]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(2));
-            if (!tmp.getMerged(0)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(0, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(2, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (merged[3]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(3));
-            if (!tmp.getMerged(1)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(1, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(3, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        Plot current;
-        while ((current = frontier.poll()) != null) {
-            if (current.owner == null || current.settings == null) {
-                // Invalid plot
-                // merged onto unclaimed plot
-                PlotSquared
-                    .debug("Ignoring invalid merged plot: " + current + " | " + current.owner);
-                continue;
-            }
-            tmpSet.add(current);
-            queuecache.remove(current);
-            merged = current.getMerged();
-            if (merged[0]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(0));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (merged[1]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(1));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (merged[2]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(2));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (merged[3]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(3));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-        }
-        connected_cache = tmpSet;
-        return tmpSet;
+  /**
+   * This will combine each plot into effective rectangular regions<br> - This result is cached
+   * globally<br> - Useful for handling non rectangular shapes
+   */
+  public HashSet<RegionWrapper> getRegions() {
+    if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
+      return regions_cache;
     }
-
-    /**
-     * This will combine each plot into effective rectangular regions<br>
-     * - This result is cached globally<br>
-     * - Useful for handling non rectangular shapes
-     *
-     * @return
-     */
-    public HashSet<RegionWrapper> getRegions() {
-        if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
-            return regions_cache;
+    if (!this.isMerged()) {
+      Location pos1 = this.getBottomAbs();
+      Location pos2 = this.getTopAbs();
+      connected_cache = new HashSet<>(Collections.singletonList(this));
+      regions_cache = new HashSet<>(1);
+      regions_cache.add(
+          new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
+              pos2.getZ()));
+      return regions_cache;
+    }
+    Set<Plot> plots = this.getConnectedPlots();
+    HashSet<RegionWrapper> regions = regions_cache = new HashSet<>();
+    HashSet<PlotId> visited = new HashSet<>();
+    for (Plot current : plots) {
+      if (visited.contains(current.getId())) {
+        continue;
+      }
+      boolean merge = true;
+      PlotId bot = new PlotId(current.getId().x, current.getId().y);
+      PlotId top = new PlotId(current.getId().x, current.getId().y);
+      while (merge) {
+        merge = false;
+        ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, bot.y - 1),
+            new PlotId(top.x, bot.y - 1));
+        boolean tmp = true;
+        for (PlotId id : ids) {
+          Plot plot = this.area.getPlotAbs(id);
+          if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
+            tmp = false;
+          }
         }
-        if (!this.isMerged()) {
-            Location pos1 = this.getBottomAbs();
-            Location pos2 = this.getTopAbs();
-            connected_cache = new HashSet<>(Collections.singletonList(this));
-            regions_cache = new HashSet<>(1);
-            regions_cache.add(
-                new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
-                    pos2.getZ()));
-            return regions_cache;
+        if (tmp) {
+          merge = true;
+          bot.y--;
         }
-        Set<Plot> plots = this.getConnectedPlots();
-        HashSet<RegionWrapper> regions = regions_cache = new HashSet<>();
-        HashSet<PlotId> visited = new HashSet<>();
-        for (Plot current : plots) {
-            if (visited.contains(current.getId())) {
-                continue;
-            }
-            boolean merge = true;
-            PlotId bot = new PlotId(current.getId().x, current.getId().y);
-            PlotId top = new PlotId(current.getId().x, current.getId().y);
-            while (merge) {
-                merge = false;
-                ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, bot.y - 1),
-                    new PlotId(top.x, bot.y - 1));
-                boolean tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    bot.y--;
-                }
-                ids = MainUtil.getPlotSelectionIds(new PlotId(top.x + 1, bot.y),
-                    new PlotId(top.x + 1, top.y));
-                tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    top.x++;
-                }
-                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, top.y + 1),
-                    new PlotId(top.x, top.y + 1));
-                tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    top.y++;
-                }
-                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x - 1, bot.y),
-                    new PlotId(bot.x - 1, top.y));
-                tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    bot.x--;
-                }
-            }
-            Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
-            Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
-            for (PlotId id : MainUtil.getPlotSelectionIds(bot, top)) {
-                visited.add(id);
-            }
-            for (int x = bot.x; x <= top.x; x++) {
-                Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
-                if (plot.getMerged(2)) {
-                    // south wedge
-                    Location toploc = plot.getExtendedTopAbs();
-                    Location botabs = plot.getBottomAbs();
-                    Location topabs = plot.getTopAbs();
-                    regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
-                        toploc.getZ()));
-                    if (plot.getMerged(5)) {
-                        regions.add(
-                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
-                                toploc.getZ()));
-                        // intersection
-                    }
-                }
-            }
-
-            for (int y = bot.y; y <= top.y; y++) {
-                Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
-                if (plot.getMerged(1)) {
-                    // east wedge
-                    Location toploc = plot.getExtendedTopAbs();
-                    Location botabs = plot.getBottomAbs();
-                    Location topabs = plot.getTopAbs();
-                    regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
-                        topabs.getZ()));
-                    if (plot.getMerged(5)) {
-                        regions.add(
-                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
-                                toploc.getZ()));
-                        // intersection
-                    }
-                }
-            }
+        ids = MainUtil.getPlotSelectionIds(new PlotId(top.x + 1, bot.y),
+            new PlotId(top.x + 1, top.y));
+        tmp = true;
+        for (PlotId id : ids) {
+          Plot plot = this.area.getPlotAbs(id);
+          if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
+            tmp = false;
+          }
+        }
+        if (tmp) {
+          merge = true;
+          top.x++;
+        }
+        ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, top.y + 1),
+            new PlotId(top.x, top.y + 1));
+        tmp = true;
+        for (PlotId id : ids) {
+          Plot plot = this.area.getPlotAbs(id);
+          if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
+            tmp = false;
+          }
+        }
+        if (tmp) {
+          merge = true;
+          top.y++;
+        }
+        ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x - 1, bot.y),
+            new PlotId(bot.x - 1, top.y));
+        tmp = true;
+        for (PlotId id : ids) {
+          Plot plot = this.area.getPlotAbs(id);
+          if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
+            tmp = false;
+          }
+        }
+        if (tmp) {
+          merge = true;
+          bot.x--;
+        }
+      }
+      Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
+      Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
+      visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
+      for (int x = bot.x; x <= top.x; x++) {
+        Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
+        if (plot.getMerged(2)) {
+          // south wedge
+          Location toploc = plot.getExtendedTopAbs();
+          Location botabs = plot.getBottomAbs();
+          Location topabs = plot.getTopAbs();
+          regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
+              toploc.getZ()));
+          if (plot.getMerged(5)) {
             regions.add(
-                new RegionWrapper(gbotabs.getX(), gtopabs.getX(), gbotabs.getZ(), gtopabs.getZ()));
+                new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
+                    toploc.getZ()));
+            // intersection
+          }
         }
-        return regions;
-    }
+      }
 
-    /**
-     * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular shapes)
-     *
-     * @return
-     */
-    public RegionWrapper getLargestRegion() {
-        HashSet<RegionWrapper> regions = this.getRegions();
-        RegionWrapper max = null;
-        double area = Double.NEGATIVE_INFINITY;
-        for (RegionWrapper region : regions) {
-            double current =
-                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1);
-            if (current > area) {
-                max = region;
-                area = current;
-            }
+      for (int y = bot.y; y <= top.y; y++) {
+        Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
+        if (plot.getMerged(1)) {
+          // east wedge
+          Location toploc = plot.getExtendedTopAbs();
+          Location botabs = plot.getBottomAbs();
+          Location topabs = plot.getTopAbs();
+          regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
+              topabs.getZ()));
+          if (plot.getMerged(5)) {
+            regions.add(
+                new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
+                    toploc.getZ()));
+            // intersection
+          }
         }
-        return max;
+      }
+      regions.add(
+          new RegionWrapper(gbotabs.getX(), gtopabs.getX(), gbotabs.getZ(), gtopabs.getZ()));
     }
+    return regions;
+  }
 
-    /**
-     * Do the plot entry tasks for each player in the plot<br>
-     * - Usually called when the plot state changes (unclaimed/claimed/flag change etc)
-     */
-    public void reEnter() {
-        TaskManager.runTaskLater(() -> {
-            for (PlotPlayer pp : Plot.this.getPlayersInPlot()) {
-                PlotListener.plotExit(pp, Plot.this);
-                PlotListener.plotEntry(pp, Plot.this);
-            }
-        }, 1);
+  /**
+   * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular
+   * shapes)
+   */
+  public RegionWrapper getLargestRegion() {
+    HashSet<RegionWrapper> regions = this.getRegions();
+    RegionWrapper max = null;
+    double area = Double.NEGATIVE_INFINITY;
+    for (RegionWrapper region : regions) {
+      double current =
+          (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1);
+      if (current > area) {
+        max = region;
+        area = current;
+      }
     }
+    return max;
+  }
 
-    /**
-     * Get all the corners of the plot (supports non-rectangular shapes).
-     *
-     * @return A list of the plot corners
-     */
-    public List<Location> getAllCorners() {
-        Area area = new Area();
-        for (RegionWrapper region : this.getRegions()) {
-            Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6,
-                region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
-            Area rectArea = new Area(rect);
-            area.add(rectArea);
-        }
-        List<Location> locs = new ArrayList<>();
-        double[] coords = new double[6];
-        for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
-            int type = pi.currentSegment(coords);
-            int x = (int) MathMan.inverseRound(coords[0]);
-            int z = (int) MathMan.inverseRound(coords[1]);
-            if (type != 4) {
-                locs.add(new Location(this.getWorldName(), x, 0, z));
-            }
-        }
-        return locs;
+  /**
+   * Do the plot entry tasks for each player in the plot<br> - Usually called when the plot state
+   * changes (unclaimed/claimed/flag change etc)
+   */
+  public void reEnter() {
+    TaskManager.runTaskLater(() -> {
+      for (PlotPlayer pp : Plot.this.getPlayersInPlot()) {
+        PlotListener.plotExit(pp, Plot.this);
+        PlotListener.plotEntry(pp, Plot.this);
+      }
+    }, 1);
+  }
+
+  /**
+   * Get all the corners of the plot (supports non-rectangular shapes).
+   *
+   * @return A list of the plot corners
+   */
+  public List<Location> getAllCorners() {
+    Area area = new Area();
+    for (RegionWrapper region : this.getRegions()) {
+      Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6,
+          region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
+      Area rectArea = new Area(rect);
+      area.add(rectArea);
     }
-
-    /**
-     * Teleport a player to a plot and send them the teleport message.
-     *
-     * @param player the player
-     * @return if the teleport succeeded
-     */
-    public boolean teleportPlayer(final PlotPlayer player) {
-        Plot plot = this.getBasePlot(false);
-        boolean result = EventUtil.manager.callTeleport(player, player.getLocation(), plot);
-        if (result) {
-            final Location location;
-            if (this.area.HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
-                location = this.getHome();
-            } else {
-                location = this.getDefaultHome(false);
-            }
-            if (Settings.Teleport.DELAY == 0 || Permissions
-                .hasPermission(player, "plots.teleport.delay.bypass")) {
-                MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
-                player.teleport(location);
-                return true;
-            }
-            MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
-            final String name = player.getName();
-            TaskManager.TELEPORT_QUEUE.add(name);
-            TaskManager.runTaskLater(() -> {
-                if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
-                    MainUtil.sendMessage(player, C.TELEPORT_FAILED);
-                    return;
-                }
-                TaskManager.TELEPORT_QUEUE.remove(name);
-                if (player.isOnline()) {
-                    MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
-                    player.teleport(location);
-                }
-            }, Settings.Teleport.DELAY * 20);
-            return true;
-        }
-        return false;
+    List<Location> locs = new ArrayList<>();
+    double[] coords = new double[6];
+    for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
+      int type = pi.currentSegment(coords);
+      int x = (int) MathMan.inverseRound(coords[0]);
+      int z = (int) MathMan.inverseRound(coords[1]);
+      if (type != 4) {
+        locs.add(new Location(this.getWorldName(), x, 0, z));
+      }
     }
+    return locs;
+  }
 
-    public boolean isOnline() {
-        if (this.owner == null) {
-            return false;
-        }
-        if (!isMerged()) {
-            return UUIDHandler.getPlayer(this.owner) != null;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (current.hasOwner() && UUIDHandler.getPlayer(current.owner) != null) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set a component for a plot to the provided blocks<br>
-     * - E.g. floor, wall, border etc.<br>
-     * - The available components depend on the generator being used<br>
-     *
-     * @param component
-     * @param blocks
-     * @return
-     */
-    public boolean setComponent(String component, BlockBucket blocks) {
-        if (StringMan
-            .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
-            EventUtil.manager.callComponentSet(this, component);
-        }
-        return this.getManager().setComponent(this.area, this.getId(), component, blocks);
-    }
-
-    public int getDistanceFromOrigin() {
-        Location bot = getManager().getPlotBottomLocAbs(this.area, id);
-        Location top = getManager().getPlotTopLocAbs(this.area, id);
-        return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
-            Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
-    }
-
-    /**
-     * Expand the world border to include the provided plot (if applicable).
-     */
-    public void updateWorldBorder() {
-        if (this.owner == null) {
-            return;
-        }
-        int border = this.area.getBorder();
-        if (border == Integer.MAX_VALUE) {
-            return;
-        }
-        int max = getDistanceFromOrigin();
-        if (max > border) {
-            this.area.setMeta("worldBorder", max);
-        }
-    }
-
-    /**
-     * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other <br> - saves to DB
-     *
-     * @param lesserPlot
-     * @param removeRoads
-     */
-    public void mergePlot(Plot lesserPlot, boolean removeRoads) {
-        Plot greaterPlot = this;
-        if (lesserPlot.getId().x == greaterPlot.getId().x) {
-            if (lesserPlot.getId().y > greaterPlot.getId().y) {
-                Plot tmp = lesserPlot;
-                lesserPlot = greaterPlot;
-                greaterPlot = tmp;
-            }
-            if (!lesserPlot.getMerged(2)) {
-                lesserPlot.clearRatings();
-                greaterPlot.clearRatings();
-                lesserPlot.setMerged(2, true);
-                greaterPlot.setMerged(0, true);
-                lesserPlot.mergeData(greaterPlot);
-                if (removeRoads) {
-                    lesserPlot.removeRoadSouth();
-                    Plot diagonal = greaterPlot.getRelative(1);
-                    if (diagonal.getMerged(7)) {
-                        lesserPlot.removeRoadSouthEast();
-                    }
-                    Plot below = greaterPlot.getRelative(3);
-                    if (below.getMerged(4)) {
-                        below.getRelative(0).removeRoadSouthEast();
-                    }
-                }
-            }
-        } else {
-            if (lesserPlot.getId().x > greaterPlot.getId().x) {
-                Plot tmp = lesserPlot;
-                lesserPlot = greaterPlot;
-                greaterPlot = tmp;
-            }
-            if (!lesserPlot.getMerged(1)) {
-                lesserPlot.clearRatings();
-                greaterPlot.clearRatings();
-                lesserPlot.setMerged(1, true);
-                greaterPlot.setMerged(3, true);
-                lesserPlot.mergeData(greaterPlot);
-                if (removeRoads) {
-                    Plot diagonal = greaterPlot.getRelative(2);
-                    if (diagonal.getMerged(7)) {
-                        lesserPlot.removeRoadSouthEast();
-                    }
-                    lesserPlot.removeRoadEast();
-                }
-                Plot below = greaterPlot.getRelative(0);
-                if (below.getMerged(6)) {
-                    below.getRelative(3).removeRoadSouthEast();
-                }
-            }
-        }
-    }
-
-    /**
-     * Move a plot physically, as well as the corresponding settings.
-     *
-     * @param destination Plot moved to
-     * @param whenDone    task when done
-     * @param allowSwap   whether to swap plots
-     * @return success
-     */
-    public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
-        final PlotId offset = new PlotId(destination.getId().x - this.getId().x,
-            destination.getId().y - this.getId().y);
-        Location db = destination.getBottomAbs();
-        Location ob = this.getBottomAbs();
-        final int offsetX = db.getX() - ob.getX();
-        final int offsetZ = db.getZ() - ob.getZ();
-        if (this.owner == null) {
-            TaskManager.runTaskLater(whenDone, 1);
-            return false;
-        }
-        boolean occupied = false;
-        Set<Plot> plots = this.getConnectedPlots();
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            if (other.hasOwner()) {
-                if (!allowSwap) {
-                    TaskManager.runTaskLater(whenDone, 1);
-                    return false;
-                }
-                occupied = true;
-            } else {
-                plot.removeSign();
-            }
-        }
-        // world border
-        destination.updateWorldBorder();
-        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-        // move / swap data
-        final PlotArea originArea = getArea();
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            plot.swapData(other, null);
-        }
-        // copy terrain
-        Runnable move = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    Plot plot = destination.getRelative(0, 0);
-                    for (Plot current : plot.getConnectedPlots()) {
-                        getManager().claimPlot(current.getArea(), current);
-                        Plot originPlot = originArea.getPlotAbs(
-                            new PlotId(current.id.x - offset.x, current.id.y - offset.y));
-                        originPlot.getManager().unclaimPlot(originArea, originPlot, null);
-                    }
-                    plot.setSign();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                final Runnable task = this;
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                final Location pos1 = corners[0];
-                final Location pos2 = corners[1];
-                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-                newPos.setWorld(destination.getWorldName());
-                ChunkManager.manager.copyRegion(pos1, pos2, newPos,
-                    () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
-            }
-        };
-        Runnable swap = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                Location pos1 = corners[0];
-                Location pos2 = corners[1];
-                Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
-                Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
-                pos3.setWorld(destination.getWorldName());
-                pos4.setWorld(destination.getWorldName());
-                ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
-            }
-        };
-        if (occupied) {
-            swap.run();
-        } else {
-            move.run();
-        }
+  /**
+   * Teleport a player to a plot and send them the teleport message.
+   *
+   * @param player the player
+   * @return if the teleport succeeded
+   */
+  public boolean teleportPlayer(final PlotPlayer player) {
+    Plot plot = this.getBasePlot(false);
+    boolean result = EventUtil.manager.callTeleport(player, player.getLocation(), plot);
+    if (result) {
+      final Location location;
+      if (this.area.HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
+        location = this.getHome();
+      } else {
+        location = this.getDefaultHome(false);
+      }
+      if (Settings.Teleport.DELAY == 0 || Permissions
+          .hasPermission(player, "plots.teleport.delay.bypass")) {
+        MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+        player.teleport(location);
         return true;
+      }
+      MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
+      final String name = player.getName();
+      TaskManager.TELEPORT_QUEUE.add(name);
+      TaskManager.runTaskLater(() -> {
+        if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
+          MainUtil.sendMessage(player, C.TELEPORT_FAILED);
+          return;
+        }
+        TaskManager.TELEPORT_QUEUE.remove(name);
+        if (player.isOnline()) {
+          MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+          player.teleport(location);
+        }
+      }, Settings.Teleport.DELAY * 20);
+      return true;
     }
+    return false;
+  }
 
-    /**
-     * Copy a plot to a location, both physically and the settings
-     *
-     * @param destination
-     * @param whenDone
-     * @return
-     */
-    public boolean copy(final Plot destination, final Runnable whenDone) {
-        PlotId offset = new PlotId(destination.getId().x - this.getId().x,
-            destination.getId().y - this.getId().y);
-        Location db = destination.getBottomAbs();
-        Location ob = this.getBottomAbs();
-        final int offsetX = db.getX() - ob.getX();
-        final int offsetZ = db.getZ() - ob.getZ();
-        if (this.owner == null) {
-            TaskManager.runTaskLater(whenDone, 1);
-            return false;
-        }
-        Set<Plot> plots = this.getConnectedPlots();
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            if (other.hasOwner()) {
-                TaskManager.runTaskLater(whenDone, 1);
-                return false;
-            }
-        }
-        // world border
-        destination.updateWorldBorder();
-        // copy data
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            other.create(plot.owner, false);
-            if (!plot.getFlags().isEmpty()) {
-                other.getSettings().flags = plot.getFlags();
-                DBFunc.setFlags(other, plot.getFlags());
-            }
-            if (plot.isMerged()) {
-                other.setMerged(plot.getMerged());
-            }
-            if (plot.members != null && !plot.members.isEmpty()) {
-                other.members = plot.members;
-                for (UUID member : plot.members) {
-                    DBFunc.setMember(other, member);
-                }
-            }
-            if (plot.trusted != null && !plot.trusted.isEmpty()) {
-                other.trusted = plot.trusted;
-                for (UUID trusted : plot.trusted) {
-                    DBFunc.setTrusted(other, trusted);
-                }
-            }
-            if (plot.denied != null && !plot.denied.isEmpty()) {
-                other.denied = plot.denied;
-                for (UUID denied : plot.denied) {
-                    DBFunc.setDenied(other, denied);
-                }
-            }
-        }
-        // copy terrain
-        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    for (Plot current : getConnectedPlots()) {
-                        destination.getManager().claimPlot(destination.getArea(), destination);
-                    }
-                    destination.setSign();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                Location pos1 = corners[0];
-                Location pos2 = corners[1];
-                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-                newPos.setWorld(destination.getWorldName());
-                ChunkManager.manager.copyRegion(pos1, pos2, newPos, this);
-            }
-        };
-        run.run();
+  public boolean isOnline() {
+    if (this.owner == null) {
+      return false;
+    }
+    if (!isMerged()) {
+      return UUIDHandler.getPlayer(this.owner) != null;
+    }
+    for (Plot current : getConnectedPlots()) {
+      if (current.hasOwner() && UUIDHandler.getPlayer(current.owner) != null) {
         return true;
+      }
     }
+    return false;
+  }
 
-    public boolean hasFlag(Flag<?> flag) {
-        return getFlags().containsKey(flag);
+  /**
+   * Set a component for a plot to the provided blocks<br> - E.g. floor, wall, border etc.<br> - The
+   * available components depend on the generator being used<br>
+   */
+  public boolean setComponent(String component, BlockBucket blocks) {
+    if (StringMan
+        .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
+      EventUtil.manager.callComponentSet(this, component);
     }
+    return this.getManager().setComponent(this.area, this.getId(), component, blocks);
+  }
+
+  public int getDistanceFromOrigin() {
+    Location bot = getManager().getPlotBottomLocAbs(this.area, id);
+    Location top = getManager().getPlotTopLocAbs(this.area, id);
+    return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
+        Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
+  }
+
+  /**
+   * Expand the world border to include the provided plot (if applicable).
+   */
+  public void updateWorldBorder() {
+    if (this.owner == null) {
+      return;
+    }
+    int border = this.area.getBorder();
+    if (border == Integer.MAX_VALUE) {
+      return;
+    }
+    int max = getDistanceFromOrigin();
+    if (max > border) {
+      this.area.setMeta("worldBorder", max);
+    }
+  }
+
+  /**
+   * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other
+   * <br> - saves to DB
+   */
+  public void mergePlot(Plot lesserPlot, boolean removeRoads) {
+    Plot greaterPlot = this;
+    if (lesserPlot.getId().x == greaterPlot.getId().x) {
+      if (lesserPlot.getId().y > greaterPlot.getId().y) {
+        Plot tmp = lesserPlot;
+        lesserPlot = greaterPlot;
+        greaterPlot = tmp;
+      }
+      if (!lesserPlot.getMerged(2)) {
+        lesserPlot.clearRatings();
+        greaterPlot.clearRatings();
+        lesserPlot.setMerged(2, true);
+        greaterPlot.setMerged(0, true);
+        lesserPlot.mergeData(greaterPlot);
+        if (removeRoads) {
+          lesserPlot.removeRoadSouth();
+          Plot diagonal = greaterPlot.getRelative(1);
+          if (diagonal.getMerged(7)) {
+            lesserPlot.removeRoadSouthEast();
+          }
+          Plot below = greaterPlot.getRelative(3);
+          if (below.getMerged(4)) {
+            below.getRelative(0).removeRoadSouthEast();
+          }
+        }
+      }
+    } else {
+      if (lesserPlot.getId().x > greaterPlot.getId().x) {
+        Plot tmp = lesserPlot;
+        lesserPlot = greaterPlot;
+        greaterPlot = tmp;
+      }
+      if (!lesserPlot.getMerged(1)) {
+        lesserPlot.clearRatings();
+        greaterPlot.clearRatings();
+        lesserPlot.setMerged(1, true);
+        greaterPlot.setMerged(3, true);
+        lesserPlot.mergeData(greaterPlot);
+        if (removeRoads) {
+          Plot diagonal = greaterPlot.getRelative(2);
+          if (diagonal.getMerged(7)) {
+            lesserPlot.removeRoadSouthEast();
+          }
+          lesserPlot.removeRoadEast();
+        }
+        Plot below = greaterPlot.getRelative(0);
+        if (below.getMerged(6)) {
+          below.getRelative(3).removeRoadSouthEast();
+        }
+      }
+    }
+  }
+
+  /**
+   * Move a plot physically, as well as the corresponding settings.
+   *
+   * @param destination Plot moved to
+   * @param whenDone task when done
+   * @param allowSwap whether to swap plots
+   * @return success
+   */
+  public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
+    final PlotId offset = new PlotId(destination.getId().x - this.getId().x,
+        destination.getId().y - this.getId().y);
+    Location db = destination.getBottomAbs();
+    Location ob = this.getBottomAbs();
+    final int offsetX = db.getX() - ob.getX();
+    final int offsetZ = db.getZ() - ob.getZ();
+    if (this.owner == null) {
+      TaskManager.runTaskLater(whenDone, 1);
+      return false;
+    }
+    boolean occupied = false;
+    Set<Plot> plots = this.getConnectedPlots();
+    for (Plot plot : plots) {
+      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+      if (other.hasOwner()) {
+        if (!allowSwap) {
+          TaskManager.runTaskLater(whenDone, 1);
+          return false;
+        }
+        occupied = true;
+      } else {
+        plot.removeSign();
+      }
+    }
+    // world border
+    destination.updateWorldBorder();
+    final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+    // move / swap data
+    final PlotArea originArea = getArea();
+    for (Plot plot : plots) {
+      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+      plot.swapData(other, null);
+    }
+    // copy terrain
+    Runnable move = new Runnable() {
+      @Override
+      public void run() {
+        if (regions.isEmpty()) {
+          Plot plot = destination.getRelative(0, 0);
+          for (Plot current : plot.getConnectedPlots()) {
+            getManager().claimPlot(current.getArea(), current);
+            Plot originPlot = originArea.getPlotAbs(
+                new PlotId(current.id.x - offset.x, current.id.y - offset.y));
+            originPlot.getManager().unclaimPlot(originArea, originPlot, null);
+          }
+          plot.setSign();
+          TaskManager.runTask(whenDone);
+          return;
+        }
+        final Runnable task = this;
+        RegionWrapper region = regions.poll();
+        Location[] corners = region.getCorners(getWorldName());
+        final Location pos1 = corners[0];
+        final Location pos2 = corners[1];
+        Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+        newPos.setWorld(destination.getWorldName());
+        ChunkManager.manager.copyRegion(pos1, pos2, newPos,
+            () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
+      }
+    };
+    Runnable swap = new Runnable() {
+      @Override
+      public void run() {
+        if (regions.isEmpty()) {
+          TaskManager.runTask(whenDone);
+          return;
+        }
+        RegionWrapper region = regions.poll();
+        Location[] corners = region.getCorners(getWorldName());
+        Location pos1 = corners[0];
+        Location pos2 = corners[1];
+        Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
+        Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
+        pos3.setWorld(destination.getWorldName());
+        pos4.setWorld(destination.getWorldName());
+        ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
+      }
+    };
+    if (occupied) {
+      swap.run();
+    } else {
+      move.run();
+    }
+    return true;
+  }
+
+  /**
+   * Copy a plot to a location, both physically and the settings
+   */
+  public boolean copy(final Plot destination, final Runnable whenDone) {
+    PlotId offset = new PlotId(destination.getId().x - this.getId().x,
+        destination.getId().y - this.getId().y);
+    Location db = destination.getBottomAbs();
+    Location ob = this.getBottomAbs();
+    final int offsetX = db.getX() - ob.getX();
+    final int offsetZ = db.getZ() - ob.getZ();
+    if (this.owner == null) {
+      TaskManager.runTaskLater(whenDone, 1);
+      return false;
+    }
+    Set<Plot> plots = this.getConnectedPlots();
+    for (Plot plot : plots) {
+      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+      if (other.hasOwner()) {
+        TaskManager.runTaskLater(whenDone, 1);
+        return false;
+      }
+    }
+    // world border
+    destination.updateWorldBorder();
+    // copy data
+    for (Plot plot : plots) {
+      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+      other.create(plot.owner, false);
+      if (!plot.getFlags().isEmpty()) {
+        other.getSettings().flags = plot.getFlags();
+        DBFunc.setFlags(other, plot.getFlags());
+      }
+      if (plot.isMerged()) {
+        other.setMerged(plot.getMerged());
+      }
+      if (plot.members != null && !plot.members.isEmpty()) {
+        other.members = plot.members;
+        for (UUID member : plot.members) {
+          DBFunc.setMember(other, member);
+        }
+      }
+      if (plot.trusted != null && !plot.trusted.isEmpty()) {
+        other.trusted = plot.trusted;
+        for (UUID trusted : plot.trusted) {
+          DBFunc.setTrusted(other, trusted);
+        }
+      }
+      if (plot.denied != null && !plot.denied.isEmpty()) {
+        other.denied = plot.denied;
+        for (UUID denied : plot.denied) {
+          DBFunc.setDenied(other, denied);
+        }
+      }
+    }
+    // copy terrain
+    final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+    Runnable run = new Runnable() {
+      @Override
+      public void run() {
+        if (regions.isEmpty()) {
+          for (Plot current : getConnectedPlots()) {
+            destination.getManager().claimPlot(destination.getArea(), destination);
+          }
+          destination.setSign();
+          TaskManager.runTask(whenDone);
+          return;
+        }
+        RegionWrapper region = regions.poll();
+        Location[] corners = region.getCorners(getWorldName());
+        Location pos1 = corners[0];
+        Location pos2 = corners[1];
+        Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+        newPos.setWorld(destination.getWorldName());
+        ChunkManager.manager.copyRegion(pos1, pos2, newPos, this);
+      }
+    };
+    run.run();
+    return true;
+  }
+
+  public boolean hasFlag(Flag<?> flag) {
+    return getFlags().containsKey(flag);
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 48ebb759a..00a30e22d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -721,6 +721,9 @@ public abstract class PlotArea {
             } else {
                 start = start.getNextId(1);
             }
+            if (start == null) {
+                PlotSquared.debug("NPE possible in getNextFreePlot");
+            }
             currentId = new PlotId(center.x + start.x, center.y + start.y);
             Plot plot = getPlotAbs(currentId);
             if (plot != null && plot.canClaim(player)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
index a1134cbce..4a12bfb7b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
@@ -5,19 +5,25 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 
 import java.util.HashSet;
 import java.util.UUID;
+import javax.annotation.Nonnull;
+import lombok.Getter;
 
 public class PlotCluster {
     public PlotArea area;
+    @Nonnull
+    @Getter
     public PlotSettings settings;
     public UUID owner;
     public HashSet<UUID> helpers = new HashSet<>();
     public HashSet<UUID> invited = new HashSet<>();
     public int temp;
+    @Nonnull
     private PlotId pos1;
+    @Nonnull
     private PlotId pos2;
     private RegionWrapper region;
 
-    public PlotCluster(PlotArea area, PlotId pos1, PlotId pos2, UUID owner) {
+    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, @Nonnull PlotId pos2, UUID owner) {
         this.area = area;
         this.pos1 = pos1;
         this.pos2 = pos2;
@@ -27,7 +33,7 @@ public class PlotCluster {
         setRegion();
     }
 
-    public PlotCluster(PlotArea area, PlotId pos1, PlotId pos2, UUID owner, int temp) {
+    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, PlotId pos2, UUID owner, int temp) {
         this.area = area;
         this.pos1 = pos1;
         this.pos2 = pos2;
@@ -82,6 +88,11 @@ public class PlotCluster {
         return this.settings.getAlias();
     }
 
+    public String getAlias() {
+        return this.settings.getAlias();
+    }
+
+    public void setName(String name) { this.settings.setAlias(name);}
     /**
      * Get the area (in plots).
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
index 47069a38e..6db234de3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
@@ -13,6 +13,7 @@ public class PlotMessage {
         try {
             reset(ChatManager.manager);
         } catch (Throwable e) {
+            assert PlotSquared.imp() != null;
             PlotSquared.debug(
                 PlotSquared.imp().getPluginName() + " doesn't support fancy chat for " + PlotSquared
                     .get().IMP.getServerVersion());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index d535c625e..850c77365 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -24,655 +24,632 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
-    public static final String META_LAST_PLOT = "lastplot";
-    public static final String META_LOCATION = "location";
-    private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
-    private Map<String, byte[]> metaMap = new HashMap<>();
-    /**
-     * The metadata map.
-     */
-    private ConcurrentHashMap<String, Object> meta;
+  public static final String META_LAST_PLOT = "lastplot";
+  public static final String META_LOCATION = "location";
+  private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
+  private Map<String, byte[]> metaMap = new HashMap<>();
+  /**
+   * The metadata map.
+   */
+  private ConcurrentHashMap<String, Object> meta;
 
-    public static <T> PlotPlayer from(@NonNull final T object) {
-        if (!converters.containsKey(object.getClass())) {
-            throw new IllegalArgumentException(String
-                .format("There is no registered PlotPlayer converter for type %s",
-                    object.getClass().getSimpleName()));
+  public static <T> PlotPlayer from(@NonNull final T object) {
+    if (!converters.containsKey(object.getClass())) {
+      throw new IllegalArgumentException(String
+          .format("There is no registered PlotPlayer converter for type %s",
+              object.getClass().getSimpleName()));
+    }
+    return converters.get(object.getClass()).convert(object);
+  }
+
+  public static <T> void registerConverter(@NonNull final Class<T> clazz,
+      final PlotPlayerConverter<T> converter) {
+    converters.put(clazz, converter);
+  }
+
+  /**
+   * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's
+   * already cached)<br> - Accepts sponge/bukkit Player (online) - Accepts player name (online) -
+   * Accepts UUID - Accepts bukkit OfflinePlayer (offline)
+   */
+  public static PlotPlayer wrap(Object player) {
+    return PlotSquared.get().IMP.wrapPlayer(player);
+  }
+
+  /**
+   * Get the cached PlotPlayer from a username<br> - This will return null if the player has not
+   * finished logging in or is not online
+   */
+  public static PlotPlayer get(String name) {
+    return UUIDHandler.getPlayer(name);
+  }
+
+  /**
+   * Set some session only metadata for this player.
+   */
+  public void setMeta(String key, Object value) {
+    if (value == null) {
+      deleteMeta(key);
+    } else {
+      if (this.meta == null) {
+        this.meta = new ConcurrentHashMap<>();
+      }
+      this.meta.put(key, value);
+    }
+  }
+
+  /**
+   * Get the session metadata for a key.
+   *
+   * @param key the name of the metadata key
+   * @param <T> the object type to return
+   * @return the value assigned to the key or null if it does not exist
+   */
+  public <T> T getMeta(String key) {
+    if (this.meta != null) {
+      return (T) this.meta.get(key);
+    }
+    return null;
+  }
+
+  public <T> T getMeta(String key, T defaultValue) {
+    T meta = getMeta(key);
+    if (meta == null) {
+      return defaultValue;
+    }
+    return meta;
+  }
+
+  /**
+   * Delete the metadata for a key. - metadata is session only - deleting other plugin's metadata
+   * may cause issues
+   */
+  public Object deleteMeta(String key) {
+    return this.meta == null ? null : this.meta.remove(key);
+  }
+
+  /**
+   * This player's name.
+   *
+   * @return the name of the player
+   */
+  @Override
+  public String toString() {
+    return getName();
+  }
+
+  /**
+   * Get this player's current plot.
+   *
+   * @return the plot the player is standing on or null if standing on a road or not in a {@link
+   * PlotArea}
+   */
+  public Plot getCurrentPlot() {
+    Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
+    if (value == null && !Settings.Enabled_Components.EVENTS) {
+      return getLocation().getPlot();
+    }
+    return value;
+  }
+
+  /**
+   * Get the total number of allowed plots Possibly relevant: (To increment the player's allowed
+   * plots, see the example script on the wiki)
+   *
+   * @return number of allowed plots within the scope (globally, or in the player's current world as
+   * defined in the settings.yml)
+   */
+  public int getAllowedPlots() {
+    return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
+  }
+
+  /**
+   * Get the total number of allowed clusters
+   *
+   * @return number of allowed clusters within the scope (globally, or in the player's current world
+   * as defined in the settings.yml)
+   */
+  public int getAllowedClusters() {
+    return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
+  }
+
+  public int hasPermissionRange(String stub, int range) {
+    if (hasPermission(C.PERMISSION_ADMIN.s())) {
+      return Integer.MAX_VALUE;
+    }
+    String[] nodes = stub.split("\\.");
+    StringBuilder n = new StringBuilder();
+    for (int i = 0; i < (nodes.length - 1); i++) {
+      n.append(nodes[i]).append(".");
+      if (!stub.equals(n + C.PERMISSION_STAR.s())) {
+        if (hasPermission(n + C.PERMISSION_STAR.s())) {
+          return Integer.MAX_VALUE;
         }
-        return converters.get(object.getClass()).convert(object);
+      }
     }
-
-    public static <T> void registerConverter(@NonNull final Class<T> clazz,
-        final PlotPlayerConverter<T> converter) {
-        converters.put(clazz, converter);
+    if (hasPermission(stub + ".*")) {
+      return Integer.MAX_VALUE;
     }
-
-    /**
-     * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's already cached)<br>
-     * - Accepts sponge/bukkit Player (online)
-     * - Accepts player name (online)
-     * - Accepts UUID
-     * - Accepts bukkit OfflinePlayer (offline)
-     *
-     * @param player
-     * @return
-     */
-    public static PlotPlayer wrap(Object player) {
-        return PlotSquared.get().IMP.wrapPlayer(player);
+    for (int i = range; i > 0; i--) {
+      if (hasPermission(stub + "." + i)) {
+        return i;
+      }
     }
+    return 0;
+  }
 
-    /**
-     * Get the cached PlotPlayer from a username<br>
-     * - This will return null if the player has not finished logging in or is not online
-     *
-     * @param name
-     * @return
-     */
-    public static PlotPlayer get(String name) {
-        return UUIDHandler.getPlayer(name);
+  /**
+   * Get the number of plots this player owns.
+   *
+   * @return number of plots within the scope (globally, or in the player's current world as defined
+   * in the settings.yml)
+   * @see #getPlotCount(String);
+   * @see #getPlots()
+   */
+  public int getPlotCount() {
+    if (!Settings.Limit.GLOBAL) {
+      return getPlotCount(getLocation().getWorld());
     }
-
-    /**
-     * Set some session only metadata for this player.
-     *
-     * @param key
-     * @param value
-     */
-    public void setMeta(String key, Object value) {
-        if (value == null) {
-            deleteMeta(key);
+    final AtomicInteger count = new AtomicInteger(0);
+    final UUID uuid = getUUID();
+    PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+          for (Plot plot : value.getPlotsAbs(uuid)) {
+            if (!plot.hasFlag(Flags.DONE)) {
+              count.incrementAndGet();
+            }
+          }
         } else {
-            if (this.meta == null) {
-                this.meta = new ConcurrentHashMap<>();
-            }
-            this.meta.put(key, value);
+          count.addAndGet(value.getPlotsAbs(uuid).size());
         }
-    }
+      }
+    });
+    return count.get();
+  }
 
-    /**
-     * Get the session metadata for a key.
-     *
-     * @param key the name of the metadata key
-     * @param <T> the object type to return
-     * @return the value assigned to the key or null if it does not exist
-     */
-    public <T> T getMeta(String key) {
-        if (this.meta != null) {
-            return (T) this.meta.get(key);
+  public int getClusterCount() {
+    if (!Settings.Limit.GLOBAL) {
+      return getClusterCount(getLocation().getWorld());
+    }
+    final AtomicInteger count = new AtomicInteger(0);
+    final UUID uuid = getUUID();
+    PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        for (PlotCluster cluster : value.getClusters()) {
+          if (cluster.isOwner(getUUID())) {
+            count.incrementAndGet();
+          }
         }
-        return null;
-    }
+      }
+    });
+    return count.get();
+  }
 
-    public <T> T getMeta(String key, T defaultValue) {
-        T meta = getMeta(key);
-        if (meta == null) {
-            return defaultValue;
+  /**
+   * Get the number of plots this player owns in the world.
+   *
+   * @param world the name of the plotworld to check.
+   */
+  public int getPlotCount(String world) {
+    UUID uuid = getUUID();
+    int count = 0;
+    for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
+      if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+        for (Plot plot : area.getPlotsAbs(uuid)) {
+          if (!plot.getFlag(Flags.DONE).isPresent()) {
+            count++;
+          }
         }
-        return meta;
+      } else {
+        count += area.getPlotsAbs(uuid).size();
+      }
     }
+    return count;
+  }
 
-    /**
-     * Delete the metadata for a key.
-     * - metadata is session only
-     * - deleting other plugin's metadata may cause issues
-     *
-     * @param key
-     */
-    public Object deleteMeta(String key) {
-        return this.meta == null ? null : this.meta.remove(key);
-    }
-
-    /**
-     * This player's name.
-     *
-     * @return the name of the player
-     */
-    @Override public String toString() {
-        return getName();
-    }
-
-    /**
-     * Get this player's current plot.
-     *
-     * @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea}
-     */
-    public Plot getCurrentPlot() {
-        Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
-        if (value == null && !Settings.Enabled_Components.EVENTS) {
-            return getLocation().getPlot();
+  public int getClusterCount(String world) {
+    UUID uuid = getUUID();
+    int count = 0;
+    for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
+      for (PlotCluster cluster : area.getClusters()) {
+        if (cluster.isOwner(getUUID())) {
+          count++;
         }
-        return value;
+      }
     }
+    return count;
+  }
 
-    /**
-     * Get the total number of allowed plots
-     * Possibly relevant: (To increment the player's allowed plots, see the example script on the wiki)
-     *
-     * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
-     */
-    public int getAllowedPlots() {
-        return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
+  /**
+   * Get a {@code Set} of plots owned by this player.
+   *
+   * @return a {@code Set} of plots owned by the player
+   * @see PlotSquared for more searching functions
+   * @see #getPlotCount() for the number of plots
+   */
+  public Set<Plot> getPlots() {
+    return PlotSquared.get().getPlots(this);
+  }
+
+  /**
+   * Return the PlotArea this player is currently in, or null.
+   */
+  public PlotArea getPlotAreaAbs() {
+    return PlotSquared.get().getPlotAreaAbs(getLocation());
+  }
+
+  public PlotArea getApplicablePlotArea() {
+    return PlotSquared.get().getApplicablePlotArea(getLocation());
+  }
+
+  @Override
+  public RequiredType getSuperCaller() {
+    return RequiredType.PLAYER;
+  }
+
+  /**
+   * Get this player's last recorded location or null if they don't any plot relevant location.
+   *
+   * @return The location
+   */
+  public Location getLocation() {
+    Location location = getMeta("location");
+    if (location != null) {
+      return location;
     }
+    return getLocationFull();
+  }
 
-    /**
-     * Get the total number of allowed clusters
-     *
-     * @return number of allowed clusters within the scope (globally, or in the player's current world as defined in the settings.yml)
-     */
-    public int getAllowedClusters() {
-        return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
+  /////////////// PLAYER META ///////////////
+
+  ////////////// PARTIALLY IMPLEMENTED ///////////
+
+  /**
+   * Get this player's full location (including yaw/pitch)
+   */
+  public abstract Location getLocationFull();
+
+  ////////////////////////////////////////////////
+
+  /**
+   * Get this player's UUID. === !IMPORTANT ===<br> The UUID is dependent on the mode chosen in the
+   * settings.yml and may not be the same as Bukkit has (especially if using an old version of
+   * Bukkit that does not support UUIDs)
+   *
+   * @return UUID
+   */
+  @Override
+  public abstract UUID getUUID();
+
+  public boolean canTeleport(Location loc) {
+    Location current = getLocationFull();
+    teleport(loc);
+    boolean result = true;
+    if (!getLocation().equals(loc)) {
+      result = false;
     }
+    teleport(current);
+    return result;
+  }
 
-    public int hasPermissionRange(String stub, int range) {
-        if (hasPermission(C.PERMISSION_ADMIN.s())) {
-            return Integer.MAX_VALUE;
-        }
-        String[] nodes = stub.split("\\.");
-        StringBuilder n = new StringBuilder();
-        for (int i = 0; i < (nodes.length - 1); i++) {
-            n.append(nodes[i]).append(".");
-            if (!stub.equals(n + C.PERMISSION_STAR.s())) {
-                if (hasPermission(n + C.PERMISSION_STAR.s())) {
-                    return Integer.MAX_VALUE;
-                }
-            }
-        }
-        if (hasPermission(stub + ".*")) {
-            return Integer.MAX_VALUE;
-        }
-        for (int i = range; i > 0; i--) {
-            if (hasPermission(stub + "." + i)) {
-                return i;
-            }
-        }
-        return 0;
+  /**
+   * Teleport this player to a location.
+   *
+   * @param location the target location
+   */
+  public abstract void teleport(Location location);
+
+  /**
+   * Kick this player to a location
+   *
+   * @param location the target location
+   */
+  public void plotkick(Location location) {
+    setMeta("kick", true);
+    teleport(location);
+    deleteMeta("kick");
+  }
+
+  /**
+   * Set this compass target.
+   *
+   * @param location the target location
+   */
+  public abstract void setCompassTarget(Location location);
+
+  /**
+   * Set player data that will persist restarts. - Please note that this is not intended to store
+   * large values - For session only data use meta
+   */
+  public void setAttribute(String key) {
+    setPersistentMeta("attrib_" + key, new byte[]{(byte) 1});
+  }
+
+  /**
+   * Retrieves the attribute of this player.
+   *
+   * @return the attribute will be either true or false
+   */
+  public boolean getAttribute(String key) {
+    if (!hasPersistentMeta("attrib_" + key)) {
+      return false;
     }
+    return getPersistentMeta("attrib_" + key)[0] == 1;
+  }
 
-    /**
-     * Get the number of plots this player owns.
-     *
-     * @return number of plots within the scope (globally, or in the player's current world as defined in the settings.yml)
-     * @see #getPlotCount(String);
-     * @see #getPlots()
-     */
-    public int getPlotCount() {
-        if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getLocation().getWorld());
-        }
-        final AtomicInteger count = new AtomicInteger(0);
-        final UUID uuid = getUUID();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-                    for (Plot plot : value.getPlotsAbs(uuid)) {
-                        if (!plot.hasFlag(Flags.DONE)) {
-                            count.incrementAndGet();
-                        }
-                    }
-                } else {
-                    count.addAndGet(value.getPlotsAbs(uuid).size());
-                }
-            }
-        });
-        return count.get();
+  /**
+   * Remove an attribute from a player.
+   */
+  public void removeAttribute(String key) {
+    removePersistentMeta("attrib_" + key);
+  }
+
+  /**
+   * Sets the local weather for this Player.
+   *
+   * @param weather the weather visible to the player
+   */
+  public abstract void setWeather(PlotWeather weather);
+
+  /**
+   * Get this player's gamemode.
+   *
+   * @return the gamemode of the player.
+   */
+  public abstract PlotGameMode getGameMode();
+
+  /**
+   * Set this player's gameMode.
+   *
+   * @param gameMode the gamemode to set
+   */
+  public abstract void setGameMode(PlotGameMode gameMode);
+
+  /**
+   * Set this player's local time (ticks).
+   *
+   * @param time the time visible to the player
+   */
+  public abstract void setTime(long time);
+
+  public abstract boolean getFlight();
+
+  /**
+   * Set this player's fly mode.
+   *
+   * @param fly if the player can fly
+   */
+  public abstract void setFlight(boolean fly);
+
+  /**
+   * Play music at a location for this player.
+   *
+   * @param location where to play the music
+   * @param id the record item id
+   */
+  public abstract void playMusic(Location location, PlotBlock id);
+
+  /**
+   * Check if this player is banned.
+   *
+   * @return true if the player is banned, false otherwise.
+   */
+  public abstract boolean isBanned();
+
+  /**
+   * Kick this player from the game.
+   *
+   * @param message the reason for the kick
+   */
+  public abstract void kick(String message);
+
+  /**
+   * Called when this player quits.
+   */
+  public void unregister() {
+    Plot plot = getCurrentPlot();
+    if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
+        .getArea() instanceof SinglePlotArea) {
+      PlotId id = plot.getId();
+      int x = id.x;
+      int z = id.y;
+      ByteBuffer buffer = ByteBuffer.allocate(13);
+      buffer.putShort((short) x);
+      buffer.putShort((short) z);
+      Location loc = getLocation();
+      buffer.putInt(loc.getX());
+      buffer.put((byte) loc.getY());
+      buffer.putInt(loc.getZ());
+      setPersistentMeta("quitLoc", buffer.array());
+    } else if (hasPersistentMeta("quitLoc")) {
+      removePersistentMeta("quitLoc");
     }
-
-    public int getClusterCount() {
-        if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getLocation().getWorld());
-        }
-        final AtomicInteger count = new AtomicInteger(0);
-        final UUID uuid = getUUID();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (PlotCluster cluster : value.getClusters()) {
-                    if (cluster.isOwner(getUUID())) {
-                        count.incrementAndGet();
-                    }
-                }
-            }
-        });
-        return count.get();
+    if (plot != null) {
+      EventUtil.manager.callLeave(this, plot);
     }
-
-    /**
-     * Get the number of plots this player owns in the world.
-     *
-     * @param world the name of the plotworld to check.
-     * @return
-     */
-    public int getPlotCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
-            if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-                for (Plot plot : area.getPlotsAbs(uuid)) {
-                    if (!plot.getFlag(Flags.DONE).isPresent()) {
-                        count++;
-                    }
-                }
-            } else {
-                count += area.getPlotsAbs(uuid).size();
-            }
-        }
-        return count;
+    if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
+      for (Plot owned : getPlots()) {
+        owned.deletePlot(null);
+        PlotSquared.debug(String
+            .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
+                owned.getId(), getName()));
+      }
     }
-
-    public int getClusterCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
-            for (PlotCluster cluster : area.getClusters()) {
-                if (cluster.isOwner(getUUID())) {
-                    count++;
-                }
-            }
-        }
-        return count;
+    String name = getName();
+    if (ExpireManager.IMP != null) {
+      ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
     }
+    UUIDHandler.getPlayers().remove(name);
+    PlotSquared.get().IMP.unregister(this);
+  }
 
-    /**
-     * Get a {@code Set} of plots owned by this player.
-     *
-     * @return a {@code Set} of plots owned by the player
-     * @see PlotSquared for more searching functions
-     * @see #getPlotCount() for the number of plots
-     */
-    public Set<Plot> getPlots() {
-        return PlotSquared.get().getPlots(this);
+  /**
+   * Get the amount of clusters this player owns in the specific world.
+   */
+  public int getPlayerClusterCount(String world) {
+    UUID uuid = getUUID();
+    int count = 0;
+    for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
+      if (uuid.equals(cluster.owner)) {
+        count += cluster.getArea();
+      }
     }
+    return count;
+  }
 
-    /**
-     * Return the PlotArea this player is currently in, or null.
-     *
-     * @return
-     */
-    public PlotArea getPlotAreaAbs() {
-        return PlotSquared.get().getPlotAreaAbs(getLocation());
+  /**
+   * Get the amount of clusters this player owns.
+   *
+   * @return the number of clusters this player owns
+   */
+  public int getPlayerClusterCount() {
+    final AtomicInteger count = new AtomicInteger();
+    PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+      @Override
+      public void run(PlotArea value) {
+        count.addAndGet(value.getClusters().size());
+      }
+    });
+    return count.get();
+  }
+
+  /**
+   * Return a {@code Set} of all plots this player owns in a certain world.
+   *
+   * @param world the world to retrieve plots from
+   * @return a {@code Set} of plots this player owns in the provided world
+   */
+  public Set<Plot> getPlots(String world) {
+    UUID uuid = getUUID();
+    HashSet<Plot> plots = new HashSet<>();
+    for (Plot plot : PlotSquared.get().getPlots(world)) {
+      if (plot.isOwner(uuid)) {
+        plots.add(plot);
+      }
     }
+    return plots;
+  }
 
-    public PlotArea getApplicablePlotArea() {
-        return PlotSquared.get().getApplicablePlotArea(getLocation());
-    }
+  public void populatePersistentMetaMap() {
+    if (Settings.Enabled_Components.PERSISTENT_META) {
+      DBFunc.getPersistentMeta(getUUID(), new RunnableVal<Map<String, byte[]>>() {
+        @Override
+        public void run(Map<String, byte[]> value) {
+          try {
+            PlotPlayer.this.metaMap = value;
+            if (!value.isEmpty()) {
+              if (Settings.Enabled_Components.PERSISTENT_META) {
+                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
+                if (manager instanceof SinglePlotAreaManager) {
+                  PlotArea area = ((SinglePlotAreaManager) manager).getArea();
+                  byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
+                  if (arr != null) {
+                    removePersistentMeta("quitLoc");
 
-    @Override public RequiredType getSuperCaller() {
-        return RequiredType.PLAYER;
-    }
-
-    /**
-     * Get this player's last recorded location or null if they don't any plot relevant location.
-     *
-     * @return The location
-     */
-    public Location getLocation() {
-        Location location = getMeta("location");
-        if (location != null) {
-            return location;
-        }
-        return getLocationFull();
-    }
-
-    /////////////// PLAYER META ///////////////
-
-    ////////////// PARTIALLY IMPLEMENTED ///////////
-
-    /**
-     * Get this player's full location (including yaw/pitch)
-     *
-     * @return
-     */
-    public abstract Location getLocationFull();
-
-    ////////////////////////////////////////////////
-
-    /**
-     * Get this player's UUID.
-     * === !IMPORTANT ===<br>
-     * The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
-     * (especially if using an old version of Bukkit that does not support UUIDs)
-     *
-     * @return UUID
-     */
-    @Override public abstract UUID getUUID();
-
-    public boolean canTeleport(Location loc) {
-        Location current = getLocationFull();
-        teleport(loc);
-        boolean result = true;
-        if (!getLocation().equals(loc)) {
-            result = false;
-        }
-        teleport(current);
-        return result;
-    }
-
-    /**
-     * Teleport this player to a location.
-     *
-     * @param location the target location
-     */
-    public abstract void teleport(Location location);
-
-    /**
-     * Kick this player to a location
-     *
-     * @param location the target location
-     */
-    public void plotkick(Location location) {
-        setMeta("kick", true);
-        teleport(location);
-        deleteMeta("kick");
-    }
-
-    /**
-     * Set this compass target.
-     *
-     * @param location the target location
-     */
-    public abstract void setCompassTarget(Location location);
-
-    /**
-     * Set player data that will persist restarts.
-     * - Please note that this is not intended to store large values
-     * - For session only data use meta
-     *
-     * @param key
-     */
-    public void setAttribute(String key) {
-        setPersistentMeta("attrib_" + key, new byte[] {(byte) 1});
-    }
-
-    /**
-     * Retrieves the attribute of this player.
-     *
-     * @param key
-     * @return the attribute will be either true or false
-     */
-    public boolean getAttribute(String key) {
-        if (!hasPersistentMeta("attrib_" + key)) {
-            return false;
-        }
-        return getPersistentMeta("attrib_" + key)[0] == 1;
-    }
-
-    /**
-     * Remove an attribute from a player.
-     *
-     * @param key
-     */
-    public void removeAttribute(String key) {
-        removePersistentMeta("attrib_" + key);
-    }
-
-    /**
-     * Sets the local weather for this Player.
-     *
-     * @param weather the weather visible to the player
-     */
-    public abstract void setWeather(PlotWeather weather);
-
-    /**
-     * Get this player's gamemode.
-     *
-     * @return the gamemode of the player.
-     */
-    public abstract PlotGameMode getGameMode();
-
-    /**
-     * Set this player's gameMode.
-     *
-     * @param gameMode the gamemode to set
-     */
-    public abstract void setGameMode(PlotGameMode gameMode);
-
-    /**
-     * Set this player's local time (ticks).
-     *
-     * @param time the time visible to the player
-     */
-    public abstract void setTime(long time);
-
-    public abstract boolean getFlight();
-
-    /**
-     * Set this player's fly mode.
-     *
-     * @param fly if the player can fly
-     */
-    public abstract void setFlight(boolean fly);
-
-    /**
-     * Play music at a location for this player.
-     *
-     * @param location where to play the music
-     * @param id       the record item id
-     */
-    public abstract void playMusic(Location location, PlotBlock id);
-
-    /**
-     * Check if this player is banned.
-     *
-     * @return true if the player is banned, false otherwise.
-     */
-    public abstract boolean isBanned();
-
-    /**
-     * Kick this player from the game.
-     *
-     * @param message the reason for the kick
-     */
-    public abstract void kick(String message);
-
-    /**
-     * Called when this player quits.
-     */
-    public void unregister() {
-        Plot plot = getCurrentPlot();
-        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
-            .getArea() instanceof SinglePlotArea) {
-            PlotId id = plot.getId();
-            int x = id.x;
-            int z = id.y;
-            ByteBuffer buffer = ByteBuffer.allocate(13);
-            buffer.putShort((short) x);
-            buffer.putShort((short) z);
-            Location loc = getLocation();
-            buffer.putInt(loc.getX());
-            buffer.put((byte) loc.getY());
-            buffer.putInt(loc.getZ());
-            setPersistentMeta("quitLoc", buffer.array());
-        } else if (hasPersistentMeta("quitLoc")) {
-            removePersistentMeta("quitLoc");
-        }
-        if (plot != null) {
-            EventUtil.manager.callLeave(this, plot);
-        }
-        if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
-            for (Plot owned : getPlots()) {
-                owned.deletePlot(null);
-                PlotSquared.debug(String
-                    .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
-                        plot.getId(), getName()));
-            }
-        }
-        String name = getName();
-        if (ExpireManager.IMP != null) {
-            ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
-        }
-        UUIDHandler.getPlayers().remove(name);
-        PlotSquared.get().IMP.unregister(this);
-    }
-
-    /**
-     * Get the amount of clusters this player owns in the specific world.
-     *
-     * @param world
-     * @return
-     */
-    public int getPlayerClusterCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
-            if (uuid.equals(cluster.owner)) {
-                count += cluster.getArea();
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Get the amount of clusters this player owns.
-     *
-     * @return the number of clusters this player owns
-     */
-    public int getPlayerClusterCount() {
-        final AtomicInteger count = new AtomicInteger();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                count.addAndGet(value.getClusters().size());
-            }
-        });
-        return count.get();
-    }
-
-    /**
-     * Return a {@code Set} of all plots this player owns in a certain world.
-     *
-     * @param world the world to retrieve plots from
-     * @return a {@code Set} of plots this player owns in the provided world
-     */
-    public Set<Plot> getPlots(String world) {
-        UUID uuid = getUUID();
-        HashSet<Plot> plots = new HashSet<>();
-        for (Plot plot : PlotSquared.get().getPlots(world)) {
-            if (plot.isOwner(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return plots;
-    }
-
-    public void populatePersistentMetaMap() {
-        if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<Map<String, byte[]>>() {
-                @Override public void run(Map<String, byte[]> value) {
-                    try {
-                        PlotPlayer.this.metaMap = value;
-                        if (!value.isEmpty()) {
-                            if (Settings.Enabled_Components.PERSISTENT_META) {
-                                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
-                                if (manager instanceof SinglePlotAreaManager) {
-                                    PlotArea area = ((SinglePlotAreaManager) manager).getArea();
-                                    byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
-                                    if (arr != null) {
-                                        removePersistentMeta("quitLoc");
-
-                                        if (getMeta("teleportOnLogin", true)) {
-                                            ByteBuffer quitWorld = ByteBuffer.wrap(arr);
-                                            final int plotX = quitWorld.getShort();
-                                            final int plotZ = quitWorld.getShort();
-                                            PlotId id = new PlotId(plotX, plotZ);
-                                            int x = quitWorld.getInt();
-                                            int y = quitWorld.get() & 0xFF;
-                                            int z = quitWorld.getInt();
-                                            Plot plot = area.getOwnedPlot(id);
-                                            if (plot != null) {
-                                                final Location loc =
-                                                    new Location(plot.getWorldName(), x, y, z);
-                                                if (plot.isLoaded()) {
-                                                    TaskManager.runTask(new Runnable() {
-                                                        @Override public void run() {
-                                                            if (getMeta("teleportOnLogin", true)) {
-                                                                teleport(loc);
-                                                                sendMessage(C.TELEPORTED_TO_PLOT.f()
-                                                                    + " (quitLoc) (" + plotX + ","
-                                                                    + plotZ + ")");
-                                                            }
-                                                        }
-                                                    });
-                                                } else if (!PlotSquared.get()
-                                                    .isMainThread(Thread.currentThread())) {
-                                                    if (getMeta("teleportOnLogin", true)) {
-                                                        if (plot.teleportPlayer(PlotPlayer.this)) {
-                                                            TaskManager.runTask(new Runnable() {
-                                                                @Override public void run() {
-                                                                    if (getMeta("teleportOnLogin",
-                                                                        true)) {
-                                                                        teleport(loc);
-                                                                        sendMessage(
-                                                                            C.TELEPORTED_TO_PLOT.f()
-                                                                                + " (quitLoc-unloaded) ("
-                                                                                + plotX + ","
-                                                                                + plotZ + ")");
-                                                                    }
-                                                                }
-                                                            });
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
+                    if (getMeta("teleportOnLogin", true)) {
+                      ByteBuffer quitWorld = ByteBuffer.wrap(arr);
+                      final int plotX = quitWorld.getShort();
+                      final int plotZ = quitWorld.getShort();
+                      PlotId id = new PlotId(plotX, plotZ);
+                      int x = quitWorld.getInt();
+                      int y = quitWorld.get() & 0xFF;
+                      int z = quitWorld.getInt();
+                      Plot plot = area.getOwnedPlot(id);
+                      if (plot != null) {
+                        final Location loc =
+                            new Location(plot.getWorldName(), x, y, z);
+                        if (plot.isLoaded()) {
+                          TaskManager.runTask(() -> {
+                            if (getMeta("teleportOnLogin", true)) {
+                              teleport(loc);
+                              sendMessage(C.TELEPORTED_TO_PLOT.f()
+                                  + " (quitLoc) (" + plotX + ","
+                                  + plotZ + ")");
                             }
+                          });
+                        } else if (!PlotSquared.get()
+                            .isMainThread(Thread.currentThread())) {
+                          if (getMeta("teleportOnLogin", true)) {
+                            if (plot.teleportPlayer(PlotPlayer.this)) {
+                              TaskManager.runTask(() -> {
+                                if (getMeta("teleportOnLogin",
+                                    true)) {
+                                  teleport(loc);
+                                  sendMessage(
+                                      C.TELEPORTED_TO_PLOT.f()
+                                          + " (quitLoc-unloaded) ("
+                                          + plotX + ","
+                                          + plotZ + ")");
+                                }
+                              });
+                            }
+                          }
                         }
-                    } catch (Throwable e) {
-                        e.printStackTrace();
+                      }
                     }
+                  }
                 }
-            });
+              }
+            }
+          } catch (Throwable e) {
+            e.printStackTrace();
+          }
         }
+      });
     }
+  }
 
-    public byte[] getPersistentMeta(String key) {
-        return this.metaMap.get(key);
+  public byte[] getPersistentMeta(String key) {
+    return this.metaMap.get(key);
+  }
+
+  public void removePersistentMeta(String key) {
+    if (this.metaMap.containsKey(key)) {
+      this.metaMap.remove(key);
     }
-
-    public void removePersistentMeta(String key) {
-        if (this.metaMap.containsKey(key)) {
-            this.metaMap.remove(key);
-        }
-        if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.removePersistentMeta(getUUID(), key);
-        }
+    if (Settings.Enabled_Components.PERSISTENT_META) {
+      DBFunc.removePersistentMeta(getUUID(), key);
     }
+  }
 
-    public void setPersistentMeta(String key, byte[] value) {
-        boolean delete = hasPersistentMeta(key);
-        this.metaMap.put(key, value);
-        if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.addPersistentMeta(getUUID(), key, value, delete);
-        }
+  public void setPersistentMeta(String key, byte[] value) {
+    boolean delete = hasPersistentMeta(key);
+    this.metaMap.put(key, value);
+    if (Settings.Enabled_Components.PERSISTENT_META) {
+      DBFunc.addPersistentMeta(getUUID(), key, value, delete);
     }
+  }
 
-    public boolean hasPersistentMeta(String key) {
-        return this.metaMap.containsKey(key);
+  public boolean hasPersistentMeta(String key) {
+    return this.metaMap.containsKey(key);
+  }
+
+  public abstract void stopSpectating();
+
+  /**
+   * The amount of money this Player has.
+   */
+  public double getMoney() {
+    return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
+  }
+
+  public void withdraw(double amount) {
+    if (EconHandler.manager != null) {
+      EconHandler.manager.withdrawMoney(this, amount);
     }
+  }
 
-    public abstract void stopSpectating();
-
-    /**
-     * The amount of money this Player has.
-     *
-     * @return
-     */
-    public double getMoney() {
-        return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
+  public void deposit(double amount) {
+    if (EconHandler.manager != null) {
+      EconHandler.manager.depositMoney(this, amount);
     }
+  }
 
-    public void withdraw(double amount) {
-        if (EconHandler.manager != null) {
-            EconHandler.manager.withdrawMoney(this, amount);
-        }
-    }
+  public interface PlotPlayerConverter<BaseObject> {
 
-    public void deposit(double amount) {
-        if (EconHandler.manager != null) {
-            EconHandler.manager.depositMoney(this, amount);
-        }
-    }
-
-    public interface PlotPlayerConverter<BaseObject> {
-        PlotPlayer convert(BaseObject object);
-    }
+    PlotPlayer convert(BaseObject object);
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
index 4f3701f56..2ccaa47a8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -42,7 +42,7 @@ public class PlotSettings {
     /**
      * Flags.
      *
-     * @deprecated Raw access
+     * @deprecated Raw access. Not compatible with PlotClusters.
      */
     @Deprecated public HashMap<Flag<?>, Object> flags = new HashMap<>();
     /**
@@ -85,7 +85,7 @@ public class PlotSettings {
         return this.ratings;
     }
 
-    public boolean setMerged(int direction, boolean merged) {
+    boolean setMerged(int direction, boolean merged) {
         if (this.merged[direction] != merged) {
             this.merged[direction] = merged;
             return true;
@@ -142,6 +142,7 @@ public class PlotSettings {
         }
     }
 
+    //todo need a plot method
     public Optional<ArrayList<PlotComment>> getComments(String inbox) {
         ArrayList<PlotComment> c = new ArrayList<>();
         if (this.comments == null) {
@@ -155,22 +156,26 @@ public class PlotSettings {
         return Optional.of(c);
     }
 
+    //todo need a plot method
     public void setComments(List<PlotComment> comments) {
         this.comments = comments;
     }
 
+    //todo need a plot method
     public void removeComment(PlotComment comment) {
         if (this.comments.contains(comment)) {
             this.comments.remove(comment);
         }
     }
 
+    //todo need a plot method
     public void removeComments(List<PlotComment> comments) {
         for (PlotComment comment : comments) {
             removeComment(comment);
         }
     }
 
+    //todo need a plot method
     public void addComment(PlotComment comment) {
         if (this.comments == null) {
             this.comments = new ArrayList<>();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
index 994f6a465..19425065f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
@@ -4,30 +4,31 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 public class AbstractDelegateOutputStream extends OutputStream {
-    private final OutputStream parent;
 
-    public AbstractDelegateOutputStream(OutputStream os) {
-        this.parent = os;
-    }
+  private final OutputStream parent;
 
-    @Override public void write(int b) throws IOException {
-        parent.write(b);
-    }
+  public AbstractDelegateOutputStream(OutputStream os) {
+    this.parent = os;
+  }
 
-    @Override public void write(byte[] b) throws IOException {
-        parent.write(b);
-    }
+  @Override
+  public void write(int b) throws IOException {
+    parent.write(b);
+  }
 
-    @Override public void write(byte[] b, int off, int len) throws IOException {
-        parent.write(b, off, len);
-    }
+  @Override
+  public void write(byte[] b) throws IOException {
+    parent.write(b);
+  }
+    
+  @Override
+  public void flush() throws IOException {
+    parent.flush();
+  }
 
-    @Override public void flush() throws IOException {
-        parent.flush();
-    }
-
-    @Override public void close() throws IOException {
-        parent.close();
-    }
+  @Override
+  public void close() throws IOException {
+    parent.close();
+  }
 }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
index 989948f0c..0919624d9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -88,9 +88,9 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         HashSet<PlotArea> globalAreas = new HashSet<>(Arrays.asList(plotAreas));
         localAreas.add(plotArea);
         globalAreas.add(plotArea);
-        this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
+        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
         this.plotAreaMap
-            .put(plotArea.worldname, localAreas.toArray(new PlotArea[localAreas.size()]));
+            .put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
         QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
         if (map == null) {
             map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
@@ -104,15 +104,15 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
     }
 
     @Override public void removePlotArea(PlotArea area) {
-        ArrayList<PlotArea> globalAreas = new ArrayList<PlotArea>(Arrays.asList(plotAreas));
+        ArrayList<PlotArea> globalAreas = new ArrayList<>(Arrays.asList(plotAreas));
         globalAreas.remove(area);
-        this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
+        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
         if (globalAreas.isEmpty()) {
             this.plotAreaMap.remove(area.worldname);
             this.plotAreaGrid.remove(area.worldname);
         } else {
             this.plotAreaMap
-                .put(area.worldname, globalAreas.toArray(new PlotArea[globalAreas.size()]));
+                .put(area.worldname, globalAreas.toArray(new PlotArea[0]));
             this.plotAreaGrid.get(area.worldname).remove(area);
         }
     }
@@ -206,7 +206,7 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
             return noPlotAreas;
         } else {
             Set<PlotArea> found = areas.get(region);
-            return found.toArray(new PlotArea[found.size()]);
+            return found.toArray(new PlotArea[0]);
         }
     }
 
@@ -217,14 +217,14 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         Set<String> tmp = new LinkedHashSet<>();
         Collections.addAll(tmp, worlds);
         tmp.add(worldName);
-        worlds = tmp.toArray(new String[tmp.size()]);
+        worlds = tmp.toArray(new String[0]);
     }
 
     @Override public void removeWorld(String worldName) {
         Set<String> tmp = new LinkedHashSet<>();
         Collections.addAll(tmp, worlds);
         tmp.remove(worldName);
-        worlds = tmp.toArray(new String[tmp.size()]);
+        worlds = tmp.toArray(new String[0]);
     }
 
     @Override public String[] getAllWorlds() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
index aef7f53a8..7a59dab9d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
@@ -5,24 +5,24 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
 
 public interface PlotAreaManager {
-    public PlotArea getApplicablePlotArea(Location location);
+    PlotArea getApplicablePlotArea(Location location);
 
-    public PlotArea getPlotArea(Location location);
+    PlotArea getPlotArea(Location location);
 
-    public PlotArea getPlotArea(String world, String id);
+    PlotArea getPlotArea(String world, String id);
 
-    public PlotArea[] getPlotAreas(String world, RegionWrapper region);
+    PlotArea[] getPlotAreas(String world, RegionWrapper region);
 
-    public PlotArea[] getAllPlotAreas();
+    PlotArea[] getAllPlotAreas();
 
-    public String[] getAllWorlds();
+    String[] getAllWorlds();
 
-    public void addPlotArea(PlotArea area);
+    void addPlotArea(PlotArea area);
 
-    public void removePlotArea(PlotArea area);
+    void removePlotArea(PlotArea area);
 
-    public void addWorld(String worldName);
+    void addWorld(String worldName);
 
-    public void removeWorld(String worldName);
+    void removeWorld(String worldName);
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
index 5e153c02e..7d57e7d2c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
@@ -7,6 +7,7 @@ import com.github.intellectualsites.plotsquared.plot.object.*;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.UUID;
+import javax.annotation.Nonnull;
 
 public class SinglePlot extends Plot {
     private HashSet<RegionWrapper> regions;
@@ -40,6 +41,7 @@ public class SinglePlot extends Plot {
         return getId().toCommaSeparatedString();
     }
 
+    @Nonnull
     @Override public SinglePlotArea getArea() {
         return (SinglePlotArea) super.getArea();
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index adc462f4e..a3b398136 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -35,8 +35,7 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
         if (chars.length == 1 && chars[0] == '*') {
             return true;
         }
-        for (int i = 0; i < chars.length; i++) {
-            char c = chars[i];
+        for (char c : chars) {
             switch (mode) {
                 case 0:
                     mode = 1;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index 8e5a6da12..f8e4ab000 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -30,12 +30,10 @@ public class SinglePlotManager extends PlotManager {
         SetupUtils.manager.unload(plot.getWorldName(), false);
         final File worldFolder =
             new File(PlotSquared.get().IMP.getWorldContainer(), plot.getWorldName());
-        TaskManager.IMP.taskAsync(new Runnable() {
-            @Override public void run() {
-                MainUtil.deleteDirectory(worldFolder);
-                if (whenDone != null)
-                    whenDone.run();
-            }
+        TaskManager.IMP.taskAsync(() -> {
+            MainUtil.deleteDirectory(worldFolder);
+            if (whenDone != null)
+                whenDone.run();
         });
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
index a5f75c96a..329230eaf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
@@ -15,6 +15,6 @@ public abstract class AbstractTitle {
         }
     }
 
-    public abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
+    protected abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
         int out);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index e863e1302..d27dc7597 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -71,41 +71,39 @@ public abstract class ChunkManager {
 
     public static void largeRegionTask(final String world, final RegionWrapper region,
         final RunnableVal<ChunkLoc> task, final Runnable whenDone) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                HashSet<ChunkLoc> chunks = new HashSet<>();
-                Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
-                for (ChunkLoc mcr : mcrs) {
-                    int bx = mcr.x << 9;
-                    int bz = mcr.z << 9;
-                    int tx = bx + 511;
-                    int tz = bz + 511;
-                    if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
-                        && tz >= region.minZ) {
-                        for (int x = bx >> 4; x <= (tx >> 4); x++) {
-                            int cbx = x << 4;
-                            int ctx = cbx + 15;
-                            if (cbx <= region.maxX && ctx >= region.minX) {
-                                for (int z = bz >> 4; z <= (tz >> 4); z++) {
-                                    int cbz = z << 4;
-                                    int ctz = cbz + 15;
-                                    if (cbz <= region.maxZ && ctz >= region.minZ) {
-                                        chunks.add(new ChunkLoc(x, z));
-                                    }
+        TaskManager.runTaskAsync(() -> {
+            HashSet<ChunkLoc> chunks = new HashSet<>();
+            Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
+            for (ChunkLoc mcr : mcrs) {
+                int bx = mcr.x << 9;
+                int bz = mcr.z << 9;
+                int tx = bx + 511;
+                int tz = bz + 511;
+                if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
+                    && tz >= region.minZ) {
+                    for (int x = bx >> 4; x <= (tx >> 4); x++) {
+                        int cbx = x << 4;
+                        int ctx = cbx + 15;
+                        if (cbx <= region.maxX && ctx >= region.minX) {
+                            for (int z = bz >> 4; z <= (tz >> 4); z++) {
+                                int cbz = z << 4;
+                                int ctz = cbz + 15;
+                                if (cbz <= region.maxZ && ctz >= region.minZ) {
+                                    chunks.add(new ChunkLoc(x, z));
                                 }
                             }
                         }
                     }
                 }
-                TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
-
-                    @Override public void run(ChunkLoc value) {
-                        if (manager.loadChunk(world, value, false)) {
-                            task.run(value);
-                        }
-                    }
-                }, whenDone);
             }
+            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
+
+                @Override public void run(ChunkLoc value) {
+                    if (manager.loadChunk(world, value, false)) {
+                        task.run(value);
+                    }
+                }
+            }, whenDone);
         });
     }
 
@@ -239,20 +237,18 @@ public abstract class ChunkManager {
 
     public void deleteRegionFiles(final String world, final Collection<ChunkLoc> chunks,
         final Runnable whenDone) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                for (ChunkLoc loc : chunks) {
-                    String directory =
-                        world + File.separator + "region" + File.separator + "r." + loc.x + "."
-                            + loc.z + ".mca";
-                    File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
-                    PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
-                    if (file.exists()) {
-                        file.delete();
-                    }
+        TaskManager.runTaskAsync(() -> {
+            for (ChunkLoc loc : chunks) {
+                String directory =
+                    world + File.separator + "region" + File.separator + "r." + loc.x + "."
+                        + loc.z + ".mca";
+                File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
+                PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
+                if (file.exists()) {
+                    file.delete();
                 }
-                TaskManager.runTask(whenDone);
             }
+            TaskManager.runTask(whenDone);
         });
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
index 11c157320..d0b4012a6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
@@ -19,11 +19,9 @@ public class CmdConfirm {
         removePending(player);
         if (commandStr != null)
             MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
-        TaskManager.runTaskLater(new Runnable() {
-            @Override public void run() {
-                CmdInstance cmd = new CmdInstance(runnable);
-                player.setMeta("cmdConfirm", cmd);
-            }
+        TaskManager.runTaskLater(() -> {
+            CmdInstance cmd = new CmdInstance(runnable);
+            player.setMeta("cmdConfirm", cmd);
         }, 1);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index 3dc43fe06..cc5021c57 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -20,34 +20,32 @@ public class CommentManager {
         if (!Settings.Enabled_Components.COMMENT_NOTIFIER || !plot.isOwner(player.getUUID())) {
             return;
         }
-        TaskManager.runTaskLaterAsync(new Runnable() {
-            @Override public void run() {
-                Collection<CommentInbox> boxes = CommentManager.inboxes.values();
-                final AtomicInteger count = new AtomicInteger(0);
-                final AtomicInteger size = new AtomicInteger(boxes.size());
-                for (final CommentInbox inbox : inboxes.values()) {
-                    inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-                        @Override public void run(List<PlotComment> value) {
-                            int total;
-                            if (value != null) {
-                                int num = 0;
-                                for (PlotComment comment : value) {
-                                    if (comment.timestamp > getTimestamp(player,
-                                        inbox.toString())) {
-                                        num++;
-                                    }
+        TaskManager.runTaskLaterAsync(() -> {
+            Collection<CommentInbox> boxes = CommentManager.inboxes.values();
+            final AtomicInteger count = new AtomicInteger(0);
+            final AtomicInteger size = new AtomicInteger(boxes.size());
+            for (final CommentInbox inbox : inboxes.values()) {
+                inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+                    @Override public void run(List<PlotComment> value) {
+                        int total;
+                        if (value != null) {
+                            int num = 0;
+                            for (PlotComment comment : value) {
+                                if (comment.timestamp > getTimestamp(player,
+                                    inbox.toString())) {
+                                    num++;
                                 }
-                                total = count.addAndGet(num);
-                            } else {
-                                total = count.get();
-                            }
-                            if ((size.decrementAndGet() == 0) && (total > 0)) {
-                                AbstractTitle.sendTitle(player, "",
-                                    C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
                             }
+                            total = count.addAndGet(num);
+                        } else {
+                            total = count.get();
                         }
-                    });
-                }
+                        if ((size.decrementAndGet() == 0) && (total > 0)) {
+                            AbstractTitle.sendTitle(player, "",
+                                C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
+                        }
+                    }
+                });
             }
         }, 20);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index b8037944e..7d82e5236 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -43,8 +43,6 @@ public abstract class EventUtil {
 
     public abstract boolean callFlagRemove(Flag<?> flag, Plot plot, Object value);
 
-    public abstract boolean callFlagRemove(Flag<?> flag, Object value, PlotCluster cluster);
-
     public abstract boolean callMerge(Plot plot, int dir, int max);
 
     public abstract boolean callAutoMerge(Plot plot, List<PlotId> plots);
@@ -78,11 +76,7 @@ public abstract class EventUtil {
         }
         final Plot plot = player.getCurrentPlot();
         if (Settings.Teleport.ON_LOGIN && plot != null) {
-            TaskManager.runTask(new Runnable() {
-                @Override public void run() {
-                    plot.teleportPlayer(player);
-                }
-            });
+            TaskManager.runTask(() -> plot.teleportPlayer(player));
             MainUtil.sendMessage(player,
                 C.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
                     .getId().y + ")");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index 906c70595..e65169260 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -411,7 +411,7 @@ public class MainUtil {
 
         ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
-            plotList.add(new ArrayList<Plot>());
+            plotList.add(new ArrayList<>());
         }
 
         for (Plot plot : PlotSquared.get().getPlots()) {
@@ -430,7 +430,7 @@ public class MainUtil {
                     count++;
                 }
             }
-            if (area != null && plot.getArea().equals(area)) {
+            if (plot.getArea().equals(area)) {
                 count++;
             }
             if (alias != null && alias.equals(plot.getAlias())) {
@@ -622,14 +622,12 @@ public class MainUtil {
         if (caption.s().isEmpty()) {
             return true;
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                String m = C.format(caption, args);
-                if (player == null) {
-                    PlotSquared.log(m);
-                } else {
-                    player.sendMessage(m);
-                }
+        TaskManager.runTaskAsync(() -> {
+            String m = C.format(caption, args);
+            if (player == null) {
+                PlotSquared.log(m);
+            } else {
+                player.sendMessage(m);
             }
         });
         return true;
@@ -780,31 +778,29 @@ public class MainUtil {
         info = info.replace("%desc%", "No description set.");
         if (info.contains("%rating%")) {
             final String newInfo = info;
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    int max = 10;
-                    if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES
-                        .isEmpty()) {
-                        max = 8;
-                    }
-                    String info;
-                    if (full && Settings.Ratings.CATEGORIES != null
-                        && Settings.Ratings.CATEGORIES.size() > 1) {
-                        double[] ratings = MainUtil.getAverageRatings(plot);
-                        String rating = "";
-                        String prefix = "";
-                        for (int i = 0; i < ratings.length; i++) {
-                            rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
-                                .format("%.1f", ratings[i]);
-                            prefix = ",";
-                        }
-                        info = newInfo.replaceAll("%rating%", rating);
-                    } else {
-                        info = newInfo.replaceAll("%rating%",
-                            String.format("%.1f", plot.getAverageRating()) + '/' + max);
-                    }
-                    whenDone.run(info);
+            TaskManager.runTaskAsync(() -> {
+                int max = 10;
+                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES
+                    .isEmpty()) {
+                    max = 8;
                 }
+                String info1;
+                if (full && Settings.Ratings.CATEGORIES != null
+                    && Settings.Ratings.CATEGORIES.size() > 1) {
+                    double[] ratings = MainUtil.getAverageRatings(plot);
+                    String rating = "";
+                    String prefix = "";
+                    for (int i = 0; i < ratings.length; i++) {
+                        rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
+                            .format("%.1f", ratings[i]);
+                        prefix = ",";
+                    }
+                    info1 = newInfo.replaceAll("%rating%", rating);
+                } else {
+                    info1 = newInfo.replaceAll("%rating%",
+                        String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                }
+                whenDone.run(info1);
             });
             return;
         }
@@ -815,10 +811,9 @@ public class MainUtil {
         if (directory.exists()) {
             File[] files = directory.listFiles();
             if (null != files) {
-                for (int i = 0; i < files.length; i++) {
-                    File file = files[i];
+                for (File file : files) {
                     if (file.isDirectory()) {
-                        deleteDirectory(files[i]);
+                        deleteDirectory(file);
                     } else {
                         PlotSquared.debug("Deleting file: " + file + " | " + file.delete());
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index f1ca31b4d..05eeee166 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -87,7 +87,7 @@ public abstract class SchematicHandler {
                                 } else {
                                     MainUtil.sendMessage(null, "&7 - &a  success: " + plot.getId());
                                 }
-                                TaskManager.runTask(() -> THIS.run());
+                                TaskManager.runTask(THIS);
                             });
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
index 3991cd78d..3d065a527 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -13,292 +13,292 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class GlobalBlockQueue {
 
-    public static GlobalBlockQueue IMP;
-    private final int PARALLEL_THREADS;
-    private final ConcurrentLinkedDeque<LocalBlockQueue> activeQueues;
-    private final ConcurrentLinkedDeque<LocalBlockQueue> inactiveQueues;
-    private final ConcurrentLinkedDeque<Runnable> runnables;
-    private final AtomicBoolean running;
-    private QueueProvider provider;
-    /**
-     * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the server
-     */
-    private long last;
-    private long secondLast;
-    private long lastSuccess;
-    private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
-        new RunnableVal2<Long, LocalBlockQueue>() {
-            @Override public void run(Long free, LocalBlockQueue queue) {
-                do {
-                    boolean more = queue.next();
-                    if (!more) {
-                        lastSuccess = last;
-                        if (inactiveQueues.size() == 0 && activeQueues.size() == 0) {
-                            tasks();
-                        }
-                        return;
-                    }
-                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
-                    - GlobalBlockQueue.this.last) < free);
+  public static GlobalBlockQueue IMP;
+  private final int PARALLEL_THREADS;
+  private final ConcurrentLinkedDeque<LocalBlockQueue> activeQueues;
+  private final ConcurrentLinkedDeque<LocalBlockQueue> inactiveQueues;
+  private final ConcurrentLinkedDeque<Runnable> runnables;
+  private final AtomicBoolean running;
+  private QueueProvider provider;
+  /**
+   * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the
+   * server
+   */
+  private long last;
+  private long secondLast;
+  private long lastSuccess;
+  private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
+      new RunnableVal2<Long, LocalBlockQueue>() {
+        @Override
+        public void run(Long free, LocalBlockQueue queue) {
+          do {
+            boolean more = queue.next();
+            if (!more) {
+              lastSuccess = last;
+              if (inactiveQueues.size() == 0 && activeQueues.size() == 0) {
+                tasks();
+              }
+              return;
             }
-        };
-
-    public GlobalBlockQueue(QueueProvider provider, int threads) {
-        this.provider = provider;
-        activeQueues = new ConcurrentLinkedDeque<>();
-        inactiveQueues = new ConcurrentLinkedDeque<>();
-        runnables = new ConcurrentLinkedDeque<>();
-        running = new AtomicBoolean();
-        this.PARALLEL_THREADS = threads;
-    }
-
-    public QueueProvider getProvider() {
-        return provider;
-    }
-
-    public void setProvider(QueueProvider provider) {
-        this.provider = provider;
-    }
-
-    public LocalBlockQueue getNewQueue(String world, boolean autoQueue) {
-        LocalBlockQueue queue = provider.getNewQueue(world);
-        if (autoQueue) {
-            inactiveQueues.add(queue);
+          } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
+              - GlobalBlockQueue.this.last) < free);
         }
-        return queue;
-    }
+      };
 
-    public boolean stop() {
-        if (!running.get()) {
-            return false;
-        }
-        running.set(false);
-        return true;
-    }
+  public GlobalBlockQueue(QueueProvider provider, int threads) {
+    this.provider = provider;
+    activeQueues = new ConcurrentLinkedDeque<>();
+    inactiveQueues = new ConcurrentLinkedDeque<>();
+    runnables = new ConcurrentLinkedDeque<>();
+    running = new AtomicBoolean();
+    this.PARALLEL_THREADS = threads;
+  }
 
-    public boolean runTask() {
-        if (running.get()) {
-            return false;
-        }
-        running.set(true);
-        TaskManager.runTaskRepeat(new Runnable() {
-            @Override public void run() {
-                if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
-                    lastSuccess = System.currentTimeMillis();
-                    tasks();
-                    return;
-                }
-                SET_TASK.value1 = 50 + Math.min(
-                    (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
-                        System.currentTimeMillis()),
-                    GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
-                SET_TASK.value2 = getNextQueue();
-                if (SET_TASK.value2 == null) {
-                    return;
-                }
-                if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-                    throw new IllegalStateException(
-                        "This shouldn't be possible for placement to occur off the main thread");
-                }
-                // Disable the async catcher as it can't discern async vs parallel
-                SET_TASK.value2.startSet(true);
-                try {
-                    if (PARALLEL_THREADS <= 1) {
-                        SET_TASK.run();
-                    } else {
-                        ArrayList<Thread> threads = new ArrayList<Thread>();
-                        for (int i = 0; i < PARALLEL_THREADS; i++) {
-                            threads.add(new Thread(SET_TASK));
-                        }
-                        for (Thread thread : threads) {
-                            thread.start();
-                        }
-                        for (Thread thread : threads) {
-                            try {
-                                thread.join();
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } finally {
-                    // Enable it again (note that we are still on the main thread)
-                    SET_TASK.value2.endSet(true);
-                }
-            }
-        }, 1);
-        return true;
-    }
+  public QueueProvider getProvider() {
+    return provider;
+  }
 
-    public QueueStage getStage(LocalBlockQueue queue) {
-        if (activeQueues.contains(queue)) {
-            return QueueStage.ACTIVE;
-        } else if (inactiveQueues.contains(queue)) {
-            return QueueStage.INACTIVE;
-        }
-        return QueueStage.NONE;
-    }
+  public void setProvider(QueueProvider provider) {
+    this.provider = provider;
+  }
 
-    public boolean isStage(LocalBlockQueue queue, QueueStage stage) {
-        switch (stage) {
-            case ACTIVE:
-                return activeQueues.contains(queue);
-            case INACTIVE:
-                return inactiveQueues.contains(queue);
-            case NONE:
-                return !activeQueues.contains(queue) && !inactiveQueues.contains(queue);
-        }
-        return false;
+  public LocalBlockQueue getNewQueue(String world, boolean autoQueue) {
+    LocalBlockQueue queue = provider.getNewQueue(world);
+    if (autoQueue) {
+      inactiveQueues.add(queue);
     }
+    return queue;
+  }
 
-    public void enqueue(LocalBlockQueue queue) {
-        inactiveQueues.remove(queue);
-        if (queue.size() > 0 && !activeQueues.contains(queue)) {
-            queue.optimize();
-            activeQueues.add(queue);
-        }
+  public boolean stop() {
+    if (!running.get()) {
+      return false;
     }
+    running.set(false);
+    return true;
+  }
 
-    public void dequeue(LocalBlockQueue queue) {
-        inactiveQueues.remove(queue);
-        activeQueues.remove(queue);
+  public boolean runTask() {
+    if (running.get()) {
+      return false;
     }
-
-    public List<LocalBlockQueue> getAllQueues() {
-        ArrayList<LocalBlockQueue> list =
-            new ArrayList<LocalBlockQueue>(activeQueues.size() + inactiveQueues.size());
-        list.addAll(inactiveQueues);
-        list.addAll(activeQueues);
-        return list;
-    }
-
-    public List<LocalBlockQueue> getActiveQueues() {
-        return new ArrayList<>(activeQueues);
-    }
-
-    public List<LocalBlockQueue> getInactiveQueues() {
-        return new ArrayList<>(inactiveQueues);
-    }
-
-    public void flush(LocalBlockQueue queue) {
-        SET_TASK.value1 = Long.MAX_VALUE;
-        SET_TASK.value2 = queue;
-        if (SET_TASK.value2 == null) {
-            return;
-        }
-        if (PlotSquared.get().isMainThread(Thread.currentThread())) {
-            throw new IllegalStateException("Must be flushed on the main thread!");
-        }
-        // Disable the async catcher as it can't discern async vs parallel
-        SET_TASK.value2.startSet(true);
-        try {
-            if (PARALLEL_THREADS <= 1) {
-                SET_TASK.run();
-            } else {
-                ArrayList<Thread> threads = new ArrayList<Thread>();
-                for (int i = 0; i < PARALLEL_THREADS; i++) {
-                    threads.add(new Thread(SET_TASK));
-                }
-                for (Thread thread : threads) {
-                    thread.start();
-                }
-                for (Thread thread : threads) {
-                    try {
-                        thread.join();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-        } finally {
-            // Enable it again (note that we are still on the main thread)
-            SET_TASK.value2.endSet(true);
-            dequeue(queue);
-        }
-    }
-
-    public LocalBlockQueue getNextQueue() {
-        long now = System.currentTimeMillis();
-        while (activeQueues.size() > 0) {
-            LocalBlockQueue queue = activeQueues.peek();
-            if (queue != null && queue.size() > 0) {
-                queue.setModified(now);
-                return queue;
-            } else {
-                activeQueues.poll();
-            }
-        }
-        int size = inactiveQueues.size();
-        if (size > 0) {
-            Iterator<LocalBlockQueue> iter = inactiveQueues.iterator();
+    running.set(true);
+    TaskManager.runTaskRepeat(() -> {
+      if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
+        lastSuccess = System.currentTimeMillis();
+        tasks();
+        return;
+      }
+      SET_TASK.value1 = 50 + Math.min(
+          (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
+              System.currentTimeMillis()),
+          GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
+      SET_TASK.value2 = getNextQueue();
+      if (SET_TASK.value2 == null) {
+        return;
+      }
+      if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+        throw new IllegalStateException(
+            "This shouldn't be possible for placement to occur off the main thread");
+      }
+      // Disable the async catcher as it can't discern async vs parallel
+      SET_TASK.value2.startSet(true);
+      try {
+        if (PARALLEL_THREADS <= 1) {
+          SET_TASK.run();
+        } else {
+          ArrayList<Thread> threads = new ArrayList<Thread>();
+          for (int i = 0; i < PARALLEL_THREADS; i++) {
+            threads.add(new Thread(SET_TASK));
+          }
+          for (Thread thread : threads) {
+            thread.start();
+          }
+          for (Thread thread : threads) {
             try {
-                int total = 0;
-                LocalBlockQueue firstNonEmpty = null;
-                while (iter.hasNext()) {
-                    LocalBlockQueue queue = iter.next();
-                    long age = now - queue.getModified();
-                    total += queue.size();
-                    if (queue.size() == 0) {
-                        if (age > 1000) {
-                            iter.remove();
-                        }
-                        continue;
-                    }
-                    if (firstNonEmpty == null) {
-                        firstNonEmpty = queue;
-                    }
-                    if (total > 64) {
-                        firstNonEmpty.setModified(now);
-                        return firstNonEmpty;
-                    }
-                    if (age > 60000) {
-                        queue.setModified(now);
-                        return queue;
-                    }
-                }
-            } catch (ConcurrentModificationException e) {
-                e.printStackTrace();
+              thread.join();
+            } catch (InterruptedException e) {
+              e.printStackTrace();
             }
+          }
         }
-        return null;
-    }
+      } catch (Throwable e) {
+        e.printStackTrace();
+      } finally {
+        // Enable it again (note that we are still on the main thread)
+        SET_TASK.value2.endSet(true);
+      }
+    }, 1);
+    return true;
+  }
 
-    public boolean isDone() {
-        return activeQueues.size() == 0 && inactiveQueues.size() == 0;
+  public QueueStage getStage(LocalBlockQueue queue) {
+    if (activeQueues.contains(queue)) {
+      return QueueStage.ACTIVE;
+    } else if (inactiveQueues.contains(queue)) {
+      return QueueStage.INACTIVE;
     }
+    return QueueStage.NONE;
+  }
 
-    public boolean addTask(final Runnable whenDone) {
-        if (this.isDone()) {
-            // Run
-            this.tasks();
-            if (whenDone != null) {
-                whenDone.run();
+  public boolean isStage(LocalBlockQueue queue, QueueStage stage) {
+    switch (stage) {
+      case ACTIVE:
+        return activeQueues.contains(queue);
+      case INACTIVE:
+        return inactiveQueues.contains(queue);
+      case NONE:
+        return !activeQueues.contains(queue) && !inactiveQueues.contains(queue);
+    }
+    return false;
+  }
+
+  public void enqueue(LocalBlockQueue queue) {
+    inactiveQueues.remove(queue);
+    if (queue.size() > 0 && !activeQueues.contains(queue)) {
+      queue.optimize();
+      activeQueues.add(queue);
+    }
+  }
+
+  public void dequeue(LocalBlockQueue queue) {
+    inactiveQueues.remove(queue);
+    activeQueues.remove(queue);
+  }
+
+  public List<LocalBlockQueue> getAllQueues() {
+    ArrayList<LocalBlockQueue> list =
+        new ArrayList<>(activeQueues.size() + inactiveQueues.size());
+    list.addAll(inactiveQueues);
+    list.addAll(activeQueues);
+    return list;
+  }
+
+  public List<LocalBlockQueue> getActiveQueues() {
+    return new ArrayList<>(activeQueues);
+  }
+
+  public List<LocalBlockQueue> getInactiveQueues() {
+    return new ArrayList<>(inactiveQueues);
+  }
+
+  public void flush(LocalBlockQueue queue) {
+    SET_TASK.value1 = Long.MAX_VALUE;
+    SET_TASK.value2 = queue;
+    if (SET_TASK.value2 == null) {
+      return;
+    }
+    if (PlotSquared.get().isMainThread(Thread.currentThread())) {
+      throw new IllegalStateException("Must be flushed on the main thread!");
+    }
+    // Disable the async catcher as it can't discern async vs parallel
+    SET_TASK.value2.startSet(true);
+    try {
+      if (PARALLEL_THREADS <= 1) {
+        SET_TASK.run();
+      } else {
+        ArrayList<Thread> threads = new ArrayList<>();
+        for (int i = 0; i < PARALLEL_THREADS; i++) {
+          threads.add(new Thread(SET_TASK));
+        }
+        for (Thread thread : threads) {
+          thread.start();
+        }
+        for (Thread thread : threads) {
+          try {
+            thread.join();
+          } catch (InterruptedException e) {
+            e.printStackTrace();
+          }
+        }
+      }
+    } catch (Throwable e) {
+      e.printStackTrace();
+    } finally {
+      // Enable it again (note that we are still on the main thread)
+      SET_TASK.value2.endSet(true);
+      dequeue(queue);
+    }
+  }
+
+  public LocalBlockQueue getNextQueue() {
+    long now = System.currentTimeMillis();
+    while (activeQueues.size() > 0) {
+      LocalBlockQueue queue = activeQueues.peek();
+      if (queue != null && queue.size() > 0) {
+        queue.setModified(now);
+        return queue;
+      } else {
+        activeQueues.poll();
+      }
+    }
+    int size = inactiveQueues.size();
+    if (size > 0) {
+      Iterator<LocalBlockQueue> iter = inactiveQueues.iterator();
+      try {
+        int total = 0;
+        LocalBlockQueue firstNonEmpty = null;
+        while (iter.hasNext()) {
+          LocalBlockQueue queue = iter.next();
+          long age = now - queue.getModified();
+          total += queue.size();
+          if (queue.size() == 0) {
+            if (age > 1000) {
+              iter.remove();
             }
-            return true;
+            continue;
+          }
+          if (firstNonEmpty == null) {
+            firstNonEmpty = queue;
+          }
+          if (total > 64) {
+            firstNonEmpty.setModified(now);
+            return firstNonEmpty;
+          }
+          if (age > 60000) {
+            queue.setModified(now);
+            return queue;
+          }
         }
-        if (whenDone != null) {
-            this.runnables.add(whenDone);
-        }
-        return false;
+      } catch (ConcurrentModificationException e) {
+        e.printStackTrace();
+      }
     }
+    return null;
+  }
 
-    public synchronized boolean tasks() {
-        if (this.runnables.isEmpty()) {
-            return false;
-        }
-        final ArrayList<Runnable> tmp = new ArrayList<>(this.runnables);
-        this.runnables.clear();
-        for (final Runnable runnable : tmp) {
-            runnable.run();
-        }
-        return true;
-    }
+  public boolean isDone() {
+    return activeQueues.size() == 0 && inactiveQueues.size() == 0;
+  }
 
-    public enum QueueStage {
-        INACTIVE, ACTIVE, NONE;
+  public boolean addTask(final Runnable whenDone) {
+    if (this.isDone()) {
+      // Run
+      this.tasks();
+      if (whenDone != null) {
+        whenDone.run();
+      }
+      return true;
     }
+    if (whenDone != null) {
+      this.runnables.add(whenDone);
+    }
+    return false;
+  }
+
+  public synchronized boolean tasks() {
+    if (this.runnables.isEmpty()) {
+      return false;
+    }
+    final ArrayList<Runnable> tmp = new ArrayList<>(this.runnables);
+    this.runnables.clear();
+    for (final Runnable runnable : tmp) {
+      runnable.run();
+    }
+    return true;
+  }
+
+  public enum QueueStage {
+    INACTIVE, ACTIVE, NONE
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index 84f86daa2..2f69b818e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -19,454 +19,435 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class ExpireManager {
 
-    public static ExpireManager IMP;
-    private final ConcurrentHashMap<UUID, Long> dates_cache;
-    private final ConcurrentHashMap<UUID, Long> account_age_cache;
-    private volatile HashSet<Plot> plotsToDelete;
-    private ArrayDeque<ExpiryTask> tasks;
-    /**
-     * 0 = stopped, 1 = stopping, 2 = running
-     */
-    private int running;
+  public static ExpireManager IMP;
+  private final ConcurrentHashMap<UUID, Long> dates_cache;
+  private final ConcurrentHashMap<UUID, Long> account_age_cache;
+  private volatile HashSet<Plot> plotsToDelete;
+  private ArrayDeque<ExpiryTask> tasks;
+  /**
+   * 0 = stopped, 1 = stopping, 2 = running
+   */
+  private int running;
 
-    public ExpireManager() {
-        tasks = new ArrayDeque<>();
-        dates_cache = new ConcurrentHashMap<>();
-        account_age_cache = new ConcurrentHashMap<>();
+  public ExpireManager() {
+    tasks = new ArrayDeque<>();
+    dates_cache = new ConcurrentHashMap<>();
+    account_age_cache = new ConcurrentHashMap<>();
+  }
+
+  public void addTask(ExpiryTask task) {
+    PlotSquared.debug("Adding new expiry task!");
+    this.tasks.add(task);
+  }
+
+  public void handleJoin(PlotPlayer pp) {
+    storeDate(pp.getUUID(), System.currentTimeMillis());
+    if (plotsToDelete != null && !plotsToDelete.isEmpty()) {
+      for (Plot plot : pp.getPlots()) {
+        plotsToDelete.remove(plot);
+      }
     }
+    confirmExpiry(pp);
+  }
 
-    public void addTask(ExpiryTask task) {
-        PlotSquared.debug("Adding new expiry task!");
-        this.tasks.add(task);
-    }
-
-    public void handleJoin(PlotPlayer pp) {
-        storeDate(pp.getUUID(), System.currentTimeMillis());
-        if (plotsToDelete != null && !plotsToDelete.isEmpty()) {
-            for (Plot plot : pp.getPlots()) {
-                plotsToDelete.remove(plot);
-            }
-        }
+  public void handleEntry(PlotPlayer pp, Plot plot) {
+    if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
+        .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
+      if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
         confirmExpiry(pp);
+      } else {
+        plotsToDelete.remove(plot);
+        confirmExpiry(pp);
+      }
     }
+  }
 
-    public void handleEntry(PlotPlayer pp, Plot plot) {
-        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
-            .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
-            if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
-                confirmExpiry(pp);
-            } else {
-                plotsToDelete.remove(plot);
-                confirmExpiry(pp);
-            }
-        }
+  /**
+   * Gets the account last joined - first joined (or Long.MAX_VALUE)
+   *
+   * @return result
+   */
+  public long getAccountAge(UUID uuid) {
+    Long value = this.account_age_cache.get(uuid);
+    return value == null ? Long.MAX_VALUE : value;
+  }
+
+  public long getTimestamp(UUID uuid) {
+    Long value = this.dates_cache.get(uuid);
+    return value == null ? 0 : value;
+  }
+
+  public void updateExpired(Plot plot) {
+    if (plotsToDelete != null && !plotsToDelete.isEmpty() && plotsToDelete.contains(plot)) {
+      if (isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
+        plotsToDelete.remove(plot);
+      }
     }
+  }
 
-    /**
-     * Gets the account last joined - first joined (or Long.MAX_VALUE)
-     *
-     * @param uuid
-     * @return result
-     */
-    public long getAccountAge(UUID uuid) {
-        Long value = this.account_age_cache.get(uuid);
-        return value == null ? Long.MAX_VALUE : value;
+  public void confirmExpiry(final PlotPlayer pp) {
+    if (pp.getMeta("ignoreExpireTask") != null) {
+      return;
     }
-
-    public long getTimestamp(UUID uuid) {
-        Long value = this.dates_cache.get(uuid);
-        return value == null ? 0 : value;
-    }
-
-    public void updateExpired(Plot plot) {
-        if (plotsToDelete != null && !plotsToDelete.isEmpty() && plotsToDelete.contains(plot)) {
-            if (isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
-                plotsToDelete.remove(plot);
-            }
-        }
-    }
-
-    public void confirmExpiry(final PlotPlayer pp) {
-        if (pp.getMeta("ignoreExpireTask") != null) {
-            return;
-        }
-        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
-            .hasPermission("plots.admin.command.autoclear")) {
-            final int num = plotsToDelete.size();
-            while (!plotsToDelete.isEmpty()) {
-                Iterator<Plot> iter = plotsToDelete.iterator();
-                final Plot current = iter.next();
-                if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
-                    TaskManager.runTask(new Runnable() {
-                        @Override public void run() {
-                            pp.setMeta("ignoreExpireTask", true);
-                            pp.teleport(current.getCenter());
-                            pp.deleteMeta("ignoreExpireTask");
-                            PlotMessage msg = new PlotMessage().text(
-                                num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
-                                .color("$1").text(current.toString()).color("$2")
-                                .suggest("/plot list expired").tooltip("/plot list expired")
-                                //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
-                                .text("\n - ").color("$3").text("Delete this (/plot delete)")
-                                .color("$2").suggest("/plot delete").tooltip("/plot delete")
-                                .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
-                                .color("$2").suggest("/plot set keep 1d")
-                                .tooltip("/plot set keep 1d").text("\n - ").color("$3")
-                                .text("Keep this (/plot set keep true)").color("$2")
-                                .suggest("/plot set keep true").tooltip("/plot set keep true")
-                                .text("\n - ").color("$3").text("Don't show me this").color("$2")
-                                .suggest("/plot toggle clear-confirmation")
-                                .tooltip("/plot toggle clear-confirmation");
-                            msg.send(pp);
-                        }
-                    });
-                    return;
-                } else {
-                    iter.remove();
-                }
-            }
-            plotsToDelete.clear();
-        }
-    }
-
-
-    public boolean cancelTask() {
-        if (this.running != 2) {
-            return false;
-        }
-        this.running = 1;
-        return true;
-    }
-
-    public boolean runAutomatedTask() {
-        return runTask(new RunnableVal3<Plot, Runnable, Boolean>() {
-            @Override public void run(Plot plot, Runnable runnable, Boolean confirm) {
-                if (confirm) {
-                    if (plotsToDelete == null) {
-                        plotsToDelete = new HashSet<>();
-                    }
-                    plotsToDelete.add(plot);
-                    runnable.run();
-                } else {
-                    deleteWithMessage(plot, runnable);
-                }
-            }
-        });
-    }
-
-    public Collection<ExpiryTask> isExpired(ArrayDeque<ExpiryTask> applicable, Plot plot) {
-        // Filter out invalid worlds
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask et = applicable.poll();
-            if (et.applies(plot.getArea())) {
-                applicable.add(et);
-            }
-        }
-        if (applicable.isEmpty()) {
-            return new ArrayList<>();
-        }
-        boolean shouldCheckAccountAge = false;
-
-        long diff = getAge(plot);
-        if (diff == 0) {
-            return new ArrayList<>();
-        }
-        // Filter out non old plots
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask et = applicable.poll();
-            if (et.applies(diff)) {
-                applicable.add(et);
-                shouldCheckAccountAge |= et.getSettings().SKIP_ACCOUNT_AGE_DAYS != -1;
-            }
-        }
-        if (applicable.isEmpty()) {
-            return new ArrayList<>();
-        }
-        // Check account age
-        if (shouldCheckAccountAge) {
-            long accountAge = getAge(plot);
-            for (int i = 0; i < applicable.size(); i++) {
-                ExpiryTask et = applicable.poll();
-                if (et.appliesAccountAge(accountAge)) {
-                    applicable.add(et);
-                }
-            }
-            if (applicable.isEmpty()) {
-                return new ArrayList<>();
-            }
-        }
-
-        // Run applicable non confirming tasks
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask expiryTask = applicable.poll();
-            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
-                if (!expiryTask.requiresConfirmation()) {
-                    return Collections.singletonList(expiryTask);
-                }
-            }
-            applicable.add(expiryTask);
-        }
-        // Run applicable confirming tasks
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask expiryTask = applicable.poll();
-            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
-                return Collections.singletonList(expiryTask);
-            }
-            applicable.add(expiryTask);
-        }
-        return applicable;
-    }
-
-    public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
-        ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
-        Iterator<ExpiryTask> iter = queue.iterator();
-        while (iter.hasNext()) {
-            if (!iter.next().applies(area)) {
-                iter.remove();
-            }
-        }
-        return queue;
-    }
-
-    public void passesComplexity(PlotAnalysis analysis, Collection<ExpiryTask> applicable,
-        RunnableVal<Boolean> success, Runnable failure) {
-        if (analysis != null) {
-            // Run non confirming tasks
-            for (ExpiryTask et : applicable) {
-                if (!et.requiresConfirmation() && et.applies(analysis)) {
-                    success.run(false);
-                    return;
-                }
-            }
-            for (ExpiryTask et : applicable) {
-                if (et.applies(analysis)) {
-                    success.run(true);
-                    return;
-                }
-            }
-            failure.run();
-        }
-    }
-
-    public boolean runTask(final RunnableVal3<Plot, Runnable, Boolean> expiredTask) {
-        if (this.running != 0) {
-            return false;
-        }
-        this.running = 2;
-        final ConcurrentLinkedDeque<Plot> plots =
-            new ConcurrentLinkedDeque<Plot>(PlotSquared.get().getPlots());
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                final Runnable task = this;
-                if (ExpireManager.this.running != 2) {
-                    ExpireManager.this.running = 0;
-                    return;
-                }
-                long start = System.currentTimeMillis();
-                while (!plots.isEmpty()) {
-                    if (ExpireManager.this.running != 2) {
-                        ExpireManager.this.running = 0;
-                        return;
-                    }
-                    Plot plot = plots.poll();
-                    PlotArea area = plot.getArea();
-                    final Plot newPlot = area.getPlot(plot.getId());
-                    final ArrayDeque<ExpiryTask> applicable = new ArrayDeque<>(tasks);
-                    final Collection<ExpiryTask> expired = isExpired(applicable, newPlot);
-                    if (expired.isEmpty()) {
-                        continue;
-                    }
-                    for (ExpiryTask expiryTask : expired) {
-                        if (!expiryTask.needsAnalysis()) {
-                            expiredTask.run(newPlot, new Runnable() {
-                                @Override public void run() {
-                                    TaskManager.IMP.taskLaterAsync(task, 1);
-                                }
-                            }, expiryTask.requiresConfirmation());
-                            return;
-                        }
-                    }
-                    final RunnableVal<PlotAnalysis> handleAnalysis =
-                        new RunnableVal<PlotAnalysis>() {
-                            @Override public void run(final PlotAnalysis changed) {
-                                passesComplexity(changed, expired, new RunnableVal<Boolean>() {
-                                    @Override public void run(Boolean confirmation) {
-                                        expiredTask.run(newPlot, new Runnable() {
-                                            @Override public void run() {
-                                                TaskManager.IMP.taskLaterAsync(task, 1);
-                                            }
-                                        }, confirmation);
-                                    }
-                                }, new Runnable() {
-                                    @Override public void run() {
-                                        FlagManager
-                                            .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
-                                        TaskManager.runTaskLaterAsync(task, 20);
-                                    }
-                                });
-                            }
-                        };
-                    final Runnable doAnalysis = new Runnable() {
-                        @Override public void run() {
-                            HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
-                        }
-                    };
-
-                    PlotAnalysis analysis = newPlot.getComplexity(null);
-                    if (analysis != null) {
-                        passesComplexity(analysis, expired, new RunnableVal<Boolean>() {
-                            @Override public void run(Boolean value) {
-                                doAnalysis.run();
-                            }
-                        }, new Runnable() {
-                            @Override public void run() {
-                                TaskManager.IMP.taskLaterAsync(task, 1);
-                            }
-                        });
-                    } else {
-                        doAnalysis.run();
-                    }
-                    return;
-                }
-                if (plots.isEmpty()) {
-                    ExpireManager.this.running = 3;
-                    TaskManager.runTaskLater(new Runnable() {
-                        @Override public void run() {
-                            if (ExpireManager.this.running == 3) {
-                                ExpireManager.this.running = 2;
-                                runTask(expiredTask);
-                            }
-                        }
-                    }, 86400000);
-                } else {
-                    TaskManager.runTaskLaterAsync(task, 20 * 10);
-                }
-            }
-        });
-        return true;
-    }
-
-    public void storeDate(UUID uuid, long time) {
-        Long existing = this.dates_cache.put(uuid, time);
-        if (existing != null) {
-            long diff = time - existing;
-            if (diff > 0) {
-                Long account_age = this.account_age_cache.get(uuid);
-                if (account_age != null)
-                    this.account_age_cache.put(uuid, account_age + diff);
-            }
-        }
-    }
-
-    public void storeAccountAge(UUID uuid, long time) {
-        this.account_age_cache.put(uuid, time);
-    }
-
-    public HashSet<Plot> getPendingExpired() {
-        return plotsToDelete == null ? new HashSet<Plot>() : plotsToDelete;
-    }
-
-    public void deleteWithMessage(Plot plot, Runnable whenDone) {
-        if (plot.isMerged()) {
-            plot.unlinkPlot(true, false);
-        }
-        for (UUID helper : plot.getTrusted()) {
-            PlotPlayer player = UUIDHandler.getPlayer(helper);
-            if (player != null) {
-                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
-            }
-        }
-        for (UUID helper : plot.getMembers()) {
-            PlotPlayer player = UUIDHandler.getPlayer(helper);
-            if (player != null) {
-                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
-            }
-        }
-        Set<Plot> plots = plot.getConnectedPlots();
-        plot.deletePlot(whenDone);
-        PlotAnalysis changed = plot.getComplexity(null);
-        int changes = changed == null ? 0 : changed.changes_sd;
-        int modified = changed == null ? 0 : changed.changes;
-        PlotSquared.debug(
-            "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
-                + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
-                .getString(plots));
-        PlotSquared.debug("$4 - Area: " + plot.getArea());
-        if (plot.hasOwner()) {
-            PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
+    if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
+        .hasPermission("plots.admin.command.autoclear")) {
+      final int num = plotsToDelete.size();
+      while (!plotsToDelete.isEmpty()) {
+        Iterator<Plot> iter = plotsToDelete.iterator();
+        final Plot current = iter.next();
+        if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
+          TaskManager.runTask(() -> {
+            pp.setMeta("ignoreExpireTask", true);
+            pp.teleport(current.getCenter());
+            pp.deleteMeta("ignoreExpireTask");
+            PlotMessage msg = new PlotMessage().text(
+                num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
+                .color("$1").text(current.toString()).color("$2")
+                .suggest("/plot list expired").tooltip("/plot list expired")
+                //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
+                .text("\n - ").color("$3").text("Delete this (/plot delete)")
+                .color("$2").suggest("/plot delete").tooltip("/plot delete")
+                .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
+                .color("$2").suggest("/plot set keep 1d")
+                .tooltip("/plot set keep 1d").text("\n - ").color("$3")
+                .text("Keep this (/plot set keep true)").color("$2")
+                .suggest("/plot set keep true").tooltip("/plot set keep true")
+                .text("\n - ").color("$3").text("Don't show me this").color("$2")
+                .suggest("/plot toggle clear-confirmation")
+                .tooltip("/plot toggle clear-confirmation");
+            msg.send(pp);
+          });
+          return;
         } else {
-            PlotSquared.debug("$4 - Owner: Unowned");
+          iter.remove();
         }
+      }
+      plotsToDelete.clear();
+    }
+  }
+
+
+  public boolean cancelTask() {
+    if (this.running != 2) {
+      return false;
+    }
+    this.running = 1;
+    return true;
+  }
+
+  public boolean runAutomatedTask() {
+    return runTask(new RunnableVal3<Plot, Runnable, Boolean>() {
+      @Override
+      public void run(Plot plot, Runnable runnable, Boolean confirm) {
+        if (confirm) {
+          if (plotsToDelete == null) {
+            plotsToDelete = new HashSet<>();
+          }
+          plotsToDelete.add(plot);
+          runnable.run();
+        } else {
+          deleteWithMessage(plot, runnable);
+        }
+      }
+    });
+  }
+
+  public Collection<ExpiryTask> isExpired(ArrayDeque<ExpiryTask> applicable, Plot plot) {
+    // Filter out invalid worlds
+    for (int i = 0; i < applicable.size(); i++) {
+      ExpiryTask et = applicable.poll();
+      if (et.applies(plot.getArea())) {
+        applicable.add(et);
+      }
+    }
+    if (applicable.isEmpty()) {
+      return new ArrayList<>();
+    }
+    boolean shouldCheckAccountAge = false;
+
+    long diff = getAge(plot);
+    if (diff == 0) {
+      return new ArrayList<>();
+    }
+    // Filter out non old plots
+    for (int i = 0; i < applicable.size(); i++) {
+      ExpiryTask et = applicable.poll();
+      if (et.applies(diff)) {
+        applicable.add(et);
+        shouldCheckAccountAge |= et.getSettings().SKIP_ACCOUNT_AGE_DAYS != -1;
+      }
+    }
+    if (applicable.isEmpty()) {
+      return new ArrayList<>();
+    }
+    // Check account age
+    if (shouldCheckAccountAge) {
+      long accountAge = getAge(plot);
+      for (int i = 0; i < applicable.size(); i++) {
+        ExpiryTask et = applicable.poll();
+        if (et.appliesAccountAge(accountAge)) {
+          applicable.add(et);
+        }
+      }
+      if (applicable.isEmpty()) {
+        return new ArrayList<>();
+      }
     }
 
-    public long getAge(UUID uuid) {
-        if (UUIDHandler.getPlayer(uuid) != null) {
-            return 0;
+    // Run applicable non confirming tasks
+    for (int i = 0; i < applicable.size(); i++) {
+      ExpiryTask expiryTask = applicable.poll();
+      if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
+        if (!expiryTask.requiresConfirmation()) {
+          return Collections.singletonList(expiryTask);
         }
-        String name = UUIDHandler.getName(uuid);
-        if (name != null) {
-            Long last = this.dates_cache.get(uuid);
-            if (last == null) {
-                OfflinePlotPlayer opp;
-                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
-                } else {
-                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(name);
-                }
-                if (opp != null && (last = opp.getLastPlayed()) != 0) {
-                    this.dates_cache.put(uuid, last);
-                } else {
-                    return 0;
-                }
-            }
-            if (last == 0) {
-                return 0;
-            }
-            return System.currentTimeMillis() - last;
+      }
+      applicable.add(expiryTask);
+    }
+    // Run applicable confirming tasks
+    for (int i = 0; i < applicable.size(); i++) {
+      ExpiryTask expiryTask = applicable.poll();
+      if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
+        return Collections.singletonList(expiryTask);
+      }
+      applicable.add(expiryTask);
+    }
+    return applicable;
+  }
+
+  public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
+    ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
+    queue.removeIf(expiryTask -> !expiryTask.applies(area));
+    return queue;
+  }
+
+  public void passesComplexity(PlotAnalysis analysis, Collection<ExpiryTask> applicable,
+      RunnableVal<Boolean> success, Runnable failure) {
+    if (analysis != null) {
+      // Run non confirming tasks
+      for (ExpiryTask et : applicable) {
+        if (!et.requiresConfirmation() && et.applies(analysis)) {
+          success.run(false);
+          return;
         }
+      }
+      for (ExpiryTask et : applicable) {
+        if (et.applies(analysis)) {
+          success.run(true);
+          return;
+        }
+      }
+      failure.run();
+    }
+  }
+
+  public boolean runTask(final RunnableVal3<Plot, Runnable, Boolean> expiredTask) {
+    if (this.running != 0) {
+      return false;
+    }
+    this.running = 2;
+    final ConcurrentLinkedDeque<Plot> plots =
+        new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
+    TaskManager.runTaskAsync(new Runnable() {
+      @Override
+      public void run() {
+        final Runnable task = this;
+        if (ExpireManager.this.running != 2) {
+          ExpireManager.this.running = 0;
+          return;
+        }
+        long start = System.currentTimeMillis();
+        while (!plots.isEmpty()) {
+          if (ExpireManager.this.running != 2) {
+            ExpireManager.this.running = 0;
+            return;
+          }
+          Plot plot = plots.poll();
+          PlotArea area = plot.getArea();
+          final Plot newPlot = area.getPlot(plot.getId());
+          final ArrayDeque<ExpiryTask> applicable = new ArrayDeque<>(tasks);
+          final Collection<ExpiryTask> expired = isExpired(applicable, newPlot);
+          if (expired.isEmpty()) {
+            continue;
+          }
+          for (ExpiryTask expiryTask : expired) {
+            if (!expiryTask.needsAnalysis()) {
+              expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                  expiryTask.requiresConfirmation());
+              return;
+            }
+          }
+          final RunnableVal<PlotAnalysis> handleAnalysis =
+              new RunnableVal<PlotAnalysis>() {
+                @Override
+                public void run(final PlotAnalysis changed) {
+                  passesComplexity(changed, expired, new RunnableVal<Boolean>() {
+                    @Override
+                    public void run(Boolean confirmation) {
+                      expiredTask.run(newPlot,
+                          () -> TaskManager.IMP.taskLaterAsync(task, 1), confirmation);
+                    }
+                  }, () -> {
+                    FlagManager
+                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
+                    TaskManager.runTaskLaterAsync(task, 20);
+                  });
+                }
+              };
+          final Runnable doAnalysis = () -> HybridUtils.manager
+              .analyzePlot(newPlot, handleAnalysis);
+
+          PlotAnalysis analysis = newPlot.getComplexity(null);
+          if (analysis != null) {
+            passesComplexity(analysis, expired, new RunnableVal<Boolean>() {
+              @Override
+              public void run(Boolean value) {
+                doAnalysis.run();
+              }
+            }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
+          } else {
+            doAnalysis.run();
+          }
+          return;
+        }
+        if (plots.isEmpty()) {
+          ExpireManager.this.running = 3;
+          TaskManager.runTaskLater(() -> {
+            if (ExpireManager.this.running == 3) {
+              ExpireManager.this.running = 2;
+              runTask(expiredTask);
+            }
+          }, 86400000);
+        } else {
+          TaskManager.runTaskLaterAsync(task, 20 * 10);
+        }
+      }
+    });
+    return true;
+  }
+
+  public void storeDate(UUID uuid, long time) {
+    Long existing = this.dates_cache.put(uuid, time);
+    if (existing != null) {
+      long diff = time - existing;
+      if (diff > 0) {
+        Long account_age = this.account_age_cache.get(uuid);
+        if (account_age != null) {
+          this.account_age_cache.put(uuid, account_age + diff);
+        }
+      }
+    }
+  }
+
+  public void storeAccountAge(UUID uuid, long time) {
+    this.account_age_cache.put(uuid, time);
+  }
+
+  public HashSet<Plot> getPendingExpired() {
+    return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
+  }
+
+  public void deleteWithMessage(Plot plot, Runnable whenDone) {
+    if (plot.isMerged()) {
+      plot.unlinkPlot(true, false);
+    }
+    for (UUID helper : plot.getTrusted()) {
+      PlotPlayer player = UUIDHandler.getPlayer(helper);
+      if (player != null) {
+        MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+      }
+    }
+    for (UUID helper : plot.getMembers()) {
+      PlotPlayer player = UUIDHandler.getPlayer(helper);
+      if (player != null) {
+        MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+      }
+    }
+    Set<Plot> plots = plot.getConnectedPlots();
+    plot.deletePlot(whenDone);
+    PlotAnalysis changed = plot.getComplexity(null);
+    int changes = changed == null ? 0 : changed.changes_sd;
+    int modified = changed == null ? 0 : changed.changes;
+    PlotSquared.debug(
+        "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
+            + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
+            .getString(plots));
+    PlotSquared.debug("$4 - Area: " + plot.getArea());
+    if (plot.hasOwner()) {
+      PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
+    } else {
+      PlotSquared.debug("$4 - Owner: Unowned");
+    }
+  }
+
+  public long getAge(UUID uuid) {
+    if (UUIDHandler.getPlayer(uuid) != null) {
+      return 0;
+    }
+    String name = UUIDHandler.getName(uuid);
+    if (name != null) {
+      Long last = this.dates_cache.get(uuid);
+      if (last == null) {
+        OfflinePlotPlayer opp;
+        if (Settings.UUID.NATIVE_UUID_PROVIDER) {
+          opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
+        } else {
+          opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(name);
+        }
+        if (opp != null && (last = opp.getLastPlayed()) != 0) {
+          this.dates_cache.put(uuid, last);
+        } else {
+          return 0;
+        }
+      }
+      if (last == 0) {
         return 0;
+      }
+      return System.currentTimeMillis() - last;
     }
+    return 0;
+  }
 
-    public long getAccountAge(Plot plot) {
-        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
-            return Long.MAX_VALUE;
-        }
-        long max = 0;
-        for (UUID owner : plot.getOwners()) {
-            long age = getAccountAge(owner);
-            max = Math.max(age, max);
-        }
-        return max;
+  public long getAccountAge(Plot plot) {
+    if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
+        || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+      return Long.MAX_VALUE;
     }
+    long max = 0;
+    for (UUID owner : plot.getOwners()) {
+      long age = getAccountAge(owner);
+      max = Math.max(age, max);
+    }
+    return max;
+  }
 
-    public long getAge(Plot plot) {
-        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
-            return 0;
-        }
-        Optional<?> keep = plot.getFlag(Flags.KEEP);
-        if (keep.isPresent()) {
-            Object value = keep.get();
-            if (value instanceof Boolean) {
-                if (Boolean.TRUE.equals(value)) {
-                    return 0;
-                }
-            } else if (value instanceof Long) {
-                if ((Long) value > System.currentTimeMillis()) {
-                    return 0;
-                }
-            } else { // Invalid?
-                return 0;
-            }
-        }
-        long min = Long.MAX_VALUE;
-        for (UUID owner : plot.getOwners()) {
-            long age = getAge(owner);
-            if (age < min) {
-                min = age;
-            }
-        }
-        return min;
+  public long getAge(Plot plot) {
+    if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
+        || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+      return 0;
     }
+    Optional<?> keep = plot.getFlag(Flags.KEEP);
+    if (keep.isPresent()) {
+      Object value = keep.get();
+      if (value instanceof Boolean) {
+        if (Boolean.TRUE.equals(value)) {
+          return 0;
+        }
+      } else if (value instanceof Long) {
+        if ((Long) value > System.currentTimeMillis()) {
+          return 0;
+        }
+      } else { // Invalid?
+        return 0;
+      }
+    }
+    long min = Long.MAX_VALUE;
+    for (UUID owner : plot.getOwners()) {
+      long age = getAge(owner);
+      if (age < min) {
+        min = age;
+      }
+    }
+    return min;
+  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
index df1244a12..3a0b82c56 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
@@ -5,7 +5,6 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotFilter;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
index b17f3ce47..f11cb429a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
@@ -118,16 +118,14 @@ public class PlotAnalysis {
 
                 final AtomicInteger mi = new AtomicInteger(0);
 
-                Thread ratingAnalysis = new Thread(new Runnable() {
-                    @Override public void run() {
-                        for (; mi.intValue() < plots.size(); mi.incrementAndGet()) {
-                            int i = mi.intValue();
-                            Plot plot = plots.get(i);
-                            ratings[i] = (int) (
-                                (plot.getAverageRating() + plot.getSettings().getRatings().size())
-                                    * 100);
-                            PlotSquared.debug(" | " + plot + " (rating) " + ratings[i]);
-                        }
+                Thread ratingAnalysis = new Thread(() -> {
+                    for (; mi.intValue() < plots.size(); mi.incrementAndGet()) {
+                        int i = mi.intValue();
+                        Plot plot = plots.get(i);
+                        ratings[i] = (int) (
+                            (plot.getAverageRating() + plot.getSettings().getRatings().size())
+                                * 100);
+                        PlotSquared.debug(" | " + plot + " (rating) " + ratings[i]);
                     }
                 });
                 ratingAnalysis.start();
@@ -424,9 +422,6 @@ public class PlotAnalysis {
     /**
      * A simple array squaring algorithm.
      * - Used for calculating the variance
-     *
-     * @param array
-     * @return
      */
     public static int[] square(int[] array) {
         array = array.clone();
@@ -439,8 +434,6 @@ public class PlotAnalysis {
     /**
      * An optimized lossy standard deviation algorithm.
      *
-     * @param ranks
-     * @return
      */
     public static int[] getSD(int[]... ranks) {
         if (ranks.length == 0) {
@@ -468,19 +461,13 @@ public class PlotAnalysis {
      * - Input is an array of int with a max size of 102400<br>
      * - A reduced sample space allows for sorting (and ranking in this case) in linear time
      *
-     * @param input
-     * @param input
-     * @return
      */
     public static int[] rank(int[] input) {
         return rank(input, 102400);
     }
 
     /**
-     * An optimized algorithm for ranking a very specific set of inputs
-     *
-     * @param input
-     * @return
+     * An optimized algorithm for ranking a very specific set of inputs.
      */
     public static int[] rank(int[] input, int size) {
         int[] cache = new int[size];
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
index 235b51a34..55f3697f7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
@@ -5,17 +5,17 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
 import java.util.UUID;
 
-public abstract class UUIDWrapper {
+public interface UUIDWrapper {
 
-    public abstract UUID getUUID(PlotPlayer player);
+    UUID getUUID(PlotPlayer player);
 
-    public abstract UUID getUUID(OfflinePlotPlayer player);
+    UUID getUUID(OfflinePlotPlayer player);
 
-    public abstract UUID getUUID(String name);
+    UUID getUUID(String name);
 
-    public abstract OfflinePlotPlayer getOfflinePlayer(UUID uuid);
+    OfflinePlotPlayer getOfflinePlayer(UUID uuid);
 
-    public abstract OfflinePlotPlayer getOfflinePlayer(String name);
+    OfflinePlotPlayer getOfflinePlayer(String name);
 
-    public abstract OfflinePlotPlayer[] getOfflinePlayers();
+    OfflinePlotPlayer[] getOfflinePlayers();
 }
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
index 7b29cdf97..cf118c717 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
@@ -84,10 +84,7 @@ public class AbstractDBTest implements AbstractDB {
     @Override public void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
     }
 
-    @Override public void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
-    }
-
-    @Override public void setClusterName(PlotCluster cluster, String name) {
+  @Override public void setClusterName(PlotCluster cluster, String name) {
     }
 
     @Override public void setAlias(Plot plot, String alias) {
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
index 011fbb7f3..f6550ce98 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
@@ -40,11 +40,7 @@ public class EventUtilTest extends EventUtil {
         return true;
     }
 
-    @Override public boolean callFlagRemove(Flag<?> flag, Object value, PlotCluster cluster) {
-        return true;
-    }
-
-    @Override public boolean callMerge(Plot plot, int dir, int max){
+  @Override public boolean callMerge(Plot plot, int dir, int max){
         return false;
     }
 

From 9c90928d0779d281275ff76dbd2e315da2269e42 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sat, 2 Feb 2019 16:13:55 +0000
Subject: [PATCH 013/210] Remove the debug and don't created a new BloxkBucket
 for every air block.

---
 .../plotsquared/bukkit/util/BukkitHybridUtils.java  | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index 68b845e58..452d04c35 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -66,6 +66,7 @@ public class BukkitHybridUtils extends HybridUtils {
             System.gc();
             final BlockBucket[][][] oldBlocks = new BlockBucket[256][width][length];
             final PlotBlock[][][] newBlocks = new PlotBlock[256][width][length];
+            final BlockBucket airBucket = BlockBucket.withSingle(StringPlotBlock.EVERYTHING);
 
             PlotArea area = PlotSquared.get().getPlotArea(world, null);
 
@@ -146,8 +147,8 @@ public class BukkitHybridUtils extends HybridUtils {
                                     continue;
                                 }
                                 int y = MainUtil.y_loc[i][j];
-                                oldBlocks[y][x][z] =
-                                    BlockBucket.withSingle(StringPlotBlock.EVERYTHING);
+                                oldBlocks[y][x][z] = airBucket;
+
                             }
                             continue;
                         }
@@ -163,7 +164,7 @@ public class BukkitHybridUtils extends HybridUtils {
                             int y = MainUtil.y_loc[i][j];
                             oldBlocks[y][x][z] = result[i][j] != null ?
                                 result[i][j] :
-                                BlockBucket.withSingle(StringPlotBlock.EVERYTHING);
+                                airBucket;
                         }
                     }
 
@@ -183,7 +184,7 @@ public class BukkitHybridUtils extends HybridUtils {
                             BlockBucket old = oldBlocks[y][x][z];
                             try {
                                 if (old == null) {
-                                    old = BlockBucket.withSingle(StringPlotBlock.EVERYTHING);
+                                    old = airBucket;
                                 }
                                 PlotBlock now = newBlocks[y][x][z];
                                 if (!old.getBlocks().contains(now)) {
@@ -228,10 +229,6 @@ public class BukkitHybridUtils extends HybridUtils {
                                     types.add(now);
                                 }
                             } catch (NullPointerException e) {
-                                PlotSquared.log(old != null ? old.toString() : "old null");
-                                PlotSquared.log(x);
-                                PlotSquared.log(y);
-                                PlotSquared.log(z);
                                 e.printStackTrace();
                             }
                         }

From 51afbdfcdca3d2a8f21ec12e80dc95e9d85ab9b0 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Mon, 4 Feb 2019 13:59:11 +0000
Subject: [PATCH 014/210] Apply correct codestyle

---
 .../plotsquared/api/PlotAPI.java              |  224 +
 .../plotsquared/commands/Argument.java        |   68 +
 .../plotsquared/commands/Command.java         |  596 ++
 .../plotsquared/commands/CommandCaller.java   |   24 +
 .../commands/CommandDeclaration.java          |   29 +
 .../configuration/Configuration.java          |   87 +
 .../configuration/ConfigurationOptions.java   |   90 +
 .../configuration/ConfigurationSection.java   |  649 ++
 .../InvalidConfigurationException.java        |   45 +
 .../configuration/MemoryConfiguration.java    |   73 +
 .../MemoryConfigurationOptions.java           |   25 +
 .../configuration/MemorySection.java          |  771 ++
 .../configuration/file/FileConfiguration.java |  158 +
 .../file/FileConfigurationOptions.java        |  115 +
 .../configuration/file/YamlConfiguration.java |  189 +
 .../file/YamlConfigurationOptions.java        |   68 +
 .../configuration/file/YamlConstructor.java   |   46 +
 .../configuration/file/YamlRepresenter.java   |   40 +
 .../ConfigurationSerializable.java            |   34 +
 .../ConfigurationSerialization.java           |  262 +
 .../DelegateDeserialization.java              |   21 +
 .../serialization/SerializableAs.java         |   32 +
 .../plotsquared/json/JSONArray.java           |  815 +++
 .../plotsquared/json/JSONException.java       |   40 +
 .../plotsquared/json/JSONObject.java          | 1425 ++++
 .../plotsquared/json/JSONString.java          |   16 +
 .../plotsquared/json/JSONTokener.java         |  384 +
 .../plotsquared/json/Property.java            |   52 +
 .../plotsquared/json/XML.java                 |  375 +
 .../plotsquared/json/XMLTokener.java          |  315 +
 .../plotsquared/plot/IPlotMain.java           |  285 +
 .../plotsquared/plot/Platform.java            |    6 +
 .../plotsquared/plot/PlotSquared.java         | 2066 ++++++
 .../plotsquared/plot/PlotVersion.java         |   45 +
 .../plotsquared/plot/commands/Add.java        |   82 +
 .../plotsquared/plot/commands/Alias.java      |  123 +
 .../plotsquared/plot/commands/Area.java       |  469 ++
 .../plotsquared/plot/commands/Auto.java       |  256 +
 .../plotsquared/plot/commands/Biome.java      |   38 +
 .../plotsquared/plot/commands/Buy.java        |   72 +
 .../plotsquared/plot/commands/Chat.java       |   14 +
 .../plotsquared/plot/commands/Claim.java      |   99 +
 .../plotsquared/plot/commands/Clear.java      |   68 +
 .../plotsquared/plot/commands/Cluster.java    |  612 ++
 .../plot/commands/CommandCategory.java        |   56 +
 .../plotsquared/plot/commands/Comment.java    |   74 +
 .../plotsquared/plot/commands/Condense.java   |  209 +
 .../plotsquared/plot/commands/Confirm.java    |   31 +
 .../plotsquared/plot/commands/Continue.java   |   45 +
 .../plotsquared/plot/commands/Copy.java       |   54 +
 .../plot/commands/CreateRoadSchematic.java    |   32 +
 .../plotsquared/plot/commands/Database.java   |  184 +
 .../plotsquared/plot/commands/Debug.java      |   46 +
 .../plot/commands/DebugAllowUnsafe.java       |   30 +
 .../plot/commands/DebugClaimTest.java         |  113 +
 .../plotsquared/plot/commands/DebugExec.java  |  429 ++
 .../plot/commands/DebugFixFlags.java          |   52 +
 .../plot/commands/DebugImportWorlds.java      |   58 +
 .../plot/commands/DebugLoadTest.java          |   17 +
 .../plotsquared/plot/commands/DebugPaste.java |  146 +
 .../plot/commands/DebugRoadRegen.java         |   41 +
 .../plot/commands/DebugSaveTest.java          |   29 +
 .../plotsquared/plot/commands/Delete.java     |   71 +
 .../plotsquared/plot/commands/Deny.java       |  114 +
 .../plotsquared/plot/commands/Desc.java       |   30 +
 .../plotsquared/plot/commands/Done.java       |   68 +
 .../plotsquared/plot/commands/Download.java   |   95 +
 .../plotsquared/plot/commands/FlagCmd.java    |  299 +
 .../plot/commands/GenerateDocs.java           |  221 +
 .../plotsquared/plot/commands/Grant.java      |   71 +
 .../plotsquared/plot/commands/Help.java       |   91 +
 .../plotsquared/plot/commands/Inbox.java      |  198 +
 .../plotsquared/plot/commands/Info.java       |  155 +
 .../plotsquared/plot/commands/Kick.java       |   92 +
 .../plotsquared/plot/commands/Leave.java      |   48 +
 .../plotsquared/plot/commands/ListCmd.java    |  397 ++
 .../plotsquared/plot/commands/Load.java       |  179 +
 .../plot/commands/MainCommand.java            |  286 +
 .../plotsquared/plot/commands/Merge.java      |  198 +
 .../plotsquared/plot/commands/Middle.java     |   29 +
 .../plotsquared/plot/commands/Move.java       |   65 +
 .../plotsquared/plot/commands/Music.java      |   69 +
 .../plotsquared/plot/commands/Near.java       |   24 +
 .../plotsquared/plot/commands/Owner.java      |   96 +
 .../plotsquared/plot/commands/PluginCmd.java  |   38 +
 .../plotsquared/plot/commands/Purge.java      |  167 +
 .../plotsquared/plot/commands/Rate.java       |  217 +
 .../plot/commands/RegenAllRoads.java          |   60 +
 .../plotsquared/plot/commands/Relight.java    |   39 +
 .../plotsquared/plot/commands/Reload.java     |   84 +
 .../plotsquared/plot/commands/Remove.java     |  108 +
 .../plot/commands/RequiredType.java           |   16 +
 .../plotsquared/plot/commands/Save.java       |   76 +
 .../plot/commands/SchematicCmd.java           |  222 +
 .../plotsquared/plot/commands/Set.java        |  167 +
 .../plotsquared/plot/commands/SetCommand.java |   43 +
 .../plotsquared/plot/commands/SetHome.java    |   40 +
 .../plotsquared/plot/commands/Setup.java      |  434 ++
 .../plotsquared/plot/commands/SubCommand.java |   39 +
 .../plotsquared/plot/commands/Swap.java       |   54 +
 .../plotsquared/plot/commands/Target.java     |   49 +
 .../plotsquared/plot/commands/Template.java   |  201 +
 .../plotsquared/plot/commands/Toggle.java     |   90 +
 .../plotsquared/plot/commands/Trim.java       |  214 +
 .../plotsquared/plot/commands/Trust.java      |   82 +
 .../plotsquared/plot/commands/Unlink.java     |   58 +
 .../plotsquared/plot/commands/Visit.java      |  142 +
 .../plot/commands/WE_Anywhere.java            |   16 +
 .../plotsquared/plot/config/C.java            | 1070 +++
 .../plotsquared/plot/config/Config.java       |  440 ++
 .../plot/config/Configuration.java            |  174 +
 .../plot/config/ConfigurationNode.java        |   89 +
 .../plotsquared/plot/config/Settings.java     |  357 +
 .../plotsquared/plot/config/Storage.java      |   38 +
 .../plotsquared/plot/database/AbstractDB.java |  341 +
 .../plotsquared/plot/database/DBFunc.java     |  495 ++
 .../plotsquared/plot/database/Database.java   |   72 +
 .../plotsquared/plot/database/MySQL.java      |   89 +
 .../plotsquared/plot/database/SQLManager.java | 3082 ++++++++
 .../plotsquared/plot/database/SQLite.java     |   86 +
 .../plotsquared/plot/database/StmtMod.java    |   39 +
 .../plotsquared/plot/flag/BooleanFlag.java    |   45 +
 .../plotsquared/plot/flag/DoubleFlag.java     |   25 +
 .../plotsquared/plot/flag/EnumFlag.java       |   31 +
 .../plotsquared/plot/flag/Flag.java           |   60 +
 .../plotsquared/plot/flag/FlagManager.java    |  299 +
 .../plotsquared/plot/flag/Flags.java          |  207 +
 .../plotsquared/plot/flag/GameModeFlag.java   |   40 +
 .../plotsquared/plot/flag/IntegerFlag.java    |   41 +
 .../plot/flag/IntegerListFlag.java            |   31 +
 .../plotsquared/plot/flag/IntervalFlag.java   |   41 +
 .../plotsquared/plot/flag/ListFlag.java       |   17 +
 .../plotsquared/plot/flag/LongFlag.java       |   24 +
 .../plot/flag/PlotBlockListFlag.java          |   33 +
 .../plot/flag/PlotWeatherFlag.java            |   35 +
 .../plotsquared/plot/flag/StringFlag.java     |   21 +
 .../plotsquared/plot/flag/StringListFlag.java |   26 +
 .../plot/flag/TeleportDenyFlag.java           |   39 +
 .../plot/generator/AugmentedUtils.java        |  141 +
 .../plot/generator/ClassicPlotManager.java    |  467 ++
 .../plot/generator/ClassicPlotWorld.java      |  117 +
 .../plot/generator/GeneratorWrapper.java      |   18 +
 .../plot/generator/GridPlotManager.java       |   10 +
 .../plot/generator/GridPlotWorld.java         |   14 +
 .../plotsquared/plot/generator/HybridGen.java |  266 +
 .../plot/generator/HybridPlotManager.java     |  225 +
 .../plot/generator/HybridPlotWorld.java       |  283 +
 .../plot/generator/HybridUtils.java           |  381 +
 .../generator/IndependentPlotGenerator.java   |   90 +
 .../plot/generator/PlotGenerator.java         |   37 +
 .../plot/generator/SquarePlotManager.java     |  220 +
 .../plot/generator/SquarePlotWorld.java       |   29 +
 .../plot/listener/ExtentWrapper.java          |   12 +
 .../plot/listener/PlayerBlockEventType.java   |   32 +
 .../plot/listener/PlotListener.java           |  260 +
 .../plot/listener/ProcessedWEExtent.java      |  178 +
 .../plotsquared/plot/listener/WEExtent.java   |   63 +
 .../plotsquared/plot/listener/WEManager.java  |  101 +
 .../plot/listener/WESubscriber.java           |   76 +
 .../plot/logger/DelegateLogger.java           |   18 +
 .../plotsquared/plot/logger/ILogger.java      |    5 +
 .../plotsquared/plot/object/BlockBucket.java  |  276 +
 .../plotsquared/plot/object/BlockLoc.java     |   77 +
 .../plot/object/BlockRegistry.java            |   34 +
 .../plotsquared/plot/object/ChunkLoc.java     |   34 +
 .../plotsquared/plot/object/ChunkWrapper.java |   43 +
 .../plotsquared/plot/object/CmdInstance.java  |   11 +
 .../plot/object/ConsolePlayer.java            |  131 +
 .../plotsquared/plot/object/Expression.java   |   55 +
 .../plotsquared/plot/object/FileBytes.java    |   12 +
 .../plotsquared/plot/object/LazyBlock.java    |   10 +
 .../plotsquared/plot/object/LazyResult.java   |   19 +
 .../plot/object/LegacyPlotBlock.java          |   60 +
 .../plotsquared/plot/object/Location.java     |  205 +
 .../plot/object/OfflinePlotPlayer.java        |   34 +
 .../plotsquared/plot/object/Plot.java         | 2888 ++++++++
 .../plotsquared/plot/object/PlotArea.java     |  961 +++
 .../plotsquared/plot/object/PlotBlock.java    |  136 +
 .../plotsquared/plot/object/PlotCluster.java  |  187 +
 .../plotsquared/plot/object/PlotFilter.java   |   11 +
 .../plotsquared/plot/object/PlotHandler.java  |   19 +
 .../plotsquared/plot/object/PlotId.java       |  180 +
 .../plot/object/PlotInventory.java            |  108 +
 .../plot/object/PlotItemStack.java            |   44 +
 .../plotsquared/plot/object/PlotLoc.java      |   75 +
 .../plotsquared/plot/object/PlotManager.java  |   82 +
 .../plotsquared/plot/object/PlotMessage.java  |   70 +
 .../plotsquared/plot/object/PlotPlayer.java   |  648 ++
 .../plotsquared/plot/object/PlotSettings.java |  185 +
 .../plotsquared/plot/object/PseudoRandom.java |   29 +
 .../plotsquared/plot/object/Rating.java       |   81 +
 .../plot/object/RegionWrapper.java            |   71 +
 .../plotsquared/plot/object/RunnableVal.java  |   18 +
 .../plotsquared/plot/object/RunnableVal2.java |   20 +
 .../plotsquared/plot/object/RunnableVal3.java |   22 +
 .../plotsquared/plot/object/SetupObject.java  |   67 +
 .../plot/object/StringPlotBlock.java          |   95 +
 .../plot/object/StringWrapper.java            |   72 +
 .../plot/object/chat/PlainChatManager.java    |   43 +
 .../plot/object/comment/CommentInbox.java     |   64 +
 .../plot/object/comment/InboxOwner.java       |   51 +
 .../plot/object/comment/InboxPublic.java      |   47 +
 .../plot/object/comment/InboxReport.java      |   34 +
 .../plot/object/comment/PlotComment.java      |   22 +
 .../plot/object/schematic/ItemType.java       |  307 +
 .../plot/object/schematic/PlotItem.java       |   22 +
 .../plot/object/schematic/Schematic.java      |   47 +
 .../plot/object/schematic/StoredEntity.java   |   54 +
 .../stream/AbstractDelegateOutputStream.java  |   30 +
 .../object/worlds/DefaultPlotAreaManager.java |  231 +
 .../plot/object/worlds/PlotAreaManager.java   |   28 +
 .../plot/object/worlds/SinglePlot.java        |   71 +
 .../plot/object/worlds/SinglePlotArea.java    |  139 +
 .../object/worlds/SinglePlotAreaManager.java  |  131 +
 .../plot/object/worlds/SinglePlotManager.java |  104 +
 .../object/worlds/SingleWorldGenerator.java   |   91 +
 .../plotsquared/plot/util/AbstractTitle.java  |   20 +
 .../plotsquared/plot/util/ArrayUtil.java      |   19 +
 .../plot/util/ByteArrayUtilities.java         |   26 +
 .../plotsquared/plot/util/ChatManager.java    |   22 +
 .../plotsquared/plot/util/ChunkManager.java   |  296 +
 .../plotsquared/plot/util/CmdConfirm.java     |   27 +
 .../plotsquared/plot/util/CommentManager.java |   65 +
 .../plotsquared/plot/util/ConsoleColors.java  |   87 +
 .../plotsquared/plot/util/EconHandler.java    |   41 +
 .../plotsquared/plot/util/EntityUtil.java     |   76 +
 .../plotsquared/plot/util/EventUtil.java      |  428 ++
 .../plot/util/HastebinUtility.java            |   65 +
 .../plotsquared/plot/util/HttpUtil.java       |   29 +
 .../plotsquared/plot/util/IncendoPaster.java  |  191 +
 .../plotsquared/plot/util/InventoryUtil.java  |   27 +
 .../plot/util/LegacyConverter.java            |  134 +
 .../plotsquared/plot/util/LegacyMappings.java |   15 +
 .../plotsquared/plot/util/MainUtil.java       |  867 +++
 .../plotsquared/plot/util/MathMan.java        |  323 +
 .../plotsquared/plot/util/Permissions.java    |  126 +
 .../plotsquared/plot/util/PlotGameMode.java   |   32 +
 .../plotsquared/plot/util/PlotWeather.java    |    5 +
 .../plot/util/ReflectionUtils.java            |  677 ++
 .../plotsquared/plot/util/RegExUtil.java      |   15 +
 .../plot/util/SchematicHandler.java           |  463 ++
 .../plotsquared/plot/util/SetupUtils.java     |   22 +
 .../plot/util/StringComparison.java           |  157 +
 .../plotsquared/plot/util/StringMan.java      |  290 +
 .../plotsquared/plot/util/TaskManager.java    |  168 +
 .../plotsquared/plot/util/UUIDHandler.java    |  169 +
 .../plot/util/UUIDHandlerImplementation.java  |  286 +
 .../plotsquared/plot/util/WorldUtil.java      |  150 +
 .../plotsquared/plot/util/area/QuadMap.java   |  297 +
 .../plot/util/block/BasicLocalBlockQueue.java |  278 +
 .../util/block/DelegateLocalBlockQueue.java   |  110 +
 .../plot/util/block/GlobalBlockQueue.java     |  303 +
 .../plot/util/block/LocalBlockQueue.java      |  108 +
 .../util/block/OffsetLocalBlockQueue.java     |   24 +
 .../plot/util/block/QueueProvider.java        |   30 +
 .../util/block/ScopedLocalBlockQueue.java     |   98 +
 .../plot/util/expiry/ExpireManager.java       |  449 ++
 .../plot/util/expiry/ExpirySettings.java      |    4 +
 .../plot/util/expiry/ExpiryTask.java          |  127 +
 .../plot/util/expiry/PlotAnalysis.java        |  552 ++
 .../plot/util/helpmenu/HelpMenu.java          |   58 +
 .../plot/util/helpmenu/HelpObject.java        |   36 +
 .../plot/util/helpmenu/HelpPage.java          |   37 +
 .../plotsquared/plot/uuid/UUIDWrapper.java    |   21 +
 Bukkit/src/main/resources/LICENSE             |  553 ++
 Bukkit/src/main/resources/addplots.js         |   18 +
 Bukkit/src/main/resources/addsigns.js         |   12 +
 Bukkit/src/main/resources/automerge.js        |   48 +
 Bukkit/src/main/resources/bridge.template     |  Bin 0 -> 5325 bytes
 Bukkit/src/main/resources/de-DE.yml           |  414 ++
 Bukkit/src/main/resources/es-ES.yml           |  394 ++
 Bukkit/src/main/resources/fr-FR.yml           |  393 ++
 Bukkit/src/main/resources/furthest.js         |   33 +
 Bukkit/src/main/resources/it-IT.yml           |  393 ++
 Bukkit/src/main/resources/ko-KR.yml           |  402 ++
 Bukkit/src/main/resources/mycommand.js        |    2 +
 Bukkit/src/main/resources/plugin.properties   |    3 +
 Bukkit/src/main/resources/setbiomes.js        |   12 +
 Bukkit/src/main/resources/skyblock.template   |  Bin 0 -> 1127 bytes
 Bukkit/src/main/resources/start.js            |    7 +
 Bukkit/src/main/resources/town.template       |  Bin 0 -> 1771 bytes
 Bukkit/src/main/resources/zh-CN.yml           |  407 ++
 .../plotsquared/plot/FlagTest.java            |   51 +
 .../plot/database/AbstractDBTest.java         |  183 +
 .../plotsquared/plot/util/EventUtilTest.java  |   75 +
 .../configuration/Configuration.java          |    2 +-
 .../configuration/ConfigurationSection.java   |    2 +-
 .../configuration/MemoryConfiguration.java    |    2 +-
 .../configuration/MemorySection.java          | 1444 ++--
 .../configuration/file/FileConfiguration.java |    2 +-
 .../plotsquared/plot/IPlotMain.java           |    2 +-
 .../plotsquared/plot/PlotSquared.java         | 3870 +++++-----
 .../plotsquared/plot/commands/Auto.java       |    3 +-
 .../plotsquared/plot/commands/Cluster.java    |    3 +-
 .../plotsquared/plot/commands/Database.java   |  307 +-
 .../plotsquared/plot/commands/DebugExec.java  |    8 +-
 .../plotsquared/plot/commands/DebugPaste.java |   74 +-
 .../plotsquared/plot/commands/FlagCmd.java    |   17 +-
 .../plotsquared/plot/commands/Merge.java      |    4 +-
 .../plotsquared/plot/commands/Music.java      |    7 +-
 .../plotsquared/plot/commands/Rate.java       |    4 +-
 .../plotsquared/plot/commands/Unlink.java     |    6 +-
 .../plot/config/Configuration.java            |    7 +-
 .../plotsquared/plot/config/Settings.java     |   12 +-
 .../plotsquared/plot/database/DBFunc.java     |    3 +-
 .../plotsquared/plot/database/SQLManager.java | 6260 ++++++++---------
 .../plotsquared/plot/flag/FlagManager.java    |    8 +-
 .../plot/generator/ClassicPlotWorld.java      |    8 +-
 .../plotsquared/plot/generator/HybridGen.java |    3 +-
 .../plot/generator/HybridPlotWorld.java       |   28 +-
 .../plot/listener/PlotListener.java           |   17 +-
 .../plotsquared/plot/listener/WEExtent.java   |    8 +-
 .../plotsquared/plot/listener/WEManager.java  |    3 -
 .../plotsquared/plot/logger/ILogger.java      |    3 +-
 .../plotsquared/plot/object/Expression.java   |    3 +-
 .../plotsquared/plot/object/Plot.java         | 5542 ++++++++-------
 .../plotsquared/plot/object/PlotCluster.java  |   19 +-
 .../plot/object/PlotInventory.java            |   37 +-
 .../plotsquared/plot/object/PlotLoc.java      |    6 +-
 .../plotsquared/plot/object/PlotPlayer.java   | 1209 ++--
 .../stream/AbstractDelegateOutputStream.java  |   38 +-
 .../object/worlds/DefaultPlotAreaManager.java |    6 +-
 .../plot/object/worlds/SinglePlot.java        |    5 +-
 .../plotsquared/plot/util/ChunkManager.java   |    4 +-
 .../plotsquared/plot/util/CommentManager.java |    3 +-
 .../plotsquared/plot/util/IncendoPaster.java  |   33 +-
 .../plotsquared/plot/util/MainUtil.java       |    3 +-
 .../plotsquared/plot/util/StringMan.java      |    4 +-
 .../plot/util/block/GlobalBlockQueue.java     |  551 +-
 .../plot/util/expiry/ExpireManager.java       |  798 ++-
 .../plot/util/expiry/ExpiryTask.java          |    1 +
 .../plot/util/expiry/PlotAnalysis.java        |    2 -
 Core/src/main/resources/addplots.js           |    2 +-
 .../plot/database/AbstractDBTest.java         |    2 +-
 .../plotsquared/plot/util/EventUtilTest.java  |    2 +-
 335 files changed, 58791 insertions(+), 10363 deletions(-)
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
 create mode 100644 Bukkit/src/main/resources/LICENSE
 create mode 100644 Bukkit/src/main/resources/addplots.js
 create mode 100644 Bukkit/src/main/resources/addsigns.js
 create mode 100644 Bukkit/src/main/resources/automerge.js
 create mode 100644 Bukkit/src/main/resources/bridge.template
 create mode 100644 Bukkit/src/main/resources/de-DE.yml
 create mode 100644 Bukkit/src/main/resources/es-ES.yml
 create mode 100644 Bukkit/src/main/resources/fr-FR.yml
 create mode 100644 Bukkit/src/main/resources/furthest.js
 create mode 100644 Bukkit/src/main/resources/it-IT.yml
 create mode 100644 Bukkit/src/main/resources/ko-KR.yml
 create mode 100644 Bukkit/src/main/resources/mycommand.js
 create mode 100644 Bukkit/src/main/resources/plugin.properties
 create mode 100644 Bukkit/src/main/resources/setbiomes.js
 create mode 100644 Bukkit/src/main/resources/skyblock.template
 create mode 100644 Bukkit/src/main/resources/start.js
 create mode 100644 Bukkit/src/main/resources/town.template
 create mode 100644 Bukkit/src/main/resources/zh-CN.yml
 create mode 100644 Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java
 create mode 100644 Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
 create mode 100644 Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
new file mode 100644
index 000000000..c966903be
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
@@ -0,0 +1,224 @@
+package com.github.intellectualsites.plotsquared.api;
+
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
+import lombok.NoArgsConstructor;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.UUID;
+
+/**
+ * PlotSquared API.
+ *
+ * <p>Useful classes:
+ * <ul>
+ * <li>{@link PlotPlayer}</li>
+ * <li>{@link Plot}</li>
+ * <li>{@link com.github.intellectualsites.plotsquared.plot.object.Location}</li>
+ * <li>{@link PlotArea}</li>
+ * <li>{@link PlotSquared}</li>
+ * </ul>
+ *
+ * @version 3.3.3
+ */
+@SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI {
+
+    /**
+     * Get all plots.
+     *
+     * @return all plots
+     * @see PlotSquared#getPlots()
+     */
+    public Set<Plot> getAllPlots() {
+        return PlotSquared.get().getPlots();
+    }
+
+    /**
+     * Return all plots for a player.
+     *
+     * @param player Player, whose plots to search for
+     * @return all plots that a player owns
+     */
+    public Set<Plot> getPlayerPlots(PlotPlayer player) {
+        return PlotSquared.get().getPlots(player);
+    }
+
+    /**
+     * Add a plot world.
+     *
+     * @param plotArea Plot World Object
+     * @see PlotSquared#addPlotArea(PlotArea)
+     */
+    public void addPlotArea(PlotArea plotArea) {
+        PlotSquared.get().addPlotArea(plotArea);
+    }
+
+    /**
+     * Returns the PlotSquared configurations file.
+     *
+     * @return main configuration
+     * @see PlotSquared#config
+     */
+    public YamlConfiguration getConfig() {
+        return PlotSquared.get().config;
+    }
+
+    /**
+     * Get the PlotSquared storage file.
+     *
+     * @return storage configuration
+     * @see PlotSquared#storage
+     */
+    public YamlConfiguration getStorage() {
+        return PlotSquared.get().storage;
+    }
+
+    /**
+     * Get the main class for this plugin. Only use this if you really need it.
+     *
+     * @return PlotSquared PlotSquared Main Class
+     * @see PlotSquared
+     */
+    public PlotSquared getMain() {
+        return PlotSquared.get();
+    }
+
+    /**
+     * ChunkManager class contains several useful methods.
+     * <ul>
+     * <li>Chunk deletion</li>
+     * <li>Moving or copying regions</li>
+     * <li>Plot swapping</li>
+     * <li>Entity Tracking</li>
+     * <li>Region Regeneration</li>
+     * </ul>
+     *
+     * @return ChunkManager
+     * @see ChunkManager
+     */
+    public ChunkManager getChunkManager() {
+        return ChunkManager.manager;
+    }
+
+    /**
+     * Get the block/biome set queue
+     *
+     * @return GlobalBlockQueue.IMP
+     */
+    public GlobalBlockQueue getBlockQueue() {
+        return GlobalBlockQueue.IMP;
+    }
+
+    /**
+     * UUIDWrapper class has basic methods for getting UUIDS. It's recommended
+     * to use the UUIDHandler class instead.
+     *
+     * @return UUIDWrapper
+     * @see UUIDWrapper
+     */
+    public UUIDWrapper getUUIDWrapper() {
+        return UUIDHandler.getUUIDWrapper();
+    }
+
+    /**
+     * SchematicHandler class contains methods related to pasting, reading
+     * and writing schematics.
+     *
+     * @return SchematicHandler
+     * @see SchematicHandler
+     */
+    public SchematicHandler getSchematicHandler() {
+        return SchematicHandler.manager;
+    }
+
+    /**
+     * Get a list of PlotAreas in the world.
+     *
+     * @param world The world to check for plot areas
+     * @return A set of PlotAreas
+     */
+    public Set<PlotArea> getPlotAreas(String world) {
+        if (world == null) {
+            return Collections.emptySet();
+        }
+        return PlotSquared.get().getPlotAreas(world);
+    }
+
+    /**
+     * Send a message to the console. The message supports color codes.
+     *
+     * @param message the message
+     * @see MainUtil#sendConsoleMessage(C, String...)
+     */
+    public void sendConsoleMessage(String message) {
+        PlotSquared.log(message);
+    }
+
+    /**
+     * Send a message to the console.
+     *
+     * @param caption the message
+     * @see #sendConsoleMessage(String)
+     * @see C
+     */
+    public void sendConsoleMessage(C caption) {
+        sendConsoleMessage(caption.s());
+    }
+
+    /**
+     * Registers a flag for use in plots.
+     *
+     * @param flag the flag to register
+     */
+    public void addFlag(Flag<?> flag) {
+        Flags.registerFlag(flag);
+    }
+
+    /**
+     * Gets the PlotSquared class.
+     *
+     * @return PlotSquared Class
+     * @see PlotSquared
+     */
+    public PlotSquared getPlotSquared() {
+        return PlotSquared.get();
+    }
+
+    /**
+     * Get the PlotPlayer for a UUID.
+     *
+     * <p><i>Please note that PlotSquared can be configured to provide
+     * different UUIDs than bukkit</i>
+     *
+     * @param uuid the uuid of the player to wrap
+     * @return a {@code PlotPlayer}
+     * @see PlotPlayer#wrap(Object)
+     */
+    public PlotPlayer wrapPlayer(UUID uuid) {
+        return PlotPlayer.wrap(uuid);
+    }
+
+    /**
+     * Get the PlotPlayer for a username.
+     *
+     * @param player the player to wrap
+     * @return a {@code PlotPlayer}
+     * @see PlotPlayer#wrap(Object)
+     */
+    public PlotPlayer wrapPlayer(String player) {
+        return PlotPlayer.wrap(player);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
new file mode 100644
index 000000000..dd5221a3a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
@@ -0,0 +1,68 @@
+package com.github.intellectualsites.plotsquared.commands;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+
+public abstract class Argument<T> {
+
+    public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
+        @Override public Integer parse(String in) {
+            Integer value = null;
+            try {
+                value = java.lang.Integer.parseInt(in);
+            } catch (Exception ignored) {
+            }
+            return value;
+        }
+    };
+    public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
+        @Override public Boolean parse(String in) {
+            Boolean value = null;
+            if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in
+                .equalsIgnoreCase("1")) {
+                value = true;
+            } else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in
+                .equalsIgnoreCase("0")) {
+                value = false;
+            }
+            return value;
+        }
+    };
+    public static final Argument<String> String = new Argument<String>("String", "Example") {
+        @Override public String parse(String in) {
+            return in;
+        }
+    };
+    public static final Argument<String> PlayerName =
+        new Argument<String>("PlayerName", "Dinnerbone") {
+            @Override public String parse(String in) {
+                return in.length() <= 16 ? in : null;
+            }
+        };
+    public static final Argument<PlotId> PlotID =
+        new Argument<PlotId>("PlotID", new PlotId(-6, 3)) {
+            @Override public PlotId parse(String in) {
+                return PlotId.fromString(in);
+            }
+        };
+    private final String name;
+    private final T example;
+
+    public Argument(String name, T example) {
+        this.name = name;
+        this.example = example;
+    }
+
+    public abstract T parse(String in);
+
+    @Override public final String toString() {
+        return this.getName();
+    }
+
+    public final String getName() {
+        return this.name;
+    }
+
+    public final T getExample() {
+        return this.example;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
new file mode 100644
index 000000000..6bac09a26
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
@@ -0,0 +1,596 @@
+package com.github.intellectualsites.plotsquared.commands;
+
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
+import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
+import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
+
+public abstract class Command {
+
+    // May be none
+    private final ArrayList<Command> allCommands = new ArrayList<>();
+    private final ArrayList<Command> dynamicCommands = new ArrayList<>();
+    private final HashMap<String, Command> staticCommands = new HashMap<>();
+
+    // Parent command (may be null)
+    private final Command parent;
+    private final boolean isStatic;
+    // The command ID
+    private String id;
+    private List<String> aliases;
+    private RequiredType required;
+    private String usage;
+    private String description;
+    private String perm;
+    private boolean confirmation;
+    private CommandCategory category;
+    private Argument[] arguments;
+
+    public Command(Command parent, boolean isStatic, String id, String perm, RequiredType required,
+        CommandCategory cat) {
+        this.parent = parent;
+        this.isStatic = isStatic;
+        this.id = id;
+        this.perm = perm;
+        this.required = required;
+        this.category = cat;
+        this.aliases = Arrays.asList(id);
+        if (this.parent != null) {
+            this.parent.register(this);
+        }
+    }
+
+    public Command(Command parent, boolean isStatic) {
+        this.parent = parent;
+        this.isStatic = isStatic;
+        Annotation cdAnnotation = getClass().getAnnotation(CommandDeclaration.class);
+        if (cdAnnotation != null) {
+            CommandDeclaration declaration = (CommandDeclaration) cdAnnotation;
+            init(declaration);
+        }
+        for (final Method method : getClass().getDeclaredMethods()) {
+            if (method.isAnnotationPresent(CommandDeclaration.class)) {
+                Class<?>[] types = method.getParameterTypes();
+                // final PlotPlayer player, String[] args, RunnableVal3<Command,Runnable,Runnable> confirm, RunnableVal2<Command, CommandResult>
+                // whenDone
+                if (types.length == 5 && types[0] == Command.class && types[1] == PlotPlayer.class
+                    && types[2] == String[].class && types[3] == RunnableVal3.class
+                    && types[4] == RunnableVal2.class) {
+                    Command tmp = new Command(this, true) {
+                        @Override public void execute(PlotPlayer player, String[] args,
+                            RunnableVal3<Command, Runnable, Runnable> confirm,
+                            RunnableVal2<Command, CommandResult> whenDone) {
+                            try {
+                                method.invoke(Command.this, this, player, args, confirm, whenDone);
+                            } catch (IllegalAccessException | InvocationTargetException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    };
+                    tmp.init(method.getAnnotation(CommandDeclaration.class));
+                }
+            }
+        }
+    }
+
+    public Command getParent() {
+        return this.parent;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public String getFullId() {
+        if (this.parent != null && this.parent.getParent() != null) {
+            return this.parent.getFullId() + "." + this.id;
+        }
+        return this.id;
+    }
+
+    public List<Command> getCommands(PlotPlayer player) {
+        List<Command> commands = new ArrayList<>();
+        for (Command cmd : this.allCommands) {
+            if (cmd.canExecute(player, false)) {
+                commands.add(cmd);
+            }
+        }
+        return commands;
+    }
+
+    public List<Command> getCommands(CommandCategory cat, PlotPlayer player) {
+        List<Command> commands = getCommands(player);
+        if (cat != null) {
+            Iterator<Command> iterator = commands.iterator();
+            while (iterator.hasNext()) {
+                if (iterator.next().category != cat) {
+                    iterator.remove();
+                }
+            }
+        }
+        return commands;
+    }
+
+    public List<Command> getCommands() {
+        return this.allCommands;
+    }
+
+    public boolean hasConfirmation(PlotPlayer player) {
+        return this.confirmation && !player.hasPermission(getPermission() + ".confirm.bypass");
+    }
+
+    public List<String> getAliases() {
+        return this.aliases;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+
+    public RequiredType getRequiredType() {
+        return this.required;
+    }
+
+    public Argument[] getRequiredArguments() {
+        return this.arguments;
+    }
+
+    public void setRequiredArguments(Argument[] arguments) {
+        this.arguments = arguments;
+    }
+
+    public void init(CommandDeclaration declaration) {
+        this.id = declaration.command();
+        this.perm = declaration.permission();
+        this.required = declaration.requiredType();
+        this.category = declaration.category();
+        HashMap<String, Object> options = new HashMap<>();
+        List<String> aliasOptions = new ArrayList<>();
+        aliasOptions.add(this.id);
+        aliasOptions.addAll(Arrays.asList(declaration.aliases()));
+        options.put("aliases", aliasOptions);
+        options.put("description", declaration.description());
+        options.put("usage", declaration.usage());
+        options.put("confirmation", declaration.confirmation());
+        boolean set = false;
+        YamlConfiguration commands =
+            PlotSquared.get() == null ? new YamlConfiguration() : PlotSquared.get().commands;
+        for (Map.Entry<String, Object> entry : options.entrySet()) {
+            String key = this.getFullId() + "." + entry.getKey();
+            if (!commands.contains(key)) {
+                commands.set(key, entry.getValue());
+                set = true;
+            }
+        }
+        if (set && PlotSquared.get() != null) {
+            try {
+                commands.save(PlotSquared.get().commandsFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+
+            }
+        }
+        this.aliases = commands.getStringList(this.getFullId() + ".aliases");
+        this.description = commands.getString(this.getFullId() + ".description");
+        this.usage = commands.getString(this.getFullId() + ".usage");
+        this.confirmation = commands.getBoolean(this.getFullId() + ".confirmation");
+        if (this.parent != null) {
+            this.parent.register(this);
+        }
+    }
+
+    public void register(Command command) {
+        if (command.isStatic) {
+            for (String alias : command.aliases) {
+                this.staticCommands.put(alias.toLowerCase(), command);
+            }
+        } else {
+            this.dynamicCommands.add(command);
+        }
+        this.allCommands.add(command);
+    }
+
+    public String getPermission() {
+        if (this.perm != null && !this.perm.isEmpty()) {
+            return this.perm;
+        }
+        if (this.parent == null) {
+            return "plots.use";
+        }
+        return "plots." + getFullId();
+    }
+
+    public <T> void paginate(PlotPlayer player, List<T> c, int size, int page,
+        RunnableVal3<Integer, T, PlotMessage> add, String baseCommand, String header) {
+        // Calculate pages & index
+        if (page < 0) {
+            page = 0;
+        }
+        int totalPages = (int) Math.ceil(c.size() / size);
+        if (page > totalPages) {
+            page = totalPages;
+        }
+        int max = page * size + size;
+        if (max > c.size()) {
+            max = c.size();
+        }
+        // Send the header
+        header = header.replaceAll("%cur", page + 1 + "").replaceAll("%max", totalPages + 1 + "")
+            .replaceAll("%amount%", c.size() + "").replaceAll("%word%", "all");
+        MainUtil.sendMessage(player, header);
+        // Send the page content
+        List<T> subList = c.subList(page * size, max);
+        int i = page * size;
+        for (T obj : subList) {
+            i++;
+            PlotMessage msg = new PlotMessage();
+            add.run(i, obj, msg);
+            msg.send(player);
+        }
+        // Send the footer
+        if (page < totalPages && page > 0) { // Back | Next
+            new PlotMessage().text("<-").color("$1").command(baseCommand + " " + page).text(" | ")
+                .color("$3").text("->").color("$1").command(baseCommand + " " + (page + 2))
+                .text(C.CLICKABLE.s()).color("$2").send(player);
+            return;
+        }
+        if (page == 0 && totalPages != 0) { // Next
+            new PlotMessage().text("<-").color("$3").text(" | ").color("$3").text("->").color("$1")
+                .command(baseCommand + " " + (0 + 2)).text(C.CLICKABLE.s()).color("$2")
+                .send(player);
+            return;
+        }
+        if (page == totalPages && totalPages != 0) { // Back
+            new PlotMessage().text("<-").color("$1").command(baseCommand + " " + page).text(" | ")
+                .color("$3").text("->").color("$3").text(C.CLICKABLE.s()).color("$2").send(player);
+        }
+    }
+
+    /**
+     * @param player  Caller
+     * @param args    Arguments
+     * @param confirm Instance, Success, Failure
+     * @return
+     */
+    public void execute(PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        if (args.length == 0 || args[0] == null) {
+            if (this.parent == null) {
+                MainCommand.getInstance().help.displayHelp(player, null, 0);
+            } else {
+                C.COMMAND_SYNTAX.send(player, getUsage());
+            }
+            return;
+        }
+        if (this.allCommands == null || this.allCommands.isEmpty()) {
+            player.sendMessage(
+                "Not Implemented: https://github.com/IntellectualSites/PlotSquared/issues/new");
+            return;
+        }
+        Command cmd = getCommand(args[0]);
+        if (cmd == null) {
+            if (this.parent != null) {
+                C.COMMAND_SYNTAX.send(player, getUsage());
+                return;
+            }
+            // Help command
+            try {
+                if (args.length == 0 || MathMan.isInteger(args[0])
+                    || CommandCategory.valueOf(args[0].toUpperCase()) != null) {
+                    // This will default certain syntax to the help command
+                    // e.g. /plot, /plot 1, /plot claiming
+                    MainCommand.getInstance().help.execute(player, args, null, null);
+                    return;
+                }
+            } catch (IllegalArgumentException ignored) {
+            }
+            // Command recommendation
+            MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
+            List<Command> commands = getCommands(player);
+            if (commands.isEmpty()) {
+                MainUtil
+                    .sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
+                return;
+            }
+            HashSet<String> setargs = new HashSet<>(args.length);
+            for (String arg : args) {
+                setargs.add(arg.toLowerCase());
+            }
+            String[] allargs = setargs.toArray(new String[setargs.size()]);
+            int best = 0;
+            for (Command current : commands) {
+                int match = getMatch(allargs, current);
+                if (match > best) {
+                    cmd = current;
+                }
+            }
+            if (cmd == null) {
+                cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
+            }
+            MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
+            return;
+        }
+        String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
+        if (!cmd.checkArgs(player, newArgs) || !cmd.canExecute(player, true)) {
+            return;
+        }
+        try {
+            cmd.execute(player, newArgs, confirm, whenDone);
+        } catch (CommandException e) {
+            e.perform(player);
+        }
+    }
+
+    public boolean checkArgs(PlotPlayer player, String[] args) {
+        Argument<?>[] reqArgs = getRequiredArguments();
+        if (reqArgs != null && reqArgs.length > 0) {
+            boolean failed = args.length < reqArgs.length;
+            String[] baseSplit = getCommandString().split(" ");
+            String[] fullSplit = getUsage().split(" ");
+            String base = getCommandString();
+            if (fullSplit.length - baseSplit.length < reqArgs.length) {
+                String[] tmp = new String[baseSplit.length + reqArgs.length];
+                System.arraycopy(fullSplit, 0, tmp, 0, fullSplit.length);
+                fullSplit = tmp;
+            }
+            for (int i = 0; i < reqArgs.length; i++) {
+                fullSplit[i + baseSplit.length] = reqArgs[i].getExample().toString();
+                failed = failed || reqArgs[i].parse(args[i]) == null;
+            }
+            if (failed) {
+                C.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public int getMatch(String[] args, Command cmd) {
+        int count = 0;
+        String perm = cmd.getPermission();
+        HashSet<String> desc = new HashSet<>();
+        for (String alias : cmd.getAliases()) {
+            if (alias.startsWith(args[0])) {
+                count += 5;
+            }
+        }
+        Collections.addAll(desc, cmd.getDescription().split(" "));
+        for (String arg : args) {
+            if (perm.startsWith(arg)) {
+                count++;
+            }
+            if (desc.contains(arg)) {
+                count++;
+            }
+        }
+        String[] usage = cmd.getUsage().split(" ");
+        for (int i = 0; i < Math.min(4, usage.length); i++) {
+            int require;
+            if (usage[i].startsWith("<")) {
+                require = 1;
+            } else {
+                require = 0;
+            }
+            String[] split = usage[i].split("\\|| |\\>|\\<|\\[|\\]|\\{|\\}|\\_|\\/");
+            for (String aSplit : split) {
+                for (String arg : args) {
+                    if (StringMan.isEqualIgnoreCase(arg, aSplit)) {
+                        count += 5 - i + require;
+                    }
+                }
+            }
+        }
+        count += StringMan.intersection(desc, args);
+        return count;
+    }
+
+    public Command getCommand(String arg) {
+        Command cmd = this.staticCommands.get(arg.toLowerCase());
+        if (cmd == null) {
+            for (Command command : this.dynamicCommands) {
+                if (command.matches(arg)) {
+                    return command;
+                }
+            }
+        }
+        return cmd;
+    }
+
+    public Command getCommand(Class clazz) {
+        for (Command cmd : this.allCommands) {
+            if (cmd.getClass() == clazz) {
+                return cmd;
+            }
+        }
+        return null;
+    }
+
+    public Command getCommandById(String id) {
+        Command exact = this.staticCommands.get(id);
+        if (exact != null) {
+            return exact;
+        }
+        for (Command cmd : this.allCommands) {
+            if (cmd.getId().equals(id)) {
+                return cmd;
+            }
+        }
+        return null;
+    }
+
+    public boolean canExecute(PlotPlayer player, boolean message) {
+        if (player == null) {
+            return true;
+        }
+        if (!this.required.allows(player)) {
+            if (message) {
+                MainUtil.sendMessage(player,
+                    this.required == RequiredType.PLAYER ? C.IS_CONSOLE : C.NOT_CONSOLE);
+            }
+        } else if (!Permissions.hasPermission(player, getPermission())) {
+            if (message) {
+                C.NO_PERMISSION.send(player, getPermission());
+            }
+        } else {
+            return true;
+        }
+        return false;
+    }
+
+    public boolean matches(String arg) {
+        arg = arg.toLowerCase();
+        return StringMan.isEqual(arg, this.id) || this.aliases.contains(arg);
+    }
+
+    public String getCommandString() {
+        String base;
+        if (this.parent == null) {
+            return "/" + toString();
+        } else {
+            return this.parent.getCommandString() + " " + toString();
+        }
+    }
+
+    public String getUsage() {
+        if (this.usage != null && !this.usage.isEmpty()) {
+            if (this.usage.startsWith("/")) {
+                return this.usage;
+            }
+            return getCommandString() + " " + this.usage;
+        }
+        if (this.allCommands.isEmpty()) {
+            return getCommandString();
+        }
+        StringBuilder args = new StringBuilder("[");
+        String prefix = "";
+        for (Command cmd : this.allCommands) {
+            args.append(prefix).append(cmd.isStatic ? cmd.toString() : "<" + cmd + ">");
+            prefix = "|";
+        }
+        return getCommandString() + " " + args + "]";
+    }
+
+    public Collection<Command> tabOf(PlotPlayer player, String[] input, boolean space,
+        String... args) {
+        if (!space) {
+            return null;
+        }
+        List<Command> result = new ArrayList<>();
+        int index = input.length - (space ? 0 : 1);
+        for (String arg : args) {
+            arg = arg.replace(getCommandString() + " ", "");
+            String[] split = arg.split(" ");
+            if (split.length <= index) {
+                continue;
+            }
+            arg = StringMan.join(Arrays.copyOfRange(split, index, split.length), " ");
+            Command cmd = new Command(null, false, arg, getPermission(), getRequiredType(), null) {
+            };
+            result.add(cmd);
+        }
+        return result;
+    }
+
+    public Collection<Command> tab(PlotPlayer player, String[] args, boolean space) {
+        switch (args.length) {
+            case 0:
+                return this.allCommands;
+            case 1:
+                String arg = args[0].toLowerCase();
+                if (space) {
+                    Command cmd = getCommand(arg);
+                    if (cmd != null && cmd.canExecute(player, false)) {
+                        return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
+                    } else {
+                        return null;
+                    }
+                } else {
+                    Set<Command> commands = new HashSet<Command>();
+                    for (Map.Entry<String, Command> entry : this.staticCommands.entrySet()) {
+                        if (entry.getKey().startsWith(arg) && entry.getValue()
+                            .canExecute(player, false)) {
+                            commands.add(entry.getValue());
+                        }
+                    }
+                    return commands;
+                }
+            default:
+                Command cmd = getCommand(args[0]);
+                if (cmd != null) {
+                    return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
+                } else {
+                    return null;
+                }
+        }
+    }
+
+    @Override public String toString() {
+        return !this.aliases.isEmpty() ? this.aliases.get(0) : this.id;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        Command other = (Command) obj;
+        if (this.hashCode() != other.hashCode()) {
+            return false;
+        }
+        return this.getFullId().equals(other.getFullId());
+    }
+
+    @Override public int hashCode() {
+        return this.getFullId().hashCode();
+    }
+
+    public void checkTrue(boolean mustBeTrue, C message, Object... args) {
+        if (!mustBeTrue) {
+            throw new CommandException(message, args);
+        }
+    }
+
+    public <T extends Object> T check(T object, C message, Object... args) {
+        if (object == null) {
+            throw new CommandException(message, args);
+        }
+        return object;
+    }
+
+    public enum CommandResult {
+        FAILURE, SUCCESS
+    }
+
+
+    public static class CommandException extends RuntimeException {
+        private final Object[] args;
+        private final C message;
+
+        public CommandException(C message, Object... args) {
+            this.message = message;
+            this.args = args;
+        }
+
+        public void perform(PlotPlayer player) {
+            if (player != null && message != null) {
+                message.send(player, args);
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
new file mode 100644
index 000000000..3b5ee295e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
@@ -0,0 +1,24 @@
+package com.github.intellectualsites.plotsquared.commands;
+
+import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
+
+public interface CommandCaller {
+
+    /**
+     * Send the player a message.
+     *
+     * @param message the message to send
+     */
+    void sendMessage(String message);
+
+    /**
+     * Check the player's permissions. <i>Will be cached if permission caching is enabled.</i>
+     *
+     * @param permission the name of the permission
+     */
+    boolean hasPermission(String permission);
+
+    boolean isPermissionSet(String permission);
+
+    RequiredType getSuperCaller();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java
new file mode 100644
index 000000000..851a03174
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.commands;
+
+import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
+import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
+public @interface CommandDeclaration {
+
+    String command();
+
+    String[] aliases() default {};
+
+    String permission() default "";
+
+    String usage() default "";
+
+    String description() default "";
+
+    RequiredType requiredType() default RequiredType.NONE;
+
+    CommandCategory category() default CommandCategory.INFO;
+
+    boolean confirmation() default false;
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
new file mode 100644
index 000000000..9d694c1ec
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
@@ -0,0 +1,87 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+import javax.annotation.Nonnull;
+import java.util.Map;
+
+/**
+ * Represents a source of configurable options and settings.
+ */
+public interface Configuration extends ConfigurationSection {
+    /**
+     * Sets the default value of the given path as provided.
+     * <p>
+     * <p>If no source {@link Configuration} was provided as a default
+     * collection, then a new {@link MemoryConfiguration} will be created to
+     * hold the new default value.</p>
+     * <p>
+     * <p>If value is null, the value will be removed from the default
+     * Configuration source.</p>
+     *
+     * @param path  Path of the value to set.
+     * @param value Value to set the default to.
+     * @throws IllegalArgumentException Thrown if path is null.
+     */
+    @Override void addDefault(@Nonnull String path, Object value);
+
+    /**
+     * Sets the default values of the given paths as provided.
+     * <p>
+     * <p>If no source {@link Configuration} was provided as a default
+     * collection, then a new {@link MemoryConfiguration} will be created to
+     * hold the new default values.</p>
+     *
+     * @param defaults A map of Path->Values to add to defaults.
+     * @throws IllegalArgumentException Thrown if defaults is null.
+     */
+    void addDefaults(Map<String, Object> defaults);
+
+    /**
+     * Sets the default values of the given paths as provided.
+     * <p>
+     * <p>If no source {@link Configuration} was provided as a default
+     * collection, then a new {@link MemoryConfiguration} will be created to
+     * hold the new default value.</p>
+     * <p>
+     * <p>This method will not hold a reference to the specified Configuration,
+     * nor will it automatically update if that Configuration ever changes. If
+     * you check this, you should set the default source with {@link
+     * #setDefaults(Configuration)}.</p>
+     *
+     * @param defaults A configuration holding a list of defaults to copy.
+     * @throws IllegalArgumentException Thrown if defaults is null or this.
+     */
+    void addDefaults(Configuration defaults);
+
+    /**
+     * Gets the source {@link Configuration} for this configuration.
+     * <p>
+     * <p>
+     * If no configuration source was set, but default values were added, then
+     * a {@link MemoryConfiguration} will be returned. If no source was set
+     * and no defaults were set, then this method will return null.</p>
+     *
+     * @return Configuration source for default values, or null if none exist.
+     */
+    Configuration getDefaults();
+
+    /**
+     * Sets the source of all default values for this {@link Configuration}.
+     * <p>
+     * <p>
+     * If a previous source was set, or previous default values were defined,
+     * then they will not be copied to the new source.</p>
+     *
+     * @param defaults New source of default values for this configuration.
+     * @throws IllegalArgumentException Thrown if defaults is null or this.
+     */
+    void setDefaults(Configuration defaults);
+
+    /**
+     * Gets the {@link ConfigurationOptions} for this {@link Configuration}.
+     * <p>
+     * <p>All setters through this method are chainable.</p>
+     *
+     * @return Options for this configuration
+     */
+    ConfigurationOptions options();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
new file mode 100644
index 000000000..f86016031
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
@@ -0,0 +1,90 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+/**
+ * Various settings for controlling the input and output of a {@link
+ * Configuration}.
+ */
+class ConfigurationOptions {
+    private final Configuration configuration;
+    private char pathSeparator = '.';
+    private boolean copyDefaults = false;
+
+    protected ConfigurationOptions(Configuration configuration) {
+        this.configuration = configuration;
+    }
+
+    /**
+     * Returns the {@link Configuration} that this object is responsible for.
+     *
+     * @return Parent configuration
+     */
+    public Configuration configuration() {
+        return configuration;
+    }
+
+    /**
+     * Gets the char that will be used to separate {@link
+     * ConfigurationSection}s.
+     *
+     * <p>This value does not affect how the {@link Configuration} is stored,
+     * only in how you access the data. The default value is '.'.
+     *
+     * @return Path separator
+     */
+    char pathSeparator() {
+        return pathSeparator;
+    }
+
+    /**
+     * Sets the char that will be used to separate {@link
+     * ConfigurationSection}s.
+     *
+     * <p>This value does not affect how the {@link Configuration} is stored,
+     * only in how you access the data. The default value is '.'.
+     *
+     * @param value Path separator
+     * @return This object, for chaining
+     */
+    public ConfigurationOptions pathSeparator(char value) {
+        pathSeparator = value;
+        return this;
+    }
+
+    /**
+     * Checks if the {@link Configuration} should copy values from its default
+     * {@link Configuration} directly.
+     *
+     * <p>If this is true, all values in the default Configuration will be
+     * directly copied, making it impossible to distinguish between values
+     * that were set and values that are provided by default. As a result,
+     * {@link ConfigurationSection#contains(String)} will always
+     * return the same value as {@link
+     * ConfigurationSection#isSet(String)}. The default value is
+     * false.
+     *
+     * @return Whether or not defaults are directly copied
+     */
+    boolean copyDefaults() {
+        return copyDefaults;
+    }
+
+    /**
+     * Sets if the {@link Configuration} should copy values from its default
+     * {@link Configuration} directly.
+     *
+     * <p>If this is true, all values in the default Configuration will be
+     * directly copied, making it impossible to distinguish between values
+     * that were set and values that are provided by default. As a result,
+     * {@link ConfigurationSection#contains(String)} will always
+     * return the same value as {@link
+     * ConfigurationSection#isSet(String)}. The default value is
+     * false.
+     *
+     * @param value Whether or not defaults are directly copied
+     * @return This object, for chaining
+     */
+    public ConfigurationOptions copyDefaults(boolean value) {
+        copyDefaults = value;
+        return this;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
new file mode 100644
index 000000000..9e15a9030
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
@@ -0,0 +1,649 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Represents a section of a {@link Configuration}.
+ */
+public interface ConfigurationSection {
+
+    /**
+     * Gets a set containing all keys in this section.
+     *
+     * <p>If deep is set to true, then this will contain all the keys within any
+     * child {@link ConfigurationSection}s (and their children, etc). These
+     * will be in a valid path notation for you to use.
+     *
+     * <p>If deep is set to false, then this will contain only the keys of any
+     * direct children, and not their own children.
+     *
+     * @param deep Whether or not to get a deep list, as opposed to a shallow
+     *             list.
+     * @return Set of keys contained within this ConfigurationSection.
+     */
+    Set<String> getKeys(boolean deep);
+
+    /**
+     * Gets a Map containing all keys and their values for this section.
+     *
+     * <p>If deep is set to true, then this will contain all the keys and values
+     * within any child {@link ConfigurationSection}s (and their children,
+     * etc). These keys will be in a valid path notation for you to use.
+     *
+     * <p>If deep is set to false, then this will contain only the keys and
+     * values of any direct children, and not their own children.
+     *
+     * @param deep Whether or not to get a deep list, as opposed to a shallow
+     *             list.
+     * @return Map of keys and values of this section.
+     */
+    Map<String, Object> getValues(boolean deep);
+
+    /**
+     * Checks if this {@link ConfigurationSection} contains the given path.
+     *
+     * <p>If the value for the requested path does not exist but a default value
+     * has been specified, this will return true.
+     *
+     * @param path Path to check for existence.
+     * @return True if this section contains the requested path, either via
+     * default or being set.
+     * @throws IllegalArgumentException Thrown when path is {@code null}.
+     */
+    boolean contains(@Nonnull String path);
+
+    /**
+     * Checks if this {@link ConfigurationSection} has a value set for the
+     * given path.
+     *
+     * <p>If the value for the requested path does not exist but a default value
+     * has been specified, this will still return false.
+     *
+     * @param path Path to check for existence.
+     * @return True if this section contains the requested path, regardless of
+     * having a default.
+     * @throws IllegalArgumentException Thrown when path is {@code null}.
+     */
+    boolean isSet(@Nonnull String path);
+
+    /**
+     * Gets the path of this {@link ConfigurationSection} from its root {@link
+     * Configuration}.
+     *
+     * <p>For any {@link Configuration} themselves, this will return an empty
+     * string.
+     *
+     * <p>If the section is no longer contained within its root for any reason,
+     * such as being replaced with a different value,
+     * this may return {@code null}.
+     *
+     * <p>To retrieve the single name of this section, that is, the final part
+     * of the path returned by this method, you may use {@link #getName()}.
+     *
+     * @return Path of this section relative to its root
+     */
+    String getCurrentPath();
+
+    /**
+     * Gets the name of this individual {@link ConfigurationSection}, in the
+     * path.
+     *
+     * <p>This will always be the final part of {@link #getCurrentPath()}, unless
+     * the section is orphaned.
+     *
+     * @return Name of this section
+     */
+    String getName();
+
+    /**
+     * Gets the root {@link Configuration} that contains this {@link
+     * ConfigurationSection}
+     *
+     * <p>For any {@link Configuration} themselves, this will return its own
+     * object.
+     *
+     * <p>If the section is no longer contained within its root for any reason,
+     * such as being replaced with a different value,
+     * this may return {@code null}.
+     *
+     * @return Root configuration containing this section.
+     */
+    Configuration getRoot();
+
+    /**
+     * Gets the parent {@link ConfigurationSection} that directly contains
+     * this {@link ConfigurationSection}.
+     *
+     * <p>For any {@link Configuration} themselves, this will return
+     * {@code null}.
+     *
+     * <p>If the section is no longer contained within its parent for any
+     * reason, such as being replaced with a different value, this may
+     * return {@code null}.
+     *
+     * @return Parent section containing this section.
+     */
+    ConfigurationSection getParent();
+
+    /**
+     * Gets the requested Object by path.
+     *
+     * <p>If the Object does not exist but a default value has been specified,
+     * this will return the default value. If the Object does not exist and no
+     * default value was specified, this will return {@code null}.
+     *
+     * @param path Path of the Object to get.
+     * @return Requested Object.
+     */
+    Object get(String path);
+
+    /**
+     * Gets the requested Object by path, returning a default value if not
+     * found.
+     *
+     * <p>If the Object does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path         Path of the Object to get.
+     * @param defaultValue The default value to return if the path is not found.
+     * @return Requested Object.
+     */
+    Object getOrDefault(@Nonnull String path, Object defaultValue);
+
+    /**
+     * Sets the specified path to the given value.
+     *
+     * <p>If value is {@code null}, the entry will be removed. Any
+     * existing entry will be replaced, regardless of what the new value is.
+     *
+     * <p>Some implementations may have limitations on what you may store. See
+     * their individual javadoc for details. No implementations should allow
+     * you to store {@link Configuration}s or {@link ConfigurationSection}s,
+     * please use {@link #createSection(String)} for that.
+     *
+     * @param path  Path of the object to set.
+     * @param value New value to set the path to.
+     */
+    void set(String path, Object value);
+
+    /**
+     * Creates an empty {@link ConfigurationSection} at the specified path.
+     *
+     * <p>Any value that was previously set at this path will be overwritten. If
+     * the previous value was itself a {@link ConfigurationSection}, it will
+     * be orphaned.
+     *
+     * @param path Path to create the section at.
+     * @return Newly created section
+     */
+    ConfigurationSection createSection(String path);
+
+    /**
+     * Creates a {@link ConfigurationSection} at the specified path, with
+     * specified values.
+     *
+     * <p>Any value that was previously set at this path will be overwritten. If
+     * the previous value was itself a {@link ConfigurationSection}, it will
+     * be orphaned.
+     *
+     * @param path Path to create the section at.
+     * @param map  The values to used.
+     * @return Newly created section
+     */
+    ConfigurationSection createSection(String path, Map<?, ?> map);
+
+    // Primitives
+
+    /**
+     * Gets the requested String by path.
+     *
+     * <p>If the String does not exist but a default value has been specified,
+     * this will return the default value. If the String does not exist and no
+     * default value was specified, this will return {@code null}.
+     *
+     * @param path Path of the String to get.
+     * @return Requested String.
+     */
+    String getString(String path);
+
+    /**
+     * Gets the requested String by path, returning a default value if not
+     * found.
+     *
+     * <p>If the String does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path Path of the String to get.
+     * @param def  The default value to return if the path is not found or is
+     *             not a String.
+     * @return Requested String.
+     */
+    String getString(String path, String def);
+
+    /**
+     * Checks if the specified path is a String.
+     *
+     * <p>If the path exists but is not a String, this will return false. If
+     * the path does not exist, this will return false. If the path does not
+     * exist but a default value has been specified, this will check if that
+     * defaultvalue is a String and return appropriately.
+     *
+     * @param path Path of the String to check.
+     * @return Whether or not the specified path is a String.
+     */
+    boolean isString(String path);
+
+    /**
+     * Gets the requested int by path.
+     *
+     * <p>If the int does not exist but a default value has been specified, this
+     * will return the default value. If the int does not exist and no default
+     * value was specified, this will return 0.
+     *
+     * @param path Path of the int to get.
+     * @return Requested int.
+     */
+    int getInt(String path);
+
+    /**
+     * Gets the requested int by path, returning a default value if not found.
+     *
+     * <p>If the int does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path Path of the int to get.
+     * @param def  The default value to return if the path is not found or is
+     *             not an int.
+     * @return Requested int.
+     */
+    int getInt(String path, int def);
+
+    /**
+     * Checks if the specified path is an int.
+     *
+     * <p>If the path exists but is not a int, this will return false. If the
+     * path does not exist, this will return false. If the path does not exist
+     * but a default value has been specified, this will check if that default
+     * value is a int and return appropriately.
+     *
+     * @param path Path of the int to check.
+     * @return Whether or not the specified path is an int.
+     */
+    boolean isInt(String path);
+
+    /**
+     * Gets the requested boolean by path.
+     *
+     * <p>If the boolean does not exist but a default value has been specified,
+     * this will return the default value. If the boolean does not exist and
+     * no default value was specified, this will return false.
+     *
+     * @param path Path of the boolean to get.
+     * @return Requested boolean.
+     */
+    boolean getBoolean(String path);
+
+    /**
+     * Gets the requested boolean by path, returning a default value if not
+     * found.
+     *
+     * <p>If the boolean does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path         Path of the boolean to get.
+     * @param defaultValue The default value to return if the path is not found or is
+     *                     not a boolean.
+     * @return Requested boolean.
+     */
+    boolean getBoolean(String path, boolean defaultValue);
+
+    /**
+     * Checks if the specified path is a boolean.
+     *
+     * <p>If the path exists but is not a boolean, this will return false. If the
+     * path does not exist, this will return false. If the path does not exist
+     * but a default value has been specified, this will check if that default
+     * value is a boolean and return appropriately.
+     *
+     * @param path Path of the boolean to check.
+     * @return Whether or not the specified path is a boolean.
+     */
+    boolean isBoolean(String path);
+
+    /**
+     * Gets the requested double by path.
+     *
+     * <p>If the double does not exist but a default value has been specified,
+     * this will return the default value. If the double does not exist and no
+     * default value was specified, this will return 0.
+     *
+     * @param path Path of the double to get.
+     * @return Requested double.
+     */
+    double getDouble(String path);
+
+    /**
+     * Gets the requested double by path, returning a default value if not
+     * found.
+     *
+     * <p>If the double does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path         Path of the double to get.
+     * @param defaultValue The default value to return if the path is not found or is
+     *                     not a double.
+     * @return Requested double.
+     */
+    double getDouble(String path, double defaultValue);
+
+    /**
+     * Checks if the specified path is a double.
+     *
+     * <p>If the path exists but is not a double, this will return false. If the
+     * path does not exist, this will return false. If the path does not exist
+     * but a default value has been specified, this will check if that default
+     * value is a double and return appropriately.
+     *
+     * @param path Path of the double to check.
+     * @return Whether or not the specified path is a double.
+     */
+    boolean isDouble(String path);
+
+    /**
+     * Gets the requested long by path.
+     *
+     * <p>If the long does not exist but a default value has been specified, this
+     * will return the default value. If the long does not exist and no
+     * default value was specified, this will return 0.
+     *
+     * @param path Path of the long to get.
+     * @return Requested long.
+     */
+    long getLong(String path);
+
+    /**
+     * Gets the requested long by path, returning a default value if not
+     * found.
+     *
+     * <p>If the long does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path Path of the long to get.
+     * @param def  The default value to return if the path is not found or is
+     *             not a long.
+     * @return Requested long.
+     */
+    long getLong(String path, long def);
+
+    /**
+     * Checks if the specified path is a long.
+     *
+     * <p>If the path exists but is not a long, this will return false. If the
+     * path does not exist, this will return false. If the path does not exist
+     * but a default value has been specified, this will check if that default
+     * value is a long and return appropriately.
+     *
+     * @param path Path of the long to check.
+     * @return Whether or not the specified path is a long.
+     */
+    boolean isLong(String path);
+
+    // Java
+
+    /**
+     * Gets the requested List by path.
+     *
+     * <p>If the List does not exist but a default value has been specified, this
+     * will return the default value. If the List does not exist and no
+     * default value was specified, this will return null.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List.
+     */
+    List<?> getList(String path);
+
+    /**
+     * Gets the requested List by path, returning a default value if not
+     * found.
+     *
+     * <p>If the List does not exist then the specified default value will
+     * returned regardless of if a default has been identified in the root
+     * {@link Configuration}.
+     *
+     * @param path Path of the List to get.
+     * @param def  The default value to return if the path is not found or is
+     *             not a List.
+     * @return Requested List.
+     */
+    List<?> getList(String path, List<?> def);
+
+    /**
+     * Checks if the specified path is a List.
+     *
+     * <p>If the path exists but is not a List, this will return false. If the
+     * path does not exist, this will return false. If the path does not exist
+     * but a default value has been specified, this will check if that default
+     * value is a List and return appropriately.
+     *
+     * @param path Path of the List to check.
+     * @return Whether or not the specified path is a List.
+     */
+    boolean isList(String path);
+
+    /**
+     * Gets the requested List of String by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a String if possible,
+     * but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of String.
+     */
+    List<String> getStringList(String path);
+
+    /**
+     * Gets the requested List of Integer by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Integer if
+     * possible, but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Integer.
+     */
+    List<Integer> getIntegerList(String path);
+
+    /**
+     * Gets the requested List of Boolean by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Boolean if
+     * possible, but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Boolean.
+     */
+    List<Boolean> getBooleanList(String path);
+
+    /**
+     * Gets the requested List of Double by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Double if possible,
+     * but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Double.
+     */
+    List<Double> getDoubleList(String path);
+
+    /**
+     * Gets the requested List of Float by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Float if possible,
+     * but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Float.
+     */
+    List<Float> getFloatList(String path);
+
+    /**
+     * Gets the requested List of Long by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Long if possible,
+     * but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Long.
+     */
+    List<Long> getLongList(String path);
+
+    /**
+     * Gets the requested List of Byte by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Byte if possible,
+     * but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Byte.
+     */
+    List<Byte> getByteList(String path);
+
+    /**
+     * Gets the requested List of Character by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Character if
+     * possible, but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Character.
+     */
+    List<Character> getCharacterList(String path);
+
+    /**
+     * Gets the requested List of Short by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     *
+     * <p>This method will attempt to cast any values into a Short if
+     * possible, but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Short.
+     */
+    List<Short> getShortList(String path);
+
+    /**
+     * Gets the requested List of Maps by path.
+     *
+     * <p>If the List does not exist but a default value has been specified,
+     * this will return the default value. If the List does not exist and no
+     * default value was specified, this will return an empty List.
+     * <p>This method will attempt to cast any values into a Map if possible,
+     * but may miss any values out if they are not compatible.
+     *
+     * @param path Path of the List to get.
+     * @return Requested List of Maps.
+     */
+    List<Map<?, ?>> getMapList(String path);
+
+    /**
+     * Gets the requested ConfigurationSection by path.
+     *
+     * <p>If the ConfigurationSection does not exist but a default value has
+     * been specified, this will return the default value. If the
+     * ConfigurationSection does not exist and no default value was specified,
+     * this will return {@code null}.
+     *
+     * @param path Path of the ConfigurationSection to get.
+     * @return Requested ConfigurationSection.
+     */
+    ConfigurationSection getConfigurationSection(String path);
+
+    /**
+     * Checks if the specified path is a ConfigurationSection.
+     *
+     * <p>If the path exists but is not a ConfigurationSection, this will return
+     * false. If the path does not exist, this will return false. If the path
+     * does not exist but a default value has been specified, this will check
+     * if that default value is a ConfigurationSection and return
+     * appropriately.
+     *
+     * @param path Path of the ConfigurationSection to check.
+     * @return Whether or not the specified path is a ConfigurationSection.
+     */
+    boolean isConfigurationSection(String path);
+
+    /**
+     * Gets the equivalent {@link ConfigurationSection} from the default
+     * {@link Configuration} defined in {@link #getRoot()}.
+     *
+     * <p>If the root contains no defaults, or the defaults doesn't contain a
+     * value for this path, or the value at this path is not a {@link
+     * ConfigurationSection} then this will return {@code null}.
+     *
+     * @return Equivalent section in root configuration
+     */
+    ConfigurationSection getDefaultSection();
+
+    /**
+     * Sets the default value in the root at the given path as provided.
+     *
+     * <p>If no source {@link Configuration} was provided as a default
+     * collection, then a new {@link MemoryConfiguration} will be created to
+     * hold the new default value.
+     *
+     * <p>If value is {@code null}, the value will be removed from the
+     * default Configuration source.
+     *
+     * <p>If the value as returned by {@link #getDefaultSection()} is
+     * {@code null}, then this will create a new section at the path,
+     * replacing anything that may have existed there previously.
+     *
+     * @param path  Path of the value to set
+     * @param value Value to set the default to
+     * @throws IllegalArgumentException Thrown if path is {@code null}
+     */
+    void addDefault(@Nonnull String path, Object value);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java
new file mode 100644
index 000000000..e9c099ed1
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java
@@ -0,0 +1,45 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+/**
+ * Exception thrown when attempting to load an invalid {@link Configuration}.
+ */
+@SuppressWarnings("serial") public class InvalidConfigurationException extends Exception {
+
+    /**
+     * Creates a new instance of InvalidConfigurationException without a
+     * message or cause.
+     */
+    public InvalidConfigurationException() {
+    }
+
+    /**
+     * Constructs an instance of InvalidConfigurationException with the
+     * specified message.
+     *
+     * @param msg The details of the exception.
+     */
+    public InvalidConfigurationException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Constructs an instance of InvalidConfigurationException with the
+     * specified cause.
+     *
+     * @param cause The cause of the exception.
+     */
+    public InvalidConfigurationException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs an instance of InvalidConfigurationException with the
+     * specified message and cause.
+     *
+     * @param cause The cause of the exception.
+     * @param msg   The details of the exception.
+     */
+    public InvalidConfigurationException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
new file mode 100644
index 000000000..d1677c54d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
@@ -0,0 +1,73 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+import javax.annotation.Nonnull;
+import java.util.Map;
+
+/**
+ * This is a {@link Configuration} implementation that does not save or load
+ * from any source, and stores all values in memory only.
+ * This is useful for temporary Configurations for providing defaults.
+ */
+public class MemoryConfiguration extends MemorySection implements Configuration {
+    protected Configuration defaults;
+    protected MemoryConfigurationOptions options;
+
+    /**
+     * Creates an empty {@link MemoryConfiguration} with no default values.
+     */
+    public MemoryConfiguration() {
+    }
+
+    /**
+     * Creates an empty {@link MemoryConfiguration} using the specified {@link
+     * Configuration} as a source for all default values.
+     *
+     * @param defaults Default value provider
+     * @throws IllegalArgumentException Thrown if defaults is null
+     */
+    public MemoryConfiguration(Configuration defaults) {
+        this.defaults = defaults;
+    }
+
+    @Override public void addDefault(@Nonnull String path, Object value) {
+        if (this.defaults == null) {
+            this.defaults = new MemoryConfiguration();
+        }
+
+        this.defaults.set(path, value);
+    }
+
+    @Override public void addDefaults(Map<String, Object> defaults) {
+        for (Map.Entry<String, Object> entry : defaults.entrySet()) {
+            addDefault(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override public void addDefaults(Configuration defaults) {
+        addDefaults(defaults.getValues(true));
+    }
+
+    @Override public Configuration getDefaults() {
+        return this.defaults;
+    }
+
+    @Override public void setDefaults(Configuration defaults) {
+        if (defaults == null) {
+            throw new NullPointerException("Defaults may not be null");
+        }
+
+        this.defaults = defaults;
+    }
+
+    @Override public ConfigurationSection getParent() {
+        return null;
+    }
+
+    @Override public MemoryConfigurationOptions options() {
+        if (this.options == null) {
+            this.options = new MemoryConfigurationOptions(this);
+        }
+
+        return this.options;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java
new file mode 100644
index 000000000..971ea1e70
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java
@@ -0,0 +1,25 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+/**
+ * Various settings for controlling the input and output of a {@link
+ * MemoryConfiguration}.
+ */
+public class MemoryConfigurationOptions extends ConfigurationOptions {
+    protected MemoryConfigurationOptions(MemoryConfiguration configuration) {
+        super(configuration);
+    }
+
+    @Override public MemoryConfiguration configuration() {
+        return (MemoryConfiguration) super.configuration();
+    }
+
+    @Override public MemoryConfigurationOptions copyDefaults(boolean value) {
+        super.copyDefaults(value);
+        return this;
+    }
+
+    @Override public MemoryConfigurationOptions pathSeparator(char value) {
+        super.pathSeparator(value);
+        return this;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
new file mode 100644
index 000000000..26f6760c8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
@@ -0,0 +1,771 @@
+package com.github.intellectualsites.plotsquared.configuration;
+
+import javax.annotation.Nonnull;
+import java.util.*;
+
+/**
+ * A type of {@link ConfigurationSection} that is stored in memory.
+ */
+public class MemorySection implements ConfigurationSection {
+
+    protected final Map<String, Object> map = new LinkedHashMap<>();
+    private final Configuration root;
+    private final ConfigurationSection parent;
+    private final String path;
+    private final String fullPath;
+
+    /**
+     * Creates an empty MemorySection for use as a root {@link Configuration} section.
+     *
+     * <p>Note that calling this without being yourself a {@link Configuration}
+     * will throw an exception!
+     *
+     * @throws IllegalStateException Thrown if this is not a {@link Configuration} root.
+     */
+    protected MemorySection() {
+        if (!(this instanceof Configuration)) {
+            throw new IllegalStateException(
+                "Cannot construct a root MemorySection when not a Configuration");
+        }
+
+        this.path = "";
+        this.fullPath = "";
+        this.parent = null;
+        this.root = (Configuration) this;
+    }
+
+    /**
+     * Creates an empty MemorySection with the specified parent and path.
+     *
+     * @param parent Parent section that contains this own section.
+     * @param path   Path that you may access this section from via the root {@link Configuration}.
+     * @throws IllegalArgumentException Thrown is parent or path is null, or if parent contains no
+     *                                  root Configuration.
+     */
+    protected MemorySection(ConfigurationSection parent, String path) {
+        this.path = path;
+        this.parent = parent;
+        this.root = parent.getRoot();
+
+        if (this.root == null) {
+            throw new NullPointerException("Path may not be orphaned");
+        }
+
+        this.fullPath = createPath(parent, path);
+    }
+
+    public static double toDouble(Object obj, double def) {
+        if (obj instanceof Number) {
+            return ((Number) obj).doubleValue();
+        }
+        if (obj instanceof String) {
+            try {
+                return Double.parseDouble((String) obj);
+            } catch (NumberFormatException ignored) {
+            }
+        } else if (obj instanceof List) {
+            List<?> val = (List<?>) obj;
+            if (!val.isEmpty()) {
+                return toDouble(val.get(0), def);
+            }
+        }
+        return def;
+    }
+
+    public static int toInt(Object obj, int def) {
+        if (obj instanceof Number) {
+            return ((Number) obj).intValue();
+        }
+        if (obj instanceof String) {
+            try {
+                return Integer.parseInt((String) obj);
+            } catch (NumberFormatException ignored) {
+            }
+        } else if (obj instanceof List) {
+            List<?> val = (List<?>) obj;
+            if (!val.isEmpty()) {
+                return toInt(val.get(0), def);
+            }
+        }
+        return def;
+    }
+
+    public static long toLong(Object obj, long def) {
+        if (obj instanceof Number) {
+            return ((Number) obj).longValue();
+        }
+        if (obj instanceof String) {
+            try {
+                return Long.parseLong((String) obj);
+            } catch (NumberFormatException ignored) {
+            }
+        } else if (obj instanceof List) {
+            List<?> val = (List<?>) obj;
+            if (!val.isEmpty()) {
+                return toLong(val.get(0), def);
+            }
+        }
+        return def;
+    }
+
+    /**
+     * Creates a full path to the given {@link ConfigurationSection} from its root {@link
+     * Configuration}.
+     *
+     * <p>You may use this method for any given {@link ConfigurationSection}, not
+     * only {@link MemorySection}.
+     *
+     * @param section Section to create a path for.
+     * @param key     Name of the specified section.
+     * @return Full path of the section from its root.
+     */
+    public static String createPath(ConfigurationSection section, String key) {
+        return createPath(section, key, section.getRoot());
+    }
+
+    /**
+     * Creates a relative path to the given {@link ConfigurationSection} from the given relative
+     * section.
+     *
+     * <p>You may use this method for any given {@link ConfigurationSection}, not
+     * only {@link MemorySection}.
+     *
+     * @param section    Section to create a path for.
+     * @param key        Name of the specified section.
+     * @param relativeTo Section to create the path relative to.
+     * @return Full path of the section from its root.
+     */
+    public static String createPath(ConfigurationSection section, String key,
+        ConfigurationSection relativeTo) {
+        Configuration root = section.getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot create path without a root");
+        }
+        char separator = root.options().pathSeparator();
+
+        StringBuilder builder = new StringBuilder();
+        for (ConfigurationSection parent = section;
+             (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
+            if (builder.length() > 0) {
+                builder.insert(0, separator);
+            }
+
+            builder.insert(0, parent.getName());
+        }
+
+        if ((key != null) && !key.isEmpty()) {
+            if (builder.length() > 0) {
+                builder.append(separator);
+            }
+
+            builder.append(key);
+        }
+
+        return builder.toString();
+    }
+
+    @Override public Set<String> getKeys(boolean deep) {
+        Set<String> result = new LinkedHashSet<>();
+
+        Configuration root = getRoot();
+        if ((root != null) && root.options().copyDefaults()) {
+            ConfigurationSection defaults = getDefaultSection();
+
+            if (defaults != null) {
+                result.addAll(defaults.getKeys(deep));
+            }
+        }
+
+        mapChildrenKeys(result, this, deep);
+
+        return result;
+    }
+
+    @Override public Map<String, Object> getValues(boolean deep) {
+        Map<String, Object> result = new LinkedHashMap<>();
+
+        Configuration root = getRoot();
+        if ((root != null) && root.options().copyDefaults()) {
+            ConfigurationSection defaults = getDefaultSection();
+
+            if (defaults != null) {
+                result.putAll(defaults.getValues(deep));
+            }
+        }
+
+        mapChildrenValues(result, this, deep);
+
+        return result;
+    }
+
+    @Override public boolean contains(@Nonnull String path) {
+        return get(path) != null;
+    }
+
+    @Override public boolean isSet(@Nonnull String path) {
+        Configuration root = getRoot();
+        if (root == null) {
+            return false;
+        }
+        if (root.options().copyDefaults()) {
+            return contains(path);
+        }
+        return getOrDefault(path, null) != null;
+    }
+
+    @Override public String getCurrentPath() {
+        return this.fullPath;
+    }
+
+    @Override public String getName() {
+        return this.path;
+    }
+
+    @Override public Configuration getRoot() {
+        return this.root;
+    }
+
+    @Override public ConfigurationSection getParent() {
+        return this.parent;
+    }
+
+    @Override public void addDefault(@Nonnull String path, Object value) {
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot add default without root");
+        }
+        if (root == this) {
+            throw new UnsupportedOperationException(
+                "Unsupported addDefault(String, Object) implementation");
+        }
+        root.addDefault(createPath(this, path), value);
+    }
+
+    @Override public ConfigurationSection getDefaultSection() {
+        Configuration root = getRoot();
+        Configuration defaults = root == null ? null : root.getDefaults();
+
+        if (defaults != null) {
+            if (defaults.isConfigurationSection(getCurrentPath())) {
+                return defaults.getConfigurationSection(getCurrentPath());
+            }
+        }
+
+        return null;
+    }
+
+    @Override public void set(String path, Object value) {
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot use section without a root");
+        }
+
+        char separator = root.options().pathSeparator();
+        // i1 is the leading (higher) index
+        // i2 is the trailing (lower) index
+        int i1 = -1;
+        int i2;
+        ConfigurationSection section = this;
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+            String node = path.substring(i2, i1);
+            ConfigurationSection subSection = section.getConfigurationSection(node);
+            if (subSection == null) {
+                section = section.createSection(node);
+            } else {
+                section = subSection;
+            }
+        }
+
+        String key = path.substring(i2);
+        if (section == this) {
+            if (value == null) {
+                this.map.remove(key);
+            } else {
+                this.map.put(key, value);
+            }
+        } else {
+            section.set(key, value);
+        }
+    }
+
+    @Override public Object get(String path) {
+        return getOrDefault(path, getDefault(path));
+    }
+
+    @Override public Object getOrDefault(@Nonnull String path, Object defaultValue) {
+        if (path.isEmpty()) {
+            return this;
+        }
+
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot access section without a root");
+        }
+
+        char separator = root.options().pathSeparator();
+        // i1 is the leading (higher) index
+        // i2 is the trailing (lower) index
+        int i1 = -1;
+        int i2;
+        ConfigurationSection section = this;
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+            section = section.getConfigurationSection(path.substring(i2, i1));
+            if (section == null) {
+                return defaultValue;
+            }
+        }
+
+        String key = path.substring(i2);
+        if (section == this) {
+            Object result = this.map.get(key);
+            if (result == null) {
+                return defaultValue;
+            } else {
+                return result;
+            }
+        }
+        return section.getOrDefault(key, defaultValue);
+    }
+
+    @Override public ConfigurationSection createSection(String path) {
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot create section without a root");
+        }
+
+        char separator = root.options().pathSeparator();
+        // i1 is the leading (higher) index
+        // i2 is the trailing (lower) index
+        int i1 = -1;
+        int i2;
+        ConfigurationSection section = this;
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+            String node = path.substring(i2, i1);
+            ConfigurationSection subSection = section.getConfigurationSection(node);
+            if (subSection == null) {
+                section = section.createSection(node);
+            } else {
+                section = subSection;
+            }
+        }
+
+        String key = path.substring(i2);
+        if (section == this) {
+            ConfigurationSection result = new MemorySection(this, key);
+            this.map.put(key, result);
+            return result;
+        }
+        return section.createSection(key);
+    }
+
+    @Override public ConfigurationSection createSection(String path, Map<?, ?> map) {
+        ConfigurationSection section = createSection(path);
+
+        for (Map.Entry<?, ?> entry : map.entrySet()) {
+            if (entry.getValue() instanceof Map) {
+                section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
+            } else {
+                section.set(entry.getKey().toString(), entry.getValue());
+            }
+        }
+
+        return section;
+    }
+
+    // Primitives
+    @Override public String getString(String path) {
+        Object def = getDefault(path);
+        return getString(path, def != null ? def.toString() : null);
+    }
+
+    @Override public String getString(String path, String def) {
+        Object val = getOrDefault(path, def);
+        if (val != null) {
+            return val.toString();
+        } else {
+            return def;
+        }
+    }
+
+    @Override public boolean isString(String path) {
+        Object val = get(path);
+        return val instanceof String;
+    }
+
+    @Override public int getInt(String path) {
+        Object def = getDefault(path);
+        return getInt(path, toInt(def, 0));
+    }
+
+    @Override public int getInt(String path, int def) {
+        Object val = getOrDefault(path, def);
+        return toInt(val, def);
+    }
+
+    @Override public boolean isInt(String path) {
+        Object val = get(path);
+        return val instanceof Integer;
+    }
+
+    @Override public boolean getBoolean(String path) {
+        Object def = getDefault(path);
+        if (def instanceof Boolean) {
+            return getBoolean(path, (Boolean) def);
+        } else {
+            return getBoolean(path, false);
+        }
+    }
+
+    @Override public boolean getBoolean(String path, boolean defaultValue) {
+        Object val = getOrDefault(path, defaultValue);
+        if (val instanceof Boolean) {
+            return (Boolean) val;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    @Override public boolean isBoolean(String path) {
+        Object val = get(path);
+        return val instanceof Boolean;
+    }
+
+    @Override public double getDouble(String path) {
+        Object def = getDefault(path);
+        return getDouble(path, toDouble(def, 0));
+    }
+
+    @Override public double getDouble(String path, double defaultValue) {
+        Object val = getOrDefault(path, defaultValue);
+        return toDouble(val, defaultValue);
+    }
+
+    @Override public boolean isDouble(String path) {
+        Object val = get(path);
+        return val instanceof Double;
+    }
+
+    @Override public long getLong(String path) {
+        Object def = getDefault(path);
+        return getLong(path, toLong(def, 0));
+    }
+
+    @Override public long getLong(String path, long def) {
+        Object val = getOrDefault(path, def);
+        return toLong(val, def);
+    }
+
+    @Override public boolean isLong(String path) {
+        Object val = get(path);
+        return val instanceof Long;
+    }
+
+    // Java
+    @Override public List<?> getList(String path) {
+        Object def = getDefault(path);
+        return getList(path, def instanceof List ? (List<?>) def : null);
+    }
+
+    @Override public List<?> getList(String path, List<?> def) {
+        Object val = getOrDefault(path, def);
+        return (List<?>) ((val instanceof List) ? val : def);
+    }
+
+    @Override public boolean isList(String path) {
+        Object val = get(path);
+        return val instanceof List;
+    }
+
+    @Override public List<String> getStringList(String path) {
+        List<?> list = getList(path);
+
+        if (list == null) {
+            return new ArrayList<>(0);
+        }
+
+        List<String> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if ((object instanceof String) || isPrimitiveWrapper(object)) {
+                result.add(String.valueOf(object));
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Integer> getIntegerList(String path) {
+        List<?> list = getList(path);
+
+        List<Integer> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Integer) {
+                result.add((Integer) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Integer.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((int) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).intValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Boolean> getBooleanList(String path) {
+        List<?> list = getList(path);
+
+        List<Boolean> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Boolean) {
+                result.add((Boolean) object);
+            } else if (object instanceof String) {
+                if (Boolean.TRUE.toString().equals(object)) {
+                    result.add(true);
+                } else if (Boolean.FALSE.toString().equals(object)) {
+                    result.add(false);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Double> getDoubleList(String path) {
+        List<?> list = getList(path);
+
+        List<Double> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Double) {
+                result.add((Double) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Double.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((double) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).doubleValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Float> getFloatList(String path) {
+        List<?> list = getList(path);
+
+        List<Float> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Float) {
+                result.add((Float) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Float.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((float) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).floatValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Long> getLongList(String path) {
+        List<?> list = getList(path);
+
+        List<Long> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Long) {
+                result.add((Long) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Long.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((long) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).longValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Byte> getByteList(String path) {
+        List<?> list = getList(path);
+
+        List<Byte> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Byte) {
+                result.add((Byte) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Byte.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((byte) ((Character) object).charValue());
+            } else if (object instanceof Number) {
+                result.add(((Number) object).byteValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Character> getCharacterList(String path) {
+        List<?> list = getList(path);
+
+        List<Character> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Character) {
+                result.add((Character) object);
+            } else if (object instanceof String) {
+                String str = (String) object;
+
+                if (str.length() == 1) {
+                    result.add(str.charAt(0));
+                }
+            } else if (object instanceof Number) {
+                result.add((char) ((Number) object).intValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Short> getShortList(String path) {
+        List<?> list = getList(path);
+
+        List<Short> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Short) {
+                result.add((Short) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Short.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((short) ((Character) object).charValue());
+            } else if (object instanceof Number) {
+                result.add(((Number) object).shortValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Map<?, ?>> getMapList(String path) {
+        List<?> list = getList(path);
+        List<Map<?, ?>> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Map) {
+                result.add((Map<?, ?>) object);
+            }
+        }
+
+        return result;
+    }
+
+    @Override public ConfigurationSection getConfigurationSection(String path) {
+        Object val = getOrDefault(path, null);
+        if (val != null) {
+            return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
+        }
+
+        val = getOrDefault(path, getDefault(path));
+        return (val instanceof ConfigurationSection) ? createSection(path) : null;
+    }
+
+    @Override public boolean isConfigurationSection(String path) {
+        Object val = get(path);
+        return val instanceof ConfigurationSection;
+    }
+
+    protected boolean isPrimitiveWrapper(Object input) {
+        return (input instanceof Integer) || (input instanceof Boolean)
+            || (input instanceof Character) || (input instanceof Byte) || (input instanceof Short)
+            || (input instanceof Double) || (input instanceof Long) || (input instanceof Float);
+    }
+
+    protected Object getDefault(String path) {
+        Configuration root = getRoot();
+        Configuration defaults = root == null ? null : root.getDefaults();
+        return (defaults == null) ? null : defaults.get(createPath(this, path));
+    }
+
+    protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
+        if (section instanceof MemorySection) {
+            MemorySection sec = (MemorySection) section;
+
+            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+                output.add(createPath(section, entry.getKey(), this));
+
+                if (deep && (entry.getValue() instanceof ConfigurationSection)) {
+                    ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
+                    mapChildrenKeys(output, subsection, deep);
+                }
+            }
+        } else {
+            Set<String> keys = section.getKeys(deep);
+
+            for (String key : keys) {
+                output.add(createPath(section, key, this));
+            }
+        }
+    }
+
+    protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section,
+        boolean deep) {
+        if (section instanceof MemorySection) {
+            MemorySection sec = (MemorySection) section;
+
+            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+                output.put(createPath(section, entry.getKey(), this), entry.getValue());
+
+                if (entry.getValue() instanceof ConfigurationSection) {
+                    if (deep) {
+                        mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
+                    }
+                }
+            }
+        } else {
+            Map<String, Object> values = section.getValues(deep);
+
+            for (Map.Entry<String, Object> entry : values.entrySet()) {
+                output.put(createPath(section, entry.getKey(), this), entry.getValue());
+            }
+        }
+    }
+
+    @Override public String toString() {
+        Configuration root = getRoot();
+        if (root == null) {
+            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + null
+                + "']";
+        } else {
+            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + root
+                .getClass().getSimpleName() + "']";
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
new file mode 100644
index 000000000..bc0b375e9
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
@@ -0,0 +1,158 @@
+package com.github.intellectualsites.plotsquared.configuration.file;
+
+import com.github.intellectualsites.plotsquared.configuration.Configuration;
+import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
+import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration;
+
+import javax.annotation.Nonnull;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * This is a base class for all File based implementations of {@link
+ * Configuration}.
+ */
+public abstract class FileConfiguration extends MemoryConfiguration {
+
+    /**
+     * Creates an empty {@link FileConfiguration} with no default values.
+     */
+    FileConfiguration() {
+    }
+
+    /**
+     * Creates an empty {@link FileConfiguration} using the specified {@link
+     * Configuration} as a source for all default values.
+     *
+     * @param defaults Default value provider
+     */
+    public FileConfiguration(Configuration defaults) {
+        super(defaults);
+    }
+
+    /**
+     * Saves this {@link FileConfiguration} to the specified location.
+     *
+     * <p>If the file does not exist, it will be created. If already exists, it
+     * will be overwritten. If it cannot be overwritten or created, an
+     * exception will be thrown.
+     *
+     * <p>This method will save using the system default encoding, or possibly
+     * using UTF8.
+     *
+     * @param file File to save to.
+     * @throws IOException Thrown when the given file cannot be written to for
+     *                     any reason.
+     */
+    public void save(File file) throws IOException {
+        File parent = file.getParentFile();
+        if (parent != null) {
+            parent.mkdirs();
+        }
+
+        String data = saveToString();
+
+        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file),
+            StandardCharsets.UTF_8)) {
+            writer.write(data);
+        }
+    }
+
+    /**
+     * Saves this {@link FileConfiguration} to a string, and returns it.
+     *
+     * @return String containing this configuration.
+     */
+    public abstract String saveToString();
+
+    /**
+     * Loads this {@link FileConfiguration} from the specified location.
+     *
+     * <p>All the values contained within this configuration will be removed,
+     * leaving only settings and defaults, and the new values will be loaded
+     * from the given file.
+     *
+     * <p>If the file cannot be loaded for any reason, an exception will be
+     * thrown.
+     *
+     * @param file File to load from.
+     * @throws FileNotFoundException         Thrown when the given file cannot be
+     *                                       opened.
+     * @throws IOException                   Thrown when the given file cannot be read.
+     * @throws InvalidConfigurationException Thrown when the given file is not
+     *                                       a valid Configuration.
+     * @throws IllegalArgumentException      Thrown when file is null.
+     */
+    public void load(@Nonnull File file) throws IOException, InvalidConfigurationException {
+
+        FileInputStream stream = new FileInputStream(file);
+
+        load(new InputStreamReader(stream, StandardCharsets.UTF_8));
+    }
+
+    /**
+     * Loads this {@link FileConfiguration} from the specified reader.
+     *
+     * <p>All the values contained within this configuration will be removed,
+     * leaving only settings and defaults, and the new values will be loaded
+     * from the given stream.
+     *
+     * @param reader the reader to load from
+     * @throws IOException                   thrown when underlying reader throws an IOException
+     * @throws InvalidConfigurationException thrown when the reader does not
+     *                                       represent a valid Configuration
+     */
+    public void load(Reader reader) throws IOException, InvalidConfigurationException {
+
+        StringBuilder builder = new StringBuilder();
+
+        try (BufferedReader input = reader instanceof BufferedReader ?
+            (BufferedReader) reader :
+            new BufferedReader(reader)) {
+            String line;
+
+            while ((line = input.readLine()) != null) {
+                builder.append(line);
+                builder.append('\n');
+            }
+        }
+
+        loadFromString(builder.toString());
+    }
+
+    /**
+     * Loads this {@link FileConfiguration} from the specified string, as
+     * opposed to from file.
+     *
+     * <p>All the values contained within this configuration will be removed,
+     * leaving only settings and defaults, and the new values will be loaded
+     * from the given string.
+     *
+     * <p>If the string is invalid in any way, an exception will be thrown.
+     *
+     * @param contents Contents of a Configuration to load.
+     * @throws InvalidConfigurationException Thrown if the specified string is
+     *                                       invalid.
+     */
+    public abstract void loadFromString(String contents) throws InvalidConfigurationException;
+
+    /**
+     * Compiles the header for this {@link FileConfiguration} and returns the
+     * result.
+     *
+     * <p>This will use the header from {@link #options()} -> {@link
+     * FileConfigurationOptions#header()}, respecting the rules of {@link
+     * FileConfigurationOptions#copyHeader()} if set.
+     *
+     * @return Compiled header
+     */
+    protected abstract String buildHeader();
+
+    @Override public FileConfigurationOptions options() {
+        if (this.options == null) {
+            this.options = new FileConfigurationOptions(this);
+        }
+
+        return (FileConfigurationOptions) this.options;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java
new file mode 100644
index 000000000..a216d0566
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java
@@ -0,0 +1,115 @@
+package com.github.intellectualsites.plotsquared.configuration.file;
+
+import com.github.intellectualsites.plotsquared.configuration.Configuration;
+import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration;
+import com.github.intellectualsites.plotsquared.configuration.MemoryConfigurationOptions;
+
+/**
+ * Various settings for controlling the input and output of a {@link
+ * FileConfiguration}.
+ */
+public class FileConfigurationOptions extends MemoryConfigurationOptions {
+    private String header = null;
+    private boolean copyHeader = true;
+
+    protected FileConfigurationOptions(MemoryConfiguration configuration) {
+        super(configuration);
+    }
+
+    @Override public FileConfiguration configuration() {
+        return (FileConfiguration) super.configuration();
+    }
+
+    @Override public FileConfigurationOptions copyDefaults(boolean value) {
+        super.copyDefaults(value);
+        return this;
+    }
+
+    @Override public FileConfigurationOptions pathSeparator(char value) {
+        super.pathSeparator(value);
+        return this;
+    }
+
+    /**
+     * Gets the header that will be applied to the top of the saved output.
+     *
+     * <p>This header will be commented out and applied directly at the top of
+     * the generated output of the {@link FileConfiguration}. It is not
+     * required to include a newline at the end of the header as it will
+     * automatically be applied, but you may include one if you wish for extra
+     * spacing.
+     *
+     * <p>{@code null} is a valid value which will indicate that no header]
+     * is to be applied. The default value is {@code null}.
+     *
+     * @return Header
+     */
+    public String header() {
+        return header;
+    }
+
+    /**
+     * Sets the header that will be applied to the top of the saved output.
+     *
+     * <p>This header will be commented out and applied directly at the top of
+     * the generated output of the {@link FileConfiguration}. It is not
+     * required to include a newline at the end of the header as it will
+     * automatically be applied, but you may include one if you wish for extra
+     * spacing.
+     *
+     * <p>{@code null} is a valid value which will indicate that no header
+     * is to be applied.
+     *
+     * @param value New header
+     * @return This object, for chaining
+     */
+    public FileConfigurationOptions header(String value) {
+        header = value;
+        return this;
+    }
+
+    /**
+     * Gets whether or not the header should be copied from a default source.
+     *
+     * <p>If this is true, if a default {@link FileConfiguration} is passed to
+     * {@link FileConfiguration#setDefaults(Configuration)}
+     * then upon saving it will use the header from that config, instead of
+     * the one provided here.
+     *
+     * <p>If no default is set on the configuration, or the default is not of
+     * type FileConfiguration, or that config has no header ({@link #header()}
+     * returns null) then the header specified in this configuration will be
+     * used.
+     *
+     * <p>Defaults to true.
+     *
+     * @return Whether or not to copy the header
+     */
+    public boolean copyHeader() {
+        return copyHeader;
+    }
+
+    /**
+     * Sets whether or not the header should be copied from a default source.
+     *
+     * <p>If this is true, if a default {@link FileConfiguration} is passed to
+     * {@link FileConfiguration#setDefaults(Configuration)}
+     * then upon saving it will use the header from that config, instead of
+     * the one provided here.
+     *
+     * <p>If no default is set on the configuration, or the default is not of
+     * type FileConfiguration, or that config has no header ({@link #header()}
+     * returns null) then the header specified in this configuration will be
+     * used.
+     *
+     * <p>Defaults to true.
+     *
+     * @param value Whether or not to copy the header
+     * @return This object, for chaining
+     */
+    public FileConfigurationOptions copyHeader(boolean value) {
+        copyHeader = value;
+
+        return this;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
new file mode 100644
index 000000000..1e694f05a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
@@ -0,0 +1,189 @@
+package com.github.intellectualsites.plotsquared.configuration.file;
+
+import com.github.intellectualsites.plotsquared.configuration.Configuration;
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.representer.Representer;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.Map;
+
+/**
+ * An implementation of {@link Configuration} which saves all files in Yaml.
+ * Note that this implementation is not synchronized.
+ */
+public class YamlConfiguration extends FileConfiguration {
+    private static final String COMMENT_PREFIX = "# ";
+    private static final String BLANK_CONFIG = "{}\n";
+    private final DumperOptions yamlOptions = new DumperOptions();
+    private final Representer yamlRepresenter = new YamlRepresenter();
+    private final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions);
+
+    /**
+     * Creates a new {@link YamlConfiguration}, loading from the given file.
+     *
+     * <p>Any errors loading the Configuration will be logged and then ignored.
+     * If the specified input is not a valid config, a blank config will be
+     * returned.
+     *
+     * <p>The encoding used may follow the system dependent default.
+     *
+     * @param file Input file
+     * @return Resulting configuration
+     */
+    public static YamlConfiguration loadConfiguration(File file) {
+        YamlConfiguration config = new YamlConfiguration();
+
+        try {
+            config.load(file);
+        } catch (InvalidConfigurationException | IOException ex) {
+            try {
+                File dest = new File(file.getAbsolutePath() + "_broken");
+                int i = 0;
+                while (dest.exists()) {
+                    dest = new File(file.getAbsolutePath() + "_broken_" + i++);
+                }
+                Files.copy(file.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
+                PlotSquared.debug("&dCould not read: &7" + file);
+                PlotSquared.debug("&dRenamed to: &7" + dest.getName());
+                PlotSquared.debug("&c============ Full stacktrace ============");
+                ex.printStackTrace();
+                PlotSquared.debug("&c=========================================");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return config;
+    }
+
+    @Override public String saveToString() {
+        yamlOptions.setIndent(options().indent());
+        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+        yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+
+        String header = buildHeader();
+        String dump = yaml.dump(getValues(false));
+
+        if (dump.equals(BLANK_CONFIG)) {
+            dump = "";
+        }
+
+        return header + dump;
+    }
+
+    @Override public void loadFromString(String contents) throws InvalidConfigurationException {
+
+        Map<?, ?> input;
+        try {
+            input = yaml.load(contents);
+        } catch (YAMLException e) {
+            throw new InvalidConfigurationException(e);
+        } catch (ClassCastException ignored) {
+            throw new InvalidConfigurationException("Top level is not a Map.");
+        }
+
+        String header = parseHeader(contents);
+        if (!header.isEmpty()) {
+            options().header(header);
+        }
+
+        if (input != null) {
+            convertMapsToSections(input, this);
+        }
+    }
+
+    protected void convertMapsToSections(Map<?, ?> input, ConfigurationSection section) {
+        for (Map.Entry<?, ?> entry : input.entrySet()) {
+            String key = entry.getKey().toString();
+            Object value = entry.getValue();
+
+            if (value instanceof Map) {
+                convertMapsToSections((Map<?, ?>) value, section.createSection(key));
+            } else {
+                section.set(key, value);
+            }
+        }
+    }
+
+    protected String parseHeader(String input) {
+        String[] lines = input.split("\r?\n", -1);
+        StringBuilder result = new StringBuilder();
+        boolean readingHeader = true;
+        boolean foundHeader = false;
+
+        for (int i = 0; (i < lines.length) && readingHeader; i++) {
+            String line = lines[i];
+
+            if (line.startsWith(COMMENT_PREFIX)) {
+                if (i > 0) {
+                    result.append('\n');
+                }
+
+                if (line.length() > COMMENT_PREFIX.length()) {
+                    result.append(line.substring(COMMENT_PREFIX.length()));
+                }
+
+                foundHeader = true;
+            } else if (foundHeader && line.isEmpty()) {
+                result.append('\n');
+            } else if (foundHeader) {
+                readingHeader = false;
+            }
+        }
+
+        return result.toString();
+    }
+
+    @Override protected String buildHeader() {
+        String header = options().header();
+
+        if (options().copyHeader()) {
+            Configuration def = getDefaults();
+
+            if (def instanceof FileConfiguration) {
+                FileConfiguration fileDefaults = (FileConfiguration) def;
+                String defaultsHeader = fileDefaults.buildHeader();
+
+                if ((defaultsHeader != null) && !defaultsHeader.isEmpty()) {
+                    return defaultsHeader;
+                }
+            }
+        }
+
+        if (header == null) {
+            return "";
+        }
+
+        StringBuilder builder = new StringBuilder();
+        String[] lines = header.split("\r?\n", -1);
+        boolean startedHeader = false;
+
+        for (int i = lines.length - 1; i >= 0; i--) {
+            builder.insert(0, '\n');
+
+            if (startedHeader || !lines[i].isEmpty()) {
+                builder.insert(0, lines[i]);
+                builder.insert(0, COMMENT_PREFIX);
+                startedHeader = true;
+            }
+        }
+
+        return builder.toString();
+    }
+
+    @Override public YamlConfigurationOptions options() {
+        if (options == null) {
+            options = new YamlConfigurationOptions(this);
+        }
+
+        return (YamlConfigurationOptions) options;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
new file mode 100644
index 000000000..730527652
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
@@ -0,0 +1,68 @@
+package com.github.intellectualsites.plotsquared.configuration.file;
+
+/**
+ * Various settings for controlling the input and output of a {@link
+ * YamlConfiguration}.
+ */
+public class YamlConfigurationOptions extends FileConfigurationOptions {
+    private int indent = 2;
+
+    YamlConfigurationOptions(YamlConfiguration configuration) {
+        super(configuration);
+    }
+
+    @Override public YamlConfiguration configuration() {
+        return (YamlConfiguration) super.configuration();
+    }
+
+    @Override public YamlConfigurationOptions copyDefaults(boolean value) {
+        super.copyDefaults(value);
+        return this;
+    }
+
+    @Override public YamlConfigurationOptions pathSeparator(char value) {
+        super.pathSeparator(value);
+        return this;
+    }
+
+    @Override public YamlConfigurationOptions header(String value) {
+        super.header(value);
+        return this;
+    }
+
+    @Override public YamlConfigurationOptions copyHeader(boolean value) {
+        super.copyHeader(value);
+        return this;
+    }
+
+    /**
+     * Gets how much spaces should be used to indent each line.
+     *
+     * <p>The minimum value this may be is 2, and the maximum is 9.
+     *
+     * @return How much to indent by
+     */
+    int indent() {
+        return indent;
+    }
+
+    /**
+     * Sets how much spaces should be used to indent each line.
+     *
+     * <p>The minimum value this may be is 2, and the maximum is 9.
+     *
+     * @param value New indent
+     * @return This object, for chaining
+     */
+    public YamlConfigurationOptions indent(int value) {
+        if (value < 2) {
+            throw new IllegalArgumentException("Indent must be at least 2 characters");
+        }
+        if (value > 9) {
+            throw new IllegalArgumentException("Indent cannot be greater than 9 characters");
+        }
+
+        indent = value;
+        return this;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
new file mode 100644
index 000000000..cdc5eb821
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
@@ -0,0 +1,46 @@
+package com.github.intellectualsites.plotsquared.configuration.file;
+
+import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
+import org.yaml.snakeyaml.error.YAMLException;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.nodes.Tag;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+class YamlConstructor extends SafeConstructor {
+
+    YamlConstructor() {
+        yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
+    }
+
+    private class ConstructCustomObject extends ConstructYamlMap {
+        @Override public Object construct(final Node node) {
+            if (node.isTwoStepsConstruction()) {
+                throw new YAMLException("Unexpected referential mapping structure. Node: " + node);
+            }
+
+            final Map<?, ?> raw = (Map<?, ?>) super.construct(node);
+
+            if (raw.containsKey(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) {
+                final Map<String, Object> typed = new LinkedHashMap<>(raw.size());
+                for (final Map.Entry<?, ?> entry : raw.entrySet()) {
+                    typed.put(entry.getKey().toString(), entry.getValue());
+                }
+
+                try {
+                    return ConfigurationSerialization.deserializeObject(typed);
+                } catch (final IllegalArgumentException ex) {
+                    throw new YAMLException("Could not deserialize object", ex);
+                }
+            }
+
+            return raw;
+        }
+
+        @Override public void construct2ndStep(final Node node, final Object object) {
+            throw new YAMLException("Unexpected referential mapping structure. Node: " + node);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java
new file mode 100644
index 000000000..ebe1aebee
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java
@@ -0,0 +1,40 @@
+package com.github.intellectualsites.plotsquared.configuration.file;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
+import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.representer.Representer;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+class YamlRepresenter extends Representer {
+
+    YamlRepresenter() {
+        this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
+        this.multiRepresenters
+            .put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
+    }
+
+    private class RepresentConfigurationSection extends RepresentMap {
+
+        @Override public Node representData(Object data) {
+            return super.representData(((ConfigurationSection) data).getValues(false));
+        }
+    }
+
+
+    private class RepresentConfigurationSerializable extends RepresentMap {
+
+        @Override public Node representData(Object data) {
+            ConfigurationSerializable serializable = (ConfigurationSerializable) data;
+            Map<String, Object> values = new LinkedHashMap<>();
+            values.put(ConfigurationSerialization.SERIALIZED_TYPE_KEY,
+                ConfigurationSerialization.getAlias(serializable.getClass()));
+            values.putAll(serializable.serialize());
+
+            return super.representData(values);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java
new file mode 100644
index 000000000..f83e7a468
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java
@@ -0,0 +1,34 @@
+package com.github.intellectualsites.plotsquared.configuration.serialization;
+
+import java.util.Map;
+
+/**
+ * Represents an object that may be serialized.
+ * <p>These objects MUST implement one of the following, in addition to
+ * the methods as defined by this interface:
+ * <ul>
+ * <li>A static method "deserialize" that accepts a single {@link Map}&lt;
+ * {@link String}, {@link Object}> and returns the class.</li>
+ * <li>A static method "valueOf" that accepts a single {@link Map}&lt;{@link
+ * String}, {@link Object}> and returns the class.</li>
+ * <li>A constructor that accepts a single {@link Map}&lt;{@link String},
+ * {@link Object}>.</li>
+ * </ul>
+ * In addition to implementing this interface, you must register the class
+ * with {@link ConfigurationSerialization#registerClass(Class)}.
+ *
+ * @see DelegateDeserialization
+ * @see SerializableAs
+ */
+public interface ConfigurationSerializable {
+
+    /**
+     * Creates a Map representation of this class.
+     *
+     * <p>This class must provide a method to restore this class, as defined in
+     * the {@link ConfigurationSerializable} interface javadoc.
+     *
+     * @return Map containing the current state of this class
+     */
+    Map<String, Object> serialize();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
new file mode 100644
index 000000000..0783b4af5
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
@@ -0,0 +1,262 @@
+package com.github.intellectualsites.plotsquared.configuration.serialization;
+
+import com.github.intellectualsites.plotsquared.configuration.Configuration;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utility class for storing and retrieving classes for {@link Configuration}.
+ */
+public class ConfigurationSerialization {
+
+    public static final String SERIALIZED_TYPE_KEY = "==";
+    private static final Map<String, Class<? extends ConfigurationSerializable>> aliases =
+        new HashMap<>();
+    private final Class<? extends ConfigurationSerializable> clazz;
+
+    protected ConfigurationSerialization(Class<? extends ConfigurationSerializable> clazz) {
+        this.clazz = clazz;
+    }
+
+    /**
+     * Attempts to deserialize the given arguments into a new instance of the
+     * given class.
+     * <p>
+     * <p>The class must implement {@link ConfigurationSerializable}, including
+     * the extra methods as specified in the javadoc of
+     * ConfigurationSerializable.</p>
+     * <p>
+     * <p>If a new instance could not be made, an example being the class not
+     * fully implementing the interface, null will be returned.</p>
+     *
+     * @param args  Arguments for deserialization
+     * @param clazz Class to deserialize into
+     * @return New instance of the specified class
+     */
+    public static ConfigurationSerializable deserializeObject(Map<String, ?> args,
+        Class<? extends ConfigurationSerializable> clazz) {
+        return new ConfigurationSerialization(clazz).deserialize(args);
+    }
+
+    /**
+     * Attempts to deserialize the given arguments into a new instance of the
+     * <p>
+     * given class.
+     * <p>
+     * The class must implement {@link ConfigurationSerializable}, including
+     * the extra methods as specified in the javadoc of
+     * ConfigurationSerializable.</p>
+     * <p>
+     * <p>
+     * If a new instance could not be made, an example being the class not
+     * fully implementing the interface, null will be returned.</p>
+     *
+     * @param args Arguments for deserialization
+     * @return New instance of the specified class
+     */
+    public static ConfigurationSerializable deserializeObject(Map<String, ?> args) {
+        Class<? extends ConfigurationSerializable> clazz = null;
+
+        if (args.containsKey(SERIALIZED_TYPE_KEY)) {
+            try {
+                String alias = (String) args.get(SERIALIZED_TYPE_KEY);
+
+                if (alias == null) {
+                    throw new IllegalArgumentException("Cannot have null alias");
+                }
+                clazz = getClassByAlias(alias);
+                if (clazz == null) {
+                    throw new IllegalArgumentException(
+                        "Specified class does not exist ('" + alias + "')");
+                }
+            } catch (ClassCastException ex) {
+                ex.fillInStackTrace();
+                throw ex;
+            }
+        } else {
+            throw new IllegalArgumentException(
+                "Args doesn't contain type key ('" + SERIALIZED_TYPE_KEY + "')");
+        }
+
+        return new ConfigurationSerialization(clazz).deserialize(args);
+    }
+
+    /**
+     * Registers the given {@link ConfigurationSerializable} class by its
+     * alias.
+     *
+     * @param clazz Class to register
+     */
+    public static void registerClass(Class<? extends ConfigurationSerializable> clazz) {
+        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
+
+        if (delegate == null) {
+            registerClass(clazz, getAlias(clazz));
+            registerClass(clazz, clazz.getName());
+        }
+    }
+
+    /**
+     * Registers the given alias to the specified {@link
+     * ConfigurationSerializable} class.
+     *
+     * @param clazz Class to register
+     * @param alias Alias to register as
+     * @see SerializableAs
+     */
+    public static void registerClass(Class<? extends ConfigurationSerializable> clazz,
+        String alias) {
+        aliases.put(alias, clazz);
+    }
+
+    /**
+     * Unregisters the specified alias to a {@link ConfigurationSerializable}
+     *
+     * @param alias Alias to unregister
+     */
+    public static void unregisterClass(String alias) {
+        aliases.remove(alias);
+    }
+
+    /**
+     * Unregisters any aliases for the specified {@link
+     * ConfigurationSerializable} class.
+     *
+     * @param clazz Class to unregister
+     */
+    public static void unregisterClass(Class<? extends ConfigurationSerializable> clazz) {
+        while (aliases.values().remove(clazz)) {
+        }
+    }
+
+    /**
+     * Attempts to get a registered {@link ConfigurationSerializable} class by
+     * its alias.
+     *
+     * @param alias Alias of the serializable
+     * @return Registered class, or null if not found
+     */
+    public static Class<? extends ConfigurationSerializable> getClassByAlias(String alias) {
+        return aliases.get(alias);
+    }
+
+    /**
+     * Gets the correct alias for the given {@link ConfigurationSerializable}
+     * class.
+     *
+     * @param clazz Class to get alias for
+     * @return Alias to use for the class
+     */
+    public static String getAlias(Class<? extends ConfigurationSerializable> clazz) {
+        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
+
+        if (delegate != null) {
+            if (delegate.value() == clazz) {
+                delegate = null;
+            } else {
+                return getAlias(delegate.value());
+            }
+        }
+
+        SerializableAs alias = clazz.getAnnotation(SerializableAs.class);
+
+        if (alias != null) {
+            return alias.value();
+        }
+
+        return clazz.getName();
+    }
+
+    protected Method getMethod(String name, boolean isStatic) {
+        try {
+            Method method = this.clazz.getDeclaredMethod(name, Map.class);
+
+            if (!ConfigurationSerializable.class.isAssignableFrom(method.getReturnType())) {
+                return null;
+            }
+            if (Modifier.isStatic(method.getModifiers()) != isStatic) {
+                return null;
+            }
+
+            return method;
+        } catch (NoSuchMethodException | SecurityException ignored) {
+            return null;
+        }
+    }
+
+    protected Constructor<? extends ConfigurationSerializable> getConstructor() {
+        try {
+            return this.clazz.getConstructor(Map.class);
+        } catch (NoSuchMethodException | SecurityException ignored) {
+            return null;
+        }
+    }
+
+    protected ConfigurationSerializable deserializeViaMethod(Method method, Map<String, ?> args) {
+        try {
+            ConfigurationSerializable result =
+                (ConfigurationSerializable) method.invoke(null, args);
+
+            if (result == null) {
+                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                    "Could not call method '" + method.toString() + "' of " + this.clazz
+                        + " for deserialization: method returned null");
+            } else {
+                return result;
+            }
+        } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ex) {
+            Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                "Could not call method '" + method.toString() + "' of " + this.clazz
+                    + " for deserialization",
+                ex instanceof InvocationTargetException ? ex.getCause() : ex);
+        }
+
+        return null;
+    }
+
+    protected ConfigurationSerializable deserializeViaCtor(
+        Constructor<? extends ConfigurationSerializable> ctor, Map<String, ?> args) {
+        try {
+            return ctor.newInstance(args);
+        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | InstantiationException ex) {
+            Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                "Could not call constructor '" + ctor.toString() + "' of " + this.clazz
+                    + " for deserialization",
+                ex instanceof InvocationTargetException ? ex.getCause() : ex);
+        }
+
+        return null;
+    }
+
+    public ConfigurationSerializable deserialize(Map<String, ?> args) {
+        if (args == null) {
+            throw new NullPointerException("Args must not be null");
+        }
+        ConfigurationSerializable result = null;
+        Method method = getMethod("deserialize", true);
+        if (method != null) {
+            result = deserializeViaMethod(method, args);
+        }
+        if (result == null) {
+            method = getMethod("valueOf", true);
+            if (method != null) {
+                result = deserializeViaMethod(method, args);
+            }
+        }
+        if (result == null) {
+            Constructor<? extends ConfigurationSerializable> constructor = getConstructor();
+            if (constructor != null) {
+                result = deserializeViaCtor(constructor, args);
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java
new file mode 100644
index 000000000..8a071cb2e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java
@@ -0,0 +1,21 @@
+package com.github.intellectualsites.plotsquared.configuration.serialization;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Applies to a {@link ConfigurationSerializable} that will delegate all
+ * deserialization to another {@link ConfigurationSerializable}.
+ */
+@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
+public @interface DelegateDeserialization {
+    /**
+     * Which class should be used as a delegate for this classes
+     * deserialization
+     *
+     * @return Delegate class
+     */
+    Class<? extends ConfigurationSerializable> value();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java
new file mode 100644
index 000000000..79b50998c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java
@@ -0,0 +1,32 @@
+package com.github.intellectualsites.plotsquared.configuration.serialization;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Represents an "alias" that a {@link ConfigurationSerializable} may be
+ * stored as.
+ * If this is not present on a {@link ConfigurationSerializable} class, it
+ * will use the fully qualified name of the class.
+ * <p>
+ * This value will be stored in the configuration so that the configuration
+ * deserialization can determine what type it is.
+ * <p>
+ * Using this annotation on any other class than a {@link
+ * ConfigurationSerializable} will have no effect.
+ *
+ * @see ConfigurationSerialization#registerClass(Class, String)
+ */
+@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface SerializableAs {
+    /**
+     * This is the name your class will be stored and retrieved as.
+     * <p>
+     * This name MUST be unique. We recommend using names such as
+     * "MyPluginThing" instead of "Thing".
+     *
+     * @return Name to serialize the class as.
+     */
+    String value();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java
new file mode 100644
index 000000000..62ee01329
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java
@@ -0,0 +1,815 @@
+package com.github.intellectualsites.plotsquared.json;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+
+/**
+ * A JSONArray is an ordered sequence of values. Its external text form is a string wrapped in square brackets with
+ * commas separating the values. The internal form is an object having {@code get} and {@code opt} methods for
+ * accessing the values by index, and {@code put} methods for adding or replacing values. The values can be any of
+ * these types: {@code Boolean}, {@code JSONArray}, {@code JSONObject}, {@code Number},
+ * {@code String}, or the {@code JSONObject.NULL object}.
+ *
+ * <p>The constructor can convert a JSON text into a Java object. The {@code toString} method converts to JSON text.
+ *
+ * <p>A {@code get} method returns a value if one can be found, and throws an exception if one cannot be found. An
+ * {@code opt} method returns a default value instead of throwing an exception, and so is useful for obtaining
+ * optional values.
+ *
+ * <p>The generic {@code get()} and {@code opt()} methods return an object which you can cast or query for type.
+ * There are also typed {@code get} and {@code opt} methods that do type checking and type coercion for you.
+ *
+ * <p>The texts produced by the {@code toString} methods strictly conform to JSON syntax rules. The constructors are
+ * more forgiving in the texts they will accept: <ul> <li>An extra {@code ,}&nbsp;<small>(comma)</small> may appear
+ * just before the closing bracket.</li> <li>The {@code null} value will be inserted when there is {@code ,}
+ * &nbsp;<small>(comma)</small> elision.</li> <li>Strings may be quoted with {@code '}&nbsp;<small>(single
+ * quote)</small>.</li> <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
+ * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: {@code { }
+ * [ ] / \ : , #} and if they do not look like numbers and if they are not the reserved words {@code true},
+ * {@code false}, or {@code null}.</li> </ul>
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+public class JSONArray {
+    /**
+     * The arrayList where the JSONArray's properties are kept.
+     */
+    private final ArrayList<Object> myArrayList;
+
+    /**
+     * Construct an empty JSONArray.
+     */
+    public JSONArray() {
+        this.myArrayList = new ArrayList<Object>();
+    }
+
+    /**
+     * Construct a JSONArray from a JSONTokener.
+     *
+     * @param x A JSONTokener
+     * @throws JSONException If there is a syntax error.
+     */
+    public JSONArray(JSONTokener x) throws JSONException {
+        this();
+        if (x.nextClean() != '[') {
+            throw x.syntaxError("A JSONArray text must start with '['");
+        }
+        if (x.nextClean() != ']') {
+            x.back();
+            for (; ; ) {
+                if (x.nextClean() == ',') {
+                    x.back();
+                    this.myArrayList.add(JSONObject.NULL);
+                } else {
+                    x.back();
+                    this.myArrayList.add(x.nextValue());
+                }
+                switch (x.nextClean()) {
+                    case ',':
+                        if (x.nextClean() == ']') {
+                            return;
+                        }
+                        x.back();
+                        break;
+                    case ']':
+                        return;
+                    default:
+                        throw x.syntaxError("Expected a ',' or ']'");
+                }
+            }
+        }
+    }
+
+    /**
+     * Construct a JSONArray from a source JSON text.
+     *
+     * @param source A string that begins with {@code [}&nbsp;<small>(left bracket)</small> and ends with
+     *               {@code ]} &nbsp;<small>(right bracket)</small>.
+     * @throws JSONException If there is a syntax error.
+     */
+    public JSONArray(String source) throws JSONException {
+        this(new JSONTokener(source));
+    }
+
+    /**
+     * Construct a JSONArray from a Collection.
+     *
+     * @param collection A Collection.
+     */
+    public JSONArray(Collection<Object> collection) {
+        this.myArrayList = new ArrayList<Object>();
+        if (collection != null) {
+            for (Object aCollection : collection) {
+                this.myArrayList.add(JSONObject.wrap(aCollection));
+            }
+        }
+    }
+
+    /**
+     * Construct a JSONArray from an array
+     *
+     * @throws JSONException If not an array.
+     */
+    public JSONArray(Object array) throws JSONException {
+        this();
+        if (array.getClass().isArray()) {
+            int length = Array.getLength(array);
+            for (int i = 0; i < length; i += 1) {
+                this.put(JSONObject.wrap(Array.get(array, i)));
+            }
+        } else {
+            throw new JSONException(
+                "JSONArray initial value should be a string or collection or array.");
+        }
+    }
+
+    /**
+     * Get the object value associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return An object value.
+     * @throws JSONException If there is no value for the index.
+     */
+    public Object get(int index) throws JSONException {
+        Object object = opt(index);
+        if (object == null) {
+            throw new JSONException("JSONArray[" + index + "] not found.");
+        }
+        return object;
+    }
+
+    /**
+     * Get the boolean value associated with an index. The string values "true" and "false" are converted to boolean.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The truth.
+     * @throws JSONException If there is no value for the index or if the value is not convertible to boolean.
+     */
+    public boolean getBoolean(int index) throws JSONException {
+        Object object = get(index);
+        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object)
+            .equalsIgnoreCase("false"))) {
+            return false;
+        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object)
+            .equalsIgnoreCase("true"))) {
+            return true;
+        }
+        throw new JSONException("JSONArray[" + index + "] is not a boolean.");
+    }
+
+    /**
+     * Get the double value associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The value.
+     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
+     */
+    public double getDouble(int index) throws JSONException {
+        Object object = get(index);
+        try {
+            return object instanceof Number ?
+                ((Number) object).doubleValue() :
+                Double.parseDouble((String) object);
+        } catch (NumberFormatException ignored) {
+            throw new JSONException("JSONArray[" + index + "] is not a number.");
+        }
+    }
+
+    /**
+     * Get the int value associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The value.
+     * @throws JSONException If the key is not found or if the value is not a number.
+     */
+    public int getInt(int index) throws JSONException {
+        Object object = get(index);
+        try {
+            return object instanceof Number ?
+                ((Number) object).intValue() :
+                Integer.parseInt((String) object);
+        } catch (NumberFormatException ignored) {
+            throw new JSONException("JSONArray[" + index + "] is not a number.");
+        }
+    }
+
+    /**
+     * Get the JSONArray associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return A JSONArray value.
+     * @throws JSONException If there is no value for the index. or if the value is not a JSONArray
+     */
+    public JSONArray getJSONArray(int index) throws JSONException {
+        Object object = get(index);
+        if (object instanceof JSONArray) {
+            return (JSONArray) object;
+        }
+        throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
+    }
+
+    /**
+     * Get the JSONObject associated with an index.
+     *
+     * @param index subscript
+     * @return A JSONObject value.
+     * @throws JSONException If there is no value for the index or if the value is not a JSONObject
+     */
+    public JSONObject getJSONObject(int index) throws JSONException {
+        Object object = get(index);
+        if (object instanceof JSONObject) {
+            return (JSONObject) object;
+        }
+        throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
+    }
+
+    /**
+     * Get the long value associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The value.
+     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
+     */
+    public long getLong(int index) throws JSONException {
+        Object object = get(index);
+        try {
+            return object instanceof Number ?
+                ((Number) object).longValue() :
+                Long.parseLong((String) object);
+        } catch (NumberFormatException ignored) {
+            throw new JSONException("JSONArray[" + index + "] is not a number.");
+        }
+    }
+
+    /**
+     * Get the string associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return A string value.
+     * @throws JSONException If there is no string value for the index.
+     */
+    public String getString(int index) throws JSONException {
+        Object object = get(index);
+        if (object instanceof String) {
+            return (String) object;
+        }
+        throw new JSONException("JSONArray[" + index + "] not a string.");
+    }
+
+    /**
+     * Determine if the value is null.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return true if the value at the index is null, or if there is no value.
+     */
+    public boolean isNull(int index) {
+        return JSONObject.NULL.equals(opt(index));
+    }
+
+    /**
+     * Make a string from the contents of this JSONArray. The {@code separator} string is inserted between each
+     * element. Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param separator A string that will be inserted between the elements.
+     * @return a string.
+     * @throws JSONException If the array contains an invalid number.
+     */
+    public String join(String separator) throws JSONException {
+        int len = length();
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < len; i += 1) {
+            if (i > 0) {
+                sb.append(separator);
+            }
+            sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Get the number of elements in the JSONArray, included nulls.
+     *
+     * @return The length (or size).
+     */
+    public int length() {
+        return this.myArrayList.size();
+    }
+
+    /**
+     * Get the optional object value associated with an index.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return An object value, or null if there is no object at that index.
+     */
+    public Object opt(int index) {
+        return ((index < 0) || (index >= length())) ? null : this.myArrayList.get(index);
+    }
+
+    /**
+     * Get the optional boolean value associated with an index. It returns false if there is no value at that index, or
+     * if the value is not Boolean.TRUE or the String "true".
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The truth.
+     */
+    public boolean optBoolean(int index) {
+        return this.optBoolean(index, false);
+    }
+
+    /**
+     * Get the optional boolean value associated with an index. It returns the defaultValue if there is no value at that
+     * index or if it is not a Boolean or the String "true" or "false" (case insensitive).
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue A boolean default.
+     * @return The truth.
+     */
+    public boolean optBoolean(int index, boolean defaultValue) {
+        try {
+            return getBoolean(index);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get the optional double value associated with an index. NaN is returned if there is no value for the index, or if
+     * the value is not a number and cannot be converted to a number.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The value.
+     */
+    public double optDouble(int index) {
+        return this.optDouble(index, Double.NaN);
+    }
+
+    /**
+     * Get the optional double value associated with an index. The defaultValue is returned if there is no value for the
+     * index, or if the value is not a number and cannot be converted to a number.
+     *
+     * @param index        subscript
+     * @param defaultValue The default value.
+     * @return The value.
+     */
+    public double optDouble(int index, double defaultValue) {
+        try {
+            return getDouble(index);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get the optional int value associated with an index. Zero is returned if there is no value for the index, or if
+     * the value is not a number and cannot be converted to a number.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The value.
+     */
+    public int optInt(int index) {
+        return this.optInt(index, 0);
+    }
+
+    /**
+     * Get the optional int value associated with an index. The defaultValue is returned if there is no value for the
+     * index, or if the value is not a number and cannot be converted to a number.
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
+     * @return The value.
+     */
+    public int optInt(int index, int defaultValue) {
+        try {
+            return getInt(index);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get the optional JSONArray associated with an index.
+     *
+     * @param index subscript
+     * @return A JSONArray value, or null if the index has no value, or if the value is not a JSONArray.
+     */
+    public JSONArray optJSONArray(int index) {
+        Object o = opt(index);
+        return o instanceof JSONArray ? (JSONArray) o : null;
+    }
+
+    /**
+     * Get the optional JSONObject associated with an index. Null is returned if the key is not found, or null if the
+     * index has no value, or if the value is not a JSONObject.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return A JSONObject value.
+     */
+    public JSONObject optJSONObject(int index) {
+        Object o = opt(index);
+        return o instanceof JSONObject ? (JSONObject) o : null;
+    }
+
+    /**
+     * Get the optional long value associated with an index. Zero is returned if there is no value for the index, or if
+     * the value is not a number and cannot be converted to a number.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return The value.
+     */
+    public long optLong(int index) {
+        return this.optLong(index, 0);
+    }
+
+    /**
+     * Get the optional long value associated with an index. The defaultValue
+     * is returned if there is no value for the index, or if the value is not a
+     * number and cannot be converted to a number.
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
+     * @return The value.
+     */
+    public long optLong(int index, long defaultValue) {
+        try {
+            return getLong(index);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get the optional string value associated with an index. It returns an
+     * empty string if there is no value at that index. If the value is not a
+     * string and is not null, then it is converted to a string.
+     *
+     * @param index The index must be between 0 and length() - 1.
+     * @return A String value.
+     */
+    public String optString(int index) {
+        return this.optString(index, "");
+    }
+
+    /**
+     * Get the optional string associated with an index. The defaultValue is
+     * returned if the key is not found.
+     *
+     * @param index        The index must be between 0 and length() - 1.
+     * @param defaultValue The default value.
+     * @return A String value.
+     */
+    public String optString(int index, String defaultValue) {
+        Object object = opt(index);
+        return JSONObject.NULL.equals(object) ? defaultValue : object.toString();
+    }
+
+    /**
+     * Append a boolean value. This increases the array's length by one.
+     *
+     * @param value A boolean value.
+     * @return this.
+     */
+    public JSONArray put(boolean value) {
+        this.put(value ? Boolean.TRUE : Boolean.FALSE);
+        return this;
+    }
+
+    /**
+     * Put a value in the JSONArray, where the value will be a JSONArray which
+     * is produced from a Collection.
+     *
+     * @param value A Collection value.
+     * @return this.
+     */
+    public JSONArray put(Collection<Object> value) {
+        this.put(new JSONArray(value));
+        return this;
+    }
+
+    /**
+     * Append a double value. This increases the array's length by one.
+     *
+     * @param value A double value.
+     * @return this.
+     * @throws JSONException if the value is not finite.
+     */
+    public JSONArray put(double value) throws JSONException {
+        Double d = value;
+        JSONObject.testValidity(d);
+        this.put(d);
+        return this;
+    }
+
+    /**
+     * Append an int value. This increases the array's length by one.
+     *
+     * @param value An int value.
+     * @return this.
+     */
+    public JSONArray put(int value) {
+        this.put(Integer.valueOf(value));
+        return this;
+    }
+
+    /**
+     * Append an long value. This increases the array's length by one.
+     *
+     * @param value A long value.
+     * @return this.
+     */
+    public JSONArray put(long value) {
+        this.put(Long.valueOf(value));
+        return this;
+    }
+
+    /**
+     * Put a value in the JSONArray, where the value will be a JSONObject which
+     * is produced from a Map.
+     *
+     * @param value A Map value.
+     * @return this.
+     */
+    public JSONArray put(Map<String, Object> value) {
+        this.put(new JSONObject(value));
+        return this;
+    }
+
+    /**
+     * Append an object value. This increases the array's length by one.
+     *
+     * @param value An object value. The value should be a Boolean, Double,
+     *              Integer, JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
+     * @return this.
+     */
+    public JSONArray put(Object value) {
+        this.myArrayList.add(value);
+        return this;
+    }
+
+    /**
+     * Put or replace a boolean value in the JSONArray. If the index is greater than the length of the JSONArray, then
+     * null elements will be added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value A boolean value.
+     * @return this.
+     * @throws JSONException If the index is negative.
+     */
+    public JSONArray put(int index, boolean value) throws JSONException {
+        this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
+        return this;
+    }
+
+    /**
+     * Put a value in the JSONArray, where the value will be a JSONArray which
+     * is produced from a Collection.
+     *
+     * @param index The subscript.
+     * @param value A Collection value.
+     * @return this.
+     * @throws JSONException If the index is negative or if the value is not
+     *                       finite.
+     */
+    public JSONArray put(int index, Collection<Object> value) throws JSONException {
+        this.put(index, new JSONArray(value));
+        return this;
+    }
+
+    /**
+     * Put or replace a double value. If the index is greater than the length
+     * of the JSONArray, then null elements will be added as necessary to pad
+     * it out.
+     *
+     * @param index The subscript.
+     * @param value A double value.
+     * @return this.
+     * @throws JSONException If the index is negative or if the value is not
+     *                       finite.
+     */
+    public JSONArray put(int index, double value) throws JSONException {
+        this.put(index, new Double(value));
+        return this;
+    }
+
+    /**
+     * Put or replace an int value. If the index is greater than the length of the JSONArray, then null elements will be
+     * added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value An int value.
+     * @return this.
+     * @throws JSONException If the index is negative.
+     */
+    public JSONArray put(int index, int value) throws JSONException {
+        this.put(index, Integer.valueOf(value));
+        return this;
+    }
+
+    /**
+     * Put or replace a long value. If the index is greater than the length of the JSONArray, then null elements will be
+     * added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value A long value.
+     * @return this.
+     * @throws JSONException If the index is negative.
+     */
+    public JSONArray put(int index, long value) throws JSONException {
+        this.put(index, Long.valueOf(value));
+        return this;
+    }
+
+    /**
+     * Put a value in the JSONArray, where the value will be a JSONObject that
+     * is produced from a Map.
+     *
+     * @param index The subscript.
+     * @param value The Map value.
+     * @return this.
+     * @throws JSONException If the index is negative or if the the value is an
+     *                       invalid number.
+     */
+    public JSONArray put(int index, Map<String, Object> value) throws JSONException {
+        this.put(index, new JSONObject(value));
+        return this;
+    }
+
+    /**
+     * Put or replace an object value in the JSONArray. If the index is greater than the length of the JSONArray, then
+     * null elements will be added as necessary to pad it out.
+     *
+     * @param index The subscript.
+     * @param value The value to put into the array. The value should be a Boolean, Double, Integer, JSONArray,
+     *              JSONObject, Long, or String, or the JSONObject.NULL object.
+     * @return this.
+     * @throws JSONException If the index is negative or if the the value is an invalid number.
+     */
+    public JSONArray put(int index, Object value) throws JSONException {
+        JSONObject.testValidity(value);
+        if (index < 0) {
+            throw new JSONException("JSONArray[" + index + "] not found.");
+        }
+        if (index < length()) {
+            this.myArrayList.set(index, value);
+        } else {
+            while (index != length()) {
+                this.put(JSONObject.NULL);
+            }
+            this.put(value);
+        }
+        return this;
+    }
+
+    /**
+     * Remove an index and close the hole.
+     *
+     * @param index The index of the element to be removed.
+     * @return The value that was associated with the index, or null if there was no value.
+     */
+    public Object remove(int index) {
+        return (index >= 0) && (index < length()) ? this.myArrayList.remove(index) : null;
+    }
+
+    /**
+     * Determine if two JSONArrays are similar. They must contain similar sequences.
+     *
+     * @param other The other JSONArray
+     * @return true if they are equal
+     */
+    public boolean similar(Object other) {
+        if (!(other instanceof JSONArray)) {
+            return false;
+        }
+        int len = length();
+        if (len != ((JSONArray) other).length()) {
+            return false;
+        }
+        for (int i = 0; i < len; i += 1) {
+            Object valueThis = get(i);
+            Object valueOther = ((JSONArray) other).get(i);
+            if (valueThis instanceof JSONObject) {
+                if (!((JSONObject) valueThis).similar(valueOther)) {
+                    return false;
+                }
+            } else if (valueThis instanceof JSONArray) {
+                if (!((JSONArray) valueThis).similar(valueOther)) {
+                    return false;
+                }
+            } else if (!valueThis.equals(valueOther)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray.
+     *
+     * @param names A JSONArray containing a list of key strings. These will be paired with the values.
+     * @return A JSONObject, or null if there are no names or if this JSONArray has no values.
+     * @throws JSONException If any of the names are null.
+     */
+    public JSONObject toJSONObject(JSONArray names) throws JSONException {
+        if ((names == null) || (names.length() == 0) || (length() == 0)) {
+            return null;
+        }
+        JSONObject jo = new JSONObject();
+        for (int i = 0; i < names.length(); i += 1) {
+            jo.put(names.getString(i), opt(i));
+        }
+        return jo;
+    }
+
+    /**
+     * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to
+     * produce a syntactically correct JSON text then null will be returned instead. This could occur if the array
+     * contains an invalid number.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return a printable, displayable, transmittable representation of the array.
+     */
+    @Override public String toString() {
+        try {
+            return this.toString(0);
+        } catch (JSONException ignored) {
+            return null;
+        }
+    }
+
+    /**
+     * Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data structure is
+     * acyclical.
+     *
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     * @return a printable, displayable, transmittable representation of the object, beginning with
+     * {@code [}&nbsp;<small>(left bracket)</small> and ending with {@code ]} &nbsp;<small>(right
+     * bracket)</small>.
+     * @throws JSONException
+     */
+    public String toString(int indentFactor) throws JSONException {
+        StringWriter sw = new StringWriter();
+        synchronized (sw.getBuffer()) {
+            return this.write(sw, indentFactor, 0).toString();
+        }
+    }
+
+    /**
+     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return The writer.
+     * @throws JSONException
+     */
+    public Writer write(Writer writer) throws JSONException {
+        return this.write(writer, 0, 0);
+    }
+
+    /**
+     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     * @param indent       The indention of the top level.
+     * @return The writer.
+     * @throws JSONException
+     */
+    Writer write(Writer writer, int indentFactor, int indent) throws JSONException {
+        try {
+            boolean commanate = false;
+            int length = length();
+            writer.write('[');
+            if (length == 1) {
+                JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
+            } else if (length != 0) {
+                int newindent = indent + indentFactor;
+                for (int i = 0; i < length; i += 1) {
+                    if (commanate) {
+                        writer.write(',');
+                    }
+                    if (indentFactor > 0) {
+                        writer.write('\n');
+                    }
+                    JSONObject.indent(writer, newindent);
+                    JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newindent);
+                    commanate = true;
+                }
+                if (indentFactor > 0) {
+                    writer.write('\n');
+                }
+                JSONObject.indent(writer, indent);
+            }
+            writer.write(']');
+            return writer;
+        } catch (IOException e) {
+            throw new JSONException(e);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java
new file mode 100644
index 000000000..67de10815
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java
@@ -0,0 +1,40 @@
+package com.github.intellectualsites.plotsquared.json;
+
+/**
+ * The JSONException is thrown by the JSON.org classes when things are amiss.
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+public class JSONException extends RuntimeException {
+    private static final long serialVersionUID = 0;
+    private Throwable cause;
+
+    /**
+     * Constructs a JSONException with an explanatory message.
+     *
+     * @param message Detail about the reason for the exception.
+     */
+    public JSONException(final String message) {
+        super(message);
+    }
+
+    /**
+     * Constructs a new JSONException with the specified cause.
+     *
+     * @param cause The cause.
+     */
+    public JSONException(final Throwable cause) {
+        super(cause.getMessage());
+        this.cause = cause;
+    }
+
+    /**
+     * Returns the cause of this exception or null if the cause is nonexistent or unknown.
+     *
+     * @return the cause of this exception or null if the cause is nonexistent or unknown.
+     */
+    @Override public Throwable getCause() {
+        return cause;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
new file mode 100644
index 000000000..9a84920dc
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
@@ -0,0 +1,1425 @@
+package com.github.intellectualsites.plotsquared.json;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * A JSONObject is an unordered collection of name/value pairs. Its external form is a string wrapped in curly braces
+ * with colons between the names and values, and commas between the values and names. The internal form is an object
+ * having <code>get</code> and <code>opt</code> methods for accessing the values by name, and <code>put</code> methods
+ * for adding or replacing values by name. The values can be any of these types: <code>Boolean</code>,
+ * <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>, <code>String</code>, or the
+ * <code>JSONObject.NULL</code> object. A JSONObject constructor can be used to convert an external form JSON text into
+ * an internal form whose values can be retrieved with the <code>get</code> and <code>opt</code> methods, or to convert
+ * values into a JSON text using the <code>put</code> and <code>toString</code> methods. A <code>get</code> method
+ * returns a value if one can be found, and throws an exception if one cannot be found. An <code>opt</code> method
+ * returns a default value instead of throwing an exception, and so is useful for obtaining optional values.
+ * <p>
+ * The generic <code>get()</code> and <code>opt()</code> methods return an object, which you can cast or query for type.
+ * There are also typed <code>get</code> and <code>opt</code> methods that do type checking and type coercion for you.
+ * The opt methods differ from the get methods in that they do not throw. Instead, they return a specified value, such
+ * as null.
+ * <p>
+ * The <code>put</code> methods add or replace values in an object. For example,
+ *
+ *
+ * <pre>
+ * myString = new JSONObject().put(&quot;JSON&quot;, &quot;Hello, World!&quot;).toString();
+ * </pre>
+ * <p>
+ * produces the string <code>{"JSON": "Hello, World"}</code>.
+ * <p>
+ * The texts produced by the <code>toString</code> methods strictly conform to the JSON syntax rules. The constructors
+ * are more forgiving in the texts they will accept: <ul> <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may
+ * appear just before the closing brace.</li> <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single
+ * quote)</small>.</li> <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
+ * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: <code>{ }
+ * [ ] / \ : , #</code> and if they do not look like numbers and if they are not the reserved words <code>true</code>,
+ * <code>false</code>, or <code>null</code>.</li> </ul>
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+public class JSONObject {
+    /**
+     * It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than to use Java's
+     * <code>null</code> value. <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
+     * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
+     */
+    public static final Object NULL = new Null();
+    /**
+     * The map where the JSONObject's properties are kept.
+     */
+    private final Map<String, Object> map;
+
+    /**
+     * Construct an empty JSONObject.
+     */
+    public JSONObject() {
+        this.map = new HashMap<String, Object>();
+    }
+
+    /**
+     * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to identify the keys that
+     * should be copied. Missing keys are ignored.
+     *
+     * @param jo    A JSONObject.
+     * @param names An array of strings.
+     * @throws JSONException
+     * @throws JSONException If a value is a non-finite number or if a name is duplicated.
+     */
+    public JSONObject(JSONObject jo, String[] names) {
+        this();
+        for (String name : names) {
+            try {
+                putOnce(name, jo.opt(name));
+            } catch (JSONException ignore) {
+            }
+        }
+    }
+
+    /**
+     * Construct a JSONObject from a JSONTokener.
+     *
+     * @param x A JSONTokener object containing the source string.
+     * @throws JSONException If there is a syntax error in the source string or a duplicated key.
+     */
+    public JSONObject(JSONTokener x) throws JSONException {
+        this();
+        char c;
+        String key;
+        if (x.nextClean() != '{') {
+            throw x.syntaxError("A JSONObject text must begin with '{'");
+        }
+        for (; ; ) {
+            c = x.nextClean();
+            switch (c) {
+                case 0:
+                    throw x.syntaxError("A JSONObject text must end with '}'");
+                case '}':
+                    return;
+                default:
+                    x.back();
+                    key = x.nextValue().toString();
+            }
+            // The key is followed by ':'.
+            c = x.nextClean();
+            if (c != ':') {
+                throw x.syntaxError("Expected a ':' after a key");
+            }
+            putOnce(key, x.nextValue());
+            // Pairs are separated by ','.
+            switch (x.nextClean()) {
+                case ';':
+                case ',':
+                    if (x.nextClean() == '}') {
+                        return;
+                    }
+                    x.back();
+                    break;
+                case '}':
+                    return;
+                default:
+                    throw x.syntaxError("Expected a ',' or '}'");
+            }
+        }
+    }
+
+    /**
+     * Construct a JSONObject from a Map.
+     *
+     * @param map A map object that can be used to initialize the contents of the JSONObject.
+     * @throws JSONException
+     */
+    public JSONObject(Map<String, Object> map) {
+        this.map = new HashMap<String, Object>();
+        if (map != null) {
+            for (Entry<String, Object> entry : map.entrySet()) {
+                Object value = entry.getValue();
+                if (value != null) {
+                    this.map.put(entry.getKey(), wrap(value));
+                }
+            }
+        }
+    }
+
+    /**
+     * Construct a JSONObject from an Object using bean getters. It reflects on all of the public methods of the object.
+     * For each of the methods with no parameters and a name starting with <code>"get"</code> or <code>"is"</code>
+     * followed by an uppercase letter, the method is invoked, and a key and the value returned from the getter method
+     * are put into the new JSONObject.
+     * <p>
+     * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix. If the second remaining
+     * character is not upper case, then the first character is converted to lower case.
+     * <p>
+     * For example, if an object has a method named <code>"getPluginName"</code>, and if the result of calling
+     * <code>object.getPluginName()</code> is <code>"Larry Fine"</code>, then the JSONObject will contain <code>"name": "Larry
+     * Fine"</code>.
+     *
+     * @param bean An object that has getter methods that should be used to make a JSONObject.
+     */
+    public JSONObject(Object bean) {
+        this();
+        populateMap(bean);
+    }
+
+    /**
+     * Construct a JSONObject from an Object, using reflection to find the public members. The resulting JSONObject's
+     * keys will be the strings from the names array, and the values will be the field values associated with those keys
+     * in the object. If a key is not found or not visible, then it will not be copied into the new JSONObject.
+     *
+     * @param object An object that has fields that should be used to make a JSONObject.
+     * @param names  An array of strings, the names of the fields to be obtained from the object.
+     */
+    public JSONObject(Object object, String names[]) {
+        this();
+        Class c = object.getClass();
+        for (String name : names) {
+            try {
+                putOpt(name, c.getField(name).get(object));
+            } catch (JSONException | SecurityException | NoSuchFieldException | IllegalArgumentException | IllegalAccessException ignore) {
+            }
+        }
+    }
+
+    /**
+     * Construct a JSONObject from a source JSON text string. This is the most commonly used JSONObject constructor.
+     *
+     * @param source A string beginning with <code>{</code>&nbsp;<small>(left brace)</small> and ending with
+     *               <code>}</code> &nbsp;<small>(right brace)</small>.
+     * @throws JSONException If there is a syntax error in the source string or a duplicated key.
+     */
+    public JSONObject(String source) throws JSONException {
+        this(new JSONTokener(source));
+    }
+
+    /**
+     * Construct a JSONObject from a ResourceBundle.
+     *
+     * @param baseName The ResourceBundle base name.
+     * @param locale   The Locale to load the ResourceBundle for.
+     * @throws JSONException If any JSONExceptions are detected.
+     */
+    public JSONObject(String baseName, Locale locale) throws JSONException {
+        this();
+        ResourceBundle bundle = ResourceBundle
+            .getBundle(baseName, locale, Thread.currentThread().getContextClassLoader());
+        // Iterate through the keys in the bundle.
+        Enumeration<String> keys = bundle.getKeys();
+        while (keys.hasMoreElements()) {
+            Object key = keys.nextElement();
+            if (key != null) {
+                // Go through the path, ensuring that there is a nested
+                // JSONObject for each
+                // segment except the last. Add the value using the last
+                // segment's name into
+                // the deepest nested JSONObject.
+                String[] path = ((String) key).split("\\.");
+                int last = path.length - 1;
+                JSONObject target = this;
+                for (int i = 0; i < last; i += 1) {
+                    String segment = path[i];
+                    JSONObject nextTarget = target.optJSONObject(segment);
+                    if (nextTarget == null) {
+                        nextTarget = new JSONObject();
+                        target.put(segment, nextTarget);
+                    }
+                    target = nextTarget;
+                }
+                target.put(path[last], bundle.getString((String) key));
+            }
+        }
+    }
+
+    /**
+     * Produce a string from a double. The string "null" will be returned if the number is not finite.
+     *
+     * @param d A double.
+     * @return A String.
+     */
+    public static String doubleToString(double d) {
+        if (Double.isInfinite(d) || Double.isNaN(d)) {
+            return "null";
+        }
+        // Shave off trailing zeros and decimal point, if possible.
+        String string = Double.toString(d);
+        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
+            while (string.endsWith("0")) {
+                string = string.substring(0, string.length() - 1);
+            }
+            if (string.endsWith(".")) {
+                string = string.substring(0, string.length() - 1);
+            }
+        }
+        return string;
+    }
+
+    /**
+     * Get an array of field names from a JSONObject.
+     *
+     * @return An array of field names, or null if there are no names.
+     */
+    public static String[] getNames(JSONObject jo) {
+        int length = jo.length();
+        if (length == 0) {
+            return null;
+        }
+        Iterator<String> iterator = jo.keys();
+        String[] names = new String[length];
+        int i = 0;
+        while (iterator.hasNext()) {
+            names[i] = iterator.next();
+            i += 1;
+        }
+        return names;
+    }
+
+    /**
+     * Get an array of field names from an Object.
+     *
+     * @return An array of field names, or null if there are no names.
+     */
+    public static String[] getNames(Object object) {
+        if (object == null) {
+            return null;
+        }
+        Class klass = object.getClass();
+        Field[] fields = klass.getFields();
+        int length = fields.length;
+        if (length == 0) {
+            return null;
+        }
+        String[] names = new String[length];
+        for (int i = 0; i < length; i += 1) {
+            names[i] = fields[i].getName();
+        }
+        return names;
+    }
+
+    /**
+     * Produce a string from a Number.
+     *
+     * @param number A Number
+     * @return A String.
+     * @throws JSONException If n is a non-finite number.
+     */
+    public static String numberToString(Number number) throws JSONException {
+        if (number == null) {
+            throw new JSONException("Null pointer");
+        }
+        testValidity(number);
+        // Shave off trailing zeros and decimal point, if possible.
+        String string = number.toString();
+        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
+            while (string.endsWith("0")) {
+                string = string.substring(0, string.length() - 1);
+            }
+            if (string.endsWith(".")) {
+                string = string.substring(0, string.length() - 1);
+            }
+        }
+        return string;
+    }
+
+    /**
+     * Produce a string in double quotes with backslash sequences in all the right places. A backslash will be inserted
+     * control character or an unescaped quote or backslash.
+     *
+     * @param string A String
+     * @return A String correctly formatted for insertion in a JSON text.
+     */
+    public static String quote(String string) {
+        StringWriter sw = new StringWriter();
+        synchronized (sw.getBuffer()) {
+            try {
+                return quote(string, sw).toString();
+            } catch (IOException ignored) {
+                // will never happen - we are writing to a string writer
+                return "";
+            }
+        }
+    }
+
+    public static Writer quote(String string, Writer w) throws IOException {
+        if ((string == null) || string.isEmpty()) {
+            w.write("\"\"");
+            return w;
+        }
+        char b;
+        char c = 0;
+        String hhhh;
+        int i;
+        int len = string.length();
+        w.write('"');
+        for (i = 0; i < len; i += 1) {
+            b = c;
+            c = string.charAt(i);
+            switch (c) {
+                case '\\':
+                case '"':
+                    w.write('\\');
+                    w.write(c);
+                    break;
+                case '/':
+                    if (b == '<') {
+                        w.write('\\');
+                    }
+                    w.write(c);
+                    break;
+                case '\b':
+                    w.write("\\b");
+                    break;
+                case '\t':
+                    w.write("\\t");
+                    break;
+                case '\n':
+                    w.write("\\n");
+                    break;
+                case '\f':
+                    w.write("\\f");
+                    break;
+                case '\r':
+                    w.write("\\r");
+                    break;
+                default:
+                    if ((c < ' ') || ((c >= '\u0080') && (c < '\u00a0')) || ((c >= '\u2000') && (c
+                        < '\u2100'))) {
+                        w.write("\\u");
+                        hhhh = Integer.toHexString(c);
+                        w.write("0000", 0, 4 - hhhh.length());
+                        w.write(hhhh);
+                    } else {
+                        w.write(c);
+                    }
+            }
+        }
+        w.write('"');
+        return w;
+    }
+
+    /**
+     * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
+     *
+     * @param string A String.
+     * @return A simple JSON value.
+     */
+    public static Object stringToValue(String string) {
+        Double d;
+        if (string.isEmpty()) {
+            return string;
+        }
+        if (string.equalsIgnoreCase("true")) {
+            return Boolean.TRUE;
+        }
+        if (string.equalsIgnoreCase("false")) {
+            return Boolean.FALSE;
+        }
+        if (string.equalsIgnoreCase("null")) {
+            return JSONObject.NULL;
+        }
+        /*
+         * If it might be a number, try converting it. If a number cannot be
+         * produced, then the value will just be a string.
+         */
+        char b = string.charAt(0);
+        if (((b >= '0') && (b <= '9')) || (b == '-')) {
+            try {
+                if ((string.indexOf('.') > -1) || (string.indexOf('e') > -1) || (string.indexOf('E')
+                    > -1)) {
+                    d = Double.valueOf(string);
+                    if (!d.isInfinite() && !d.isNaN()) {
+                        return d;
+                    }
+                } else {
+                    Long myLong = Long.valueOf(string);
+                    if (string.equals(myLong.toString())) {
+                        if (myLong == myLong.intValue()) {
+                            return myLong.intValue();
+                        } else {
+                            return myLong;
+                        }
+                    }
+                }
+            } catch (NumberFormatException ignore) {
+            }
+        }
+        return string;
+    }
+
+    /**
+     * Throw an exception if the object is a NaN or infinite number.
+     *
+     * @param o The object to test.
+     * @throws JSONException If o is a non-finite number.
+     */
+    public static void testValidity(Object o) throws JSONException {
+        if (o != null) {
+            if (o instanceof Double) {
+                if (((Double) o).isInfinite() || ((Double) o).isNaN()) {
+                    throw new JSONException("JSON does not allow non-finite numbers.");
+                }
+            } else if (o instanceof Float) {
+                if (((Float) o).isInfinite() || ((Float) o).isNaN()) {
+                    throw new JSONException("JSON does not allow non-finite numbers.");
+                }
+            }
+        }
+    }
+
+    /**
+     * Make a JSON text of an Object value. If the object has an value.toJSONString() method, then that method will be
+     * used to produce the JSON text. The method is required to produce a strictly conforming text. If the object does
+     * not contain a toJSONString method (which is the most common case), then a text will be produced by other means.
+     * If the value is an array or Collection, then a JSONArray will be made from it and its toJSONString method will be
+     * called. If the value is a MAP, then a JSONObject will be made from it and its toJSONString method will be called.
+     * Otherwise, the value's toString method will be called, and the result will be quoted.
+     * <p>
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param value The value to be serialized.
+     * @return a printable, displayable, transmittable representation of the object, beginning with
+     * <code>{</code>&nbsp;<small>(left brace)</small> and ending with <code>}</code>&nbsp;<small>(right
+     * brace)</small>.
+     * @throws JSONException If the value is or contains an invalid number.
+     */
+    public static String valueToString(Object value) throws JSONException {
+        if ((value == null) || value.equals(null)) {
+            return "null";
+        }
+        if (value instanceof JSONString) {
+            Object object;
+            try {
+                object = ((JSONString) value).toJSONString();
+            } catch (Exception e) {
+                throw new JSONException(e);
+            }
+            if (object != null) {
+                return (String) object;
+            }
+            throw new JSONException("Bad value from toJSONString: " + object);
+        }
+        if (value instanceof Number) {
+            return numberToString((Number) value);
+        }
+        if ((value instanceof Boolean) || (value instanceof JSONObject)
+            || (value instanceof JSONArray)) {
+            return value.toString();
+        }
+        if (value instanceof Map) {
+            return new JSONObject((Map<String, Object>) value).toString();
+        }
+        if (value instanceof Collection) {
+            return new JSONArray((Collection<Object>) value).toString();
+        }
+        if (value.getClass().isArray()) {
+            return new JSONArray(value).toString();
+        }
+        return quote(value.toString());
+    }
+
+    /**
+     * Wrap an object, if necessary. If the object is null, return the NULL object. If it is an array or collection,
+     * wrap it in a JSONArray. If it is a map, wrap it in a JSONObject. If it is a standard property (Double, String, et
+     * al) then it is already wrapped. Otherwise, if it comes from one of the java packages, turn it into a string. And
+     * if it doesn't, try to wrap it in a JSONObject. If the wrapping fails, then null is returned.
+     *
+     * @param object The object to wrap
+     * @return The wrapped value
+     */
+    public static Object wrap(Object object) {
+        try {
+            if (object == null) {
+                return NULL;
+            }
+            if ((object instanceof JSONObject) || (object instanceof JSONArray) || NULL
+                .equals(object) || (object instanceof JSONString) || (object instanceof Byte)
+                || (object instanceof Character) || (object instanceof Short)
+                || (object instanceof Integer) || (object instanceof Long)
+                || (object instanceof Boolean) || (object instanceof Float)
+                || (object instanceof Double) || (object instanceof String)) {
+                return object;
+            }
+            if (object instanceof Collection) {
+                return new JSONArray((Collection<Object>) object);
+            }
+            if (object.getClass().isArray()) {
+                return new JSONArray(object);
+            }
+            if (object instanceof Map) {
+                return new JSONObject((Map<String, Object>) object);
+            }
+            Package objectPackage = object.getClass().getPackage();
+            String objectPackageName = objectPackage != null ? objectPackage.getName() : "";
+            if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") || (
+                object.getClass().getClassLoader() == null)) {
+                return object.toString();
+            }
+            return new JSONObject(object);
+        } catch (JSONException ignored) {
+            return null;
+        }
+    }
+
+    static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent)
+        throws JSONException, IOException {
+        if ((value == null) || value.equals(null)) {
+            writer.write("null");
+        } else if (value instanceof JSONObject) {
+            ((JSONObject) value).write(writer, indentFactor, indent);
+        } else if (value instanceof JSONArray) {
+            ((JSONArray) value).write(writer, indentFactor, indent);
+        } else if (value instanceof Map) {
+            new JSONObject((Map<String, Object>) value).write(writer, indentFactor, indent);
+        } else if (value instanceof Collection) {
+            new JSONArray((Collection<Object>) value).write(writer, indentFactor, indent);
+        } else if (value.getClass().isArray()) {
+            new JSONArray(value).write(writer, indentFactor, indent);
+        } else if (value instanceof Number) {
+            writer.write(numberToString((Number) value));
+        } else if (value instanceof Boolean) {
+            writer.write(value.toString());
+        } else if (value instanceof JSONString) {
+            Object o;
+            try {
+                o = ((JSONString) value).toJSONString();
+            } catch (Exception e) {
+                throw new JSONException(e);
+            }
+            writer.write(o != null ? o.toString() : quote(value.toString()));
+        } else {
+            quote(value.toString(), writer);
+        }
+        return writer;
+    }
+
+    static final void indent(Writer writer, int indent) throws IOException {
+        for (int i = 0; i < indent; i += 1) {
+            writer.write(' ');
+        }
+    }
+
+    /**
+     * Accumulate values under a key. It is similar to the put method except that if there is already an object stored
+     * under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already
+     * a JSONArray, then the new value is appended to it. In contrast, the put method replaces the previous value.
+     * <p>
+     * If only one value is accumulated that is not a JSONArray, then the result will be the same as using put. But if
+     * multiple values are accumulated, then the result will be like append.
+     *
+     * @param key   A key string.
+     * @param value An object to be accumulated under the key.
+     * @return this.
+     * @throws JSONException If the value is an invalid number or if the key is null.
+     */
+    public JSONObject accumulate(String key, Object value) throws JSONException {
+        testValidity(value);
+        Object object = opt(key);
+        if (object == null) {
+            this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value);
+        } else if (object instanceof JSONArray) {
+            ((JSONArray) object).put(value);
+        } else {
+            this.put(key, new JSONArray().put(object).put(value));
+        }
+        return this;
+    }
+
+    /**
+     * Append values to the array under a key. If the key does not exist in the JSONObject, then the key is put in the
+     * JSONObject with its value being a JSONArray containing the value parameter. If the key was already associated
+     * with a JSONArray, then the value parameter is appended to it.
+     *
+     * @param key   A key string.
+     * @param value An object to be accumulated under the key.
+     * @return this.
+     * @throws JSONException If the key is null or if the current value associated with the key is not a JSONArray.
+     */
+    public JSONObject append(String key, Object value) throws JSONException {
+        testValidity(value);
+        Object object = opt(key);
+        if (object == null) {
+            this.put(key, new JSONArray().put(value));
+        } else if (object instanceof JSONArray) {
+            this.put(key, ((JSONArray) object).put(value));
+        } else {
+            throw new JSONException("JSONObject[" + key + "] is not a JSONArray.");
+        }
+        return this;
+    }
+
+    /**
+     * Get the value object associated with a key.
+     *
+     * @param key A key string.
+     * @return The object associated with the key.
+     * @throws JSONException if the key is not found.
+     */
+    public Object get(String key) throws JSONException {
+        if (key == null) {
+            throw new JSONException("Null key.");
+        }
+        Object object = opt(key);
+        if (object == null) {
+            throw new JSONException("JSONObject[" + quote(key) + "] not found.");
+        }
+        return object;
+    }
+
+    /**
+     * Get the boolean value associated with a key.
+     *
+     * @param key A key string.
+     * @return The truth.
+     * @throws JSONException if the value is not a Boolean or the String "true" or "false".
+     */
+    public boolean getBoolean(String key) throws JSONException {
+        Object object = get(key);
+        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object)
+            .equalsIgnoreCase("false"))) {
+            return false;
+        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object)
+            .equalsIgnoreCase("true"))) {
+            return true;
+        }
+        throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
+    }
+
+    /**
+     * Get the double value associated with a key.
+     *
+     * @param key A key string.
+     * @return The numeric value.
+     * @throws JSONException if the key is not found or if the value is not a Number object and cannot be converted to a
+     *                       number.
+     */
+    public double getDouble(String key) throws JSONException {
+        Object object = get(key);
+        try {
+            return object instanceof Number ?
+                ((Number) object).doubleValue() :
+                Double.parseDouble((String) object);
+        } catch (NumberFormatException ignored) {
+            throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
+        }
+    }
+
+    /**
+     * Get the int value associated with a key.
+     *
+     * @param key A key string.
+     * @return The integer value.
+     * @throws JSONException if the key is not found or if the value cannot be converted to an integer.
+     */
+    public int getInt(String key) throws JSONException {
+        Object object = get(key);
+        try {
+            return object instanceof Number ?
+                ((Number) object).intValue() :
+                Integer.parseInt((String) object);
+        } catch (NumberFormatException ignored) {
+            throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
+        }
+    }
+
+    /**
+     * Get the JSONArray value associated with a key.
+     *
+     * @param key A key string.
+     * @return A JSONArray which is the value.
+     * @throws JSONException if the key is not found or if the value is not a JSONArray.
+     */
+    public JSONArray getJSONArray(String key) throws JSONException {
+        Object object = get(key);
+        if (object instanceof JSONArray) {
+            return (JSONArray) object;
+        }
+        throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray.");
+    }
+
+    /**
+     * Get the JSONObject value associated with a key.
+     *
+     * @param key A key string.
+     * @return A JSONObject which is the value.
+     * @throws JSONException if the key is not found or if the value is not a JSONObject.
+     */
+    public JSONObject getJSONObject(String key) throws JSONException {
+        Object object = get(key);
+        if (object instanceof JSONObject) {
+            return (JSONObject) object;
+        }
+        throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject.");
+    }
+
+    /**
+     * Get the long value associated with a key.
+     *
+     * @param key A key string.
+     * @return The long value.
+     * @throws JSONException if the key is not found or if the value cannot be converted to a long.
+     */
+    public long getLong(String key) throws JSONException {
+        Object object = get(key);
+        try {
+            return object instanceof Number ?
+                ((Number) object).longValue() :
+                Long.parseLong((String) object);
+        } catch (NumberFormatException ignored) {
+            throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
+        }
+    }
+
+    /**
+     * Get the string associated with a key.
+     *
+     * @param key A key string.
+     * @return A string which is the value.
+     * @throws JSONException if there is no string value for the key.
+     */
+    public String getString(String key) throws JSONException {
+        Object object = get(key);
+        if (object instanceof String) {
+            return (String) object;
+        }
+        throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
+    }
+
+    /**
+     * Determine if the JSONObject contains a specific key.
+     *
+     * @param key A key string.
+     * @return true if the key exists in the JSONObject.
+     */
+    public boolean has(String key) {
+        return this.map.containsKey(key);
+    }
+
+    /**
+     * Increment a property of a JSONObject. If there is no such property, create one with a value of 1. If there is
+     * such a property, and if it is an Integer, Long, Double, or Float, then add one to it.
+     *
+     * @param key A key string.
+     * @return this.
+     * @throws JSONException If there is already a property with this name that is not an Integer, Long, Double, or
+     *                       Float.
+     */
+    public JSONObject increment(String key) throws JSONException {
+        Object value = opt(key);
+        if (value == null) {
+            this.put(key, 1);
+        } else if (value instanceof Integer) {
+            this.put(key, (Integer) value + 1);
+        } else if (value instanceof Long) {
+            this.put(key, (Long) value + 1);
+        } else if (value instanceof Double) {
+            this.put(key, (Double) value + 1);
+        } else if (value instanceof Float) {
+            this.put(key, (Float) value + 1);
+        } else {
+            throw new JSONException("Unable to increment [" + quote(key) + "].");
+        }
+        return this;
+    }
+
+    /**
+     * Determine if the value associated with the key is null or if there is no value.
+     *
+     * @param key A key string.
+     * @return true if there is no value associated with the key or if the value is the JSONObject.NULL object.
+     */
+    public boolean isNull(String key) {
+        return JSONObject.NULL.equals(opt(key));
+    }
+
+    /**
+     * Get an enumeration of the keys of the JSONObject.
+     *
+     * @return An iterator of the keys.
+     */
+    public Iterator<String> keys() {
+        return keySet().iterator();
+    }
+
+    /**
+     * Get a set of keys of the JSONObject.
+     *
+     * @return A keySet.
+     */
+    public Set<String> keySet() {
+        return this.map.keySet();
+    }
+
+    /**
+     * Get the number of keys stored in the JSONObject.
+     *
+     * @return The number of keys in the JSONObject.
+     */
+    public int length() {
+        return this.map.size();
+    }
+
+    /**
+     * Produce a JSONArray containing the names of the elements of this JSONObject.
+     *
+     * @return A JSONArray containing the key strings, or null if the JSONObject is empty.
+     */
+    public JSONArray names() {
+        JSONArray ja = new JSONArray();
+        Iterator<String> keys = keys();
+        while (keys.hasNext()) {
+            ja.put(keys.next());
+        }
+        return ja.length() == 0 ? null : ja;
+    }
+
+    /**
+     * Get an optional value associated with a key.
+     *
+     * @param key A key string.
+     * @return An object which is the value, or null if there is no value.
+     */
+    public Object opt(String key) {
+        return key == null ? null : this.map.get(key);
+    }
+
+    /**
+     * Get an optional boolean associated with a key. It returns false if there is no such key, or if the value is not
+     * Boolean.TRUE or the String "true".
+     *
+     * @param key A key string.
+     * @return The truth.
+     */
+    public boolean optBoolean(String key) {
+        return this.optBoolean(key, false);
+    }
+
+    /**
+     * Get an optional boolean associated with a key. It returns the defaultValue if there is no such key, or if it is
+     * not a Boolean or the String "true" or "false" (case insensitive).
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
+     * @return The truth.
+     */
+    public boolean optBoolean(String key, boolean defaultValue) {
+        try {
+            return getBoolean(key);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get an optional double associated with a key, or NaN if there is no such key or if its value is not a number. If
+     * the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A string which is the key.
+     * @return An object which is the value.
+     */
+    public double optDouble(String key) {
+        return this.optDouble(key, Double.NaN);
+    }
+
+    /**
+     * Get an optional double associated with a key, or the defaultValue if there is no such key or if its value is not
+     * a number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
+     * @return An object which is the value.
+     */
+    public double optDouble(String key, double defaultValue) {
+        try {
+            return getDouble(key);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get an optional int value associated with a key, or zero if there is no such key or if the value is not a number.
+     * If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
+     * @return An object which is the value.
+     */
+    public int optInt(String key) {
+        return this.optInt(key, 0);
+    }
+
+    /**
+     * Get an optional int value associated with a key, or the default if there is no such key or if the value is not a
+     * number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
+     * @return An object which is the value.
+     */
+    public int optInt(String key, int defaultValue) {
+        try {
+            return getInt(key);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get an optional JSONArray associated with a key. It returns null if there is no such key, or if its value is not
+     * a JSONArray.
+     *
+     * @param key A key string.
+     * @return A JSONArray which is the value.
+     */
+    public JSONArray optJSONArray(String key) {
+        Object o = opt(key);
+        return o instanceof JSONArray ? (JSONArray) o : null;
+    }
+
+    /**
+     * Get an optional JSONObject associated with a key. It returns null if there is no such key, or if its value is not
+     * a JSONObject.
+     *
+     * @param key A key string.
+     * @return A JSONObject which is the value.
+     */
+    public JSONObject optJSONObject(String key) {
+        Object object = opt(key);
+        return object instanceof JSONObject ? (JSONObject) object : null;
+    }
+
+    /**
+     * Get an optional long value associated with a key, or zero if there is no such key or if the value is not a
+     * number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key A key string.
+     * @return An object which is the value.
+     */
+    public long optLong(String key) {
+        return this.optLong(key, 0);
+    }
+
+    /**
+     * Get an optional long value associated with a key, or the default if there is no such key or if the value is not a
+     * number. If the value is a string, an attempt will be made to evaluate it as a number.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
+     * @return An object which is the value.
+     */
+    public long optLong(String key, long defaultValue) {
+        try {
+            return getLong(key);
+        } catch (JSONException ignored) {
+            return defaultValue;
+        }
+    }
+
+    /**
+     * Get an optional string associated with a key. It returns an empty string if there is no such key. If the value is
+     * not a string and is not null, then it is converted to a string.
+     *
+     * @param key A key string.
+     * @return A string which is the value.
+     */
+    public String optString(String key) {
+        return this.optString(key, "");
+    }
+
+    /**
+     * Get an optional string associated with a key. It returns the defaultValue if there is no such key.
+     *
+     * @param key          A key string.
+     * @param defaultValue The default.
+     * @return A string which is the value.
+     */
+    public String optString(String key, String defaultValue) {
+        Object object = opt(key);
+        return NULL.equals(object) ? defaultValue : object.toString();
+    }
+
+    private void populateMap(Object bean) {
+        Class klass = bean.getClass();
+        // If klass is a System class then set includeSuperClass to false.
+        boolean includeSuperClass = klass.getClassLoader() != null;
+        Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
+        for (Method method : methods) {
+            try {
+                if (Modifier.isPublic(method.getModifiers())) {
+                    String name = method.getName();
+                    String key = "";
+                    if (name.startsWith("get")) {
+                        if ("getClass".equals(name) || "getDeclaringClass".equals(name)) {
+                            key = "";
+                        } else {
+                            key = name.substring(3);
+                        }
+                    } else if (name.startsWith("is")) {
+                        key = name.substring(2);
+                    }
+                    if (!key.isEmpty() && Character.isUpperCase(key.charAt(0)) && (
+                        method.getParameterTypes().length == 0)) {
+                        if (key.length() == 1) {
+                            key = key.toLowerCase();
+                        } else if (!Character.isUpperCase(key.charAt(1))) {
+                            key = key.substring(0, 1).toLowerCase() + key.substring(1);
+                        }
+                        Object result = method.invoke(bean, (Object[]) null);
+                        if (result != null) {
+                            this.map.put(key, wrap(result));
+                        }
+                    }
+                }
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignore) {
+            }
+        }
+    }
+
+    /**
+     * Put a key/boolean pair in the JSONObject.
+     *
+     * @param key   A key string.
+     * @param value A boolean which is the value.
+     * @return this.
+     * @throws JSONException If the key is null.
+     */
+    public JSONObject put(String key, boolean value) throws JSONException {
+        this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
+        return this;
+    }
+
+    /**
+     * Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced from a Collection.
+     *
+     * @param key   A key string.
+     * @param value A Collection value.
+     * @return this.
+     * @throws JSONException
+     */
+    public JSONObject put(String key, Collection<Object> value) throws JSONException {
+        this.put(key, new JSONArray(value));
+        return this;
+    }
+
+    /**
+     * Put a key/double pair in the JSONObject.
+     *
+     * @param key   A key string.
+     * @param value A double which is the value.
+     * @return this.
+     * @throws JSONException If the key is null or if the number is invalid.
+     */
+    public JSONObject put(String key, double value) throws JSONException {
+        this.put(key, new Double(value));
+        return this;
+    }
+
+    /**
+     * Put a key/int pair in the JSONObject.
+     *
+     * @param key   A key string.
+     * @param value An int which is the value.
+     * @return this.
+     * @throws JSONException If the key is null.
+     */
+    public JSONObject put(String key, int value) throws JSONException {
+        this.put(key, Integer.valueOf(value));
+        return this;
+    }
+
+    /**
+     * Put a key/long pair in the JSONObject.
+     *
+     * @param key   A key string.
+     * @param value A long which is the value.
+     * @return this.
+     * @throws JSONException If the key is null.
+     */
+    public JSONObject put(String key, long value) throws JSONException {
+        this.put(key, Long.valueOf(value));
+        return this;
+    }
+
+    /**
+     * Put a key/value pair in the JSONObject, where the value will be a JSONObject which is produced from a Map.
+     *
+     * @param key   A key string.
+     * @param value A Map value.
+     * @return this.
+     * @throws JSONException
+     */
+    public JSONObject put(String key, Map<String, Object> value) throws JSONException {
+        this.put(key, new JSONObject(value));
+        return this;
+    }
+
+    /**
+     * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from the JSONObject if
+     * it is present.
+     *
+     * @param key   A key string.
+     * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
+     *              JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
+     * @return this.
+     * @throws JSONException If the value is non-finite number or if the key is null.
+     */
+    public JSONObject put(String key, Object value) throws JSONException {
+        if (key == null) {
+            throw new NullPointerException("Null key.");
+        }
+        if (value != null) {
+            testValidity(value);
+            this.map.put(key, value);
+        } else {
+            remove(key);
+        }
+        return this;
+    }
+
+    /**
+     * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null, and only if there is
+     * not already a member with that name.
+     *
+     * @param key   string
+     * @param value object
+     * @return this.
+     * @throws JSONException if the key is a duplicate
+     */
+    public JSONObject putOnce(String key, Object value) throws JSONException {
+        if ((key != null) && (value != null)) {
+            if (opt(key) != null) {
+                throw new JSONException("Duplicate key \"" + key + "\"");
+            }
+            this.put(key, value);
+        }
+        return this;
+    }
+
+    /**
+     * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null.
+     *
+     * @param key   A key string.
+     * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
+     *              JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
+     * @return this.
+     * @throws JSONException If the value is a non-finite number.
+     */
+    public JSONObject putOpt(String key, Object value) throws JSONException {
+        if ((key != null) && (value != null)) {
+            this.put(key, value);
+        }
+        return this;
+    }
+
+    /**
+     * Remove a name and its value, if present.
+     *
+     * @param key The name to be removed.
+     * @return The value that was associated with the name, or null if there was no value.
+     */
+    public Object remove(String key) {
+        return this.map.remove(key);
+    }
+
+    /**
+     * Determine if two JSONObjects are similar. They must contain the same set of names which must be associated with
+     * similar values.
+     *
+     * @param other The other JSONObject
+     * @return true if they are equal
+     */
+    public boolean similar(Object other) {
+        try {
+            if (!(other instanceof JSONObject)) {
+                return false;
+            }
+            Set<String> set = keySet();
+            if (!set.equals(((JSONObject) other).keySet())) {
+                return false;
+            }
+            for (String name : set) {
+                Object valueThis = get(name);
+                Object valueOther = ((JSONObject) other).get(name);
+                if (valueThis instanceof JSONObject) {
+                    if (!((JSONObject) valueThis).similar(valueOther)) {
+                        return false;
+                    }
+                } else if (valueThis instanceof JSONArray) {
+                    if (!((JSONArray) valueThis).similar(valueOther)) {
+                        return false;
+                    }
+                } else if (!valueThis.equals(valueOther)) {
+                    return false;
+                }
+            }
+            return true;
+        } catch (JSONException ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * Produce a JSONArray containing the values of the members of this JSONObject.
+     *
+     * @param names A JSONArray containing a list of key strings. This determines the sequence of the values in the
+     *              result.
+     * @return A JSONArray of values.
+     * @throws JSONException If any of the values are non-finite numbers.
+     */
+    public JSONArray toJSONArray(JSONArray names) throws JSONException {
+        if ((names == null) || (names.length() == 0)) {
+            return null;
+        }
+        JSONArray ja = new JSONArray();
+        for (int i = 0; i < names.length(); i += 1) {
+            ja.put(opt(names.getString(i)));
+        }
+        return ja;
+    }
+
+    /**
+     * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a
+     * syntactically correct JSON text, then null will be returned instead.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return a printable, displayable, portable, transmittable representation of the object, beginning with
+     * <code>{</code>&nbsp;<small>(left brace)</small> and ending with <code>}</code>&nbsp;<small>(right
+     * brace)</small>.
+     */
+    @Override public String toString() {
+        try {
+            return this.toString(0);
+        } catch (JSONException ignored) {
+            return null;
+        }
+    }
+
+    /**
+     * Make a prettyprinted JSON text of this JSONObject.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @param indentFactor The number of spaces to add to each level of indentation.
+     * @return a printable, displayable, portable, transmittable representation of the object, beginning with
+     * <code>{</code>&nbsp;<small>(left brace)</small> and ending with <code>}</code>&nbsp;<small>(right
+     * brace)</small>.
+     * @throws JSONException If the object contains an invalid number.
+     */
+    public String toString(int indentFactor) throws JSONException {
+        StringWriter w = new StringWriter();
+        synchronized (w.getBuffer()) {
+            return this.write(w, indentFactor, 0).toString();
+        }
+    }
+
+    /**
+     * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return The writer.
+     * @throws JSONException
+     */
+    public Writer write(Writer writer) throws JSONException {
+        return this.write(writer, 0, 0);
+    }
+
+    /**
+     * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
+     * <p>
+     * Warning: This method assumes that the data structure is acyclical.
+     *
+     * @return The writer.
+     * @throws JSONException
+     */
+    Writer write(Writer writer, int indentFactor, int indent) throws JSONException {
+        try {
+            boolean commanate = false;
+            int length = length();
+            Iterator<String> keys = keys();
+            writer.write('{');
+            if (length == 1) {
+                Object key = keys.next();
+                writer.write(quote(key.toString()));
+                writer.write(':');
+                if (indentFactor > 0) {
+                    writer.write(' ');
+                }
+                writeValue(writer, this.map.get(key), indentFactor, indent);
+            } else if (length != 0) {
+                int newindent = indent + indentFactor;
+                while (keys.hasNext()) {
+                    Object key = keys.next();
+                    if (commanate) {
+                        writer.write(',');
+                    }
+                    if (indentFactor > 0) {
+                        writer.write('\n');
+                    }
+                    indent(writer, newindent);
+                    writer.write(quote(key.toString()));
+                    writer.write(':');
+                    if (indentFactor > 0) {
+                        writer.write(' ');
+                    }
+                    writeValue(writer, this.map.get(key), indentFactor, newindent);
+                    commanate = true;
+                }
+                if (indentFactor > 0) {
+                    writer.write('\n');
+                }
+                indent(writer, indent);
+            }
+            writer.write('}');
+            return writer;
+        } catch (IOException exception) {
+            throw new JSONException(exception);
+        }
+    }
+
+    /**
+     * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the
+     * value that JavaScript calls undefined.
+     */
+    private static final class Null {
+        /**
+         * There is only intended to be a single instance of the NULL object, so the clone method returns itself.
+         *
+         * @return NULL.
+         */
+        @Override protected final Object clone() {
+            try {
+                return super.clone();
+            } catch (CloneNotSupportedException ignored) {
+                return this;
+            }
+        }
+
+        /**
+         * A Null object is equal to the null value and to itself.
+         *
+         * @param object An object to test for nullness.
+         * @return true if the object parameter is the JSONObject.NULL object or null.
+         */
+        @Override public boolean equals(Object object) {
+            return (object == null) || (object == this);
+        }
+
+        /**
+         * Get the "null" string value.
+         *
+         * @return The string "null".
+         */
+        @Override public String toString() {
+            return "null";
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java
new file mode 100644
index 000000000..019776e58
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java
@@ -0,0 +1,16 @@
+package com.github.intellectualsites.plotsquared.json;
+
+/**
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code> method so that a class can change the
+ * behavior of <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>, and
+ * <code>JSONWriter.value(</code>Object<code>)</code>. The <code>toJSONString</code> method will be used instead of the
+ * default behavior of using the Object's <code>toString()</code> method and quoting the result.
+ */
+public interface JSONString {
+    /**
+     * The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
+     *
+     * @return A strictly syntactically correct JSON text.
+     */
+    String toJSONString();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java
new file mode 100644
index 000000000..290b9ea0b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java
@@ -0,0 +1,384 @@
+package com.github.intellectualsites.plotsquared.json;
+
+import java.io.*;
+
+/**
+ * A JSONTokener takes a source string and extracts characters and tokens from it. It is used by the JSONObject and
+ * JSONArray constructors to parse JSON source strings.
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+public class JSONTokener {
+    private final Reader reader;
+    private long character;
+    private boolean eof;
+    private long index;
+    private long line;
+    private char previous;
+    private boolean usePrevious;
+
+    /**
+     * Construct a JSONTokener from a Reader.
+     *
+     * @param reader A reader.
+     */
+    public JSONTokener(final Reader reader) {
+        this.reader = reader.markSupported() ? reader : new BufferedReader(reader);
+        eof = false;
+        usePrevious = false;
+        previous = 0;
+        index = 0;
+        character = 1;
+        line = 1;
+    }
+
+    /**
+     * Construct a JSONTokener from an InputStream.
+     *
+     * @param inputStream The source.
+     */
+    public JSONTokener(final InputStream inputStream) throws JSONException {
+        this(new InputStreamReader(inputStream));
+    }
+
+    /**
+     * Construct a JSONTokener from a string.
+     *
+     * @param s A source string.
+     */
+    public JSONTokener(final String s) {
+        this(new StringReader(s));
+    }
+
+    /**
+     * Get the hex value of a character (base16).
+     *
+     * @param c A character between '0' and '9' or between 'A' and 'F' or between 'a' and 'f'.
+     * @return An int between 0 and 15, or -1 if c was not a hex digit.
+     */
+    public static int dehexchar(final char c) {
+        if ((c >= '0') && (c <= '9')) {
+            return c - '0';
+        }
+        if ((c >= 'A') && (c <= 'F')) {
+            return c - ('A' - 10);
+        }
+        if ((c >= 'a') && (c <= 'f')) {
+            return c - ('a' - 10);
+        }
+        return -1;
+    }
+
+    /**
+     * Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter
+     * before attempting to parse the next number or identifier.
+     */
+    public void back() throws JSONException {
+        if (usePrevious || (index <= 0)) {
+            throw new JSONException("Stepping back two steps is not supported");
+        }
+        index -= 1;
+        character -= 1;
+        usePrevious = true;
+        eof = false;
+    }
+
+    public boolean end() {
+        return eof && !usePrevious;
+    }
+
+    /**
+     * Determine if the source string still contains characters that next() can consume.
+     *
+     * @return true if not yet at the end of the source.
+     */
+    public boolean more() throws JSONException {
+        this.next();
+        if (end()) {
+            return false;
+        }
+        back();
+        return true;
+    }
+
+    /**
+     * Get the next character in the source string.
+     *
+     * @return The next character, or 0 if past the end of the source string.
+     */
+    public char next() throws JSONException {
+        int c;
+        if (usePrevious) {
+            usePrevious = false;
+            c = previous;
+        } else {
+            try {
+                c = reader.read();
+            } catch (final IOException exception) {
+                throw new JSONException(exception);
+            }
+            if (c <= 0) { // End of stream
+                eof = true;
+                c = 0;
+            }
+        }
+        index += 1;
+        if (previous == '\r') {
+            line += 1;
+            character = c == '\n' ? 0 : 1;
+        } else if (c == '\n') {
+            line += 1;
+            character = 0;
+        } else {
+            character += 1;
+        }
+        previous = (char) c;
+        return previous;
+    }
+
+    /**
+     * Consume the next character, and check that it matches a specified character.
+     *
+     * @param c The character to match.
+     * @return The character.
+     * @throws JSONException if the character does not match.
+     */
+    public char next(final char c) throws JSONException {
+        final char n = this.next();
+        if (n != c) {
+            throw syntaxError("Expected '" + c + "' and instead saw '" + n + "'");
+        }
+        return n;
+    }
+
+    /**
+     * Get the next n characters.
+     *
+     * @param n The number of characters to take.
+     * @return A string of n characters.
+     * @throws JSONException Substring bounds error if there are not n characters remaining in the source string.
+     */
+    public String next(final int n) throws JSONException {
+        if (n == 0) {
+            return "";
+        }
+        final char[] chars = new char[n];
+        int pos = 0;
+        while (pos < n) {
+            chars[pos] = this.next();
+            if (end()) {
+                throw syntaxError("Substring bounds error");
+            }
+            pos += 1;
+        }
+        return new String(chars);
+    }
+
+    /**
+     * Get the next char in the string, skipping whitespace.
+     *
+     * @return A character, or 0 if there are no more characters.
+     * @throws JSONException
+     */
+    public char nextClean() throws JSONException {
+        for (; ; ) {
+            final char c = this.next();
+            if ((c == 0) || (c > ' ')) {
+                return c;
+            }
+        }
+    }
+
+    /**
+     * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format
+     * does not allow strings in single quotes, but an implementation is allowed to accept them.
+     *
+     * @param quote The quoting character, either <code>"</code> &nbsp;<small>(double quote)</small> or <code>'</code>
+     *              &nbsp;<small>(single quote)</small>.
+     * @return A String.
+     * @throws JSONException Unterminated string.
+     */
+    public String nextString(final char quote) throws JSONException {
+        char c;
+        final StringBuilder sb = new StringBuilder();
+        for (; ; ) {
+            c = this.next();
+            switch (c) {
+                case 0:
+                case '\n':
+                case '\r':
+                    throw syntaxError("Unterminated string");
+                case '\\':
+                    c = this.next();
+                    switch (c) {
+                        case 'b':
+                            sb.append('\b');
+                            break;
+                        case 't':
+                            sb.append('\t');
+                            break;
+                        case 'n':
+                            sb.append('\n');
+                            break;
+                        case 'f':
+                            sb.append('\f');
+                            break;
+                        case 'r':
+                            sb.append('\r');
+                            break;
+                        case 'u':
+                            sb.append((char) Integer.parseInt(this.next(4), 16));
+                            break;
+                        case '"':
+                        case '\'':
+                        case '\\':
+                        case '/':
+                            sb.append(c);
+                            break;
+                        default:
+                            throw syntaxError("Illegal escape.");
+                    }
+                    break;
+                default:
+                    if (c == quote) {
+                        return sb.toString();
+                    }
+                    sb.append(c);
+            }
+        }
+    }
+
+    /**
+     * Get the text up but not including the specified character or the end of line, whichever comes first.
+     *
+     * @param delimiter A delimiter character.
+     * @return A string.
+     */
+    public String nextTo(final char delimiter) throws JSONException {
+        final StringBuilder sb = new StringBuilder();
+        for (; ; ) {
+            final char c = this.next();
+            if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r')) {
+                if (c != 0) {
+                    back();
+                }
+                return sb.toString().trim();
+            }
+            sb.append(c);
+        }
+    }
+
+    /**
+     * Get the text up but not including one of the specified delimiter characters or the end of line, whichever comes
+     * first.
+     *
+     * @param delimiters A set of delimiter characters.
+     * @return A string, trimmed.
+     */
+    public String nextTo(final String delimiters) throws JSONException {
+        char c;
+        final StringBuilder sb = new StringBuilder();
+        for (; ; ) {
+            c = this.next();
+            if ((delimiters.indexOf(c) >= 0) || (c == 0) || (c == '\n') || (c == '\r')) {
+                if (c != 0) {
+                    back();
+                }
+                return sb.toString().trim();
+            }
+            sb.append(c);
+        }
+    }
+
+    /**
+     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+     * JSONObject.NULL object.
+     *
+     * @return An object.
+     * @throws JSONException If syntax error.
+     */
+    public Object nextValue() throws JSONException {
+        char c = nextClean();
+        String string;
+        switch (c) {
+            case '"':
+            case '\'':
+                return nextString(c);
+            case '{':
+                back();
+                return new JSONObject(this);
+            case '[':
+                back();
+                return new JSONArray(this);
+        }
+        /*
+         * Handle unquoted text. This could be the values true, false, or
+         * null, or it can be a number. An implementation (such as this one)
+         * is allowed to also accept non-standard forms.
+         * Accumulate characters until we reach the end of the text or a
+         * formatting character.
+         */
+        final StringBuilder sb = new StringBuilder();
+        while ((c >= ' ') && (",:]}/\\\"[{;=#".indexOf(c) < 0)) {
+            sb.append(c);
+            c = this.next();
+        }
+        back();
+        string = sb.toString().trim();
+        if (string.isEmpty()) {
+            throw syntaxError("Missing value");
+        }
+        return JSONObject.stringToValue(string);
+    }
+
+    /**
+     * Skip characters until the next character is the requested character. If the requested character is not found, no
+     * characters are skipped.
+     *
+     * @param to A character to skip to.
+     * @return The requested character, or zero if the requested character is not found.
+     */
+    public char skipTo(final char to) throws JSONException {
+        char c;
+        try {
+            final long startIndex = index;
+            final long startCharacter = character;
+            final long startLine = line;
+            reader.mark(1000000);
+            do {
+                c = this.next();
+                if (c == 0) {
+                    reader.reset();
+                    index = startIndex;
+                    character = startCharacter;
+                    line = startLine;
+                    return 0;
+                }
+            } while (c != to);
+        } catch (final IOException exception) {
+            throw new JSONException(exception);
+        }
+        back();
+        return c;
+    }
+
+    /**
+     * Make a JSONException to signal a syntax error.
+     *
+     * @param message The error message.
+     * @return A JSONException object, suitable for throwing
+     */
+    public JSONException syntaxError(final String message) {
+        return new JSONException(message + toString());
+    }
+
+    /**
+     * Make a printable string of this JSONTokener.
+     *
+     * @return " at {index} [character {character} line {line}]"
+     */
+    @Override public String toString() {
+        return " at " + index + " [character " + character + " line " + line + "]";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java
new file mode 100644
index 000000000..7ace1989b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java
@@ -0,0 +1,52 @@
+package com.github.intellectualsites.plotsquared.json;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Properties;
+
+/**
+ * Converts a Property file data into JSONObject and back.
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+public class Property {
+    /**
+     * Converts a property file object into a JSONObject. The property file object is a table of name value pairs.
+     *
+     * @param properties java.util.Properties
+     * @return JSONObject
+     * @throws JSONException
+     */
+    public static JSONObject toJSONObject(final java.util.Properties properties)
+        throws JSONException {
+        final JSONObject jo = new JSONObject();
+        if ((properties != null) && !properties.isEmpty()) {
+            final Enumeration enumProperties = properties.propertyNames();
+            while (enumProperties.hasMoreElements()) {
+                final String name = (String) enumProperties.nextElement();
+                jo.put(name, properties.getProperty(name));
+            }
+        }
+        return jo;
+    }
+
+    /**
+     * Converts the JSONObject into a property file object.
+     *
+     * @param jo JSONObject
+     * @return java.util.Properties
+     * @throws JSONException
+     */
+    public static Properties toProperties(final JSONObject jo) throws JSONException {
+        final Properties properties = new Properties();
+        if (jo != null) {
+            final Iterator<String> keys = jo.keys();
+            while (keys.hasNext()) {
+                final String name = keys.next();
+                properties.put(name, jo.getString(name));
+            }
+        }
+        return properties;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java
new file mode 100644
index 000000000..51a0cdb10
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java
@@ -0,0 +1,375 @@
+package com.github.intellectualsites.plotsquared.json;
+
+import java.util.Iterator;
+
+/**
+ * This provides static methods to convert an XML text into a JSONObject, and to covert a JSONObject into an XML text.
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+class XML {
+
+    static final Character AMP = '&';
+    static final Character APOS = '\'';
+    static final Character BANG = '!';
+    static final Character EQ = '=';
+    static final Character GT = '>';
+    static final Character LT = '<';
+    static final Character QUEST = '?';
+    static final Character QUOT = '"';
+    static final Character SLASH = '/';
+
+    static String escape(String string) {
+        StringBuilder sb = new StringBuilder(string.length());
+        for (int i = 0, length = string.length(); i < length; i++) {
+            char c = string.charAt(i);
+            switch (c) {
+                case '&':
+                    sb.append("&amp;");
+                    break;
+                case '<':
+                    sb.append("&lt;");
+                    break;
+                case '>':
+                    sb.append("&gt;");
+                    break;
+                case '"':
+                    sb.append("&quot;");
+                    break;
+                case '\'':
+                    sb.append("&apos;");
+                    break;
+                default:
+                    sb.append(c);
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Throw an exception if the string contains whitespace. Whitespace is not allowed in tagNames and attributes.
+     *
+     * @param string A string.
+     * @throws JSONException
+     */
+    static void noSpace(String string) throws JSONException {
+        int length = string.length();
+        if (length == 0) {
+            throw new JSONException("Empty string.");
+        }
+        for (char c : string.toCharArray()) {
+            if (Character.isWhitespace(c)) {
+                throw new JSONException('\'' + string + "' contains a space character.");
+            }
+        }
+    }
+
+    /**
+     * Scan the content following the named tag, attaching it to the context.
+     *
+     * @param x       The XMLTokener containing the source string.
+     * @param context The JSONObject that will include the new material.
+     * @param name    The tag name.
+     * @return true if the close tag is processed.
+     * @throws JSONException
+     */
+    private static boolean parse(XMLTokener x, JSONObject context, String name)
+        throws JSONException {
+        // Test for and skip past these forms:
+        // <!-- ... -->
+        // <! ... >
+        // <![ ... ]]>
+        // <? ... ?>
+        // Report errors for these forms:
+        // <>
+        // <=
+        // <<
+        Object token = x.nextToken();
+        // <!
+        String string;
+        if (token == BANG) {
+            char c = x.next();
+            if (c == '-') {
+                if (x.next() == '-') {
+                    x.skipPast("-->");
+                    return false;
+                }
+                x.back();
+            } else if (c == '[') {
+                token = x.nextToken();
+                if ("CDATA".equals(token)) {
+                    if (x.next() == '[') {
+                        string = x.nextCDATA();
+                        if (!string.isEmpty()) {
+                            context.accumulate("content", string);
+                        }
+                        return false;
+                    }
+                }
+                throw x.syntaxError("Expected 'CDATA['");
+            }
+            int i = 1;
+            do {
+                token = x.nextMeta();
+                if (token == null) {
+                    throw x.syntaxError("Missing '>' after '<!'.");
+                } else if (token == LT) {
+                    i += 1;
+                } else if (token == GT) {
+                    i -= 1;
+                }
+            } while (i > 0);
+            return false;
+        } else if (token == QUEST) {
+            // <?
+            x.skipPast("?>");
+            return false;
+        } else if (token == SLASH) {
+            // Close tag </
+            token = x.nextToken();
+            if (name == null) {
+                throw x.syntaxError("Mismatched close tag " + token);
+            }
+            if (!token.equals(name)) {
+                throw x.syntaxError("Mismatched " + name + " and " + token);
+            }
+            if (x.nextToken() != GT) {
+                throw x.syntaxError("Misshaped close tag");
+            }
+            return true;
+        } else if (token instanceof Character) {
+            throw x.syntaxError("Misshaped tag");
+            // Open tag <
+        } else {
+            String tagName = (String) token;
+            token = null;
+            JSONObject jsonobject = new JSONObject();
+            for (; ; ) {
+                if (token == null) {
+                    token = x.nextToken();
+                }
+                // attribute = value
+                if (token instanceof String) {
+                    string = (String) token;
+                    token = x.nextToken();
+                    if (token == EQ) {
+                        token = x.nextToken();
+                        if (!(token instanceof String)) {
+                            throw x.syntaxError("Missing value");
+                        }
+                        jsonobject.accumulate(string, XML.stringToValue((String) token));
+                        token = null;
+                    } else {
+                        jsonobject.accumulate(string, "");
+                    }
+                    // Empty tag <.../>
+                } else if (token == SLASH) {
+                    if (x.nextToken() != GT) {
+                        throw x.syntaxError("Misshaped tag");
+                    }
+                    if (jsonobject.length() > 0) {
+                        context.accumulate(tagName, jsonobject);
+                    } else {
+                        context.accumulate(tagName, "");
+                    }
+                    return false;
+                    // Content, between <...> and </...>
+                } else if (token == GT) {
+                    for (; ; ) {
+                        token = x.nextContent();
+                        if (token == null) {
+                            if (tagName != null) {
+                                throw x.syntaxError("Unclosed tag " + tagName);
+                            }
+                            return false;
+                        } else if (token instanceof String) {
+                            string = (String) token;
+                            if (!string.isEmpty()) {
+                                jsonobject.accumulate("content", XML.stringToValue(string));
+                            }
+                            // Nested element
+                        } else if (token == LT) {
+                            if (parse(x, jsonobject, tagName)) {
+                                if (jsonobject.length() == 0) {
+                                    context.accumulate(tagName, "");
+                                } else if ((jsonobject.length() == 1) && (jsonobject.opt("content")
+                                    != null)) {
+                                    context.accumulate(tagName, jsonobject.opt("content"));
+                                } else {
+                                    context.accumulate(tagName, jsonobject);
+                                }
+                                return false;
+                            }
+                        }
+                    }
+                } else {
+                    throw x.syntaxError("Misshaped tag");
+                }
+            }
+        }
+    }
+
+    /**
+     * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
+     * This is much less ambitious than JSONObject.stringToValue, especially because it does not attempt to convert plus
+     * forms, octal forms, hex forms, or E forms lacking decimal points.
+     *
+     * @param string A String.
+     * @return A simple JSON value.
+     */
+    static Object stringToValue(String string) {
+        if ("true".equalsIgnoreCase(string)) {
+            return Boolean.TRUE;
+        }
+        if ("false".equalsIgnoreCase(string)) {
+            return Boolean.FALSE;
+        }
+        if ("null".equalsIgnoreCase(string)) {
+            return JSONObject.NULL;
+        }
+        //If it might be a number, try converting it, first as a Long, and then as a Double. If that doesn't work, return the string.
+        try {
+            char initial = string.charAt(0);
+            if ((initial == '-') || ((initial >= '0') && (initial <= '9'))) {
+                Long value = Long.valueOf(string);
+                if (value.toString().equals(string)) {
+                    return value;
+                }
+            }
+        } catch (NumberFormatException ignore) {
+            try {
+                Double value = Double.valueOf(string);
+                if (value.toString().equals(string)) {
+                    return value;
+                }
+            } catch (NumberFormatException ignored) {
+            }
+        }
+        return string;
+    }
+
+    public static JSONObject toJSONObject(String string) throws JSONException {
+        JSONObject jo = new JSONObject();
+        XMLTokener x = new XMLTokener(string);
+        while (x.more() && x.skipPast("<")) {
+            parse(x, jo, null);
+        }
+        return jo;
+    }
+
+    /**
+     * Convert a JSONObject into a well-formed, element-normal XML string.
+     *
+     * @param object A JSONObject.
+     * @return A string.
+     * @throws JSONException
+     */
+    public static String toString(Object object) throws JSONException {
+        return toString(object, null);
+    }
+
+    /**
+     * Convert a JSONObject into a well-formed, element-normal XML string.
+     *
+     * @param object  A JSONObject.
+     * @param tagName The optional name of the enclosing tag.
+     * @return A string.
+     * @throws JSONException
+     */
+    public static String toString(Object object, String tagName) throws JSONException {
+        StringBuilder sb = new StringBuilder();
+        int i;
+        JSONArray ja;
+        int length;
+        String string;
+        if (object instanceof JSONObject) {
+            // Emit <tagName>
+            if (tagName != null) {
+                sb.append('<');
+                sb.append(tagName);
+                sb.append('>');
+            }
+            // Loop thru the keys.
+            JSONObject jo = (JSONObject) object;
+            Iterator<String> keys = jo.keys();
+            while (keys.hasNext()) {
+                String key = keys.next();
+                Object value = jo.opt(key);
+                if (value == null) {
+                    value = "";
+                }
+                string = value instanceof String ? (String) value : null;
+                // Emit content in body
+                if ("content".equals(key)) {
+                    if (value instanceof JSONArray) {
+                        ja = (JSONArray) value;
+                        length = ja.length();
+                        for (i = 0; i < length; i += 1) {
+                            if (i > 0) {
+                                sb.append('\n');
+                            }
+                            sb.append(escape(ja.get(i).toString()));
+                        }
+                    } else {
+                        sb.append(escape(value.toString()));
+                    }
+                    // Emit an array of similar keys
+                } else if (value instanceof JSONArray) {
+                    ja = (JSONArray) value;
+                    length = ja.length();
+                    for (i = 0; i < length; i += 1) {
+                        value = ja.get(i);
+                        if (value instanceof JSONArray) {
+                            sb.append('<');
+                            sb.append(key);
+                            sb.append('>');
+                            sb.append(toString(value));
+                            sb.append("</");
+                            sb.append(key);
+                            sb.append('>');
+                        } else {
+                            sb.append(toString(value, key));
+                        }
+                    }
+                } else if ("".equals(value)) {
+                    sb.append('<');
+                    sb.append(key);
+                    sb.append("/>");
+                    // Emit a new tag <k>
+                } else {
+                    sb.append(toString(value, key));
+                }
+            }
+            if (tagName != null) {
+                // Emit the </tagname> close tag
+                sb.append("</");
+                sb.append(tagName);
+                sb.append('>');
+            }
+            return sb.toString();
+            // XML does not have good support for arrays. If an array appears in
+            // a place
+            // where XML is lacking, synthesize an <array> element.
+        } else {
+            if (object.getClass().isArray()) {
+                object = new JSONArray(object);
+            }
+            if (object instanceof JSONArray) {
+                ja = (JSONArray) object;
+                length = ja.length();
+                for (i = 0; i < length; i += 1) {
+                    sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
+                }
+                return sb.toString();
+            } else {
+                string = escape(object.toString());
+                return (tagName == null) ?
+                    '"' + string + '"' :
+                    string.isEmpty() ?
+                        '<' + tagName + "/>" :
+                        '<' + tagName + '>' + string + "</" + tagName + '>';
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java
new file mode 100644
index 000000000..96d65541f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java
@@ -0,0 +1,315 @@
+package com.github.intellectualsites.plotsquared.json;
+
+import java.util.HashMap;
+
+/**
+ * The XMLTokener extends the JSONTokener to provide additional methods for the parsing of XML texts.
+ *
+ * @author JSON.org
+ * @version 2014-05-03
+ */
+public class XMLTokener extends JSONTokener {
+    /**
+     * The table of entity values. It initially contains Character values for amp, apos, gt, lt, quot.
+     */
+    public static final HashMap<String, Character> entity;
+
+    static {
+        entity = new HashMap<>(8);
+        entity.put("amp", XML.AMP);
+        entity.put("apos", XML.APOS);
+        entity.put("gt", XML.GT);
+        entity.put("lt", XML.LT);
+        entity.put("quot", XML.QUOT);
+    }
+
+    /**
+     * Construct an XMLTokener from a string.
+     *
+     * @param s A source string.
+     */
+    public XMLTokener(final String s) {
+        super(s);
+    }
+
+    /**
+     * Get the text in the CDATA block.
+     *
+     * @return The string up to the <code>]]&gt;</code>.
+     * @throws JSONException If the <code>]]&gt;</code> is not found.
+     */
+    public String nextCDATA() throws JSONException {
+        final StringBuilder sb = new StringBuilder();
+        for (; ; ) {
+            char c = next();
+            if (end()) {
+                throw syntaxError("Unclosed CDATA");
+            }
+            sb.append(c);
+            int i = sb.length() - 3;
+            if ((i >= 0) && (sb.charAt(i) == ']') && (sb.charAt(i + 1) == ']') && (sb.charAt(i + 2)
+                == '>')) {
+                sb.setLength(i);
+                return sb.toString();
+            }
+        }
+    }
+
+    /**
+     * Get the next XML outer token, trimming whitespace. There are two kinds of tokens: the '&lt;' character which begins
+     * a markup tag, and the content text between markup tags.
+     *
+     * @return A string, or a '&lt;' Character, or null if there is no more source text.
+     * @throws JSONException
+     */
+    public Object nextContent() throws JSONException {
+        char c;
+        do {
+            c = next();
+        } while (Character.isWhitespace(c));
+        if (c == 0) {
+            return null;
+        }
+        if (c == '<') {
+            return XML.LT;
+        }
+        StringBuilder sb = new StringBuilder();
+        for (; ; ) {
+            if ((c == '<') || (c == 0)) {
+                back();
+                return sb.toString().trim();
+            }
+            if (c == '&') {
+                sb.append(nextEntity('&'));
+            } else {
+                sb.append(c);
+            }
+            c = next();
+        }
+    }
+
+    /**
+     * Return the next entity. These entities are translated to Characters: <code>&amp; &quot; &gt;  &lt;
+     * &quot;</code>.
+     *
+     * @param ampersand An ampersand character.
+     * @return A Character or an entity String if the entity is not recognized.
+     * @throws JSONException If missing ';' in XML entity.
+     */
+    public Object nextEntity(final char ampersand) throws JSONException {
+        final StringBuilder sb = new StringBuilder();
+        for (; ; ) {
+            final char c = next();
+            if (Character.isLetterOrDigit(c) || (c == '#')) {
+                sb.append(Character.toLowerCase(c));
+            } else if (c == ';') {
+                break;
+            } else {
+                throw syntaxError("Missing ';' in XML entity: &" + sb);
+            }
+        }
+        final String string = sb.toString();
+        final Object object = entity.get(string);
+        return object != null ? object : ampersand + string + ';';
+    }
+
+    /**
+     * Returns the next XML meta token. This is used for skipping over <!...> and <?...?> structures.
+     *
+     * @return Syntax characters (<code>&lt; &gt; / = ! ?</code>) are returned as Character, and strings and names are
+     * returned as Boolean. We don't care what the values actually are.
+     * @throws JSONException If a string is not properly closed or if the XML is badly structured.
+     */
+    public Object nextMeta() throws JSONException {
+        char c;
+        do {
+            c = next();
+        } while (Character.isWhitespace(c));
+        char q;
+        switch (c) {
+            case 0:
+                throw syntaxError("Misshaped meta tag");
+            case '<':
+                return XML.LT;
+            case '>':
+                return XML.GT;
+            case '/':
+                return XML.SLASH;
+            case '=':
+                return XML.EQ;
+            case '!':
+                return XML.BANG;
+            case '?':
+                return XML.QUEST;
+            case '"':
+            case '\'':
+                q = c;
+                for (; ; ) {
+                    c = next();
+                    if (c == 0) {
+                        throw syntaxError("Unterminated string");
+                    }
+                    if (c == q) {
+                        return Boolean.TRUE;
+                    }
+                }
+            default:
+                for (; ; ) {
+                    c = next();
+                    if (Character.isWhitespace(c)) {
+                        return Boolean.TRUE;
+                    }
+                    switch (c) {
+                        case 0:
+                        case '<':
+                        case '>':
+                        case '/':
+                        case '=':
+                        case '!':
+                        case '?':
+                        case '"':
+                        case '\'':
+                            back();
+                            return Boolean.TRUE;
+                    }
+                }
+        }
+    }
+
+    /**
+     * Get the next XML Token. These tokens are found inside of angle brackets. It may be one of these characters:
+     * <code>/ &gt;= ! ?</code> or it may be a string wrapped in single quotes or double quotes, or it may be a name.
+     *
+     * @return a String or a Character.
+     * @throws JSONException If the XML is not well formed.
+     */
+    public Object nextToken() throws JSONException {
+        char c;
+        do {
+            c = next();
+        } while (Character.isWhitespace(c));
+        char q;
+        StringBuilder sb;
+        switch (c) {
+            case 0:
+                throw syntaxError("Misshaped element");
+            case '<':
+                throw syntaxError("Misplaced '<'");
+            case '>':
+                return XML.GT;
+            case '/':
+                return XML.SLASH;
+            case '=':
+                return XML.EQ;
+            case '!':
+                return XML.BANG;
+            case '?':
+                return XML.QUEST;
+            // Quoted string
+            case '"':
+            case '\'':
+                q = c;
+                sb = new StringBuilder();
+                for (; ; ) {
+                    c = next();
+                    if (c == 0) {
+                        throw syntaxError("Unterminated string");
+                    }
+                    if (c == q) {
+                        return sb.toString();
+                    }
+                    if (c == '&') {
+                        sb.append(nextEntity('&'));
+                    } else {
+                        sb.append(c);
+                    }
+                }
+            default:
+                // Name
+                sb = new StringBuilder();
+                for (; ; ) {
+                    sb.append(c);
+                    c = next();
+                    if (Character.isWhitespace(c)) {
+                        return sb.toString();
+                    }
+                    switch (c) {
+                        case 0:
+                            return sb.toString();
+                        case '>':
+                        case '/':
+                        case '=':
+                        case '!':
+                        case '?':
+                        case '[':
+                        case ']':
+                            back();
+                            return sb.toString();
+                        case '<':
+                        case '"':
+                        case '\'':
+                            throw syntaxError("Bad character in a name");
+                    }
+                }
+        }
+    }
+
+    /**
+     * Skip characters until past the requested string. If it is not found, we are left at the end of the source with a
+     * result of false.
+     *
+     * @param to A string to skip past.
+     * @throws JSONException
+     */
+    public boolean skipPast(final String to) throws JSONException {
+        char c;
+        int i;
+        final int length = to.length();
+        final char[] circle = new char[length];
+        /*
+         * First fill the circle buffer with as many characters as are in the
+         * to string. If we reach an early end, bail.
+         */
+        for (i = 0; i < length; i += 1) {
+            c = next();
+            if (c == 0) {
+                return false;
+            }
+            circle[i] = c;
+        }
+        /* We will loop, possibly for all of the remaining characters. */
+        for (int offset = 0; ; ) {
+            int j = offset;
+            boolean b = true;
+            /* Compare the circle buffer with the to string. */
+            for (i = 0; i < length; i += 1) {
+                if (circle[j] != to.charAt(i)) {
+                    b = false;
+                    break;
+                }
+                j += 1;
+                if (j >= length) {
+                    j -= length;
+                }
+            }
+            /* If we exit the loop with b intact, then victory is ours. */
+            if (b) {
+                return true;
+            }
+            /* Get the next character. If there isn't one, then defeat is ours. */
+            c = next();
+            if (c == 0) {
+                return false;
+            }
+            /*
+             * Shove the character in the circle buffer and advance the
+             * circle offset. The offset is mod n.
+             */
+            circle[offset] = c;
+            offset += 1;
+            if (offset >= length) {
+                offset -= length;
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
new file mode 100644
index 000000000..2f6559a4e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -0,0 +1,285 @@
+package com.github.intellectualsites.plotsquared.plot;
+
+import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
+import com.github.intellectualsites.plotsquared.plot.logger.ILogger;
+import com.github.intellectualsites.plotsquared.plot.object.BlockRegistry;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
+
+import java.io.File;
+import java.util.List;
+
+public interface IPlotMain extends ILogger {
+
+    /**
+     * Log a message to console.
+     *
+     * @param message The message to log
+     */
+    void log(String message);
+
+    /**
+     * Get the `PlotSquared` directory.
+     *
+     * @return The plugin directory
+     */
+    File getDirectory();
+
+    /**
+     * Get the directory containing all the worlds.
+     *
+     * @return The directory containing the worlds
+     */
+    File getWorldContainer();
+
+    /**
+     * Wrap a player into a PlotPlayer object.
+     *
+     * @param player The player to convert to a PlotPlayer
+     * @return A PlotPlayer
+     */
+    PlotPlayer wrapPlayer(Object player);
+
+    /**
+     * Disable the implementation.
+     *
+     * <ul>
+     * <li>If a full disable isn't feasibly, just disable what it can.
+     * </ul>
+     */
+    void disable();
+
+    /**
+     * Completely shut down the plugin
+     */
+    void shutdown();
+
+    /**
+     * Get the version of the PlotSquared being used.
+     *
+     * @return the plugin version
+     */
+    int[] getPluginVersion();
+
+    /**
+     * Get the version of the PlotSquared being used as a string.
+     *
+     * @return the plugin version as a string
+     */
+    String getPluginVersionString();
+
+    /**
+     * Usually PlotSquared
+     *
+     * @return
+     */
+    default String getPluginName() {
+        return "PlotSquared";
+    }
+
+    /**
+     * Get the version of Minecraft that is running.
+     *
+     * @return
+     */
+    int[] getServerVersion();
+
+    /**
+     * Get the server implementation name and version
+     */
+    String getServerImplementation();
+
+    /**
+     * Get the NMS package prefix.
+     *
+     * @return The NMS package prefix
+     */
+    String getNMSPackage();
+
+    /**
+     * Get the schematic handler.
+     *
+     * @return The {@link SchematicHandler}
+     */
+    SchematicHandler initSchematicHandler();
+
+    /**
+     * Get the Chat Manager.
+     *
+     * @return The {@link ChatManager}
+     */
+    ChatManager initChatManager();
+
+    /**
+     * The task manager will run and manage Minecraft tasks.
+     *
+     * @return
+     */
+    TaskManager getTaskManager();
+
+    /**
+     * Run the task that will kill road mobs.
+     */
+    void runEntityTask();
+
+    /**
+     * Register the implementation specific commands.
+     */
+    void registerCommands();
+
+    /**
+     * Register the protection system.
+     */
+    void registerPlayerEvents();
+
+    /**
+     * Register inventory related events.
+     */
+    void registerInventoryEvents();
+
+    /**
+     * Register plot plus related events.
+     */
+    void registerPlotPlusEvents();
+
+    /**
+     * Register force field events.
+     */
+    void registerForceFieldEvents();
+
+    /**
+     * Register the WorldEdit hook.
+     */
+    boolean initWorldEdit();
+
+    /**
+     * Get the economy provider.
+     *
+     * @return
+     */
+    EconHandler getEconomyHandler();
+
+    /**
+     * Get the {@link QueueProvider} class.
+     *
+     * @return
+     */
+    QueueProvider initBlockQueue();
+
+    /**
+     * Get the {@link WorldUtil} class.
+     *
+     * @return
+     */
+    WorldUtil initWorldUtil();
+
+    /**
+     * Get the EventUtil class.
+     *
+     * @return
+     */
+    EventUtil initEventUtil();
+
+    /**
+     * Get the chunk manager.
+     *
+     * @return
+     */
+    ChunkManager initChunkManager();
+
+    /**
+     * Get the {@link SetupUtils} class.
+     *
+     * @return
+     */
+    SetupUtils initSetupUtils();
+
+    /**
+     * Get {@link HybridUtils} class.
+     *
+     * @return
+     */
+    HybridUtils initHybridUtils();
+
+    /**
+     * Start Metrics.
+     */
+    void startMetrics();
+
+    /**
+     * If a world is already loaded, set the generator (use NMS if required).
+     *
+     * @param world The world to set the generator
+     */
+    void setGenerator(String world);
+
+    /**
+     * Get the {@link UUIDHandlerImplementation} which will cache and
+     * provide UUIDs.
+     *
+     * @return
+     */
+    UUIDHandlerImplementation initUUIDHandler();
+
+    /**
+     * Get the {@link InventoryUtil} class (used for implementation specific
+     * inventory guis).
+     *
+     * @return
+     */
+    InventoryUtil initInventoryUtil();
+
+    /**
+     * Unregister a PlotPlayer from cache e.g. if they have logged off.
+     *
+     * @param player
+     */
+    void unregister(PlotPlayer player);
+
+    /**
+     * Get the generator wrapper for a world (world) and generator (name).
+     *
+     * @param world
+     * @param name
+     * @return
+     */
+    GeneratorWrapper<?> getGenerator(String world, String name);
+
+    GeneratorWrapper<?> wrapPlotGenerator(String world, IndependentPlotGenerator generator);
+
+    /**
+     * Register the chunk processor which will clean out chunks that have too
+     * many blockstates or entities.
+     */
+    void registerChunkProcessor();
+
+    /**
+     * Register the world initialization events (used to keep track of worlds
+     * being generated).
+     */
+    void registerWorldEvents();
+
+    /**
+     * Usually HybridGen
+     *
+     * @return Default implementation generator
+     */
+    IndependentPlotGenerator getDefaultGenerator();
+
+    /**
+     * Get the class that will manage player titles.
+     *
+     * @return
+     */
+    AbstractTitle initTitleManager();
+
+    List<String> getPluginIds();
+
+    BlockRegistry<?> getBlockRegistry();
+
+    LegacyMappings getLegacyMappings();
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
new file mode 100644
index 000000000..9dfbf2ffb
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
@@ -0,0 +1,6 @@
+package com.github.intellectualsites.plotsquared.plot;
+
+public enum Platform {
+    Bukkit, Sponge, Spigot
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
new file mode 100644
index 000000000..63bbf8142
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -0,0 +1,2066 @@
+package com.github.intellectualsites.plotsquared.plot;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.configuration.MemorySection;
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
+import com.github.intellectualsites.plotsquared.plot.commands.WE_Anywhere;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.config.Storage;
+import com.github.intellectualsites.plotsquared.plot.database.*;
+import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
+import com.github.intellectualsites.plotsquared.plot.listener.WESubscriber;
+import com.github.intellectualsites.plotsquared.plot.logger.ILogger;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpiryTask;
+import com.sk89q.worldedit.WorldEdit;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+
+import javax.annotation.Nullable;
+import java.io.*;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+/**
+ * An implementation of the core, with a static getter for easy access.
+ */
+@SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
+
+    private static final Set<Plot> EMPTY_SET = Collections.unmodifiableSet(Collections.emptySet());
+    private static PlotSquared instance;
+    // Implementation
+    public final IPlotMain IMP;
+    // Current thread
+    private final Thread thread;
+    // WorldEdit instance
+    public WorldEdit worldedit;
+    public File styleFile;
+    public File configFile;
+    public File worldsFile;
+    public File commandsFile;
+    public File translationFile;
+    public YamlConfiguration style;
+    public YamlConfiguration config;
+    public YamlConfiguration worlds;
+    public YamlConfiguration storage;
+    public YamlConfiguration commands;
+    // Temporary hold the plots/clusters before the worlds load
+    public HashMap<String, Set<PlotCluster>> clusters_tmp;
+    public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
+    // Implementation logger
+    @Setter @Getter private ILogger logger;
+    // Platform / Version / Update URL
+    private PlotVersion version;
+    // Files and configuration
+    @Getter private File jarFile = null; // This file
+    private File storageFile;
+    @Getter private PlotAreaManager plotAreaManager;
+
+    /**
+     * Initialize PlotSquared with the desired Implementation class.
+     *
+     * @param iPlotMain Implementation of {@link IPlotMain} used
+     * @param platform  The platform being used
+     */
+    public PlotSquared(final IPlotMain iPlotMain, final String platform) {
+        if (instance != null) {
+            throw new IllegalStateException("Cannot re-initialize the PlotSquared singleton");
+        }
+        instance = this;
+
+        this.thread = Thread.currentThread();
+        this.IMP = iPlotMain;
+        this.logger = iPlotMain;
+        Settings.PLATFORM = platform;
+
+        //
+        // Register configuration serializable classes
+        //
+        ConfigurationSerialization.registerClass(PlotBlock.class, "PlotBlock");
+        ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
+
+        try {
+            new ReflectionUtils(this.IMP.getNMSPackage());
+            try {
+                URL url = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
+                this.jarFile = new File(
+                    new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
+                        .toURI().getPath());
+            } catch (MalformedURLException | URISyntaxException | SecurityException e) {
+                e.printStackTrace();
+                this.jarFile = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar");
+                if (!this.jarFile.exists()) {
+                    this.jarFile = new File(this.IMP.getDirectory().getParentFile(),
+                        "PlotSquared-" + platform + ".jar");
+                }
+            }
+            TaskManager.IMP = this.IMP.getTaskManager();
+
+            // World Util. Has to be done before config files are loaded
+            WorldUtil.IMP = this.IMP.initWorldUtil();
+
+            if (!setupConfigs()) {
+                return;
+            }
+            this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
+                Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
+                    + ".use_THIS.yml");
+            C.load(this.translationFile);
+
+            // Setup plotAreaManager
+            if (Settings.Enabled_Components.WORLDS) {
+                this.plotAreaManager = new SinglePlotAreaManager();
+            } else {
+                this.plotAreaManager = new DefaultPlotAreaManager();
+            }
+
+            // Database
+            if (Settings.Enabled_Components.DATABASE) {
+                setupDatabase();
+            }
+            // Comments
+            CommentManager.registerDefaultInboxes();
+            // Kill entities
+            if (Settings.Enabled_Components.KILL_ROAD_MOBS
+                || Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+                this.IMP.runEntityTask();
+            }
+            if (Settings.Enabled_Components.EVENTS) {
+                this.IMP.registerPlayerEvents();
+                this.IMP.registerInventoryEvents();
+                this.IMP.registerPlotPlusEvents();
+            }
+            // Required
+            this.IMP.registerWorldEvents();
+            if (Settings.Enabled_Components.METRICS) {
+                this.IMP.startMetrics();
+            } else {
+                PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
+            }
+            if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
+                this.IMP.registerChunkProcessor();
+            }
+            // create UUIDWrapper
+            UUIDHandler.implementation = this.IMP.initUUIDHandler();
+            if (Settings.Enabled_Components.UUID_CACHE) {
+                startUuidCatching();
+            } else {
+                // Start these separately
+                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+                startExpiryTasks();
+            }
+            // create event util class
+            EventUtil.manager = this.IMP.initEventUtil();
+            // create Hybrid utility class
+            HybridUtils.manager = this.IMP.initHybridUtils();
+            // Inventory utility class
+            InventoryUtil.manager = this.IMP.initInventoryUtil();
+            // create setup util class
+            SetupUtils.manager = this.IMP.initSetupUtils();
+            // Set block
+            GlobalBlockQueue.IMP = new GlobalBlockQueue(IMP.initBlockQueue(), 1);
+            GlobalBlockQueue.IMP.runTask();
+            // Set chunk
+            ChunkManager.manager = this.IMP.initChunkManager();
+            // Schematic handler
+            SchematicHandler.manager = this.IMP.initSchematicHandler();
+            // Titles
+            AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
+            // Chat
+            ChatManager.manager = this.IMP.initChatManager();
+            // Commands
+            if (Settings.Enabled_Components.COMMANDS) {
+                this.IMP.registerCommands();
+            }
+            // WorldEdit
+            if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
+                try {
+                    if (this.IMP.initWorldEdit()) {
+                        PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
+                        this.worldedit = WorldEdit.getInstance();
+                        WorldEdit.getInstance().getEventBus().register(new WESubscriber());
+                        if (Settings.Enabled_Components.COMMANDS) {
+                            new WE_Anywhere();
+                        }
+
+                    }
+                } catch (Throwable e) {
+                    PlotSquared.debug(
+                        "Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
+                }
+            }
+            // Economy
+            if (Settings.Enabled_Components.ECONOMY) {
+                TaskManager
+                    .runTask(() -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
+            }
+
+/*            // Check for updates
+            if (Settings.Enabled_Components.UPDATER) {
+                updater = new Updater();
+                TaskManager.IMP.taskAsync(new Runnable() {
+                    @Override public void run() {
+                        updater.update(getPlatform(), getVersion());
+                    }
+                });
+                TaskManager.IMP.taskRepeatAsync(new Runnable() {
+                    @Override public void run() {
+                        updater.update(getPlatform(), getVersion());
+                    }
+                }, 36000);
+            }*/
+
+            // World generators:
+            final ConfigurationSection section = this.worlds.getConfigurationSection("worlds");
+            if (section != null) {
+                for (String world : section.getKeys(false)) {
+                    if (world.equals("CheckingPlotSquaredGenerator")) {
+                        continue;
+                    }
+                    if (WorldUtil.IMP.isWorld(world)) {
+                        this.IMP.setGenerator(world);
+                    }
+                }
+                TaskManager.runTaskLater(() -> {
+                    for (String world : section.getKeys(false)) {
+                        if (world.equals("CheckingPlotSquaredGenerator")) {
+                            continue;
+                        }
+                        if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
+                            debug(
+                                "&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
+                                    + " will now try to load it properly: ");
+                            debug(
+                                "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
+                            debug(
+                                "&8 - &7Your world management plugin may be faulty (or non existent)");
+                            PlotSquared.this.IMP.setGenerator(world);
+                        }
+                    }
+                }, 1);
+            }
+
+            // Copy files
+            copyFile("addplots.js", Settings.Paths.SCRIPTS);
+            copyFile("addsigns.js", Settings.Paths.SCRIPTS);
+            copyFile("automerge.js", Settings.Paths.SCRIPTS);
+            copyFile("furthest.js", Settings.Paths.SCRIPTS);
+            copyFile("mycommand.js", Settings.Paths.SCRIPTS);
+            copyFile("setbiomes.js", Settings.Paths.SCRIPTS);
+            copyFile("start.js", Settings.Paths.SCRIPTS);
+            copyFile("town.template", Settings.Paths.TEMPLATES);
+            copyFile("skyblock.template", Settings.Paths.TEMPLATES);
+            copyFile("bridge.template", Settings.Paths.TEMPLATES);
+            copyFile("de-DE.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("es-ES.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("zh-CN.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("it-IT.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("ko-KR.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("fr-FR.yml", Settings.Paths.TRANSLATIONS);
+            showDebug();
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
+        PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
+    }
+
+    /**
+     * Get an instance of PlotSquared.
+     *
+     * @return instance of PlotSquared
+     */
+    public static PlotSquared get() {
+        return PlotSquared.instance;
+    }
+
+    public static IPlotMain imp() {
+        if (instance != null) {
+            return instance.IMP;
+        }
+        return null;
+    }
+
+    /**
+     * Log a message to the IPlotMain logger.
+     *
+     * @param message Message to log
+     * @see IPlotMain#log(String)
+     */
+    public static void log(Object message) {
+        if (message == null || message.toString().isEmpty()) {
+            return;
+        }
+        if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
+            System.out.printf("[P2][Info] %s\n", StringMan.getString(message));
+        } else {
+            PlotSquared.get().getLogger().log(StringMan.getString(message));
+        }
+    }
+
+    /**
+     * Log a message to the IPlotMain logger.
+     *
+     * @param message Message to log
+     * @see IPlotMain#log(String)
+     */
+    public static void debug(@Nullable Object message) {
+        if (Settings.DEBUG) {
+            if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
+                System.out.printf("[P2][Debug] %s\n", StringMan.getString(message));
+            } else {
+                PlotSquared.get().getLogger().log(StringMan.getString(message));
+            }
+        }
+    }
+
+    private void startUuidCatching() {
+        TaskManager.runTaskLater(() -> {
+            debug("Starting UUID caching");
+            UUIDHandler.startCaching(() -> {
+                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+                foreachPlotRaw(new RunnableVal<Plot>() {
+                    @Override public void run(Plot plot) {
+                        if (plot.hasOwner() && plot.temp != -1) {
+                            if (UUIDHandler.getName(plot.owner) == null) {
+                                UUIDHandler.implementation.unknown.add(plot.owner);
+                            }
+                        }
+                    }
+                });
+                startExpiryTasks();
+            });
+        }, 20);
+    }
+
+    private void startExpiryTasks() {
+        if (Settings.Enabled_Components.PLOT_EXPIRY) {
+            ExpireManager.IMP = new ExpireManager();
+            ExpireManager.IMP.runAutomatedTask();
+            for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
+                ExpiryTask task = new ExpiryTask(settings);
+                ExpireManager.IMP.addTask(task);
+            }
+        }
+    }
+
+    public boolean isMainThread(Thread thread) {
+        return this.thread == thread;
+    }
+
+    /**
+     * Check if `version` is >= `version2`.
+     *
+     * @param version  First version
+     * @param version2 Second version
+     * @return true if `version` is >= `version2`
+     */
+    public boolean checkVersion(int[] version, int... version2) {
+        return version[0] > version2[0] || version[0] == version2[0] && version[1] > version2[1]
+            || version[0] == version2[0] && version[1] == version2[1] && version[2] >= version2[2];
+    }
+
+    /**
+     * Get the current PlotSquared version.
+     *
+     * @return current version in config or null
+     */
+    public PlotVersion getVersion() {
+        return this.version;
+    }
+
+    /**
+     * Get the server platform this plugin is running on this is running on.
+     * <p>
+     * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
+     *
+     * @return the server implementation
+     */
+    public String getPlatform() {
+        return Settings.PLATFORM;
+    }
+
+    public PlotManager getPlotManager(Plot plot) {
+        return plot.getArea().manager;
+    }
+
+    public PlotManager getPlotManager(Location location) {
+        PlotArea pa = getPlotAreaAbs(location);
+        return pa != null ? pa.manager : null;
+    }
+
+    /**
+     * Add a global reference to a plot world.
+     *
+     * @param plotArea the {@code PlotArea} to add.
+     * @see #removePlotArea(PlotArea) To remove the reference
+     */
+    public void addPlotArea(PlotArea plotArea) {
+        HashMap<PlotId, Plot> plots;
+        if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
+            if (plotArea.TYPE == 2) {
+                plots = this.plots_tmp != null ? this.plots_tmp.get(plotArea.worldname) : null;
+                if (plots != null) {
+                    Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
+                    while (iterator.hasNext()) {
+                        Entry<PlotId, Plot> next = iterator.next();
+                        PlotId id = next.getKey();
+                        if (plotArea.contains(id)) {
+                            next.getValue().setArea(plotArea);
+                            iterator.remove();
+                        }
+                    }
+                }
+            }
+        } else {
+            for (Plot entry : plots.values()) {
+                entry.setArea(plotArea);
+            }
+        }
+        Set<PlotCluster> clusters;
+        if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
+            if (plotArea.TYPE == 2) {
+                clusters =
+                    this.clusters_tmp != null ? this.clusters_tmp.get(plotArea.worldname) : null;
+                if (clusters != null) {
+                    Iterator<PlotCluster> iterator = clusters.iterator();
+                    while (iterator.hasNext()) {
+                        PlotCluster next = iterator.next();
+                        if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
+                            next.setArea(plotArea);
+                            iterator.remove();
+                        }
+                    }
+                }
+            }
+        } else {
+            for (PlotCluster cluster : clusters) {
+                cluster.setArea(plotArea);
+            }
+        }
+        plotAreaManager.addPlotArea(plotArea);
+        plotArea.setupBorder();
+    }
+
+    /**
+     * Remove a plot world reference.
+     *
+     * @param area the {@code PlotArea} to remove
+     */
+    public void removePlotArea(PlotArea area) {
+        plotAreaManager.removePlotArea(area);
+        setPlotsTmp(area);
+    }
+
+    public void removePlotAreas(String world) {
+        for (PlotArea area : getPlotAreas(world)) {
+            if (area.worldname.equals(world)) {
+                removePlotArea(area);
+            }
+        }
+    }
+
+    private void setPlotsTmp(PlotArea area) {
+        if (this.plots_tmp == null) {
+            this.plots_tmp = new HashMap<>();
+        }
+        HashMap<PlotId, Plot> map =
+            this.plots_tmp.computeIfAbsent(area.toString(), k -> new HashMap<>());
+        for (Plot plot : area.getPlots()) {
+            map.put(plot.getId(), plot);
+        }
+        if (this.clusters_tmp == null) {
+            this.clusters_tmp = new HashMap<>();
+        }
+        this.clusters_tmp.put(area.toString(), area.getClusters());
+    }
+
+    public Set<PlotCluster> getClusters(String world) {
+        Set<PlotCluster> set = new HashSet<>();
+        for (PlotArea area : getPlotAreas(world)) {
+            set.addAll(area.getClusters());
+        }
+        return Collections.unmodifiableSet(set);
+
+    }
+
+    /**
+     * Get all the base plots in a single set (for merged plots it just returns the bottom plot).
+     *
+     * @return Set of base Plots
+     */
+    public Set<Plot> getBasePlots() {
+        int size = getPlotCount();
+        final Set<Plot> result = new HashSet<>(size);
+        foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                for (Plot plot : value.getPlots()) {
+                    if (!plot.isBasePlot()) {
+                        continue;
+                    }
+                    result.add(plot);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(result);
+    }
+
+    public List<Plot> sortPlotsByTemp(Collection<Plot> plots) {
+        int max = 0;
+        int overflowCount = 0;
+        for (Plot plot : plots) {
+            if (plot.temp > 0) {
+                if (plot.temp > max) {
+                    max = plot.temp;
+                }
+            } else {
+                overflowCount++;
+            }
+        }
+        Plot[] array = new Plot[max + 1];
+        List<Plot> overflow = new ArrayList<>(overflowCount);
+        for (Plot plot : plots) {
+            if (plot.temp <= 0) {
+                overflow.add(plot);
+            } else {
+                array[plot.temp] = plot;
+            }
+        }
+        ArrayList<Plot> result = new ArrayList<>(plots.size());
+        for (Plot plot : array) {
+            if (plot != null) {
+                result.add(plot);
+            }
+        }
+        overflow.sort(Comparator.comparingInt(Plot::hashCode));
+        result.addAll(overflow);
+        return result;
+    }
+
+    /**
+     * Sort plots by hashcode.
+     *
+     * @param plots the collection of plots to sort
+     * @return the sorted collection {@link #sortPlots(Collection, SortType, PlotArea)} which has
+     * additional checks before calling this
+     */
+    // TODO: Re-evaluate this (previously public and deprecated), as it's being used internally
+    private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
+        int hardmax = 256000;
+        int max = 0;
+        int overflowSize = 0;
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash > max) {
+                if (hash >= hardmax) {
+                    overflowSize++;
+                } else {
+                    max = hash;
+                }
+            }
+        }
+        hardmax = Math.min(hardmax, max);
+        Plot[] cache = new Plot[hardmax + 1];
+        List<Plot> overflow = new ArrayList<>(overflowSize);
+        ArrayList<Plot> extra = new ArrayList<>();
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash < hardmax) {
+                if (hash >= 0) {
+                    cache[hash] = plot;
+                } else {
+                    extra.add(plot);
+                }
+            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
+                extra.add(plot);
+            } else {
+                overflow.add(plot);
+            }
+        }
+        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        sortPlotsByHash(overflowArray);
+        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
+        for (Plot plot : cache) {
+            if (plot != null) {
+                result.add(plot);
+            }
+        }
+        Collections.addAll(result, overflowArray);
+        result.addAll(extra);
+        return result;
+    }
+
+    private void sortPlotsByHash(Plot[] input) {
+        List<Plot>[] bucket = new ArrayList[32];
+        for (int i = 0; i < bucket.length; i++) {
+            bucket[i] = new ArrayList<>();
+        }
+        boolean maxLength = false;
+        int placement = 1;
+        while (!maxLength) {
+            maxLength = true;
+            for (Plot i : input) {
+                int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
+                bucket[tmp & 31].add(i);
+                if (maxLength && tmp > 0) {
+                    maxLength = false;
+                }
+            }
+            int a = 0;
+            for (int b = 0; b < 32; b++) {
+                for (Plot i : bucket[b]) {
+                    input[a++] = i;
+                }
+                bucket[b].clear();
+            }
+            placement *= 32;
+        }
+    }
+
+    private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
+        int hardMax = 256000;
+        int max = 0;
+        int overflowSize = 0;
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash > max) {
+                if (hash >= hardMax) {
+                    overflowSize++;
+                } else {
+                    max = hash;
+                }
+            }
+        }
+        hardMax = Math.min(hardMax, max);
+        Plot[] cache = new Plot[hardMax + 1];
+        List<Plot> overflow = new ArrayList<>(overflowSize);
+        ArrayList<Plot> extra = new ArrayList<>();
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash < hardMax) {
+                if (hash >= 0) {
+                    cache[hash] = plot;
+                } else {
+                    extra.add(plot);
+                }
+            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
+                extra.add(plot);
+            } else {
+                overflow.add(plot);
+            }
+        }
+        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        sortPlotsByHash(overflowArray);
+        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
+        for (Plot plot : cache) {
+            if (plot != null) {
+                result.add(plot);
+            }
+        }
+        Collections.addAll(result, overflowArray);
+        result.addAll(extra);
+        return result;
+    }
+
+    /**
+     * Sort plots by creation timestamp.
+     */
+
+    private List<Plot> sortPlotsByModified(Collection<Plot> input) {
+        List<Plot> list;
+        if (input instanceof List) {
+            list = (List<Plot>) input;
+        } else {
+            list = new ArrayList<>(input);
+        }
+        list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
+        return list;
+    }
+
+    /**
+     * Sort a collection of plots by world (with a priority world), then by hashcode.
+     *
+     * @param plots        the plots to sort
+     * @param type         The sorting method to use for each world (timestamp, or hash)
+     * @param priorityArea Use null, "world", or "gibberish" if you want default world order
+     * @return ArrayList of plot
+     */
+    public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
+        final PlotArea priorityArea) {
+        // group by world
+        // sort each
+        HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
+        int totalSize = getPlotCount();
+        if (plots.size() == totalSize) {
+            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+                map.put(area, area.getPlots());
+            }
+        } else {
+            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+                map.put(area, new ArrayList<>(0));
+            }
+            Collection<Plot> lastList = null;
+            PlotArea lastWorld = null;
+            for (Plot plot : plots) {
+                if (lastWorld == plot.getArea()) {
+                    lastList.add(plot);
+                } else {
+                    lastWorld = plot.getArea();
+                    lastList = map.get(lastWorld);
+                    lastList.add(plot);
+                }
+            }
+        }
+        List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
+        areas.sort((a, b) -> {
+            if (priorityArea != null) {
+                if (a.equals(priorityArea)) {
+                    return -1;
+                } else if (b.equals(priorityArea)) {
+                    return 1;
+                }
+            }
+            return a.hashCode() - b.hashCode();
+        });
+        ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
+        for (PlotArea area : areas) {
+            switch (type) {
+                case CREATION_DATE:
+                    toReturn.addAll(sortPlotsByTemp(map.get(area)));
+                    break;
+                case CREATION_DATE_TIMESTAMP:
+                    toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
+                    break;
+                case DISTANCE_FROM_ORIGIN:
+                    toReturn.addAll(sortPlotsByHash(map.get(area)));
+                    break;
+                case LAST_MODIFIED:
+                    toReturn.addAll(sortPlotsByModified(map.get(area)));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return toReturn;
+    }
+
+    /**
+     * A more generic way to filter plots - make your own method if you need complex filters.
+     *
+     * @param filters the filter
+     * @return a filtered set of plots
+     */
+    public Set<Plot> getPlots(final PlotFilter... filters) {
+        final HashSet<Plot> set = new HashSet<>();
+        foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                for (PlotFilter filter : filters) {
+                    if (!filter.allowsArea(value)) {
+                        return;
+                    }
+                }
+                loop:
+                for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
+                    Plot plot = entry2.getValue();
+                    for (PlotFilter filter : filters) {
+                        if (!filter.allowsPlot(plot)) {
+                            continue loop;
+                        }
+                    }
+                    set.add(plot);
+                }
+            }
+        });
+        return set;
+    }
+
+    /**
+     * Get all the plots in a single set.
+     *
+     * @return Set of Plots
+     */
+    public Set<Plot> getPlots() {
+        int size = getPlotCount();
+        final Set<Plot> result = new HashSet<>(size);
+        foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                result.addAll(value.getPlots());
+            }
+        });
+        return result;
+    }
+
+    //TODO look at uncommenting or deleting tis. Is it useful and will it work?
+    //If it is readded make sure there is proper javadoc documentation for it.
+/*
+  public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
+    if (this.plots_tmp == null) {
+      this.plots_tmp = new HashMap<>();
+    }
+    for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
+      String world = entry.getKey();
+      PlotArea area = getPlotArea(world, null);
+      if (area == null) {
+        HashMap<PlotId, Plot> map = this.plots_tmp
+            .computeIfAbsent(world, k -> new HashMap<>());
+        map.putAll(entry.getValue());
+      } else {
+        for (Plot plot : entry.getValue().values()) {
+          plot.setArea(area);
+          area.addPlot(plot);
+        }
+      }
+    }
+  }
+*/
+
+    /**
+     * Get all the plots owned by a player name.
+     *
+     * @param world  the world
+     * @param player the plot owner
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlots(String world, String player) {
+        final UUID uuid = UUIDHandler.getUUID(player, null);
+        return getPlots(world, uuid);
+    }
+
+    /**
+     * Get all the plots owned by a player name.
+     *
+     * @param area   the PlotArea
+     * @param player the plot owner
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlots(PlotArea area, String player) {
+        UUID uuid = UUIDHandler.getUUID(player, null);
+        return getPlots(area, uuid);
+    }
+
+    /**
+     * Get all plots by a PlotPlayer.
+     *
+     * @param world  the world
+     * @param player the plot owner
+     * @return Set of plot
+     */
+    public Set<Plot> getPlots(String world, PlotPlayer player) {
+        return getPlots(world, player.getUUID());
+    }
+
+    /**
+     * Get all plots by a PlotPlayer.
+     *
+     * @param area   the PlotArea
+     * @param player the plot owner
+     * @return Set of plot
+     */
+    public Set<Plot> getPlots(PlotArea area, PlotPlayer player) {
+        return getPlots(area, player.getUUID());
+    }
+
+    /**
+     * Get all plots by a UUID in a world.
+     *
+     * @param world the world
+     * @param uuid  the plot owner
+     * @return Set of plot
+     */
+    public Set<Plot> getPlots(String world, UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        for (final Plot plot : getPlots(world)) {
+            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
+                plots.add(plot);
+            }
+        }
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Get all plots by a UUID in an area.
+     *
+     * @param area the {@code PlotArea}
+     * @param uuid the plot owner
+     * @return Set of plots
+     */
+    public Set<Plot> getPlots(PlotArea area, UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        for (Plot plot : getPlots(area)) {
+            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
+                plots.add(plot);
+            }
+        }
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Check if a plot world.
+     *
+     * @param world the world
+     * @return if a plot world is registered
+     * @see #getPlotAreaByString(String) to get the PlotArea object
+     */
+    public boolean hasPlotArea(String world) {
+        return plotAreaManager.getPlotAreas(world, null).length != 0;
+    }
+
+    public Collection<Plot> getPlots(String world) {
+        final Set<Plot> set = new HashSet<>();
+        foreachPlotArea(world, new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                set.addAll(value.getPlots());
+            }
+        });
+        return set;
+    }
+
+    /**
+     * Get the plots for a PlotPlayer.
+     *
+     * @param player the player to retrieve the plots for
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlots(PlotPlayer player) {
+        return getPlots(player.getUUID());
+    }
+
+    public Collection<Plot> getPlots(PlotArea area) {
+        return area == null ? EMPTY_SET : area.getPlots();
+    }
+
+    public Plot getPlot(PlotArea area, PlotId id) {
+        return area == null ? null : id == null ? null : area.getPlot(id);
+    }
+
+    public Set<Plot> getBasePlots(PlotPlayer player) {
+        return getBasePlots(player.getUUID());
+    }
+
+    /**
+     * Get the plots for a UUID.
+     *
+     * @param uuid the plot owner
+     * @return Set of Plot's owned by the player
+     */
+    public Set<Plot> getPlots(final UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        foreachPlot(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (value.isOwnerAbs(uuid)) {
+                    plots.add(value);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(plots);
+    }
+
+    public boolean hasPlot(final UUID uuid) {
+        for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
+            if (area.hasPlot(uuid)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public Set<Plot> getBasePlots(final UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        foreachBasePlot(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (value.isOwner(uuid)) {
+                    plots.add(value);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Get the plots for a UUID.
+     *
+     * @param uuid the UUID of the owner
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlotsAbs(final UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        foreachPlot(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (value.isOwnerAbs(uuid)) {
+                    plots.add(value);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Unregister a plot from local memory (does not call DB).
+     *
+     * @param plot      the plot to remove
+     * @param callEvent If to call an event about the plot being removed
+     * @return true if plot existed | false if it didn't
+     */
+    public boolean removePlot(Plot plot, boolean callEvent) {
+        if (plot == null) {
+            return false;
+        }
+        if (callEvent) {
+            EventUtil.manager.callDelete(plot);
+        }
+        if (plot.getArea().removePlot(plot.getId())) {
+            PlotId last = (PlotId) plot.getArea().getMeta("lastPlot");
+            int last_max = Math.max(Math.abs(last.x), Math.abs(last.y));
+            int this_max = Math.max(Math.abs(plot.getId().x), Math.abs(plot.getId().y));
+            if (this_max < last_max) {
+                plot.getArea().setMeta("lastPlot", plot.getId());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * This method is called by the PlotGenerator class normally.
+     * <ul>
+     * <li>Initializes the PlotArea and PlotManager classes
+     * <li>Registers the PlotArea and PlotManager classes
+     * <li>Loads (and/or generates) the PlotArea configuration
+     * <li>Sets up the world border if configured
+     * </ul>
+     *
+     * <p>If loading an augmented plot world:
+     * <ul>
+     * <li>Creates the AugmentedPopulator classes
+     * <li>Injects the AugmentedPopulator classes if required
+     * </ul>
+     *
+     * @param world         the world to load
+     * @param baseGenerator The generator for that world, or null
+     */
+    public void loadWorld(String world, GeneratorWrapper<?> baseGenerator) {
+        if (world.equals("CheckingPlotSquaredGenerator")) {
+            return;
+        }
+        this.plotAreaManager.addWorld(world);
+        Set<String> worlds;
+        if (this.worlds.contains("worlds")) {
+            worlds = this.worlds.getConfigurationSection("worlds").getKeys(false);
+        } else {
+            worlds = new HashSet<>();
+        }
+        String path = "worlds." + world;
+        ConfigurationSection worldSection = this.worlds.getConfigurationSection(path);
+        int type;
+        if (worldSection != null) {
+            type = worldSection.getInt("generator.type", 0);
+        } else {
+            type = 0;
+        }
+        if (type == 0) {
+            if (plotAreaManager.getPlotAreas(world, null).length != 0) {
+                debug("World possibly already loaded: " + world);
+                return;
+            }
+            IndependentPlotGenerator plotGenerator;
+            if (baseGenerator != null && baseGenerator.isFull()) {
+                plotGenerator = baseGenerator.getPlotGenerator();
+            } else if (worldSection != null) {
+                String secondaryGeneratorName = worldSection.getString("generator.plugin");
+                GeneratorWrapper<?> secondaryGenerator =
+                    this.IMP.getGenerator(world, secondaryGeneratorName);
+                if (secondaryGenerator != null && secondaryGenerator.isFull()) {
+                    plotGenerator = secondaryGenerator.getPlotGenerator();
+                } else {
+                    String primaryGeneratorName = worldSection.getString("generator.init");
+                    GeneratorWrapper<?> primaryGenerator =
+                        this.IMP.getGenerator(world, primaryGeneratorName);
+                    if (primaryGenerator != null && primaryGenerator.isFull()) {
+                        plotGenerator = primaryGenerator.getPlotGenerator();
+                    } else {
+                        return;
+                    }
+                }
+            } else {
+                return;
+            }
+            // Conventional plot generator
+            PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
+            PlotManager plotManager = plotGenerator.getNewPlotManager();
+            PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+            PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
+            PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
+            PlotSquared
+                .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
+            if (!this.worlds.contains(path)) {
+                this.worlds.createSection(path);
+                worldSection = this.worlds.getConfigurationSection(path);
+            }
+            plotArea.saveConfiguration(worldSection);
+            plotArea.loadDefaultConfiguration(worldSection);
+            try {
+                this.worlds.save(this.worldsFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            // Now add it
+            addPlotArea(plotArea);
+            plotGenerator.initialize(plotArea);
+        } else {
+            if (!worlds.contains(world)) {
+                return;
+            }
+            ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
+            if (areasSection == null) {
+                if (plotAreaManager.getPlotAreas(world, null).length != 0) {
+                    debug("World possibly already loaded: " + world);
+                    return;
+                }
+                PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+                String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
+                if (type == 2) {
+                    Set<PlotCluster> clusters =
+                        this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<>();
+                    if (clusters == null) {
+                        throw new IllegalArgumentException("No cluster exists for world: " + world);
+                    }
+                    ArrayDeque<PlotArea> toLoad = new ArrayDeque<>();
+                    for (PlotCluster cluster : clusters) {
+                        PlotId pos1 = cluster.getP1(); // Cluster pos1
+                        PlotId pos2 = cluster.getP2(); // Cluster pos2
+                        String name = cluster.getName(); // Cluster name
+                        String fullId = name + "-" + pos1 + "-" + pos2;
+                        worldSection.createSection("areas." + fullId);
+                        DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
+
+                        PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
+                        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+                        if (areaGen == null) {
+                            throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+                        }
+                        PlotArea pa =
+                            areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
+                        pa.saveConfiguration(worldSection);
+                        pa.loadDefaultConfiguration(worldSection);
+                        try {
+                            this.worlds.save(this.worldsFile);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        PlotSquared
+                            .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+                        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
+                        PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
+                            + " (invalid or old configuration?)");
+                        areaGen.getPlotGenerator().initialize(pa);
+                        areaGen.augment(pa);
+                        toLoad.add(pa);
+                    }
+                    for (PlotArea area : toLoad) {
+                        addPlotArea(area);
+                    }
+                    return;
+                }
+                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+                if (areaGen == null) {
+                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+                }
+                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
+                pa.saveConfiguration(worldSection);
+                pa.loadDefaultConfiguration(worldSection);
+                try {
+                    this.worlds.save(this.worldsFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
+                PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
+                PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
+                areaGen.getPlotGenerator().initialize(pa);
+                areaGen.augment(pa);
+                addPlotArea(pa);
+                return;
+            }
+            if (type == 1) {
+                throw new IllegalArgumentException(
+                    "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
+            }
+            for (String areaId : areasSection.getKeys(false)) {
+                PlotSquared.log(C.PREFIX + "&3 - " + areaId);
+                String[] split = areaId.split("(?<=[^;-])-");
+                if (split.length != 3) {
+                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
+                        + ". Expected form `<name>-<pos1>-<pos2>`");
+                }
+                String name = split[0];
+                PlotId pos1 = PlotId.fromString(split[1]);
+                PlotId pos2 = PlotId.fromString(split[2]);
+                if (pos1 == null || pos2 == null || name.isEmpty()) {
+                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
+                        + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
+                }
+                PlotArea existing = getPlotArea(world, name);
+                if (existing != null && name.equals(existing.id)) {
+                    continue;
+                }
+                ConfigurationSection section = areasSection.getConfigurationSection(areaId);
+                YamlConfiguration clone = new YamlConfiguration();
+                for (String key : section.getKeys(true)) {
+                    if (section.get(key) instanceof MemorySection) {
+                        continue;
+                    }
+                    if (!clone.contains(key)) {
+                        clone.set(key, section.get(key));
+                    }
+                }
+                for (String key : worldSection.getKeys(true)) {
+                    if (worldSection.get(key) instanceof MemorySection) {
+                        continue;
+                    }
+                    if (!key.startsWith("areas") && !clone.contains(key)) {
+                        clone.set(key, worldSection.get(key));
+                    }
+                }
+                String gen_string = clone.getString("generator.plugin", IMP.getPluginName());
+                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+                if (areaGen == null) {
+                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+                }
+                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
+                pa.saveConfiguration(clone);
+                // netSections is the combination of
+                for (String key : clone.getKeys(true)) {
+                    if (clone.get(key) instanceof MemorySection) {
+                        continue;
+                    }
+                    if (!worldSection.contains(key)) {
+                        worldSection.set(key, clone.get(key));
+                    } else {
+                        Object value = worldSection.get(key);
+                        if (!Objects.equals(value, clone.get(key))) {
+                            section.set(key, clone.get(key));
+                        }
+                    }
+                }
+                pa.loadDefaultConfiguration(clone);
+                try {
+                    this.worlds.save(this.worldsFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
+                PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+                PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
+                areaGen.getPlotGenerator().initialize(pa);
+                areaGen.augment(pa);
+                addPlotArea(pa);
+            }
+        }
+    }
+
+    /**
+     * Setup the configuration for a plot world based on world arguments.
+     *
+     *
+     * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
+     *
+     * @param world     The name of the world
+     * @param args      The arguments
+     * @param generator the plot generator
+     * @return boolean | if valid arguments were provided
+     */
+    public boolean setupPlotWorld(String world, String args, IndependentPlotGenerator generator) {
+        if (args != null && !args.isEmpty()) {
+            // save configuration
+
+            final List<String> validArguments = Arrays
+                .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
+                    "w=", "wall=", "b=", "border=");
+
+            // Calculate the number of expected arguments
+            int expected = 0;
+            for (final String validArgument : validArguments) {
+                if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
+                    expected += 1;
+                }
+            }
+
+            String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
+
+            if (split.length > expected) {
+                // This means we have multi-block block buckets
+                String[] combinedArgs = new String[expected];
+                int index = 0;
+
+                StringBuilder argBuilder = new StringBuilder();
+                outer:
+                for (final String string : split) {
+                    for (final String validArgument : validArguments) {
+                        if (string.contains(validArgument)) {
+                            if (!argBuilder.toString().isEmpty()) {
+                                combinedArgs[index++] = argBuilder.toString();
+                                argBuilder = new StringBuilder();
+                            }
+                            argBuilder.append(string);
+                            continue outer;
+                        }
+                    }
+                    if (argBuilder.toString().charAt(argBuilder.length() - 1) != '=') {
+                        argBuilder.append(",");
+                    }
+                    argBuilder.append(string);
+                }
+
+                if (!argBuilder.toString().isEmpty()) {
+                    combinedArgs[index] = argBuilder.toString();
+                }
+
+                split = combinedArgs;
+            }
+
+            HybridPlotWorld plotworld = new HybridPlotWorld(world, null, generator, null, null);
+            for (String element : split) {
+                String[] pair = element.split("=");
+                if (pair.length != 2) {
+                    PlotSquared.log("&cNo value provided for: &7" + element);
+                    return false;
+                }
+                String key = pair[0].toLowerCase();
+                String value = pair[1];
+                String base = "worlds." + world + ".";
+                try {
+                    switch (key) {
+                        case "s":
+                        case "size":
+                            this.worlds.set(base + "plot.size",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            break;
+                        case "g":
+                        case "gap":
+                            this.worlds.set(base + "road.width",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            break;
+                        case "h":
+                        case "height":
+                            this.worlds.set(base + "road.height",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            this.worlds.set(base + "plot.height",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            this.worlds.set(base + "wall.height",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            break;
+                        case "f":
+                        case "floor":
+                            this.worlds.set(base + "plot.floor",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        case "m":
+                        case "main":
+                            this.worlds.set(base + "plot.filling",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        case "w":
+                        case "wall":
+                            this.worlds.set(base + "wall.filling",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        case "b":
+                        case "border":
+                            this.worlds.set(base + "wall.block",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        default:
+                            PlotSquared.log("&cKey not found: &7" + element);
+                            return false;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    PlotSquared.log("&cInvalid value: &7" + value + " in arg " + element);
+                    return false;
+                }
+            }
+            try {
+                ConfigurationSection section =
+                    this.worlds.getConfigurationSection("worlds." + world);
+                plotworld.saveConfiguration(section);
+                plotworld.loadConfiguration(section);
+                this.worlds.save(this.worldsFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    public boolean canUpdate(@NonNull final String current, @NonNull final String other) {
+        final String s1 = normalisedVersion(current);
+        final String s2 = normalisedVersion(other);
+        return s1.compareTo(s2) < 0;
+    }
+
+    public String normalisedVersion(@NonNull final String version) {
+        final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
+        final StringBuilder sb = new StringBuilder();
+        for (final String s : split) {
+            sb.append(String.format("%" + 4 + 's', s));
+        }
+        return sb.toString();
+    }
+
+    public boolean update(PlotPlayer sender, URL url) {
+        try {
+            String name = this.jarFile.getName();
+            File newJar = new File("plugins/update/" + name);
+            MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
+            URLConnection con = url.openConnection();
+            try (InputStream stream = con.getInputStream()) {
+                File parent = newJar.getParentFile();
+                if (!parent.exists()) {
+                    parent.mkdirs();
+                }
+                MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
+                if (!newJar.delete()) {
+                    MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
+                    MainUtil.sendMessage(sender, "Jar file failed to delete.");
+                    MainUtil.sendMessage(sender, " - Please update manually");
+                }
+                Files.copy(stream, newJar.toPath());
+            }
+            MainUtil.sendMessage(sender,
+                "$1The update will take effect when the server is restarted next");
+            return true;
+        } catch (IOException e) {
+            MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
+            MainUtil.sendMessage(sender, " - Please update manually");
+            PlotSquared.log("============ Stacktrace ============");
+            e.printStackTrace();
+            PlotSquared.log("====================================");
+        }
+        return false;
+    }
+
+    /**
+     * Copy a file from inside the jar to a location
+     *
+     * @param file   Name of the file inside PlotSquared.jar
+     * @param folder The output location relative to /plugins/PlotSquared/
+     */
+    public void copyFile(String file, String folder) {
+        try {
+            File output = this.IMP.getDirectory();
+            if (!output.exists()) {
+                output.mkdirs();
+            }
+            File newFile = MainUtil.getFile(output, folder + File.separator + file);
+            if (newFile.exists()) {
+                return;
+            }
+            try (InputStream stream = this.IMP.getClass().getResourceAsStream(file)) {
+                byte[] buffer = new byte[2048];
+                if (stream == null) {
+                    try (ZipInputStream zis = new ZipInputStream(
+                        new FileInputStream(this.jarFile))) {
+                        ZipEntry ze = zis.getNextEntry();
+                        while (ze != null) {
+                            String name = ze.getName();
+                            if (name.equals(file)) {
+                                new File(newFile.getParent()).mkdirs();
+                                try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                                    int len;
+                                    while ((len = zis.read(buffer)) > 0) {
+                                        fos.write(buffer, 0, len);
+                                    }
+                                }
+                                ze = null;
+                            } else {
+                                ze = zis.getNextEntry();
+                            }
+                        }
+                        zis.closeEntry();
+                    }
+                    return;
+                }
+                newFile.createNewFile();
+                try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                    int len;
+                    while ((len = stream.read(buffer)) > 0) {
+                        fos.write(buffer, 0, len);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            PlotSquared.log("&cCould not save " + file);
+        }
+    }
+
+    private Map<String, Map<PlotId, Plot>> getPlotsRaw() {
+        HashMap<String, Map<PlotId, Plot>> map = new HashMap<>();
+        for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            Map<PlotId, Plot> map2 = map.get(area.toString());
+            if (map2 == null) {
+                map.put(area.toString(), area.getPlotsRaw());
+            } else {
+                map2.putAll(area.getPlotsRaw());
+            }
+        }
+        return map;
+    }
+
+    /**
+     * Close the database connection.
+     */
+    public void disable() {
+        try {
+            // Validate that all data in the db is correct
+            final HashSet<Plot> plots = new HashSet<>();
+            try {
+                foreachPlotRaw(new RunnableVal<Plot>() {
+                    @Override public void run(Plot value) {
+                        plots.add(value);
+                    }
+                });
+            } catch (final Exception ignored) {
+            }
+            DBFunc.validatePlots(plots);
+
+            // Close the connection
+            DBFunc.close();
+            UUIDHandler.handleShutdown();
+        } catch (NullPointerException exception) {
+            exception.printStackTrace();
+            PlotSquared.log("&cCould not close database connection!");
+        }
+    }
+
+    /**
+     * Setup the database connection.
+     */
+    public void setupDatabase() {
+        try {
+            if (DBFunc.dbManager != null) {
+                DBFunc.dbManager.close();
+            }
+            Database database;
+            if (Storage.MySQL.USE) {
+                database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
+                    Storage.MySQL.USER, Storage.MySQL.PASSWORD);
+            } else if (Storage.SQLite.USE) {
+                File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
+                database = new SQLite(file);
+            } else {
+                PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
+                this.IMP.disable();
+                return;
+            }
+            DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
+            PlotSquared.log("GETTING PLOTS NOW AND STORING TO PLOTS_TMP");
+            for (PlotArea allPlotArea : plotAreaManager.getAllPlotAreas()) {
+                PlotSquared.log(allPlotArea.toString());
+            }
+
+            this.plots_tmp = DBFunc.getPlots();
+            if (plotAreaManager instanceof SinglePlotAreaManager) {
+                SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
+                addPlotArea(area);
+                ConfigurationSection section = worlds.getConfigurationSection("worlds.*");
+                if (section == null) {
+                    section = worlds.createSection("worlds.*");
+                }
+                area.saveConfiguration(section);
+                area.loadDefaultConfiguration(section);
+            }
+            this.clusters_tmp = DBFunc.getClusters();
+        } catch (ClassNotFoundException | SQLException e) {
+            PlotSquared.log(
+                C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
+            if (Storage.MySQL.USE) {
+                PlotSquared.log("$4MYSQL");
+            } else if (Storage.SQLite.USE) {
+                PlotSquared.log("$4SQLITE");
+            }
+            PlotSquared.log(
+                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+            e.printStackTrace();
+            PlotSquared.log("&d==== End of stacktrace ====");
+            PlotSquared.log("&6Please go to the " + IMP.getPluginName()
+                + " 'storage.yml' and configure the database correctly.");
+            this.IMP.disable();
+        }
+    }
+
+    /**
+     * Setup the default configuration.
+     *
+     * @throws IOException if the config failed to save
+     */
+    public void setupConfig() throws IOException {
+        String lastVersionString = this.config.getString("version");
+        if (lastVersionString != null) {
+            String[] split = lastVersionString.split("\\.");
+            int[] lastVersion = new int[] {Integer.parseInt(split[0]), Integer.parseInt(split[1]),
+                Integer.parseInt(split[2])};
+            if (checkVersion(new int[] {3, 4, 0}, lastVersion)) {
+                Settings.convertLegacy(configFile);
+                if (config.contains("worlds")) {
+                    ConfigurationSection worldSection = config.getConfigurationSection("worlds");
+                    worlds.set("worlds", worldSection);
+                    try {
+                        worlds.save(worldsFile);
+                    } catch (IOException e) {
+                        PlotSquared.debug("Failed to save " + IMP.getPluginName() + " worlds.yml");
+                        e.printStackTrace();
+                    }
+                }
+                Settings.save(configFile);
+            }
+        }
+        Settings.load(configFile);
+        try {
+            InputStream stream = getClass().getResourceAsStream("/plugin.properties");
+            BufferedReader br = new BufferedReader(new InputStreamReader(stream));
+            //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
+            String versionString = br.readLine();
+            String commitString = br.readLine();
+            String dateString = br.readLine();
+            //scanner.close();
+            br.close();
+            this.version = PlotVersion.tryParse(versionString, commitString, dateString);
+            Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
+            Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
+            Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
+                .toHexString(version.hash);
+            System.out.println("Version is " + this.version);
+        } catch (IOException exception) {
+            exception.printStackTrace();
+        }
+        Settings.save(configFile);
+        config = YamlConfiguration.loadConfiguration(configFile);
+    }
+
+    /**
+     * Setup all configuration files<br> - Config: settings.yml<br> - Storage: storage.yml<br> -
+     * Translation: PlotSquared.use_THIS.yml, style.yml<br>
+     */
+    public boolean setupConfigs() {
+        File folder = new File(this.IMP.getDirectory(), "config");
+        if (!folder.exists() && !folder.mkdirs()) {
+            PlotSquared.log(C.PREFIX
+                + "&cFailed to create the /plugins/config folder. Please create it manually.");
+        }
+        try {
+            this.worldsFile = new File(folder, "worlds.yml");
+            if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not create the worlds file, please create \"worlds.yml\" manually.");
+            }
+            this.worlds = YamlConfiguration.loadConfiguration(this.worldsFile);
+
+            if (this.worlds.contains("worlds")) {
+                if (!this.worlds.contains("configuration_version") || !this.worlds
+                    .getString("configuration_version")
+                    .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
+                    // Conversion needed
+                    log(C.LEGACY_CONFIG_FOUND.s());
+                    try {
+                        com.google.common.io.Files
+                            .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
+                        log(C.LEGACY_CONFIG_BACKUP.s());
+                        final ConfigurationSection worlds =
+                            this.worlds.getConfigurationSection("worlds");
+                        final LegacyConverter converter = new LegacyConverter(worlds);
+                        converter.convert();
+                        this.worlds
+                            .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
+                        this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
+                        this.worlds.save(this.worldsFile);
+                        log(C.LEGACY_CONFIG_DONE.s());
+                    } catch (final Exception e) {
+                        log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
+                        e.printStackTrace();
+                    }
+                    // Disable plugin
+                    this.IMP.shutdown();
+                    return false;
+                }
+            } else {
+                this.worlds.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
+            }
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save settings.yml");
+        }
+        try {
+            this.configFile = new File(folder, "settings.yml");
+            if (!this.configFile.exists() && !this.configFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not create the settings file, please create \"settings.yml\" manually.");
+            }
+            this.config = YamlConfiguration.loadConfiguration(this.configFile);
+            setupConfig();
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save settings.yml");
+        }
+        try {
+            this.styleFile = MainUtil.getFile(IMP.getDirectory(),
+                Settings.Paths.TRANSLATIONS + File.separator + "style.yml");
+            if (!this.styleFile.exists()) {
+                if (!this.styleFile.getParentFile().exists()) {
+                    this.styleFile.getParentFile().mkdirs();
+                }
+                if (!this.styleFile.createNewFile()) {
+                    PlotSquared.log(
+                        "Could not create the style file, please create \"translations/style.yml\" manually");
+                }
+            }
+            this.style = YamlConfiguration.loadConfiguration(this.styleFile);
+            setupStyle();
+        } catch (IOException err) {
+            err.printStackTrace();
+            PlotSquared.log("failed to save style.yml");
+        }
+        try {
+            this.storageFile = new File(folder, "storage.yml");
+            if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not the storage settings file, please create \"storage.yml\" manually.");
+            }
+            this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
+            setupStorage();
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save storage.yml");
+        }
+        try {
+            this.commandsFile = new File(folder, "commands.yml");
+            if (!this.commandsFile.exists() && !this.commandsFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not the storage settings file, please create \"commands.yml\" manually.");
+            }
+            this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save commands.yml");
+        }
+        try {
+            this.style.save(this.styleFile);
+            this.commands.save(this.commandsFile);
+        } catch (IOException e) {
+            PlotSquared.log("Configuration file saving failed");
+            e.printStackTrace();
+        }
+        return true;
+    }
+
+    /**
+     * Setup the storage file (load + save missing nodes).
+     */
+    private void setupStorage() {
+        Storage.load(storageFile);
+        Storage.save(storageFile);
+        storage = YamlConfiguration.loadConfiguration(storageFile);
+    }
+
+    /**
+     * Show startup debug information.
+     */
+    private void showDebug() {
+        if (Settings.DEBUG) {
+            Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
+            for (Entry<String, Object> component : components.entrySet()) {
+                PlotSquared.log(C.PREFIX + String
+                    .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
+                        component.getValue()));
+            }
+        }
+    }
+
+    /**
+     * Setup the style.yml file
+     */
+    private void setupStyle() {
+        if (this.version != null) {
+            this.style.set("version", this.version.toString());
+        }
+        Map<String, Object> o = new HashMap<>(4);
+        o.put("color.1", "6");
+        o.put("color.2", "7");
+        o.put("color.3", "8");
+        o.put("color.4", "3");
+        if (!this.style.contains("color")) {
+            for (Entry<String, Object> node : o.entrySet()) {
+                this.style.set(node.getKey(), node.getValue());
+            }
+        }
+    }
+
+    /**
+     * Get the Java version.
+     *
+     * @return the java version
+     */
+    public double getJavaVersion() {
+        return Double.parseDouble(System.getProperty("java.specification.version"));
+    }
+
+    public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            runnable.run(area);
+        }
+    }
+
+    public void foreachPlotArea(@NonNull final String world,
+        @NonNull final RunnableVal<PlotArea> runnable) {
+        final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
+        if (array == null) {
+            return;
+        }
+        for (final PlotArea area : array) {
+            runnable.run(area);
+        }
+    }
+
+    public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            area.getPlots().forEach(runnable::run);
+        }
+    }
+
+    public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            area.getPlots().forEach(runnable::run);
+        }
+        if (this.plots_tmp != null) {
+            for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
+                entry.values().forEach(runnable::run);
+            }
+        }
+    }
+
+    public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            area.foreachBasePlot(run);
+        }
+    }
+
+    public PlotArea getFirstPlotArea() {
+        PlotArea[] areas = plotAreaManager.getAllPlotAreas();
+        return areas.length > 0 ? areas[0] : null;
+    }
+
+    public int getPlotAreaCount() {
+        return this.plotAreaManager.getAllPlotAreas().length;
+    }
+
+    public int getPlotCount() {
+        int count = 0;
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            count += area.getPlotCount();
+        }
+        return count;
+    }
+
+    public Set<PlotArea> getPlotAreas() {
+        final Set<PlotArea> set = new HashSet<>();
+        Collections.addAll(set, plotAreaManager.getAllPlotAreas());
+        return Collections.unmodifiableSet(set);
+    }
+
+    public boolean isAugmented(@NonNull final String world) {
+        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, null);
+        return areas != null && (areas.length > 1 || areas[0].TYPE != 0);
+    }
+
+    /**
+     * Get a list of PlotArea objects.
+     *
+     * @param world the world
+     * @return Collection of PlotArea objects
+     */
+    public Set<PlotArea> getPlotAreas(@NonNull final String world) {
+        final Set<PlotArea> set = new HashSet<>();
+        Collections.addAll(set, plotAreaManager.getPlotAreas(world, null));
+        return set;
+    }
+
+    /**
+     * Get the relevant plot area for a specified location.
+     * <ul>
+     * <li>If there is only one plot area globally that will be returned.
+     * <li>If there is only one plot area in the world, it will return that.
+     * <li>If the plot area for a location cannot be unambiguously
+     * resolved, null will be returned.
+     * </ul>
+     * Note: An applicable plot area may not include the location i.e. clusters
+     *
+     * @param location the location
+     */
+    public PlotArea getApplicablePlotArea(@NonNull final Location location) {
+        return plotAreaManager.getApplicablePlotArea(location);
+    }
+
+    public PlotArea getPlotArea(@NonNull final String world, final String id) {
+        return plotAreaManager.getPlotArea(world, id);
+    }
+
+    /**
+     * Get the {@code PlotArea} which contains a location.
+     * <ul>
+     * <li>If the plot area does not contain a location, null
+     * will be returned.
+     * </ul>
+     *
+     * @param location the location
+     * @return the {@link PlotArea} in the location, null if non existent
+     */
+    public PlotArea getPlotAreaAbs(@NonNull final Location location) {
+        return plotAreaManager.getPlotArea(location);
+    }
+
+    public PlotArea getPlotAreaByString(@NonNull final String search) {
+        String[] split = search.split("[;,]");
+        PlotArea[] areas = plotAreaManager.getPlotAreas(split[0], null);
+        if (areas == null) {
+            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+                if (area.worldname.equalsIgnoreCase(split[0])) {
+                    if (area.id == null || split.length == 2 && area.id
+                        .equalsIgnoreCase(split[1])) {
+                        return area;
+                    }
+                }
+            }
+            return null;
+        }
+        if (areas.length == 1) {
+            return areas[0];
+        } else if (split.length == 1) {
+            return null;
+        } else {
+            for (PlotArea area : areas) {
+                if (StringMan.isEqual(split[1], area.id)) {
+                    return area;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Get Plots based on alias
+     *
+     * @param alias     to search plots
+     * @param worldname to filter alias to a specific world [optional] null means all worlds
+     * @return Set<{
+                       *       @       link
+                       *       <   p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * Plot
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * }> empty if nothing found
+     */
+    public Set<Plot> getPlotsByAlias(@Nullable final String alias,
+        @NonNull final String worldname) {
+        final Set<Plot> result = new HashSet<>();
+        if (alias != null) {
+            for (final Plot plot : getPlots()) {
+                if (alias.equals(plot.getAlias()) && (worldname == null || worldname
+                    .equals(plot.getWorldName()))) {
+                    result.add(plot);
+                }
+            }
+        }
+        return Collections.unmodifiableSet(result);
+    }
+
+    public Set<PlotArea> getPlotAreas(final String world, final RegionWrapper region) {
+        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, region);
+        final Set<PlotArea> set = new HashSet<>();
+        Collections.addAll(set, areas);
+        return Collections.unmodifiableSet(set);
+    }
+
+    public enum SortType {
+        CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
new file mode 100644
index 000000000..ecb423970
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
@@ -0,0 +1,45 @@
+package com.github.intellectualsites.plotsquared.plot;
+
+public class PlotVersion {
+    public final int year, month, day, hash, build;
+
+    public PlotVersion(int year, int month, int day, int hash, int build) {
+        this.year = year;
+        this.month = month;
+        this.day = day;
+        this.hash = hash;
+        this.build = build;
+    }
+
+    public PlotVersion(String version, String commit, String date) {
+        String[] split = version.substring(version.indexOf('=') + 1).split("\\.");
+        this.build = Integer.parseInt(split[1]);
+        this.hash = Integer.parseInt(commit.substring(commit.indexOf('=') + 1), 16);
+        String[] split1 = date.substring(date.indexOf('=') + 1).split("\\.");
+        this.year = Integer.parseInt(split1[0]);
+        this.month = Integer.parseInt(split1[1]);
+        this.day = Integer.parseInt(split1[2]);
+    }
+
+    public static PlotVersion tryParse(String version, String commit, String date) {
+        try {
+            return new PlotVersion(version, commit, date);
+        } catch (Exception ignore) {
+            ignore.printStackTrace();
+            return new PlotVersion(0, 0, 0, 0, 0);
+        }
+    }
+
+    @Override public String toString() {
+        if (hash == 0 && build == 0) {
+            return "PlotSquared-" + year + "." + month + "." + day + "-SNAPSHOT";
+        } else {
+            return "PlotSquared-" + year + "." + month + "." + day + "-" + Integer.toHexString(hash)
+                + "-" + build;
+        }
+    }
+
+    public boolean isNewer(PlotVersion other) {
+        return other.build < this.build;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
new file mode 100644
index 000000000..03d27555a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
@@ -0,0 +1,82 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "add",
+    description = "Allow a user to build in a plot while you are online",
+    usage = "/plot add <player>", category = CommandCategory.SETTINGS, permission = "plots.add",
+    requiredType = RequiredType.NONE) public class Add extends Command {
+
+    public Add() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
+        checkTrue(plot.isOwner(player.getUUID()) || Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.NO_PLOT_PERMS);
+        checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
+        final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
+        checkTrue(!uuids.isEmpty(), C.INVALID_PLAYER, args[0]);
+        Iterator<UUID> iter = uuids.iterator();
+        int size = plot.getTrusted().size() + plot.getMembers().size();
+        while (iter.hasNext()) {
+            UUID uuid = iter.next();
+            if (uuid == DBFunc.EVERYONE && !(
+                Permissions.hasPermission(player, C.PERMISSION_TRUST_EVERYONE) || Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST))) {
+                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
+                iter.remove();
+                continue;
+            }
+            if (plot.isOwner(uuid)) {
+                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
+                iter.remove();
+                continue;
+            }
+            if (plot.getMembers().contains(uuid)) {
+                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
+                iter.remove();
+                continue;
+            }
+            size += plot.getTrusted().contains(uuid) ? 0 : 1;
+        }
+        checkTrue(!uuids.isEmpty(), null);
+        checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
+        confirm.run(this, new Runnable() {
+            @Override // Success
+            public void run() {
+                for (UUID uuid : uuids) {
+                    if (uuid != DBFunc.EVERYONE) {
+                        if (!plot.removeTrusted(uuid)) {
+                            if (plot.getDenied().contains(uuid)) {
+                                plot.removeDenied(uuid);
+                            }
+                        }
+                    }
+                    plot.addMember(uuid);
+                    EventUtil.manager.callMember(player, plot, uuid, true);
+                    MainUtil.sendMessage(player, C.MEMBER_ADDED);
+                }
+            }
+        }, null);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
new file mode 100644
index 000000000..2eeb0a49d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
@@ -0,0 +1,123 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+@CommandDeclaration(command = "setalias", permission = "plots.alias",
+    description = "Set the plot name", usage = "/plot alias <set|remove> <alias>",
+    aliases = {"alias", "sa", "name", "rename", "setname", "seta", "nameplot"},
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Alias
+    extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+
+        if (args.length == 0) {
+            C.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <value>");
+            return false;
+        }
+
+        Location loc = player.getLocation();
+        Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+
+        if (!plot.hasOwner()) {
+            sendMessage(player, C.PLOT_NOT_CLAIMED);
+            return false;
+        }
+
+        if (!plot.isOwner(player.getUUID())) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+
+        boolean result = false;
+
+        switch (args[0].toLowerCase()) {
+            case "set":
+                if (args.length != 2) {
+                    C.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
+                    return false;
+                }
+
+                if (canExecuteCommand(player, C.PERMISSION_ALIAS_SET, false) || canExecuteCommand(
+                    player, C.PERMISSION_ALIAS_SET_OBSOLETE, false)) {
+                    result = setAlias(player, plot, args[1]);
+                } else {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION);
+                }
+
+                break;
+            case "remove":
+                if (canExecuteCommand(player, C.PERMISSION_ALIAS_REMOVE, true)) {
+                    result = removeAlias(player, plot);
+                }
+                break;
+            default:
+                C.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <alias>");
+                result = false;
+        }
+
+        return result;
+    }
+
+
+    private boolean setAlias(PlotPlayer player, Plot plot, String alias) {
+        if (alias.isEmpty()) {
+            C.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
+            return false;
+        }
+        if (alias.length() >= 50) {
+            MainUtil.sendMessage(player, C.ALIAS_TOO_LONG);
+            return false;
+        }
+        if (alias.contains(" ")) {
+            C.NOT_VALID_VALUE.send(player);
+            return false;
+        }
+        if (MathMan.isInteger(alias)) {
+            C.NOT_VALID_VALUE.send(player);
+            return false;
+        }
+        for (Plot p : PlotSquared.get().getPlots(plot.getArea())) {
+            if (p.getAlias().equalsIgnoreCase(alias)) {
+                MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
+                return false;
+            }
+        }
+        if (UUIDHandler.nameExists(new StringWrapper(alias)) || PlotSquared.get()
+            .hasPlotArea(alias)) {
+            MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
+            return false;
+        }
+        plot.setAlias(alias);
+        MainUtil.sendMessage(player, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
+        return true;
+    }
+
+    private boolean removeAlias(PlotPlayer player, Plot plot) {
+        plot.setAlias(null);
+        MainUtil.sendMessage(player, C.ALIAS_REMOVED.s());
+        return true;
+    }
+
+    private boolean canExecuteCommand(PlotPlayer player, C caption, boolean sendMessage) {
+        if (!Permissions.hasPermission(player, caption)) {
+            if (sendMessage) {
+                MainUtil.sendMessage(player, C.NO_PERMISSION);
+            }
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
new file mode 100644
index 000000000..ee7c1cb23
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -0,0 +1,469 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.Set;
+
+@CommandDeclaration(command = "area", permission = "plots.area",
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
+    description = "Create a new PlotArea", aliases = "world",
+    usage = "/plot area <create|info|list|tp|regen>", confirmation = true) public class Area
+    extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length == 0) {
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        switch (args[0].toLowerCase()) {
+            case "c":
+            case "setup":
+            case "create":
+                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_CREATE)) {
+                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_CREATE);
+                    return false;
+                }
+                switch (args.length) {
+                    case 1:
+                        C.COMMAND_SYNTAX
+                            .send(player, "/plot area create [world[:id]] [<modifier>=<value>]...");
+                        return false;
+                    case 2:
+                        switch (args[1].toLowerCase()) {
+                            case "pos1": { // Set position 1
+                                HybridPlotWorld area = player.getMeta("area_create_area");
+                                if (area == null) {
+                                    C.COMMAND_SYNTAX.send(player,
+                                        "/plot area create [world[:id]] [<modifier>=<value>]...");
+                                    return false;
+                                }
+                                Location location = player.getLocation();
+                                player.setMeta("area_pos1", location);
+                                C.SET_ATTRIBUTE.send(player, "area_pos1",
+                                    location.getX() + "," + location.getZ());
+                                MainUtil.sendMessage(player,
+                                    "You will now set pos2: /plot area create pos2"
+                                        + "\nNote: The chosen plot size may result in the created area not exactly matching your second position.");
+                                return true;
+                            }
+                            case "pos2":  // Set position 2 and finish creation for type=2 (partial)
+                                final HybridPlotWorld area = player.getMeta("area_create_area");
+                                if (area == null) {
+                                    C.COMMAND_SYNTAX.send(player,
+                                        "/plot area create [world[:id]] [<modifier>=<value>]...");
+                                    return false;
+                                }
+                                Location pos1 = player.getLocation();
+                                Location pos2 = player.getMeta("area_pos1");
+                                int dx = Math.abs(pos1.getX() - pos2.getX());
+                                int dz = Math.abs(pos1.getZ() - pos2.getZ());
+                                int numX = Math.max(1,
+                                    (dx + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
+                                int numZ = Math.max(1,
+                                    (dz + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
+                                int ddx = dx - (numX * area.SIZE - area.ROAD_WIDTH);
+                                int ddz = dz - (numZ * area.SIZE - area.ROAD_WIDTH);
+                                int bx = Math.min(pos1.getX(), pos2.getX()) + ddx;
+                                int bz = Math.min(pos1.getZ(), pos2.getZ()) + ddz;
+                                int tx = Math.max(pos1.getX(), pos2.getX()) - ddx;
+                                int tz = Math.max(pos1.getZ(), pos2.getZ()) - ddz;
+                                int lower = (area.ROAD_WIDTH & 1) == 0 ?
+                                    area.ROAD_WIDTH / 2 - 1 :
+                                    area.ROAD_WIDTH / 2;
+                                final int offsetX = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
+                                final int offsetZ = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
+                                final RegionWrapper region = new RegionWrapper(bx, tx, bz, tz);
+                                Set<PlotArea> areas =
+                                    PlotSquared.get().getPlotAreas(area.worldname, region);
+                                if (!areas.isEmpty()) {
+                                    C.CLUSTER_INTERSECTION
+                                        .send(player, areas.iterator().next().toString());
+                                    return false;
+                                }
+                                final SetupObject object = new SetupObject();
+                                object.world = area.worldname;
+                                object.id = area.id;
+                                object.terrain = area.TERRAIN;
+                                object.type = area.TYPE;
+                                object.min = new PlotId(1, 1);
+                                object.max = new PlotId(numX, numZ);
+                                object.plotManager = PlotSquared.imp().getPluginName();
+                                object.setupGenerator = PlotSquared.imp().getPluginName();
+                                object.step = area.getSettingNodes();
+                                final String path =
+                                    "worlds." + area.worldname + ".areas." + area.id + '-'
+                                        + object.min + '-' + object.max;
+                                Runnable run = () -> {
+                                    if (offsetX != 0) {
+                                        PlotSquared.get().worlds
+                                            .set(path + ".road.offset.x", offsetX);
+                                    }
+                                    if (offsetZ != 0) {
+                                        PlotSquared.get().worlds
+                                            .set(path + ".road.offset.z", offsetZ);
+                                    }
+                                    final String world = SetupUtils.manager.setupWorld(object);
+                                    if (WorldUtil.IMP.isWorld(world)) {
+                                        PlotSquared.get().loadWorld(world, null);
+                                        C.SETUP_FINISHED.send(player);
+                                        player.teleport(WorldUtil.IMP.getSpawn(world));
+                                        if (area.TERRAIN != 3) {
+                                            ChunkManager.largeRegionTask(world, region,
+                                                new RunnableVal<ChunkLoc>() {
+                                                    @Override public void run(ChunkLoc value) {
+                                                        AugmentedUtils
+                                                            .generate(world, value.x, value.z,
+                                                                null);
+                                                    }
+                                                }, null);
+                                        }
+                                    } else {
+                                        MainUtil.sendMessage(player,
+                                            "An error occurred while creating the world: "
+                                                + area.worldname);
+                                    }
+                                };
+                                if (hasConfirmation(player)) {
+                                    CmdConfirm.addPending(player,
+                                        getCommandString() + " create pos2 (Creates world)", run);
+                                } else {
+                                    run.run();
+                                }
+                                return true;
+                        }
+                    default: // Start creation
+                        final SetupObject object = new SetupObject();
+                        String[] split = args[1].split(":");
+                        String id;
+                        if (split.length == 2) {
+                            id = split[1];
+                        } else {
+                            id = null;
+                        }
+                        object.world = split[0];
+                        final HybridPlotWorld pa = new HybridPlotWorld(object.world, id,
+                            PlotSquared.get().IMP.getDefaultGenerator(), null, null);
+                        PlotArea other = PlotSquared.get().getPlotArea(pa.worldname, id);
+                        if (other != null && Objects.equals(pa.id, other.id)) {
+                            C.SETUP_WORLD_TAKEN.send(player, pa.toString());
+                            return false;
+                        }
+                        Set<PlotArea> areas = PlotSquared.get().getPlotAreas(pa.worldname);
+                        if (!areas.isEmpty()) {
+                            PlotArea area = areas.iterator().next();
+                            pa.TYPE = area.TYPE;
+                        }
+                        pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
+                        for (int i = 2; i < args.length; i++) {
+                            String[] pair = args[i].split("=");
+                            if (pair.length != 2) {
+                                C.COMMAND_SYNTAX.send(player, getCommandString()
+                                    + " create [world[:id]] [<modifier>=<value>]...");
+                                return false;
+                            }
+                            switch (pair[0].toLowerCase()) {
+                                case "s":
+                                case "size":
+                                    pa.PLOT_WIDTH = Integer.parseInt(pair[1]);
+                                    pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
+                                    break;
+                                case "g":
+                                case "gap":
+                                    pa.ROAD_WIDTH = Integer.parseInt(pair[1]);
+                                    pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
+                                    break;
+                                case "h":
+                                case "height":
+                                    int value = Integer.parseInt(pair[1]);
+                                    pa.PLOT_HEIGHT = value;
+                                    pa.ROAD_HEIGHT = value;
+                                    pa.WALL_HEIGHT = value;
+                                    break;
+                                case "f":
+                                case "floor":
+                                    pa.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
+                                    break;
+                                case "m":
+                                case "main":
+                                    pa.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
+                                    break;
+                                case "w":
+                                case "wall":
+                                    pa.WALL_FILLING =
+                                        Configuration.BLOCK_BUCKET.parseString(pair[1]);
+                                    break;
+                                case "b":
+                                case "border":
+                                    pa.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
+                                    break;
+                                case "terrain":
+                                    pa.TERRAIN = Integer.parseInt(pair[1]);
+                                    object.terrain = pa.TERRAIN;
+                                    break;
+                                case "type":
+                                    pa.TYPE = Integer.parseInt(pair[1]);
+                                    object.type = pa.TYPE;
+                                    break;
+                                default:
+                                    C.COMMAND_SYNTAX.send(player, getCommandString()
+                                        + " create [world[:id]] [<modifier>=<value>]...");
+                                    return false;
+                            }
+                        }
+                        if (pa.TYPE != 2) {
+                            if (WorldUtil.IMP.isWorld(pa.worldname)) {
+                                C.SETUP_WORLD_TAKEN.send(player, pa.worldname);
+                                return false;
+                            }
+                            Runnable run = () -> {
+                                String path = "worlds." + pa.worldname;
+                                if (!PlotSquared.get().worlds.contains(path)) {
+                                    PlotSquared.get().worlds.createSection(path);
+                                }
+                                ConfigurationSection section =
+                                    PlotSquared.get().worlds.getConfigurationSection(path);
+                                pa.saveConfiguration(section);
+                                pa.loadConfiguration(section);
+                                object.plotManager = PlotSquared.imp().getPluginName();
+                                object.setupGenerator = PlotSquared.imp().getPluginName();
+                                String world = SetupUtils.manager.setupWorld(object);
+                                if (WorldUtil.IMP.isWorld(world)) {
+                                    C.SETUP_FINISHED.send(player);
+                                    player.teleport(WorldUtil.IMP.getSpawn(world));
+                                } else {
+                                    MainUtil.sendMessage(player,
+                                        "An error occurred while creating the world: "
+                                            + pa.worldname);
+                                }
+                                try {
+                                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                            };
+                            if (hasConfirmation(player)) {
+                                CmdConfirm.addPending(player,
+                                    getCommandString() + ' ' + StringMan.join(args, " "), run);
+                            } else {
+                                run.run();
+                            }
+                            return true;
+                        }
+                        if (pa.id == null) {
+                            C.COMMAND_SYNTAX.send(player, getCommandString()
+                                + " create [world[:id]] [<modifier>=<value>]...");
+                            return false;
+                        }
+                        if (WorldUtil.IMP.isWorld(pa.worldname)) {
+                            if (!player.getLocation().getWorld().equals(pa.worldname)) {
+                                player.teleport(WorldUtil.IMP.getSpawn(pa.worldname));
+                            }
+                        } else {
+                            object.terrain = 0;
+                            object.type = 0;
+                            SetupUtils.manager.setupWorld(object);
+                            player.teleport(WorldUtil.IMP.getSpawn(pa.worldname));
+                        }
+                        player.setMeta("area_create_area", pa);
+                        MainUtil.sendMessage(player,
+                            "$1Go to the first corner and use: $2 " + getCommandString()
+                                + " create pos1");
+                        break;
+                }
+                return true;
+            case "i":
+            case "info": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_INFO)) {
+                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_INFO);
+                    return false;
+                }
+                PlotArea area;
+                switch (args.length) {
+                    case 1:
+                        area = player.getApplicablePlotArea();
+                        break;
+                    case 2:
+                        area = PlotSquared.get().getPlotAreaByString(args[1]);
+                        break;
+                    default:
+                        C.COMMAND_SYNTAX.send(player, getCommandString() + " info [area]");
+                        return false;
+                }
+                if (area == null) {
+                    if (args.length == 2) {
+                        C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
+                    } else {
+                        C.NOT_IN_PLOT_WORLD.send(player);
+                    }
+                    return false;
+                }
+                String name;
+                double percent;
+                int claimed = area.getPlotCount();
+                int clusters = area.getClusters().size();
+                String region;
+                String generator = String.valueOf(area.getGenerator());
+                if (area.TYPE == 2) {
+                    PlotId min = area.getMin();
+                    PlotId max = area.getMax();
+                    name = area.worldname + ';' + area.id + ';' + min + ';' + max;
+                    int size = (max.x - min.x + 1) * (max.y - min.y + 1);
+                    percent = claimed == 0 ? 0 : size / (double) claimed;
+                    region = area.getRegion().toString();
+                } else {
+                    name = area.worldname;
+                    percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
+                    region = "N/A";
+                }
+                String value = "&r$1NAME: " + name + "\n$1Type: $2" + area.TYPE + "\n$1Terrain: $2"
+                    + area.TERRAIN + "\n$1Usage: $2" + String.format("%.2f", percent) + '%'
+                    + "\n$1Claimed: $2" + claimed + "\n$1Clusters: $2" + clusters + "\n$1Region: $2"
+                    + region + "\n$1Generator: $2" + generator;
+                MainUtil.sendMessage(player,
+                    C.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + C.PLOT_INFO_FOOTER.s(), false);
+                return true;
+            }
+            case "l":
+            case "list":
+                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_LIST)) {
+                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_LIST);
+                    return false;
+                }
+                int page;
+                switch (args.length) {
+                    case 1:
+                        page = 0;
+                        break;
+                    case 2:
+                        if (MathMan.isInteger(args[1])) {
+                            page = Integer.parseInt(args[1]) - 1;
+                            break;
+                        }
+                    default:
+                        C.COMMAND_SYNTAX.send(player, getCommandString() + " list [#]");
+                        return false;
+                }
+                ArrayList<PlotArea> areas = new ArrayList<>(PlotSquared.get().getPlotAreas());
+                paginate(player, areas, 8, page,
+                    new RunnableVal3<Integer, PlotArea, PlotMessage>() {
+                        @Override public void run(Integer i, PlotArea area, PlotMessage message) {
+                            String name;
+                            double percent;
+                            int claimed = area.getPlotCount();
+                            int clusters = area.getClusters().size();
+                            String region;
+                            String generator = String.valueOf(area.getGenerator());
+                            if (area.TYPE == 2) {
+                                PlotId min = area.getMin();
+                                PlotId max = area.getMax();
+                                name = area.worldname + ';' + area.id + ';' + min + ';' + max;
+                                int size = (max.x - min.x + 1) * (max.y - min.y + 1);
+                                percent = claimed == 0 ? 0 : size / (double) claimed;
+                                region = area.getRegion().toString();
+                            } else {
+                                name = area.worldname;
+                                percent = claimed == 0 ?
+                                    0 :
+                                    Short.MAX_VALUE * Short.MAX_VALUE / (double) claimed;
+                                region = "N/A";
+                            }
+                            PlotMessage tooltip = new PlotMessage().text("Claimed=").color("$1")
+                                .text(String.valueOf(claimed)).color("$2").text("\nUsage=")
+                                .color("$1").text(String.format("%.2f", percent) + '%').color("$2")
+                                .text("\nClusters=").color("$1").text(String.valueOf(clusters))
+                                .color("$2").text("\nRegion=").color("$1").text(region).color("$2")
+                                .text("\nGenerator=").color("$1").text(generator).color("$2");
+
+                            // type / terrain
+                            String visit = "/plot area tp " + area.toString();
+                            message.text("[").color("$3").text(String.valueOf(i)).command(visit)
+                                .tooltip(visit).color("$1").text("]").color("$3").text(' ' + name)
+                                .tooltip(tooltip).command(getCommandString() + " info " + area)
+                                .color("$1").text(" - ").color("$2")
+                                .text(area.TYPE + ":" + area.TERRAIN).color("$3");
+                        }
+                    }, "/plot area list", C.AREA_LIST_HEADER_PAGED.s());
+                return true;
+            case "regen":
+            case "clear":
+            case "reset":
+            case "regenerate": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_REGEN)) {
+                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_REGEN);
+                    return false;
+                }
+                final PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                if (area.TYPE != 2) {
+                    MainUtil.sendMessage(player,
+                        "$4Stop the server and delete: " + area.worldname + "/region");
+                    return false;
+                }
+                ChunkManager
+                    .largeRegionTask(area.worldname, area.getRegion(), new RunnableVal<ChunkLoc>() {
+                        @Override public void run(ChunkLoc value) {
+                            AugmentedUtils.generate(area.worldname, value.x, value.z, null);
+                        }
+                    }, () -> player.sendMessage("Regen complete"));
+                return true;
+            }
+            case "goto":
+            case "v":
+            case "teleport":
+            case "visit":
+            case "tp":
+                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_TP)) {
+                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_TP);
+                    return false;
+                }
+                if (args.length != 2) {
+                    C.COMMAND_SYNTAX.send(player, "/plot visit [area]");
+                    return false;
+                }
+                PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
+                if (area == null) {
+                    C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
+                    return false;
+                }
+                Location center;
+                if (area.TYPE != 2) {
+                    center = WorldUtil.IMP.getSpawn(area.worldname);
+                } else {
+                    RegionWrapper region = area.getRegion();
+                    center =
+                        new Location(area.worldname, region.minX + (region.maxX - region.minX) / 2,
+                            0, region.minZ + (region.maxZ - region.minZ) / 2);
+                    center.setY(1 + WorldUtil.IMP
+                        .getHighestBlock(area.worldname, center.getX(), center.getZ()));
+                }
+                player.teleport(center);
+                return true;
+            case "delete":
+            case "remove":
+                MainUtil.sendMessage(player,
+                    "$1World creation settings may be stored in multiple locations:"
+                        + "\n$3 - $2Bukkit bukkit.yml" + "\n$3 - $2" + PlotSquared.imp()
+                        .getPluginName() + " settings.yml"
+                        + "\n$3 - $2Multiverse worlds.yml (or any world management plugin)"
+                        + "\n$1Stop the server and delete it from these locations.");
+                return true;
+        }
+        C.COMMAND_SYNTAX.send(player, getUsage());
+        return false;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
new file mode 100644
index 000000000..5035c1480
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -0,0 +1,256 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import javax.annotation.Nullable;
+import java.util.Set;
+
+@CommandDeclaration(command = "auto", permission = "plots.auto",
+    category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE,
+    description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length,width]")
+public class Auto extends SubCommand {
+
+    @Deprecated public static PlotId getNextPlotId(PlotId id, int step) {
+        return id.getNextId(step);
+    }
+
+    private static boolean checkAllowedPlots(PlotPlayer player, PlotArea plotarea,
+        @Nullable Integer allowed_plots, int size_x, int size_z) {
+        if (allowed_plots == null)
+            allowed_plots = player.getAllowedPlots();
+        int currentPlots =
+            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plotarea.worldname);
+        int diff = currentPlots - allowed_plots;
+        if (diff + size_x * size_z > 0) {
+            if (diff < 0) {
+                MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS_NUM, -diff + "");
+                return false;
+            } else if (player.hasPersistentMeta("grantedPlots")) {
+                int grantedPlots =
+                    ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
+                if (grantedPlots - diff < size_x * size_z) {
+                    player.removePersistentMeta("grantedPlots");
+                    MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                    return false;
+                } else {
+                    int left = grantedPlots - diff - size_x * size_z;
+                    if (left == 0) {
+                        player.removePersistentMeta("grantedPlots");
+                    } else {
+                        player.setPersistentMeta("grantedPlots",
+                            ByteArrayUtilities.integerToBytes(left));
+                    }
+                    MainUtil.sendMessage(player, C.REMOVED_GRANTED_PLOT, "" + left,
+                        "" + (grantedPlots - left));
+                }
+            } else {
+                MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Teleport the player home, or claim a new plot
+     *
+     * @param player
+     * @param area
+     * @param start
+     * @param schem
+     */
+    public static void homeOrAuto(final PlotPlayer player, final PlotArea area, PlotId start,
+        final String schem) {
+        Set<Plot> plots = player.getPlots();
+        if (!plots.isEmpty()) {
+            plots.iterator().next().teleportPlayer(player);
+        } else {
+            autoClaimSafe(player, area, start, schem);
+        }
+    }
+
+    /**
+     * Claim a new plot for a player
+     *
+     * @param player
+     * @param area
+     * @param start
+     * @param schem
+     */
+    public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
+        final String schem) {
+        autoClaimSafe(player, area, start, schem, null);
+    }
+
+    /**
+     * Claim a new plot for a player
+     *
+     * @param player
+     * @param area
+     * @param start
+     * @param schem
+     */
+    public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
+        final String schem, @Nullable final Integer allowed_plots) {
+        player.setMeta(Auto.class.getName(), true);
+        autoClaimFromDatabase(player, area, start, new RunnableVal<Plot>() {
+            @Override public void run(final Plot plot) {
+                TaskManager.IMP.sync(new RunnableVal<Object>() {
+                    @Override public void run(Object ignore) {
+                        player.deleteMeta(Auto.class.getName());
+                        if (plot == null) {
+                            MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
+                        } else if (checkAllowedPlots(player, area, allowed_plots, 1, 1)) {
+                            plot.claim(player, true, schem, false);
+                            if (area.AUTO_MERGE) {
+                                plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
+                            }
+                        } else {
+                            DBFunc.delete(plot);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    public static void autoClaimFromDatabase(final PlotPlayer player, final PlotArea area,
+        PlotId start, final RunnableVal<Plot> whenDone) {
+        final Plot plot = area.getNextFreePlot(player, start);
+        if (plot == null) {
+            whenDone.run(null);
+            return;
+        }
+        whenDone.value = plot;
+        plot.owner = player.getUUID();
+        DBFunc.createPlotSafe(plot, whenDone, new Runnable() {
+            @Override public void run() {
+                autoClaimFromDatabase(player, area, plot.getId(), whenDone);
+            }
+        });
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        PlotArea plotarea = player.getApplicablePlotArea();
+        if (plotarea == null) {
+            if (EconHandler.manager != null) {
+                for (PlotArea area : PlotSquared.get().getPlotAreaManager().getAllPlotAreas()) {
+                    if (EconHandler.manager
+                        .hasPermission(area.worldname, player.getName(), "plots.auto")) {
+                        if (plotarea != null) {
+                            plotarea = null;
+                            break;
+                        }
+                        plotarea = area;
+                    }
+                }
+            }
+            if (plotarea == null) {
+                MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
+                return false;
+            }
+        }
+        int size_x = 1;
+        int size_z = 1;
+        String schematic = null;
+        if (args.length > 0) {
+            if (Permissions.hasPermission(player, C.PERMISSION_AUTO_MEGA)) {
+                try {
+                    String[] split = args[0].split(",|;");
+                    size_x = Integer.parseInt(split[0]);
+                    size_z = Integer.parseInt(split[1]);
+                    if (size_x < 1 || size_z < 1) {
+                        MainUtil.sendMessage(player, "&cError: size<=0");
+                    }
+                    if (args.length > 1) {
+                        schematic = args[1];
+                    }
+                } catch (NumberFormatException ignored) {
+                    size_x = 1;
+                    size_z = 1;
+                    schematic = args[0];
+                    // PlayerFunctions.sendMessage(plr,
+                    // "&cError: Invalid size (X,Y)");
+                    // return false;
+                }
+            } else {
+                schematic = args[0];
+                // PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
+                // return false;
+            }
+        }
+        if (size_x * size_z > Settings.Claim.MAX_AUTO_AREA) {
+            MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS_NUM,
+                Settings.Claim.MAX_AUTO_AREA + "");
+            return false;
+        }
+        final int allowed_plots = player.getAllowedPlots();
+        if (player.getMeta(Auto.class.getName(), false) || !checkAllowedPlots(player, plotarea,
+            allowed_plots, size_x, size_z))
+            return false;
+
+        if (schematic != null && !schematic.isEmpty()) {
+            if (!plotarea.SCHEMATICS.contains(schematic.toLowerCase())) {
+                sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
+                return true;
+            }
+            if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
+                && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
+                MainUtil.sendMessage(player, C.NO_PERMISSION,
+                    C.PERMISSION_CLAIM_SCHEMATIC.f(schematic));
+                return true;
+            }
+        }
+        if (EconHandler.manager != null && plotarea.USE_ECONOMY) {
+            Expression<Double> costExp = plotarea.PRICES.get("claim");
+            double cost = costExp.evaluate((double) (Settings.Limit.GLOBAL ?
+                player.getPlotCount() :
+                player.getPlotCount(plotarea.worldname)));
+            cost = (size_x * size_z) * cost;
+            if (cost > 0d) {
+                if (EconHandler.manager.getMoney(player) < cost) {
+                    sendMessage(player, C.CANNOT_AFFORD_PLOT, "" + cost);
+                    return true;
+                }
+                EconHandler.manager.withdrawMoney(player, cost);
+                sendMessage(player, C.REMOVED_BALANCE, cost + "");
+            }
+        }
+        // TODO handle type 2 the same as normal worlds!
+        if (size_x == 1 && size_z == 1) {
+            autoClaimSafe(player, plotarea, null, schematic, allowed_plots);
+            return true;
+        } else {
+            if (plotarea.TYPE == 2) {
+                MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
+                return false;
+            }
+            while (true) {
+                PlotId start = plotarea.getMeta("lastPlot", new PlotId(0, 0)).getNextId(1);
+                PlotId end = new PlotId(start.x + size_x - 1, start.y + size_z - 1);
+                if (plotarea.canClaim(player, start, end)) {
+                    plotarea.setMeta("lastPlot", start);
+                    for (int i = start.x; i <= end.x; i++) {
+                        for (int j = start.y; j <= end.y; j++) {
+                            Plot plot = plotarea.getPlotAbs(new PlotId(i, j));
+                            boolean teleport = i == end.x && j == end.y;
+                            plot.claim(player, teleport, null);
+                        }
+                    }
+                    if (!plotarea.mergePlots(MainUtil.getPlotSelectionIds(start, end), true)) {
+                        return false;
+                    }
+                    break;
+                }
+                plotarea.setMeta("lastPlot", start);
+            }
+            return true;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
new file mode 100644
index 000000000..82a573949
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
@@ -0,0 +1,38 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+
+@CommandDeclaration(command = "setbiome", permission = "plots.set.biome",
+    description = "Set the plot biome", usage = "/plot biome [biome]",
+    aliases = {"biome", "sb", "setb", "b"}, category = CommandCategory.APPEARANCE,
+    requiredType = RequiredType.NONE) public class Biome extends SetCommand {
+
+    @Override public boolean set(final PlotPlayer player, final Plot plot, final String value) {
+        int biome = WorldUtil.IMP.getBiomeFromString(value);
+        if (biome == -1) {
+            String biomes =
+                StringMan.join(WorldUtil.IMP.getBiomeList(), C.BLOCK_LIST_SEPARATER.s());
+            C.NEED_BIOME.send(player);
+            MainUtil.sendMessage(player, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + biomes);
+            return false;
+        }
+        if (plot.getRunning() > 0) {
+            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            return false;
+        }
+        plot.addRunning();
+        plot.setBiome(value.toUpperCase(), new Runnable() {
+            @Override public void run() {
+                plot.removeRunning();
+                MainUtil.sendMessage(player, C.BIOME_SET_TO.s() + value.toLowerCase());
+            }
+        });
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
new file mode 100644
index 000000000..25f9484b1
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
@@ -0,0 +1,72 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.Optional;
+import java.util.Set;
+
+@CommandDeclaration(command = "buy", description = "Buy the plot you are standing on",
+    usage = "/plot buy", permission = "plots.buy", category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE) public class Buy extends Command {
+
+    public Buy() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        final RunnableVal2<Command, CommandResult> whenDone) {
+        check(EconHandler.manager, C.ECON_DISABLED);
+        final Plot plot;
+        if (args.length != 0) {
+            checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
+            plot = check(MainUtil.getPlotFromString(player, args[0], true), null);
+        } else {
+            plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        }
+        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
+        checkTrue(!plot.isOwner(player.getUUID()), C.CANNOT_BUY_OWN);
+        Set<Plot> plots = plot.getConnectedPlots();
+        checkTrue(player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
+            C.CANT_CLAIM_MORE_PLOTS);
+        Optional<Double> flag = plot.getFlag(Flags.PRICE);
+        if (!flag.isPresent()) {
+            throw new CommandException(C.NOT_FOR_SALE);
+        }
+        final double price = flag.get();
+        checkTrue(player.getMoney() >= price, C.CANNOT_AFFORD_PLOT);
+        player.withdraw(price);
+        confirm.run(this, new Runnable() {
+            @Override // Success
+            public void run() {
+                C.REMOVED_BALANCE.send(player, price);
+                EconHandler.manager
+                    .depositMoney(UUIDHandler.getUUIDWrapper().getOfflinePlayer(plot.owner), price);
+                PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
+                if (owner != null) {
+                    C.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
+                }
+                plot.removeFlag(Flags.PRICE);
+                plot.setOwner(player.getUUID());
+                C.CLAIMED.send(player);
+                whenDone.run(Buy.this, CommandResult.SUCCESS);
+            }
+        }, new Runnable() {
+            @Override // Failure
+            public void run() {
+                player.deposit(price);
+                whenDone.run(Buy.this, CommandResult.FAILURE);
+            }
+        });
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
new file mode 100644
index 000000000..453a6a8ac
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
@@ -0,0 +1,14 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+@CommandDeclaration(command = "chat", description = "Toggle plot chat on or off",
+    usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT,
+    requiredType = RequiredType.NONE) public class Chat extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        MainCommand.getInstance().toggle.chat(this, player, new String[0], null, null);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
new file mode 100644
index 000000000..e49155b8d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
@@ -0,0 +1,99 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+@CommandDeclaration(command = "claim", aliases = "c",
+    description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
+public class Claim extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        String schematic = "";
+        if (args.length >= 1) {
+            schematic = args[0];
+        }
+        Location loc = player.getLocation();
+        final Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return sendMessage(player, C.NOT_IN_PLOT);
+        }
+        int currentPlots =
+            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(loc.getWorld());
+        int grants = 0;
+        if (currentPlots >= player.getAllowedPlots()) {
+            if (player.hasPersistentMeta("grantedPlots")) {
+                grants =
+                    ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
+                if (grants <= 0) {
+                    player.removePersistentMeta("grantedPlots");
+                    return sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                }
+            } else {
+                return sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+            }
+        }
+        if (!plot.canClaim(player)) {
+            return sendMessage(player, C.PLOT_IS_CLAIMED);
+        }
+        final PlotArea area = plot.getArea();
+        if (!schematic.isEmpty()) {
+            if (area.SCHEMATIC_CLAIM_SPECIFY) {
+                if (!area.SCHEMATICS.contains(schematic.toLowerCase())) {
+                    return sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
+                }
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
+                    && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
+                    return sendMessage(player, C.NO_SCHEMATIC_PERMISSION, schematic);
+                }
+            }
+        }
+        int border = area.getBorder();
+        if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border) {
+            return !sendMessage(player, C.BORDER);
+        }
+        if ((EconHandler.manager != null) && area.USE_ECONOMY) {
+            Expression<Double> costExr = area.PRICES.get("claim");
+            double cost = costExr.evaluate((double) currentPlots);
+            if (cost > 0d) {
+                if (EconHandler.manager.getMoney(player) < cost) {
+                    return sendMessage(player, C.CANNOT_AFFORD_PLOT, "" + cost);
+                }
+                EconHandler.manager.withdrawMoney(player, cost);
+                sendMessage(player, C.REMOVED_BALANCE, cost + "");
+            }
+        }
+        if (grants > 0) {
+            if (grants == 1) {
+                player.removePersistentMeta("grantedPlots");
+            } else {
+                player.setPersistentMeta("grantedPlots",
+                    ByteArrayUtilities.integerToBytes(grants - 1));
+            }
+            sendMessage(player, C.REMOVED_GRANTED_PLOT, "1", "" + (grants - 1));
+        }
+        if (plot.canClaim(player)) {
+            plot.owner = player.getUUID();
+            final String finalSchematic = schematic;
+            DBFunc.createPlotSafe(plot, () -> TaskManager.IMP.sync(new RunnableVal<Object>() {
+                @Override public void run(Object value) {
+                    plot.claim(player, true, finalSchematic, false);
+                    if (area.AUTO_MERGE) {
+                        plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
+                    }
+                }
+            }), () -> sendMessage(player, C.PLOT_NOT_CLAIMED));
+            return true;
+        } else {
+            sendMessage(player, C.PLOT_NOT_CLAIMED);
+        }
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
new file mode 100644
index 000000000..efd6b1525
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
@@ -0,0 +1,68 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+
+@CommandDeclaration(command = "clear", description = "Clear the plot you stand on",
+    permission = "plots.clear", category = CommandCategory.APPEARANCE, usage = "/plot clear",
+    aliases = "reset", confirmation = true) public class Clear extends Command {
+
+    // Note: To clear a specific plot use /plot <plot> clear
+    // The syntax also works with any command: /plot <plot> <command>
+
+    public Clear() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        checkTrue(args.length == 0, C.COMMAND_SYNTAX, getUsage());
+        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        checkTrue(plot.isOwner(player.getUUID()) || Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_CLEAR), C.NO_PLOT_PERMS);
+        checkTrue(plot.getRunning() == 0, C.WAIT_FOR_TIMER);
+        checkTrue(!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot) || Permissions
+            .hasPermission(player, C.PERMISSION_CONTINUE), C.DONE_ALREADY_DONE);
+        confirm.run(this, new Runnable() {
+            @Override public void run() {
+                final long start = System.currentTimeMillis();
+                boolean result = plot.clear(true, false, new Runnable() {
+                    @Override public void run() {
+                        plot.unlink();
+                        GlobalBlockQueue.IMP.addTask(new Runnable() {
+                            @Override public void run() {
+                                plot.removeRunning();
+                                // If the state changes, then mark it as no longer done
+                                if (plot.getFlag(Flags.DONE).isPresent()) {
+                                    FlagManager.removePlotFlag(plot, Flags.DONE);
+                                }
+                                if (plot.getFlag(Flags.ANALYSIS).isPresent()) {
+                                    FlagManager.removePlotFlag(plot, Flags.ANALYSIS);
+                                }
+                                MainUtil.sendMessage(player, C.CLEARING_DONE,
+                                    "" + (System.currentTimeMillis() - start));
+                            }
+                        });
+                    }
+                });
+                if (!result) {
+                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                } else {
+                    plot.addRunning();
+                }
+            }
+        }, null);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
new file mode 100644
index 000000000..b4b24021f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -0,0 +1,612 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "cluster", aliases = "clusters",
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
+    permission = "plots.cluster", description = "Manage a plot cluster") public class Cluster
+    extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+
+        // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
+        if (args.length == 0) {
+            // return arguments
+            MainUtil.sendMessage(player, C.CLUSTER_AVAILABLE_ARGS);
+            return false;
+        }
+        String sub = args[0].toLowerCase();
+        switch (sub) {
+            case "l":
+            case "list": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_LIST)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_LIST);
+                    return false;
+                }
+                if (args.length != 1) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster list");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                Set<PlotCluster> clusters = area.getClusters();
+                MainUtil.sendMessage(player, C.CLUSTER_LIST_HEADING, clusters.size() + "");
+                for (PlotCluster cluster : clusters) {
+                    // Ignore unmanaged clusters
+                    String name = "'" + cluster.getName() + "' : " + cluster.toString();
+                    if (player.getUUID().equals(cluster.owner)) {
+                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&a" + name);
+                    } else if (cluster.helpers.contains(player.getUUID())) {
+                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&3" + name);
+                    } else if (cluster.invited.contains(player.getUUID())) {
+                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&9" + name);
+                    } else {
+                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, cluster.toString());
+                    }
+                }
+                return true;
+            }
+            case "c":
+            case "create": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_CREATE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_CREATE);
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                if (args.length != 4) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        "/plot cluster create <name> <id-bot> <id-top>");
+                    return false;
+                }
+                int currentClusters = Settings.Limit.GLOBAL ?
+                    player.getClusterCount() :
+                    player.getPlotCount(player.getLocation().getWorld());
+                if (currentClusters >= player.getAllowedPlots()) {
+                    return sendMessage(player, C.CANT_CLAIM_MORE_CLUSTERS);
+                }
+                // check pos1 / pos2
+                PlotId pos1 = PlotId.fromString(args[2]);
+                PlotId pos2 = PlotId.fromString(args[3]);
+                if (pos1 == null || pos2 == null) {
+                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+                    return false;
+                }
+                // check if name is taken
+                String name = args[1];
+                if (area.getCluster(name) != null) {
+                    MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
+                    return false;
+                }
+                if (pos2.x < pos1.x || pos2.y < pos1.y) {
+                    PlotId tmp = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y));
+                    pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y));
+                    pos1 = tmp;
+                }
+                //check if overlap
+                PlotCluster cluster = area.getFirstIntersectingCluster(pos1, pos2);
+                if (cluster != null) {
+                    MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, cluster.getName());
+                    return false;
+                }
+                // Check if it occupies existing plots
+                if (!area.contains(pos1) || !area.contains(pos2)) {
+                    C.CLUSTER_OUTSIDE.send(player, area);
+                    return false;
+                }
+                Set<Plot> plots = area.getPlotSelectionOwned(pos1, pos2);
+                if (!plots.isEmpty()) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_CREATE_OTHER)) {
+                        UUID uuid = player.getUUID();
+                        for (Plot plot : plots) {
+                            if (!plot.isOwner(uuid)) {
+                                MainUtil.sendMessage(player, C.NO_PERMISSION,
+                                    C.PERMISSION_CLUSTER_CREATE_OTHER);
+                                return false;
+                            }
+                        }
+                    }
+                }
+                // Check allowed cluster size
+                cluster = new PlotCluster(area, pos1, pos2, player.getUUID());
+                int current;
+                if (Settings.Limit.GLOBAL) {
+                    current = player.getPlayerClusterCount();
+                } else {
+                    current = player.getPlayerClusterCount(player.getLocation().getWorld());
+                }
+                int allowed = Permissions.hasPermissionRange(player, C.PERMISSION_CLUSTER_SIZE,
+                    Settings.Limit.MAX_PLOTS);
+                if (current + cluster.getArea() > allowed) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION,
+                        C.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()));
+                    return false;
+                }
+                // create cluster
+                cluster.settings.setAlias(name);
+                area.addCluster(cluster);
+                DBFunc.createCluster(cluster);
+                // Add any existing plots to the current cluster
+                for (Plot plot : plots) {
+                    if (plot.hasOwner()) {
+                        if (!cluster.isAdded(plot.owner)) {
+                            cluster.invited.add(plot.owner);
+                            DBFunc.setInvited(cluster, plot.owner);
+                        }
+                    }
+                }
+                MainUtil.sendMessage(player, C.CLUSTER_ADDED);
+                return true;
+            }
+            case "disband":
+            case "del":
+            case "delete": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_DELETE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_DELETE);
+                    return false;
+                }
+                if (args.length != 1 && args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster delete [name]");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster;
+                if (args.length == 2) {
+                    cluster = area.getCluster(args[1]);
+                    if (cluster == null) {
+                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                        return false;
+                    }
+                } else {
+                    cluster = area.getCluster(player.getLocation());
+                    if (cluster == null) {
+                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                        return false;
+                    }
+                }
+                if (!cluster.owner.equals(player.getUUID())) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_DELETE_OTHER)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_CLUSTER_DELETE_OTHER);
+                        return false;
+                    }
+                }
+                DBFunc.delete(cluster);
+                MainUtil.sendMessage(player, C.CLUSTER_DELETED);
+                return true;
+            }
+            case "res":
+            case "resize": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_RESIZE);
+                    return false;
+                }
+                if (args.length != 3) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        "/plot cluster resize <pos1> <pos2>");
+                    return false;
+                }
+                // check pos1 / pos2
+                PlotId pos1 = PlotId.fromString(args[1]);
+                PlotId pos2 = PlotId.fromString(args[2]);
+                if (pos1 == null || pos2 == null) {
+                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+                    return false;
+                }
+                if (pos2.x < pos1.x || pos2.y < pos1.y) {
+                    pos1 = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y));
+                    pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y));
+                }
+                // check if in cluster
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster = area.getCluster(player.getLocation());
+                if (cluster == null) {
+                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    return false;
+                }
+                if (!cluster.hasHelperRights(player.getUUID())) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_OTHER)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_CLUSTER_RESIZE_OTHER);
+                        return false;
+                    }
+                }
+                //check if overlap
+                PlotCluster intersect = area.getFirstIntersectingCluster(pos1, pos2);
+                if (intersect != null) {
+                    MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, intersect.getName());
+                    return false;
+                }
+                Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
+                Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
+                // Set<Plot> removed = (HashSet<Plot>) existing.clone();
+                Set<Plot> removed = new HashSet<>(existing);
+
+                removed.removeAll(newPlots);
+                // Check expand / shrink
+                if (!removed.isEmpty()) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_CLUSTER_RESIZE_SHRINK);
+                        return false;
+                    }
+                }
+                newPlots.removeAll(existing);
+                if (!newPlots.isEmpty()) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_CLUSTER_RESIZE_EXPAND);
+                        return false;
+                    }
+                }
+                // Check allowed cluster size
+                int current;
+                if (Settings.Limit.GLOBAL) {
+                    current = player.getPlayerClusterCount();
+                } else {
+                    current = player.getPlayerClusterCount(player.getLocation().getWorld());
+                }
+                current -= cluster.getArea() + (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
+                int allowed = Permissions
+                    .hasPermissionRange(player, C.PERMISSION_CLUSTER, Settings.Limit.MAX_PLOTS);
+                if (current + cluster.getArea() > allowed) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION,
+                        C.PERMISSION_CLUSTER.s() + "." + (current + cluster.getArea()));
+                    return false;
+                }
+                // resize cluster
+                DBFunc.resizeCluster(cluster, pos1, pos2);
+                MainUtil.sendMessage(player, C.CLUSTER_RESIZED);
+                return true;
+            }
+            case "add":
+            case "inv":
+            case "invite": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INVITE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_INVITE);
+                    return false;
+                }
+                if (args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster invite <player>");
+                    return false;
+                }
+                // check if in cluster
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster = area.getCluster(player.getLocation());
+                if (cluster == null) {
+                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    return false;
+                }
+                if (!cluster.hasHelperRights(player.getUUID())) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INVITE_OTHER)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_CLUSTER_INVITE_OTHER);
+                        return false;
+                    }
+                }
+                // check uuid
+                UUID uuid = UUIDHandler.getUUID(args[1], null);
+                if (uuid == null) {
+                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[2]);
+                    return false;
+                }
+                if (!cluster.isAdded(uuid)) {
+                    // add the user if not added
+                    cluster.invited.add(uuid);
+                    DBFunc.setInvited(cluster, uuid);
+                    PlotPlayer player2 = UUIDHandler.getPlayer(uuid);
+                    if (player2 != null) {
+                        MainUtil.sendMessage(player2, C.CLUSTER_INVITED, cluster.getName());
+                    }
+                }
+                MainUtil.sendMessage(player, C.CLUSTER_ADDED_USER);
+                return true;
+            }
+            case "k":
+            case "remove":
+            case "kick": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_KICK)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_KICK);
+                    return false;
+                }
+                if (args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster kick <player>");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster = area.getCluster(player.getLocation());
+                if (cluster == null) {
+                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    return false;
+                }
+                if (!cluster.hasHelperRights(player.getUUID())) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_KICK_OTHER)) {
+                        MainUtil
+                            .sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_KICK_OTHER);
+                        return false;
+                    }
+                }
+                // check uuid
+                UUID uuid = UUIDHandler.getUUID(args[1], null);
+                if (uuid == null) {
+                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[1]);
+                    return false;
+                }
+                // Can't kick if the player is yourself, the owner, or not added to the cluster
+                if (uuid.equals(player.getUUID()) || uuid.equals(cluster.owner) || !cluster
+                    .isAdded(uuid)) {
+                    MainUtil.sendMessage(player, C.CANNOT_KICK_PLAYER, cluster.getName());
+                    return false;
+                }
+                if (cluster.helpers.contains(uuid)) {
+                    cluster.helpers.remove(uuid);
+                    DBFunc.removeHelper(cluster, uuid);
+                }
+                cluster.invited.remove(uuid);
+                DBFunc.removeInvited(cluster, uuid);
+                PlotPlayer player2 = UUIDHandler.getPlayer(uuid);
+                if (player2 != null) {
+                    MainUtil.sendMessage(player2, C.CLUSTER_REMOVED, cluster.getName());
+                }
+                for (Plot plot : new ArrayList<>(
+                    PlotSquared.get().getPlots(player2.getLocation().getWorld(), uuid))) {
+                    PlotCluster current = plot.getCluster();
+                    if (current != null && current.equals(cluster)) {
+                        plot.unclaim();
+                    }
+                }
+                MainUtil.sendMessage(player2, C.CLUSTER_KICKED_USER);
+                return true;
+            }
+            case "quit":
+            case "leave": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_LEAVE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_LEAVE);
+                    return false;
+                }
+                if (args.length != 1 && args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster leave [name]");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster;
+                if (args.length == 2) {
+                    cluster = area.getCluster(args[1]);
+                    if (cluster == null) {
+                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                        return false;
+                    }
+                } else {
+                    cluster = area.getCluster(player.getLocation());
+                    if (cluster == null) {
+                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                        return false;
+                    }
+                }
+                UUID uuid = player.getUUID();
+                if (!cluster.isAdded(uuid)) {
+                    MainUtil.sendMessage(player, C.CLUSTER_NOT_ADDED);
+                    return false;
+                }
+                if (uuid.equals(cluster.owner)) {
+                    MainUtil.sendMessage(player, C.CLUSTER_CANNOT_LEAVE);
+                    return false;
+                }
+                if (cluster.helpers.contains(uuid)) {
+                    cluster.helpers.remove(uuid);
+                    DBFunc.removeHelper(cluster, uuid);
+                }
+                cluster.invited.remove(uuid);
+                DBFunc.removeInvited(cluster, uuid);
+                MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
+                for (Plot plot : new ArrayList<>(
+                    PlotSquared.get().getPlots(player.getLocation().getWorld(), uuid))) {
+                    PlotCluster current = plot.getCluster();
+                    if (current != null && current.equals(cluster)) {
+                        plot.unclaim();
+                    }
+                }
+                return true;
+            }
+            case "members":
+            case "admin":
+            case "helper":
+            case "helpers": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_HELPERS)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_HELPERS);
+                    return false;
+                }
+                if (args.length != 3) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        "/plot cluster helpers <add|remove> <player>");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster = area.getCluster(player.getLocation());
+                if (cluster == null) {
+                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    return false;
+                }
+                UUID uuid = UUIDHandler.getUUID(args[2], null);
+                if (uuid == null) {
+                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[2]);
+                    return false;
+                }
+                if (args[1].equalsIgnoreCase("add")) {
+                    cluster.helpers.add(uuid);
+                    DBFunc.setHelper(cluster, uuid);
+                    return MainUtil.sendMessage(player, C.CLUSTER_ADDED_HELPER);
+                }
+                if (args[1].equalsIgnoreCase("remove")) {
+                    cluster.helpers.remove(uuid);
+                    DBFunc.removeHelper(cluster, uuid);
+                    return MainUtil.sendMessage(player, C.CLUSTER_REMOVED_HELPER);
+                }
+                MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    "/plot cluster helpers <add|remove> <player>");
+                return false;
+            }
+            case "spawn":
+            case "home":
+            case "tp": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_TP)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_TP);
+                    return false;
+                }
+                if (args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster tp <name>");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster = area.getCluster(args[1]);
+                if (cluster == null) {
+                    MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                    return false;
+                }
+                UUID uuid = player.getUUID();
+                if (!cluster.isAdded(uuid)) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_TP_OTHER)) {
+                        MainUtil
+                            .sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_TP_OTHER);
+                        return false;
+                    }
+                }
+                player.teleport(cluster.getHome());
+                return MainUtil.sendMessage(player, C.CLUSTER_TELEPORTING);
+            }
+            case "i":
+            case "info":
+            case "show":
+            case "information": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INFO)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_INFO);
+                    return false;
+                }
+                if (args.length != 1 && args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster info [name]");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster;
+                if (args.length == 2) {
+                    cluster = area.getCluster(args[1]);
+                    if (cluster == null) {
+                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                        return false;
+                    }
+                } else {
+                    cluster = area.getCluster(player.getLocation());
+                    if (cluster == null) {
+                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                        return false;
+                    }
+                }
+                String id = cluster.toString();
+                String owner = UUIDHandler.getName(cluster.owner);
+                if (owner == null) {
+                    owner = "unknown";
+                }
+                String name = cluster.getName();
+                String size = (cluster.getP2().x - cluster.getP1().x + 1) + "x" + (
+                    cluster.getP2().y - cluster.getP1().y + 1);
+                String rights = cluster.isAdded(player.getUUID()) + "";
+                String message = C.CLUSTER_INFO.s();
+                message = message.replaceAll("%id%", id);
+                message = message.replaceAll("%owner%", owner);
+                message = message.replaceAll("%name%", name);
+                message = message.replaceAll("%size%", size);
+                message = message.replaceAll("%rights%", rights);
+                MainUtil.sendMessage(player, message);
+                return true;
+            }
+            case "sh":
+            case "setspawn":
+            case "sethome":
+                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_SETHOME)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_SETHOME);
+                    return false;
+                }
+                if (args.length != 1 && args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster sethome");
+                    return false;
+                }
+                PlotArea area = player.getApplicablePlotArea();
+                if (area == null) {
+                    C.NOT_IN_PLOT_WORLD.send(player);
+                    return false;
+                }
+                PlotCluster cluster = area.getCluster(player.getLocation());
+                if (cluster == null) {
+                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    return false;
+                }
+                if (!cluster.hasHelperRights(player.getUUID())) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_SETHOME_OTHER)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_CLUSTER_SETHOME_OTHER);
+                        return false;
+                    }
+                }
+                Location base = cluster.getClusterBottom();
+                Location relative = player.getLocation().subtract(base.getX(), 0, base.getZ());
+                BlockLoc blockloc = new BlockLoc(relative.getX(), relative.getY(), relative.getZ());
+                cluster.settings.setPosition(blockloc);
+                DBFunc.setPosition(cluster,
+                    relative.getX() + "," + relative.getY() + "," + relative.getZ());
+                return MainUtil.sendMessage(player, C.POSITION_SET);
+        }
+        MainUtil.sendMessage(player, C.CLUSTER_AVAILABLE_ARGS);
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
new file mode 100644
index 000000000..4aeacf85c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
@@ -0,0 +1,56 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+/**
+ * CommandCategory.
+ */
+public enum CommandCategory {
+    /**
+     * Claiming CommandConfig.
+     * Such as: /plot claim
+     */
+    CLAIMING("Claiming"), /**
+     * Teleportation CommandConfig.
+     * Such as: /plot visit
+     */
+    TELEPORT("Teleport"), /**
+     * Protection.
+     */
+    SETTINGS("Protection"), /**
+     * Chat.
+     */
+    CHAT("Chat"), /**
+     * Web.
+     */
+    SCHEMATIC("Web"), /**
+     * Cosmetic.
+     */
+    APPEARANCE("Cosmetic"), /**
+     * Information CommandConfig.
+     * Such as: /plot info
+     */
+    INFO("Info"), /**
+     * Debug CommandConfig.
+     * Such as: /plot debug
+     */
+    DEBUG("Debug"), /**
+     * Administration commands.
+     */
+    ADMINISTRATION("Admin");
+    /**
+     * The category name (Readable).
+     */
+    private final String name;
+
+    /**
+     * Constructor.
+     *
+     * @param name readable name
+     */
+    CommandCategory(String name) {
+        this.name = name;
+    }
+
+    @Override public String toString() {
+        return this.name;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
new file mode 100644
index 000000000..775450517
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
@@ -0,0 +1,74 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+import com.github.intellectualsites.plotsquared.plot.util.CommentManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.Arrays;
+import java.util.Map.Entry;
+
+@CommandDeclaration(command = "comment", aliases = {"msg"}, description = "Comment on a plot",
+    category = CommandCategory.CHAT, requiredType = RequiredType.NONE, permission = "plots.comment")
+public class Comment extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        if (args.length < 2) {
+            sendMessage(player, C.COMMENT_SYNTAX,
+                StringMan.join(CommentManager.inboxes.keySet(), "|"));
+            return false;
+        }
+        CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
+        if (inbox == null) {
+            sendMessage(player, C.COMMENT_SYNTAX,
+                StringMan.join(CommentManager.inboxes.keySet(), "|"));
+            return false;
+        }
+        Location loc = player.getLocation();
+        PlotId id = PlotId.fromString(args[1]);
+        Plot plot = MainUtil.getPlotFromString(player, args[1], false);
+        int index;
+        if (plot == null) {
+            index = 1;
+            plot = loc.getPlotAbs();
+        } else {
+            if (args.length < 4) {
+                sendMessage(player, C.COMMENT_SYNTAX,
+                    StringMan.join(CommentManager.inboxes.keySet(), "|"));
+                return false;
+            }
+            index = 2;
+        }
+        if (!inbox.canWrite(plot, player)) {
+            sendMessage(player, C.NO_PERM_INBOX, "");
+            return false;
+        }
+        String message = StringMan.join(Arrays.copyOfRange(args, index, args.length), " ");
+        PlotComment comment =
+            new PlotComment(loc.getWorld(), id, message, player.getName(), inbox.toString(),
+                System.currentTimeMillis());
+        boolean result = inbox.addComment(plot, comment);
+        if (!result) {
+            sendMessage(player, C.NO_PLOT_INBOX, "");
+            sendMessage(player, C.COMMENT_SYNTAX,
+                StringMan.join(CommentManager.inboxes.keySet(), "|"));
+            return false;
+        }
+        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+            PlotPlayer pp = entry.getValue();
+            if (pp.getAttribute("chatspy")) {
+                MainUtil.sendMessage(pp, "/plot comment " + StringMan.join(args, " "));
+            }
+        }
+        sendMessage(player, C.COMMENT_ADDED);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
new file mode 100644
index 000000000..44d0e5593
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
@@ -0,0 +1,209 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+
+import java.util.*;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@CommandDeclaration(command = "condense", permission = "plots.admin",
+    description = "Condense a plotworld", category = CommandCategory.ADMINISTRATION,
+    requiredType = RequiredType.CONSOLE) public class Condense extends SubCommand {
+
+    public static boolean TASK = false;
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length != 2 && args.length != 3) {
+            MainUtil.sendMessage(player, "/plot condense <area> <start|stop|info> [radius]");
+            return false;
+        }
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
+            MainUtil.sendMessage(player, "INVALID AREA");
+            return false;
+        }
+        switch (args[1].toLowerCase()) {
+            case "start": {
+                if (args.length == 2) {
+                    MainUtil.sendMessage(player,
+                        "/plot condense " + area.toString() + " start <radius>");
+                    return false;
+                }
+                if (Condense.TASK) {
+                    MainUtil.sendMessage(player, "TASK ALREADY STARTED");
+                    return false;
+                }
+                if (!MathMan.isInteger(args[2])) {
+                    MainUtil.sendMessage(player, "INVALID RADIUS");
+                    return false;
+                }
+                int radius = Integer.parseInt(args[2]);
+                ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots(area));
+                // remove non base plots
+                Iterator<Plot> iterator = plots.iterator();
+                int maxSize = 0;
+                ArrayList<Integer> sizes = new ArrayList<>();
+                while (iterator.hasNext()) {
+                    Plot plot = iterator.next();
+                    if (!plot.isBasePlot()) {
+                        iterator.remove();
+                        continue;
+                    }
+                    int size = plot.getConnectedPlots().size();
+                    if (size > maxSize) {
+                        maxSize = size;
+                    }
+                    sizes.add(size - 1);
+                }
+                // Sort plots by size (buckets?)]
+                //noinspection unchecked
+                ArrayList<Plot>[] buckets = new ArrayList[maxSize];
+                for (int i = 0; i < plots.size(); i++) {
+                    Plot plot = plots.get(i);
+                    int size = sizes.get(i);
+                    ArrayList<Plot> array = buckets[size];
+                    if (array == null) {
+                        array = new ArrayList<>();
+                        buckets[size] = array;
+                    }
+                    array.add(plot);
+                }
+                final ArrayList<Plot> allPlots = new ArrayList<>(plots.size());
+                for (int i = buckets.length - 1; i >= 0; i--) {
+                    ArrayList<Plot> array = buckets[i];
+                    if (array != null) {
+                        allPlots.addAll(array);
+                    }
+                }
+                int size = allPlots.size();
+                int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
+                if (radius < minimumRadius) {
+                    MainUtil.sendMessage(player, "RADIUS TOO SMALL");
+                    return false;
+                }
+                List<PlotId> toMove = new ArrayList<>(getPlots(allPlots, radius));
+                final List<PlotId> free = new ArrayList<>();
+                PlotId start = new PlotId(0, 0);
+                while (start.x <= minimumRadius && start.y <= minimumRadius) {
+                    Plot plot = area.getPlotAbs(start);
+                    if (plot != null && !plot.hasOwner()) {
+                        free.add(plot.getId());
+                    }
+                    start = Auto.getNextPlotId(start, 1);
+                }
+                if (free.isEmpty() || toMove.isEmpty()) {
+                    MainUtil.sendMessage(player, "NO FREE PLOTS FOUND");
+                    return false;
+                }
+                MainUtil.sendMessage(player, "TASK STARTED...");
+                Runnable run = new Runnable() {
+                    @Override public void run() {
+                        if (!Condense.TASK) {
+                            MainUtil.sendMessage(player, "TASK CANCELLED.");
+                        }
+                        if (allPlots.isEmpty()) {
+                            Condense.TASK = false;
+                            MainUtil.sendMessage(player,
+                                "TASK COMPLETE. PLEASE VERIFY THAT NO NEW PLOTS HAVE BEEN CLAIMED DURING TASK.");
+                            return;
+                        }
+                        final Runnable task = this;
+                        final Plot origin = allPlots.remove(0);
+                        int i = 0;
+                        while (free.size() > i) {
+                            final Plot possible = origin.getArea().getPlotAbs(free.get(i));
+                            if (possible.hasOwner()) {
+                                free.remove(i);
+                                continue;
+                            }
+                            i++;
+                            final AtomicBoolean result = new AtomicBoolean(false);
+                            result.set(origin.move(possible, () -> {
+                                if (result.get()) {
+                                    MainUtil.sendMessage(player,
+                                        "Moving: " + origin + " -> " + possible);
+                                    TaskManager.runTaskLater(task, 1);
+                                }
+                            }, false));
+                            if (result.get()) {
+                                break;
+                            }
+                        }
+                        if (free.isEmpty()) {
+                            Condense.TASK = false;
+                            MainUtil.sendMessage(player, "TASK FAILED. NO FREE PLOTS FOUND!");
+                            return;
+                        }
+                        if (i >= free.size()) {
+                            MainUtil.sendMessage(player, "SKIPPING COMPLEX PLOT: " + origin);
+                        }
+                    }
+                };
+                Condense.TASK = true;
+                TaskManager.runTaskAsync(run);
+                return true;
+            }
+            case "stop":
+                if (!Condense.TASK) {
+                    MainUtil.sendMessage(player, "TASK ALREADY STOPPED");
+                    return false;
+                }
+                Condense.TASK = false;
+                MainUtil.sendMessage(player, "TASK STOPPED");
+                return true;
+            case "info":
+                if (args.length == 2) {
+                    MainUtil.sendMessage(player,
+                        "/plot condense " + area.toString() + " info <radius>");
+                    return false;
+                }
+                if (!MathMan.isInteger(args[2])) {
+                    MainUtil.sendMessage(player, "INVALID RADIUS");
+                    return false;
+                }
+                int radius = Integer.parseInt(args[2]);
+                Collection<Plot> plots = area.getPlots();
+                int size = plots.size();
+                int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
+                if (radius < minimumRadius) {
+                    MainUtil.sendMessage(player, "RADIUS TOO SMALL");
+                    return false;
+                }
+                int maxMove = getPlots(plots, minimumRadius).size();
+                int userMove = getPlots(plots, radius).size();
+                MainUtil.sendMessage(player, "=== DEFAULT EVAL ===");
+                MainUtil.sendMessage(player, "MINIMUM RADIUS: " + minimumRadius);
+                MainUtil.sendMessage(player, "MAXIMUM MOVES: " + maxMove);
+                MainUtil.sendMessage(player, "=== INPUT EVAL ===");
+                MainUtil.sendMessage(player, "INPUT RADIUS: " + radius);
+                MainUtil.sendMessage(player, "ESTIMATED MOVES: " + userMove);
+                MainUtil.sendMessage(player,
+                    "ESTIMATED TIME: No idea, times will drastically change based on the system performance and load");
+                MainUtil.sendMessage(player, "&e - Radius is measured in plot width");
+                return true;
+        }
+        MainUtil.sendMessage(player,
+            "/plot condense " + area.worldname + " <start|stop|info> [radius]");
+        return false;
+    }
+
+    public Set<PlotId> getPlots(Collection<Plot> plots, int radius) {
+        HashSet<PlotId> outside = new HashSet<>();
+        for (Plot plot : plots) {
+            if (plot.getId().x > radius || plot.getId().x < -radius || plot.getId().y > radius
+                || plot.getId().y < -radius) {
+                outside.add(plot.getId());
+            }
+        }
+        return outside;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
new file mode 100644
index 000000000..b33bd4dab
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
@@ -0,0 +1,31 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.CmdInstance;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+@CommandDeclaration(command = "confirm", permission = "plots.use",
+    description = "Confirm an action", category = CommandCategory.INFO) public class Confirm
+    extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        CmdInstance command = CmdConfirm.getPending(player);
+        if (command == null) {
+            MainUtil.sendMessage(player, C.FAILED_CONFIRM);
+            return false;
+        }
+        CmdConfirm.removePending(player);
+        if ((System.currentTimeMillis() - command.timestamp)
+            > Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS * 1000) {
+            MainUtil.sendMessage(player, C.EXPIRED_CONFIRM);
+            return false;
+        }
+        TaskManager.runTask(command.command);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
new file mode 100644
index 000000000..68bf8c786
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
@@ -0,0 +1,45 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+@CommandDeclaration(command = "continue",
+    description = "Continue a plot that was previously marked as done",
+    permission = "plots.continue", category = CommandCategory.SETTINGS,
+    requiredType = RequiredType.NONE) public class Continue extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Plot plot = player.getCurrentPlot();
+        if ((plot == null) || !plot.hasOwner()) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (!plot.hasFlag(Flags.DONE)) {
+            MainUtil.sendMessage(player, C.DONE_NOT_DONE);
+            return false;
+        }
+        int size = plot.getConnectedPlots().size();
+        if (Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
+            < player.getPlotCount() + size)) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_ADMIN_COMMAND_CONTINUE);
+            return false;
+        }
+        if (plot.getRunning() > 0) {
+            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            return false;
+        }
+        plot.removeFlag(Flags.DONE);
+        MainUtil.sendMessage(player, C.DONE_REMOVED);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
new file mode 100644
index 000000000..8303ef042
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
@@ -0,0 +1,54 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+@CommandDeclaration(command = "copy", permission = "plots.copy", aliases = {"copypaste"},
+    category = CommandCategory.CLAIMING, description = "Copy a plot", usage = "/plot copy <X;Z>",
+    requiredType = RequiredType.NONE) public class Copy extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        Plot plot1 = loc.getPlotAbs();
+        if (plot1 == null) {
+            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot1.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (args.length != 1) {
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
+        if (plot2 == null) {
+            return false;
+        }
+        if (plot1.equals(plot2)) {
+            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        if (!plot1.getArea().isCompatible(plot2.getArea())) {
+            C.PLOTWORLD_INCOMPATIBLE.send(player);
+            return false;
+        }
+        if (plot1.copy(plot2, new Runnable() {
+            @Override public void run() {
+                MainUtil.sendMessage(player, C.COPY_SUCCESS);
+            }
+        })) {
+            return true;
+        } else {
+            MainUtil.sendMessage(player, C.REQUIRES_UNOWNED);
+            return false;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
new file mode 100644
index 000000000..acc47a64e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
@@ -0,0 +1,32 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+@CommandDeclaration(command = "createroadschematic", aliases = {"crs"},
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
+    permission = "plots.createroadschematic",
+    description = "Add a road schematic to your world using the roads around your current plot",
+    usage = "/plot createroadschematic") public class CreateRoadSchematic extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!(loc.getPlotArea() instanceof HybridPlotWorld)) {
+            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
+        }
+        HybridUtils.manager.setupRoadSchematic(plot);
+        MainUtil.sendMessage(player,
+            "$1Saved new road schematic. To test the road, fly to a few other plots and use /plot debugroadregen");
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
new file mode 100644
index 000000000..e94850121
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -0,0 +1,184 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.database.MySQL;
+import com.github.intellectualsites.plotsquared.plot.database.SQLManager;
+import com.github.intellectualsites.plotsquared.plot.database.SQLite;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.io.File;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
+@CommandDeclaration(command = "database", aliases = {"convert"},
+    category = CommandCategory.ADMINISTRATION, permission = "plots.database",
+    description = "Convert/Backup Storage", requiredType = RequiredType.CONSOLE,
+    usage = "/plot database [area] <sqlite|mysql|import>") public class Database
+    extends SubCommand {
+
+    public static void insertPlots(final SQLManager manager, final List<Plot> plots,
+        final PlotPlayer player) {
+        TaskManager.runTaskAsync(() -> {
+            try {
+                ArrayList<Plot> ps = new ArrayList<>(plots);
+                MainUtil.sendMessage(player, "&6Starting...");
+                manager.createPlotsAndData(ps, () -> {
+                    MainUtil.sendMessage(player, "&6Database conversion finished!");
+                    manager.close();
+                });
+            } catch (Exception e) {
+                MainUtil
+                    .sendMessage(player, "Failed to insert plot objects, see stacktrace for info");
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length < 1) {
+            MainUtil.sendMessage(player, "/plot database [area] <sqlite|mysql|import>");
+            return false;
+        }
+        List<Plot> plots;
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        if (area != null) {
+            plots = PlotSquared.get().sortPlotsByTemp(area.getPlots());
+            args = Arrays.copyOfRange(args, 1, args.length);
+        } else {
+            plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots());
+        }
+        if (args.length < 1) {
+            MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
+            MainUtil.sendMessage(player, "[arg] indicates an optional argument");
+            return false;
+        }
+        try {
+            com.github.intellectualsites.plotsquared.plot.database.Database implementation;
+            String prefix = "";
+            switch (args[0].toLowerCase()) {
+                case "import":
+                    if (args.length < 2) {
+                        MainUtil
+                            .sendMessage(player, "/plot database import <sqlite file> [prefix]");
+                        return false;
+                    }
+                    File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+                        args[1].endsWith(".db") ? args[1] : args[1] + ".db");
+                    if (!file.exists()) {
+                        MainUtil.sendMessage(player, "&6Database does not exist: " + file);
+                        return false;
+                    }
+                    MainUtil.sendMessage(player, "&6Starting...");
+                    implementation = new SQLite(file);
+                    SQLManager manager =
+                        new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
+                    HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
+                    plots = new ArrayList<>();
+                    for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
+                        String areaname = entry.getKey();
+                        PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
+                        if (pa != null) {
+                            for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
+                                Plot plot = entry2.getValue();
+                                if (pa.getOwnedPlotAbs(plot.getId()) != null) {
+                                    if (pa instanceof SinglePlotArea) {
+                                        Plot newPlot = pa.getNextFreePlot(null, plot.getId());
+                                        if (newPlot != null) {
+                                            PlotId newId = newPlot.getId();
+                                            PlotId id = plot.getId();
+                                            File worldFile =
+                                                new File(PlotSquared.imp().getWorldContainer(),
+                                                    id.toCommaSeparatedString());
+                                            if (worldFile.exists()) {
+                                                File newFile =
+                                                    new File(PlotSquared.imp().getWorldContainer(),
+                                                        newId.toCommaSeparatedString());
+                                                worldFile.renameTo(newFile);
+                                            }
+                                            id.x = newId.x;
+                                            id.y = newId.y;
+                                            id.recalculateHash();
+                                            plot.setArea(pa);
+                                            plots.add(plot);
+                                            continue;
+                                        }
+                                    }
+                                    MainUtil.sendMessage(player,
+                                        "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
+                                    continue;
+                                }
+                                plot.setArea(pa);
+                                plots.add(plot);
+                            }
+                        } else {
+                            HashMap<PlotId, Plot> plotmap = PlotSquared.get().plots_tmp
+                                .computeIfAbsent(areaname, k -> new HashMap<>());
+                            plotmap.putAll(entry.getValue());
+                        }
+                    }
+                    DBFunc.createPlotsAndData(plots,
+                        () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
+                    return true;
+                case "mysql":
+                    if (args.length < 6) {
+                        return MainUtil.sendMessage(player,
+                            "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
+                    }
+                    String host = args[1];
+                    String port = args[2];
+                    String username = args[3];
+                    String password = args[4];
+                    String database = args[5];
+                    if (args.length > 6) {
+                        prefix = args[6];
+                    }
+                    implementation = new MySQL(host, port, database, username, password);
+                    break;
+                case "sqlite":
+                    if (args.length < 2) {
+                        return MainUtil.sendMessage(player, "/plot database sqlite [file]");
+                    }
+                    File sqliteFile =
+                        MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), args[1] + ".db");
+                    implementation = new SQLite(sqliteFile);
+                    break;
+                default:
+                    return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
+            }
+            try {
+                SQLManager manager = new SQLManager(implementation, prefix, true);
+                Database.insertPlots(manager, plots, player);
+                return true;
+            } catch (ClassNotFoundException | SQLException e) {
+                MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
+                MainUtil.sendMessage(player,
+                    "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+                e.printStackTrace();
+                MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
+                MainUtil
+                    .sendMessage(player, "$1Please make sure you are using the correct arguments!");
+                return false;
+            }
+        } catch (ClassNotFoundException | SQLException e) {
+            MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
+            MainUtil.sendMessage(player,
+                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+            e.printStackTrace();
+            MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
+            MainUtil.sendMessage(player, "$1Please make sure you are using the correct arguments!");
+            return false;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
new file mode 100644
index 000000000..28594982c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
@@ -0,0 +1,46 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+@CommandDeclaration(command = "debug", category = CommandCategory.DEBUG,
+    description = "Show debug information", usage = "/plot debug [msg]", permission = "plots.admin")
+public class Debug extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) {
+            StringBuilder msg = new StringBuilder();
+            for (C caption : C.values()) {
+                msg.append(caption.s()).append("\n");
+            }
+            MainUtil.sendMessage(player, msg.toString());
+            return true;
+        }
+        StringBuilder information = new StringBuilder();
+        String header = C.DEBUG_HEADER.s();
+        String line = C.DEBUG_LINE.s();
+        String section = C.DEBUG_SECTION.s();
+        information.append(header);
+        information.append(getSection(section, "PlotArea"));
+        information.append(
+            getLine(line, "Plot Worlds", StringMan.join(PlotSquared.get().getPlotAreas(), ", ")));
+        information.append(getLine(line, "Owned Plots", PlotSquared.get().getPlots().size()));
+        information.append(getSection(section, "Messages"));
+        information.append(getLine(line, "Total Messages", C.values().length));
+        information.append(getLine(line, "View all captions", "/plot debug msg"));
+        MainUtil.sendMessage(player, information.toString());
+        return true;
+    }
+
+    private String getSection(String line, String val) {
+        return line.replaceAll("%val%", val) + "\n";
+    }
+
+    private String getLine(String line, String var, Object val) {
+        return line.replaceAll("%var%", var).replaceAll("%val%", "" + val) + "\n";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
new file mode 100644
index 000000000..cbfacfae6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
@@ -0,0 +1,30 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+@CommandDeclaration(command = "debugallowunsafe",
+    description = "Allow unsafe actions until toggled off", usage = "/plot debugallowunsafe",
+    category = CommandCategory.DEBUG, requiredType = RequiredType.NONE,
+    permission = "plots.debugallowunsafe") public class DebugAllowUnsafe extends SubCommand {
+
+    public static final List<UUID> unsafeAllowed = new ArrayList<>();
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+
+        if (unsafeAllowed.contains(player.getUUID())) {
+            unsafeAllowed.remove(player.getUUID());
+            sendMessage(player, C.DEBUGALLOWUNSAFE_OFF);
+        } else {
+            unsafeAllowed.add(player.getUUID());
+            sendMessage(player, C.DEBUGALLOWUNSAFE_ON);
+        }
+        return true;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
new file mode 100644
index 000000000..01a344369
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
@@ -0,0 +1,113 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import com.google.common.collect.BiMap;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.UUID;
+
+@CommandDeclaration(command = "debugclaimtest", description =
+    "If you accidentally delete your database, this command will attempt to restore all plots based on the data from plot signs. "
+        + "Execution time may vary", category = CommandCategory.DEBUG,
+    requiredType = RequiredType.CONSOLE, permission = "plots.debugclaimtest")
+public class DebugClaimTest extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length < 3) {
+            return !MainUtil.sendMessage(null,
+                "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the "
+                    + "plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}");
+        }
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
+            C.NOT_VALID_PLOT_WORLD.send(player, args[0]);
+            return false;
+        }
+        PlotId min, max;
+        try {
+            args[1].split(";");
+            args[2].split(";");
+            min = PlotId.fromString(args[1]);
+            max = PlotId.fromString(args[2]);
+        } catch (Exception ignored) {
+            return !MainUtil.sendMessage(player,
+                "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X;Y are the plot coords\nThe conversion "
+                    + "will only check the plots in the selected area.");
+        }
+        MainUtil.sendMessage(player,
+            "&3Sign Block&8->&3Plot&8: &7Beginning sign to plot conversion. This may take a while...");
+        MainUtil.sendMessage(player,
+            "&3Sign Block&8->&3Plot&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)");
+        PlotManager manager = area.getPlotManager();
+        ArrayList<Plot> plots = new ArrayList<>();
+        for (PlotId id : MainUtil.getPlotSelectionIds(min, max)) {
+            Plot plot = area.getPlotAbs(id);
+            if (plot.hasOwner()) {
+                MainUtil.sendMessage(player, " - &cDB Already contains: " + plot.getId());
+                continue;
+            }
+            Location loc = manager.getSignLoc(area, plot);
+            ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
+            boolean result = ChunkManager.manager.loadChunk(area.worldname, chunk, false);
+            if (!result) {
+                continue;
+            }
+            String[] lines = WorldUtil.IMP.getSign(loc);
+            if (lines != null) {
+                String line = lines[2];
+                if (line != null && line.length() > 2) {
+                    line = line.substring(2);
+                    BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
+                    UUID uuid = map.get(new StringWrapper(line));
+                    if (uuid == null) {
+                        for (Map.Entry<StringWrapper, UUID> stringWrapperUUIDEntry : map
+                            .entrySet()) {
+                            if (stringWrapperUUIDEntry.getKey().value.toLowerCase()
+                                .startsWith(line.toLowerCase())) {
+                                uuid = stringWrapperUUIDEntry.getValue();
+                                break;
+                            }
+                        }
+                    }
+                    if (uuid == null) {
+                        uuid = UUIDHandler.getUUID(line, null);
+                    }
+                    if (uuid != null) {
+                        MainUtil
+                            .sendMessage(player, " - &aFound plot: " + plot.getId() + " : " + line);
+                        plot.setOwner(uuid);
+                        plots.add(plot);
+                    } else {
+                        MainUtil.sendMessage(player,
+                            " - &cInvalid PlayerName: " + plot.getId() + " : " + line);
+                    }
+                }
+            }
+        }
+        if (!plots.isEmpty()) {
+            MainUtil.sendMessage(player,
+                "&3Sign Block&8->&3Plot&8: &7Updating '" + plots.size() + "' plots!");
+            DBFunc.createPlotsAndData(plots, new Runnable() {
+                @Override public void run() {
+                    MainUtil.sendMessage(player, "&6Database update finished!");
+                }
+            });
+            for (Plot plot : plots) {
+                plot.create();
+            }
+            MainUtil.sendMessage(player, "&3Sign Block&8->&3Plot&8: &7Complete!");
+        } else {
+            MainUtil.sendMessage(player, "No plots were found for the given search.");
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
new file mode 100644
index 000000000..01cd1fefc
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
@@ -0,0 +1,429 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.listener.WEManager;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
+import com.google.common.io.Files;
+
+import javax.script.*;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.sql.Timestamp;
+import java.util.*;
+
+@CommandDeclaration(command = "debugexec", permission = "plots.admin",
+    description = "Mutli-purpose debug command", aliases = {"exec", "$"},
+    category = CommandCategory.DEBUG) public class DebugExec extends SubCommand {
+    private ScriptEngine engine;
+    private Bindings scope;
+
+    public DebugExec() {
+        try {
+            if (PlotSquared.get() != null) {
+                File file = new File(PlotSquared.get().IMP.getDirectory(),
+                    Settings.Paths.SCRIPTS + File.separator + "start.js");
+                if (file.exists()) {
+                    init();
+                    String script = StringMan.join(Files.readLines(new File(new File(
+                            PlotSquared.get().IMP.getDirectory() + File.separator
+                                + Settings.Paths.SCRIPTS), "start.js"), StandardCharsets.UTF_8),
+                        System.getProperty("line.separator"));
+                    this.scope.put("THIS", this);
+                    this.scope.put("PlotPlayer", ConsolePlayer.getConsole());
+                    this.engine.eval(script, this.scope);
+                }
+            }
+        } catch (IOException | ScriptException ignored) {
+            ignored.printStackTrace();
+        }
+    }
+
+    public ScriptEngine getEngine() {
+        if (this.engine == null) {
+            init();
+        }
+        return this.engine;
+    }
+
+    public Bindings getScope() {
+        return this.scope;
+    }
+
+    public void init() {
+        if (this.engine != null) {
+            return;
+        }
+        this.engine = new ScriptEngineManager(null).getEngineByName("nashorn");
+        if (this.engine == null) {
+            this.engine = new ScriptEngineManager(null).getEngineByName("JavaScript");
+        }
+        ScriptContext context = new SimpleScriptContext();
+        this.scope = context.getBindings(ScriptContext.ENGINE_SCOPE);
+
+        // stuff
+        this.scope.put("MainUtil", new MainUtil());
+        this.scope.put("Settings", new Settings());
+        this.scope.put("StringMan", new StringMan());
+        this.scope.put("MathMan", new MathMan());
+        this.scope.put("FlagManager", new FlagManager());
+
+        // Classes
+        this.scope.put("Location", Location.class);
+        this.scope.put("PlotBlock", PlotBlock.class);
+        this.scope.put("Plot", Plot.class);
+        this.scope.put("PlotId", PlotId.class);
+        this.scope.put("Runnable", Runnable.class);
+        this.scope.put("RunnableVal", RunnableVal.class);
+
+        // Instances
+        this.scope.put("PS", PlotSquared.get());
+        this.scope.put("GlobalBlockQueue", GlobalBlockQueue.IMP);
+        this.scope.put("ExpireManager", ExpireManager.IMP);
+        if (PlotSquared.get().worldedit != null) {
+            this.scope.put("WEManager", new WEManager());
+        }
+        this.scope.put("TaskManager", TaskManager.IMP);
+        this.scope.put("TitleManager", AbstractTitle.TITLE_CLASS);
+        this.scope.put("ConsolePlayer", ConsolePlayer.getConsole());
+        this.scope.put("SchematicHandler", SchematicHandler.manager);
+        this.scope.put("ChunkManager", ChunkManager.manager);
+        this.scope.put("BlockManager", WorldUtil.IMP);
+        this.scope.put("SetupUtils", SetupUtils.manager);
+        this.scope.put("EventUtil", EventUtil.manager);
+        this.scope.put("EconHandler", EconHandler.manager);
+        this.scope.put("UUIDHandler", UUIDHandler.implementation);
+        this.scope.put("DBFunc", DBFunc.dbManager);
+        this.scope.put("HybridUtils", HybridUtils.manager);
+        this.scope.put("IMP", PlotSquared.get().IMP);
+        this.scope.put("MainCommand", MainCommand.getInstance());
+
+        // enums
+        for (Enum<?> value : C.values()) {
+            this.scope.put("C_" + value.name(), value);
+        }
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        List<String> allowed_params = Arrays
+            .asList("analyze", "calibrate-analysis", "remove-flag", "stop-expire", "start-expire",
+                "seen", "list-scripts", "start-rgar", "stop-rgar", "help", "addcmd", "runasync",
+                "run", "allcmd", "all");
+        if (args.length > 0) {
+            String arg = args[0].toLowerCase();
+            String script;
+            boolean async = false;
+            switch (arg) {
+                case "analyze": {
+                    Plot plot = player.getCurrentPlot();
+                    if (plot == null) {
+                        MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+                        return false;
+                    }
+                    PlotAnalysis analysis = plot.getComplexity(null);
+                    if (analysis != null) {
+                        MainUtil.sendMessage(player, "Changes/column: " + analysis.changes / 1.0);
+                        return true;
+                    }
+                    MainUtil.sendMessage(player, "$1Starting task...");
+                    HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>() {
+                        @Override public void run(PlotAnalysis value) {
+                            MainUtil.sendMessage(player,
+                                "$1Done: $2Use $3/plot debugexec analyze$2 for more information");
+                        }
+                    });
+                    return true;
+                }
+                case "calibrate-analysis":
+                    if (args.length != 2) {
+                        MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                            "/plot debugexec analyze <threshold>");
+                        MainUtil.sendMessage(player,
+                            "$1<threshold> $2= $1The percentage of plots you want to clear (100 clears 100% of plots so no point calibrating "
+                                + "it)");
+                        return false;
+                    }
+                    double threshold;
+                    try {
+                        threshold = Integer.parseInt(args[1]) / 100d;
+                    } catch (NumberFormatException ignored) {
+                        MainUtil.sendMessage(player, "$2Invalid threshold: " + args[1]);
+                        MainUtil.sendMessage(player,
+                            "$1<threshold> $2= $1The percentage of plots you want to clear as a number between 0 - 100");
+                        return false;
+                    }
+                    PlotAnalysis.calcOptimalModifiers(() -> MainUtil
+                        .sendMessage(player, "$1Thank you for calibrating plot expiry"), threshold);
+                    return true;
+                case "stop-expire":
+                    if (ExpireManager.IMP == null || !ExpireManager.IMP.cancelTask()) {
+                        return MainUtil.sendMessage(player, "Task already halted");
+                    }
+                    return MainUtil.sendMessage(player, "Cancelled task.");
+                case "remove-flag":
+                    if (args.length != 2) {
+                        MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                            "/plot debugexec remove-flag <flag>");
+                        return false;
+                    }
+                    String flag = args[1];
+                    for (Plot plot : PlotSquared.get().getBasePlots()) {
+                        Flag<?> flag1 = FlagManager.getFlag(flag);
+                        if (plot.getFlag(flag1).isPresent()) {
+                            plot.removeFlag(flag1);
+                        }
+                    }
+                    return MainUtil.sendMessage(player, "Cleared flag: " + flag);
+                case "start-rgar": {
+                    if (args.length != 2) {
+                        MainUtil.sendMessage(player,
+                            "&cInvalid syntax: /plot debugexec start-rgar <world>");
+                        return false;
+                    }
+                    PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
+                    if (area == null) {
+                        MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[1]);
+                        return false;
+                    }
+                    boolean result;
+                    if (HybridUtils.regions != null) {
+                        result =
+                            HybridUtils.manager.scheduleRoadUpdate(area, HybridUtils.regions, 0);
+                    } else {
+                        result = HybridUtils.manager.scheduleRoadUpdate(area, 0);
+                    }
+                    if (!result) {
+                        MainUtil.sendMessage(player,
+                            "&cCannot schedule mass schematic update! (Is one already in progress?)");
+                        return false;
+                    }
+                    return true;
+                }
+                case "stop-rgar":
+                    if (!HybridUtils.UPDATE) {
+                        MainUtil.sendMessage(player, "&cTask not running!");
+                        return false;
+                    }
+                    HybridUtils.UPDATE = false;
+                    MainUtil.sendMessage(player, "&cCancelling task... (Please wait)");
+                    return true;
+                case "start-expire":
+                    if (ExpireManager.IMP == null) {
+                        ExpireManager.IMP = new ExpireManager();
+                    }
+                    if (ExpireManager.IMP.runAutomatedTask()) {
+                        return MainUtil.sendMessage(player, "Started plot expiry task");
+                    } else {
+                        return MainUtil.sendMessage(player, "Plot expiry task already started");
+                    }
+                case "seen":
+                    if (args.length != 2) {
+                        return MainUtil.sendMessage(player, "Use /plot debugexec seen <player>");
+                    }
+                    UUID uuid = UUIDHandler.getUUID(args[1], null);
+                    if (uuid == null) {
+                        return MainUtil.sendMessage(player, "Player not found: " + args[1]);
+                    }
+                    OfflinePlotPlayer op = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
+                    if (op == null || op.getLastPlayed() == 0) {
+                        return MainUtil
+                            .sendMessage(player, "Player hasn't connected before: " + args[1]);
+                    }
+                    Timestamp stamp = new Timestamp(op.getLastPlayed());
+                    Date date = new Date(stamp.getTime());
+                    MainUtil.sendMessage(player, "PLAYER: " + args[1]);
+                    MainUtil.sendMessage(player, "UUID: " + uuid);
+                    MainUtil.sendMessage(player, "Object: " + date.toGMTString());
+                    MainUtil.sendMessage(player, "GMT: " + date.toGMTString());
+                    MainUtil.sendMessage(player, "Local: " + date.toLocaleString());
+                    return true;
+                case "h":
+                case "he":
+                case "?":
+                case "help":
+                    MainUtil.sendMessage(player,
+                        "Possible sub commands: /plot debugexec <" + StringMan
+                            .join(allowed_params, "|") + ">");
+                    return false;
+                case "addcmd":
+                    try {
+                        final String cmd = StringMan.join(Files.readLines(MainUtil.getFile(new File(
+                                PlotSquared.get().IMP.getDirectory() + File.separator
+                                    + Settings.Paths.SCRIPTS), args[1]), StandardCharsets.UTF_8),
+                            System.getProperty("line.separator"));
+                        new Command(MainCommand.getInstance(), true, args[1].split("\\.")[0], null,
+                            RequiredType.NONE, CommandCategory.DEBUG) {
+                            @Override public void execute(PlotPlayer player, String[] args,
+                                RunnableVal3<Command, Runnable, Runnable> confirm,
+                                RunnableVal2<Command, CommandResult> whenDone) {
+                                try {
+                                    DebugExec.this.scope.put("PlotPlayer", player);
+                                    DebugExec.this.scope.put("args", args);
+                                    DebugExec.this.engine.eval(cmd, DebugExec.this.scope);
+                                } catch (ScriptException e) {
+                                    e.printStackTrace();
+                                    MainUtil.sendMessage(player, C.COMMAND_WENT_WRONG);
+                                }
+                            }
+                        };
+                        return true;
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        MainUtil
+                            .sendMessage(player, C.COMMAND_SYNTAX, "/plot debugexec addcmd <file>");
+                        return false;
+                    }
+                case "runasync":
+                    async = true;
+                case "run":
+                    try {
+                        script = StringMan.join(Files.readLines(MainUtil.getFile(new File(
+                                PlotSquared.get().IMP.getDirectory() + File.separator
+                                    + Settings.Paths.SCRIPTS), args[1]), StandardCharsets.UTF_8),
+                            System.getProperty("line.separator"));
+                        if (args.length > 2) {
+                            HashMap<String, String> replacements = new HashMap<>();
+                            for (int i = 2; i < args.length; i++) {
+                                replacements.put("%s" + (i - 2), args[i]);
+                            }
+                            script = StringMan.replaceFromMap(script, replacements);
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        return false;
+                    }
+                    break;
+                case "list-scripts":
+                    String path = PlotSquared.get().IMP.getDirectory() + File.separator
+                        + Settings.Paths.SCRIPTS;
+                    File folder = new File(path);
+                    File[] filesArray = folder.listFiles();
+
+                    int page;
+                    switch (args.length) {
+                        case 1:
+                            page = 0;
+                            break;
+                        case 2:
+                            if (MathMan.isInteger(args[1])) {
+                                page = Integer.parseInt(args[1]) - 1;
+                                break;
+                            }
+                        default:
+                            C.COMMAND_SYNTAX.send(player, "/plot debugexec list-scripts [#]");
+                            return false;
+                    }
+
+                    List<File> allFiles = Arrays.asList(filesArray);
+                    paginate(player, allFiles, 8, page,
+                        new RunnableVal3<Integer, File, PlotMessage>() {
+
+                            @Override public void run(Integer i, File file, PlotMessage message) {
+                                String name = file.getName();
+                                message.text("[").color("$3").text(String.valueOf(i)).color("$1")
+                                    .text("]").color("$3").text(' ' + name).color("$1");
+                            }
+                        }, "/plot debugexec list-scripts", "List of scripts");
+                    return true;
+                case "allcmd":
+                    if (args.length < 3) {
+                        C.COMMAND_SYNTAX
+                            .send(player, "/plot debugexec allcmd <condition> <command>");
+                        return false;
+                    }
+                    long start = System.currentTimeMillis();
+                    Command cmd = MainCommand.getInstance().getCommand(args[3]);
+                    String[] params = Arrays.copyOfRange(args, 4, args.length);
+                    if ("true".equals(args[1])) {
+                        Location loc = player.getMeta(PlotPlayer.META_LOCATION);
+                        Plot plot = player.getMeta(PlotPlayer.META_LAST_PLOT);
+                        for (Plot current : PlotSquared.get().getBasePlots()) {
+                            player.setMeta(PlotPlayer.META_LOCATION, current.getBottomAbs());
+                            player.setMeta(PlotPlayer.META_LAST_PLOT, current);
+                            cmd.execute(player, params, null, null);
+                        }
+                        if (loc == null) {
+                            player.deleteMeta(PlotPlayer.META_LOCATION);
+                        } else {
+                            player.setMeta(PlotPlayer.META_LOCATION, loc);
+                        }
+                        if (plot == null) {
+                            player.deleteMeta(PlotPlayer.META_LAST_PLOT);
+                        } else {
+                            player.setMeta(PlotPlayer.META_LAST_PLOT, plot);
+                        }
+                        player.sendMessage("&c> " + (System.currentTimeMillis() - start));
+                        return true;
+                    }
+                    init();
+                    this.scope.put("_2", params);
+                    this.scope.put("_3", cmd);
+                    script =
+                        "_1=PS.getBasePlots().iterator();while(_1.hasNext()){plot=_1.next();if("
+                            + args[1]
+                            + "){PlotPlayer.setMeta(\"location\",plot.getBottomAbs());PlotPlayer.setMeta(\"lastplot\",plot);_3.onCommand"
+                            + "(PlotPlayer,_2)}}";
+
+                    break;
+                case "all":
+                    if (args.length < 3) {
+                        C.COMMAND_SYNTAX.send(player, "/plot debugexec all <condition> <code>");
+                        return false;
+                    }
+                    script =
+                        "_1=PS.getBasePlots().iterator();while(_1.hasNext()){plot=_1.next();if("
+                            + args[1] + "){" + StringMan
+                            .join(Arrays.copyOfRange(args, 2, args.length), " ") + "}}";
+
+                    break;
+                default:
+                    script = StringMan.join(args, " ");
+            }
+            if (!(player instanceof ConsolePlayer)) {
+                MainUtil.sendMessage(player, C.NOT_CONSOLE);
+                return false;
+            }
+            init();
+            this.scope.put("PlotPlayer", player);
+            PlotSquared.debug("> " + script);
+            try {
+                if (async) {
+                    final String toExec = script;
+                    TaskManager.runTaskAsync(() -> {
+                        long start = System.currentTimeMillis();
+                        Object result = null;
+                        try {
+                            result = DebugExec.this.engine.eval(toExec, DebugExec.this.scope);
+                        } catch (ScriptException e) {
+                            e.printStackTrace();
+                        }
+                        PlotSquared
+                            .log("> " + (System.currentTimeMillis() - start) + "ms -> " + result);
+                    });
+                } else {
+                    long start = System.currentTimeMillis();
+                    Object result = this.engine.eval(script, this.scope);
+                    PlotSquared
+                        .log("> " + (System.currentTimeMillis() - start) + "ms -> " + result);
+                }
+                return true;
+            } catch (ScriptException e) {
+                e.printStackTrace();
+                return false;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
new file mode 100644
index 000000000..da1e27e61
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
@@ -0,0 +1,52 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map.Entry;
+
+@CommandDeclaration(command = "debugfixflags", usage = "/plot debugfixflags <world>",
+    permission = "plots.debugfixflags", description = "Attempt to fix all flags for a world",
+    requiredType = RequiredType.CONSOLE, category = CommandCategory.DEBUG)
+public class DebugFixFlags extends SubCommand {
+
+    public DebugFixFlags() {
+        super(Argument.String);
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
+            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[0]);
+            return false;
+        }
+        MainUtil.sendMessage(player, "&8--- &6Starting task &8 ---");
+        for (Plot plot : area.getPlots()) {
+            HashMap<Flag<?>, Object> flags = plot.getFlags();
+            Iterator<Entry<Flag<?>, Object>> i = flags.entrySet().iterator();
+            boolean changed = false;
+            while (i.hasNext()) {
+                if (i.next().getKey() == null) {
+                    changed = true;
+                    i.remove();
+                }
+            }
+            if (changed) {
+                DBFunc.setFlags(plot, plot.getFlags());
+            }
+        }
+        MainUtil.sendMessage(player, "&aDone!");
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
new file mode 100644
index 000000000..ddffaf744
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
@@ -0,0 +1,58 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import com.google.common.base.Charsets;
+
+import java.io.File;
+import java.util.UUID;
+
+@CommandDeclaration(command = "debugimportworlds", permission = "plots.admin",
+    description = "Import worlds by player name", requiredType = RequiredType.CONSOLE,
+    category = CommandCategory.TELEPORT) public class DebugImportWorlds extends Command {
+    public DebugImportWorlds() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        // UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8))
+        PlotAreaManager pam = PlotSquared.get().getPlotAreaManager();
+        if (!(pam instanceof SinglePlotAreaManager)) {
+            player.sendMessage("Must be a single plot area!");
+            return;
+        }
+        SinglePlotArea area = ((SinglePlotAreaManager) pam).getArea();
+        PlotId id = new PlotId(0, 0);
+        File container = PlotSquared.imp().getWorldContainer();
+        for (File folder : container.listFiles()) {
+            String name = folder.getName();
+            if (!WorldUtil.IMP.isWorld(name) && PlotId.fromString(name) == null) {
+                UUID uuid = UUIDHandler.getUUID(name, null);
+                if (uuid == null) {
+                    uuid =
+                        UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8));
+                }
+                while (new File(container, id.toCommaSeparatedString()).exists()) {
+                    id = Auto.getNextPlotId(id, 1);
+                }
+                File newDir = new File(container, id.toCommaSeparatedString());
+                if (folder.renameTo(newDir)) {
+                    area.getPlot(id).setOwner(uuid);
+                }
+            }
+        }
+        player.sendMessage("Done!");
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java
new file mode 100644
index 000000000..f12ce8d1e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java
@@ -0,0 +1,17 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+@CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest",
+    description = "This debug command will force the reload of all plots in the DB",
+    usage = "/plot debugloadtest", category = CommandCategory.DEBUG,
+    requiredType = RequiredType.CONSOLE) public class DebugLoadTest extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        PlotSquared.get().plots_tmp = DBFunc.getPlots();
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
new file mode 100644
index 000000000..eedba15cf
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
@@ -0,0 +1,146 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.IncendoPaster;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import lombok.NonNull;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+
+@CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste",
+    description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your latest.log to https://incendo.org",
+    permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste
+    extends SubCommand {
+
+    private static String readFile(@NonNull final File file) throws IOException {
+        final StringBuilder content = new StringBuilder();
+        final List<String> lines = new ArrayList<>();
+        try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                lines.add(line);
+            }
+        }
+        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
+            content.append(lines.get(i)).append("\n");
+        }
+        return content.toString();
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        TaskManager.runTaskAsync(() -> {
+            try {
+                final IncendoPaster incendoPaster = new IncendoPaster("plotsquared");
+
+                StringBuilder b = new StringBuilder();
+                b.append(
+                    "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
+                        + "problem\n\n");
+                b.append("# Server Information\n");
+                b.append("server.version: ").append(PlotSquared.get().IMP.getServerImplementation())
+                    .append("\n");
+                b.append("online_mode: ").append(UUIDHandler.getUUIDWrapper()).append(';')
+                    .append(!Settings.UUID.OFFLINE).append('\n');
+                b.append("plugins:");
+                for (String id : PlotSquared.get().IMP.getPluginIds()) {
+                    String[] split = id.split(":");
+                    String[] split2 = split[0].split(";");
+                    String enabled = split.length == 2 ? split[1] : "unknown";
+                    String name = split2[0];
+                    String version = split2.length == 2 ? split2[1] : "unknown";
+                    b.append("\n  ").append(name).append(":\n    ").append("version: '")
+                        .append(version).append('\'').append("\n    enabled: ").append(enabled);
+                }
+                b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
+                Runtime runtime = Runtime.getRuntime();
+                b.append("memory.free: ").append(runtime.freeMemory()).append('\n');
+                b.append("memory.max: ").append(runtime.maxMemory()).append('\n');
+                b.append("java.specification.version: '")
+                    .append(System.getProperty("java.specification.version")).append("'\n");
+                b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n");
+                b.append("java.version: '").append(System.getProperty("java.version"))
+                    .append("'\n");
+                b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n");
+                b.append("os.name: '").append(System.getProperty("os.name")).append("'\n");
+                b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n");
+                b.append("# Okay :D Great. You are now ready to create your bug report!");
+                b.append(
+                    "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
+                b.append("\n# or via our Discord at https://discord.gg/ngZCzbU");
+
+                incendoPaster.addFile(new IncendoPaster.PasteFile("information", b.toString()));
+
+                try {
+                    final File logFile =
+                        new File(PlotSquared.get().IMP.getDirectory(), "../../logs/latest.log");
+                    if (Files.size(logFile.toPath()) > 14_000_000) {
+                        throw new IOException("Too big...");
+                    }
+                    incendoPaster
+                        .addFile(new IncendoPaster.PasteFile("latest.log", readFile(logFile)));
+                } catch (IOException ignored) {
+                    MainUtil
+                        .sendMessage(player, "&clatest.log is too big to be pasted, will ignore");
+                }
+
+                try {
+                    incendoPaster.addFile(new IncendoPaster.PasteFile("settings.yml",
+                        readFile(PlotSquared.get().configFile)));
+                } catch (final IllegalArgumentException ignored) {
+                    MainUtil.sendMessage(player, "&cSkipping settings.yml because it's empty");
+                }
+                try {
+                    incendoPaster.addFile(new IncendoPaster.PasteFile("worlds.yml",
+                        readFile(PlotSquared.get().worldsFile)));
+                } catch (final IllegalArgumentException ignored) {
+                    MainUtil.sendMessage(player, "&cSkipping worlds.yml because it's empty");
+                }
+                try {
+                    incendoPaster.addFile(new IncendoPaster.PasteFile("PlotSquared.use_THIS.yml",
+                        readFile(PlotSquared.get().translationFile)));
+                } catch (final IllegalArgumentException ignored) {
+                    MainUtil.sendMessage(player,
+                        "&cSkipping PlotSquared.use_THIS.yml because it's empty");
+                }
+
+                try {
+                    final String rawResponse = incendoPaster.upload();
+                    final JsonObject jsonObject =
+                        new JsonParser().parse(rawResponse).getAsJsonObject();
+
+                    if (jsonObject.has("created")) {
+                        final String pasteId = jsonObject.get("paste_id").getAsString();
+                        final String link =
+                            String.format("https://incendo.org/paste/view/%s", pasteId);
+                        player.sendMessage(C.DEBUG_REPORT_CREATED.s().replace("%url%", link));
+                    } else {
+                        final String responseMessage = jsonObject.get("response").getAsString();
+                        MainUtil.sendMessage(player, String
+                            .format("&cFailed to create the debug paste: %s", responseMessage));
+                    }
+                } catch (final Throwable throwable) {
+                    throwable.printStackTrace();
+                    MainUtil.sendMessage(player,
+                        "&cFailed to create the debug paste: " + throwable.getMessage());
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
new file mode 100644
index 000000000..84489e88b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
@@ -0,0 +1,41 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+@CommandDeclaration(command = "debugroadregen", usage = "/plot debugroadregen",
+    requiredType = RequiredType.NONE,
+    description = "Regenerate all roads based on the road schematic",
+    category = CommandCategory.DEBUG, permission = "plots.debugroadregen")
+public class DebugRoadRegen extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        PlotArea plotArea = loc.getPlotArea();
+        if (!(plotArea instanceof HybridPlotWorld)) {
+            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
+        }
+        Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            C.NOT_IN_PLOT.send(player);
+        } else if (plot.isMerged()) {
+            C.REQUIRES_UNMERGED.send(player);
+        } else {
+            HybridPlotManager manager = (HybridPlotManager) plotArea.getPlotManager();
+            manager.createRoadEast(plotArea, plot);
+            manager.createRoadSouth(plotArea, plot);
+            manager.createRoadSouthEast(plotArea, plot);
+            MainUtil.sendMessage(player, "&6Regenerating plot south/east roads: " + plot.getId()
+                + "\n&6 - Result: &aSuccess");
+            MainUtil.sendMessage(player, "&cTo regenerate all roads: /plot regenallroads");
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
new file mode 100644
index 000000000..fbbc3267c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+import java.util.ArrayList;
+
+@CommandDeclaration(command = "debugsavetest", permission = "plots.debugsavetest",
+    category = CommandCategory.DEBUG, requiredType = RequiredType.CONSOLE,
+    usage = "/plot debugsavetest",
+    description = "This command will force the recreation of all plots in the DB")
+public class DebugSaveTest extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        ArrayList<Plot> plots = new ArrayList<Plot>();
+        plots.addAll(PlotSquared.get().getPlots());
+        MainUtil.sendMessage(player, "&6Starting `DEBUGSAVETEST`");
+        DBFunc.createPlotsAndData(plots, new Runnable() {
+            @Override public void run() {
+                MainUtil.sendMessage(player, "&6Database sync finished!");
+            }
+        });
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
new file mode 100644
index 000000000..b399f5752
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
@@ -0,0 +1,71 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+
+@CommandDeclaration(command = "delete", permission = "plots.delete",
+    description = "Delete the plot you stand on", usage = "/plot delete",
+    aliases = {"dispose", "del"}, category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE, confirmation = true) public class Delete extends SubCommand {
+
+    // Note: To delete a specific plot use /plot <plot> delete
+    // The syntax also works with any command: /plot <plot> <command>
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        final Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            return !sendMessage(player, C.PLOT_UNOWNED);
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DELETE)) {
+            return !sendMessage(player, C.NO_PLOT_PERMS);
+        }
+        final PlotArea plotArea = plot.getArea();
+        final java.util.Set<Plot> plots = plot.getConnectedPlots();
+        final int currentPlots =
+            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(loc.getWorld());
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (plot.getRunning() > 0) {
+                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                    return;
+                }
+                final long start = System.currentTimeMillis();
+                boolean result = plot.deletePlot(new Runnable() {
+                    @Override public void run() {
+                        plot.removeRunning();
+                        if ((EconHandler.manager != null) && plotArea.USE_ECONOMY) {
+                            Expression<Double> valueExr = plotArea.PRICES.get("sell");
+                            double value = plots.size() * valueExr.evaluate((double) currentPlots);
+                            if (value > 0d) {
+                                EconHandler.manager.depositMoney(player, value);
+                                sendMessage(player, C.ADDED_BALANCE, String.valueOf(value));
+                            }
+                        }
+                        MainUtil.sendMessage(player, C.DELETING_DONE,
+                            System.currentTimeMillis() - start);
+                    }
+                });
+                if (result) {
+                    plot.addRunning();
+                } else {
+                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                }
+            }
+        };
+        if (hasConfirmation(player)) {
+            CmdConfirm.addPending(player, getCommandString() + ' ' + plot.getId(), run);
+        } else {
+            TaskManager.runTask(run);
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
new file mode 100644
index 000000000..e586f0656
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
@@ -0,0 +1,114 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "deny", aliases = {"d", "ban"},
+    description = "Deny a user from a plot", usage = "/plot deny <player>",
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Deny
+    extends SubCommand {
+
+    public Deny() {
+        super(Argument.PlayerName);
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DENY)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return true;
+        }
+        Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
+        if (uuids.isEmpty()) {
+            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            return false;
+        }
+        Iterator<UUID> iter = uuids.iterator();
+        while (iter.hasNext()) {
+            UUID uuid = iter.next();
+            if (uuid == DBFunc.EVERYONE && !(
+                Permissions.hasPermission(player, C.PERMISSION_DENY_EVERYONE) || Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DENY))) {
+                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
+                continue;
+            }
+            if (plot.isOwner(uuid)) {
+                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
+                return false;
+            }
+
+            if (plot.getDenied().contains(uuid)) {
+                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
+                return false;
+            }
+            if (uuid != DBFunc.EVERYONE) {
+                plot.removeMember(uuid);
+                plot.removeTrusted(uuid);
+            }
+            plot.addDenied(uuid);
+            EventUtil.manager.callDenied(player, plot, uuid, true);
+            if (!uuid.equals(DBFunc.EVERYONE)) {
+                handleKick(UUIDHandler.getPlayer(uuid), plot);
+            } else {
+                for (PlotPlayer plotPlayer : plot.getPlayersInPlot()) {
+                    handleKick(plotPlayer, plot);
+                }
+            }
+        }
+        if (!uuids.isEmpty()) {
+            MainUtil.sendMessage(player, C.DENIED_ADDED);
+        }
+        return true;
+    }
+
+    private void handleKick(PlotPlayer player, Plot plot) {
+        if (player == null) {
+            return;
+        }
+        if (!plot.equals(player.getCurrentPlot())) {
+            return;
+        }
+        if (player.hasPermission("plots.admin.entry.denied")) {
+            return;
+        }
+        if (player.getGameMode() == PlotGameMode.SPECTATOR) {
+            player.stopSpectating();
+        }
+        Location loc = player.getLocation();
+        Location spawn = WorldUtil.IMP.getSpawn(loc.getWorld());
+        MainUtil.sendMessage(player, C.YOU_GOT_DENIED);
+        if (plot.equals(spawn.getPlot())) {
+            Location newSpawn =
+                WorldUtil.IMP.getSpawn(PlotSquared.get().getPlotAreaManager().getAllWorlds()[0]);
+            if (plot.equals(newSpawn.getPlot())) {
+                // Kick from server if you can't be teleported to spawn
+                player.kick(C.YOU_GOT_DENIED.s());
+            } else {
+                player.teleport(newSpawn);
+            }
+        } else {
+            player.teleport(spawn);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
new file mode 100644
index 000000000..687eef002
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
@@ -0,0 +1,30 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+@CommandDeclaration(command = "setdescription", permission = "plots.set.desc",
+    description = "Set the plot description", usage = "/plot desc <description>",
+    aliases = {"desc", "setdesc", "setd", "description"}, category = CommandCategory.SETTINGS,
+    requiredType = RequiredType.NONE) public class Desc extends SetCommand {
+
+    @Override public boolean set(PlotPlayer player, Plot plot, String desc) {
+        if (desc.isEmpty()) {
+            plot.removeFlag(Flags.DESCRIPTION);
+            MainUtil.sendMessage(player, C.DESC_UNSET);
+            return true;
+        }
+        boolean result = FlagManager.addPlotFlag(plot, Flags.DESCRIPTION, desc);
+        if (!result) {
+            MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+            return false;
+        }
+        MainUtil.sendMessage(player, C.DESC_SET);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
new file mode 100644
index 000000000..a37c187cc
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
@@ -0,0 +1,68 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
+
+@CommandDeclaration(command = "done", aliases = {"submit"}, description = "Mark a plot as done",
+    permission = "plots.done", category = CommandCategory.SETTINGS,
+    requiredType = RequiredType.NONE) public class Done extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        final Plot plot = loc.getPlotAbs();
+        if ((plot == null) || !plot.hasOwner()) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DONE)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (plot.hasFlag(Flags.DONE)) {
+            MainUtil.sendMessage(player, C.DONE_ALREADY_DONE);
+            return false;
+        }
+        if (plot.getRunning() > 0) {
+            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            return false;
+        }
+        plot.addRunning();
+        MainUtil.sendMessage(player, C.GENERATING_LINK);
+        final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
+        if (ExpireManager.IMP == null || doneRequirements == null) {
+            finish(plot, player, true);
+            plot.removeRunning();
+        } else {
+            HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>() {
+                @Override public void run(PlotAnalysis value) {
+                    plot.removeRunning();
+                    boolean result =
+                        value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
+                    finish(plot, player, result);
+                }
+            });
+        }
+        return true;
+    }
+
+    private void finish(Plot plot, PlotPlayer pp, boolean success) {
+        if (success) {
+            long flagValue = System.currentTimeMillis() / 1000;
+            plot.setFlag(Flags.DONE, flagValue);
+            MainUtil.sendMessage(pp, C.DONE_SUCCESS);
+        } else {
+            MainUtil.sendMessage(pp, C.DONE_INSUFFICIENT_COMPLEXITY);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
new file mode 100644
index 000000000..7dd7b7acd
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
@@ -0,0 +1,95 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.sk89q.jnbt.CompoundTag;
+
+import java.net.URL;
+
+@CommandDeclaration(usage = "/plot download [schematic|world]", command = "download",
+    aliases = {"dl"}, category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE,
+    description = "Download your plot", permission = "plots.download") public class Download
+    extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        String world = player.getLocation().getWorld();
+        if (!PlotSquared.get().hasPlotArea(world)) {
+            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
+        }
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && (!plot.getFlag(Flags.DONE).isPresent()))
+            && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) {
+            MainUtil.sendMessage(player, C.DONE_NOT_DONE);
+            return false;
+        }
+        if ((!plot.isOwner(player.getUUID())) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (plot.getRunning() > 0) {
+            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            return false;
+        }
+        if (args.length == 0 || (args.length == 1 && StringMan
+            .isEqualIgnoreCaseToAny(args[0], "sch", "schem", "schematic"))) {
+            if (plot.getVolume() > Integer.MAX_VALUE) {
+                C.SCHEMATIC_TOO_LARGE.send(player);
+                return false;
+            }
+            plot.addRunning();
+            SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
+                @Override public void run(CompoundTag value) {
+                    plot.removeRunning();
+                    SchematicHandler.manager.upload(value, null, null, new RunnableVal<URL>() {
+                        @Override public void run(URL url) {
+                            if (url == null) {
+                                MainUtil.sendMessage(player, C.GENERATING_LINK_FAILED);
+                                return;
+                            }
+                            MainUtil.sendMessage(player, url.toString());
+                        }
+                    });
+                }
+            });
+        } else if (args.length == 1 && StringMan
+            .isEqualIgnoreCaseToAny(args[0], "mcr", "world", "mca")) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_DOWNLOAD_WORLD)) {
+                C.NO_PERMISSION.send(player, C.PERMISSION_DOWNLOAD_WORLD);
+                return false;
+            }
+            MainUtil.sendMessage(player, "&cNote: The `.mca` files are 512x512");
+            plot.addRunning();
+            WorldUtil.IMP.saveWorld(world);
+            WorldUtil.IMP.upload(plot, null, null, new RunnableVal<URL>() {
+                @Override public void run(URL url) {
+                    plot.removeRunning();
+                    if (url == null) {
+                        MainUtil.sendMessage(player, C.GENERATING_LINK_FAILED);
+                        return;
+                    }
+                    MainUtil.sendMessage(player, url.toString());
+                }
+            });
+        } else {
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        MainUtil.sendMessage(player, C.GENERATING_LINK);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
new file mode 100644
index 000000000..9d0435c07
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -0,0 +1,299 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.util.*;
+
+@CommandDeclaration(command = "setflag", aliases = {"f", "flag", "setf", "setflag"},
+    usage = "/plot flag <set|remove|add|list|info> <flag> <value>", description = "Set plot flags",
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE,
+    permission = "plots.flag") public class FlagCmd extends SubCommand {
+
+    private boolean checkPermValue(PlotPlayer player, Flag flag, String key, String value) {
+        key = key.toLowerCase();
+        value = value.toLowerCase();
+        String perm = C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase());
+        if (flag instanceof IntegerFlag && MathMan.isInteger(value)) {
+            try {
+                int numeric = Integer.parseInt(value);
+                perm = perm.substring(0, perm.length() - value.length() - 1);
+                if (numeric > 0) {
+                    int checkRange = PlotSquared.get().getPlatform().equalsIgnoreCase("bukkit") ?
+                        numeric :
+                        Settings.Limit.MAX_PLOTS;
+                    final boolean result = player.hasPermissionRange(perm, checkRange) >= numeric;
+                    if (!result) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_SET_FLAG_KEY_VALUE
+                                .f(key.toLowerCase(), value.toLowerCase()));
+                    }
+                    return result;
+                }
+
+            } catch (NumberFormatException ignore) {
+            }
+        } else if (flag instanceof PlotBlockListFlag) {
+            final PlotBlockListFlag blockListFlag = (PlotBlockListFlag) flag;
+            final HashSet<PlotBlock> parsedBlocks = blockListFlag.parseValue(value);
+            for (final PlotBlock block : parsedBlocks) {
+                final String permission = C.PERMISSION_SET_FLAG_KEY_VALUE
+                    .f(key.toLowerCase(), block.getRawId().toString().toLowerCase());
+                final boolean result = Permissions.hasPermission(player, permission);
+                if (!result) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION,
+                        C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
+                    return false;
+                }
+            }
+            return true;
+        }
+        final boolean result = Permissions.hasPermission(player, perm);
+        if (!result) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION,
+                C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
+        }
+        return result;
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+
+        /*
+         *  plot flag set fly true
+         *  plot flag remove fly
+         *  plot flag remove use 1,3
+         *  plot flag add use 2,4
+         *  plot flag list
+         */
+        if (args.length == 0) {
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
+            return false;
+        }
+        Location loc = player.getLocation();
+        Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            return false;
+        }
+        if (!plot.hasOwner()) {
+            sendMessage(player, C.PLOT_NOT_CLAIMED);
+            return false;
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_SET_FLAG_OTHER)) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_OTHER);
+            return false;
+        }
+        Flag<?> flag = null;
+        if (args.length > 1) {
+            flag = FlagManager.getFlag(args[1]);
+            if (flag == null || flag.isReserved()) {
+                boolean suggested = false;
+                try {
+                    StringComparison<Flag<?>> stringComparison =
+                        new StringComparison<>(args[1], Flags.getFlags());
+                    String best = stringComparison.getBestMatch();
+                    if (best != null) {
+                        MainUtil.sendMessage(player, C.NOT_VALID_FLAG_SUGGESTED, best);
+                        suggested = true;
+                    }
+                } catch (final Exception ignored) { /* Happens sometimes because of mean code */ }
+                if (!suggested) {
+                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
+                }
+                return false;
+            }
+        }
+        switch (args[0].toLowerCase()) {
+            case "info": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_SET_FLAG)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.info");
+                    return false;
+                }
+                if (args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
+                    return false;
+                }
+                // flag key
+                MainUtil.sendMessage(player, C.FLAG_KEY, flag.getName());
+                // flag type
+                MainUtil.sendMessage(player, C.FLAG_TYPE, flag.getClass().getSimpleName());
+                // Flag type description
+                MainUtil.sendMessage(player, C.FLAG_DESC, flag.getValueDescription());
+                return true;
+            }
+            case "set": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_SET_FLAG)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG);
+                    return false;
+                }
+                if (args.length < 3) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag set <flag> <value>");
+                    return false;
+                }
+                String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                if (!checkPermValue(player, flag, args[1], value)) {
+                    return false;
+                }
+                Object parsed = flag.parseValue(value);
+                if (parsed == null) {
+                    MainUtil.sendMessage(player, "&c" + flag.getValueDescription());
+                    return false;
+                }
+                boolean result = plot.setFlag(flag, parsed);
+                if (!result) {
+                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+                    return false;
+                }
+                MainUtil.sendMessage(player, C.FLAG_ADDED);
+                return true;
+            }
+            case "remove": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_REMOVE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_REMOVE);
+                    return false;
+                }
+                if (args.length != 2 && args.length != 3) {
+                    MainUtil
+                        .sendMessage(player, C.COMMAND_SYNTAX, "/plot flag remove <flag> [values]");
+                    return false;
+                }
+                if (!Permissions
+                    .hasPermission(player, C.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()))) {
+                    if (args.length != 3) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()));
+                        return false;
+                    }
+                    for (String entry : args[2].split(",")) {
+                        if (!checkPermValue(player, flag, args[1], entry)) {
+                            return false;
+                        }
+                    }
+                }
+                if (args.length == 3 && flag instanceof ListFlag) {
+                    String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                    Optional<? extends Collection> flag1 =
+                        plot.getFlag((Flag<? extends Collection<?>>) flag);
+                    if (flag1.isPresent()) {
+                        boolean o = flag1.get().removeAll((Collection) flag.parseValue(value));
+                        if (o) {
+                            if (flag1.get().isEmpty()) {
+                                final boolean result = plot.removeFlag(flag);
+                                if (result) {
+                                    MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                                } else {
+                                    MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                                }
+                                return true;
+                            } else {
+                                MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                            }
+                        } else {
+                            MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                            return false;
+                        }
+                    }
+                    DBFunc.setFlags(plot, plot.getFlags());
+                    return true;
+                } else {
+                    boolean result = plot.removeFlag(flag);
+                    if (!result) {
+                        MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                        return false;
+                    }
+                }
+                if (flag == Flags.TIME) {
+                    player.setTime(Long.MAX_VALUE);
+                } else if (flag == Flags.WEATHER) {
+                    player.setWeather(PlotWeather.RESET);
+                }
+                MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                return true;
+            }
+            case "add":
+                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_ADD)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_ADD);
+                    return false;
+                }
+                if (args.length < 3) {
+                    MainUtil
+                        .sendMessage(player, C.COMMAND_SYNTAX, "/plot flag add <flag> <values>");
+                    return false;
+                }
+                for (String entry : args[2].split(",")) {
+                    if (!checkPermValue(player, flag, args[1], entry)) {
+                        return false;
+                    }
+                }
+                String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
+                Object parsed = flag.parseValue(value);
+                if (parsed == null) {
+                    MainUtil.sendMessage(player, "&c" + flag.getValueDescription());
+                    return false;
+                }
+                Object val = parsed;
+                if (flag instanceof ListFlag) {
+                    Optional<? extends Collection> flag1 =
+                        plot.getFlag((Flag<? extends Collection<?>>) flag);
+                    if (flag1.isPresent()) {
+                        boolean o = flag1.get().addAll((Collection) parsed);
+                        if (o) {
+                            MainUtil.sendMessage(player, C.FLAG_ADDED);
+                            val = flag1.get();
+                        } else {
+                            MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+                            return false;
+                        }
+                    }
+                }
+                boolean result = plot.setFlag(flag, val);
+                if (!result) {
+                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+                    return false;
+                }
+                MainUtil.sendMessage(player, C.FLAG_ADDED);
+                return true;
+            case "list":
+                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_LIST)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_LIST);
+                    return false;
+                }
+                if (args.length > 1) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
+                    return false;
+                }
+                HashMap<String, ArrayList<String>> flags = new HashMap<>();
+                for (Flag<?> flag1 : Flags.getFlags()) {
+                    String type = flag1.getClass().getSimpleName();
+                    if (!flags.containsKey(type)) {
+                        flags.put(type, new ArrayList<>());
+                    }
+                    flags.get(type).add(flag1.getName());
+                }
+                StringBuilder message = new StringBuilder();
+                String prefix = "";
+                for (Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) {
+                    String category = entry.getKey();
+                    List<String> flagNames = entry.getValue();
+                    Collections.sort(flagNames);
+                    message.append(prefix).append("&6").append(category).append(": &7")
+                        .append(StringMan.join(flagNames, ", "));
+                    prefix = "\n";
+                }
+                MainUtil.sendMessage(player, message.toString());
+                return true;
+        }
+        MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
new file mode 100644
index 000000000..5a69479b5
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
@@ -0,0 +1,221 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class GenerateDocs {
+
+    public static void main(String[] args) {
+        new WE_Anywhere();
+        List<Command> commands = MainCommand.getInstance().getCommands();
+        GenerateDocs.log("### Want to document some commands?");
+        GenerateDocs.log(" - This page is automatically generated");
+        GenerateDocs
+            .log(" - Fork the project and add a javadoc comment to one of the command classes");
+        GenerateDocs.log(" - Then do a pull request and it will be added to this page");
+        GenerateDocs.log("");
+        GenerateDocs.log("# Contents");
+        for (CommandCategory category : CommandCategory.values()) {
+            GenerateDocs.log("###### " + category.name());
+            for (Command command : MainCommand.getInstance().getCommands(category, null)) {
+                GenerateDocs.log(" - [/plot " + command.getId()
+                    + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command
+                    .getId() + ")    ");
+            }
+            GenerateDocs.log("");
+        }
+        GenerateDocs.log("# Commands");
+        for (Command command : commands) {
+            GenerateDocs.printCommand(command);
+        }
+    }
+
+    public static void printCommand(Command command) {
+        try {
+            String clazz = command.getClass().getSimpleName();
+            String name = command.getId();
+
+            // Header
+            String source =
+                "https://github.com/IntellectualSites/PlotSquared/tree/master/Core/src/main/java/com/intellectualcrafters/plot/commands/"
+                    + clazz + ".java";
+            GenerateDocs.log("## [" + name.toUpperCase() + "](" + source + ")    ");
+
+            File file = new File(
+                "Core/src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java");
+            List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
+            List<String> perms = GenerateDocs.getPerms(name, lines);
+            List<String> usages = GenerateDocs.getUsage(name, lines);
+            String comment = GenerateDocs.getComments(lines);
+
+            GenerateDocs.log("#### Description");
+            GenerateDocs.log('`' + command.getDescription() + '`');
+            if (!comment.isEmpty()) {
+                GenerateDocs.log("##### Comments");
+                GenerateDocs.log("``` java");
+                GenerateDocs.log(comment);
+                GenerateDocs.log("```");
+            }
+
+            GenerateDocs.log("#### Usage    ");
+            String mainUsage = command.getUsage().replaceAll("\\{label\\}", "plot");
+            if (!usages.isEmpty() && !usages.get(0).equalsIgnoreCase(mainUsage)) {
+                GenerateDocs.log("##### Primary    ");
+                GenerateDocs.log(" - `" + mainUsage + "`    ");
+                GenerateDocs.log("");
+                GenerateDocs.log("##### Other    ");
+                GenerateDocs.log(" - `" + StringMan.join(usages, "`\n - `") + "`    ");
+                GenerateDocs.log("");
+            } else {
+                GenerateDocs.log('`' + mainUsage + "`    ");
+            }
+
+            if (command.getRequiredType() != RequiredType.NONE) {
+                GenerateDocs.log("#### Required callers");
+                GenerateDocs.log('`' + command.getRequiredType().name() + '`');
+            }
+
+            List<String> aliases = command.getAliases();
+            if (!aliases.isEmpty()) {
+                GenerateDocs.log("#### Aliases");
+                GenerateDocs.log('`' + StringMan.getString(command.getAliases()) + '`');
+            }
+
+            GenerateDocs.log("#### Permissions");
+            if (!perms.isEmpty()) {
+                GenerateDocs.log("##### Primary");
+                GenerateDocs.log(" - `" + command.getPermission() + "`    ");
+                GenerateDocs.log("");
+                GenerateDocs.log("##### Other");
+                GenerateDocs.log(" - `" + StringMan.join(perms, "`\n - `") + '`');
+                GenerateDocs.log("");
+            } else {
+                GenerateDocs.log('`' + command.getPermission() + "`    ");
+            }
+            GenerateDocs.log("***");
+            GenerateDocs.log("");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static List<String> getUsage(String cmd, List<String> lines) {
+        Pattern p = Pattern.compile("\"([^\"]*)\"");
+        HashSet<String> usages = new HashSet<>();
+        for (String line : lines) {
+            if (line.contains("COMMAND_SYNTAX") && !line.contains("getUsage()")) {
+                Matcher m = p.matcher(line);
+                String prefix = "";
+                StringBuilder usage = new StringBuilder();
+                while (m.find()) {
+                    String match = m.group(1);
+                    usage.append(prefix).append(match);
+                    prefix = " <arg> ";
+                }
+                if (usage.length() != 0) {
+                    usages.add(usage.toString().trim().replaceAll("  ", " ")
+                        .replaceAll("\\{label\\}", "plot"));
+                }
+            }
+        }
+        return new ArrayList<>(usages);
+    }
+
+    public static List<String> getPerms(String cmd, List<String> lines) {
+        HashSet<String> perms = new HashSet<>();
+        Pattern p = Pattern.compile("\"([^\"]*)\"");
+        Pattern p2 = Pattern.compile("C.PERMISSION_\\s*(\\w+)");
+        String last = null;
+        for (String line : lines) {
+
+            Matcher m2 = p2.matcher(line);
+            while (m2.find()) {
+                perms.add(C.valueOf("PERMISSION_" + m2.group(1)).s());
+            }
+            if (line.contains("Permissions.hasPermission(")) {
+                String[] split = line.split("Permissions.hasPermission");
+                split = Arrays.copyOfRange(split, 1, split.length);
+                for (String method : split) {
+                    String perm = method.split("[,|)]")[1].trim();
+                    if (!perm.equalsIgnoreCase(perm)) {
+                        if (perm.startsWith("C.")) {
+                            perm = C.valueOf(perm.split("\\.")[1]).s();
+                        } else {
+                            continue;
+                        }
+                    } else {
+                        perm = perm.substring(1, perm.length() - 1);
+                    }
+                    perms.add(perm);
+                }
+                Matcher m = p.matcher(line);
+                while (m.find()) {
+                    String perm = m.group(1);
+                    if (perm.endsWith(".")) {
+                        perm += "<arg>";
+                    }
+                    if (perm.startsWith(".")) {
+                        perms.remove(last);
+                        perms.add(last + perm);
+                    } else if (perm.contains(".")) {
+                        last = perm;
+                        perms.add(perm);
+                    }
+                }
+            } else if (line.contains("Permissions.hasPermissionRange")) {
+                String[] split = line.split("Permissions.hasPermissionRange");
+                split = Arrays.copyOfRange(split, 1, split.length);
+                for (String method : split) {
+                    String perm = method.split("[,|)]")[1].trim();
+                    if (!perm.equalsIgnoreCase(perm)) {
+                        if (perm.startsWith("C.")) {
+                            perm = C.valueOf(perm.split("\\.")[1]).s();
+                        } else {
+                            continue;
+                        }
+                    } else {
+                        perm = perm.substring(1, perm.length() - 1);
+                    }
+                    perms.add(perm + ".<#>");
+                }
+            }
+        }
+        switch (cmd.toLowerCase()) {
+            case "auto":
+            case "claim":
+                perms.add("plots.plot.<#>");
+                break;
+        }
+        return new ArrayList<>(perms);
+    }
+
+    public static String getComments(List<String> lines) {
+        StringBuilder result = new StringBuilder();
+        for (String line : lines) {
+            line = line.trim();
+            if (line.startsWith("/** ") || line.startsWith("*/ ") || line.startsWith("* ")) {
+                line =
+                    line.replaceAll("/[*][*] ", "").replaceAll("[*]/ ", "").replaceAll("[*] ", "")
+                        .trim();
+                result.append(line + '\n');
+            }
+        }
+        return result.toString().trim();
+    }
+
+    public static void log(String s) {
+        System.out.println(s);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
new file mode 100644
index 000000000..d29bd76bb
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
@@ -0,0 +1,71 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.UUID;
+
+@CommandDeclaration(command = "grant", category = CommandCategory.CLAIMING,
+    usage = "/plot grant <check|add> [player]", permission = "plots.grant",
+    requiredType = RequiredType.NONE) public class Grant extends Command {
+
+    public Grant() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        checkTrue(args.length >= 1 && args.length <= 2, C.COMMAND_SYNTAX, getUsage());
+        final String arg0 = args[0].toLowerCase();
+        switch (arg0) {
+            case "add":
+            case "check":
+                if (!Permissions.hasPermission(player, C.PERMISSION_GRANT.f(arg0))) {
+                    C.NO_PERMISSION.send(player, C.PERMISSION_GRANT.f(arg0));
+                    return;
+                }
+                if (args.length > 2) {
+                    break;
+                }
+                final UUID uuid =
+                    args.length == 2 ? UUIDHandler.getUUIDFromString(args[1]) : player.getUUID();
+                if (uuid == null) {
+                    C.INVALID_PLAYER.send(player, args[1]);
+                    return;
+                }
+                MainUtil.getPersistentMeta(uuid, "grantedPlots", new RunnableVal<byte[]>() {
+                    @Override public void run(byte[] array) {
+                        if (arg0.equals("check")) { // check
+                            int granted =
+                                array == null ? 0 : ByteArrayUtilities.bytesToInteger(array);
+                            C.GRANTED_PLOTS.send(player, granted);
+                        } else { // add
+                            int amount =
+                                1 + (array == null ? 0 : ByteArrayUtilities.bytesToInteger(array));
+                            boolean replace = array != null;
+                            String key = "grantedPlots";
+                            byte[] rawData = ByteArrayUtilities.integerToBytes(amount);
+                            PlotPlayer online = UUIDHandler.getPlayer(uuid);
+                            if (online != null) {
+                                online.setPersistentMeta(key, rawData);
+                            } else {
+                                DBFunc.addPersistentMeta(uuid, key, rawData, replace);
+                            }
+                        }
+                    }
+                });
+        }
+        C.COMMAND_SYNTAX.send(player, getUsage());
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
new file mode 100644
index 000000000..ff697953c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -0,0 +1,91 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.helpmenu.HelpMenu;
+
+@CommandDeclaration(command = "help", description = "Get this help menu", aliases = {"he", "?"},
+    category = CommandCategory.INFO, usage = "help [category|#]", permission = "plots.use")
+public class Help extends Command {
+    public Help(Command parent) {
+        super(parent, true);
+    }
+
+    @Override public boolean canExecute(PlotPlayer player, boolean message) {
+        return true;
+    }
+
+    @Override public void execute(PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        switch (args.length) {
+            case 0:
+                displayHelp(player, null, 0);
+                return;
+            case 1:
+                if (MathMan.isInteger(args[0])) {
+                    try {
+                        displayHelp(player, null, Integer.parseInt(args[0]));
+                    } catch (NumberFormatException ignored) {
+                        displayHelp(player, null, 1);
+                    }
+                } else {
+                    displayHelp(player, args[0], 1);
+                }
+                return;
+            case 2:
+                if (MathMan.isInteger(args[1])) {
+                    try {
+                        displayHelp(player, args[0], Integer.parseInt(args[1]));
+                    } catch (NumberFormatException ignored) {
+                        displayHelp(player, args[0], 1);
+                    }
+                }
+                return;
+            default:
+                C.COMMAND_SYNTAX.send(player, getUsage());
+        }
+    }
+
+    public void displayHelp(PlotPlayer player, String cat, int page) {
+        CommandCategory catEnum = null;
+        if (cat != null) {
+            if (!StringMan.isEqualIgnoreCase(cat, "all")) {
+                for (CommandCategory c : CommandCategory.values()) {
+                    if (StringMan.isEqualIgnoreCaseToAny(cat, c.name(), c.toString())) {
+                        catEnum = c;
+                        cat = c.name();
+                        break;
+                    }
+                }
+                if (catEnum == null) {
+                    cat = null;
+                }
+            }
+        }
+        if (cat == null && page == 0) {
+            StringBuilder builder = new StringBuilder();
+            builder.append(C.HELP_HEADER.s());
+            for (CommandCategory c : CommandCategory.values()) {
+                builder.append("\n" + StringMan
+                    .replaceAll(C.HELP_INFO_ITEM.s(), "%category%", c.toString().toLowerCase(),
+                        "%category_desc%", c.toString()));
+            }
+            builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
+                .replaceAll("%category_desc%", "Display all commands"));
+            builder.append("\n" + C.HELP_FOOTER.s());
+            MainUtil.sendMessage(player, builder.toString(), false);
+            return;
+        }
+        page--;
+        new HelpMenu(player).setCategory(catEnum).getCommands().generateMaxPages()
+            .generatePage(page, getParent().toString()).render();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
new file mode 100644
index 000000000..908e35afc
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -0,0 +1,198 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+import com.github.intellectualsites.plotsquared.plot.util.CommentManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@CommandDeclaration(command = "inbox", description = "Review the comments for a plot",
+    usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox",
+    category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Inbox
+    extends SubCommand {
+
+    public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
+        if (oldComments == null || oldComments.isEmpty()) {
+            MainUtil.sendMessage(player, C.INBOX_EMPTY);
+            return;
+        }
+        PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
+        if (page < 0) {
+            page = 0;
+        }
+        // Get the total pages
+        // int totalPages = ((int) Math.ceil(12 *
+        int totalPages = (int) Math.ceil(comments.length / 12);
+        if (page > totalPages) {
+            page = totalPages;
+        }
+        // Only display 12 per page
+        int max = page * 12 + 12;
+        if (max > comments.length) {
+            max = comments.length;
+        }
+        StringBuilder string = new StringBuilder();
+        string.append(StringMan
+            .replaceAll(C.COMMENT_LIST_HEADER_PAGED.s(), "%amount%", comments.length, "%cur",
+                page + 1, "%max", totalPages + 1, "%word", "all") + '\n');
+
+        // This might work xD
+        for (int x = page * 12; x < max; x++) {
+            PlotComment comment = comments[x];
+            String color;
+            if (player.getName().equals(comment.senderName)) {
+                color = "&a";
+            } else {
+                color = "&7";
+            }
+            string.append("&8[&7#").append(x + 1).append("&8][&7").append(comment.world).append(';')
+                .append(comment.id).append("&8][&6").append(comment.senderName).append("&8]")
+                .append(color).append(comment.comment).append('\n');
+        }
+        MainUtil.sendMessage(player, string.toString());
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            sendMessage(player, C.NOT_IN_PLOT);
+            return false;
+        }
+        if (!plot.hasOwner()) {
+            sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        if (args.length == 0) {
+            sendMessage(player, C.COMMAND_SYNTAX,
+                "/plot inbox [inbox] [delete <index>|clear|page]");
+            for (final CommentInbox inbox : CommentManager.inboxes.values()) {
+                if (inbox.canRead(plot, player)) {
+                    if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+                        @Override public void run(List<PlotComment> value) {
+                            if (value != null) {
+                                int total = 0;
+                                int unread = 0;
+                                for (PlotComment comment : value) {
+                                    total++;
+                                    if (comment.timestamp > CommentManager
+                                        .getTimestamp(player, inbox.toString())) {
+                                        unread++;
+                                    }
+                                }
+                                if (total != 0) {
+                                    String color;
+                                    if (unread > 0) {
+                                        color = "&c";
+                                    } else {
+                                        color = "";
+                                    }
+                                    sendMessage(player, C.INBOX_ITEM,
+                                        color + inbox.toString() + " (" + total + '/' + unread
+                                            + ')');
+                                    return;
+                                }
+                            }
+                            sendMessage(player, C.INBOX_ITEM, inbox.toString());
+                        }
+                    })) {
+                        sendMessage(player, C.INBOX_ITEM, inbox.toString());
+                    }
+                }
+            }
+            return false;
+        }
+        final CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
+        if (inbox == null) {
+            sendMessage(player, C.INVALID_INBOX,
+                StringMan.join(CommentManager.inboxes.keySet(), ", "));
+            return false;
+        }
+        player.setMeta("inbox:" + inbox.toString(), System.currentTimeMillis());
+        final int page;
+        if (args.length > 1) {
+            switch (args[1].toLowerCase()) {
+                case "delete":
+                    if (!inbox.canModify(plot, player)) {
+                        sendMessage(player, C.NO_PERM_INBOX_MODIFY);
+                        return false;
+                    }
+                    if (args.length != 3) {
+                        sendMessage(player, C.COMMAND_SYNTAX,
+                            "/plot inbox " + inbox.toString() + " delete <index>");
+                    }
+                    final int index;
+                    try {
+                        index = Integer.parseInt(args[2]);
+                        if (index < 1) {
+                            sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
+                            return false;
+                        }
+                    } catch (NumberFormatException ignored) {
+                        sendMessage(player, C.COMMAND_SYNTAX,
+                            "/plot inbox " + inbox.toString() + " delete <index>");
+                        return false;
+                    }
+
+                    if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+                        @Override public void run(List<PlotComment> value) {
+                            if (index > value.size()) {
+                                sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
+                                return;
+                            }
+                            PlotComment comment = value.get(index - 1);
+                            inbox.removeComment(plot, comment);
+                            plot.getSettings().removeComment(comment);
+                            MainUtil.sendMessage(player, C.COMMENT_REMOVED, comment.comment);
+                        }
+                    })) {
+                        sendMessage(player, C.NOT_IN_PLOT);
+                        return false;
+                    }
+                    return true;
+                case "clear":
+                    if (!inbox.canModify(plot, player)) {
+                        sendMessage(player, C.NO_PERM_INBOX_MODIFY);
+                    }
+                    inbox.clearInbox(plot);
+                    Optional<ArrayList<PlotComment>> comments =
+                        plot.getSettings().getComments(inbox.toString());
+                    comments
+                        .ifPresent(plotComments -> plot.getSettings().removeComments(plotComments));
+                    MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
+                    return true;
+                default:
+                    try {
+                        page = Integer.parseInt(args[1]);
+                    } catch (NumberFormatException ignored) {
+                        sendMessage(player, C.COMMAND_SYNTAX,
+                            "/plot inbox [inbox] [delete <index>|clear|page]");
+                        return false;
+                    }
+            }
+        } else {
+            page = 1;
+        }
+        if (!inbox.canRead(plot, player)) {
+            sendMessage(player, C.NO_PERM_INBOX);
+            return false;
+        }
+        if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+            @Override public void run(List<PlotComment> value) {
+                displayComments(player, value, page);
+            }
+        })) {
+            sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
new file mode 100644
index 000000000..6241e1d51
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -0,0 +1,155 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+
+import java.util.UUID;
+
+@CommandDeclaration(command = "info", aliases = "i", description = "Display plot info",
+    usage = "/plot info <id>", category = CommandCategory.INFO) public class Info
+    extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Plot plot;
+        String arg;
+        if (args.length > 0) {
+            arg = args[0];
+            switch (arg) {
+                case "trusted":
+                case "alias":
+                case "inv":
+                case "biome":
+                case "denied":
+                case "flags":
+                case "id":
+                case "size":
+                case "members":
+                case "seen":
+                case "owner":
+                case "rating":
+                    plot = MainUtil.getPlotFromString(player, null, false);
+                    break;
+                default:
+                    plot = MainUtil.getPlotFromString(player, arg, false);
+                    if (args.length == 2) {
+                        arg = args[1];
+                    } else {
+                        arg = null;
+                    }
+                    break;
+            }
+            if (plot == null) {
+                plot = player.getCurrentPlot();
+            }
+        } else {
+            arg = null;
+            plot = player.getCurrentPlot();
+        }
+        if (plot == null) {
+            MainUtil.sendMessage(player, C.NOT_IN_PLOT.s());
+            return false;
+        }
+        if (arg != null) {
+            if (args.length == 1) {
+                args = new String[0];
+            } else {
+                args = new String[] {args[1]};
+            }
+        }
+        if (args.length == 1 && args[0].equalsIgnoreCase("inv")) {
+            PlotInventory inv = new PlotInventory(player) {
+                @Override public boolean onClick(int index) {
+                    // TODO InfoInventory not implemented yet!!!!!!!!
+                    // See plot rating or musicsubcommand on examples
+                    return false;
+                }
+            };
+            UUID uuid = player.getUUID();
+            String name = MainUtil.getName(plot.owner);
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cPlot Info",
+                "&cID: &6" + plot.getId().toString(), "&cOwner: &6" + name,
+                "&cAlias: &6" + plot.getAlias(),
+                "&cBiome: &6" + plot.getBiome().replaceAll("_", "").toLowerCase(),
+                "&cCan Build: &6" + plot.isAdded(uuid),
+                "&cSeen: &6" + MainUtil.secToTime((int) (ExpireManager.IMP.getAge(plot) / 1000)),
+                "&cIs Denied: &6" + plot.isDenied(uuid)));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cTrusted",
+                "&cAmount: &6" + plot.getTrusted().size(),
+                "&8Click to view a list of the trusted users"));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cMembers",
+                "&cAmount: &6" + plot.getMembers().size(),
+                "&8Click to view a list of plot members"));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cDenied", "&cDenied",
+                "&cAmount: &6" + plot.getDenied().size(),
+                "&8Click to view a list of denied players"));
+            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cFlags", "&cFlags",
+                "&cAmount: &6" + plot.getFlags().size(), "&8Click to view a list of plot flags"));
+            inv.openInventory();
+            return true;
+        }
+        boolean hasOwner = plot.hasOwner();
+        // Wildcard player {added}
+        boolean containsEveryone = plot.getTrusted().contains(DBFunc.EVERYONE);
+        boolean trustedEveryone = plot.getMembers().contains(DBFunc.EVERYONE);
+        // Unclaimed?
+        if (!hasOwner && !containsEveryone && !trustedEveryone) {
+            MainUtil
+                .sendMessage(player, C.PLOT_INFO_UNCLAIMED, plot.getId().x + ";" + plot.getId().y);
+            return true;
+        }
+        String info = C.PLOT_INFO.s();
+        boolean full;
+        if (arg != null) {
+            info = getCaption(arg);
+            if (info == null) {
+                MainUtil.sendMessage(player,
+                    "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                        + "&aowner&7, &arating");
+                return false;
+            }
+            full = true;
+        } else {
+            full = false;
+        }
+        MainUtil.format(info, plot, player, full, new RunnableVal<String>() {
+            @Override public void run(String value) {
+                MainUtil.sendMessage(player,
+                    C.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + C.PLOT_INFO_FOOTER.s(), false);
+            }
+        });
+        return true;
+    }
+
+    private String getCaption(String string) {
+        switch (string) {
+            case "trusted":
+                return C.PLOT_INFO_TRUSTED.s();
+            case "alias":
+                return C.PLOT_INFO_ALIAS.s();
+            case "biome":
+                return C.PLOT_INFO_BIOME.s();
+            case "denied":
+                return C.PLOT_INFO_DENIED.s();
+            case "flags":
+                return C.PLOT_INFO_FLAGS.s();
+            case "id":
+                return C.PLOT_INFO_ID.s();
+            case "size":
+                return C.PLOT_INFO_SIZE.s();
+            case "members":
+                return C.PLOT_INFO_MEMBERS.s();
+            case "owner":
+                return C.PLOT_INFO_OWNER.s();
+            case "rating":
+                return C.PLOT_INFO_RATING.s();
+            case "seen":
+                return C.PLOT_INFO_SEEN.s();
+            default:
+                return null;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
new file mode 100644
index 000000000..fc16db715
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
@@ -0,0 +1,92 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "kick", aliases = {"k"}, description = "Kick a player from your plot",
+    permission = "plots.kick", usage = "/plot kick <player>", category = CommandCategory.TELEPORT,
+    requiredType = RequiredType.NONE) public class Kick extends SubCommand {
+
+    public Kick() {
+        super(Argument.PlayerName);
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location location = player.getLocation();
+        Plot plot = location.getPlot();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_KICK)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
+        if (uuids.isEmpty()) {
+            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            return false;
+        }
+        Set<PlotPlayer> players = new HashSet<>();
+        for (UUID uuid : uuids) {
+            if (uuid == DBFunc.EVERYONE) {
+                for (PlotPlayer pp : plot.getPlayersInPlot()) {
+                    if (pp == player || Permissions
+                        .hasPermission(pp, C.PERMISSION_ADMIN_ENTRY_DENIED)) {
+                        continue;
+                    }
+                    players.add(pp);
+                }
+                continue;
+            }
+            PlotPlayer pp = UUIDHandler.getPlayer(uuid);
+            if (pp != null) {
+                players.add(pp);
+            }
+        }
+        players.remove(player); // Don't ever kick the calling player
+        if (players.isEmpty()) {
+            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            return false;
+        }
+        for (PlotPlayer player2 : players) {
+            if (!plot.equals(player2.getCurrentPlot())) {
+                MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+                return false;
+            }
+            if (Permissions.hasPermission(player2, C.PERMISSION_ADMIN_ENTRY_DENIED)) {
+                C.CANNOT_KICK_PLAYER.send(player, player2.getName());
+                return false;
+            }
+            Location spawn = WorldUtil.IMP.getSpawn(location.getWorld());
+            C.YOU_GOT_KICKED.send(player2);
+            if (plot.equals(spawn.getPlot())) {
+                Location newSpawn = WorldUtil.IMP
+                    .getSpawn(PlotSquared.get().getPlotAreaManager().getAllWorlds()[0]);
+                if (plot.equals(newSpawn.getPlot())) {
+                    // Kick from server if you can't be teleported to spawn
+                    player2.kick(C.YOU_GOT_KICKED.s());
+                } else {
+                    player2.plotkick(newSpawn);
+                }
+            } else {
+                player2.plotkick(spawn);
+            }
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
new file mode 100644
index 000000000..5504ce777
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
@@ -0,0 +1,48 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+import java.util.UUID;
+
+@CommandDeclaration(command = "leave",
+    description = "Removes self from being trusted or a member of the plot",
+    permission = "plots.leave", category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE) public class Leave extends Command {
+    public Leave() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
+        checkTrue(plot.isAdded(player.getUUID()), C.NO_PLOT_PERMS);
+        checkTrue(args.length == 0, C.COMMAND_SYNTAX, getUsage());
+        if (plot.isOwner(player.getUUID())) {
+            checkTrue(plot.hasOwner(), C.ALREADY_OWNER);
+            // TODO setowner, other
+        } else {
+            UUID uuid = player.getUUID();
+            if (plot.isAdded(uuid)) {
+                if (plot.removeTrusted(uuid)) {
+                    EventUtil.manager.callTrusted(player, plot, uuid, false);
+                }
+                if (plot.removeMember(uuid)) {
+                    EventUtil.manager.callMember(player, plot, uuid, false);
+                }
+                MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            } else {
+                MainUtil.sendMessage(player, C.REMOVED_PLAYERS, 1);
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
new file mode 100644
index 000000000..9df74d30b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -0,0 +1,397 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared.SortType;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+@CommandDeclaration(command = "list", aliases = {"l", "find", "search"}, description = "List plots",
+    permission = "plots.list", category = CommandCategory.INFO,
+    usage = "/plot list <forsale|mine|shared|world|top|all|unowned|unknown|player|world|done|fuzzy <search...>> [#]")
+public class ListCmd extends SubCommand {
+
+    private String[] getArgumentList(PlotPlayer player) {
+        List<String> args = new ArrayList<>();
+        if (EconHandler.manager != null && Permissions
+            .hasPermission(player, C.PERMISSION_LIST_FORSALE)) {
+            args.add("forsale");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_MINE)) {
+            args.add("mine");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_SHARED)) {
+            args.add("shared");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
+            args.add("world");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_TOP)) {
+            args.add("top");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_ALL)) {
+            args.add("all");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_UNOWNED)) {
+            args.add("unowned");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_UNKNOWN)) {
+            args.add("unknown");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_PLAYER)) {
+            args.add("<player>");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
+            args.add("<world>");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_DONE)) {
+            args.add("done");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_EXPIRED)) {
+            args.add("expired");
+        }
+        if (Permissions.hasPermission(player, C.PERMISSION_LIST_FUZZY)) {
+            args.add("fuzzy <search...>");
+        }
+        return args.toArray(new String[args.size()]);
+    }
+
+    public void noArgs(PlotPlayer player) {
+        MainUtil.sendMessage(player,
+            C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + Arrays.toString(getArgumentList(player)));
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        if (args.length < 1) {
+            noArgs(player);
+            return false;
+        }
+        int page = 0;
+        if (args.length > 1) {
+            try {
+                page = Integer.parseInt(args[args.length - 1]);
+                --page;
+                if (page < 0) {
+                    page = 0;
+                }
+            } catch (NumberFormatException ignored) {
+                page = -1;
+            }
+        }
+
+        List<Plot> plots = null;
+
+        String world = player.getLocation().getWorld();
+        PlotArea area = player.getApplicablePlotArea();
+        String arg = args[0].toLowerCase();
+        boolean sort = true;
+        switch (arg) {
+            case "mine":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_MINE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_MINE);
+                    return false;
+                }
+                sort = false;
+                plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getBasePlots(player));
+                break;
+            case "shared":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_SHARED)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_SHARED);
+                    return false;
+                }
+                plots = new ArrayList<>();
+                for (Plot plot : PlotSquared.get().getPlots()) {
+                    if (plot.getTrusted().contains(player.getUUID()) || plot.getMembers()
+                        .contains(player.getUUID())) {
+                        plots.add(plot);
+                    }
+                }
+                break;
+            case "world":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_WORLD);
+                    return false;
+                }
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(world))) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION,
+                        C.PERMISSION_LIST_WORLD_NAME.f(world));
+                    return false;
+                }
+                plots = new ArrayList<>(PlotSquared.get().getPlots(world));
+                break;
+            case "expired":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_EXPIRED)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_EXPIRED);
+                    return false;
+                }
+                plots = ExpireManager.IMP == null ?
+                    new ArrayList<Plot>() :
+                    new ArrayList<>(ExpireManager.IMP.getPendingExpired());
+                break;
+            case "area":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_AREA)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_AREA);
+                    return false;
+                }
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(world))) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION,
+                        C.PERMISSION_LIST_WORLD_NAME.f(world));
+                    return false;
+                }
+                plots = area == null ? new ArrayList<Plot>() : new ArrayList<>(area.getPlots());
+                break;
+            case "all":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_ALL)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_ALL);
+                    return false;
+                }
+                plots = new ArrayList<>(PlotSquared.get().getPlots());
+                break;
+            case "done":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_DONE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_DONE);
+                    return false;
+                }
+                plots = new ArrayList<>();
+                for (Plot plot : PlotSquared.get().getPlots()) {
+                    Optional<String> flag = plot.getFlag(Flags.DONE);
+                    if (flag.isPresent()) {
+                        plots.add(plot);
+                    }
+                }
+                Collections.sort(plots, new Comparator<Plot>() {
+                    @Override public int compare(Plot a, Plot b) {
+                        String va = "" + a.getFlags().get(Flags.DONE);
+                        String vb = "" + b.getFlags().get(Flags.DONE);
+                        if (MathMan.isInteger(va)) {
+                            if (MathMan.isInteger(vb)) {
+                                return Integer.parseInt(vb) - Integer.parseInt(va);
+                            }
+                            return -1;
+                        }
+                        return 1;
+                    }
+                });
+                sort = false;
+                break;
+            case "top":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_TOP)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_TOP);
+                    return false;
+                }
+                plots = new ArrayList<>(PlotSquared.get().getPlots());
+                Collections.sort(plots, new Comparator<Plot>() {
+                    @Override public int compare(Plot p1, Plot p2) {
+                        double v1 = 0;
+                        int p1s = p1.getSettings().getRatings().size();
+                        int p2s = p2.getRatings().size();
+                        if (!p1.getSettings().getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
+                                double av = entry.getValue().getAverageRating();
+                                v1 += av * av;
+                            }
+                            v1 /= p1s;
+                            v1 += p1s;
+                        }
+                        double v2 = 0;
+                        if (!p2.getSettings().getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                                double av = entry.getValue().getAverageRating();
+                                v2 += av * av;
+                            }
+                            v2 /= p2s;
+                            v2 += p2s;
+                        }
+                        if (v2 == v1 && v2 != 0) {
+                            return p2s - p1s;
+                        }
+                        return (int) Math.signum(v2 - v1);
+                    }
+                });
+                sort = false;
+                break;
+            case "forsale":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_FORSALE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_FORSALE);
+                    return false;
+                }
+                if (EconHandler.manager == null) {
+                    break;
+                }
+                plots = new ArrayList<>();
+                for (Plot plot : PlotSquared.get().getPlots()) {
+                    Optional<Double> price = plot.getFlag(Flags.PRICE);
+                    if (price.isPresent()) {
+                        plots.add(plot);
+                    }
+                }
+                break;
+            case "unowned":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_UNOWNED)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_UNOWNED);
+                    return false;
+                }
+                plots = new ArrayList<>();
+                for (Plot plot : PlotSquared.get().getPlots()) {
+                    if (plot.owner == null) {
+                        plots.add(plot);
+                    }
+                }
+                break;
+            case "unknown":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_UNKNOWN)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_UNKNOWN);
+                    return false;
+                }
+                plots = new ArrayList<>();
+                for (Plot plot : PlotSquared.get().getPlots()) {
+                    if (plot.owner == null) {
+                        continue;
+                    }
+                    if (UUIDHandler.getName(plot.owner) == null) {
+                        plots.add(plot);
+                    }
+                }
+                break;
+            case "fuzzy":
+                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_FUZZY)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_FUZZY);
+                    return false;
+                }
+                if (args.length < (page == -1 ? 2 : 3)) {
+                    C.COMMAND_SYNTAX.send(player, "/plot list fuzzy <search...> [#]");
+                    return false;
+                }
+                String term;
+                if (MathMan.isInteger(args[args.length - 1])) {
+                    term = StringMan.join(Arrays.copyOfRange(args, 1, args.length - 1), " ");
+                } else {
+                    term = StringMan.join(Arrays.copyOfRange(args, 1, args.length), " ");
+                }
+                plots = MainUtil.getPlotsBySearch(term);
+                sort = false;
+                break;
+            default:
+                if (PlotSquared.get().hasPlotArea(args[0])) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_WORLD);
+                        return false;
+                    }
+                    if (!Permissions
+                        .hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(args[0]))) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_LIST_WORLD_NAME.f(args[0]));
+                        return false;
+                    }
+                    plots = new ArrayList<>(PlotSquared.get().getPlots(args[0]));
+                    break;
+                }
+                UUID uuid = UUIDHandler.getUUID(args[0], null);
+                if (uuid == null) {
+                    try {
+                        uuid = UUID.fromString(args[0]);
+                    } catch (Exception ignored) {
+                    }
+                }
+                if (uuid != null) {
+                    if (!Permissions.hasPermission(player, C.PERMISSION_LIST_PLAYER)) {
+                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_PLAYER);
+                        return false;
+                    }
+                    sort = false;
+                    plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots(uuid));
+                    break;
+                }
+        }
+
+        if (plots == null) {
+            sendMessage(player, C.DID_YOU_MEAN,
+                new StringComparison<>(args[0], new String[] {"mine", "shared", "world", "all"})
+                    .getBestMatch());
+            return false;
+        }
+
+        if (plots.isEmpty()) {
+            MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
+            return false;
+        }
+        displayPlots(player, plots, 12, page, area, args, sort);
+        return true;
+    }
+
+    public void displayPlots(final PlotPlayer player, List<Plot> plots, int pageSize, int page,
+        PlotArea area, String[] args, boolean sort) {
+        // Header
+        Iterator<Plot> iterator = plots.iterator();
+        while (iterator.hasNext()) {
+            if (!iterator.next().isBasePlot()) {
+                iterator.remove();
+            }
+        }
+        if (sort) {
+            plots = PlotSquared.get().sortPlots(plots, SortType.CREATION_DATE, area);
+        }
+        this.paginate(player, plots, pageSize, page,
+            new RunnableVal3<Integer, Plot, PlotMessage>() {
+                @Override public void run(Integer i, Plot plot, PlotMessage message) {
+                    String color;
+                    if (plot.owner == null) {
+                        color = "$3";
+                    } else if (plot.isOwner(player.getUUID())) {
+                        color = "$1";
+                    } else if (plot.isAdded(player.getUUID())) {
+                        color = "$4";
+                    } else if (plot.isDenied(player.getUUID())) {
+                        color = "$2";
+                    } else {
+                        color = "$1";
+                    }
+                    PlotMessage trusted = new PlotMessage().text(C.color(C.PLOT_INFO_TRUSTED.s()
+                        .replaceAll("%trusted%", MainUtil.getPlayerList(plot.getTrusted()))))
+                        .color("$1");
+                    PlotMessage members = new PlotMessage().text(C.color(C.PLOT_INFO_MEMBERS.s()
+                        .replaceAll("%members%", MainUtil.getPlayerList(plot.getMembers()))))
+                        .color("$1");
+                    String strFlags = StringMan.join(plot.getFlags().values(), ",");
+                    if (strFlags.isEmpty()) {
+                        strFlags = C.NONE.s();
+                    }
+                    PlotMessage flags = new PlotMessage()
+                        .text(C.color(C.PLOT_INFO_FLAGS.s().replaceAll("%flags%", strFlags)))
+                        .color("$1");
+                    message.text("[").color("$3").text(i + "")
+                        .command("/plot visit " + plot.getArea() + ";" + plot.getId())
+                        .tooltip("/plot visit " + plot.getArea() + ";" + plot.getId()).color("$1")
+                        .text("]").color("$3").text(" " + plot.toString())
+                        .tooltip(trusted, members, flags)
+                        .command("/plot info " + plot.getArea() + ";" + plot.getId()).color(color)
+                        .text(" - ").color("$2");
+                    String prefix = "";
+                    for (UUID uuid : plot.getOwners()) {
+                        String name = UUIDHandler.getName(uuid);
+                        if (name == null) {
+                            message = message.text(prefix).color("$4").text("unknown").color("$2")
+                                .tooltip(uuid.toString()).suggest(uuid.toString());
+                        } else {
+                            PlotPlayer pp = UUIDHandler.getPlayer(uuid);
+                            if (pp != null) {
+                                message = message.text(prefix).color("$4").text(name).color("$1")
+                                    .tooltip(new PlotMessage("Online").color("$4"));
+                            } else {
+                                message = message.text(prefix).color("$4").text(name).color("$1")
+                                    .tooltip(new PlotMessage("Offline").color("$3"));
+                            }
+                        }
+                        prefix = ", ";
+                    }
+                }
+            }, "/plot list " + args[0], C.PLOT_LIST_HEADER_PAGED.s());
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
new file mode 100644
index 000000000..cc9106d28
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
@@ -0,0 +1,179 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+
+@CommandDeclaration(command = "load", aliases = {"restore"}, category = CommandCategory.SCHEMATIC,
+    requiredType = RequiredType.NONE, description = "Load your plot", permission = "plots.load",
+    usage = "/plot load") public class Load extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        String world = player.getLocation().getWorld();
+        if (!PlotSquared.get().hasPlotArea(world)) {
+            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
+        }
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_LOAD)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (plot.getRunning() > 0) {
+            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            return false;
+        }
+
+        if (args.length != 0) {
+            if (args.length == 1) {
+                List<String> schematics = player.getMeta("plot_schematics");
+                if (schematics == null) {
+                    // No schematics found:
+                    MainUtil.sendMessage(player, C.LOAD_NULL);
+                    return false;
+                }
+                String schem;
+                try {
+                    schem = schematics.get(Integer.parseInt(args[0]) - 1);
+                } catch (Exception ignored) {
+                    // use /plot load <index>
+                    MainUtil
+                        .sendMessage(player, C.NOT_VALID_NUMBER, "(1, " + schematics.size() + ')');
+                    return false;
+                }
+                final URL url;
+                try {
+                    url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schem);
+                } catch (MalformedURLException e) {
+                    e.printStackTrace();
+                    MainUtil.sendMessage(player, C.LOAD_FAILED);
+                    return false;
+                }
+                plot.addRunning();
+                MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
+                TaskManager.runTaskAsync(() -> {
+                    Schematic schematic = SchematicHandler.manager.getSchematic(url);
+                    if (schematic == null) {
+                        plot.removeRunning();
+                        sendMessage(player, C.SCHEMATIC_INVALID,
+                            "non-existent or not in gzip format");
+                        return;
+                    }
+                    PlotArea area = plot.getArea();
+                    SchematicHandler.manager
+                        .paste(schematic, plot, 0, area.MIN_BUILD_HEIGHT, 0, false,
+                            new RunnableVal<Boolean>() {
+                                @Override public void run(Boolean value) {
+                                    plot.removeRunning();
+                                    if (value) {
+                                        sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                                    } else {
+                                        sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                                    }
+                                }
+                            });
+                });
+                return true;
+            }
+            plot.removeRunning();
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot load <index>");
+            return false;
+        }
+
+        // list schematics
+
+        List<String> schematics = player.getMeta("plot_schematics");
+        if (schematics == null) {
+            plot.addRunning();
+            TaskManager.runTaskAsync(() -> {
+                List<String> schematics1 = SchematicHandler.manager.getSaves(player.getUUID());
+                plot.removeRunning();
+                if ((schematics1 == null) || schematics1.isEmpty()) {
+                    MainUtil.sendMessage(player, C.LOAD_FAILED);
+                    return;
+                }
+                player.setMeta("plot_schematics", schematics1);
+                displaySaves(player);
+            });
+        } else {
+            displaySaves(player);
+        }
+        return true;
+    }
+
+    public void displaySaves(PlotPlayer player) {
+        List<String> schematics = player.getMeta("plot_schematics");
+        for (int i = 0; i < Math.min(schematics.size(), 32); i++) {
+            try {
+                String schematic = schematics.get(i).split("\\.")[0];
+                String[] split = schematic.split("_");
+                if (split.length < 5) {
+                    continue;
+                }
+                String time =
+                    secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
+                String world = split[1];
+                PlotId id = PlotId.fromString(split[2] + ';' + split[3]);
+                String size = split[4];
+                String color = "$4";
+                MainUtil.sendMessage(player,
+                    "$3[$2" + (i + 1) + "$3] " + color + time + "$3 | " + color + world + ';' + id
+                        + "$3 | " + color + size + 'x' + size);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        MainUtil.sendMessage(player, C.LOAD_LIST);
+    }
+
+    public String secToTime(long time) {
+        StringBuilder toreturn = new StringBuilder();
+        if (time >= 33868800) {
+            int years = (int) (time / 33868800);
+            time -= years * 33868800;
+            toreturn.append(years).append("y ");
+        }
+        if (time >= 604800) {
+            int weeks = (int) (time / 604800);
+            time -= weeks * 604800;
+            toreturn.append(weeks).append("w ");
+        }
+        if (time >= 86400) {
+            int days = (int) (time / 86400);
+            time -= days * 86400;
+            toreturn.append(days).append("d ");
+        }
+        if (time >= 3600) {
+            int hours = (int) (time / 3600);
+            time -= hours * 3600;
+            toreturn.append(hours).append("h ");
+        }
+        if (time >= 60) {
+            int minutes = (int) (time / 60);
+            time -= minutes * 60;
+            toreturn.append(minutes).append("m ");
+        }
+        if (toreturn.length() == 0 || (time > 0)) {
+            toreturn.append(time).append("s ");
+        }
+        return toreturn.toString().trim();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
new file mode 100644
index 000000000..0e1630e76
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
@@ -0,0 +1,286 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+import java.util.Arrays;
+
+/**
+ * PlotSquared command class.
+ */
+@CommandDeclaration(command = "plot",
+    aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
+public class MainCommand extends Command {
+
+    private static MainCommand instance;
+    public Help help;
+    public Toggle toggle;
+
+    private MainCommand() {
+        super(null, true);
+        instance = this;
+    }
+
+    public static MainCommand getInstance() {
+        if (instance == null) {
+            instance = new MainCommand();
+            new Buy();
+            new Save();
+            new Load();
+            new Confirm();
+            new Template();
+            new Download();
+            new Template();
+            new Setup();
+            new Area();
+            new DebugSaveTest();
+            new DebugLoadTest();
+            new CreateRoadSchematic();
+            new DebugAllowUnsafe();
+            new RegenAllRoads();
+            new Claim();
+            new Auto();
+            new Visit();
+            new Set();
+            new Clear();
+            new Delete();
+            new Trust();
+            new Add();
+            new Leave();
+            new Deny();
+            new Remove();
+            new Info();
+            new Near();
+            new ListCmd();
+            new Debug();
+            new SchematicCmd();
+            new PluginCmd();
+            new Purge();
+            new Reload();
+            new Relight();
+            new Merge();
+            new DebugPaste();
+            new Unlink();
+            new Kick();
+            new Rate();
+            new DebugClaimTest();
+            new Inbox();
+            new Comment();
+            new Database();
+            new Swap();
+            new Music();
+            new DebugRoadRegen();
+            new Trust();
+            new DebugExec();
+            new FlagCmd();
+            new Target();
+            new DebugFixFlags();
+            new Move();
+            new Condense();
+            new Copy();
+            new Chat();
+            new Trim();
+            new Done();
+            new Continue();
+            new Middle();
+            new Grant();
+            // Set commands
+            new Owner();
+            new Desc();
+            new Biome();
+            new Alias();
+            new SetHome();
+            new Cluster();
+            new DebugImportWorlds();
+            // Referenced commands
+            instance.toggle = new Toggle();
+            instance.help = new Help(instance);
+        }
+        return instance;
+    }
+
+    public static boolean onCommand(final PlotPlayer player, String... args) {
+        if (args.length >= 1 && args[0].contains(":")) {
+            String[] split2 = args[0].split(":");
+            if (split2.length == 2) {
+                // Ref: c:v, this will push value to the last spot in the array
+                // ex. /p h:2 SomeUsername
+                // > /p h SomeUsername 2
+                String[] tmp = new String[args.length + 1];
+                tmp[0] = split2[0];
+                tmp[args.length] = split2[1];
+                if (args.length >= 2) {
+                    System.arraycopy(args, 1, tmp, 1, args.length - 1);
+                }
+                args = tmp;
+            }
+        }
+        try {
+            getInstance().execute(player, args, new RunnableVal3<Command, Runnable, Runnable>() {
+                @Override
+                public void run(final Command cmd, final Runnable success, final Runnable failure) {
+                    if (cmd.hasConfirmation(player)) {
+                        CmdConfirm.addPending(player, cmd.getUsage(), new Runnable() {
+                            @Override public void run() {
+                                if (EconHandler.manager != null) {
+                                    PlotArea area = player.getApplicablePlotArea();
+                                    if (area != null) {
+                                        Expression<Double> priceEval =
+                                            area.PRICES.get(cmd.getFullId());
+                                        Double price =
+                                            priceEval != null ? priceEval.evaluate(0d) : 0d;
+                                        if (price != null
+                                            && EconHandler.manager.getMoney(player) < price) {
+                                            if (failure != null) {
+                                                failure.run();
+                                            }
+                                            return;
+                                        }
+                                    }
+                                }
+                                if (success != null) {
+                                    success.run();
+                                }
+                            }
+                        });
+                        return;
+                    }
+                    if (EconHandler.manager != null) {
+                        PlotArea area = player.getApplicablePlotArea();
+                        if (area != null) {
+                            Expression<Double> priceEval = area.PRICES.get(cmd.getFullId());
+                            Double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
+                            if (price != 0d && EconHandler.manager.getMoney(player) < price) {
+                                if (failure != null) {
+                                    failure.run();
+                                }
+                                return;
+                            }
+                        }
+                    }
+                    if (success != null) {
+                        success.run();
+                    }
+                }
+            }, new RunnableVal2<Command, CommandResult>() {
+                @Override public void run(Command cmd, CommandResult result) {
+                    // Post command stuff!?
+                }
+            });
+        } catch (CommandException e) {
+            e.perform(player);
+        }
+        // Always true
+        return true;
+    }
+
+    @Deprecated
+    /**
+     * @Deprecated legacy
+     */ public void addCommand(SubCommand command) {
+        PlotSquared.debug("Command registration is now done during instantiation");
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        // Clear perm caching //
+        player.deleteMeta("perm");
+        // Optional command scope //
+        Location loc = null;
+        Plot plot = null;
+        boolean tp = false;
+        if (args.length >= 2) {
+            PlotArea area = player.getApplicablePlotArea();
+            Plot newPlot = Plot.fromString(area, args[0]);
+            if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
+                .equals(area) || Permissions.hasPermission(player, C.PERMISSION_ADMIN)) && !newPlot
+                .isDenied(player.getUUID())) {
+                Location newLoc = newPlot.getCenter();
+                if (player.canTeleport(newLoc)) {
+                    // Save meta
+                    loc = player.getMeta(PlotPlayer.META_LOCATION);
+                    plot = player.getMeta(PlotPlayer.META_LAST_PLOT);
+                    tp = true;
+                    // Set loc
+                    player.setMeta(PlotPlayer.META_LOCATION, newLoc);
+                    player.setMeta(PlotPlayer.META_LAST_PLOT, newPlot);
+                } else {
+                    C.BORDER.send(player);
+                }
+                // Trim command
+                args = Arrays.copyOfRange(args, 1, args.length);
+            }
+            if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') {
+                switch (args[0].substring(1)) {
+                    case "f":
+                        confirm = new RunnableVal3<Command, Runnable, Runnable>() {
+                            @Override
+                            public void run(Command cmd, Runnable success, Runnable failure) {
+                                if (EconHandler.manager != null) {
+                                    PlotArea area = player.getApplicablePlotArea();
+                                    if (area != null) {
+                                        Expression<Double> priceEval =
+                                            area.PRICES.get(cmd.getFullId());
+                                        Double price =
+                                            priceEval != null ? priceEval.evaluate(0d) : 0d;
+                                        if (price != 0d
+                                            && EconHandler.manager.getMoney(player) < price) {
+                                            if (failure != null) {
+                                                failure.run();
+                                            }
+                                            return;
+                                        }
+                                    }
+                                }
+                                if (success != null) {
+                                    success.run();
+                                }
+                            }
+                        };
+                        args = Arrays.copyOfRange(args, 1, args.length);
+                        break;
+                    default:
+                        C.INVALID_COMMAND_FLAG.send(player);
+                        return;
+                }
+            }
+        }
+        try {
+            super.execute(player, args, confirm, whenDone);
+        } catch (CommandException e) {
+            throw e;
+        } catch (Throwable e) {
+            e.printStackTrace();
+            String message = e.getLocalizedMessage();
+            if (message != null) {
+                C.ERROR.send(player, message);
+            } else {
+                C.ERROR.send(player);
+            }
+        }
+        // Reset command scope //
+        if (tp && !(player instanceof ConsolePlayer)) {
+            if (loc == null) {
+                player.deleteMeta(PlotPlayer.META_LOCATION);
+            } else {
+                player.setMeta(PlotPlayer.META_LOCATION, loc);
+            }
+            if (plot == null) {
+                player.deleteMeta(PlotPlayer.META_LAST_PLOT);
+            } else {
+                player.setMeta(PlotPlayer.META_LAST_PLOT, plot);
+            }
+        }
+    }
+
+    @Override public boolean canExecute(PlotPlayer player, boolean message) {
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
new file mode 100644
index 000000000..94152175e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
@@ -0,0 +1,198 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.util.UUID;
+
+@CommandDeclaration(command = "merge", aliases = "m",
+    description = "Merge the plot you are standing on, with another plot",
+    permission = "plots.merge", usage = "/plot merge <all|n|e|s|w> [removeroads]",
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, confirmation = true)
+public class Merge extends SubCommand {
+
+    public static final String[] values = new String[] {"north", "east", "south", "west", "auto"};
+    public static final String[] aliases = new String[] {"n", "e", "s", "w", "all"};
+
+    public static String direction(float yaw) {
+        yaw = yaw / 90;
+        int i = Math.round(yaw);
+        switch (i) {
+            case -4:
+            case 0:
+            case 4:
+                return "SOUTH";
+            case -1:
+            case 3:
+                return "EAST";
+            case -2:
+            case 2:
+                return "NORTH";
+            case -3:
+            case 1:
+                return "WEST";
+            default:
+                return "";
+        }
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Location loc = player.getLocationFull();
+        final Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        UUID uuid = player.getUUID();
+        if (!plot.isOwner(uuid)) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_MERGE)) {
+                MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+                return false;
+            } else {
+                uuid = plot.guessOwner();
+            }
+        }
+        final PlotArea plotArea = plot.getArea();
+        Expression<Double> priceExr =
+            plotArea.PRICES.getOrDefault("merge", Expression.constant(0d));
+        final int size = plot.getConnectedPlots().size();
+        final double price = priceExr.evaluate((double) size);
+        if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d
+            && EconHandler.manager.getMoney(player) < price) {
+            sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
+            return false;
+        }
+        final int maxSize =
+            Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
+        if (size - 1 > maxSize) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.merge." + (size + 1));
+            return false;
+        }
+        int direction = -1;
+        if (args.length == 0) {
+            switch (direction(player.getLocationFull().getYaw())) {
+                case "NORTH":
+                    direction = 0;
+                    break;
+                case "EAST":
+                    direction = 1;
+                    break;
+                case "SOUTH":
+                    direction = 2;
+                    break;
+                case "WEST":
+                    direction = 3;
+                    break;
+            }
+        } else {
+            if ("all".equalsIgnoreCase(args[0]) || "auto".equalsIgnoreCase(args[0])) {
+                boolean terrain = true;
+                if (args.length == 2) {
+                    terrain = "true".equalsIgnoreCase(args[1]);
+                }
+                if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
+                    return true;
+                }
+                if (plot.autoMerge(-1, maxSize, uuid, terrain)) {
+                    if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
+                        EconHandler.manager.withdrawMoney(player, price);
+                        sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
+                    }
+                    MainUtil.sendMessage(player, C.SUCCESS_MERGE);
+                    return true;
+                }
+                MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
+                return false;
+
+            }
+            for (int i = 0; i < values.length; i++) {
+                if (args[0].equalsIgnoreCase(values[i]) || args[0].equalsIgnoreCase(aliases[i])) {
+                    direction = i;
+                    break;
+                }
+            }
+        }
+        if (direction == -1) {
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                "/plot merge <" + StringMan.join(values, "|") + "> [removeroads]");
+            MainUtil
+                .sendMessage(player, C.DIRECTION.s().replaceAll("%dir%", direction(loc.getYaw())));
+            return false;
+        }
+        final boolean terrain;
+        if (args.length == 2) {
+            terrain = "true".equalsIgnoreCase(args[1]);
+        } else {
+            terrain = true;
+        }
+        if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
+            return true;
+        }
+        if (plot.autoMerge(direction, maxSize - size, uuid, terrain)) {
+            if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
+                EconHandler.manager.withdrawMoney(player, price);
+                sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
+            }
+            MainUtil.sendMessage(player, C.SUCCESS_MERGE);
+            return true;
+        }
+        Plot adjacent = plot.getRelative(direction);
+        if (adjacent == null || !adjacent.hasOwner() || adjacent.getMerged((direction + 2) % 4)
+            || adjacent.isOwner(uuid)) {
+            MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
+            return false;
+        }
+        if (!Permissions.hasPermission(player, C.PERMISSION_MERGE_OTHER)) {
+            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_OTHER);
+            return false;
+        }
+        java.util.Set<UUID> uuids = adjacent.getOwners();
+        boolean isOnline = false;
+        for (final UUID owner : uuids) {
+            final PlotPlayer accepter = UUIDHandler.getPlayer(owner);
+            if (accepter == null) {
+                continue;
+            }
+            isOnline = true;
+            final int dir = direction;
+            Runnable run = () -> {
+                MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED);
+                plot.autoMerge(dir, maxSize - size, owner, terrain);
+                PlotPlayer plotPlayer = UUIDHandler.getPlayer(player.getUUID());
+                if (plotPlayer == null) {
+                    sendMessage(accepter, C.MERGE_NOT_VALID);
+                    return;
+                }
+                if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
+                    if (EconHandler.manager.getMoney(player) < price) {
+                        sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
+                        return;
+                    }
+                    EconHandler.manager.withdrawMoney(player, price);
+                    sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
+                }
+                MainUtil.sendMessage(player, C.SUCCESS_MERGE);
+            };
+            if (hasConfirmation(player)) {
+                CmdConfirm.addPending(accepter,
+                    C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", player.getName()), run);
+            } else {
+                run.run();
+            }
+        }
+        if (!isOnline) {
+            MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
+            return false;
+        }
+        MainUtil.sendMessage(player, C.MERGE_REQUESTED);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
new file mode 100644
index 000000000..f4f184cc1
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+/**
+ * @author manuelgu, altered by Citymonstret
+ */
+@CommandDeclaration(command = "middle", aliases = {"center", "centre"},
+    description = "Teleports you to the center of the plot", usage = "/plot middle",
+    category = CommandCategory.TELEPORT, requiredType = RequiredType.NONE) public class Middle
+    extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] arguments) {
+        Location location = player.getLocation();
+        Plot plot = location.getPlot();
+        if (plot == null) {
+            return sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            return sendMessage(player, C.PLOT_UNOWNED);
+        }
+        player.teleport(plot.getCenter());
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
new file mode 100644
index 000000000..289a3c4a6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
@@ -0,0 +1,65 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+@CommandDeclaration(usage = "/plot move <X;Z>", command = "move", description = "Move a plot",
+    aliases = {"debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE) public class Move extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        Plot plot1 = loc.getPlotAbs();
+        if (plot1 == null) {
+            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot1.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        boolean override = false;
+        if (args.length == 2 && args[1].equalsIgnoreCase("-f")) {
+            args = new String[] {args[0]};
+            override = true;
+        }
+        if (args.length != 1) {
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        Plot plot2;
+        if (area == null) {
+            plot2 = MainUtil.getPlotFromString(player, args[0], true);
+            if (plot2 == null) {
+                return false;
+            }
+        } else {
+            plot2 = area.getPlotAbs(plot1.getId());
+        }
+        if (plot1.equals(plot2)) {
+            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
+            return false;
+        }
+        if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN.s()))) {
+            C.PLOTWORLD_INCOMPATIBLE.send(player);
+            return false;
+        }
+        if (plot1.move(plot2, () -> MainUtil.sendMessage(player, C.MOVE_SUCCESS), false)) {
+            return true;
+        } else {
+            MainUtil.sendMessage(player, C.REQUIRES_UNOWNED);
+            return false;
+        }
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
new file mode 100644
index 000000000..b2e5170e5
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
@@ -0,0 +1,69 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Locale;
+
+@CommandDeclaration(command = "music", permission = "plots.music",
+    description = "Play music in your plot", usage = "/plot music",
+    category = CommandCategory.APPEARANCE, requiredType = RequiredType.PLAYER) public class Music
+    extends SubCommand {
+
+    private static final Collection<String> DISCS = Arrays
+        .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
+            "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
+            "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait");
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        final Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.isAdded(player.getUUID())) {
+            sendMessage(player, C.NO_PLOT_PERMS);
+            return true;
+        }
+        PlotInventory inv = new PlotInventory(player, 2, "Plot Jukebox") {
+            @Override public boolean onClick(int index) {
+                PlotItemStack item = getItem(index);
+                if (item == null) {
+                    return true;
+                }
+                if (item.getPlotBlock().equalsAny(7, "bedrock")) {
+                    plot.removeFlag(Flags.MUSIC);
+                    C.FLAG_REMOVED.send(player);
+                } else if (item.name.toLowerCase(Locale.ENGLISH).contains("disc")) {
+                    plot.setFlag(Flags.MUSIC, item.getPlotBlock().getRawId());
+                    C.FLAG_ADDED.send(player);
+                } else {
+                    C.FLAG_NOT_ADDED.send(player);
+                }
+                return false;
+            }
+        };
+        int index = 0;
+
+        for (final String disc : DISCS) {
+            final String name = String.format("&r&6%s", disc);
+            final String[] lore = {"&r&aClick to play!"};
+            final PlotItemStack item = new PlotItemStack(disc, 1, name, lore);
+            inv.setItem(index++, item);
+        }
+
+        // Always add the cancel button
+        // if (player.getMeta("music") != null) {
+        String name = "&r&6Cancel music";
+        String[] lore = {"&r&cClick to cancel!"};
+        inv.setItem(index, new PlotItemStack("bedrock", 1, name, lore));
+        // }
+
+        inv.openInventory();
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
new file mode 100644
index 000000000..c3e9c5f9e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
@@ -0,0 +1,24 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+@CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players",
+    usage = "/plot near", category = CommandCategory.INFO) public class Near extends Command {
+    public Near() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        C.PLOT_NEAR.send(player, StringMan.join(plot.getPlayersInPlot(), ", "));
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
new file mode 100644
index 000000000..4095c15c9
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
@@ -0,0 +1,96 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "setowner", permission = "plots.set.owner",
+    description = "Set the plot owner", usage = "/plot setowner <player>",
+    aliases = {"owner", "so", "seto"}, category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE, confirmation = true) public class Owner extends SetCommand {
+
+    @Override public boolean set(final PlotPlayer player, final Plot plot, String value) {
+        Set<Plot> plots = plot.getConnectedPlots();
+        UUID uuid = null;
+        String name = null;
+        if (value.length() == 36) {
+            try {
+                uuid = UUID.fromString(value);
+                name = MainUtil.getName(uuid);
+            } catch (Exception ignored) {
+            }
+        } else {
+            uuid = UUIDHandler.getUUID(value, null);
+            name = UUIDHandler.getName(uuid);
+            name = name == null ? value : name;
+        }
+        if (uuid == null || value.equalsIgnoreCase("-")) {
+            if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
+                .equalsIgnoreCase("-")) {
+                if (!Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
+                    return false;
+                }
+                Set<Plot> connected = plot.getConnectedPlots();
+                plot.unlinkPlot(false, false);
+                for (Plot current : connected) {
+                    current.unclaim();
+                    current.removeSign();
+                }
+                MainUtil.sendMessage(player, C.SET_OWNER);
+                return true;
+            }
+            C.INVALID_PLAYER.send(player, value);
+            return false;
+        }
+        final PlotPlayer other = UUIDHandler.getPlayer(uuid);
+        if (plot.isOwner(uuid)) {
+            C.ALREADY_OWNER.send(player, MainUtil.getName(uuid));
+            return false;
+        }
+        if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER)) {
+            if (other == null) {
+                C.INVALID_PLAYER_OFFLINE.send(player, value);
+                return false;
+            }
+            int size = plots.size();
+            int currentPlots = (Settings.Limit.GLOBAL ?
+                other.getPlotCount() :
+                other.getPlotCount(plot.getWorldName())) + size;
+            if (currentPlots > other.getAllowedPlots()) {
+                sendMessage(player, C.CANT_TRANSFER_MORE_PLOTS);
+                return false;
+            }
+        }
+        final String finalName = name;
+        final UUID finalUUID = uuid;
+        final boolean removeDenied = plot.isDenied(finalUUID);
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (plot.setOwner(finalUUID, player)) {
+                    if (removeDenied)
+                        plot.removeDenied(finalUUID);
+                    plot.setSign(finalName);
+                    MainUtil.sendMessage(player, C.SET_OWNER);
+                    if (other != null) {
+                        MainUtil
+                            .sendMessage(other, C.NOW_OWNER, plot.getArea() + ";" + plot.getId());
+                    }
+                } else
+                    MainUtil.sendMessage(player, C.SET_OWNER_CANCELLED);
+            }
+        };
+        if (hasConfirmation(player)) {
+            CmdConfirm.addPending(player, "/plot set owner " + value, run);
+        } else {
+            TaskManager.runTask(run);
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java
new file mode 100644
index 000000000..81047ec9b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java
@@ -0,0 +1,38 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.json.JSONObject;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.HttpUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+@CommandDeclaration(command = "plugin", permission = "plots.use",
+    description = "Show plugin information", usage = "/plot plugin", aliases = "version",
+    category = CommandCategory.INFO) public class PluginCmd extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        TaskManager.IMP.taskAsync(new Runnable() {
+            @Override public void run() {
+                MainUtil.sendMessage(player, String.format(
+                    "$2>> $1&l" + PlotSquared.imp().getPluginName() + " $2($1Version$2: $1%s$2)",
+                    PlotSquared.get().getVersion()));
+                MainUtil.sendMessage(player,
+                    "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21");
+                MainUtil.sendMessage(player,
+                    "$2>> $1&lWiki$2: $1https://github.com/IntellectualCrafters/PlotSquared/wiki");
+                MainUtil.sendMessage(player,
+                    "$2>> $1&lNewest Version$2: $1" + getNewestVersionString());
+            }
+        });
+        return true;
+    }
+
+    public String getNewestVersionString() {
+        String str = HttpUtil
+            .readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest");
+        JSONObject release = new JSONObject(str);
+        return release.getString("name");
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
new file mode 100644
index 000000000..8cd4d9e56
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -0,0 +1,167 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+@CommandDeclaration(
+    usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false]",
+    command = "purge", permission = "plots.admin", description = "Purge all plots for a world",
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE,
+    confirmation = true) public class Purge extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length == 0) {
+            return false;
+        }
+
+        String world = null;
+        PlotArea area = null;
+        PlotId id = null;
+        UUID owner = null;
+        UUID added = null;
+        boolean unknown = false;
+        for (String arg : args) {
+            String[] split = arg.split(":");
+            if (split.length != 2) {
+                C.COMMAND_SYNTAX.send(player, getUsage());
+                return false;
+            }
+            switch (split[0].toLowerCase()) {
+                case "world":
+                case "w":
+                    world = split[1];
+                    break;
+                case "area":
+                case "a":
+                    area = PlotSquared.get().getPlotAreaByString(split[1]);
+                    if (area == null) {
+                        C.NOT_VALID_PLOT_WORLD.send(player, split[1]);
+                        return false;
+                    }
+                    break;
+                case "plotid":
+                case "id":
+                    id = PlotId.fromString(split[1]);
+                    if (id == null) {
+                        C.NOT_VALID_PLOT_ID.send(player, split[1]);
+                        return false;
+                    }
+                    break;
+                case "owner":
+                case "o":
+                    owner = UUIDHandler.getUUID(split[1], null);
+                    if (owner == null) {
+                        C.INVALID_PLAYER.send(player, split[1]);
+                        return false;
+                    }
+                    break;
+                case "shared":
+                case "s":
+                    added = UUIDHandler.getUUID(split[1], null);
+                    if (added == null) {
+                        C.INVALID_PLAYER.send(player, split[1]);
+                        return false;
+                    }
+                    break;
+                case "unknown":
+                case "?":
+                case "u":
+                    unknown = Boolean.parseBoolean(split[1]);
+                    break;
+                default:
+                    C.COMMAND_SYNTAX.send(player, getUsage());
+                    return false;
+            }
+        }
+        final HashSet<Plot> toDelete = new HashSet<>();
+        for (Plot plot : PlotSquared.get().getBasePlots()) {
+            if (world != null && !plot.getWorldName().equalsIgnoreCase(world)) {
+                continue;
+            }
+            if (area != null && !plot.getArea().equals(area)) {
+                continue;
+            }
+            if (id != null && !plot.getId().equals(id)) {
+                continue;
+            }
+            if (owner != null && !plot.isOwner(owner)) {
+                continue;
+            }
+            if (added != null && !plot.isAdded(added)) {
+                continue;
+            }
+            if (unknown && UUIDHandler.getName(plot.owner) != null) {
+                continue;
+            }
+            toDelete.addAll(plot.getConnectedPlots());
+        }
+        if (PlotSquared.get().plots_tmp != null) {
+            for (Entry<String, HashMap<PlotId, Plot>> entry : PlotSquared.get().plots_tmp
+                .entrySet()) {
+                String worldName = entry.getKey();
+                if (world != null && !world.equalsIgnoreCase(worldName)) {
+                    continue;
+                }
+                for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
+                    Plot plot = entry2.getValue();
+                    if (id != null && !plot.getId().equals(id)) {
+                        continue;
+                    }
+                    if (owner != null && !plot.isOwner(owner)) {
+                        continue;
+                    }
+                    if (added != null && !plot.isAdded(added)) {
+                        continue;
+                    }
+                    if (unknown && UUIDHandler.getName(plot.owner) != null) {
+                        continue;
+                    }
+                    toDelete.add(plot);
+                }
+            }
+        }
+        if (toDelete.isEmpty()) {
+            C.FOUND_NO_PLOTS.send(player);
+            return false;
+        }
+        String cmd =
+            "/plot purge " + StringMan.join(args, " ") + " (" + toDelete.size() + " plots)";
+        Runnable run = () -> {
+            PlotSquared.debug("Calculating plots to purge, please wait...");
+            HashSet<Integer> ids = new HashSet<>();
+            for (Plot plot : toDelete) {
+                if (plot.temp != Integer.MAX_VALUE) {
+                    ids.add(plot.temp);
+                    plot.getArea().removePlot(plot.getId());
+                    for (PlotPlayer pp : plot.getPlayersInPlot()) {
+                        PlotListener.plotEntry(pp, plot);
+                    }
+                    plot.removeSign();
+                }
+            }
+            DBFunc.purgeIds(ids);
+            C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
+        };
+        if (hasConfirmation(player)) {
+            CmdConfirm.addPending(player, cmd, run);
+        } else {
+            run.run();
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
new file mode 100644
index 000000000..d8103e5b8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -0,0 +1,217 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.UUID;
+
+@CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
+    usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
+    requiredType = RequiredType.NONE) public class Rate extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length == 1) {
+            switch (args[0].toLowerCase()) {
+                case "next": {
+                    ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getBasePlots());
+                    plots.sort((p1, p2) -> {
+                        double v1 = 0;
+                        if (!p1.getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
+                                v1 -= 11 - entry.getValue().getAverageRating();
+                            }
+                        }
+                        double v2 = 0;
+                        if (!p2.getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                                v2 -= 11 - entry.getValue().getAverageRating();
+                            }
+                        }
+                        if (v1 == v2) {
+                            return -0;
+                        }
+                        return v2 > v1 ? 1 : -1;
+                    });
+                    UUID uuid = player.getUUID();
+                    for (Plot p : plots) {
+                        if ((!Settings.Done.REQUIRED_FOR_RATINGS || p.hasFlag(Flags.DONE)) && p
+                            .isBasePlot() && (!p.getRatings().containsKey(uuid)) && !p
+                            .isAdded(uuid)) {
+                            p.teleportPlayer(player);
+                            MainUtil.sendMessage(player, C.RATE_THIS);
+                            return true;
+                        }
+                    }
+                    MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
+                    return false;
+                }
+                case "purge": {
+                    final Plot plot = player.getCurrentPlot();
+                    if (plot == null) {
+                        return !sendMessage(player, C.NOT_IN_PLOT);
+                    }
+                    if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_RATE, true)) {
+                        return false;
+                    }
+                    plot.clearRatings();
+                    C.RATINGS_PURGED.send(player);
+                    return true;
+                }
+            }
+        }
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            sendMessage(player, C.RATING_NOT_OWNED);
+            return false;
+        }
+        if (plot.isOwner(player.getUUID())) {
+            sendMessage(player, C.RATING_NOT_YOUR_OWN);
+            return false;
+        }
+        if (Settings.Done.REQUIRED_FOR_RATINGS && !plot.hasFlag(Flags.DONE)) {
+            sendMessage(player, C.RATING_NOT_DONE);
+            return false;
+        }
+        if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
+            final Runnable run = new Runnable() {
+                @Override public void run() {
+                    if (plot.getRatings().containsKey(player.getUUID())) {
+                        sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                        return;
+                    }
+                    final MutableInt index = new MutableInt(0);
+                    final MutableInt rating = new MutableInt(0);
+                    String title = Settings.Ratings.CATEGORIES.get(0);
+                    PlotInventory inventory = new PlotInventory(player, 1, title) {
+                        @Override public boolean onClick(int i) {
+                            rating.add((i + 1) * Math.pow(10, index.getValue()));
+                            index.increment();
+                            if (index.getValue() >= Settings.Ratings.CATEGORIES.size()) {
+                                int rV = rating.getValue();
+                                Rating result =
+                                    EventUtil.manager.callRating(this.player, plot, new Rating(rV));
+                                if (result != null) {
+                                    plot.addRating(this.player.getUUID(), result);
+                                    sendMessage(this.player, C.RATING_APPLIED,
+                                        plot.getId().toString());
+                                    if (Permissions
+                                        .hasPermission(this.player, C.PERMISSION_COMMENT)) {
+                                        Command command =
+                                            MainCommand.getInstance().getCommand(Comment.class);
+                                        if (command != null) {
+                                            MainUtil.sendMessage(this.player, C.COMMENT_THIS,
+                                                command.getUsage());
+                                        }
+                                    }
+                                }
+                                return false;
+                            }
+                            setTitle(Settings.Ratings.CATEGORIES.get(index.getValue()));
+                            return true;
+                        }
+                    };
+                    inventory.setItem(0, new PlotItemStack("minecraft:brown_wool", 0, "0/8"));
+                    inventory.setItem(1, new PlotItemStack(35, (short) 14, 1, "1/8"));
+                    inventory.setItem(2, new PlotItemStack(35, (short) 1, 2, "2/8"));
+                    inventory.setItem(3, new PlotItemStack(35, (short) 4, 3, "3/8"));
+                    inventory.setItem(4, new PlotItemStack(35, (short) 5, 4, "4/8"));
+                    inventory.setItem(5, new PlotItemStack(35, (short) 9, 5, "5/8"));
+                    inventory.setItem(6, new PlotItemStack(35, (short) 11, 6, "6/8"));
+                    inventory.setItem(7, new PlotItemStack(35, (short) 10, 7, "7/8"));
+                    inventory.setItem(8, new PlotItemStack(35, (short) 2, 8, "8/8"));
+                    inventory.openInventory();
+                }
+            };
+            if (plot.getSettings().ratings == null) {
+                if (!Settings.Enabled_Components.RATING_CACHE) {
+                    TaskManager.runTaskAsync(() -> {
+                        plot.getSettings().ratings = DBFunc.getRatings(plot);
+                        run.run();
+                    });
+                    return true;
+                }
+                plot.getSettings().ratings = new HashMap<>();
+            }
+            run.run();
+            return true;
+        }
+        if (args.length < 1) {
+            sendMessage(player, C.RATING_NOT_VALID);
+            return true;
+        }
+        String arg = args[0];
+        final int rating;
+        if (MathMan.isInteger(arg) && arg.length() < 3 && !arg.isEmpty()) {
+            rating = Integer.parseInt(arg);
+            if (rating > 10 || rating < 1) {
+                sendMessage(player, C.RATING_NOT_VALID);
+                return false;
+            }
+        } else {
+            sendMessage(player, C.RATING_NOT_VALID);
+            return false;
+        }
+        final UUID uuid = player.getUUID();
+        final Runnable run = () -> {
+            if (plot.getRatings().containsKey(uuid)) {
+                sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                return;
+            }
+            Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
+            if (result != null) {
+                plot.addRating(uuid, result);
+                sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
+            }
+        };
+        if (plot.getSettings().ratings == null) {
+            if (!Settings.Enabled_Components.RATING_CACHE) {
+                TaskManager.runTaskAsync(() -> {
+                    plot.getSettings().ratings = DBFunc.getRatings(plot);
+                    run.run();
+                });
+                return true;
+            }
+            plot.getSettings().ratings = new HashMap<>();
+        }
+        run.run();
+        return true;
+    }
+
+    private class MutableInt {
+
+        private int value;
+
+        MutableInt(int i) {
+            this.value = i;
+        }
+
+        void increment() {
+            this.value++;
+        }
+
+        void decrement() {
+            this.value--;
+        }
+
+        int getValue() {
+            return this.value;
+        }
+
+        void add(Number v) {
+            this.value += v.intValue();
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
new file mode 100644
index 000000000..9edf20a62
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
@@ -0,0 +1,60 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+@CommandDeclaration(command = "regenallroads",
+    description = "Regenerate all roads in the map using the set road schematic",
+    aliases = {"rgar"}, usage = "/plot regenallroads <world> [height]",
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE,
+    permission = "plots.regenallroads") public class RegenAllRoads extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        int height = 0;
+        if (args.length == 2) {
+            try {
+                height = Integer.parseInt(args[1]);
+            } catch (NumberFormatException ignored) {
+                MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0, 256)");
+                MainUtil
+                    .sendMessage(player, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
+                return false;
+            }
+        } else if (args.length != 1) {
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
+            return false;
+        }
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        if (area == null) {
+            C.NOT_VALID_PLOT_WORLD.send(player, args[0]);
+            return false;
+        }
+        String name = args[0];
+        PlotManager manager = area.getPlotManager();
+        if (!(manager instanceof HybridPlotManager)) {
+            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+            return false;
+        }
+        //Set<ChunkLoc> chunks = ChunkManager.manager.getChunkChunks(name);
+        MainUtil
+            .sendMessage(player, "&cIf no schematic is set, the following will not do anything");
+        MainUtil.sendMessage(player,
+            "&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic");
+        //MainUtil.sendMessage(player, "&6Potential chunks to update: &7" + (chunks.size() * 1024));
+        //MainUtil.sendMessage(player, "&6Estimated time: &7" + chunks.size() + " seconds");
+        boolean result = HybridUtils.manager.scheduleRoadUpdate(area, height);
+        if (!result) {
+            MainUtil.sendMessage(player,
+                "&cCannot schedule mass schematic update! (Is one already in progress?)");
+            return false;
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
new file mode 100644
index 000000000..79a87b887
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
@@ -0,0 +1,39 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+
+import java.util.HashSet;
+
+@CommandDeclaration(command = "relight", description = "Relight your plot", usage = "/plot relight",
+    category = CommandCategory.DEBUG) public class Relight extends Command {
+    public Relight() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            C.NOT_IN_PLOT.send(player);
+            return;
+        }
+        HashSet<RegionWrapper> regions = plot.getRegions();
+        final LocalBlockQueue queue = plot.getArea().getQueue(false);
+        ChunkManager.chunkTask(plot, new RunnableVal<int[]>() {
+            @Override public void run(int[] value) {
+                queue.fixChunkLighting(value[0], value[1]);
+            }
+        }, new Runnable() {
+            @Override public void run() {
+                plot.refreshChunks();
+                C.SET_BLOCK_ACTION_FINISHED.send(player);
+            }
+        }, 5);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
new file mode 100644
index 000000000..71ee2e840
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
@@ -0,0 +1,84 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.configuration.MemorySection;
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+import java.io.IOException;
+import java.util.Objects;
+
+@CommandDeclaration(command = "reload", aliases = "rl", permission = "plots.admin.command.reload",
+    description = "Reload translations and world settings", usage = "/plot reload",
+    category = CommandCategory.ADMINISTRATION) public class Reload extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        try {
+            // The following won't affect world generation, as that has to be
+            // loaded during startup unfortunately.
+            PlotSquared.get().setupConfigs();
+            C.load(PlotSquared.get().translationFile);
+            PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+                @Override public void run(PlotArea area) {
+                    ConfigurationSection worldSection = PlotSquared.get().worlds
+                        .getConfigurationSection("worlds." + area.worldname);
+                    if (worldSection == null) {
+                        return;
+                    }
+                    if (area.TYPE != 2 || !worldSection.contains("areas")) {
+                        area.saveConfiguration(worldSection);
+                        area.loadDefaultConfiguration(worldSection);
+                    } else {
+                        ConfigurationSection areaSection = worldSection.getConfigurationSection(
+                            "areas." + area.id + "-" + area.getMin() + "-" + area.getMax());
+                        YamlConfiguration clone = new YamlConfiguration();
+                        for (String key : areaSection.getKeys(true)) {
+                            if (areaSection.get(key) instanceof MemorySection) {
+                                continue;
+                            }
+                            if (!clone.contains(key)) {
+                                clone.set(key, areaSection.get(key));
+                            }
+                        }
+                        for (String key : worldSection.getKeys(true)) {
+                            if (worldSection.get(key) instanceof MemorySection) {
+                                continue;
+                            }
+                            if (!key.startsWith("areas") && !clone.contains(key)) {
+                                clone.set(key, worldSection.get(key));
+                            }
+                        }
+                        area.saveConfiguration(clone);
+                        // netSections is the combination of
+                        for (String key : clone.getKeys(true)) {
+                            if (clone.get(key) instanceof MemorySection) {
+                                continue;
+                            }
+                            if (!worldSection.contains(key)) {
+                                worldSection.set(key, clone.get(key));
+                            } else {
+                                Object value = worldSection.get(key);
+                                if (Objects.equals(value, clone.get(key))) {
+                                    areaSection.set(key, clone.get(key));
+                                }
+                            }
+                        }
+                        area.loadDefaultConfiguration(clone);
+                    }
+                }
+            });
+            PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+            MainUtil.sendMessage(player, C.RELOADED_CONFIGS);
+        } catch (IOException e) {
+            e.printStackTrace();
+            MainUtil.sendMessage(player, C.RELOAD_FAILED);
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
new file mode 100644
index 000000000..bf027f20d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
@@ -0,0 +1,108 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "remove", aliases = {"r", "untrust", "ut", "undeny", "unban", "ud"},
+    description = "Remove a player from a plot", usage = "/plot remove <player>",
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE,
+    permission = "plots.remove") public class Remove extends SubCommand {
+
+    public Remove() {
+        super(Argument.PlayerName);
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location location = player.getLocation();
+        Plot plot = location.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_REMOVE)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return true;
+        }
+        int count = 0;
+        switch (args[0]) {
+            case "unknown": {
+                ArrayList<UUID> toRemove = new ArrayList<>();
+                HashSet<UUID> all = new HashSet<>();
+                all.addAll(plot.getMembers());
+                all.addAll(plot.getTrusted());
+                all.addAll(plot.getDenied());
+                for (UUID uuid : all) {
+                    if (UUIDHandler.getName(uuid) == null) {
+                        toRemove.add(uuid);
+                        count++;
+                    }
+                }
+                for (UUID uuid : toRemove) {
+                    plot.removeDenied(uuid);
+                    plot.removeTrusted(uuid);
+                    plot.removeMember(uuid);
+                }
+                break;
+            }
+            default:
+                Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
+                if (!uuids.isEmpty()) {
+                    for (UUID uuid : uuids) {
+                        if (uuid == DBFunc.EVERYONE) {
+                            if (plot.removeTrusted(uuid)) {
+                                EventUtil.manager.callTrusted(player, plot, uuid, false);
+                                count++;
+                            } else if (plot.removeMember(uuid)) {
+                                EventUtil.manager.callMember(player, plot, uuid, false);
+                                count++;
+                            } else if (plot.removeDenied(uuid)) {
+                                EventUtil.manager.callDenied(player, plot, uuid, false);
+                                count++;
+                            }
+                        } else if (plot.getTrusted().contains(uuid)) {
+                            if (plot.removeTrusted(uuid)) {
+                                EventUtil.manager.callTrusted(player, plot, uuid, false);
+                                count++;
+                            }
+                        } else if (plot.getMembers().contains(uuid)) {
+                            if (plot.removeMember(uuid)) {
+                                EventUtil.manager.callMember(player, plot, uuid, false);
+                                count++;
+                            }
+                        } else if (plot.getDenied().contains(uuid)) {
+                            if (plot.removeDenied(uuid)) {
+                                EventUtil.manager.callDenied(player, plot, uuid, false);
+                                count++;
+                            }
+                        }
+                    }
+                }
+                break;
+        }
+        if (count == 0) {
+            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            return false;
+        } else {
+            MainUtil.sendMessage(player, C.REMOVED_PLAYERS, count + "");
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
new file mode 100644
index 000000000..3f13368de
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
@@ -0,0 +1,16 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
+
+public enum RequiredType {
+    CONSOLE, PLAYER, NONE;
+
+    public boolean allows(CommandCaller player) {
+        switch (this) {
+            case NONE:
+                return true;
+            default:
+                return this == player.getSuperCaller();
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
new file mode 100644
index 000000000..aec9543ed
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
@@ -0,0 +1,76 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.sk89q.jnbt.CompoundTag;
+
+import java.net.URL;
+import java.util.List;
+import java.util.UUID;
+
+@CommandDeclaration(command = "save", aliases = {"backup"}, description = "Save your plot",
+    category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE,
+    permission = "plots.save") public class Save extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        String world = player.getLocation().getWorld();
+        if (!PlotSquared.get().hasPlotArea(world)) {
+            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
+        }
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            return false;
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SAVE)) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (plot.getRunning() > 0) {
+            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            return false;
+        }
+        plot.addRunning();
+        SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
+            @Override public void run(final CompoundTag value) {
+                TaskManager.runTaskAsync(() -> {
+                    String time = (System.currentTimeMillis() / 1000) + "";
+                    Location[] corners = plot.getCorners();
+                    corners[0].setY(0);
+                    corners[1].setY(255);
+                    int size = (corners[1].getX() - corners[0].getX()) + 1;
+                    PlotId id = plot.getId();
+                    String world1 = plot.getArea().toString().replaceAll(";", "-")
+                        .replaceAll("[^A-Za-z0-9]", "");
+                    final String file = time + '_' + world1 + '_' + id.x + '_' + id.y + '_' + size;
+                    UUID uuid = player.getUUID();
+                    SchematicHandler.manager.upload(value, uuid, file, new RunnableVal<URL>() {
+                        @Override public void run(URL url) {
+                            plot.removeRunning();
+                            if (url == null) {
+                                MainUtil.sendMessage(player, C.SAVE_FAILED);
+                                return;
+                            }
+                            MainUtil.sendMessage(player, C.SAVE_SUCCESS);
+                            List<String> schematics = player.getMeta("plot_schematics");
+                            if (schematics != null) {
+                                schematics.add(file + ".schematic");
+                            }
+                        }
+                    });
+                });
+            }
+        });
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
new file mode 100644
index 000000000..110992543
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
@@ -0,0 +1,222 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.UUID;
+
+@CommandDeclaration(command = "schematic", permission = "plots.schematic",
+    description = "Schematic command", aliases = {"sch", "schem"},
+    category = CommandCategory.SCHEMATIC, usage = "/plot schematic <arg...>")
+public class SchematicCmd extends SubCommand {
+
+    private boolean running = false;
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length < 1) {
+            sendMessage(player, C.SCHEMATIC_MISSING_ARG);
+            return true;
+        }
+        String arg = args[0].toLowerCase();
+        switch (arg) {
+            case "paste": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_PASTE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_PASTE);
+                    return false;
+                }
+                if (args.length < 2) {
+                    sendMessage(player, C.SCHEMATIC_MISSING_ARG);
+                    break;
+                }
+                Location loc = player.getLocation();
+                final Plot plot = loc.getPlotAbs();
+                if (plot == null) {
+                    return !sendMessage(player, C.NOT_IN_PLOT);
+                }
+                if (!plot.hasOwner()) {
+                    MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+                    return false;
+                }
+                if (!plot.isOwner(player.getUUID()) && !Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE)) {
+                    MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+                    return false;
+                }
+                if (this.running) {
+                    MainUtil.sendMessage(player, "&cTask is already running.");
+                    return false;
+                }
+                final String location = args[1];
+                this.running = true;
+                TaskManager.runTaskAsync(() -> {
+                    Schematic schematic = null;
+                    if (location.startsWith("url:")) {
+                        try {
+                            UUID uuid = UUID.fromString(location.substring(4));
+                            URL base = new URL(Settings.Web.URL);
+                            URL url = new URL(base, "uploads/" + uuid + ".schematic");
+                            schematic = SchematicHandler.manager.getSchematic(url);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            sendMessage(player, C.SCHEMATIC_INVALID,
+                                "non-existent url: " + location);
+                            SchematicCmd.this.running = false;
+                            return;
+                        }
+                    } else {
+                        try {
+                            schematic = SchematicHandler.manager.getSchematic(location);
+                        } catch (SchematicHandler.UnsupportedFormatException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    if (schematic == null) {
+                        SchematicCmd.this.running = false;
+                        sendMessage(player, C.SCHEMATIC_INVALID,
+                            "non-existent or not in gzip format");
+                        return;
+                    }
+                    SchematicHandler.manager
+                        .paste(schematic, plot, 0, 1, 0, false, new RunnableVal<Boolean>() {
+                            @Override public void run(Boolean value) {
+                                SchematicCmd.this.running = false;
+                                if (value) {
+                                    sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                                } else {
+                                    sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                                }
+                            }
+                        });
+                });
+                break;
+            }
+            //            TODO test
+            //            case "test": {
+            //                if (!Permissions.hasPermission(plr, "plots.schematic.test")) {
+            //                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
+            //                    return false;
+            //                }
+            //                if (args.length < 2) {
+            //                    sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
+            //                    return false;
+            //                }
+            //                final Location loc = plr.getLocation();
+            //                final Plot plot = MainUtil.getPlot(loc);
+            //                if (plot == null) {
+            //                    sendMessage(plr, C.NOT_IN_PLOT);
+            //                    return false;
+            //                }
+            //                file = args[1];
+            //                schematic = SchematicHandler.manager.getSchematic(file);
+            //                if (schematic == null) {
+            //                    sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
+            //                    return false;
+            //                }
+            //                final int l1 = schematic.getSchematicDimension().getX();
+            //                final int l2 = schematic.getSchematicDimension().getZ();
+            //                final int length = MainUtil.getPlotWidth(loc.getWorld(), plot.id);
+            //                if ((l1 < length) || (l2 < length)) {
+            //                    sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
+            //                    break;
+            //                }
+            //                sendMessage(plr, C.SCHEMATIC_VALID);
+            //                break;
+            //            }
+            case "saveall":
+            case "exportall": {
+                if (!(player instanceof ConsolePlayer)) {
+                    MainUtil.sendMessage(player, C.NOT_CONSOLE);
+                    return false;
+                }
+                if (args.length != 2) {
+                    MainUtil.sendMessage(player,
+                        "&cNeed world argument. Use &7/plot sch exportall <area>");
+                    return false;
+                }
+                PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
+                if (area == null) {
+                    C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
+                    return false;
+                }
+                Collection<Plot> plots = area.getPlots();
+                if (plots.isEmpty()) {
+                    MainUtil
+                        .sendMessage(player, "&cInvalid world. Use &7/plot sch exportall <area>");
+                    return false;
+                }
+                boolean result = SchematicHandler.manager.exportAll(plots, null, null,
+                    () -> MainUtil.sendMessage(player, "&aFinished mass export"));
+                if (!result) {
+                    MainUtil.sendMessage(player, "&cTask is already running.");
+                    return false;
+                } else {
+                    MainUtil.sendMessage(player,
+                        "&3Plot&8->&3Schematic&8: &7Mass export has started. This may take a while.");
+                    MainUtil.sendMessage(player,
+                        "&3Plot&8->&3Schematic&8: &7Found &c" + plots.size() + "&7 plots...");
+                }
+                break;
+            }
+            case "export":
+            case "save":
+                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_SAVE)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_SAVE);
+                    return false;
+                }
+                if (this.running) {
+                    MainUtil.sendMessage(player, "&cTask is already running.");
+                    return false;
+                }
+                Location location = player.getLocation();
+                Plot plot = location.getPlotAbs();
+                if (plot == null) {
+                    return !sendMessage(player, C.NOT_IN_PLOT);
+                }
+                if (!plot.hasOwner()) {
+                    MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+                    return false;
+                }
+                if (!plot.isOwner(player.getUUID()) && !Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE)) {
+                    MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+                    return false;
+                }
+                location.getWorld();
+                Collection<Plot> plots = new ArrayList<>();
+                plots.add(plot);
+                boolean result = SchematicHandler.manager.exportAll(plots, null, null, () -> {
+                    MainUtil.sendMessage(player, "&aFinished export");
+                    SchematicCmd.this.running = false;
+                });
+                if (!result) {
+                    MainUtil.sendMessage(player, "&cTask is already running.");
+                    return false;
+                } else {
+                    MainUtil.sendMessage(player, "&7Starting export...");
+                }
+                break;
+            case "list": {
+                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_LIST)) {
+                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_LIST);
+                    return false;
+                }
+                final String string =
+                    StringMan.join(SchematicHandler.manager.getShematicNames(), "$2, $1");
+                C.SCHEMATIC_LIST.send(player, string);
+            }
+            break;
+            default:
+                sendMessage(player, C.SCHEMATIC_MISSING_ARG);
+                break;
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
new file mode 100644
index 000000000..95166aa4a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
@@ -0,0 +1,167 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration.UnknownBlockException;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+
+@CommandDeclaration(command = "set", description = "Set a plot value", aliases = {"s"},
+    usage = "/plot set <biome|alias|home|flag> <value...>", permission = "plots.set",
+    category = CommandCategory.APPEARANCE, requiredType = RequiredType.NONE) public class Set
+    extends SubCommand {
+
+    public static final String[] values = new String[] {"biome", "alias", "home", "flag"};
+    public static final String[] aliases = new String[] {"b", "w", "wf", "f", "a", "h", "fl"};
+
+    private final SetCommand component;
+
+    public Set() {
+        this.component = new SetCommand() {
+
+            @Override public String getId() {
+                return "set.component";
+            }
+
+            @Override public boolean set(PlotPlayer player, final Plot plot, String value) {
+                PlotArea plotArea = player.getLocation().getPlotArea();
+                PlotManager manager = player.getLocation().getPlotManager();
+                String[] components = manager.getPlotComponents(plotArea, plot.getId());
+                boolean allowUnsafe = DebugAllowUnsafe.unsafeAllowed.contains(player.getUUID());
+
+                String[] args = value.split(" ");
+                String material =
+                    StringMan.join(Arrays.copyOfRange(args, 1, args.length), ",").trim();
+
+                for (String component : components) {
+                    if (component.equalsIgnoreCase(args[0])) {
+                        if (!Permissions
+                            .hasPermission(player, C.PERMISSION_SET_COMPONENT.f(component))) {
+                            MainUtil.sendMessage(player, C.NO_PERMISSION,
+                                C.PERMISSION_SET_COMPONENT.f(component));
+                            return false;
+                        }
+                        // PlotBlock[] blocks;
+                        BlockBucket bucket;
+                        try {
+                            if (args.length < 2) {
+                                MainUtil.sendMessage(player, C.NEED_BLOCK);
+                                return true;
+                            }
+                            String[] split = material.split(",");
+                            // blocks = Configuration.BLOCKLIST.parseString(material);
+
+                            try {
+                                bucket = Configuration.BLOCK_BUCKET.parseString(material);
+                            } catch (final UnknownBlockException unknownBlockException) {
+                                final String unknownBlock = unknownBlockException.getUnknownValue();
+                                C.NOT_VALID_BLOCK.send(player, unknownBlock);
+                                StringComparison<PlotBlock>.ComparisonResult match =
+                                    WorldUtil.IMP.getClosestBlock(unknownBlock);
+                                if (match != null) {
+                                    final String found =
+                                        WorldUtil.IMP.getClosestMatchingName(match.best);
+                                    if (found != null) {
+                                        MainUtil.sendMessage(player, C.DID_YOU_MEAN,
+                                            found.toLowerCase());
+                                    }
+                                }
+                                return false;
+                            }
+
+                            if (!allowUnsafe) {
+                                for (final PlotBlock block : bucket.getBlocks()) {
+                                    if (!block.isAir() && !WorldUtil.IMP.isBlockSolid(block)) {
+                                        C.NOT_ALLOWED_BLOCK.send(player, block.toString());
+                                        return false;
+                                    }
+                                }
+                            }
+                        } catch (Exception ignored) {
+                            MainUtil.sendMessage(player, C.NOT_VALID_BLOCK, material);
+                            return false;
+                        }
+                        if (plot.getRunning() > 0) {
+                            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                            return false;
+                        }
+                        plot.addRunning();
+                        for (Plot current : plot.getConnectedPlots()) {
+                            current.setComponent(component, bucket);
+                        }
+                        MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
+                        GlobalBlockQueue.IMP.addTask(new Runnable() {
+                            @Override public void run() {
+                                plot.removeRunning();
+                            }
+                        });
+                        return true;
+                    }
+                }
+                return false;
+            }
+        };
+    }
+
+    public boolean noArgs(PlotPlayer player) {
+        ArrayList<String> newValues = new ArrayList<>();
+        newValues.addAll(Arrays.asList("biome", "alias", "home", "flag"));
+        Plot plot = player.getCurrentPlot();
+        if (plot != null) {
+            newValues.addAll(
+                Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
+        }
+        MainUtil.sendMessage(player, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan
+            .join(newValues, C.BLOCK_LIST_SEPARATER.formatted()));
+        return false;
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        if (args.length == 0) {
+            return noArgs(player);
+        }
+        Command cmd = MainCommand.getInstance().getCommand("set" + args[0]);
+        if (cmd != null) {
+            if (!Permissions.hasPermission(player, cmd.getPermission(), true)) {
+                return false;
+            }
+            cmd.execute(player, Arrays.copyOfRange(args, 1, args.length), null, null);
+            return true;
+        }
+        // Additional checks
+        Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            return false;
+        }
+        // components
+        HashSet<String> components = new HashSet<>(
+            Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
+        if (components.contains(args[0].toLowerCase())) {
+            return this.component.onCommand(player, Arrays.copyOfRange(args, 0, args.length));
+        }
+        // flag
+        Flag<?> flag = FlagManager.getFlag(args[0].toLowerCase());
+        if (Flags.getFlags().contains(flag)) {
+            StringBuilder a = new StringBuilder();
+            if (args.length > 1) {
+                for (int x = 1; x < args.length; x++) {
+                    a.append(" ").append(args[x]);
+                }
+            }
+            MainCommand.onCommand(player, ("flag set " + args[0] + a.toString()).split(" "));
+            return true;
+        }
+        return noArgs(player);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
new file mode 100644
index 000000000..aaa1adfa2
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
@@ -0,0 +1,43 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+public abstract class SetCommand extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
+                MainUtil.sendMessage(player, C.NO_PERMISSION,
+                    C.PERMISSION_ADMIN_COMMAND.f(getFullId()));
+                MainUtil.sendMessage(player, C.PLOT_NOT_CLAIMED);
+                return false;
+            }
+        }
+        if (!plot.isOwner(player.getUUID())) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
+                MainUtil.sendMessage(player, C.NO_PERMISSION,
+                    C.PERMISSION_ADMIN_COMMAND.f(getFullId()));
+                MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+                return false;
+            }
+        }
+        if (args.length == 0) {
+            return set(player, plot, "");
+        }
+        return set(player, plot, StringMan.join(args, " "));
+    }
+
+    public abstract boolean set(PlotPlayer player, Plot plot, String value);
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
new file mode 100644
index 000000000..fc92cc550
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
@@ -0,0 +1,40 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.BlockLoc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+@CommandDeclaration(command = "sethome", permission = "plots.set.home",
+    description = "Set the plot home to your current position", usage = "/plot sethome [none]",
+    aliases = {"sh", "seth"}, category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE)
+public class SetHome extends SetCommand {
+
+    @Override public boolean set(PlotPlayer player, Plot plot, String value) {
+        switch (value.toLowerCase()) {
+            case "unset":
+            case "reset":
+            case "remove":
+            case "none": {
+                Plot base = plot.getBasePlot(false);
+                base.setHome(null);
+                return MainUtil.sendMessage(player, C.POSITION_UNSET);
+            }
+            case "":
+                Plot base = plot.getBasePlot(false);
+                Location bot = base.getBottomAbs();
+                Location loc = player.getLocationFull();
+                BlockLoc rel =
+                    new BlockLoc(loc.getX() - bot.getX(), loc.getY(), loc.getZ() - bot.getZ(),
+                        loc.getYaw(), loc.getPitch());
+                base.setHome(rel);
+                return MainUtil.sendMessage(player, C.POSITION_SET);
+            default:
+                MainUtil.sendMessage(player, C.HOME_ARGUMENT);
+                return false;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
new file mode 100644
index 000000000..facea4952
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
@@ -0,0 +1,434 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
+import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import lombok.*;
+
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.Map.Entry;
+
+@CommandDeclaration(command = "setup", permission = "plots.admin.command.setup",
+    description = "Setup wizard for plot worlds", usage = "/plot setup", aliases = {"create"},
+    category = CommandCategory.ADMINISTRATION) public class Setup extends SubCommand {
+
+    public void displayGenerators(PlotPlayer player) {
+        StringBuilder message = new StringBuilder();
+        message.append("&6What generator do you want?");
+        for (Entry<String, GeneratorWrapper<?>> entry : SetupUtils.generators.entrySet()) {
+            if (entry.getKey().equals(PlotSquared.imp().getPluginName())) {
+                message.append("\n&8 - &2").append(entry.getKey()).append(" (Default Generator)");
+            } else if (entry.getValue().isFull()) {
+                message.append("\n&8 - &7").append(entry.getKey()).append(" (Plot Generator)");
+            } else {
+                message.append("\n&8 - &7").append(entry.getKey()).append(" (Unknown structure)");
+            }
+        }
+        MainUtil.sendMessage(player, message.toString());
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        // going through setup
+        SetupObject object = player.getMeta("setup");
+        if (object == null) {
+            object = new SetupObject();
+            player.setMeta("setup", object);
+            SetupUtils.manager.updateGenerators();
+            sendMessage(player, C.SETUP_INIT);
+            displayGenerators(player);
+            return false;
+        }
+        if (args.length == 1) {
+            if (args[0].equalsIgnoreCase("cancel")) {
+                player.deleteMeta("setup");
+                MainUtil.sendMessage(player, "&aCancelled setup");
+                return false;
+            }
+            if (args[0].equalsIgnoreCase("back")) {
+                if (object.setup_index > 0) {
+                    object.setup_index--;
+                    ConfigurationNode node = object.step[object.setup_index];
+                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, node.getDescription(),
+                        node.getType().getType(), String.valueOf(node.getDefaultValue()));
+                    return false;
+                } else if (object.current > 0) {
+                    object.current--;
+                }
+            }
+        }
+        int index = object.current;
+        switch (index) {
+            case 0:  // choose generator
+                if (args.length != 1 || !SetupUtils.generators.containsKey(args[0])) {
+                    String prefix = "\n&8 - &7";
+                    MainUtil.sendMessage(player,
+                        "&cYou must choose a generator!" + prefix + StringMan
+                            .join(SetupUtils.generators.keySet(), prefix)
+                            .replaceAll(PlotSquared.imp().getPluginName(),
+                                "&2" + PlotSquared.imp().getPluginName()));
+                    sendMessage(player, C.SETUP_INIT);
+                    return false;
+                }
+                object.setupGenerator = args[0];
+                object.current++;
+                String partial = "\n&8 - &7PARTIAL&8 - &7Vanilla with clusters of plots";
+                MainUtil.sendMessage(player,
+                    "&6What world type do you want?\n&8 - &2DEFAULT&8 - &7Standard plot generation"
+                        + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + partial);
+                break;
+            case 1:  // choose world type
+                List<String> allTypes = Arrays.asList("default", "augmented", "partial");
+                List<String> allDesc = Arrays
+                    .asList("Standard plot generation", "Plot generation with vanilla terrain",
+                        "Vanilla with clusters of plots");
+                ArrayList<String> types = new ArrayList<>();
+                if (SetupUtils.generators.get(object.setupGenerator).isFull()) {
+                    types.add("default");
+                }
+                types.add("augmented");
+                types.add("partial");
+                if (args.length != 1 || !types.contains(args[0].toLowerCase())) {
+                    MainUtil.sendMessage(player, "&cYou must choose a world type!");
+                    for (String type : types) {
+                        int i = allTypes.indexOf(type);
+                        if (type.equals("default")) {
+                            MainUtil
+                                .sendMessage(player, "&8 - &2" + type + " &8-&7 " + allDesc.get(i));
+                        } else {
+                            MainUtil
+                                .sendMessage(player, "&8 - &7" + type + " &8-&7 " + allDesc.get(i));
+                        }
+                    }
+                    return false;
+                }
+                object.type = allTypes.indexOf(args[0].toLowerCase());
+                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
+                if (object.type == 0) {
+                    object.current = 6;
+                    if (object.step == null) {
+                        object.plotManager = object.setupGenerator;
+                        object.step =
+                            SetupUtils.generators.get(object.plotManager).getPlotGenerator()
+                                .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
+                                .getSettingNodes();
+                        SetupUtils.generators.get(object.plotManager).getPlotGenerator()
+                            .processSetup(object);
+                    }
+                    if (object.step.length == 0) {
+                        MainUtil.sendMessage(player, "&6What do you want your world to be called?");
+                        object.setup_index = 0;
+                        return true;
+                    }
+                    ConfigurationNode step = object.step[object.setup_index];
+                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                } else {
+                    if (gen.isFull()) {
+                        object.plotManager = object.setupGenerator;
+                        object.setupGenerator = null;
+                        object.step =
+                            SetupUtils.generators.get(object.plotManager).getPlotGenerator()
+                                .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
+                                .getSettingNodes();
+                        SetupUtils.generators.get(object.plotManager).getPlotGenerator()
+                            .processSetup(object);
+                    } else {
+                        object.plotManager = PlotSquared.imp().getPluginName();
+                        MainUtil.sendMessage(player,
+                            "&c[WARNING] The specified generator does not identify as BukkitPlotGenerator");
+                        MainUtil.sendMessage(player,
+                            "&7 - You may need to manually configure the other plugin");
+                        object.step =
+                            SetupUtils.generators.get(object.plotManager).getPlotGenerator()
+                                .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
+                                .getSettingNodes();
+                    }
+                    if (object.type == 2) {
+                        MainUtil.sendMessage(player, "What would you like this area called?");
+                        object.current++;
+                    } else {
+                        MainUtil.sendMessage(player, "&6What terrain would you like in plots?"
+                            + "\n&8 - &2NONE&8 - &7No terrain at all"
+                            + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
+                            + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
+                            + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
+                        object.current = 5;
+                    }
+                }
+                break;
+            case 2:  // area id
+                if (!StringMan.isAlphanumericUnd(args[0])) {
+                    MainUtil.sendMessage(player, "&cThe area id must be alphanumerical!");
+                    return false;
+                }
+                for (PlotArea area : PlotSquared.get().getPlotAreas()) {
+                    if (area.id != null && area.id.equalsIgnoreCase(args[0])) {
+                        MainUtil.sendMessage(player,
+                            "&cYou must choose an area id that is not in use!");
+                        return false;
+                    }
+                }
+                object.id = args[0];
+                object.current++;
+                MainUtil.sendMessage(player, "&6What should be the minimum Plot Id?");
+                break;
+            case 3:  // min
+                object.min = PlotId.fromString(args[0]);
+                if (object.min == null) {
+                    MainUtil.sendMessage(player, "&cYou must choose a valid minimum PlotId!");
+                    return false;
+                }
+                object.current++;
+                MainUtil.sendMessage(player, "&6What should be the maximum Plot Id?");
+                break;
+            case 4:
+                // max
+                PlotId id = PlotId.fromString(args[0]);
+                if (id == null) {
+                    MainUtil.sendMessage(player, "&cYou must choose a valid maximum PlotId!");
+                    return false;
+                }
+                if (id.x <= object.min.x || id.y <= object.min.y) {
+                    MainUtil
+                        .sendMessage(player, "&cThe max PlotId must be greater than the minimum!");
+                    return false;
+                }
+                object.max = id;
+                object.current++;
+                MainUtil.sendMessage(player, "&6What terrain would you like in plots?"
+                    + "\n&8 - &2NONE&8 - &7No terrain at all"
+                    + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
+                    + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
+                    + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
+                break;
+            case 5: { // Choose terrain
+                List<String> terrain = Arrays.asList("none", "ore", "road", "all");
+                if (args.length != 1 || !terrain.contains(args[0].toLowerCase())) {
+                    MainUtil.sendMessage(player,
+                        "&cYou must choose the terrain!" + "\n&8 - &2NONE&8 - &7No terrain at all"
+                            + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
+                            + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
+                            + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
+                    return false;
+                }
+                object.terrain = terrain.indexOf(args[0].toLowerCase());
+                object.current++;
+                if (object.step == null) {
+                    object.step = SetupUtils.generators.get(object.plotManager).getPlotGenerator()
+                        .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
+                        .getSettingNodes();
+                }
+                ConfigurationNode step = object.step[object.setup_index];
+                sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                    step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                break;
+            }
+            case 6:  // world setup
+                if (object.setup_index == object.step.length) {
+                    MainUtil.sendMessage(player, "&6What do you want your world to be called?");
+                    object.setup_index = 0;
+                    object.current++;
+                    return true;
+                }
+                ConfigurationNode step = object.step[object.setup_index];
+                if (args.length < 1) {
+                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                    return false;
+                }
+
+                boolean valid = false;
+                try {
+                    valid = step.isValid(args[0]);
+                } catch (final Configuration.UnsafeBlockException e) {
+                    C.NOT_ALLOWED_BLOCK.send(player, e.getUnsafeBlock().toString());
+                }
+                if (valid) {
+                    sendMessage(player, C.SETUP_VALID_ARG, step.getConstant(), args[0]);
+                    step.setValue(args[0]);
+                    object.setup_index++;
+                    if (object.setup_index == object.step.length) {
+                        onCommand(player, args);
+                        return false;
+                    }
+                    step = object.step[object.setup_index];
+                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                    return false;
+                } else {
+                    sendMessage(player, C.SETUP_INVALID_ARG, args[0], step.getConstant());
+                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                    return false;
+                }
+            case 7:
+                if (args.length != 1) {
+                    MainUtil.sendMessage(player, "&cYou need to choose a world name!");
+                    return false;
+                }
+                if (WorldUtil.IMP.isWorld(args[0])) {
+                    if (PlotSquared.get().hasPlotArea(args[0])) {
+                        MainUtil.sendMessage(player, "&cThat world name is already taken!");
+                        return false;
+                    }
+                    MainUtil.sendMessage(player,
+                        "&cThe world you specified already exists. After restarting, new terrain will use "
+                            + PlotSquared.imp().getPluginName() + ", however you may need to "
+                            + "reset the world for it to generate correctly!");
+                }
+                object.world = args[0];
+                player.deleteMeta("setup");
+                String world;
+                if (object.setupManager == null) {
+                    world = SetupUtils.manager.setupWorld(object);
+                } else {
+                    world = object.setupManager.setupWorld(object);
+                }
+                try {
+                    player.teleport(WorldUtil.IMP.getSpawn(world));
+                } catch (Exception e) {
+                    player.sendMessage("&cAn error occurred. See console for more information");
+                    e.printStackTrace();
+                }
+                sendMessage(player, C.SETUP_FINISHED, object.world);
+        }
+        return false;
+    }
+
+    private static final class StepPickGenerator extends SetupStep {
+
+        @Getter private String generator;
+
+        public StepPickGenerator() {
+            super("generator");
+        }
+
+        @Override public Collection<PlotMessage> showDescriptionMessage() {
+            SetupUtils.manager.updateGenerators();
+            final List<PlotMessage> messages = new ArrayList<>();
+            messages.add(new PlotMessage("What generator do you want?").color("$6"));
+            for (Entry<String, GeneratorWrapper<?>> entry : SetupUtils.generators.entrySet()) {
+                final PlotMessage plotMessage = new PlotMessage(" - ").color("$8");
+                if (entry.getKey().equals(PlotSquared.imp().getPluginName())) {
+                    plotMessage.text(entry.getKey()).color("$8").tooltip("Select this generator")
+                        .color("$2").command("/plot setup generator " + entry.getKey())
+                        .text(" (Default Generator)").color("$7");
+                } else if (entry.getValue().isFull()) {
+                    plotMessage.text(entry.getKey()).color("$8").tooltip("Select this generator")
+                        .color("$7").command("/plot setup generator " + entry.getKey())
+                        .text(" (Plot Generator)").color("$7");
+                } else {
+                    plotMessage.text(entry.getKey()).color("$8").tooltip("Select this generator")
+                        .color("$7").command("/plot setup generator " + entry.getKey())
+                        .text(" (Unknown Structure)").color("$7");
+                }
+                messages.add(plotMessage);
+            }
+            return messages;
+        }
+
+        @Override public boolean parseInut(String input) {
+            this.generator = input.toLowerCase();
+            return true;
+        }
+
+        @Nullable @Override public String getDefault() {
+            return null;
+        }
+    }
+
+
+    private static final class StepWorldType extends SetupStep {
+
+        private static final Map<String, String> WORLD_TYPES = new HashMap<>();
+
+        static {
+            WORLD_TYPES.put("default", "Standard plot generation");
+            WORLD_TYPES.put("augmented", "Plot generation with vanilla terrain");
+            WORLD_TYPES.put("partial", "Vanilla clusters of plots");
+        }
+
+        @Getter private String worldType;
+
+        public StepWorldType() {
+            super("type");
+        }
+
+        @Override public Collection<PlotMessage> showDescriptionMessage() {
+            final List<PlotMessage> messages = new ArrayList<>();
+            messages.add(new PlotMessage("What world type do you want?").color("$6"));
+            for (final Map.Entry<String, String> worldType : WORLD_TYPES.entrySet()) {
+                messages.add(new PlotMessage(" - ").color("$8").text(worldType.getKey())
+                    .color(worldType.getKey().equals(getDefault()) ? "$2" : "$7")
+                    .tooltip("Select this world type")
+                    .command("/plot setup type " + worldType.getKey())
+                    .text(" (" + worldType.getValue() + ")").color("$7"));
+            }
+            return messages;
+        }
+
+        @Override public boolean parseInut(String input) {
+            if (!WORLD_TYPES.keySet().contains(input.toLowerCase())) {
+                return false;
+            }
+            this.worldType = input.toLowerCase();
+            return true;
+        }
+
+        @Override public String getDefault() {
+            return "default";
+        }
+    }
+
+
+    @ToString @EqualsAndHashCode(of = "uuid") @AllArgsConstructor
+    private static class SetupContext {
+
+        private final UUID uuid;
+
+        @Getter private String step;
+
+    }
+
+
+    @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+    private abstract static class SetupStep {
+
+        private final String stepName;
+
+        public abstract Collection<PlotMessage> showDescriptionMessage();
+
+        public abstract boolean parseInut(String input);
+
+        public final PlotMessage getUsage() {
+            return new PlotMessage("Usage: ").color("$1")
+                .text("/plot setup " + this.stepName + " <value>").color("$2").suggest(
+                    "/plot setup " + this.stepName + (this.getDefault() != null ?
+                        this.getDefault() :
+                        ""));
+        }
+
+        @Nullable public abstract String getDefault();
+
+        public void sendToPlayer(@NonNull final PlotPlayer plotPlayer) {
+            new PlotMessage("Setup Step: ").color("$6").text(this.stepName).color("$7")
+                .send(plotPlayer);
+            this.getUsage().send(plotPlayer);
+            this.showDescriptionMessage().forEach(plotMessage -> plotMessage.send(plotPlayer));
+            if (this.getDefault() != null) {
+                new PlotMessage("Default: ").color("$6").text(this.getDefault()).color("$7");
+            }
+        }
+
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
new file mode 100644
index 000000000..396185e29
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
@@ -0,0 +1,39 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+
+/**
+ * SubCommand class
+ *
+ * @Deprecated In favor of normal Command class
+ * @see Command(Command, boolean)
+ */
+public abstract class SubCommand extends Command {
+    public SubCommand() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    public SubCommand(Argument... arguments) {
+        this();
+        setRequiredArguments(arguments);
+    }
+
+    @Override public void execute(PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        onCommand(player, args);
+    }
+
+
+    public abstract boolean onCommand(PlotPlayer player, String[] args);
+
+    public boolean sendMessage(PlotPlayer player, C message, Object... args) {
+        message.send(player, args);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
new file mode 100644
index 000000000..80a96dfb6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
@@ -0,0 +1,54 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+@CommandDeclaration(usage = "/plot swap <X;Z>", command = "swap", description = "Swap two plots",
+    aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE)
+public class Swap extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        Location loc = player.getLocation();
+        Plot plot1 = loc.getPlotAbs();
+        if (plot1 == null) {
+            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot1.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            return false;
+        }
+        if (args.length != 1) {
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
+        if (plot2 == null) {
+            return false;
+        }
+        if (plot1.equals(plot2)) {
+            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
+            return false;
+        }
+        if (!plot1.getArea().isCompatible(plot2.getArea())) {
+            C.PLOTWORLD_INCOMPATIBLE.send(player);
+            return false;
+        }
+        if (plot1.move(plot2, new Runnable() {
+            @Override public void run() {
+                MainUtil.sendMessage(player, C.SWAP_SUCCESS);
+            }
+        }, true)) {
+            return true;
+        } else {
+            MainUtil.sendMessage(player, C.SWAP_OVERLAP);
+            return false;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
new file mode 100644
index 000000000..03879463a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
@@ -0,0 +1,49 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+@CommandDeclaration(command = "target", usage = "/plot target <<plot>|nearest>",
+    description = "Target a plot with your compass", permission = "plots.target",
+    requiredType = RequiredType.PLAYER, category = CommandCategory.INFO) public class Target
+    extends SubCommand {
+
+    public Target() {
+        super(Argument.PlotID);
+    }
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        Location location = player.getLocation();
+        if (!location.isPlotArea()) {
+            MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            return false;
+        }
+        Plot target = null;
+        if (StringMan.isEqualIgnoreCaseToAny(args[0], "near", "nearest")) {
+            int distance = Integer.MAX_VALUE;
+            for (Plot plot : PlotSquared.get().getPlots(location.getWorld())) {
+                double current = plot.getCenter().getEuclideanDistanceSquared(location);
+                if (current < distance) {
+                    distance = (int) current;
+                    target = plot;
+                }
+            }
+            if (target == null) {
+                MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
+                return false;
+            }
+        } else if ((target = MainUtil.getPlotFromString(player, args[0], true)) == null) {
+            return false;
+        }
+        player.setCompassTarget(target.getCenter());
+        MainUtil.sendMessage(player, C.COMPASS_TARGET);
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
new file mode 100644
index 000000000..aed9c5ca6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
@@ -0,0 +1,201 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+
+import java.io.*;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+@CommandDeclaration(command = "template", permission = "plots.admin",
+    description = "Create or use a world template",
+    usage = "/plot template [import|export] <world> <template>",
+    category = CommandCategory.ADMINISTRATION) public class Template extends SubCommand {
+
+    public static boolean extractAllFiles(String world, String template) {
+        try {
+            File folder =
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.TEMPLATES);
+            if (!folder.exists()) {
+                return false;
+            }
+            File input = new File(folder + File.separator + template + ".template");
+            File output = PlotSquared.get().IMP.getDirectory();
+            if (!output.exists()) {
+                output.mkdirs();
+            }
+            try (ZipInputStream zis = new ZipInputStream(new FileInputStream(input))) {
+                ZipEntry ze = zis.getNextEntry();
+                byte[] buffer = new byte[2048];
+                while (ze != null) {
+                    if (!ze.isDirectory()) {
+                        String name = ze.getName().replace('\\', File.separatorChar)
+                            .replace('/', File.separatorChar);
+                        File newFile = new File(
+                            (output + File.separator + name).replaceAll("__TEMP_DIR__", world));
+                        File parent = newFile.getParentFile();
+                        if (parent != null) {
+                            parent.mkdirs();
+                        }
+                        try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                            int len;
+                            while ((len = zis.read(buffer)) > 0) {
+                                fos.write(buffer, 0, len);
+                            }
+                        }
+                    }
+                    ze = zis.getNextEntry();
+                }
+                zis.closeEntry();
+            }
+            return true;
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public static byte[] getBytes(PlotArea plotArea) {
+        ConfigurationSection section =
+            PlotSquared.get().worlds.getConfigurationSection("worlds." + plotArea.worldname);
+        YamlConfiguration config = new YamlConfiguration();
+        String generator = SetupUtils.manager.getGenerator(plotArea);
+        if (generator != null) {
+            config.set("generator.plugin", generator);
+        }
+        for (String key : section.getKeys(true)) {
+            config.set(key, section.get(key));
+        }
+        return config.saveToString().getBytes();
+    }
+
+    public static void zipAll(String world, Set<FileBytes> files) throws IOException {
+        File output =
+            MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.TEMPLATES);
+        output.mkdirs();
+        try (FileOutputStream fos = new FileOutputStream(
+            output + File.separator + world + ".template");
+            ZipOutputStream zos = new ZipOutputStream(fos)) {
+
+            for (FileBytes file : files) {
+                ZipEntry ze = new ZipEntry(file.path);
+                zos.putNextEntry(ze);
+                zos.write(file.data);
+            }
+            zos.closeEntry();
+        }
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length != 2 && args.length != 3) {
+            if (args.length == 1) {
+                if (args[0].equalsIgnoreCase("export")) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot template export <world>");
+                    return true;
+                } else if (args[0].equalsIgnoreCase("import")) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        "/plot template import <world> <template>");
+                    return true;
+                }
+            }
+            MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                "/plot template <import|export> <world> [template]");
+            return true;
+        }
+        final String world = args[1];
+        switch (args[0].toLowerCase()) {
+            case "import": {
+                if (args.length != 3) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        "/plot template import <world> <template>");
+                    return false;
+                }
+                if (PlotSquared.get().hasPlotArea(world)) {
+                    MainUtil.sendMessage(player, C.SETUP_WORLD_TAKEN, world);
+                    return false;
+                }
+                boolean result = extractAllFiles(world, args[2]);
+                if (!result) {
+                    MainUtil
+                        .sendMessage(player, "&cInvalid template file: " + args[2] + ".template");
+                    return false;
+                }
+                File worldFile = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+                    Settings.Paths.TEMPLATES + File.separator + "tmp-data.yml");
+                YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile);
+                PlotSquared.get().worlds.set("worlds." + world, worldConfig.get(""));
+                try {
+                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+                    PlotSquared.get().worlds.load(PlotSquared.get().worldsFile);
+                } catch (InvalidConfigurationException | IOException e) {
+                    e.printStackTrace();
+                }
+                String manager =
+                    worldConfig.getString("generator.plugin", PlotSquared.imp().getPluginName());
+                String generator = worldConfig.getString("generator.init", manager);
+                int type = worldConfig.getInt("generator.type");
+                int terrain = worldConfig.getInt("generator.terrain");
+
+                SetupObject setup = new SetupObject();
+                setup.plotManager = manager;
+                setup.setupGenerator = generator;
+                setup.type = type;
+                setup.terrain = terrain;
+                setup.step = new ConfigurationNode[0];
+                setup.world = world;
+                SetupUtils.manager.setupWorld(setup);
+                GlobalBlockQueue.IMP.addTask(new Runnable() {
+                    @Override public void run() {
+                        MainUtil.sendMessage(player, "Done!");
+                        player.teleport(WorldUtil.IMP.getSpawn(world));
+                    }
+                });
+                return true;
+            }
+            case "export":
+                if (args.length != 2) {
+                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot template export <world>");
+                    return false;
+                }
+                final PlotArea area = PlotSquared.get().getPlotAreaByString(world);
+                if (area == null) {
+                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+                    return false;
+                }
+                final PlotManager manager = area.getPlotManager();
+                TaskManager.runTaskAsync(new Runnable() {
+                    @Override public void run() {
+                        try {
+                            manager.exportTemplate(area);
+                        } catch (Exception e) { // Must recover from any exception thrown a third party template manager
+                            e.printStackTrace();
+                            MainUtil.sendMessage(player, "Failed: " + e.getMessage());
+                            return;
+                        }
+                        MainUtil.sendMessage(player, "Done!");
+                    }
+                });
+                return true;
+            default:
+                C.COMMAND_SYNTAX.send(player, getUsage());
+        }
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
new file mode 100644
index 000000000..4a324e879
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
@@ -0,0 +1,90 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+@CommandDeclaration(command = "toggle", aliases = {"attribute"}, permission = "plots.use",
+    description = "Toggle per user settings", requiredType = RequiredType.NONE,
+    category = CommandCategory.SETTINGS) public class Toggle extends Command {
+    public Toggle() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @CommandDeclaration(command = "chatspy", aliases = {"spy"},
+        permission = "plots.admin.command.chat", description = "Toggle admin chat spying")
+    public void chatspy(Command command, PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        if (toggle(player, "chatspy")) {
+            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+        } else {
+            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+        }
+    }
+
+    @CommandDeclaration(command = "worldedit", aliases = {"we", "wea"},
+        permission = "plots.worldedit.bypass", description = "Toggle worldedit area restrictions")
+    public void worldedit(Command command, PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        if (toggle(player, "worldedit")) {
+            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+        } else {
+            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+        }
+    }
+
+    @CommandDeclaration(command = "chat", permission = "plots.toggle.chat",
+        description = "Toggle plot chat")
+    public void chat(Command command, PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        if (toggle(player, "chat")) {
+            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+        } else {
+            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+        }
+    }
+
+    @CommandDeclaration(command = "clear-confirmation",
+        permission = "plots.admin.command.autoclear", description = "Toggle autoclear confirmation")
+    public void clearConfirmation(Command command, PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        if (toggle(player, "ignoreExpireTask")) {
+            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+        } else {
+            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+        }
+    }
+
+    @CommandDeclaration(command = "titles", permission = "plots.toggle.titles",
+        description = "Toggle plot title messages")
+    public void titles(Command command, PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) {
+        PlotArea area = player.getApplicablePlotArea();
+        boolean chat = area == null ? false : area.PLOT_CHAT;
+        if (toggle(player, "disabletitles") != chat) {
+            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+        } else {
+            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+        }
+    }
+
+    public boolean toggle(PlotPlayer player, String key) {
+        if (player.getAttribute(key)) {
+            player.removeAttribute(key);
+            return true;
+        } else {
+            player.setAttribute(key);
+            return false;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
new file mode 100644
index 000000000..f1a063dcb
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
@@ -0,0 +1,214 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+@CommandDeclaration(command = "trim", permission = "plots.admin",
+    description = "Delete unmodified portions of your plotworld",
+    usage = "/plot trim <world> [regenerate]", requiredType = RequiredType.CONSOLE,
+    category = CommandCategory.ADMINISTRATION) public class Trim extends SubCommand {
+
+    public static ArrayList<Plot> expired = null;
+    private static volatile boolean TASK = false;
+
+    public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world,
+        final Runnable whenDone) {
+        if (Trim.TASK) {
+            return false;
+        }
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                String directory = world + File.separator + "region";
+                File folder = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
+                File[] regionFiles = folder.listFiles();
+                for (File file : regionFiles) {
+                    String name = file.getName();
+                    if (name.endsWith("mca")) {
+                        if (file.getTotalSpace() <= 8192) {
+                            checkMca(name);
+                        } else {
+                            Path path = Paths.get(file.getPath());
+                            try {
+                                BasicFileAttributes attr =
+                                    Files.readAttributes(path, BasicFileAttributes.class);
+                                long creation = attr.creationTime().toMillis();
+                                long modification = file.lastModified();
+                                long diff = Math.abs(creation - modification);
+                                if (diff < 10000) {
+                                    checkMca(name);
+                                }
+                            } catch (IOException ignored) {
+                            }
+                        }
+                    }
+                }
+                Trim.TASK = false;
+                TaskManager.runTaskAsync(whenDone);
+            }
+
+            private void checkMca(String name) {
+                try {
+                    String[] split = name.split("\\.");
+                    int x = Integer.parseInt(split[1]);
+                    int z = Integer.parseInt(split[2]);
+                    ChunkLoc loc = new ChunkLoc(x, z);
+                    empty.add(loc);
+                } catch (NumberFormatException ignored) {
+                    PlotSquared.debug("INVALID MCA: " + name);
+                }
+            }
+        });
+        Trim.TASK = true;
+        return true;
+    }
+
+    /**
+     * Runs the result task with the parameters (viable, nonViable).
+     *
+     * @param world  The world
+     * @param result (viable = .mcr to trim, nonViable = .mcr keep)
+     * @return
+     */
+    public static boolean getTrimRegions(String world,
+        final RunnableVal2<Set<ChunkLoc>, Set<ChunkLoc>> result) {
+        if (result == null) {
+            return false;
+        }
+        MainUtil.sendMessage(null, "Collecting region data...");
+        ArrayList<Plot> plots = new ArrayList<>();
+        plots.addAll(PlotSquared.get().getPlots(world));
+        if (ExpireManager.IMP != null) {
+            plots.removeAll(ExpireManager.IMP.getPendingExpired());
+        }
+        result.value1 = new HashSet<>(ChunkManager.manager.getChunkChunks(world));
+        result.value2 = new HashSet<>();
+        MainUtil.sendMessage(null, " - MCA #: " + result.value1.size());
+        MainUtil.sendMessage(null, " - CHUNKS: " + (result.value1.size() * 1024) + " (max)");
+        MainUtil.sendMessage(null, " - TIME ESTIMATE: 12 Parsecs");
+        TaskManager.objectTask(plots, new RunnableVal<Plot>() {
+            @Override public void run(Plot plot) {
+                Location pos1 = plot.getBottom();
+                Location pos2 = plot.getTop();
+                int ccx1 = pos1.getX() >> 9;
+                int ccz1 = pos1.getZ() >> 9;
+                int ccx2 = pos2.getX() >> 9;
+                int ccz2 = pos2.getZ() >> 9;
+                for (int x = ccx1; x <= ccx2; x++) {
+                    for (int z = ccz1; z <= ccz2; z++) {
+                        ChunkLoc loc = new ChunkLoc(x, z);
+                        if (result.value1.remove(loc)) {
+                            result.value2.add(loc);
+                        }
+                    }
+                }
+            }
+        }, result);
+        return true;
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length == 0) {
+            C.COMMAND_SYNTAX.send(player, getUsage());
+            return false;
+        }
+        final String world = args[0];
+        if (!WorldUtil.IMP.isWorld(world) || !PlotSquared.get().hasPlotArea(world)) {
+            MainUtil.sendMessage(player, C.NOT_VALID_WORLD);
+            return false;
+        }
+        if (Trim.TASK) {
+            C.TRIM_IN_PROGRESS.send(player);
+            return false;
+        }
+        Trim.TASK = true;
+        final boolean regen = args.length == 2 && Boolean.parseBoolean(args[1]);
+        getTrimRegions(world, new RunnableVal2<Set<ChunkLoc>, Set<ChunkLoc>>() {
+            @Override public void run(Set<ChunkLoc> viable, final Set<ChunkLoc> nonViable) {
+                Runnable regenTask;
+                if (regen) {
+                    PlotSquared.log("Starting regen task:");
+                    PlotSquared.log(" - This is a VERY slow command");
+                    PlotSquared.log(" - It will say `Trim done!` when complete");
+                    regenTask = new Runnable() {
+                        @Override public void run() {
+                            if (nonViable.isEmpty()) {
+                                Trim.TASK = false;
+                                player.sendMessage("Trim done!");
+                                return;
+                            }
+                            Iterator<ChunkLoc> iterator = nonViable.iterator();
+                            ChunkLoc mcr = iterator.next();
+                            iterator.remove();
+                            int cbx = mcr.x << 5;
+                            int cbz = mcr.z << 5;
+                            // get all 1024 chunks
+                            HashSet<ChunkLoc> chunks = new HashSet<>();
+                            for (int x = cbx; x < cbx + 32; x++) {
+                                for (int z = cbz; z < cbz + 32; z++) {
+                                    ChunkLoc loc = new ChunkLoc(x, z);
+                                    chunks.add(loc);
+                                }
+                            }
+                            int bx = cbx << 4;
+                            int bz = cbz << 4;
+                            RegionWrapper region = new RegionWrapper(bx, bx + 511, bz, bz + 511);
+                            for (Plot plot : PlotSquared.get().getPlots(world)) {
+                                Location bot = plot.getBottomAbs();
+                                Location top = plot.getExtendedTopAbs();
+                                RegionWrapper plotReg =
+                                    new RegionWrapper(bot.getX(), top.getX(), bot.getZ(),
+                                        top.getZ());
+                                if (!region.intersects(plotReg)) {
+                                    continue;
+                                }
+                                for (int x = plotReg.minX >> 4; x <= plotReg.maxX >> 4; x++) {
+                                    for (int z = plotReg.minZ >> 4; z <= plotReg.maxZ >> 4; z++) {
+                                        ChunkLoc loc = new ChunkLoc(x, z);
+                                        chunks.remove(loc);
+                                    }
+                                }
+                            }
+                            final LocalBlockQueue queue =
+                                GlobalBlockQueue.IMP.getNewQueue(world, false);
+                            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
+                                @Override public void run(ChunkLoc value) {
+                                    queue.regenChunk(value.x, value.z);
+                                }
+                            }, this);
+                        }
+                    };
+                } else {
+                    regenTask = new Runnable() {
+                        @Override public void run() {
+                            Trim.TASK = false;
+                            player.sendMessage("Trim done!");
+                        }
+                    };
+                }
+                ChunkManager.manager.deleteRegionFiles(world, viable, regenTask);
+
+            }
+        });
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
new file mode 100644
index 000000000..6e6f0c5ab
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
@@ -0,0 +1,82 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.UUID;
+
+@CommandDeclaration(command = "trust", aliases = {"t"}, requiredType = RequiredType.NONE,
+    usage = "/plot trust <player>",
+    description = "Allow a user to build in a plot while you are offline",
+    category = CommandCategory.SETTINGS) public class Trust extends Command {
+
+    public Trust() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
+        checkTrue(plot.isOwner(player.getUUID()) || Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.NO_PLOT_PERMS);
+        checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
+        final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
+        checkTrue(!uuids.isEmpty(), C.INVALID_PLAYER, args[0]);
+        Iterator<UUID> iter = uuids.iterator();
+        int size = plot.getTrusted().size() + plot.getMembers().size();
+        while (iter.hasNext()) {
+            UUID uuid = iter.next();
+            if (uuid == DBFunc.EVERYONE && !(
+                Permissions.hasPermission(player, C.PERMISSION_TRUST_EVERYONE) || Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST))) {
+                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
+                iter.remove();
+                continue;
+            }
+            if (plot.isOwner(uuid)) {
+                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
+                iter.remove();
+                continue;
+            }
+            if (plot.getTrusted().contains(uuid)) {
+                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
+                iter.remove();
+                continue;
+            }
+            size += plot.getMembers().contains(uuid) ? 0 : 1;
+        }
+        checkTrue(!uuids.isEmpty(), null);
+        checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
+        confirm.run(this, new Runnable() {
+            @Override // Success
+            public void run() {
+                for (UUID uuid : uuids) {
+                    if (uuid != DBFunc.EVERYONE) {
+                        if (!plot.removeMember(uuid)) {
+                            if (plot.getDenied().contains(uuid)) {
+                                plot.removeDenied(uuid);
+                            }
+                        }
+                    }
+                    plot.addTrusted(uuid);
+                    EventUtil.manager.callTrusted(player, plot, uuid, true);
+                    MainUtil.sendMessage(player, C.TRUSTED_ADDED);
+                }
+            }
+        }, null);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
new file mode 100644
index 000000000..19414ac90
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
@@ -0,0 +1,58 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+
+@CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
+    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]",
+    requiredType = RequiredType.NONE, category = CommandCategory.SETTINGS, confirmation = true)
+public class Unlink extends SubCommand {
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+
+        Location loc = player.getLocation();
+        final Plot plot = loc.getPlotAbs();
+        if (plot == null) {
+            return !sendMessage(player, C.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            return !sendMessage(player, C.PLOT_UNOWNED);
+        }
+        if (!plot.isOwner(player.getUUID()) && !Permissions
+            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_UNLINK)) {
+            return sendMessage(player, C.NO_PLOT_PERMS);
+        }
+        if (!plot.isMerged()) {
+            return sendMessage(player, C.UNLINK_IMPOSSIBLE);
+        }
+        final boolean createRoad;
+        if (args.length != 0) {
+            if (args.length != 1 || !StringMan.isEqualIgnoreCaseToAny(args[0], "true", "false")) {
+                C.COMMAND_SYNTAX.send(player, getUsage());
+                return false;
+            }
+            createRoad = Boolean.parseBoolean(args[0]);
+        } else {
+            createRoad = true;
+        }
+        Runnable runnable = new Runnable() {
+            @Override public void run() {
+                if (!plot.unlinkPlot(createRoad, createRoad)) {
+                    MainUtil.sendMessage(player, "&cUnlink has been cancelled");
+                    return;
+                }
+                MainUtil.sendMessage(player, C.UNLINK_SUCCESS);
+            }
+        };
+        if (hasConfirmation(player)) {
+            CmdConfirm.addPending(player, "/plot unlink " + plot.getId(), runnable);
+        } else {
+            TaskManager.runTask(runnable);
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
new file mode 100644
index 000000000..8f1e50f16
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
@@ -0,0 +1,142 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.*;
+
+@CommandDeclaration(command = "visit", permission = "plots.visit",
+    description = "Visit someones plot", usage = "/plot visit [<player>|<alias>|<world>|<id>] [#]",
+    aliases = {"v", "tp", "teleport", "goto", "home", "h"}, requiredType = RequiredType.NONE,
+    category = CommandCategory.TELEPORT) public class Visit extends Command {
+
+    public Visit() {
+        super(MainCommand.getInstance(), true);
+    }
+
+    @Override public Collection<Command> tab(PlotPlayer player, String[] args, boolean space) {
+        return tabOf(player, args, space, getUsage());
+    }
+
+    @Override public void execute(final PlotPlayer player, String[] args,
+        RunnableVal3<Command, Runnable, Runnable> confirm,
+        final RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
+        if (args.length == 1 && args[0].contains(":")) {
+            args = args[0].split(":");
+        }
+        int page = Integer.MIN_VALUE;
+        Collection<Plot> unsorted = null;
+        PlotArea sortByArea = player.getApplicablePlotArea();
+        boolean shouldSortByArea = Settings.Teleport.PER_WORLD_VISIT;
+        switch (args.length) {
+            case 3:
+                if (!MathMan.isInteger(args[1])) {
+                    C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
+                    C.COMMAND_SYNTAX.send(player, getUsage());
+                    return;
+                }
+                page = Integer.parseInt(args[2]);
+            case 2:
+                if (page != Integer.MIN_VALUE || !MathMan.isInteger(args[1])) {
+                    sortByArea = PlotSquared.get().getPlotAreaByString(args[1]);
+                    if (sortByArea == null) {
+                        C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
+                        C.COMMAND_SYNTAX.send(player, getUsage());
+                        return;
+                    }
+                    UUID user = UUIDHandler.getUUIDFromString(args[0]);
+                    if (user == null) {
+                        C.COMMAND_SYNTAX.send(player, getUsage());
+                        return;
+                    }
+                    unsorted = PlotSquared.get().getBasePlots(user);
+                    shouldSortByArea = true;
+                    break;
+                }
+                page = Integer.parseInt(args[1]);
+            case 1:
+                UUID user = args[0].length() >= 2 ? UUIDHandler.getUUIDFromString(args[0]) : null;
+                if (user != null && !PlotSquared.get().hasPlot(user))
+                    user = null;
+                if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
+                    page = Integer.parseInt(args[0]);
+                    unsorted = PlotSquared.get().getBasePlots(player);
+                    break;
+                }
+                if (user != null) {
+                    unsorted = PlotSquared.get().getBasePlots(user);
+                } else {
+                    Plot plot = MainUtil.getPlotFromString(player, args[0], true);
+                    if (plot != null) {
+                        unsorted = Collections.singletonList(plot.getBasePlot(false));
+                    }
+                }
+                break;
+            case 0:
+                page = 1;
+                unsorted = PlotSquared.get().getPlots(player);
+                break;
+            default:
+
+        }
+        if (page == Integer.MIN_VALUE) {
+            page = 1;
+        }
+        if (unsorted == null || unsorted.isEmpty()) {
+            C.FOUND_NO_PLOTS.send(player);
+            return;
+        }
+        unsorted = new ArrayList<>(unsorted);
+        unsorted.removeIf(plot -> !plot.isBasePlot());
+        if (page < 1 || page > unsorted.size()) {
+            C.NOT_VALID_NUMBER.send(player, "(1, " + unsorted.size() + ")");
+            return;
+        }
+        List<Plot> plots;
+        if (shouldSortByArea) {
+            plots = PlotSquared.get()
+                .sortPlots(unsorted, PlotSquared.SortType.CREATION_DATE, sortByArea);
+        } else {
+            plots = PlotSquared.get().sortPlotsByTemp(unsorted);
+        }
+        final Plot plot = plots.get(page - 1);
+        if (!plot.hasOwner()) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_UNOWNED)) {
+                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_UNOWNED);
+                return;
+            }
+        } else if (plot.isOwner(player.getUUID())) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_OWNED) && !Permissions
+                .hasPermission(player, C.PERMISSION_HOME)) {
+                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_OWNED);
+                return;
+            }
+        } else if (plot.isAdded(player.getUUID())) {
+            if (!Permissions.hasPermission(player, C.PERMISSION_SHARED)) {
+                C.NO_PERMISSION.send(player, C.PERMISSION_SHARED);
+                return;
+            }
+        } else {
+            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_OTHER)) {
+                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_OTHER);
+                return;
+            }
+        }
+        confirm.run(this, () -> {
+            if (plot.teleportPlayer(player)) {
+                whenDone.run(Visit.this, CommandResult.SUCCESS);
+            } else {
+                whenDone.run(Visit.this, CommandResult.FAILURE);
+            }
+        }, () -> whenDone.run(Visit.this, CommandResult.FAILURE));
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java
new file mode 100644
index 000000000..bd18e3886
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java
@@ -0,0 +1,16 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+@CommandDeclaration(command = "weanywhere", permission = "plots.worldedit.bypass",
+    description = "Force bypass of WorldEdit", aliases = {"wea"}, usage = "/plot weanywhere",
+    requiredType = RequiredType.NONE, category = CommandCategory.ADMINISTRATION) @Deprecated
+public class WE_Anywhere extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] arguments) {
+        MainCommand.getInstance().toggle.worldedit(this, player, new String[0], null, null);
+        return true;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
new file mode 100644
index 000000000..d3045c568
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
@@ -0,0 +1,1070 @@
+package com.github.intellectualsites.plotsquared.plot.config;
+
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * Captions class.
+ */
+public enum C {
+
+    /*
+     * Static flags
+     */
+    FLAG_USE("use", "static.flags"), FLAG_BREAK("break", "static.flags"), FLAG_PLACE("place",
+        "static.flags"), FLAG_PVP("pvp", "static.flags"), FLAG_HANGING_PLACE("hanging-place",
+        "static.flags"), FLAG_HANGING_BREAK("hanging-break", "static.flags"), FLAG_HANGING_INTERACT(
+        "hanging-interact", "static.flags"), FLAG_MISC_INTERACT("misc-interact",
+        "static.flags"), FLAG_MISC_BREAK("misc-break", "static.flags"), FLAG_MISC_PLACE(
+        "misc-place", "static.flags"), FLAG_VEHICLE_BREAK("vehicle-break",
+        "static.flags"), FLAG_HOSTILE_INTERACT("hostile-interact",
+        "static.flags"), FLAG_DEVICE_INTERACT("device-interact",
+        "static.flags"), FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"), FLAG_VEHICLE_USE(
+        "vehicle-use", "static.flags"), FLAG_VEHICLE_PLACE("vehicle-place",
+        "static.flags"), FLAG_PLAYER_INTERACT("player-interact",
+        "static.flags"), FLAG_TAMED_INTERACT("tamed-interact",
+        "static.flags"), FLAG_DISABLE_PHYSICS("disable-physics", "static.flags"), FLAG_MOB_PLACE(
+        "mob-place", "static.flags"), /*
+     * Static permission
+     */
+    PERMISSION_STAR("*", "static.permissions"), PERMISSION_ADMIN("plots.admin",
+        "static.permissions"), PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned",
+        "static.permissions"), PERMISSION_PROJECTILE_OTHER("plots.projectile.other",
+        "static.permissions"), PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS(
+        "plots.admin.interact.blockedcommands", "static.permissions"), PERMISSION_WORLDEDIT_BYPASS(
+        "plots.worldedit.bypass", "static.permissions"), PERMISSION_PLOT_TOGGLE_TITLES(
+        "plots.toggle.titles", "static.permissions"), PERMISSION_PLOT_TOGGLE_CHAT(
+        "plots.toggle.chat", "static.permissions"), PERMISSION_ADMIN_EXIT_DENIED(
+        "plots.admin.exit.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_DENIED(
+        "plots.admin.entry.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_FORCEFIELD(
+        "plots.admin.entry.forcefield", "static.permissions"), PERMISSION_COMMANDS_CHAT(
+        "plots.admin.command.chat", "static.permissions"), PERMISSION_MERGE_OTHER(
+        "plots.merge.other", "static.permissions"), PERMISSION_MERGE_KEEPROAD(
+        "plots.merge.keeproad", "static.permissions"), PERMISSION_ADMIN_DESTROY_UNOWNED(
+        "plots.admin.destroy.unowned", "static.permissions"), PERMISSION_ADMIN_DESTROY_GROUNDLEVEL(
+        "plots.admin.destroy.groundlevel", "static.permissions"), PERMISSION_ADMIN_DESTROY_OTHER(
+        "plots.admin.destroy.other", "static.permissions"), PERMISSION_ADMIN_DESTROY_ROAD(
+        "plots.admin.destroy.road", "static.permissions"), PERMISSION_ADMIN_BUILD_ROAD(
+        "plots.admin.build.road", "static.permissions"), PERMISSION_ADMIN_BUILD_UNOWNED(
+        "plots.admin.build.unowned", "static.permissions"), PERMISSION_ADMIN_BUILD_OTHER(
+        "plots.admin.build.other", "static.permissions"), PERMISSION_ADMIN_INTERACT_ROAD(
+        "plots.admin.interact.road", "static.permissions"), PERMISSION_ADMIN_INTERACT_UNOWNED(
+        "plots.admin.interact.unowned", "static.permissions"), PERMISSION_ADMIN_INTERACT_OTHER(
+        "plots.admin.interact.other", "static.permissions"), PERMISSION_ADMIN_BUILD_HEIGHTLIMIT(
+        "plots.admin.build.heightlimit", "static.permissions"), PERMISSION_ADMIN_UPDATE(
+        "plots.admin.command.update", "static.permissions"), PERMISSION_ADMIN_COMMAND_RATE(
+        "plots.admin.command.rate", "static.permissions"), PERMISSION_ADMIN_COMMAND_TRUST(
+        "plots.admin.command.trust", "static.permissions"), PERMISSION_TRUST_EVERYONE(
+        "plots.trust.everyone", "static.permissions"), PERMISSION_AREA_CREATE("plots.area.create",
+        "static.permissions"), PERMISSION_AREA_INFO("plots.area.info",
+        "static.permissions"), PERMISSION_AREA_LIST("plots.area.list",
+        "static.permissions"), PERMISSION_AREA_REGEN("plots.area.regen",
+        "static.permissions"), PERMISSION_AREA_TP("plots.area.tp",
+        "static.permissions"), PERMISSION_AUTO_MEGA("plots.auto.mega",
+        "static.permissions"), PERMISSION_CLAIM_SCHEMATIC("plots.claim.%s0",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC("plots.admin.command.schematic",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_CLEAR("plots.admin.command.clear",
+        "static.permissions"), PERMISSION_CONTINUE("plots.continue",
+        "static.permissions"), PERMISSION_CLUSTER_LIST("plots.cluster.list",
+        "static.permissions"), PERMISSION_CLUSTER_CREATE("plots.cluster.create",
+        "static.permissions"), PERMISSION_CLUSTER_CREATE_OTHER("plots.cluster.create.other",
+        "static.permissions"), PERMISSION_CLUSTER_SIZE("plots.cluster.size",
+        "static.permissions"), PERMISSION_CLUSTER_DELETE("plots.cluster.delete",
+        "static.permissions"), PERMISSION_CLUSTER_DELETE_OTHER("plots.cluster.delete.other",
+        "static.permissions"), PERMISSION_CLUSTER_RESIZE("plots.cluster.resize",
+        "static.permissions"), PERMISSION_CLUSTER_RESIZE_OTHER("plots.cluster.resize.other",
+        "static.permissions"), PERMISSION_CLUSTER_RESIZE_SHRINK("plots.cluster.resize.shrink",
+        "static.permissions"), PERMISSION_CLUSTER_RESIZE_EXPAND("plots.cluster.resize.expand",
+        "static.permissions"), PERMISSION_CLUSTER("plots.cluster",
+        "static.permissions"), PERMISSION_CLUSTER_INVITE("plots.cluster.invite",
+        "static.permissions"), PERMISSION_CLUSTER_INVITE_OTHER("plots.cluster.invite.other",
+        "static.permissions"), PERMISSION_CLUSTER_KICK("plots.cluster.kick",
+        "static.permissions"), PERMISSION_CLUSTER_KICK_OTHER("plots.cluster.kick.other",
+        "static.permissions"), PERMISSION_CLUSTER_LEAVE("plots.cluster.leave",
+        "static.permissions"), PERMISSION_CLUSTER_HELPERS("plots.cluster.helpers",
+        "static.permissions"), PERMISSION_CLUSTER_TP("plots.cluster.tp",
+        "static.permissions"), PERMISSION_CLUSTER_TP_OTHER("plots.cluster.tp.other",
+        "static.permissions"), PERMISSION_CLUSTER_INFO("plots.cluster.info",
+        "static.permissions"), PERMISSION_CLUSTER_SETHOME("plots.cluster.sethome",
+        "static.permissions"), PERMISSION_CLUSTER_SETHOME_OTHER("plots.cluster.sethome.other",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_CONTINUE("plots.admin.command.continue",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_DELETE("plots.admin.command.delete",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_DENY("plots.admin.command.deny",
+        "static.permissions"), PERMISSION_DENY_EVERYONE("plots.deny.everyone",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_DONE("plots.admin.command.done",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_DOWNLOAD("plots.admin.command.download",
+        "static.permissions"), PERMISSION_DOWNLOAD_WORLD("plots.download.world",
+        "static.permissions"), PERMISSION_SET_FLAG_OTHER("plots.set.flag.other",
+        "static.permissions"), PERMISSION_SET_FLAG("plots.set.flag",
+        "static.permissions"), PERMISSION_SET_FLAG_KEY("plots.set.flag.%s0",
+        "static.permissions"), PERMISSION_SET_FLAG_KEY_VALUE("plots.set.flag.%s0.%s1",
+        "static.permissions"), PERMISSION_FLAG_REMOVE("plots.flag.remove",
+        "static.permissions"), PERMISSION_FLAG_ADD("plots.flag.add",
+        "static.permissions"), PERMISSION_FLAG_LIST("plots.flag.list",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_KICK("plots.admin.command.kick",
+        "static.permissions"), PERMISSION_GRANT("plots.grant.%s0",
+        "static.permissions"), PERMISSION_LIST_FORSALE("plots.list.forsale",
+        "static.permissions"), PERMISSION_LIST_MINE("plots.list.mine",
+        "static.permissions"), PERMISSION_LIST_SHARED("plots.list.shared",
+        "static.permissions"), PERMISSION_LIST_WORLD("plots.list.world",
+        "static.permissions"), PERMISSION_LIST_WORLD_NAME("plots.list.world.%s0",
+        "static.permissions"), PERMISSION_LIST_TOP("plots.list.top",
+        "static.permissions"), PERMISSION_LIST_ALL("plots.list.all",
+        "static.permissions"), PERMISSION_LIST_UNOWNED("plots.list.unowned",
+        "static.permissions"), PERMISSION_LIST_UNKNOWN("plots.list.unknown",
+        "static.permissions"), PERMISSION_LIST_PLAYER("plots.list.player",
+        "static.permissions"), PERMISSION_LIST_DONE("plots.list.done",
+        "static.permissions"), PERMISSION_LIST_EXPIRED("plots.list.expired",
+        "static.permissions"), PERMISSION_LIST_FUZZY("plots.list.fuzzy",
+        "static.permissions"), PERMISSION_LIST_AREA("plots.list.area",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_LOAD("plots.admin.command.load",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_SETOWNER("plots.admin.command.setowner",
+        "static.permissions"), PERMISSION_COMMENT("plots.comment",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_REMOVE("plots.admin.command.remove",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_SAVE("plots.admin.command.save",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE(
+        "plots.admin.command.schematic.paste", "static.permissions"), PERMISSION_SCHEMATIC_PASTE(
+        "plots.schematic.paste", "static.permissions"), PERMISSION_SCHEMATIC_LIST(
+        "plots.schematic.list", "static.permissions"),
+
+    PERMISSION_SCHEMATIC_SAVE("plots.schematic.save",
+        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE(
+        "plots.admin.command.schematic.save", "static.permissions"),
+
+    PERMISSION_SET_COMPONENT("plots.set.%s0", "static.permissions"), PERMISSION_ADMIN_COMMAND(
+        "plots.admin.command.%s0", "static.permissions"),
+
+    PERMISSION_ADMIN_COMMAND_UNLINK("plots.admin.command.unlink",
+        "static.permissions"), PERMISSION_VISIT_UNOWNED("plots.visit.unowned",
+        "static.permissions"),
+
+    PERMISSION_VISIT_OWNED("plots.visit.owned", "static.permissions"), PERMISSION_SHARED(
+        "plots.visit.shared", "static.permissions"),
+
+    PERMISSION_VISIT_OTHER("plots.visit.other", "static.permissions"), PERMISSION_HOME("plots.home",
+        "static.permissions"),
+
+    PERMISSION_ALIAS_SET_OBSOLETE("plots.set.alias",
+        "static.permissions"), // Note this is for backwards compatibility
+
+    PERMISSION_ALIAS_SET("plots.alias.set", "static.permissions"), PERMISSION_ALIAS_REMOVE(
+        "plots.alias.remove", "static.permissions"),
+
+    /*
+     * Static console
+     */
+    CONSOLE_JAVA_OUTDATED(
+        "&cYour version of java is outdated. It is highly recommended that you update to Java 8 as it increases performance "
+            + "and security. %s0 will require Java 8 in a future update.",
+        "static.console"), CONSOLE_PLEASE_ENABLE_METRICS(
+        "&dPlease enable metrics for %s0. Using metrics improves plugin stability, performance, and features. "
+            + "Bug fixes and new features are influenced on metrics.", "static.console"), /*
+     * Confirm
+     */
+
+    EXPIRED_CONFIRM("$2Confirmation has expired, please run the command again!",
+        "Confirm"), FAILED_CONFIRM("$2You have no pending actions to confirm!", "Confirm"),
+
+    REQUIRES_CONFIRM(
+        "$2Are you sure you wish to execute: $1%s$2?&-$2This cannot be undone! If you are sure: $1/plot confirm",
+        "Confirm"), /*
+     * Move
+     */
+
+    MOVE_SUCCESS("$4Successfully moved plot.", "Move"), COPY_SUCCESS("$4Successfully copied plot.",
+        "Move"),
+
+    REQUIRES_UNOWNED("$2The location specified is already occupied.", "Move"), /*
+     * Area Create
+     */
+
+    REQUIRES_UNMERGED("$2The plot cannot be merged", "debug"),
+
+    SET_ATTRIBUTE("$4Successfully set %s0 set to %s1", "Set"), /*
+     * Web
+     */
+
+    GENERATING_LINK("$1Processing plot...", "Web"), GENERATING_LINK_FAILED(
+        "$2Failed to generate download link!", "Web"),
+
+    SAVE_FAILED("$2Failed to save", "Web"), LOAD_NULL(
+        "$2Please use $4/plot load $2to get a list of schematics", "Web"),
+
+    LOAD_FAILED("$2Failed to load schematic", "Web"), LOAD_LIST(
+        "$2To load a schematic, use $1/plot load #", "Web"),
+
+    SAVE_SUCCESS("$1Successfully saved!", "Web"), /*
+     * Compass
+     */
+
+    COMPASS_TARGET("$4Successfully targeted plot with compass", "Compass"), /*
+     * Cluster
+     */
+
+    CLUSTER_AVAILABLE_ARGS(
+        "$1The following sub commands are available: $4list$2, $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, "
+            + "$4members$2, $4info$2, $4tp$2, $4sethome", "Cluster"), CLUSTER_LIST_HEADING(
+        "$2There are $1%s$2 clusters in this world", "Cluster"),
+
+    CLUSTER_LIST_ELEMENT("$2 - $1%s&-", "Cluster"), CLUSTER_INTERSECTION(
+        "$2The proposed area overlaps with: %s0", "Cluster"),
+
+    CLUSTER_OUTSIDE("$2The proposed area is outside the plot area: %s0", "Cluster"), CLUSTER_ADDED(
+        "$4Successfully created the cluster.", "Cluster"),
+
+    CLUSTER_DELETED("$4Successfully deleted the cluster.", "Cluster"), CLUSTER_RESIZED(
+        "$4Successfully resized the cluster.", "Cluster"),
+
+    CLUSTER_ADDED_USER("$4Successfully added user to the cluster.", "Cluster"), CANNOT_KICK_PLAYER(
+        "$2You cannot kick that player", "Cluster"),
+
+    CLUSTER_INVITED("$1You have been invited to the following cluster: $2%s",
+        "Cluster"), CLUSTER_REMOVED("$1You have been removed from cluster: $2%s", "Cluster"),
+
+    CLUSTER_KICKED_USER("$4Successfully kicked the user", "Cluster"), INVALID_CLUSTER(
+        "$1Invalid cluster name: $2%s", "Cluster"),
+
+    CLUSTER_NOT_ADDED("$2That player was not added to the plot cluster",
+        "Cluster"), CLUSTER_CANNOT_LEAVE("$1You must delete or transfer ownership before leaving",
+        "Cluster"),
+
+    CLUSTER_ADDED_HELPER("$4Successfully added a helper to the cluster",
+        "Cluster"), CLUSTER_REMOVED_HELPER("$4Successfully removed a helper from the cluster",
+        "Cluster"),
+
+    CLUSTER_REGENERATED("$4Successfully started cluster regeneration",
+        "Cluster"), CLUSTER_TELEPORTING("$4Teleporting...", "Cluster"),
+
+    CLUSTER_INFO(
+        "$1Current cluster: $2%id%&-$1Name: $2%name%&-$1Owner: $2%owner%&-$1Size: $2%size%&-$1Rights: $2%rights%",
+        "Cluster"), /*
+     * Border
+     */
+
+    BORDER("$2You are outside the current map border", "Border"), /*
+     * Unclaim
+     */
+
+    UNCLAIM_SUCCESS("$4You successfully unclaimed the plot.", "Unclaim"), UNCLAIM_FAILED(
+        "$2Could not unclaim the plot", "Unclaim"), /*
+     * WorldEdit masks
+     */
+
+    WORLDEDIT_DELAYED("$2Please wait while we process your WorldEdit action...",
+        "WorldEdit Masks"), WORLDEDIT_RUN("$2Apologies for the delay. Now executing: %s",
+        "WorldEdit Masks"),
+
+    REQUIRE_SELECTION_IN_MASK(
+        "$2%s of your selection is not within your plot mask. You can only make edits within your plot.",
+        "WorldEdit Masks"), WORLDEDIT_VOLUME(
+        "$2You cannot select a volume of %current%. The maximum volume you can modify is %max%.",
+        "WorldEdit Masks"),
+
+    WORLDEDIT_ITERATIONS(
+        "$2You cannot iterate %current% times. The maximum number of iterations allowed is %max%.",
+        "WorldEdit Masks"), WORLDEDIT_UNSAFE("$2Access to that command has been blocked",
+        "WorldEdit Masks"),
+
+    WORLDEDIT_BYPASS("$2&oTo bypass your restrictions use $4/plot wea",
+        "WorldEdit Masks"), WORLDEDIT_BYPASSED("$2Currently bypassing WorldEdit restriction.",
+        "WorldEdit Masks"),
+
+    WORLDEDIT_UNMASKED("$1Your WorldEdit is now unrestricted.",
+        "WorldEdit Masks"), WORLDEDIT_RESTRICTED("$1Your WorldEdit is now restricted.",
+        "WorldEdit Masks"),
+
+    GAMEMODE_WAS_BYPASSED("$1You bypassed the GameMode ($2{gamemode}$1) $1set for $2{plot}",
+        "GameMode"), HEIGHT_LIMIT("$1This plot area has a height limit of $2{limit}",
+        "Height Limit"), /*
+     * Records
+     */
+
+    RECORD_PLAY("$2%player $2started playing record $1%name", "Records"), NOTIFY_ENTER(
+        "$2%player $2entered your plot ($1%plot$2)", "Records"),
+
+    NOTIFY_LEAVE("$2%player $2left your plot ($1%plot$2)", "Records"), /*
+     * Swap
+     */
+
+    SWAP_OVERLAP("$2The proposed areas are not allowed to overlap", "Swap"), SWAP_DIMENSIONS(
+        "$2The proposed areas must have comparable dimensions", "Swap"),
+
+    SWAP_SYNTAX("$2/plot swap <id>", "Swap"), SWAP_SUCCESS("$4Successfully swapped plots", "Swap"),
+
+    STARTED_SWAP("$2Started plot swap task. You will be notified when it finishes", "Swap"), /*
+     * Comment
+     */
+
+    INBOX_NOTIFICATION("%s unread messages. Use /plot inbox", "Comment"), NOT_VALID_INBOX_INDEX(
+        "$2No comment at index %s", "Comment"),
+
+    INBOX_ITEM("$2 - $4%s", "Comment"), COMMENT_SYNTAX("$2Use /plot comment [X;Z] <%s> <comment>",
+        "Comment"),
+
+    INVALID_INBOX("$2That is not a valid inbox.&-$1Accepted values: %s", "Comment"), NO_PERM_INBOX(
+        "$2You do not have permission for that inbox", "Comment"),
+
+    NO_PERM_INBOX_MODIFY("$2You do not have permission to modify that inbox",
+        "Comment"), NO_PLOT_INBOX("$2You must stand in or supply a plot argument", "Comment"),
+
+    COMMENT_REMOVED("$4Successfully deleted comment/s:n$2 - '$3%s$2'", "Comment"), COMMENT_ADDED(
+        "$4A comment has been left", "Comment"),
+
+    COMMENT_HEADER("$2&m---------&r $1Comments $2&m---------&r", "Comment"), INBOX_EMPTY(
+        "$2No comments", "Comment"), /*
+     * Console
+     */
+
+    NOT_CONSOLE("$2For safety reasons, this command can only be executed by console.",
+        "Console"), IS_CONSOLE("$2This command can only be executed by a player.", "Console"),
+
+    /*
+    Inventory
+     */
+    INVENTORY_USAGE("&cUsage: &6{usage}", "Inventory"), INVENTORY_DESC("&cDescription: &6{desc}",
+        "Inventory"),
+
+    INVENTORY_CATEGORY("&cCategory: &6{category}", "Inventory"),
+
+    /*
+     * Clipboard
+     */
+    CLIPBOARD_SET(
+        "$2The current plot is now copied to your clipboard, use $1/plot paste$2 to paste it",
+        "Clipboard"), PASTED(
+        "$4The plot selection was successfully pasted. It has been cleared from your clipboard.",
+        "Clipboard"),
+
+    PASTE_FAILED("$2Failed to paste the selection. Reason: $2%s", "Clipboard"), NO_CLIPBOARD(
+        "$2You don't have a selection in your clipboard", "Clipboard"),
+
+    CLIPBOARD_INFO(
+        "$2Current Selection - Plot ID: $1%id$2, Width: $1%width$2, Total Blocks: $1%total$2",
+        "Clipboard"), /*
+     * Toggle
+     */
+
+    TOGGLE_ENABLED("$2Enabled setting: %s", "Toggle"), TOGGLE_DISABLED("$2Disabled setting: %s",
+        "Toggle"),
+
+    COMMAND_BLOCKED("$2That command is not allowed in this plot", "Blocked Command"), /*
+     * Done
+     */
+
+    DONE_ALREADY_DONE("$2This plot is already marked as done", "Done"), DONE_NOT_DONE(
+        "$2This plot is not marked as done.", "Done"),
+
+    DONE_INSUFFICIENT_COMPLEXITY(
+        "$2This plot is too simple. Please add more detail before using this command.",
+        "Done"), DONE_SUCCESS("$1Successfully marked this plot as done.", "Done"),
+
+    DONE_REMOVED("$1You may now continue building in this plot.", "Done"), /*
+     * Ratings
+     */
+
+    RATINGS_PURGED("$2Purged ratings for this plot", "Ratings"), RATING_NOT_VALID(
+        "$2You need to specify a number between 1 and 10", "Ratings"),
+
+    RATING_ALREADY_EXISTS("$2You have already rated plot $2%s", "Ratings"), RATING_APPLIED(
+        "$4You successfully rated plot $2%s", "Ratings"),
+
+    RATING_NOT_YOUR_OWN("$2You cannot rate your own plot", "Ratings"), RATING_NOT_DONE(
+        "$2You can only rate finished plots.", "Ratings"),
+
+    RATING_NOT_OWNED("$2You cannot rate a plot that is not claimed by anyone", "Ratings"), /*
+     * Tutorial
+     */
+
+    RATE_THIS("$2Rate this plot!", "Tutorial"), COMMENT_THIS(
+        "$2Leave some feedback on this plot: %s", "Tutorial"), /*
+     * Economy Stuff
+     */
+
+    ECON_DISABLED("$2Economy is not enabled", "Economy"), CANNOT_AFFORD_PLOT(
+        "$2You cannot afford to buy this plot. It costs $1%s", "Economy"),
+
+    NOT_FOR_SALE("$2This plot is not for sale", "Economy"), CANNOT_BUY_OWN(
+        "$2You cannot buy your own plot", "Economy"),
+
+    PLOT_SOLD("$4Your plot; $1%s0$4, has been sold to $1%s1$4 for $1$%s2",
+        "Economy"), CANNOT_AFFORD_MERGE("$2You cannot afford to merge the plots. It costs $1%s",
+        "Economy"),
+
+    ADDED_BALANCE("$1%s $2has been added to your balance", "Economy"), REMOVED_BALANCE(
+        "$1%s $2has been taken from your balance", "Economy"),
+
+    REMOVED_GRANTED_PLOT("$2You used %s plot grant(s), you've got $1%s $2left", "Economy"), /*
+     * Setup Stuff
+     */
+
+    SETUP_INIT("$1Usage: $2/plot setup <value>", "Setup"), SETUP_STEP(
+        "$3[$1Step %s0$3] $1%s1 $2- $1Expecting: $2%s2 $1Default: $2%s3", "Setup"),
+
+    SETUP_INVALID_ARG(
+        "$2%s0 is not a valid argument for step %s1. To cancel setup use: $1/plot setup cancel",
+        "Setup"), SETUP_VALID_ARG("$2Value $1%s0 $2set to %s1", "Setup"),
+
+    SETUP_FINISHED(
+        "$4You should have been teleported to the created world. Otherwise you will need to set the generator manually using the bukkit.yml or "
+            + "your chosen world management plugin.", "Setup"), SETUP_WORLD_TAKEN(
+        "$2%s is already a world", "Setup"),
+
+    SETUP_MISSING_WORLD(
+        "$2You need to specify a world name ($1/plot setup &l<world>$1 <generator>$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 -"
+            + " $1/plot setup back&-$2 - $1/plot setup cancel", "Setup"), SETUP_MISSING_GENERATOR(
+        "$2You need to specify a generator ($1/plot setup <world> &l<generator>&r$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - "
+            + "$1/plot setup back&-$2 - $1/plot setup cancel", "Setup"),
+
+    SETUP_INVALID_GENERATOR("$2Invalid generator. Possible options: %s", "Setup"), /*
+     * Schematic Stuff
+     */
+
+    SCHEMATIC_TOO_LARGE("$2The plot is too large for this action!",
+        "Schematics"), SCHEMATIC_MISSING_ARG(
+        "$2You need to specify an argument. Possible values: $1test <name>$2 , $1save$2 , $1paste $2, $1exportall$2, $1list",
+        "Schematics"),
+
+    SCHEMATIC_INVALID("$2That is not a valid schematic. Reason: $2%s",
+        "Schematics"), SCHEMATIC_VALID("$2That is a valid schematic", "Schematics"),
+
+    SCHEMATIC_PASTE_FAILED("$2Failed to paste the schematic",
+        "Schematics"), SCHEMATIC_PASTE_SUCCESS("$4The schematic pasted successfully", "Schematics"),
+
+    SCHEMATIC_LIST("$4Saved Schematics: $1%s", "Schematics"),
+
+    /*
+     * Title Stuff
+     */
+    TITLE_ENTERED_PLOT("$1Plot: %world%;%x%;%z%", "Titles"), TITLE_ENTERED_PLOT_SUB("$4Owned by %s",
+        "Titles"),
+
+    PREFIX_GREETING("$1%id%$2> ", "Titles"), PREFIX_FAREWELL("$1%id%$2> ", "Titles"), /*
+     * Core Stuff
+     */
+
+    TASK_START("Starting task...", "Core"), PREFIX("$3[$1P2$3] $2", "Core"),
+
+    ENABLED("$1%s0 is now enabled", "Core"), /*
+     * Reload
+     */
+
+    RELOADED_CONFIGS("$1Translations and world settings have been reloaded",
+        "Reload"), RELOAD_FAILED("$2Failed to reload file configurations", "Reload"),
+    /*
+     * BarAPI
+     */
+
+    DESC_SET("$2Plot description set", "Desc"), DESC_UNSET("$2Plot description unset", "Desc"),
+
+    MISSING_DESC("$2You need to specify a description", "Desc"),
+
+    /*
+     * Alias
+     */
+    ALIAS_SET_TO("$2Plot alias set to $1%alias%", "Alias"), ALIAS_REMOVED("$2Plot alias removed",
+        "Alias"),
+
+    MISSING_ALIAS("$2You need to specify an alias", "Alias"), ALIAS_TOO_LONG(
+        "$2The alias must be < 50 characters in length", "Alias"),
+
+    ALIAS_IS_TAKEN("$2That alias is already taken", "Alias"), /*
+     * Position
+     */
+
+    MISSING_POSITION("$2You need to specify a position. Possible values: $1none",
+        "Position"), POSITION_SET("$1Home position set to your current location", "Position"),
+
+    POSITION_UNSET("$1Home position reset to the default location", "Position"), HOME_ARGUMENT(
+        "$2Use /plot set home [none]", "Position"),
+
+    INVALID_POSITION("$2That is not a valid position value", "Position"), /*
+     * Cap
+     */
+
+    ENTITY_CAP("$2You are not allowed to spawn more mobs", "cap"), /*
+     * Time
+     */
+
+    TIME_FORMAT("$1%hours%, %min%, %sec%", "Time"), /*
+     * Permission
+     */
+
+    NO_SCHEMATIC_PERMISSION("$2You don't have the permission required to use schematic $1%s",
+        "Permission"), NO_PERMISSION("$2You are lacking the permission node: $1%s", "Permission"),
+
+    NO_PERMISSION_EVENT("$2You are lacking the permission node: $1%s", "Permission"), NO_PLOT_PERMS(
+        "$2You must be the plot owner to perform this action", "Permission"),
+
+    CANT_CLAIM_MORE_PLOTS("$2You can't claim more plots.", "Permission"), CANT_CLAIM_MORE_CLUSTERS(
+        "$2You can't claim more clusters.", "Permission"),
+
+    CANT_TRANSFER_MORE_PLOTS("$2You can't send more plots to that user",
+        "Permission"), CANT_CLAIM_MORE_PLOTS_NUM("$2You can't claim more than $1%s $2plots at once",
+        "Permission"),
+
+    YOU_BE_DENIED("$2You are not allowed to enter this plot", "Permission"),
+
+    /*
+     * Merge
+     */
+    MERGE_NOT_VALID("$2This merge request is no longer valid.", "Merge"), MERGE_ACCEPTED(
+        "$2The merge request has been accepted", "Merge"),
+
+    SUCCESS_MERGE("$2Plots have been merged!", "Merge"), MERGE_REQUESTED(
+        "$2Successfully sent a merge request", "Merge"),
+
+    MERGE_REQUEST_CONFIRM("Merge request from %s", "Permission"), NO_PERM_MERGE(
+        "$2You are not the owner of the plot: $1%plot%", "Merge"),
+
+    NO_AVAILABLE_AUTOMERGE(
+        "$2You do not own any adjacent plots in the specified direction or are not allowed to merge to the required size.",
+        "Merge"), UNLINK_REQUIRED("$2An unlink is required to do this.", "Merge"),
+
+    UNLINK_IMPOSSIBLE("$2You can only unlink a mega-plot", "Merge"), UNLINK_SUCCESS(
+        "$2Successfully unlinked plots.", "Merge"), /*
+     * CommandConfig
+     */
+
+    NOT_VALID_SUBCOMMAND("$2That is not a valid subcommand", "CommandConfig"), DID_YOU_MEAN(
+        "$2Did you mean: $1%s", "CommandConfig"),
+
+    NAME_LITTLE("$2%s0 name is too short, $1%s1$2<$1%s3", "CommandConfig"), NO_COMMANDS(
+        "$2I'm sorry, but you're not permitted to use any subcommands.", "CommandConfig"),
+
+    SUBCOMMAND_SET_OPTIONS_HEADER("$2Possible Values: ", "CommandConfig"), COMMAND_SYNTAX(
+        "$1Usage: $2%s", "CommandConfig"), /*
+     * Player not found
+     */
+
+    INVALID_PLAYER_WAIT("$2Player not found: $1%s$2, fetching it. Try again soon.",
+        "Errors"), INVALID_PLAYER("$2Player not found: $1%s$2.", "Errors"),
+
+    INVALID_PLAYER_OFFLINE("$2The player must be online: $1%s.", "Errors"), /*
+     * Command flag
+     */
+
+    INVALID_COMMAND_FLAG("$2Invalid command flag: %s0", "Errors"), /*
+     * Unknown Error
+     */
+
+    ERROR("$2An error occurred: %s",
+        "Errors"), // SETTINGS_PASTE_UPLOADED("$2settings.yml was uploaded to: $1%url%", "Paste"),
+
+    // LATEST_LOG_UPLOADED("$2latest.log was uploaded to: $1%url%", "Paste"),
+    DEBUG_REPORT_CREATED("$1Uploaded a full debug to: $1%url%", "Paste"), /*
+     *
+     */
+
+    COMMAND_WENT_WRONG("$2Something went wrong when executing that command...", "Errors"), /*
+     * purge
+     */
+
+    PURGE_SUCCESS("$4Successfully purged %s plots", "Purge"), /*
+     * trim
+     */
+
+    TRIM_IN_PROGRESS("A world trim task is already in progress!",
+        "Trim"), NOT_VALID_HYBRID_PLOT_WORLD(
+        "The hybrid plot manager is required to perform this action", "Trim"), /*
+     * No <plot>
+     */
+
+    NO_FREE_PLOTS("$2There are no free plots available", "Errors"), NOT_IN_PLOT(
+        "$2You're not in a plot", "Errors"),
+
+    NOT_LOADED("$2The plot could not be loaded", "Errors"), NOT_IN_CLUSTER(
+        "$2You must be within a plot cluster to perform that action", "Errors"),
+
+    NOT_IN_PLOT_WORLD("$2You're not in a plot area", "Errors"), PLOTWORLD_INCOMPATIBLE(
+        "$2The two worlds must be compatible", "Errors"),
+
+    NOT_VALID_WORLD("$2That is not a valid world (case sensitive)", "Errors"), NOT_VALID_PLOT_WORLD(
+        "$2That is not a valid plot area (case sensitive)", "Errors"),
+
+    NO_PLOTS("$2You don't have any plots", "Errors"), /*
+     * Block List
+     */
+
+    BLOCK_LIST_SEPARATER("$1,$2 ", "Block List"), /*
+     * Biome
+     */
+
+    NEED_BIOME("$2You need to specify a valid biome.", "Biome"), BIOME_SET_TO(
+        "$2Plot biome set to $2", "Biome"), /*
+     * Teleport / Entry
+     */
+
+    TELEPORTED_TO_PLOT("$1You have been teleported", "Teleport"), TELEPORTED_TO_ROAD(
+        "$2You got teleported to the road", "Teleport"),
+
+    TELEPORT_IN_SECONDS("$1Teleporting in %s seconds. Do not move...", "Teleport"), TELEPORT_FAILED(
+        "$2Teleportation cancelled due to movement or damage", "Teleport"), /*
+     * Set Block
+     */
+
+    SET_BLOCK_ACTION_FINISHED("$1The last setblock action is now finished.", "Set Block"),
+
+    /*
+    AllowUnsafe
+     */
+    DEBUGALLOWUNSAFE_ON("$2Unsafe actions allowed", "unsafe"), DEBUGALLOWUNSAFE_OFF(
+        "$2Unsafe actions disabled", "unsafe"), /*
+     * Debug
+     */
+
+    DEBUG_HEADER("$1Debug Information&-", "Debug"), DEBUG_SECTION("$2>> $1&l%val%", "Debug"),
+
+    DEBUG_LINE("$2>> $1%var%$2:$1 %val%&-", "Debug"), /*
+     * Invalid
+     */
+
+    NOT_VALID_DATA("$2That's not a valid data id.", "Invalid"), NOT_VALID_BLOCK(
+        "$2That's not a valid block: %s", "Invalid"),
+
+    NOT_ALLOWED_BLOCK("$2That block is not allowed: %s", "Invalid"), NOT_VALID_NUMBER(
+        "$2That's not a valid number within the range: %s", "Invalid"),
+
+    NOT_VALID_PLOT_ID("$2That's not a valid plot id.", "Invalid"), PLOT_ID_FORM(
+        "$2The plot id must be in the form: $1X;Y $2e.g. $1-5;7", "Invalid"),
+
+    NOT_YOUR_PLOT("$2That is not your plot.", "Invalid"), NO_SUCH_PLOT("$2There is no such plot",
+        "Invalid"),
+
+    PLAYER_HAS_NOT_BEEN_ON("$2That player hasn't been in the plotworld", "Invalid"), FOUND_NO_PLOTS(
+        "$2Found no plots with your search query", "Invalid"),
+
+    FOUND_NO_PLOTS_FOR_PLAYER("$2No plots found for player: %s", "Invalid"), /*
+     * Camera
+     */
+
+    CAMERA_STARTED("$2You have entered camera mode for plot $1%s", "Camera"), CAMERA_STOPPED(
+        "$2You are no longer in camera mode", "Camera"), /*
+     * Need
+     */
+
+    NEED_PLOT_NUMBER("$2You've got to specify a plot number or alias", "Need"), NEED_BLOCK(
+        "$2You've got to specify a block", "Need"),
+
+    NEED_PLOT_ID("$2You've got to specify a plot id.", "Need"), NEED_PLOT_WORLD(
+        "$2You've got to specify a plot area.", "Need"),
+
+    NEED_USER("$2You need to specify a username", "Need"), /*
+     * Near
+     */
+
+    PLOT_NEAR("$1Players: %s0", "Near"), /*
+     * Info
+     */
+
+    NONE("None", "Info"), NOW("Now", "Info"),
+
+    NEVER("Never", "Info"), UNKNOWN("Unknown", "Info"),
+
+    EVERYONE("Everyone", "Info"), PLOT_UNOWNED(
+        "$2The current plot must have an owner to perform this action", "Info"),
+
+    PLOT_INFO_UNCLAIMED("$2Plot $1%s$2 is not yet claimed", "Info"), PLOT_INFO_HEADER(
+        "$3&m---------&r $1INFO $3&m---------", false, "Info"),
+
+    PLOT_INFO("$1ID: $2%id%$1&-" + "$1Alias: $2%alias%$1&-" + "$1Owner: $2%owner%$1&-"
+        + "$1Biome: $2%biome%$1&-" + "$1Can Build: $2%build%$1&-" + "$1Rating: $2%rating%&-"
+        + "$1Seen: $2%seen%&-" + "$1Trusted: $2%trusted%$1&-" + "$1Members: $2%members%$1&-"
+        + "$1Denied: $2%denied%$1&-" + "$1Flags: $2%flags%", "Info"), PLOT_INFO_FOOTER(
+        "$3&m---------&r $1INFO $3&m---------", false, "Info"),
+
+    PLOT_INFO_TRUSTED("$1Trusted:$2 %trusted%", "Info"), PLOT_INFO_MEMBERS("$1Members:$2 %members%",
+        "Info"),
+
+    PLOT_INFO_DENIED("$1Denied:$2 %denied%", "Info"), PLOT_INFO_FLAGS("$1Flags:$2 %flags%", "Info"),
+
+    PLOT_INFO_BIOME("$1Biome:$2 %biome%", "Info"), PLOT_INFO_RATING("$1Rating:$2 %rating%", "Info"),
+
+    PLOT_INFO_OWNER("$1Owner:$2 %owner%", "Info"), PLOT_INFO_ID("$1ID:$2 %id%", "Info"),
+
+    PLOT_INFO_ALIAS("$1Alias:$2 %alias%", "Info"), PLOT_INFO_SIZE("$1Size:$2 %size%", "Info"),
+
+    PLOT_INFO_SEEN("$1Seen:$2 %seen%", "Info"), PLOT_USER_LIST(" $1%user%$2,", "Info"),
+
+    PLOT_FLAG_LIST("$1%s0:%s1$2", "Info"), INFO_SYNTAX_CONSOLE("$2/plot info X;Y", "Info"), /*
+     * Generating
+     */
+
+    GENERATING_COMPONENT("$1Started generating component from your settings", "Working"), /*
+     * Clearing
+     */
+
+    CLEARING_PLOT("$2Clearing plot async.", "Working"), CLEARING_DONE(
+        "$4Clear completed! Took %sms.", "Working"),
+
+    DELETING_DONE("$4Delete completed! Took %sms.", "Working"), /*
+     * Claiming
+     */
+
+    PLOT_NOT_CLAIMED("$2Plot not claimed", "Working"), PLOT_IS_CLAIMED(
+        "$2This plot is already claimed", "Working"),
+
+    CLAIMED("$4You successfully claimed the plot", "Working"), /*
+     * List
+     */
+
+    COMMENT_LIST_HEADER_PAGED("$2(Page $1%cur$2/$1%max$2) $1List of %amount% comments",
+        "List"), CLICKABLE(" (interactive)", "List"),
+
+    AREA_LIST_HEADER_PAGED("$2(Page $1%cur$2/$1%max$2) $1List of %amount% areas",
+        "List"), PLOT_LIST_HEADER_PAGED("$2(Page $1%cur$2/$1%max$2) $1List of %amount% plots",
+        "List"),
+
+    PLOT_LIST_HEADER("$1List of %word% plots", "List"), PLOT_LIST_ITEM(
+        "$2>> $1%id$2:$1%world $2- $1%owner", "List"),
+
+    PLOT_LIST_ITEM_ORDERED("$2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner",
+        "List"), PLOT_LIST_FOOTER("$2>> $1%word% a total of $2%num% $1claimed %plot%.", "List"), /*
+     * Left
+     */
+
+    LEFT_PLOT("$2You left a plot", "Left"), /*
+     * Wait
+     */
+
+    WAIT_FOR_TIMER(
+        "$2A setblock timer is bound to either the current plot or you. Please wait for it to finish",
+        "Errors"), /*
+     * Chat
+     */
+
+    PLOT_CHAT_SPY_FORMAT("$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%",
+        "Chat"), PLOT_CHAT_FORMAT("$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%", "Chat"),
+
+    PLOT_CHAT_FORCED("$2This world forces everyone to use plot chat.", "Chat"), PLOT_CHAT_ON(
+        "$4Plot chat enabled.", "Chat"),
+
+    PLOT_CHAT_OFF("$4Plot chat disabled.", "Chat"), /*
+     * Denied
+     */
+
+    DENIED_REMOVED("$4You successfully undenied the player from this plot", "Deny"), DENIED_ADDED(
+        "$4You successfully denied the player from this plot", "Deny"),
+
+    DENIED_NEED_ARGUMENT(
+        "$2Arguments are missing. $1/plot denied add <name> $2or $1/plot denied remove <name>",
+        "Deny"), WAS_NOT_DENIED("$2That player was not denied on this plot", "Deny"),
+
+    YOU_GOT_DENIED(
+        "$4You are denied from the plot you were previously on, and got teleported to spawn",
+        "Deny"), /*
+     * Kick
+     */
+
+    YOU_GOT_KICKED("$4You got kicked!", "Kick"), /*
+     * Rain
+     */
+
+    NEED_ON_OFF("$2You need to specify a value. Possible values: $1on$2, $1off",
+        "Rain"), SETTING_UPDATED("$4You successfully updated the setting", "Rain"), /*
+     * Flag
+     */
+
+    FLAG_KEY("$2Key: %s", "Flag"), FLAG_TYPE("$2Type: %s", "Flag"),
+
+    FLAG_DESC("$2Desc: %s", "Flag"), NOT_VALID_FLAG("$2That is not a valid flag", "Flag"),
+
+    NOT_VALID_FLAG_SUGGESTED("$2That is not a valid flag. Did you mean: $1%s",
+        "Flag"), NOT_VALID_VALUE("$2Flag values must be alphanumerical", "Flag"),
+
+    FLAG_NOT_IN_PLOT("$2The plot does not have that flag", "Flag"), FLAG_NOT_REMOVED(
+        "$2The flag could not be removed", "Flag"),
+
+    FLAG_NOT_ADDED("$2The flag could not be added", "Flag"), FLAG_REMOVED(
+        "$4Successfully removed flag", "Flag"),
+
+    FLAG_ADDED("$4Successfully added flag", "Flag"), FLAG_TUTORIAL_USAGE(
+        "$1Have an admin set the flag: $2%s", "CommandConfig"), /*
+     * Trusted
+     */
+
+    TRUSTED_ADDED("$4You successfully trusted a user to the plot", "Trusted"), TRUSTED_REMOVED(
+        "$4You successfully removed a trusted user from the plot", "Trusted"),
+
+    WAS_NOT_ADDED("$2That player was not trusted on this plot", "Trusted"), PLOT_REMOVED_USER(
+        "$1Plot %s of which you were added to has been deleted due to owner inactivity",
+        "Trusted"), /*
+     * Member
+     */
+
+    REMOVED_PLAYERS("$2Removed %s players from this plot.", "Member"), ALREADY_OWNER(
+        "$2That user is already the plot owner: %s0", "Member"),
+
+    ALREADY_ADDED("$2That user is already added to that category: %s0", "Member"), MEMBER_ADDED(
+        "$4That user can now build while the plot owner is online", "Member"),
+
+    MEMBER_REMOVED("$1You successfully removed a user from the plot",
+        "Member"), MEMBER_WAS_NOT_ADDED("$2That player was not added as a user on this plot",
+        "Member"),
+
+    PLOT_MAX_MEMBERS("$2You are not allowed to add any more players to this plot", "Member"), /*
+     * Set Owner
+     */
+
+    SET_OWNER("$4You successfully set the plot owner", "Owner"), SET_OWNER_CANCELLED(
+        "$2The setowner action was cancelled", "Owner"),
+
+    NOW_OWNER("$4You are now owner of plot %s", "Owner"), /*
+     * Signs
+     */
+
+    OWNER_SIGN_LINE_1("$1ID: $1%id%", "Signs"), OWNER_SIGN_LINE_2("$1Owner:", "Signs"),
+
+    OWNER_SIGN_LINE_3("$2%plr%", "Signs"), OWNER_SIGN_LINE_4("$3Claimed", "Signs"), /*
+     * Help
+     */
+
+    HELP_HEADER("$3&m---------&r $1Plot\u00B2 Help $3&m---------", "Help"), HELP_PAGE_HEADER(
+        "$1Category: $2%category%$2,$1 Page: $2%current%$3/$2%max%$2", "Help"),
+
+    HELP_FOOTER("$3&m---------&r $1Plot\u00B2 Help $3&m---------", "Help"),
+
+    HELP_INFO_ITEM("$1/plot help %category% $3- $2%category_desc%", "Help"), HELP_ITEM(
+        "$1%usage% [%alias%]&- $3- $2%desc%&-", "Help"),
+
+    BUCKET_ENTRIES_IGNORED(
+        "$2Total bucket values add up to 1 or more. Blocks without a spcified chance will be ignored",
+        "Generator_Bucket"),
+
+    /*
+     * Direction
+     */
+
+    DIRECTION("$1Current direction: %dir%", "Help"), /*
+     * Grant
+     */
+
+    GRANTED_PLOTS("$1Result: $2%s $1grants left", "Grants"), GRANTED_PLOT(
+        "$1You granted %s0 plot to $2%s1", "Grants"),
+
+    GRANTED_PLOT_FAILED("$1Grant failed: $2%s", "Grants"), /*
+     * Custom
+     */
+
+    /**
+     * Legacy Configuration Conversion
+     */
+    LEGACY_CONFIG_FOUND("A legacy configuration file was detected. Conversion will be attempted.",
+        "LegacyConfig"), LEGACY_CONFIG_BACKUP(
+        "A copy of worlds.yml $1have been saved in the file worlds.yml.old$1.",
+        "LegacyConfig"), LEGACY_CONFIG_REPLACED("> %s has been replaced with %s",
+        "LegacyConfig"), LEGACY_CONFIG_DONE(
+        "The conversion has finished. PlotSquared will now be disabled and the new configuration file will"
+            + " be used at next startup. Please review the new worlds.yml file. "
+            + "Please note that schematics will not be converted, as we are now using WorldEdit to handle schematics. "
+            + "You need to re-generate the schematics.",
+        "LegacyConfig"), LEGACY_CONFIG_CONVERSION_FAILED(
+        "Failed to convert the legacy configuration file. See stack trace for information.",
+        "LegacyConfig"),
+
+    CUSTOM_STRING("-", "-");
+
+    public static final HashMap<String, String> replacements = new HashMap<>();
+
+    /**
+     * Default.
+     */
+    private final String def;
+    /**
+     * What locale category should this translation fall under.
+     */
+    private final String category;
+    /**
+     * Should the string be prefixed.
+     */
+    private final boolean prefix;
+    /**
+     * Translated.
+     */
+    private String s;
+
+    /**
+     * Constructor.
+     *
+     * @param def    default
+     * @param prefix use prefix
+     */
+    C(String def, boolean prefix, String category) {
+        this.def = def;
+        this.s = def;
+        this.prefix = prefix;
+        this.category = category.toLowerCase();
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param def default
+     */
+    C(String def, String category) {
+        this(def, true, category.toLowerCase());
+    }
+
+    public static String format(String m, Object... args) {
+        if (args.length == 0) {
+            return m;
+        }
+        Map<String, String> map = new LinkedHashMap<>();
+        if (args.length > 0) {
+            for (int i = args.length - 1; i >= 0; i--) {
+                String arg = "" + args[i];
+                if (arg == null || arg.isEmpty()) {
+                    map.put("%s" + i, "");
+                } else {
+                    arg = C.color(arg);
+                    map.put("%s" + i, arg);
+                }
+                if (i == 0) {
+                    map.put("%s", arg);
+                }
+            }
+        }
+        m = StringMan.replaceFromMap(m, map);
+        return m;
+    }
+
+    public static String format(C caption, Object... args) {
+        if (caption.usePrefix() && caption.s.length() > 0) {
+            return C.PREFIX.s() + format(caption.s, args);
+        } else {
+            return format(caption.s, args);
+        }
+    }
+
+    public static String color(String string) {
+        return StringMan.replaceFromMap(string, replacements);
+    }
+
+    public static void load(File file) {
+        try {
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                file.createNewFile();
+            }
+            YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
+            Set<String> keys = yml.getKeys(true);
+            EnumSet<C> allEnums = EnumSet.allOf(C.class);
+            HashSet<String> allNames = new HashSet<>();
+            HashSet<String> categories = new HashSet<>();
+            HashSet<String> toRemove = new HashSet<>();
+            for (C caption : allEnums) {
+                allNames.add(caption.name());
+                categories.add(caption.category.toLowerCase());
+            }
+            HashSet<C> captions = new HashSet<>();
+            boolean changed = false;
+            for (String key : keys) {
+                if (!yml.isString(key)) {
+                    if (!categories.contains(key)) {
+                        toRemove.add(key);
+                    }
+                    continue;
+                }
+                String[] split = key.split("\\.");
+                String node = split[split.length - 1].toUpperCase();
+                C caption;
+                if (allNames.contains(node)) {
+                    caption = valueOf(node);
+                } else {
+                    caption = null;
+                }
+                if (caption != null) {
+                    if (caption.category.startsWith("static")) {
+                        continue;
+                    }
+                    String value = yml.getString(key);
+                    if (!split[0].equalsIgnoreCase(caption.category)) {
+                        changed = true;
+                        yml.set(key, null);
+                        yml.set(caption.category + '.' + caption.name().toLowerCase(), value);
+                    }
+                    captions.add(caption);
+                    caption.s = value;
+                } else {
+                    toRemove.add(key);
+                }
+            }
+            for (String remove : toRemove) {
+                changed = true;
+                yml.set(remove, null);
+            }
+            ConfigurationSection config = PlotSquared.get().style.getConfigurationSection("color");
+            Set<String> styles = config.getKeys(false);
+            // HashMap<String, String> replacements = new HashMap<>();
+            replacements.clear();
+            for (String style : styles) {
+                replacements.put('$' + style, '\u00A7' + config.getString(style));
+            }
+            for (char letter : "1234567890abcdefklmnor".toCharArray()) {
+                replacements.put("&" + letter, "\u00a7" + letter);
+            }
+            replacements.put("\\\\n", "\n");
+            replacements.put("\\n", "\n");
+            replacements.put("&-", "\n");
+            for (C caption : allEnums) {
+                if (!captions.contains(caption)) {
+                    if (caption.getCategory().startsWith("static")) {
+                        continue;
+                    }
+                    changed = true;
+                    yml.set(caption.category + '.' + caption.name().toLowerCase(), caption.def);
+                }
+                caption.s = StringMan.replaceFromMap(caption.s, replacements);
+            }
+            if (changed) {
+                yml.save(file);
+            }
+        } catch (IOException | IllegalArgumentException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String f(final Object... args) {
+        return format(s(), args);
+    }
+
+    @Override public String toString() {
+        return this.s;
+    }
+
+    public String s() {
+        return this.s;
+    }
+
+    public boolean usePrefix() {
+        return this.prefix;
+    }
+
+    public String formatted() {
+        return StringMan.replaceFromMap(s(), replacements);
+    }
+
+    public String getCategory() {
+        return this.category;
+    }
+
+    public void send(CommandCaller caller, String... args) {
+        send(caller, (Object[]) args);
+    }
+
+    public void send(CommandCaller caller, Object... args) {
+        String msg = format(this, args);
+        if (caller == null) {
+            PlotSquared.log(msg);
+        } else {
+            caller.sendMessage(msg);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
new file mode 100644
index 000000000..82992e265
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
@@ -0,0 +1,440 @@
+package com.github.intellectualsites.plotsquared.plot.config;
+
+import com.github.intellectualsites.plotsquared.configuration.MemorySection;
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.io.File;
+import java.io.PrintWriter;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+public class Config {
+
+    /**
+     * Get the value for a node<br>
+     * Probably throws some error if you try to get a non existent key
+     *
+     * @param key
+     * @param root
+     * @param <T>
+     * @return
+     */
+    public static <T> T get(String key, Class root) {
+        String[] split = key.split("\\.");
+        Object instance = getInstance(split, root);
+        if (instance != null) {
+            Field field = getField(split, instance);
+            if (field != null) {
+                try {
+                    return (T) field.get(instance);
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        PlotSquared.debug("Failed to get config option: " + key);
+        return null;
+    }
+
+    /**
+     * Set the value of a specific node<br>
+     * Probably throws some error if you supply non existing keys or invalid values
+     *
+     * @param key   config node
+     * @param value value
+     * @param root
+     */
+    public static void set(String key, Object value, Class root) {
+        String[] split = key.split("\\.");
+        Object instance = getInstance(split, root);
+        if (instance != null) {
+            Field field = getField(split, instance);
+            if (field != null) {
+                try {
+                    if (field.getAnnotation(Final.class) != null) {
+                        return;
+                    }
+                    if (field.getType() == String.class && !(value instanceof String)) {
+                        value = value + "";
+                    }
+                    field.set(instance, value);
+                    return;
+                } catch (Throwable e) {
+                    PlotSquared.debug(
+                        "Invalid configuration value: " + key + ": " + value + " in " + root
+                            .getSimpleName());
+                    e.printStackTrace();
+                }
+            }
+        }
+        PlotSquared.debug("Failed to set config option: " + key + ": " + value + " | " + instance);
+    }
+
+    public static boolean load(File file, Class root) {
+        if (!file.exists()) {
+            return false;
+        }
+        YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
+        for (String key : yml.getKeys(true)) {
+            Object value = yml.get(key);
+            if (value instanceof MemorySection) {
+                continue;
+            }
+            set(key, value, root);
+        }
+        return true;
+    }
+
+    /**
+     * Set all values in the file (load first to avoid overwriting)
+     *
+     * @param file
+     * @param root
+     */
+    public static void save(File file, Class root) {
+        try {
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                file.createNewFile();
+            }
+            PrintWriter writer = new PrintWriter(file);
+            Object instance = root.newInstance();
+            save(writer, root, instance, 0);
+            writer.close();
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Get the static fields in a section.
+     *
+     * @param clazz
+     * @return
+     */
+    public static Map<String, Object> getFields(Class clazz) {
+        HashMap<String, Object> map = new HashMap<>();
+        for (Field field : clazz.getFields()) {
+            if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
+                try {
+                    map.put(toNodeName(field.getName()), field.get(null));
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return map;
+    }
+
+    private static String toYamlString(Object value, String spacing) {
+        if (value instanceof List) {
+            Collection<?> listValue = (Collection<?>) value;
+            if (listValue.isEmpty()) {
+                return "[]";
+            }
+            StringBuilder m = new StringBuilder();
+            for (Object obj : listValue) {
+                m.append(System.lineSeparator() + spacing + "- " + toYamlString(obj, spacing));
+            }
+            return m.toString();
+        }
+        if (value instanceof String) {
+            String stringValue = (String) value;
+            if (stringValue.isEmpty()) {
+                return "''";
+            }
+            return "\"" + stringValue + "\"";
+        }
+        return value != null ? value.toString() : "null";
+    }
+
+    private static void save(PrintWriter writer, Class clazz, Object instance, int indent) {
+        try {
+            String lineSeparator = System.lineSeparator();
+            String spacing = StringMan.repeat(" ", indent);
+            for (Field field : clazz.getFields()) {
+                if (field.getAnnotation(Ignore.class) != null) {
+                    continue;
+                }
+                Comment comment = field.getAnnotation(Comment.class);
+                if (comment != null) {
+                    for (String commentLine : comment.value()) {
+                        writer.write(spacing + "# " + commentLine + lineSeparator);
+                    }
+                }
+                Create create = field.getAnnotation(Create.class);
+                if (create != null) {
+                    Object value = field.get(instance);
+                    if (value == null && field.getType() != ConfigBlock.class) {
+                        setAccessible(field);
+                        Class<?>[] classes = clazz.getDeclaredClasses();
+                        for (Class current : classes) {
+                            if (StringMan.isEqual(current.getSimpleName(), field.getName())) {
+                                field.set(instance, current.newInstance());
+                                break;
+                            }
+                        }
+                    }
+                    continue;
+                } else {
+                    writer.write(spacing + toNodeName(field.getName() + ": ") + toYamlString(
+                        field.get(instance), spacing) + lineSeparator);
+                }
+            }
+            for (Class<?> current : clazz.getClasses()) {
+                if (current.isInterface() || current.getAnnotation(Ignore.class) != null) {
+                    continue;
+                }
+                if (indent == 0) {
+                    writer.write(lineSeparator);
+                }
+                Comment comment = current.getAnnotation(Comment.class);
+                if (comment != null) {
+                    for (String commentLine : comment.value()) {
+                        writer.write(spacing + "# " + commentLine + lineSeparator);
+                    }
+                }
+                writer.write(spacing + toNodeName(current.getSimpleName()) + ":" + lineSeparator);
+                BlockName blockNames = current.getAnnotation(BlockName.class);
+                if (blockNames != null) {
+                    Field instanceField =
+                        clazz.getDeclaredField(toFieldName(current.getSimpleName()));
+                    setAccessible(instanceField);
+                    ConfigBlock value = (ConfigBlock) instanceField.get(instance);
+                    if (value == null) {
+                        value = new ConfigBlock();
+                        instanceField.set(instance, value);
+                        for (String blockName : blockNames.value()) {
+                            value.put(blockName, current.newInstance());
+                        }
+                    }
+                    // Save each instance
+                    for (Map.Entry<String, Object> entry : ((Map<String, Object>) value.getRaw())
+                        .entrySet()) {
+                        String key = entry.getKey();
+                        writer.write(spacing + "  " + toNodeName(key) + ":" + lineSeparator);
+                        save(writer, current, entry.getValue(), indent + 4);
+                    }
+                    continue;
+                } else {
+                    save(writer, current, current.newInstance(), indent + 2);
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Get the field for a specific config node.
+     *
+     * @param split the node (split by period)
+     * @param root
+     * @return
+     */
+    private static Field getField(String[] split, Class root) {
+        Object instance = getInstance(split, root);
+        if (instance == null) {
+            return null;
+        }
+        return getField(split, instance);
+    }
+
+    /**
+     * Get the field for a specific config node and instance<br>
+     * Note: As expiry can have multiple blocks there will be multiple instances
+     *
+     * @param split    the node (split by period)
+     * @param instance the instance
+     * @return
+     */
+    private static Field getField(String[] split, Object instance) {
+        try {
+            Field field = instance.getClass().getField(toFieldName(split[split.length - 1]));
+            setAccessible(field);
+            return field;
+        } catch (Throwable e) {
+            PlotSquared.debug(
+                "Invalid config field: " + StringMan.join(split, ".") + " for " + toNodeName(
+                    instance.getClass().getSimpleName()));
+            return null;
+        }
+    }
+
+    /**
+     * Get the instance for a specific config node.
+     *
+     * @param split the node (split by period)
+     * @param root
+     * @return The instance or null
+     */
+    private static Object getInstance(String[] split, Class root) {
+        try {
+            Class<?> clazz = root == null ? MethodHandles.lookup().lookupClass() : root;
+            Object instance = clazz.newInstance();
+            while (split.length > 0) {
+                switch (split.length) {
+                    case 1:
+                        return instance;
+                    default:
+                        Class found = null;
+                        Class<?>[] classes = clazz.getDeclaredClasses();
+                        for (Class current : classes) {
+                            if (current.getSimpleName().equalsIgnoreCase(toFieldName(split[0]))) {
+                                found = current;
+                                break;
+                            }
+                        }
+                        try {
+                            Field instanceField = clazz.getDeclaredField(toFieldName(split[0]));
+                            setAccessible(instanceField);
+                            if (instanceField.getType() != ConfigBlock.class) {
+                                Object value = instanceField.get(instance);
+                                if (value == null) {
+                                    value = found.newInstance();
+                                    instanceField.set(instance, value);
+                                }
+                                clazz = found;
+                                instance = value;
+                                split = Arrays.copyOfRange(split, 1, split.length);
+                                continue;
+                            }
+                            ConfigBlock value = (ConfigBlock) instanceField.get(instance);
+                            if (value == null) {
+                                value = new ConfigBlock();
+                                instanceField.set(instance, value);
+                            }
+                            instance = value.get(split[1]);
+                            if (instance == null) {
+                                instance = found.newInstance();
+                                value.put(split[1], instance);
+                            }
+                            clazz = found;
+                            split = Arrays.copyOfRange(split, 2, split.length);
+                            continue;
+                        } catch (NoSuchFieldException ignore) {
+                        }
+                        if (found != null) {
+                            split = Arrays.copyOfRange(split, 1, split.length);
+                            clazz = found;
+                            instance = clazz.newInstance();
+                            continue;
+                        }
+                        return null;
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * Translate a node to a java field name.
+     *
+     * @param node
+     * @return
+     */
+    private static String toFieldName(String node) {
+        return node.toUpperCase().replaceAll("-", "_");
+    }
+
+    /**
+     * Translate a field to a config node.
+     *
+     * @param field
+     * @return
+     */
+    private static String toNodeName(String field) {
+        return field.toLowerCase().replace("_", "-");
+    }
+
+    /**
+     * Set some field to be accessible.
+     *
+     * @param field
+     * @throws NoSuchFieldException
+     * @throws IllegalAccessException
+     */
+    private static void setAccessible(Field field)
+        throws NoSuchFieldException, IllegalAccessException {
+        field.setAccessible(true);
+        Field modifiersField = Field.class.getDeclaredField("modifiers");
+        modifiersField.setAccessible(true);
+        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+    }
+
+    /**
+     * Indicates that a field should be instantiated / created.
+     */
+    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) public @interface Create {
+    }
+
+
+    /**
+     * Indicates that a field cannot be modified.
+     */
+    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) public @interface Final {
+    }
+
+
+    /**
+     * Creates a comment.
+     */
+    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
+    public @interface Comment {
+        String[] value();
+    }
+
+
+    /**
+     * The names of any default blocks.
+     */
+    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
+    public @interface BlockName {
+        String[] value();
+    }
+
+
+    /**
+     * Any field or class with is not part of the config.
+     */
+    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
+    public @interface Ignore {
+    }
+
+
+    @Ignore // This is not part of the config
+    public static class ConfigBlock<T> {
+
+        private HashMap<String, T> INSTANCES = new HashMap<>();
+
+        public T get(String key) {
+            return INSTANCES.get(key);
+        }
+
+        public void put(String key, T value) {
+            INSTANCES.put(key, value);
+        }
+
+        public Collection<T> getInstances() {
+            return INSTANCES.values();
+        }
+
+        public Collection<String> getSections() {
+            return INSTANCES.keySet();
+        }
+
+        private Map<String, T> getRaw() {
+            return INSTANCES;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
new file mode 100644
index 000000000..3d636e0dd
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
@@ -0,0 +1,174 @@
+package com.github.intellectualsites.plotsquared.plot.config;
+
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import lombok.Getter;
+import lombok.NonNull;
+
+/**
+ * Main Configuration Utility
+ */
+public class Configuration {
+
+    public static final SettingValue<Integer> INTEGER = new SettingValue<Integer>("INTEGER") {
+        @Override public boolean validateValue(String string) {
+            try {
+                Integer.parseInt(string);
+                return true;
+            } catch (NumberFormatException ignored) {
+                return false;
+            }
+        }
+
+        @Override public Integer parseString(String string) {
+            return Integer.parseInt(string);
+        }
+    };
+    public static final SettingValue<Boolean> BOOLEAN = new SettingValue<Boolean>("BOOLEAN") {
+        @Override public boolean validateValue(String string) {
+            //noinspection ResultOfMethodCallIgnored
+            Boolean.parseBoolean(string);
+            return true;
+        }
+
+        @Override public Boolean parseString(String string) {
+            return Boolean.parseBoolean(string);
+        }
+    };
+    public static final SettingValue<String> BIOME = new SettingValue<String>("BIOME") {
+        @Override public boolean validateValue(String string) {
+            try {
+                int biome = WorldUtil.IMP.getBiomeFromString(string.toUpperCase());
+                return biome != -1;
+            } catch (Exception ignored) {
+                return false;
+            }
+        }
+
+        @Override public String parseString(String string) {
+            if (validateValue(string)) {
+                return string.toUpperCase();
+            }
+            return "FOREST";
+        }
+    };
+
+    public static final SettingValue<BlockBucket> BLOCK_BUCKET =
+        new SettingValue<BlockBucket>("BLOCK_BUCKET") {
+            @Override public BlockBucket parseString(final String string) {
+                if (string == null || string.isEmpty()) {
+                    return new BlockBucket();
+                }
+                final BlockBucket blockBucket = new BlockBucket();
+                final String[] parts = string.split(",");
+                for (final String part : parts) {
+                    String block;
+                    int chance = -1;
+
+                    if (part.contains(":")) {
+                        final String[] innerParts = part.split(":");
+                        if (innerParts.length > 1) {
+                            chance = Integer.parseInt(innerParts[1]);
+                        }
+                        block = innerParts[0];
+                    } else {
+                        block = part;
+                    }
+                    final StringComparison<PlotBlock>.ComparisonResult value =
+                        WorldUtil.IMP.getClosestBlock(block);
+                    if (value == null) {
+                        throw new UnknownBlockException(block);
+                    } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir()
+                        && !WorldUtil.IMP.isBlockSolid(value.best)) {
+                        throw new UnsafeBlockException(value.best);
+                    }
+                    blockBucket.addBlock(value.best, chance);
+                }
+                blockBucket.compile(); // Pre-compile :D
+                return blockBucket;
+            }
+
+            @Override public boolean validateValue(final String string) {
+                try {
+                    if (string == null || string.isEmpty()) {
+                        return false;
+                    }
+                    final String[] parts = string.split(",");
+                    for (final String part : parts) {
+                        String block;
+                        if (part.contains(":")) {
+                            final String[] innerParts = part.split(":");
+                            if (innerParts.length > 1) {
+                                final int chance = Integer.parseInt(innerParts[1]);
+                                if (chance < 1 || chance > 100) {
+                                    return false;
+                                }
+                            }
+                            block = innerParts[0];
+                        } else {
+                            block = part;
+                        }
+                        StringComparison<PlotBlock>.ComparisonResult value =
+                            WorldUtil.IMP.getClosestBlock(block);
+                        if (value == null || value.match > 1) {
+                            return false;
+                        } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir()
+                            && !WorldUtil.IMP.isBlockSolid(value.best)) {
+                            throw new UnsafeBlockException(value.best);
+                        }
+                    }
+                } catch (final Throwable exception) {
+                    return false;
+                }
+                return true;
+            }
+        };
+
+
+    public static final class UnknownBlockException extends IllegalArgumentException {
+
+        @Getter private final String unknownValue;
+
+        UnknownBlockException(@NonNull final String unknownValue) {
+            super(String.format("\"%s\" is not a valid block", unknownValue));
+            this.unknownValue = unknownValue;
+        }
+
+    }
+
+
+    /**
+     * Create your own SettingValue object to make the management of plotworld configuration easier
+     */
+    public abstract static class SettingValue<T> {
+
+        private final String type;
+
+        SettingValue(String type) {
+            this.type = type;
+        }
+
+        public String getType() {
+            return this.type;
+        }
+
+        public abstract T parseString(String string);
+
+        public abstract boolean validateValue(String string);
+    }
+
+
+    public static final class UnsafeBlockException extends IllegalArgumentException {
+
+        @Getter private final PlotBlock unsafeBlock;
+
+        UnsafeBlockException(@NonNull final PlotBlock unsafeBlock) {
+            super(String.format("%s is not a valid block", unsafeBlock));
+            this.unsafeBlock = unsafeBlock;
+        }
+
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java
new file mode 100644
index 000000000..31539d5c2
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java
@@ -0,0 +1,89 @@
+package com.github.intellectualsites.plotsquared.plot.config;
+
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Configuration Node.
+ */
+public class ConfigurationNode {
+
+    private final String constant;
+    private final Object defaultValue;
+    private final String description;
+    private final Configuration.SettingValue type;
+    private Object value;
+
+    public ConfigurationNode(String constant, Object defaultValue, String description,
+        Configuration.SettingValue type) {
+        this.constant = constant;
+        this.defaultValue = defaultValue;
+        this.description = description;
+        this.value = defaultValue;
+        this.type = type;
+    }
+
+    public Configuration.SettingValue getType() {
+        return this.type;
+    }
+
+    public boolean isValid(String string) {
+        try {
+            Object result = this.type.parseString(string);
+            return result != null;
+        } catch (Exception e) {
+            if (e instanceof Configuration.UnknownBlockException) {
+                throw e;
+            }
+            return false;
+        }
+    }
+
+    public boolean setValue(String string) {
+        if (!this.type.validateValue(string)) {
+            return false;
+        }
+        this.value = this.type.parseString(string);
+        return true;
+    }
+
+    public Object getValue() {
+        if (this.value instanceof String[]) {
+            return Arrays.asList((String[]) this.value);
+        }
+        if (this.value instanceof Object[]) {
+            List<String> values = new ArrayList<>();
+            for (Object value : (Object[]) this.value) {
+                values.add(value.toString());
+            }
+            return values;
+        }
+        if (this.value instanceof BlockBucket) {
+            return this.value.toString();
+        }
+        if (this.value instanceof PlotBlock) {
+            return this.value.toString();
+        }
+        return this.value;
+    }
+
+    public String getConstant() {
+        return this.constant;
+    }
+
+    public Object getDefaultValue() {
+        if (this.defaultValue instanceof Object[]) {
+            return StringMan.join((Object[]) this.defaultValue, ",");
+        }
+        return this.defaultValue;
+    }
+
+    public String getDescription() {
+        return this.description;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
new file mode 100644
index 000000000..1f7f6a88d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -0,0 +1,357 @@
+package com.github.intellectualsites.plotsquared.plot.config;
+
+import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Settings extends Config {
+
+    /*
+    START OF CONFIGURATION SECTION:
+    NOTE: Fields are saved in declaration order, classes in reverse order
+     */
+
+    @Comment("These first 7 aren't configurable") // This is a comment
+    @Final // Indicates that this value isn't configurable
+    public static final String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues";
+    @Final public static final String SUGGESTION =
+        "https://github.com/IntellectualSites/PlotSquaredSuggestions";
+    @Final public static final String WIKI =
+        "https://github.com/IntellectualSites/PlotSquared/wiki";
+    @Final public static String DATE; // These values are set from P2 before loading
+    @Final public static String BUILD; // These values are set from P2 before loading
+    @Final public static String COMMIT; // These values are set from P2 before loading
+    @Final public static String PLATFORM; // These values are set from P2 before loading
+
+    @Comment("Show additional information in console") public static boolean DEBUG = true;
+    @Comment({"The big annoying text that appears when you enter a plot",
+        "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"})
+    public static boolean TITLES = true;
+
+    @Create // This value will be generated automatically
+    public static ConfigBlock<Auto_Clear> AUTO_CLEAR = null;
+    // A ConfigBlock is a section that can have multiple instances e.g. multiple expiry tasks
+
+    public static void save(File file) {
+        save(file, Settings.class);
+    }
+
+    public static void load(File file) {
+        load(file, Settings.class);
+    }
+
+    public static boolean convertLegacy(File file) {
+        if (!file.exists()) {
+            return false;
+        }
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
+
+        // Protection
+        Redstone.DISABLE_OFFLINE = config.getBoolean("protection.redstone.disable-offline");
+        Redstone.DISABLE_UNOCCUPIED = config
+            .getBoolean("protection.redstone.disable-unoccupied", Redstone.DISABLE_UNOCCUPIED);
+
+        // UUID
+        UUID.USE_SQLUUIDHANDLER =
+            config.getBoolean("uuid.use_sqluuidhandler", UUID.USE_SQLUUIDHANDLER);
+        UUID.OFFLINE = config.getBoolean("UUID.offline", UUID.OFFLINE);
+        UUID.FORCE_LOWERCASE = config.getBoolean("UUID.force-lowercase", UUID.FORCE_LOWERCASE);
+
+        // Mob stuff
+        Enabled_Components.KILL_ROAD_MOBS =
+            config.getBoolean("kill_road_mobs", Enabled_Components.KILL_ROAD_MOBS);
+        Enabled_Components.KILL_ROAD_VEHICLES =
+            config.getBoolean("kill_road_vehicles", Enabled_Components.KILL_ROAD_VEHICLES);
+
+        // Clearing + Expiry
+        //FAST_CLEAR = config.getBoolean("clear.fastmode");
+        Enabled_Components.PLOT_EXPIRY =
+            config.getBoolean("clear.auto.enabled", Enabled_Components.PLOT_EXPIRY);
+        if (Enabled_Components.PLOT_EXPIRY) {
+            Enabled_Components.BAN_DELETER = config.getBoolean("clear.on.ban");
+            AUTO_CLEAR = new ConfigBlock<>();
+            AUTO_CLEAR.put("task1", new Auto_Clear());
+            Auto_Clear task = AUTO_CLEAR.get("task1");
+            task.CALIBRATION = new Auto_Clear.CALIBRATION();
+
+            task.DAYS = config.getInt("clear.auto.days", task.DAYS);
+            task.THRESHOLD = config.getInt("clear.auto.threshold", task.THRESHOLD);
+            task.CONFIRMATION = config.getBoolean("clear.auto.confirmation", task.CONFIRMATION);
+            task.CALIBRATION.CHANGES =
+                config.getInt("clear.auto.calibration.changes", task.CALIBRATION.CHANGES);
+            task.CALIBRATION.FACES =
+                config.getInt("clear.auto.calibration.faces", task.CALIBRATION.FACES);
+            task.CALIBRATION.DATA =
+                config.getInt("clear.auto.calibration.data", task.CALIBRATION.DATA);
+            task.CALIBRATION.AIR =
+                config.getInt("clear.auto.calibration.air", task.CALIBRATION.AIR);
+            task.CALIBRATION.VARIETY =
+                config.getInt("clear.auto.calibration.variety", task.CALIBRATION.VARIETY);
+            task.CALIBRATION.CHANGES_SD =
+                config.getInt("clear.auto.calibration.changes_sd", task.CALIBRATION.CHANGES_SD);
+            task.CALIBRATION.FACES_SD =
+                config.getInt("clear.auto.calibration.faces_sd", task.CALIBRATION.FACES_SD);
+            task.CALIBRATION.DATA_SD =
+                config.getInt("clear.auto.calibration.data_sd", task.CALIBRATION.DATA_SD);
+            task.CALIBRATION.AIR_SD =
+                config.getInt("clear.auto.calibration.air_sd", task.CALIBRATION.AIR_SD);
+            task.CALIBRATION.VARIETY_SD =
+                config.getInt("clear.auto.calibration.variety_sd", task.CALIBRATION.VARIETY_SD);
+        }
+
+        // Done
+        Done.REQUIRED_FOR_RATINGS =
+            config.getBoolean("approval.ratings.check-done", Done.REQUIRED_FOR_RATINGS);
+        Done.COUNTS_TOWARDS_LIMIT =
+            config.getBoolean("approval.done.counts-towards-limit", Done.COUNTS_TOWARDS_LIMIT);
+        Done.RESTRICT_BUILDING =
+            config.getBoolean("approval.done.restrict-building", Done.RESTRICT_BUILDING);
+        Done.REQUIRED_FOR_DOWNLOAD =
+            config.getBoolean("approval.done.required-for-download", Done.REQUIRED_FOR_DOWNLOAD);
+
+        // Schematics
+        Paths.SCHEMATICS = config.getString("schematics.save_path", Paths.SCHEMATICS);
+
+        // Web
+        Web.URL = config.getString("web.url", Web.URL);
+
+        // Caching
+        Enabled_Components.PERMISSION_CACHE =
+            config.getBoolean("cache.permissions", Enabled_Components.PERMISSION_CACHE);
+        Enabled_Components.RATING_CACHE =
+            config.getBoolean("cache.ratings", Enabled_Components.RATING_CACHE);
+
+        // Rating system
+        Ratings.CATEGORIES = config.contains("ratings.categories") ?
+            config.getStringList("ratings.categories") :
+            Ratings.CATEGORIES;
+
+        // Titles
+        TITLES = config.getBoolean("titles", TITLES);
+
+        // Teleportation
+        Teleport.DELAY = config.getInt("teleport.delay", Teleport.DELAY);
+        Teleport.ON_LOGIN = config.getBoolean("teleport.on_login", Teleport.ON_LOGIN);
+        Teleport.ON_DEATH = config.getBoolean("teleport.on_death", Teleport.ON_DEATH);
+
+        // WorldEdit
+        //WE_ALLOW_HELPER = config.getBoolean("worldedit.enable-for-helpers");
+
+        // Chunk processor
+        Enabled_Components.CHUNK_PROCESSOR =
+            config.getBoolean("chunk-processor.enabled", Enabled_Components.CHUNK_PROCESSOR);
+        Chunk_Processor.AUTO_TRIM =
+            config.getBoolean("chunk-processor.auto-unload", Chunk_Processor.AUTO_TRIM);
+        Chunk_Processor.MAX_TILES =
+            config.getInt("chunk-processor.max-blockstates", Chunk_Processor.MAX_TILES);
+        Chunk_Processor.MAX_ENTITIES =
+            config.getInt("chunk-processor.max-entities", Chunk_Processor.MAX_ENTITIES);
+        Chunk_Processor.DISABLE_PHYSICS =
+            config.getBoolean("chunk-processor.disable-physics", Chunk_Processor.DISABLE_PHYSICS);
+
+        // Comments
+        Enabled_Components.COMMENT_NOTIFIER = config
+            .getBoolean("comments.notifications.enabled", Enabled_Components.COMMENT_NOTIFIER);
+
+        // Plot limits
+        Claim.MAX_AUTO_AREA = config.getInt("claim.max-auto-area", Claim.MAX_AUTO_AREA);
+        Limit.MAX_PLOTS = config.getInt("max_plots", Limit.MAX_PLOTS);
+        Limit.GLOBAL = config.getBoolean("global_limit", Limit.GLOBAL);
+
+        // Misc
+        DEBUG = config.getBoolean("debug", DEBUG);
+        Chat.CONSOLE_COLOR = config.getBoolean("console.color", Chat.CONSOLE_COLOR);
+        Chat.INTERACTIVE = config.getBoolean("chat.fancy", Chat.INTERACTIVE);
+
+        Enabled_Components.METRICS = config.getBoolean("metrics", Enabled_Components.METRICS);
+        Enabled_Components.UPDATER =
+            config.getBoolean("update-notifications", Enabled_Components.UPDATER);
+        Enabled_Components.DATABASE_PURGER =
+            config.getBoolean("auto-purge", Enabled_Components.DATABASE_PURGER);
+        return true;
+    }
+
+    @Comment("This is an auto clearing task called `task1`") @BlockName("task1")
+    // The name for the default block
+    public static final class Auto_Clear extends ConfigBlock {
+        @Create // This value has to be generated since an instance isn't static
+        public CALIBRATION CALIBRATION = null;
+        public int THRESHOLD = 1;
+        public int REQUIRED_PLOTS = -1;
+        public boolean CONFIRMATION = true;
+        public int DAYS = 7;
+        public int SKIP_ACCOUNT_AGE_DAYS = -1;
+        public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
+
+
+        @Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis")
+        public static final class CALIBRATION {
+            public int VARIETY = 0;
+            public int VARIETY_SD = 0;
+            public int CHANGES = 0;
+            public int CHANGES_SD = 1;
+            public int FACES = 0;
+            public int FACES_SD = 0;
+            public int DATA_SD = 0;
+            public int AIR = 0;
+            public int AIR_SD = 0;
+            public int DATA = 0;
+        }
+    }
+
+
+    public static class Chunk_Processor {
+        @Comment("Auto trim will not save chunks which aren't claimed") public static boolean
+            AUTO_TRIM = false;
+        @Comment("Max tile entities per chunk") public static int MAX_TILES = 4096;
+        @Comment("Max entities per chunk") public static int MAX_ENTITIES = 512;
+        @Comment("Disable block physics") public static boolean DISABLE_PHYSICS = false;
+    }
+
+
+    public static class UUID {
+        @Comment("Force using offline UUIDs (it usually detects the right mode)")
+        public static boolean OFFLINE = false;
+        @Comment("Force using lowercase UUIDs") public static boolean FORCE_LOWERCASE = false;
+        @Comment("Use a database to store UUID/name info") public static boolean
+            USE_SQLUUIDHANDLER = false;
+        @Ignore public static boolean NATIVE_UUID_PROVIDER = false;
+    }
+
+
+    @Comment("General settings") public static final class General {
+        @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
+    }
+
+
+    @Comment("Schematic Settings") public static final class Schematics {
+        @Comment(
+            "Whether schematic based generation should paste schematic on top of plots, or from Y=1")
+        public static boolean PASTE_ON_TOP = true;
+    }
+
+
+    @Comment("Configure the paths that will be used") public static final class Paths {
+        public static String SCHEMATICS = "schematics";
+        public static String SCRIPTS = "scripts";
+        public static String TEMPLATES = "templates";
+        public static String TRANSLATIONS = "translations";
+    }
+
+
+    public static class Web {
+        @Comment({"The web interface for schematics", " - All schematics are anonymous and private",
+            " - Downloads can be deleted by the user",
+            " - Supports plot uploads, downloads and saves",}) public static String URL =
+            "https://empcraft.com/plots/";
+        @Comment({"The web interface for assets", " - All schematics are organized and public",
+            " - Assets can be searched, selected and downloaded",}) public static String ASSETS =
+            "https://empcraft.com/assetpack/";
+
+    }
+
+
+    public static final class Done {
+        @Comment("Require a done plot to download") public static boolean REQUIRED_FOR_DOWNLOAD =
+            false;
+        @Comment("Only done plots can be rated") public static boolean REQUIRED_FOR_RATINGS = false;
+        @Comment("Restrict building when a plot is done") public static boolean RESTRICT_BUILDING =
+            false;
+        @Comment("The limit being how many plots a player can claim") public static boolean
+            COUNTS_TOWARDS_LIMIT = true;
+    }
+
+
+    public static final class Chat {
+        @Comment("Sometimes console color doesn't work, you can disable it here")
+        public static boolean CONSOLE_COLOR = true;
+        @Comment("Should chat be interactive") public static boolean INTERACTIVE = true;
+    }
+
+
+    @Comment("Relating to how many plots someone can claim  ") public static final class Limit {
+        @Comment("Should the limit be global (over multiple worlds)") public static boolean GLOBAL =
+            false;
+        @Comment("The range of permissions to check e.g. plots.plot.127") public static int
+            MAX_PLOTS = 127;
+    }
+
+
+    public static final class Confirmation {
+        @Comment("Teleport to your plot on death") public static int CONFIRMATION_TIMEOUT_SECONDS =
+            20;
+    }
+
+
+    public static final class Teleport {
+        @Comment("Teleport to your plot on death") public static boolean ON_DEATH = false;
+        @Comment("Teleport to your plot on login") public static boolean ON_LOGIN = false;
+        @Comment("Add a teleportation delay to all commands") public static int DELAY = 0;
+        @Comment("The visit command is ordered by world instead of globally") public static boolean
+            PER_WORLD_VISIT = false;
+    }
+
+
+    public static final class Redstone {
+        @Comment("Disable redstone in unoccupied plots") public static boolean DISABLE_UNOCCUPIED =
+            false;
+        @Comment("Disable redstone when all owners/trusted/members are offline")
+        public static boolean DISABLE_OFFLINE = false;
+        @Comment(
+            "Detect and cancel invalid pistons on the edge of plots (e.g. placed with WorldEdit)")
+        public static boolean DETECT_INVALID_EDGE_PISTONS = false;
+    }
+
+
+    public static final class Claim {
+        @Comment("The max plots claimed in a single `/plot auto <size>` command") public static int
+            MAX_AUTO_AREA = 4;
+    }
+
+
+    public static final class Ratings {
+        public static List<String> CATEGORIES = new ArrayList<>();
+    }
+
+
+    @Comment(
+        {"Enable or disable part of the plugin", "Note: A cache will use some memory if enabled"})
+    public static final class Enabled_Components { // Group the following values into a new config section
+        @Comment("The database stores all the plots") public static boolean DATABASE = true;
+        @Comment("Events are needed to track a lot of things") public static boolean EVENTS = true;
+        @Comment("Commands are used to interact with the plugin") public static boolean COMMANDS =
+            true;
+        @Comment("The UUID cacher is used to resolve player names") public static boolean
+            UUID_CACHE = true;
+        @Comment("The plugin auto updater") public static boolean UPDATER = true;
+        @Comment("Stores user metadata in a database") public static boolean PERSISTENT_META = true;
+        @Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true;
+        @Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true;
+        @Comment("Getting a rating won't need the database") public static boolean RATING_CACHE =
+            true;
+        @Comment("Allow WorldEdit to be restricted to plots") public static boolean
+            WORLDEDIT_RESTRICTIONS = true;
+        @Comment("Allow economy to be used") public static boolean ECONOMY = true;
+        @Comment("Send anonymous usage statistics. Bukkit only setting.") public static boolean
+            METRICS = true;
+        @Comment("Expiry will clear old or simplistic plots") public static boolean PLOT_EXPIRY =
+            false;
+        @Comment("Processes chunks (trimming, or entity/tile limits) ") public static boolean
+            CHUNK_PROCESSOR = false;
+        @Comment("Kill mobs on roads") public static boolean KILL_ROAD_MOBS = false;
+        @Comment("Kill items on roads") public static boolean KILL_ROAD_ITEMS = false;
+        @Comment("Kill vehicles on roads") public static boolean KILL_ROAD_VEHICLES = false;
+        @Comment("Notify a player of any missed comments upon plot entry") public static boolean
+            COMMENT_NOTIFIER = false;
+        @Comment("Let player's claim entire worlds with PlotSquared") public static boolean WORLDS =
+            false;
+        @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER =
+            false;
+        @Comment("Delete plots when a player is banned") public static boolean BAN_DELETER = false;
+        @Comment("Prevent possibly unsafe blocks from being used in plot components")
+        public static boolean PREVENT_UNSAFE = true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java
new file mode 100644
index 000000000..962e0468f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java
@@ -0,0 +1,38 @@
+package com.github.intellectualsites.plotsquared.plot.config;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class Storage extends Config {
+
+    public static String PREFIX = "";
+
+    public static void save(File file) {
+        save(file, Storage.class);
+    }
+
+    public static void load(File file) {
+        load(file, Storage.class);
+    }
+
+    @Comment("MySQL section") public static final class MySQL {
+        @Comment("Should MySQL be used?") public static boolean USE = false;
+        public static String HOST = "localhost";
+        public static String PORT = "3306";
+        public static String USER = "root";
+        public static String PASSWORD = "password";
+        public static String DATABASE = "plot_db";
+
+        @Comment("Set additional properties: https://goo.gl/wngtN8") public static List<String>
+            PROPERTIES = new ArrayList<>(Collections.singletonList("useSSL=false"));
+    }
+
+
+    @Comment("SQLite section") public static final class SQLite {
+        @Comment("Should SQLite be used?") public static boolean USE = true;
+        @Comment("The file to use") public static String DB = "storage";
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
new file mode 100644
index 000000000..e5341103d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -0,0 +1,341 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+
+import java.util.*;
+
+public interface AbstractDB {
+
+    /**
+     * The UUID that will count as EVERYONE.
+     */
+    UUID everyone = UUID.fromString("1-1-3-3-7");
+
+    /**
+     * Set Plot owner.
+     *
+     * @param plot the plot
+     * @param uuid the uuid of the new owner
+     */
+    void setOwner(Plot plot, UUID uuid);
+
+    /**
+     * Create all settings, and create default helpers, trusted + denied lists.
+     *
+     * @param plots    Plots for which the default table entries should be created
+     * @param whenDone the task to run when the method is finished executing
+     */
+    void createPlotsAndData(List<Plot> plots, Runnable whenDone);
+
+    /**
+     * Create a plot.
+     *
+     * @param plot the plot to create
+     */
+    void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure);
+
+    /**
+     * Create tables.
+     *
+     * @throws Exception If the database manager is unable to create the tables
+     */
+    void createTables() throws Exception;
+
+    /**
+     * Delete a plot.
+     *
+     * @param plot the plot to delete
+     */
+    void delete(Plot plot);
+
+    void deleteSettings(Plot plot);
+
+    void deleteHelpers(Plot plot);
+
+    void deleteTrusted(Plot plot);
+
+    /**
+     * Remove all denied players from the plot.
+     *
+     * @param plot the plot
+     */
+    void deleteDenied(Plot plot);
+
+    /**
+     * Delete all comments from the plot.
+     *
+     * @param plot the plot
+     */
+    void deleteComments(Plot plot);
+
+    void deleteRatings(Plot plot);
+
+    void delete(PlotCluster cluster);
+
+    void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete);
+
+    void removePersistentMeta(UUID uuid, String key);
+
+    void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result);
+
+    /**
+     * Create the plot settings.
+     *
+     * @param id   the plot entry id
+     * @param plot the plot
+     */
+    void createPlotSettings(int id, Plot plot);
+
+    /**
+     * Get the table entry ID.
+     *
+     * @param plot the plot
+     * @return {@code Integer} = Plot Entry Id
+     */
+    int getId(Plot plot);
+
+    /**
+     * Get the id of a given plot cluster.
+     *
+     * @param cluster PlotCluster Object
+     * @return Integer = Cluster Entry Id
+     */
+    int getClusterId(PlotCluster cluster);
+
+    /**
+     * @return A linked HashMap containing all plots
+     */
+    HashMap<String, HashMap<PlotId, Plot>> getPlots();
+
+    /**
+     * @param toValidate
+     */
+    void validateAllPlots(Set<Plot> toValidate);
+
+    /**
+     * @return A HashMap containing all plot clusters
+     */
+    HashMap<String, Set<PlotCluster>> getClusters();
+
+    /**
+     * Set the merged status for a plot.
+     *
+     * @param plot   The plot to set the merged status of
+     * @param merged boolean[]
+     */
+    void setMerged(Plot plot, boolean[] merged);
+
+    /**
+     * Swap the settings, helpers etc. of two plots.
+     *
+     * @param plot1 Plot1
+     * @param plot2 Plot2
+     */
+    void swapPlots(Plot plot1, Plot plot2);
+
+    /**
+     * Set plot flags.
+     *
+     * @param plot  Plot Object
+     * @param flags flags to set
+     */
+    void setFlags(Plot plot, HashMap<Flag<?>, Object> flags);
+
+    /**
+     * Rename a cluster to the given name.
+     *
+     * @param cluster the cluster to rename
+     * @param name    the new cluster name
+     */
+    void setClusterName(PlotCluster cluster, String name);
+
+    /**
+     * Set the plot alias.
+     *
+     * @param plot  Plot for which the alias should be set
+     * @param alias Plot Alias
+     */
+    void setAlias(Plot plot, String alias);
+
+    /**
+     * Purge a plot.
+     *
+     * @param uniqueIds list of plot id (db) to be purged
+     */
+    void purgeIds(Set<Integer> uniqueIds);
+
+    /**
+     * Purge a whole world.
+     *
+     * @param area    World in which the plots should be purged
+     * @param plotIds the {@code PlotId}s of {@code Plot}s to purge
+     */
+    void purge(PlotArea area, Set<PlotId> plotIds);
+
+    /**
+     * Set the plot home position.
+     *
+     * @param plot     the plot
+     * @param position the position of plot home
+     */
+    void setPosition(Plot plot, String position);
+
+    /**
+     * @param cluster
+     * @param position
+     */
+    void setPosition(PlotCluster cluster, String position);
+
+    /**
+     * Remove the specified player from the trust list of the specified plot.
+     *
+     * @param plot the plot
+     * @param uuid the uuid of the player to remove
+     */
+    void removeTrusted(Plot plot, UUID uuid);
+
+    /**
+     * @param cluster PlotCluster Object
+     * @param uuid    Player that should be removed
+     */
+    void removeHelper(PlotCluster cluster, UUID uuid);
+
+    /**
+     * @param plot the plot
+     * @param uuid Player that should be removed
+     */
+    void removeMember(Plot plot, UUID uuid);
+
+    /**
+     * @param cluster
+     * @param uuid
+     */
+    void removeInvited(PlotCluster cluster, UUID uuid);
+
+    /**
+     * @param plot Plot Object
+     * @param uuid Player that should be removed
+     */
+    void setTrusted(Plot plot, UUID uuid);
+
+    /**
+     * @param cluster PlotCluster Object
+     * @param uuid    Player that should be removed
+     */
+    void setHelper(PlotCluster cluster, UUID uuid);
+
+    /**
+     * @param plot Plot Object
+     * @param uuid Player that should be added
+     */
+    void setMember(Plot plot, UUID uuid);
+
+    /**
+     * @param cluster
+     * @param uuid
+     */
+    void setInvited(PlotCluster cluster, UUID uuid);
+
+    /**
+     * Remove the specified player from the denied list of the specified plot.
+     *
+     * @param plot the plot
+     * @param uuid the uuid of the player to remove
+     */
+    void removeDenied(Plot plot, UUID uuid);
+
+    /**
+     * Deny the specified player from the given plot.
+     *
+     * @param plot the plot
+     * @param uuid the uuid of the player to deny
+     */
+    void setDenied(Plot plot, UUID uuid);
+
+    /**
+     * Get the ratings from the specified plot.
+     *
+     * @param plot the plot
+     * @return the plot ratings (pre-calculated)
+     */
+    HashMap<UUID, Integer> getRatings(Plot plot);
+
+    /**
+     * Set a rating for a plot.
+     *
+     * @param plot
+     * @param rater
+     * @param value
+     */
+    void setRating(Plot plot, UUID rater, int value);
+
+    /**
+     * Remove the specified comment from the given plot.
+     *
+     * @param plot    the plot
+     * @param comment the comment to remove
+     */
+    void removeComment(Plot plot, PlotComment comment);
+
+    /**
+     * Clear the specified inbox on the given plot.
+     *
+     * @param plot  the plot
+     * @param inbox the inbox to clear
+     */
+    void clearInbox(Plot plot, String inbox);
+
+    /**
+     * Add the specified comment to the given plot.
+     *
+     * @param plot    the plot
+     * @param comment the comment to add
+     */
+    void setComment(Plot plot, PlotComment comment);
+
+    /**
+     * Get Plot Comments.
+     *
+     * @param plot The Plot to get comments from
+     */
+    void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone);
+
+    void createPlotAndSettings(Plot plot, Runnable whenDone);
+
+    void createCluster(PlotCluster cluster);
+
+    void resizeCluster(PlotCluster current, PlotId min, PlotId max);
+
+    void movePlot(Plot originalPlot, Plot newPlot);
+
+    /**
+     * Replace a old uuid with a new one in the database.
+     *
+     * <ul>
+     * <li> Useful for replacing a few uuids (not the entire database).</li>
+     * <li>or entire conversion, the uuidconvert command scales better.</li>
+     * </ul>
+     *
+     * @param old
+     * @param now
+     */
+    void replaceUUID(UUID old, UUID now);
+
+    /**
+     * Don't use this method unless you want to ruin someone's server.
+     *
+     * @return true if the tables were deleted, false when an error is encountered
+     */
+    boolean deleteTables();
+
+    /**
+     * Close the database. Generally not recommended to be used by add-ons.
+     */
+    void close();
+
+    void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max);
+
+    void updateTables(int[] oldVersion);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
new file mode 100644
index 000000000..1127a6ed2
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
@@ -0,0 +1,495 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.util.*;
+
+/**
+ * Database Functions
+ * - These functions do not update the local plot objects and only make changes to the DB
+ */
+@SuppressWarnings("deprecation") public class DBFunc {
+    /**
+     * The "global" uuid.
+     */
+    // TODO: Use this instead. public static final UUID EVERYONE = UUID.fromString("4aa2aaa4-c06b-485c-bc58-186aa1780d9b");
+    public static final UUID EVERYONE = UUID.fromString("1-1-3-3-7");
+
+    /**
+     * Abstract Database Manager
+     */
+    public static AbstractDB dbManager;
+
+    public static void updateTables(int[] oldVersion) {
+        if (dbManager != null) {
+            dbManager.updateTables(oldVersion);
+        }
+    }
+
+    public static void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete) {
+        if (dbManager != null) {
+            dbManager.addPersistentMeta(uuid, key, meta, delete);
+        }
+    }
+
+    public static void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result) {
+        if (dbManager != null) {
+            dbManager.getPersistentMeta(uuid, result);
+        }
+    }
+
+    public static void removePersistentMeta(UUID uuid, String key) {
+        if (dbManager != null) {
+            dbManager.removePersistentMeta(uuid, key);
+        }
+    }
+
+    public static void swapPlots(Plot plot1, Plot plot2) {
+        if (dbManager != null) {
+            dbManager.swapPlots(plot1, plot2);
+        }
+    }
+
+    public static boolean deleteTables() {
+        return dbManager != null && dbManager.deleteTables();
+    }
+
+    public static void movePlot(Plot originalPlot, Plot newPlot) {
+        if (originalPlot.temp == -1 || newPlot.temp == -1) {
+            return;
+        }
+        DBFunc.dbManager.movePlot(originalPlot, newPlot);
+    }
+
+    public static void validatePlots(Set<Plot> plots) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.validateAllPlots(plots);
+    }
+
+    /**
+     * Check if a {@link ResultSet} contains a column.
+     *
+     * @param resultSet
+     * @param name
+     * @return
+     */
+    public static boolean hasColumn(ResultSet resultSet, String name) {
+        try {
+            ResultSetMetaData meta = resultSet.getMetaData();
+            int count = meta.getColumnCount();
+            for (int x = 1; x <= count; x++) {
+                if (name.equals(meta.getColumnName(x))) {
+                    return true;
+                }
+            }
+            return false;
+        } catch (SQLException ignored) {
+            return false;
+        }
+    }
+
+    /**
+     * Set the owner of a plot
+     *
+     * @param plot Plot Object
+     * @param uuid New Owner
+     */
+    public static void setOwner(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setOwner(plot, uuid);
+    }
+
+    /**
+     * Create all settings + (trusted, denied, members)
+     *
+     * @param plots List containing all plot objects
+     */
+    public static void createPlotsAndData(List<Plot> plots, Runnable whenDone) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.createPlotsAndData(plots, whenDone);
+    }
+
+    public static void createPlotSafe(final Plot plot, final Runnable success,
+        final Runnable failure) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.createPlotSafe(plot, success, failure);
+    }
+
+    /**
+     * Create a plot.
+     *
+     * @param plot Plot to create
+     */
+    public static void createPlotAndSettings(Plot plot, Runnable whenDone) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.createPlotAndSettings(plot, whenDone);
+    }
+
+    /**
+     * Create tables.
+     *
+     * @throws Exception
+     */
+    public static void createTables() throws Exception {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.createTables();
+    }
+
+    /**
+     * Delete a plot.
+     *
+     * @param plot Plot to delete
+     */
+    public static void delete(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.delete(plot);
+        plot.temp = -1;
+    }
+
+    /**
+     * Delete the ratings for a plot.
+     *
+     * @param plot
+     */
+    public static void deleteRatings(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.deleteRatings(plot);
+    }
+
+    /**
+     * Delete the trusted list for a plot.
+     *
+     * @param plot
+     */
+    public static void deleteTrusted(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.deleteHelpers(plot);
+    }
+
+    /**
+     * Delete the members list for a plot.
+     *
+     * @param plot
+     */
+    public static void deleteMembers(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.deleteTrusted(plot);
+    }
+
+    /**
+     * Delete the denied list for a plot.
+     *
+     * @param plot
+     */
+    public static void deleteDenied(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.deleteDenied(plot);
+    }
+
+    /**
+     * Delete the comments in a plot.
+     *
+     * @param plot
+     */
+    public static void deleteComments(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.deleteComments(plot);
+    }
+
+    /**
+     * Deleting settings will
+     * 1) Delete any settings (flags and such) associated with the plot
+     * 2) Prevent any local changes to the plot from saving properly to the db
+     * <p>
+     * This shouldn't ever be needed
+     *
+     * @param plot
+     */
+    public static void deleteSettings(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.deleteSettings(plot);
+    }
+
+    public static void delete(PlotCluster toDelete) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.delete(toDelete);
+    }
+
+    /**
+     * Create plot settings.
+     *
+     * @param id   Plot ID
+     * @param plot Plot Object
+     */
+    public static void createPlotSettings(int id, Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.createPlotSettings(id, plot);
+    }
+
+    /**
+     * Get a plot id.
+     *
+     * @param plot Plot Object
+     * @return ID
+     */
+    public static int getId(Plot plot) {
+        if (dbManager == null) {
+            return 0;
+        }
+        return DBFunc.dbManager.getId(plot);
+    }
+
+    /**
+     * @return Plots
+     */
+    public static HashMap<String, HashMap<PlotId, Plot>> getPlots() {
+        if (dbManager == null) {
+            return new HashMap<>();
+        }
+        return DBFunc.dbManager.getPlots();
+    }
+
+    public static void setMerged(Plot plot, boolean[] merged) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setMerged(plot, merged);
+    }
+
+    public static void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setFlags(plot, flags);
+    }
+
+    public static void setAlias(Plot plot, String alias) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setAlias(plot, alias);
+    }
+
+    public static void purgeIds(Set<Integer> uniqueIds) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.purgeIds(uniqueIds);
+    }
+
+    public static void purge(PlotArea area, Set<PlotId> plotIds) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.purge(area, plotIds);
+    }
+
+    public static void setPosition(Plot plot, String position) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setPosition(plot, position);
+    }
+
+    public static void removeComment(Plot plot, PlotComment comment) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.removeComment(plot, comment);
+    }
+
+    public static void clearInbox(Plot plot, String inbox) {
+        if (plot != null && plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.clearInbox(plot, inbox);
+    }
+
+    public static void setComment(Plot plot, PlotComment comment) {
+        if (plot != null && plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setComment(plot, comment);
+    }
+
+    public static void getComments(Plot plot, String inbox,
+        RunnableVal<List<PlotComment>> whenDone) {
+        if (plot != null && plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.getComments(plot, inbox, whenDone);
+    }
+
+    public static void removeTrusted(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.removeTrusted(plot, uuid);
+    }
+
+    public static void removeHelper(PlotCluster cluster, UUID uuid) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.removeHelper(cluster, uuid);
+    }
+
+    public static void createCluster(PlotCluster cluster) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.createCluster(cluster);
+    }
+
+    public static void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.resizeCluster(current, min, max);
+    }
+
+    public static void removeMember(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.removeMember(plot, uuid);
+    }
+
+    public static void removeInvited(PlotCluster cluster, UUID uuid) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.removeInvited(cluster, uuid);
+    }
+
+    public static void setTrusted(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setTrusted(plot, uuid);
+    }
+
+    public static void setHelper(PlotCluster cluster, UUID uuid) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setHelper(cluster, uuid);
+    }
+
+    public static void setMember(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setMember(plot, uuid);
+    }
+
+    public static void setInvited(PlotCluster cluster, UUID uuid) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setInvited(cluster, uuid);
+    }
+
+    public static void removeDenied(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.removeDenied(plot, uuid);
+    }
+
+    public static void setDenied(Plot plot, UUID uuid) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setDenied(plot, uuid);
+    }
+
+    public static HashMap<UUID, Integer> getRatings(Plot plot) {
+        if (plot.temp == -1 || dbManager == null) {
+            return new HashMap<>(0);
+        }
+        return DBFunc.dbManager.getRatings(plot);
+    }
+
+    public static void setRating(Plot plot, UUID rater, int value) {
+        if (plot.temp == -1 || dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setRating(plot, rater, value);
+    }
+
+    public static HashMap<String, Set<PlotCluster>> getClusters() {
+        if (dbManager == null) {
+            return new HashMap<>();
+        }
+        return DBFunc.dbManager.getClusters();
+    }
+
+    public static void setPosition(PlotCluster cluster, String position) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setPosition(cluster, position);
+    }
+
+    public static void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.replaceWorld(oldWorld, newWorld, min, max);
+    }
+
+    /**
+     * Replace all occurrences of a uuid in the database with another one
+     *
+     * @param old
+     * @param now
+     */
+    public static void replaceUUID(UUID old, UUID now) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.replaceUUID(old, now);
+    }
+
+    public static void close() {
+        if (dbManager != null) {
+            DBFunc.dbManager.close();
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
new file mode 100644
index 000000000..8626a1a24
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
@@ -0,0 +1,72 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * Abstract Database class, serves as a base for any connection method (MySQL, SQLite, etc.)
+ *
+ * @author -_Husky_-
+ * @author tips48
+ */
+public interface Database {
+
+    Connection forceConnection() throws SQLException, ClassNotFoundException;
+
+    /**
+     * Opens a connection with the database.
+     *
+     * @return Opened connection
+     * @throws SQLException           if the connection can not be opened
+     * @throws ClassNotFoundException if the driver cannot be found
+     */
+    Connection openConnection() throws SQLException, ClassNotFoundException;
+
+    /**
+     * Checks if a connection is open with the database.
+     *
+     * @return true if the connection is open
+     * @throws SQLException if the connection cannot be checked
+     */
+    boolean checkConnection() throws SQLException;
+
+    /**
+     * Gets the connection with the database.
+     *
+     * @return Connection with the database, null if none
+     */
+    Connection getConnection();
+
+    /**
+     * Closes the connection with the database.
+     *
+     * @return true if successful
+     * @throws SQLException if the connection cannot be closed
+     */
+    boolean closeConnection() throws SQLException;
+
+    /**
+     * Executes a SQL Query.
+     * If the connection is closed, it will be opened.
+     *
+     * @param query Query to be run
+     * @return the results of the query
+     * @throws SQLException           If the query cannot be executed
+     * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
+     */
+    ResultSet querySQL(String query) throws SQLException, ClassNotFoundException;
+
+    /**
+     * Executes an Update SQL Query.
+     * See {@link Statement#executeUpdate(String)}.
+     * If the connection is closed, it will be opened.
+     *
+     * @param query Query to be run
+     * @return Result Code, see {@link Statement#executeUpdate(String)}
+     * @throws SQLException           If the query cannot be executed
+     * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
+     */
+    int updateSQL(String query) throws SQLException, ClassNotFoundException;
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
new file mode 100644
index 000000000..4a0e655c5
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
@@ -0,0 +1,89 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.plot.config.Storage;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.sql.*;
+
+/**
+ * Connects to and uses a MySQL database
+ *
+ * @author -_Husky_-
+ * @author tips48
+ */
+public class MySQL implements Database {
+
+    private final String user;
+    private final String database;
+    private final String password;
+    private final String port;
+    private final String hostname;
+    private Connection connection;
+
+    /**
+     * Creates a new MySQL instance.
+     *
+     * @param hostname Name of the host
+     * @param port     Port number
+     * @param database Database name
+     * @param username Username
+     * @param password Password
+     */
+    public MySQL(String hostname, String port, String database, String username, String password) {
+        this.hostname = hostname;
+        this.port = port;
+        this.database = database;
+        this.user = username;
+        this.password = password;
+        this.connection = null;
+    }
+
+    @Override public Connection forceConnection() throws SQLException {
+        this.connection = DriverManager.getConnection(
+            "jdbc:mysql://" + this.hostname + ':' + this.port + '/' + this.database + "?"
+                + StringMan.join(Storage.MySQL.PROPERTIES, "&"), this.user, this.password);
+        return this.connection;
+    }
+
+    @Override public Connection openConnection() throws SQLException, ClassNotFoundException {
+        if (checkConnection()) {
+            return this.connection;
+        }
+        return forceConnection();
+    }
+
+    @Override public boolean checkConnection() throws SQLException {
+        return (this.connection != null) && !this.connection.isClosed();
+    }
+
+    @Override public Connection getConnection() {
+        return this.connection;
+    }
+
+    @Override public boolean closeConnection() throws SQLException {
+        if (this.connection == null) {
+            return false;
+        }
+        this.connection.close();
+        this.connection = null;
+        return true;
+    }
+
+    @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException {
+        if (checkConnection()) {
+            openConnection();
+        }
+        try (Statement statement = this.connection.createStatement()) {
+            return statement.executeQuery(query);
+        }
+    }
+
+    @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException {
+        if (checkConnection()) {
+            openConnection();
+        }
+        try (Statement statement = this.connection.createStatement()) {
+            return statement.executeUpdate(query);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
new file mode 100644
index 000000000..3e197a16d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -0,0 +1,3082 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.config.Storage;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.StringFlag;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.google.common.base.Charsets;
+
+import javax.annotation.Nonnull;
+import java.sql.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+
+@SuppressWarnings("SqlDialectInspection") public class SQLManager implements AbstractDB {
+
+    // Public final
+    public final String SET_OWNER;
+    public final String GET_ALL_PLOTS;
+    public final String CREATE_PLOTS;
+    public final String CREATE_SETTINGS;
+    public final String CREATE_TIERS;
+    public final String CREATE_PLOT;
+    public final String CREATE_PLOT_SAFE;
+    public final String CREATE_CLUSTER;
+    private final String prefix;
+    // Private Final
+    private final Database database;
+    private final boolean mySQL;
+    /**
+     * important tasks
+     */
+    public volatile Queue<Runnable> globalTasks;
+    /**
+     * Notify tasks
+     */
+    public volatile Queue<Runnable> notifyTasks;
+    /**
+     * plot plot_denied plot_helpers plot_trusted plot_comments plot_settings plot_rating
+     */
+    public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
+    /**
+     * player_meta
+     */
+    public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
+    /**
+     * cluster cluster_helpers cluster_invited cluster_settings
+     */
+    public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
+    // Private
+    private Connection connection;
+    private boolean closed = false;
+
+    /**
+     * Constructor
+     *
+     * @param p prefix
+     */
+    public SQLManager(final Database database, String p, boolean debug)
+        throws SQLException, ClassNotFoundException {
+        // Private final
+        this.database = database;
+        this.connection = database.openConnection();
+        this.mySQL = database instanceof MySQL;
+        this.globalTasks = new ConcurrentLinkedQueue<>();
+        this.notifyTasks = new ConcurrentLinkedQueue<>();
+        this.plotTasks = new ConcurrentHashMap<>();
+        this.playerTasks = new ConcurrentHashMap<>();
+        this.clusterTasks = new ConcurrentHashMap<>();
+        this.prefix = p;
+        this.SET_OWNER = "UPDATE `" + this.prefix
+            + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
+        this.GET_ALL_PLOTS =
+            "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
+        this.CREATE_PLOTS = "INSERT INTO `" + this.prefix
+            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
+        this.CREATE_SETTINGS =
+            "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
+        this.CREATE_TIERS =
+            "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
+        this.CREATE_PLOT = "INSERT INTO `" + this.prefix
+            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
+
+        if (mySQL) {
+            this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
+                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
+                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+        } else {
+            this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
+                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
+                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+        }
+        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
+            + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
+        try {
+            createTables();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        TaskManager.runTaskAsync(() -> {
+            long last = System.currentTimeMillis();
+            while (true) {
+                if (SQLManager.this.closed) {
+                    break;
+                }
+                boolean hasTask =
+                    !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
+                        || !clusterTasks.isEmpty();
+                if (hasTask) {
+                    if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
+                        || !isValid()) {
+                        last = System.currentTimeMillis();
+                        reconnect();
+                    }
+                    if (!sendBatch()) {
+                        try {
+                            if (!getNotifyTasks().isEmpty()) {
+                                for (Runnable task : getNotifyTasks()) {
+                                    TaskManager.runTask(task);
+                                }
+                                getNotifyTasks().clear();
+                            }
+                            Thread.sleep(50);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                } else {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        });
+    }
+
+    public boolean isValid() {
+        try {
+            if (connection.isClosed()) {
+                return false;
+            }
+        } catch (SQLException e) {
+            return false;
+        }
+        try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
+            stmt.executeQuery();
+            return true;
+        } catch (Throwable e) {
+            return false;
+        }
+    }
+
+    public void reconnect() {
+        try {
+            close();
+            SQLManager.this.closed = false;
+            SQLManager.this.connection = database.forceConnection();
+        } catch (SQLException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public synchronized Queue<Runnable> getGlobalTasks() {
+        return this.globalTasks;
+    }
+
+    public synchronized Queue<Runnable> getNotifyTasks() {
+        return this.notifyTasks;
+    }
+
+    public synchronized void addPlotTask(@Nonnull Plot plot, UniqueStatement task) {
+        Queue<UniqueStatement> tasks =
+            this.plotTasks.computeIfAbsent(plot, plot1 -> new ConcurrentLinkedQueue<>());
+        if (task == null) {
+            task = new UniqueStatement(String.valueOf(plot.hashCode())) {
+
+                @Override public PreparedStatement get() {
+                    return null;
+                }
+
+                @Override public void set(PreparedStatement stmt) {
+                }
+
+                @Override public void addBatch(PreparedStatement statement) {
+                }
+
+                @Override public void execute(PreparedStatement statement) {
+                }
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addPlayerTask(UUID uuid, UniqueStatement task) {
+        if (uuid == null) {
+            return;
+        }
+        Queue<UniqueStatement> tasks =
+            this.playerTasks.computeIfAbsent(uuid, uuid1 -> new ConcurrentLinkedQueue<>());
+        if (task == null) {
+            task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
+
+                @Override public PreparedStatement get() {
+                    return null;
+                }
+
+                @Override public void set(PreparedStatement stmt) {
+                }
+
+                @Override public void addBatch(PreparedStatement statement) {
+                }
+
+                @Override public void execute(PreparedStatement statement) {
+                }
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
+        Queue<UniqueStatement> tasks = this.clusterTasks
+            .computeIfAbsent(cluster, plotCluster -> new ConcurrentLinkedQueue<>());
+        if (task == null) {
+            task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
+
+                @Override public PreparedStatement get() {
+                    return null;
+                }
+
+                @Override public void set(PreparedStatement stmt) {
+                }
+
+                @Override public void addBatch(PreparedStatement statement) {
+                }
+
+                @Override public void execute(PreparedStatement statement) {
+                }
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addGlobalTask(Runnable task) {
+        getGlobalTasks().add(task);
+    }
+
+    public synchronized void addNotifyTask(Runnable task) {
+        if (task != null) {
+            getNotifyTasks().add(task);
+        }
+    }
+
+    public boolean sendBatch() {
+        try {
+            if (!getGlobalTasks().isEmpty()) {
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                Runnable task = getGlobalTasks().remove();
+                if (task != null) {
+                    try {
+                        task.run();
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                commit();
+                return true;
+            }
+            int count = -1;
+            if (!this.plotTasks.isEmpty()) {
+                count = 0;
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement statement = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
+                    this.plotTasks.entrySet().iterator();
+                while (iter.hasNext()) {
+                    try {
+                        Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
+                        Plot plot = entry.getKey();
+                        Queue<UniqueStatement> tasks = entry.getValue();
+                        if (tasks.isEmpty()) {
+                            iter.remove();
+                            continue;
+                        }
+                        task = tasks.remove();
+                        count++;
+                        if (task != null) {
+                            if (task.method == null || !task.method.equals(method)
+                                || statement == null) {
+                                if (statement != null) {
+                                    lastTask.execute(statement);
+                                    statement.close();
+                                }
+                                method = task.method;
+                                statement = task.get();
+                            }
+                            task.set(statement);
+                            task.addBatch(statement);
+                            try {
+                                if (statement.isClosed()) {
+                                    statement = null;
+                                }
+                            } catch (AbstractMethodError ignore) {
+                            }
+                        }
+                        lastTask = task;
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
+                }
+            }
+            if (!this.playerTasks.isEmpty()) {
+                count = 0;
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement statement = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
+                    try {
+                        UUID uuid = entry.getKey();
+                        if (this.playerTasks.get(uuid).isEmpty()) {
+                            this.playerTasks.remove(uuid);
+                            continue;
+                        }
+                        task = this.playerTasks.get(uuid).remove();
+                        count++;
+                        if (task != null) {
+                            if (task.method == null || !task.method.equals(method)) {
+                                if (statement != null) {
+                                    lastTask.execute(statement);
+                                    statement.close();
+                                }
+                                method = task.method;
+                                statement = task.get();
+                            }
+                            task.set(statement);
+                            task.addBatch(statement);
+                        }
+                        lastTask = task;
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
+                }
+            }
+            if (!this.clusterTasks.isEmpty()) {
+                count = 0;
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement statement = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks
+                    .entrySet()) {
+                    try {
+                        PlotCluster cluster = entry.getKey();
+                        if (this.clusterTasks.get(cluster).isEmpty()) {
+                            this.clusterTasks.remove(cluster);
+                            continue;
+                        }
+                        task = this.clusterTasks.get(cluster).remove();
+                        count++;
+                        if (task != null) {
+                            if (task.method == null || !task.method.equals(method)) {
+                                if (statement != null) {
+                                    lastTask.execute(statement);
+                                    statement.close();
+                                }
+                                method = task.method;
+                                statement = task.get();
+                            }
+                            task.set(statement);
+                            task.addBatch(statement);
+                        }
+                        lastTask = task;
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
+                }
+            }
+            if (count > 0) {
+                commit();
+                return true;
+            }
+            if (count != -1) {
+                if (!this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(true);
+                }
+            }
+            if (!this.clusterTasks.isEmpty()) {
+                this.clusterTasks.clear();
+            }
+            if (!this.plotTasks.isEmpty()) {
+                this.plotTasks.clear();
+            }
+        } catch (Throwable e) {
+            PlotSquared.debug("============ DATABASE ERROR ============");
+            PlotSquared.debug("There was an error updating the database.");
+            PlotSquared.debug(" - It will be corrected on shutdown");
+            PlotSquared.debug("========================================");
+            e.printStackTrace();
+            PlotSquared.debug("========================================");
+        }
+        return false;
+    }
+
+    public Connection getConnection() {
+        return this.connection;
+    }
+
+    /**
+     * Set Plot owner
+     *
+     * @param plot Plot Object
+     * @param uuid Owner UUID
+     */
+    @Override public void setOwner(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setOwner") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, uuid.toString());
+                statement.setInt(2, plot.getId().x);
+                statement.setInt(3, plot.getId().y);
+                statement.setString(4, plot.getArea().toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
+            }
+        });
+    }
+
+    @Override public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
+        addGlobalTask(() -> {
+            try {
+                // Create the plots
+                createPlots(myList, () -> {
+                    try {
+                        // Creating datastructures
+                        HashMap<PlotId, Plot> plotMap = new HashMap<>();
+                        for (Plot plot : myList) {
+                            plotMap.put(plot.getId(), plot);
+                        }
+                        ArrayList<SettingsPair> settings = new ArrayList<>();
+                        final ArrayList<UUIDPair> helpers = new ArrayList<>();
+                        final ArrayList<UUIDPair> trusted = new ArrayList<>();
+                        final ArrayList<UUIDPair> denied = new ArrayList<>();
+
+                        // Populating structures
+                        try (PreparedStatement stmt = SQLManager.this.connection
+                            .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
+                            ResultSet result = stmt.executeQuery()) {
+                            while (result.next()) {
+                                int id = result.getInt("id");
+                                int x = result.getInt("plot_id_x");
+                                int y = result.getInt("plot_id_z");
+                                PlotId plotId = new PlotId(x, y);
+                                Plot plot = plotMap.get(plotId);
+                                if (plot != null) {
+                                    settings.add(new SettingsPair(id, plot.getSettings()));
+                                    for (UUID uuid : plot.getDenied()) {
+                                        denied.add(new UUIDPair(id, uuid));
+                                    }
+                                    for (UUID uuid : plot.getMembers()) {
+                                        trusted.add(new UUIDPair(id, uuid));
+                                    }
+                                    for (UUID uuid : plot.getTrusted()) {
+                                        helpers.add(new UUIDPair(id, uuid));
+                                    }
+                                }
+                            }
+                        }
+                        createSettings(settings, () -> createTiers(helpers, "helpers",
+                            () -> createTiers(trusted, "trusted",
+                                () -> createTiers(denied, "denied", () -> {
+                                    try {
+                                        SQLManager.this.connection.commit();
+                                    } catch (SQLException e) {
+                                        e.printStackTrace();
+                                    }
+                                    if (whenDone != null) {
+                                        whenDone.run();
+                                    }
+                                }))));
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                        try {
+                            SQLManager.this.connection.commit();
+                        } catch (SQLException e1) {
+                            e1.printStackTrace();
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                try {
+                    SQLManager.this.connection.commit();
+                } catch (SQLException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        });
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param myList list of plots to be created
+     */
+    public void createTiers(ArrayList<UUIDPair> myList, final String tier, Runnable whenDone) {
+        StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, SQLManager.this.CREATE_TIERS.replaceAll("%tier%", tier),
+                    2);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size,
+                    "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
+                        + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
+            }
+
+            @Override public String getCreateSQL() {
+                return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
+                    + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair)
+                throws SQLException {
+                stmt.setInt(i * 2 + 1, pair.id);
+                stmt.setString(i * 2 + 2, pair.uuid.toString());
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair)
+                throws SQLException {
+                stmt.setInt(i * 2 + 1, pair.id);
+                stmt.setString(i * 2 + 2, pair.uuid.toString());
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, UUIDPair pair)
+                throws SQLException {
+                stmt.setInt(1, pair.id);
+                stmt.setString(2, pair.uuid.toString());
+            }
+        };
+        setBulk(myList, mod, whenDone);
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param myList list of plots to be created
+     */
+    public void createPlots(List<Plot> myList, Runnable whenDone) {
+        StmtMod<Plot> mod = new StmtMod<Plot>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, SQLManager.this.CREATE_PLOTS, 5);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ",
+                    6);
+            }
+
+            @Override public String getCreateSQL() {
+                return SQLManager.this.CREATE_PLOT;
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, Plot plot)
+                throws SQLException {
+                stmt.setInt(i * 5 + 1, plot.getId().x);
+                stmt.setInt(i * 5 + 2, plot.getId().y);
+                try {
+                    stmt.setString(i * 5 + 3, plot.owner.toString());
+                } catch (SQLException ignored) {
+                    stmt.setString(i * 5 + 3, everyone.toString());
+                }
+                stmt.setString(i * 5 + 4, plot.getArea().toString());
+                stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, Plot plot)
+                throws SQLException {
+                stmt.setNull(i * 6 + 1, 4);
+                stmt.setInt(i * 6 + 2, plot.getId().x);
+                stmt.setInt(i * 6 + 3, plot.getId().y);
+                try {
+                    stmt.setString(i * 6 + 4, plot.owner.toString());
+                } catch (SQLException ignored) {
+                    stmt.setString(i * 6 + 4, everyone.toString());
+                }
+                stmt.setString(i * 6 + 5, plot.getArea().toString());
+                stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
+                stmt.setInt(1, plot.getId().x);
+                stmt.setInt(2, plot.getId().y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.getArea().toString());
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+
+            }
+        };
+        setBulk(myList, mod, whenDone);
+    }
+
+    public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
+        int size = objList.size();
+        if (size == 0) {
+            if (whenDone != null) {
+                whenDone.run();
+            }
+            return;
+        }
+        int packet;
+        if (this.mySQL) {
+            packet = Math.min(size, 5000);
+        } else {
+            packet = Math.min(size, 50);
+        }
+        int amount = size / packet;
+        try {
+            int count = 0;
+            PreparedStatement preparedStmt = null;
+            int last = -1;
+            for (int j = 0; j <= amount; j++) {
+                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                if (subList.isEmpty()) {
+                    break;
+                }
+                String statement;
+                if (last == -1) {
+                    last = subList.size();
+                    statement = mod.getCreateMySQL(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                if (subList.size() != last || count % 5000 == 0 && count > 0) {
+                    preparedStmt.executeBatch();
+                    preparedStmt.close();
+                    statement = mod.getCreateMySQL(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                for (int i = 0; i < subList.size(); i++) {
+                    count++;
+                    T obj = subList.get(i);
+                    mod.setMySQL(preparedStmt, i, obj);
+                }
+                last = subList.size();
+                preparedStmt.addBatch();
+            }
+            PlotSquared.debug(
+                "&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+            preparedStmt.executeBatch();
+            preparedStmt.clearParameters();
+            preparedStmt.close();
+            if (whenDone != null) {
+                whenDone.run();
+            }
+            return;
+        } catch (SQLException e) {
+            if (this.mySQL) {
+                e.printStackTrace();
+                PlotSquared.debug("&cERROR 1:  | " + objList.get(0).getClass().getCanonicalName());
+            }
+        }
+        try {
+            int count = 0;
+            PreparedStatement preparedStmt = null;
+            int last = -1;
+            for (int j = 0; j <= amount; j++) {
+                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                if (subList.isEmpty()) {
+                    break;
+                }
+                String statement;
+                if (last == -1) {
+                    last = subList.size();
+                    statement = mod.getCreateSQLite(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                if (subList.size() != last || count % 5000 == 0 && count > 0) {
+                    preparedStmt.executeBatch();
+                    preparedStmt.clearParameters();
+                    statement = mod.getCreateSQLite(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                for (int i = 0; i < subList.size(); i++) {
+                    count++;
+                    T obj = subList.get(i);
+                    mod.setSQLite(preparedStmt, i, obj);
+                }
+                last = subList.size();
+                preparedStmt.addBatch();
+            }
+            PlotSquared.debug(
+                "&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+            preparedStmt.executeBatch();
+            preparedStmt.clearParameters();
+            preparedStmt.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            PlotSquared.debug("&cERROR 2:  | " + objList.get(0).getClass().getCanonicalName());
+            PlotSquared.debug("&6[WARN] Could not bulk save!");
+            try (PreparedStatement preparedStmt = this.connection
+                .prepareStatement(mod.getCreateSQL())) {
+                for (T obj : objList) {
+                    mod.setSQL(preparedStmt, obj);
+                    preparedStmt.addBatch();
+                }
+                PlotSquared.debug("&aBatch 3");
+                preparedStmt.executeBatch();
+            } catch (SQLException e3) {
+                e3.printStackTrace();
+                PlotSquared.debug("&c[ERROR] Failed to save all!");
+            }
+        }
+        if (whenDone != null) {
+            whenDone.run();
+        }
+    }
+
+    public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
+        final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
+                    + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
+                    + "`position`) VALUES ", 10);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
+                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
+                    10);
+            }
+
+            @Override public String getCreateSQL() {
+                return "INSERT INTO `" + SQLManager.this.prefix
+                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
+            }
+
+            @Override public void setMySQL(PreparedStatement statement, int i, SettingsPair pair)
+                throws SQLException {
+                statement.setInt(i * 10 + 1, pair.id); // id
+                statement.setNull(i * 10 + 2, 4); // biome
+                statement.setNull(i * 10 + 3, 4); // rain
+                statement.setNull(i * 10 + 4, 4); // custom_time
+                statement.setNull(i * 10 + 5, 4); // time
+                statement.setNull(i * 10 + 6, 4); // deny_entry
+                if (pair.settings.getAlias().isEmpty()) {
+                    statement.setNull(i * 10 + 7, 4);
+                } else {
+                    statement.setString(i * 10 + 7, pair.settings.getAlias());
+                }
+                StringBuilder flag_string = new StringBuilder();
+                int k = 0;
+                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
+                    if (k != 0) {
+                        flag_string.append(',');
+                    }
+                    flag_string.append(flag.getKey().getName()).append(':').append(
+                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
+                            .replaceAll(",", "´"));
+                    k++;
+                }
+                statement.setString(i * 10 + 8, flag_string.toString());
+                boolean[] merged = pair.settings.getMerged();
+                int hash = MainUtil.hash(merged);
+                statement.setInt(i * 10 + 9, hash);
+                BlockLoc loc = pair.settings.getPosition();
+                String position;
+                if (loc.y == 0) {
+                    position = "DEFAULT";
+                } else {
+                    position = loc.x + "," + loc.y + ',' + loc.z;
+                }
+                statement.setString(i * 10 + 10, position);
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair)
+                throws SQLException {
+                stmt.setInt(i * 10 + 1, pair.id); // id
+                stmt.setNull(i * 10 + 2, 4); // biome
+                stmt.setNull(i * 10 + 3, 4); // rain
+                stmt.setNull(i * 10 + 4, 4); // custom_time
+                stmt.setNull(i * 10 + 5, 4); // time
+                stmt.setNull(i * 10 + 6, 4); // deny_entry
+                if (pair.settings.getAlias().isEmpty()) {
+                    stmt.setNull(i * 10 + 7, 4);
+                } else {
+                    stmt.setString(i * 10 + 7, pair.settings.getAlias());
+                }
+                StringBuilder flag_string = new StringBuilder();
+                int k = 0;
+                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
+                    if (k != 0) {
+                        flag_string.append(',');
+                    }
+                    flag_string.append(flag.getKey().getName()).append(':').append(
+                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
+                            .replaceAll(",", "´"));
+                    k++;
+                }
+                stmt.setString(i * 10 + 8, flag_string.toString());
+                boolean[] merged = pair.settings.getMerged();
+                int n = 0;
+                for (int j = 0; j < 4; ++j) {
+                    n = (n << 1) + (merged[j] ? 1 : 0);
+                }
+                stmt.setInt(i * 10 + 9, n);
+                BlockLoc loc = pair.settings.getPosition();
+                String position;
+                if (loc.y == 0) {
+                    position = "DEFAULT";
+                } else {
+                    position = loc.x + "," + loc.y + ',' + loc.z;
+                }
+                stmt.setString(i * 10 + 10, position);
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, SettingsPair pair)
+                throws SQLException {
+                stmt.setInt(1, pair.id);
+            }
+        };
+        addGlobalTask(() -> setBulk(myList, mod, whenDone));
+    }
+
+    public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
+        final StmtMod<Integer> mod = new StmtMod<Integer>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, SQLManager.this.CREATE_SETTINGS, 1);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
+                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
+                    10);
+            }
+
+            @Override public String getCreateSQL() {
+                return "INSERT INTO `" + SQLManager.this.prefix
+                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, Integer id)
+                throws SQLException {
+                stmt.setInt(i + 1, id);
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, Integer id)
+                throws SQLException {
+                stmt.setInt(i * 10 + 1, id);
+                stmt.setNull(i * 10 + 2, 4);
+                stmt.setNull(i * 10 + 3, 4);
+                stmt.setNull(i * 10 + 4, 4);
+                stmt.setNull(i * 10 + 5, 4);
+                stmt.setNull(i * 10 + 6, 4);
+                stmt.setNull(i * 10 + 7, 4);
+                stmt.setNull(i * 10 + 8, 4);
+                stmt.setNull(i * 10 + 9, 4);
+                stmt.setString(i * 10 + 10, "DEFAULT");
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
+                stmt.setInt(1, id);
+            }
+        };
+        addGlobalTask(() -> setBulk(myList, mod, whenDone));
+    }
+
+    public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
+        final long timestamp = plot.getTimestamp();
+        addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, plot.getId().x);
+                stmt.setInt(2, plot.getId().y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.getArea().toString());
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+                stmt.setString(6, plot.getArea().toString());
+                stmt.setInt(7, plot.getId().x);
+                stmt.setInt(8, plot.getId().y);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT_SAFE,
+                    Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                int inserted = statement.executeUpdate();
+                if (inserted > 0) {
+                    try (ResultSet keys = statement.getGeneratedKeys()) {
+                        if (keys.next()) {
+                            plot.temp = keys.getInt(1);
+                            addPlotTask(plot, new UniqueStatement(
+                                "createPlotAndSettings_settings_" + plot.hashCode()) {
+                                @Override public void set(PreparedStatement stmt)
+                                    throws SQLException {
+                                    stmt.setInt(1, getId(plot));
+                                }
+
+                                @Override public PreparedStatement get() throws SQLException {
+                                    return SQLManager.this.connection.prepareStatement(
+                                        "INSERT INTO `" + SQLManager.this.prefix
+                                            + "plot_settings`(`plot_plot_id`) VALUES(?)");
+                                }
+                            });
+                            if (success != null) {
+                                addNotifyTask(success);
+                            }
+                            return;
+                        }
+                    }
+                }
+                if (failure != null) {
+                    failure.run();
+                }
+            }
+        });
+    }
+
+    public void commit() {
+        if (this.closed) {
+            return;
+        }
+        try {
+            if (!this.connection.getAutoCommit()) {
+                this.connection.commit();
+                this.connection.setAutoCommit(true);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
+        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, plot.getId().x);
+                stmt.setInt(2, plot.getId().y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.getArea().toString());
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection
+                    .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                statement.executeUpdate();
+                try (ResultSet keys = statement.getGeneratedKeys()) {
+                    if (keys.next()) {
+                        plot.temp = keys.getInt(1);
+                    }
+                }
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
+            }
+        });
+        addNotifyTask(whenDone);
+    }
+
+    /**
+     * Create tables.
+     */
+    @Override public void createTables() throws SQLException {
+        String[] tables =
+            new String[] {"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
+                "plot_rating", "plot_settings", "cluster", "player_meta"};
+        DatabaseMetaData meta = this.connection.getMetaData();
+        int create = 0;
+        for (String s : tables) {
+            ResultSet set = meta.getTables(null, null, this.prefix + s, new String[] {"TABLE"});
+            //            ResultSet set = meta.getTables(null, null, prefix + s, null);
+            if (!set.next()) {
+                create++;
+            }
+            set.close();
+        }
+        if (create == 0) {
+            return;
+        }
+        boolean addConstraint = create == tables.length;
+        PlotSquared.debug("Creating tables");
+        try (Statement stmt = this.connection.createStatement()) {
+            if (this.mySQL) {
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
+                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
+                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+                    + "PRIMARY KEY (`id`)"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` ("
+                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                    + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL,"
+                    + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` ("
+                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
+                    + "  `plot_plot_id` INT(11) NOT NULL,"
+                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
+                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
+                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`plot_plot_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB "
+                    + "DEFAULT CHARSET=utf8");
+                if (addConstraint) {
+                    stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `"
+                        + this.prefix
+                        + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
+                        + this.prefix + "plot` (`id`) ON DELETE CASCADE");
+                }
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
+                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL,"
+                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
+                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+                    + "PRIMARY KEY (`id`)"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` ("
+                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` ("
+                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
+                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
+                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
+                    + " `meta_id` INT(11) NOT NULL AUTO_INCREMENT,"
+                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
+                    + " `value` blob NOT NULL," + " PRIMARY KEY (`meta_id`)"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            } else {
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
+                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
+                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_helpers` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_trusted` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                    + "`comment` VARCHAR(40) NOT NULL,"
+                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+                    + "`sender` VARCHAR(40) NOT NULL" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
+                    + "  `plot_plot_id` INT(11) NOT NULL,"
+                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
+                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
+                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`plot_plot_id`)" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
+                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL,"
+                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
+                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "cluster_helpers` (`cluster_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "cluster_invited` (`cluster_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
+                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
+                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`cluster_id`)" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
+                    + " `meta_id` INTEGER PRIMARY KEY AUTOINCREMENT,"
+                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
+                    + " `value` blob NOT NULL" + ')');
+            }
+            stmt.executeBatch();
+            stmt.clearBatch();
+        }
+    }
+
+    @Override public void deleteSettings(final Plot plot) {
+        addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_settings` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteHelpers(final Plot plot) {
+        if (plot.getTrusted().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_helpers` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteTrusted(final Plot plot) {
+        if (plot.getMembers().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_trusted` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteDenied(final Plot plot) {
+        if (plot.getDenied().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_denied` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteComments(final Plot plot) {
+        addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, plot.getArea().toString());
+                stmt.setInt(2, plot.hashCode());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteRatings(final Plot plot) {
+        if (Settings.Enabled_Components.RATING_CACHE && plot.getSettings().getRatings().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_rating` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Delete a plot.
+     */
+    @Override public void delete(final Plot plot) {
+        PlotSquared.debug(
+            "Deleting plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
+                + plot.owner + " Index: " + plot.temp);
+        deleteSettings(plot);
+        deleteDenied(plot);
+        deleteHelpers(plot);
+        deleteTrusted(plot);
+        deleteComments(plot);
+        deleteRatings(plot);
+        addPlotTask(plot, new UniqueStatement("delete_plot") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Create plot settings
+     */
+    @Override public void createPlotSettings(final int id, Plot plot) {
+        PlotSquared.debug(
+            "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
+                + plot.owner + " Index: " + id);
+        addPlotTask(plot, new UniqueStatement("createPlotSettings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
+            }
+        });
+    }
+
+    @Override public int getClusterId(PlotCluster cluster) {
+        if (cluster.temp > 0) {
+            return cluster.temp;
+        }
+        try {
+            commit();
+            if (cluster.temp > 0) {
+                return cluster.temp;
+            }
+            int c_id;
+            try (PreparedStatement stmt = this.connection.prepareStatement(
+                "SELECT `id` FROM `" + this.prefix
+                    + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
+                stmt.setInt(1, cluster.getP1().x);
+                stmt.setInt(2, cluster.getP1().y);
+                stmt.setInt(3, cluster.getP2().x);
+                stmt.setInt(4, cluster.getP2().y);
+                stmt.setString(5, cluster.area.toString());
+                try (ResultSet resultSet = stmt.executeQuery()) {
+                    c_id = Integer.MAX_VALUE;
+                    while (resultSet.next()) {
+                        c_id = resultSet.getInt("id");
+                    }
+                }
+            }
+            if (c_id == Integer.MAX_VALUE || c_id == 0) {
+                if (cluster.temp > 0) {
+                    return cluster.temp;
+                }
+                throw new SQLException("Cluster does not exist in database");
+            }
+            cluster.temp = c_id;
+            return c_id;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    @Override public int getId(Plot plot) {
+        if (plot.temp > 0) {
+            return plot.temp;
+        }
+        try {
+            commit();
+            if (plot.temp > 0) {
+                return plot.temp;
+            }
+            int id;
+            try (PreparedStatement statement = this.connection.prepareStatement(
+                "SELECT `id` FROM `" + this.prefix
+                    + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
+                statement.setInt(1, plot.getId().x);
+                statement.setInt(2, plot.getId().y);
+                statement.setString(3, plot.getArea().toString());
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    id = Integer.MAX_VALUE;
+                    while (resultSet.next()) {
+                        id = resultSet.getInt("id");
+                    }
+                }
+            }
+            if (id == Integer.MAX_VALUE || id == 0) {
+                if (plot.temp > 0) {
+                    return plot.temp;
+                }
+                throw new SQLException("Plot does not exist in database");
+            }
+            plot.temp = id;
+            return id;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    @Override public void updateTables(int[] oldVersion) {
+        try {
+            if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
+                try (Statement stmt = this.connection.createStatement()) {
+                    stmt.executeUpdate(
+                        "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
+                } catch (SQLException ignored) {
+                }
+            }
+            DatabaseMetaData data = this.connection.getMetaData();
+            ResultSet rs =
+                data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
+            if (rs.next()) {
+                rs.close();
+                rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
+                if (!rs.next()) {
+                    rs.close();
+                    try (Statement statement = this.connection.createStatement()) {
+                        statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
+                        if (Storage.MySQL.USE) {
+                            statement.addBatch(
+                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                                    + "`comment` VARCHAR(40) NOT NULL,"
+                                    + "`inbox` VARCHAR(40) NOT NULL,"
+                                    + "`timestamp` INT(11) NOT NULL,"
+                                    + "`sender` VARCHAR(40) NOT NULL"
+                                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                        } else {
+                            statement.addBatch(
+                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                                    + "`comment` VARCHAR(40) NOT NULL,"
+                                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+                                    + "`sender` VARCHAR(40) NOT NULL" + ')');
+                        }
+                        statement.executeBatch();
+                    } catch (SQLException ignored) {
+                        try (Statement statement = this.connection.createStatement()) {
+                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
+                                + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
+                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
+                                + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
+                            statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
+                            statement.executeBatch();
+                        }
+                    }
+                }
+            }
+            rs.close();
+            rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
+            if (rs.next()) {
+                try (Statement statement = this.connection.createStatement()) {
+                    statement.executeUpdate("DELETE FROM `" + this.prefix
+                        + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
+                        + this.prefix + "plot`)");
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+
+                rs.close();
+                try (Statement statement = this.connection.createStatement()) {
+                    for (String table : new String[] {"plot_denied", "plot_helpers",
+                        "plot_trusted"}) {
+                        ResultSet result = statement.executeQuery(
+                            "SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table
+                                + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
+                        if (result.next()) {
+                            PlotSquared.debug("BACKING UP: " + this.prefix + table);
+                            result.close();
+                            statement.executeUpdate(
+                                "CREATE TABLE " + this.prefix + table + "_tmp AS SELECT * FROM "
+                                    + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
+                            statement.executeUpdate("DROP TABLE " + this.prefix + table);
+                            statement.executeUpdate(
+                                "CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "
+                                    + this.prefix + table + "_tmp");
+                            statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
+                            PlotSquared.debug("RESTORING: " + this.prefix + table);
+                        }
+                    }
+                } catch (SQLException e2) {
+                    e2.printStackTrace();
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public void deleteRows(ArrayList<Integer> rowIds, final String table, final String column) {
+        setBulk(rowIds, new StmtMod<Integer>() {
+
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
+                    size);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
+                    size);
+            }
+
+            @Override public String getCreateSQL() {
+                return "DELETE FROM `" + table + "` WHERE `" + column + "` = ?";
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, Integer obj)
+                throws SQLException {
+                stmt.setInt(i + 1, obj);
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, Integer obj)
+                throws SQLException {
+                stmt.setInt(i + 1, obj);
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, Integer obj) throws SQLException {
+                stmt.setInt(1, obj);
+            }
+        }, null);
+    }
+
+    /**
+     * Load all plots, helpers, denied, trusted, and every setting from DB into a {@link HashMap}.
+     */
+    @Override public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
+        HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
+        HashMap<Integer, Plot> plots = new HashMap<>();
+        try {
+            HashSet<String> areas = new HashSet<>();
+            if (PlotSquared.get().worlds.contains("worlds")) {
+                ConfigurationSection worldSection =
+                    PlotSquared.get().worlds.getConfigurationSection("worlds");
+                if (worldSection != null) {
+                    for (String worldKey : worldSection.getKeys(false)) {
+                        areas.add(worldKey);
+                        ConfigurationSection areaSection =
+                            worldSection.getConfigurationSection(worldKey + ".areas");
+                        if (areaSection != null) {
+                            areaSection.getKeys(false).forEach(s -> {
+                                String[] split = s.split("(?<![;])-");
+                                if (split.length == 3) {
+                                    areas.add(worldKey + ';' + split[0]);
+                                }
+                            });
+                        }
+                    }
+                }
+            }
+            HashMap<String, UUID> uuids = new HashMap<>();
+            HashMap<String, AtomicInteger> noExist = new HashMap<>();
+
+            /*
+             * Getting plots
+             */
+            try (Statement statement = this.connection.createStatement()) {
+                int id;
+                String owner;
+                UUID user;
+                try (ResultSet resultSet = statement.executeQuery(
+                    "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
+                        + this.prefix + "plot`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (resultSet.next()) {
+                        PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
+                            resultSet.getInt("plot_id_z"));
+                        id = resultSet.getInt("id");
+                        String areaid = resultSet.getString("world");
+                        if (!areas.contains(areaid)) {
+                            if (Settings.Enabled_Components.DATABASE_PURGER) {
+                                toDelete.add(id);
+                                continue;
+                            } else {
+                                AtomicInteger value = noExist.get(areaid);
+                                if (value != null) {
+                                    value.incrementAndGet();
+                                } else {
+                                    noExist.put(areaid, new AtomicInteger(1));
+                                }
+                            }
+                        }
+                        owner = resultSet.getString("owner");
+                        user = uuids.computeIfAbsent(owner, s -> {
+                            try {
+                                return UUID.fromString(s);
+                            } catch (IllegalArgumentException ignored) {
+                                if (Settings.UUID.FORCE_LOWERCASE) {
+                                    return UUID.nameUUIDFromBytes(
+                                        ("OfflinePlayer:" + s.toLowerCase())
+                                            .getBytes(Charsets.UTF_8));
+                                } else {
+                                    return UUID.nameUUIDFromBytes(
+                                        ("OfflinePlayer:" + s).getBytes(Charsets.UTF_8));
+                                }
+                            }
+                        });
+                        long time;
+                        try {
+                            Timestamp timestamp = resultSet.getTimestamp("timestamp");
+                            time = timestamp.getTime();
+                        } catch (SQLException exception) {
+                            String parsable = resultSet.getString("timestamp");
+                            try {
+                                time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
+                                    .getTime();
+                            } catch (ParseException e) {
+                                PlotSquared.debug(
+                                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
+                                        + plot_id + ") (" + parsable + ")");
+                                time = System.currentTimeMillis() + id;
+                            }
+                        }
+                        Plot plot = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
+                            new HashSet<>(), "", null, null, null,
+                            new boolean[] {false, false, false, false}, time, id);
+                        HashMap<PlotId, Plot> map = newPlots.get(areaid);
+                        if (map != null) {
+                            Plot last = map.put(plot.getId(), plot);
+                            if (last != null) {
+                                if (Settings.Enabled_Components.DATABASE_PURGER) {
+                                    toDelete.add(last.temp);
+                                } else {
+                                    PlotSquared.debug(
+                                        "&cPLOT #" + id + "(" + last + ") in `" + this.prefix
+                                            + "plot` is a duplicate. Delete this plot or set `database-purger: true` in the settings.yml.");
+                                }
+                            }
+                        } else {
+                            map = new HashMap<>();
+                            newPlots.put(areaid, map);
+                            map.put(plot.getId(), plot);
+                        }
+                        plots.put(id, plot);
+                    }
+                    deleteRows(toDelete, this.prefix + "plot", "id");
+                }
+                if (Settings.Enabled_Components.RATING_CACHE) {
+                    try (ResultSet r = statement.executeQuery(
+                        "SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix
+                            + "plot_rating`")) {
+                        ArrayList<Integer> toDelete = new ArrayList<>();
+                        while (r.next()) {
+                            id = r.getInt("plot_plot_id");
+                            owner = r.getString("player");
+                            user = uuids.computeIfAbsent(owner, UUID::fromString);
+                            Plot plot = plots.get(id);
+                            if (plot != null) {
+                                plot.getSettings().getRatings().put(user, r.getInt("rating"));
+                            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                                toDelete.add(id);
+                            } else {
+                                PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                    + ") in `plot_rating` does not exist. Create this plot or set `database-purger: true` in the "
+                                    + "settings.yml.");
+                            }
+                        }
+                        deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id");
+                    }
+                }
+
+                /*
+                 * Getting helpers
+                 */
+                try (ResultSet r = statement.executeQuery(
+                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (r.next()) {
+                        id = r.getInt("plot_plot_id");
+                        owner = r.getString("user_uuid");
+                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plot.getTrusted().add(user);
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                + ") in `plot_helpers` does not exist. Create this plot or set `database-purger: true` in the settings"
+                                + ".yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id");
+                }
+
+                /*
+                 * Getting trusted
+                 */
+                try (ResultSet r = statement.executeQuery(
+                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (r.next()) {
+                        id = r.getInt("plot_plot_id");
+                        owner = r.getString("user_uuid");
+                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plot.getMembers().add(user);
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                + ") in `plot_trusted` does not exist. Create this plot or set `database-purger: true` in the settings"
+                                + ".yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id");
+                }
+
+                /*
+                 * Getting denied
+                 */
+                try (ResultSet r = statement.executeQuery(
+                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (r.next()) {
+                        id = r.getInt("plot_plot_id");
+                        owner = r.getString("user_uuid");
+                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plot.getDenied().add(user);
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY " + id
+                                + " in `plot_denied` does not exist. Create this plot or set `database-purger: true` in the settings.yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id");
+                }
+
+                try (ResultSet resultSet = statement
+                    .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (resultSet.next()) {
+                        id = resultSet.getInt("plot_plot_id");
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plots.remove(id);
+                            String alias = resultSet.getString("alias");
+                            if (alias != null) {
+                                plot.getSettings().setAlias(alias);
+                            }
+                            String pos = resultSet.getString("position");
+                            switch (pos.toLowerCase()) {
+                                case "":
+                                case "default":
+                                case "0,0,0":
+                                case "center":
+                                    break;
+                                default:
+                                    try {
+                                        plot.getSettings().setPosition(BlockLoc.fromString(pos));
+                                    } catch (Exception ignored) {
+                                    }
+                            }
+                            int m = resultSet.getInt("merged");
+                            boolean[] merged = new boolean[4];
+                            for (int i = 0; i < 4; i++) {
+                                merged[3 - i] = (m & 1 << i) != 0;
+                            }
+                            plot.getSettings().setMerged(merged);
+                            String[] flags_string;
+                            String myflags = resultSet.getString("flags");
+                            if (myflags == null || myflags.isEmpty()) {
+                                flags_string = new String[] {};
+                            } else {
+                                flags_string = myflags.split(",");
+                            }
+                            HashMap<Flag<?>, Object> flags = new HashMap<>();
+                            boolean exception = false;
+                            for (String element : flags_string) {
+                                if (element.contains(":")) {
+                                    String[] split = element.split(":");
+                                    try {
+                                        String flag_str =
+                                            split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
+                                        Flag<?> flag = FlagManager.getOrCreateFlag(split[0]);
+                                        flags.put(flag, flag.parseValue(flag_str));
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                        exception = true;
+                                    }
+                                } else {
+                                    element =
+                                        element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
+                                    if (StringMan
+                                        .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
+                                        Flag flag = FlagManager.getOrCreateFlag(element);
+                                        if (flag == null) {
+                                            flag = new StringFlag(element) {
+                                                @Override public String getValueDescription() {
+                                                    return "Generic Filler Flag";
+                                                }
+                                            };
+                                        }
+                                        flags.put(flag, flag.parseValue(""));
+                                    } else {
+                                        PlotSquared.debug("INVALID FLAG: " + element);
+                                    }
+                                }
+                            }
+                            if (exception) {
+                                PlotSquared.debug("&cPlot #" + id + "(" + plot + ") | " + plot
+                                    + " had an invalid flag. A fix has been attempted.");
+                                PlotSquared.debug("&c" + myflags);
+                                this.setFlags(plot, flags);
+                            }
+                            plot.getSettings().flags = flags;
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                + ") in `plot_settings` does not exist. Create this plot or set `database-purger: true` in the settings"
+                                + ".yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id");
+                }
+            }
+            if (!plots.entrySet().isEmpty()) {
+                createEmptySettings(new ArrayList<>(plots.keySet()), null);
+                for (Entry<Integer, Plot> entry : plots.entrySet()) {
+                    entry.getValue().getSettings();
+                }
+            }
+            boolean invalidPlot = false;
+            for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
+                String worldName = entry.getKey();
+                invalidPlot = true;
+                PlotSquared.debug("&c[WARNING] Found " + entry.getValue().intValue()
+                    + " plots in DB for non existent world; '" + worldName + "'.");
+            }
+            if (invalidPlot) {
+                PlotSquared.debug(
+                    "&c[WARNING] - Please create the world/s or remove the plots using the purge command");
+            }
+        } catch (SQLException e) {
+            PlotSquared.debug("&7[WARN] Failed to load plots.");
+            e.printStackTrace();
+        }
+        return newPlots;
+    }
+
+    @Override public void setMerged(final Plot plot, final boolean[] merged) {
+        plot.getSettings().setMerged(merged);
+        addPlotTask(plot, new UniqueStatement("setMerged") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                int hash = MainUtil.hash(merged);
+                stmt.setInt(1, hash);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void swapPlots(Plot plot1, Plot plot2) {
+        final int id1 = getId(plot1);
+        final int id2 = getId(plot2);
+        final PlotId pos1 = plot1.getId();
+        final PlotId pos2 = plot2.getId();
+        addPlotTask(plot1, new UniqueStatement("swapPlots") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, pos2.x);
+                stmt.setInt(2, pos2.y);
+                stmt.setInt(3, id1);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+        addPlotTask(plot2, new UniqueStatement("swapPlots") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, pos1.x);
+                stmt.setInt(2, pos1.y);
+                stmt.setInt(3, id2);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override public void movePlot(final Plot original, final Plot newPlot) {
+        addPlotTask(original, new UniqueStatement("movePlot") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, newPlot.getId().x);
+                stmt.setInt(2, newPlot.getId().y);
+                stmt.setString(3, newPlot.getArea().toString());
+                stmt.setInt(4, getId(original));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ?, `world` = ? WHERE `id` = ?");
+            }
+        });
+        addPlotTask(newPlot, null);
+    }
+
+    @Override public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
+        final String flag_string = FlagManager.toString(flags);
+        addPlotTask(plot, new UniqueStatement("setFlags") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, flag_string);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void setAlias(final Plot plot, final String alias) {
+        addPlotTask(plot, new UniqueStatement("setAlias") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, alias);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Purge all plots with the following database IDs
+     */
+    @Override public void purgeIds(final Set<Integer> uniqueIds) {
+        addGlobalTask(() -> {
+            if (!uniqueIds.isEmpty()) {
+                try {
+                    ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
+                    String stmt_prefix = "";
+                    int size = uniqueIdsList.size();
+                    int packet = 990;
+                    int amount = size / packet;
+                    int count = 0;
+                    int last = -1;
+                    for (int j = 0; j <= amount; j++) {
+                        PlotSquared.debug("Purging " + (j * packet) + " / " + size);
+                        List<Integer> subList =
+                            uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                        if (subList.isEmpty()) {
+                            break;
+                        }
+                        StringBuilder idstr2 = new StringBuilder();
+                        stmt_prefix = "";
+                        for (Integer id : subList) {
+                            idstr2.append(stmt_prefix).append(id);
+                            stmt_prefix = " OR `id` = ";
+                        }
+                        stmt_prefix = "";
+                        StringBuilder idstr = new StringBuilder();
+                        for (Integer id : subList) {
+                            idstr.append(stmt_prefix).append(id);
+                            stmt_prefix = " OR `plot_plot_id` = ";
+                        }
+                        PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_denied` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_settings` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
+                                + idstr2);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        commit();
+                    }
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
+                    return;
+                }
+            }
+            PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
+        });
+    }
+
+    @Override public void purge(final PlotArea area, final Set<PlotId> plots) {
+        addGlobalTask(() -> {
+            try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
+                    + "plot` WHERE `world` = ?")) {
+                stmt.setString(1, area.toString());
+                Set<Integer> ids;
+                try (ResultSet r = stmt.executeQuery()) {
+                    ids = new HashSet<>();
+                    while (r.next()) {
+                        PlotId plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                        if (plots.contains(plot_id)) {
+                            ids.add(r.getInt("id"));
+                        }
+                    }
+                }
+                purgeIds(ids);
+            } catch (SQLException e) {
+                e.printStackTrace();
+                PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
+            }
+            for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
+                PlotId plotId = iterator.next();
+                iterator.remove();
+                PlotId id = new PlotId(plotId.x, plotId.y);
+                area.removePlot(id);
+            }
+        });
+    }
+
+    @Override public void setPosition(final Plot plot, final String position) {
+        addPlotTask(plot, new UniqueStatement("setPosition") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, position == null ? "" : position);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void removeComment(final Plot plot, final PlotComment comment) {
+        addPlotTask(plot, new UniqueStatement("removeComment") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                if (plot != null) {
+                    statement.setString(1, plot.getArea().toString());
+                    statement.setInt(2, plot.getId().hashCode());
+                    statement.setString(3, comment.comment);
+                    statement.setString(4, comment.inbox);
+                    statement.setString(5, comment.senderName);
+                } else {
+                    statement.setString(1, comment.comment);
+                    statement.setString(2, comment.inbox);
+                    statement.setString(3, comment.senderName);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (plot != null) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "DELETE FROM `" + SQLManager.this.prefix
+                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
+                }
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
+            }
+        });
+    }
+
+    @Override public void clearInbox(final Plot plot, final String inbox) {
+        addPlotTask(plot, new UniqueStatement("clearInbox") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                if (plot != null) {
+                    statement.setString(1, plot.getArea().toString());
+                    statement.setInt(2, plot.getId().hashCode());
+                    statement.setString(3, inbox);
+                } else {
+                    statement.setString(1, inbox);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (plot != null) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "DELETE FROM `" + SQLManager.this.prefix
+                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+                }
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
+            }
+        });
+    }
+
+    @Override public void getComments(final Plot plot, final String inbox,
+        final RunnableVal<List<PlotComment>> whenDone) {
+        addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                if (plot != null) {
+                    statement.setString(1, plot.getArea().toString());
+                    statement.setInt(2, plot.getId().hashCode());
+                    statement.setString(3, inbox);
+                } else {
+                    statement.setString(1, inbox);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (plot != null) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "SELECT * FROM `" + SQLManager.this.prefix
+                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+                }
+                return SQLManager.this.connection.prepareStatement(
+                    "SELECT * FROM `" + SQLManager.this.prefix
+                        + "plot_comments` WHERE `inbox` = ?");
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                ArrayList<PlotComment> comments = new ArrayList<>();
+                try (ResultSet set = statement.executeQuery()) {
+                    while (set.next()) {
+                        String sender = set.getString("sender");
+                        String world = set.getString("world");
+                        int hash = set.getInt("hashcode");
+                        PlotId id;
+                        if (hash != 0) {
+                            id = PlotId.unpair(hash);
+                        } else {
+                            id = null;
+                        }
+                        String msg = set.getString("comment");
+                        long timestamp = set.getInt("timestamp") * 1000;
+                        PlotComment comment =
+                            new PlotComment(world, id, msg, sender, inbox, timestamp);
+                        comments.add(comment);
+                        whenDone.value = comments;
+                    }
+                }
+                TaskManager.runTask(whenDone);
+            }
+        });
+    }
+
+    @Override public void setComment(final Plot plot, final PlotComment comment) {
+        addPlotTask(plot, new UniqueStatement("setComment") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, plot.getArea().toString());
+                statement.setInt(2, plot.getId().hashCode());
+                statement.setString(3, comment.comment);
+                statement.setString(4, comment.inbox);
+                statement.setInt(5, (int) (comment.timestamp / 1000));
+                statement.setString(6, comment.senderName);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
+            }
+        });
+    }
+
+    @Override public void removeTrusted(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("removeTrusted") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void removeMember(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("removeMember") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setTrusted(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setTrusted") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public void setMember(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setMember") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public void removeDenied(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("removeDenied") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setDenied(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setDenied") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public HashMap<UUID, Integer> getRatings(Plot plot) {
+        HashMap<UUID, Integer> map = new HashMap<>();
+        try (PreparedStatement statement = this.connection.prepareStatement(
+            "SELECT `rating`, `player` FROM `" + this.prefix
+                + "plot_rating` WHERE `plot_plot_id` = ? ")) {
+            statement.setInt(1, getId(plot));
+            try (ResultSet resultSet = statement.executeQuery()) {
+                while (resultSet.next()) {
+                    UUID uuid = UUID.fromString(resultSet.getString("player"));
+                    int rating = resultSet.getInt("rating");
+                    map.put(uuid, rating);
+                }
+            }
+        } catch (SQLException e) {
+            PlotSquared
+                .debug("&7[WARN] Failed to fetch rating for plot " + plot.getId().toString());
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+    @Override public void setRating(final Plot plot, final UUID rater, final int value) {
+        addPlotTask(plot, new UniqueStatement("setRating") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setInt(2, value);
+                statement.setString(3, rater.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
+            }
+        });
+    }
+
+    @Override public void delete(PlotCluster cluster) {
+        final int id = getClusterId(cluster);
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_settings` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_helpers` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_invited` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
+        final boolean replace) {
+        addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                if (replace) {
+                    stmt.setBytes(1, meta);
+                    stmt.setString(2, uuid.toString());
+                    stmt.setString(3, key);
+                } else {
+                    stmt.setString(1, uuid.toString());
+                    stmt.setString(2, key);
+                    stmt.setBytes(3, meta);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (replace) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "UPDATE `" + SQLManager.this.prefix
+                            + "player_meta` SET `value` = ? WHERE `uuid` = ? AND `key` = ?");
+                } else {
+                    return SQLManager.this.connection.prepareStatement(
+                        "INSERT INTO `" + SQLManager.this.prefix
+                            + "player_meta`(`uuid`, `key`, `value`) VALUES(?, ? ,?)");
+                }
+            }
+        });
+    }
+
+    @Override public void removePersistentMeta(final UUID uuid, final String key) {
+        addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, uuid.toString());
+                stmt.setString(2, key);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "player_meta` WHERE `uuid` = ? AND `key` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
+        addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "SELECT * FROM `" + SQLManager.this.prefix
+                        + "player_meta` WHERE `uuid` = ? ORDER BY `meta_id` ASC");
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                ResultSet resultSet = statement.executeQuery();
+
+                final Map<String, byte[]> metaMap = new HashMap<>();
+
+                while (resultSet.next()) {
+                    String key = resultSet.getString("key");
+                    byte[] bytes = resultSet.getBytes("value");
+                    metaMap.put(key, bytes);
+                }
+
+                resultSet.close();
+                TaskManager.runTaskAsync(() -> result.run(metaMap));
+            }
+
+        });
+    }
+
+    @Override public HashMap<String, Set<PlotCluster>> getClusters() {
+        LinkedHashMap<String, Set<PlotCluster>> newClusters = new LinkedHashMap<>();
+        HashMap<Integer, PlotCluster> clusters = new HashMap<>();
+        try {
+            HashSet<String> areas = new HashSet<>();
+            if (PlotSquared.get().worlds.contains("worlds")) {
+                ConfigurationSection worldSection =
+                    PlotSquared.get().worlds.getConfigurationSection("worlds");
+                if (worldSection != null) {
+                    for (String worldKey : worldSection.getKeys(false)) {
+                        areas.add(worldKey);
+                        ConfigurationSection areaSection =
+                            worldSection.getConfigurationSection(worldKey + ".areas");
+                        if (areaSection != null) {
+                            for (String areaKey : areaSection.getKeys(false)) {
+                                String[] split = areaKey.split("(?<![;])-");
+                                if (split.length == 3) {
+                                    areas.add(worldKey + ';' + split[0]);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            HashMap<String, UUID> uuids = new HashMap<>();
+            HashMap<String, Integer> noExist = new HashMap<>();
+            /*
+             * Getting clusters
+             */
+            try (Statement stmt = this.connection.createStatement()) {
+                ResultSet resultSet =
+                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
+                PlotCluster cluster;
+                String owner;
+                UUID user;
+                int id;
+                while (resultSet.next()) {
+                    PlotId pos1 =
+                        new PlotId(resultSet.getInt("pos1_x"), resultSet.getInt("pos1_z"));
+                    PlotId pos2 =
+                        new PlotId(resultSet.getInt("pos2_x"), resultSet.getInt("pos2_z"));
+                    id = resultSet.getInt("id");
+                    String areaid = resultSet.getString("world");
+                    if (!areas.contains(areaid)) {
+                        if (noExist.containsKey(areaid)) {
+                            noExist.put(areaid, noExist.get(areaid) + 1);
+                        } else {
+                            noExist.put(areaid, 1);
+                        }
+                    }
+                    owner = resultSet.getString("owner");
+                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    cluster = new PlotCluster(null, pos1, pos2, user, id);
+                    clusters.put(id, cluster);
+                    Set<PlotCluster> set =
+                        newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
+                    set.add(cluster);
+                }
+                //Getting helpers
+                resultSet = stmt.executeQuery(
+                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
+                while (resultSet.next()) {
+                    id = resultSet.getInt("cluster_id");
+                    owner = resultSet.getString("user_uuid");
+                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    cluster = clusters.get(id);
+                    if (cluster != null) {
+                        cluster.helpers.add(user);
+                    } else {
+                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                            + ") in cluster_helpers does not exist. Please create the cluster or remove this entry.");
+                    }
+                }
+                // Getting invited
+                resultSet = stmt.executeQuery(
+                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
+                while (resultSet.next()) {
+                    id = resultSet.getInt("cluster_id");
+                    owner = resultSet.getString("user_uuid");
+                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    cluster = clusters.get(id);
+                    if (cluster != null) {
+                        cluster.invited.add(user);
+                    } else {
+                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                            + ") in cluster_invited does not exist. Please create the cluster or remove this entry.");
+                    }
+                }
+                resultSet =
+                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
+                while (resultSet.next()) {
+                    id = resultSet.getInt("cluster_id");
+                    cluster = clusters.get(id);
+                    if (cluster != null) {
+                        String alias = resultSet.getString("alias");
+                        if (alias != null) {
+                            cluster.settings.setAlias(alias);
+                        }
+                        String pos = resultSet.getString("position");
+                        switch (pos.toLowerCase()) {
+                            case "":
+                            case "default":
+                            case "0,0,0":
+                            case "center":
+                                break;
+                            default:
+                                try {
+                                    BlockLoc loc = BlockLoc.fromString(pos);
+                                    cluster.settings.setPosition(loc);
+                                } catch (Exception ignored) {
+                                }
+                        }
+                        int m = resultSet.getInt("merged");
+                        boolean[] merged = new boolean[4];
+                        for (int i = 0; i < 4; i++) {
+                            merged[3 - i] = (m & 1 << i) != 0;
+                        }
+                        cluster.settings.setMerged(merged);
+                        String[] flags_string;
+                        String myflags = resultSet.getString("flags");
+                        if (myflags == null || myflags.isEmpty()) {
+                            flags_string = new String[] {};
+                        } else {
+                            flags_string = myflags.split(",");
+                        }
+                        HashMap<Flag<?>, Object> flags = new HashMap<>();
+                        for (String element : flags_string) {
+                            if (element.contains(":")) {
+                                String[] split = element.split(":");
+                                String flag_str =
+                                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
+                                Flag flag = FlagManager.getOrCreateFlag(split[0]);
+                                if (flag == null) {
+                                    flag = new StringFlag(split[0]) {
+                                        @Override public String getValueDescription() {
+                                            return "Generic Filler Flag";
+                                        }
+                                    };
+                                }
+                                flags.put(flag, flag.parseValue(flag_str));
+                            } else {
+                                Flag flag = FlagManager.getOrCreateFlag(element);
+                                if (flag == null) {
+                                    flag = new StringFlag(element) {
+                                        @Override public String getValueDescription() {
+                                            return "Generic Filler Flag";
+                                        }
+                                    };
+                                }
+                                flags.put(flag, flag.parseValue(""));
+                            }
+                        }
+                        cluster.settings.flags = flags;
+                    } else {
+                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                            + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
+                    }
+                }
+                resultSet.close();
+            }
+            boolean invalidPlot = false;
+            for (Entry<String, Integer> entry : noExist.entrySet()) {
+                String a = entry.getKey();
+                invalidPlot = true;
+                PlotSquared.debug("&c[WARNING] Found " + noExist.get(a)
+                    + " clusters in DB for non existent area; '" + a + "'.");
+            }
+            if (invalidPlot) {
+                PlotSquared.debug(
+                    "&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
+            }
+        } catch (SQLException e) {
+            PlotSquared.debug("&7[WARN] Failed to load clusters.");
+            e.printStackTrace();
+        }
+        return newClusters;
+    }
+
+    @Override public void setClusterName(final PlotCluster cluster, final String name) {
+        addClusterTask(cluster, new UniqueStatement("setClusterName") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, name);
+                stmt.setInt(2, getClusterId(cluster));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
+            }
+        });
+        cluster.settings.setAlias(name);
+    }
+
+    @Override public void removeHelper(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("removeHelper") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setHelper(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("setHelper") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public void createCluster(final PlotCluster cluster) {
+        addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, cluster.getP1().x);
+                stmt.setInt(2, cluster.getP1().y);
+                stmt.setInt(3, cluster.getP2().x);
+                stmt.setInt(4, cluster.getP2().y);
+                stmt.setString(5, cluster.owner.toString());
+                stmt.setString(6, cluster.area.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER,
+                    Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                statement.executeUpdate();
+                try (ResultSet keys = statement.getGeneratedKeys()) {
+                    if (keys.next()) {
+                        cluster.temp = keys.getInt(1);
+                    }
+                }
+            }
+        });
+        addClusterTask(cluster,
+            new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
+                @Override public void set(PreparedStatement stmt) throws SQLException {
+                    stmt.setInt(1, getClusterId(cluster));
+                    stmt.setString(2, cluster.getAlias());
+                }
+
+                @Override public PreparedStatement get() throws SQLException {
+                    return SQLManager.this.connection.prepareStatement(
+                        "INSERT INTO `" + SQLManager.this.prefix
+                            + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?)");
+                }
+            });
+    }
+
+    @Override public void resizeCluster(final PlotCluster current, PlotId min, PlotId max) {
+        final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
+        final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
+        current.setP1(min);
+        current.setP2(max);
+
+        addClusterTask(current, new UniqueStatement("resizeCluster") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, pos1.x);
+                stmt.setInt(2, pos1.y);
+                stmt.setInt(3, pos2.x);
+                stmt.setInt(4, pos2.y);
+                stmt.setInt(5, getClusterId(current));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override public void setPosition(final PlotCluster cluster, final String position) {
+        addClusterTask(cluster, new UniqueStatement("setPosition") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, position);
+                stmt.setInt(2, getClusterId(cluster));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
+            }
+        });
+    }
+
+    @Override public void removeInvited(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("removeInvited") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setInvited(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("setInvited") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public boolean deleteTables() {
+        try (Statement stmt = this.connection.createStatement();
+            PreparedStatement statement = this.connection
+                .prepareStatement("DROP TABLE `" + this.prefix + "plot`")) {
+            close();
+            this.closed = false;
+            SQLManager.this.connection = this.database.forceConnection();
+            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_invited`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_helpers`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_rating`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_settings`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_trusted`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_helpers`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_denied`");
+            stmt.executeBatch();
+            stmt.clearBatch();
+            statement.executeUpdate();
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+
+        }
+        return true;
+    }
+
+    @Override public void validateAllPlots(Set<Plot> toValidate) {
+        if (!isValid()) {
+            reconnect();
+        }
+        PlotSquared.debug(
+            "$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
+        commit();
+        while (true) {
+            if (!sendBatch()) {
+                break;
+            }
+        }
+        try {
+            if (this.connection.getAutoCommit()) {
+                this.connection.setAutoCommit(false);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        HashMap<String, HashMap<PlotId, Plot>> database = getPlots();
+        ArrayList<Plot> toCreate = new ArrayList<>();
+        for (Plot plot : toValidate) {
+            if (plot.temp == -1) {
+                continue;
+            }
+            HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
+            if (worldPlots == null) {
+                PlotSquared.debug("&8 - &7Creating plot (1): " + plot);
+                toCreate.add(plot);
+                continue;
+            }
+            Plot dataPlot = worldPlots.remove(plot.getId());
+            if (dataPlot == null) {
+                PlotSquared.debug("&8 - &7Creating plot (2): " + plot);
+                toCreate.add(plot);
+                continue;
+            }
+            // owner
+            if (!plot.owner.equals(dataPlot.owner)) {
+                PlotSquared
+                    .debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
+                setOwner(plot, plot.owner);
+            }
+            // trusted
+            if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
+                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
+                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
+                toRemove.removeAll(plot.getTrusted());
+                toAdd.removeAll(dataPlot.getTrusted());
+                PlotSquared.debug(
+                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: "
+                        + plot);
+                if (!toRemove.isEmpty()) {
+                    for (UUID uuid : toRemove) {
+                        removeTrusted(plot, uuid);
+                    }
+                }
+                if (!toAdd.isEmpty()) {
+                    for (UUID uuid : toAdd) {
+                        setTrusted(plot, uuid);
+                    }
+                }
+            }
+            if (!plot.getMembers().equals(dataPlot.getMembers())) {
+                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
+                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
+                toRemove.removeAll(plot.getMembers());
+                toAdd.removeAll(dataPlot.getMembers());
+                PlotSquared.debug(
+                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: "
+                        + plot);
+                if (!toRemove.isEmpty()) {
+                    for (UUID uuid : toRemove) {
+                        removeMember(plot, uuid);
+                    }
+                }
+                if (!toAdd.isEmpty()) {
+                    for (UUID uuid : toAdd) {
+                        setMember(plot, uuid);
+                    }
+                }
+            }
+            if (!plot.getDenied().equals(dataPlot.getDenied())) {
+                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
+                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
+                toRemove.removeAll(plot.getDenied());
+                toAdd.removeAll(dataPlot.getDenied());
+                PlotSquared.debug(
+                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: "
+                        + plot);
+                if (!toRemove.isEmpty()) {
+                    for (UUID uuid : toRemove) {
+                        removeDenied(plot, uuid);
+                    }
+                }
+                if (!toAdd.isEmpty()) {
+                    for (UUID uuid : toAdd) {
+                        setDenied(plot, uuid);
+                    }
+                }
+            }
+            boolean[] pm = plot.getMerged();
+            boolean[] dm = dataPlot.getMerged();
+            if (pm[0] != dm[0] || pm[1] != dm[1]) {
+                PlotSquared.debug("&8 - &7Correcting merge for: " + plot);
+                setMerged(dataPlot, plot.getMerged());
+            }
+            HashMap<Flag<?>, Object> pf = plot.getFlags();
+            HashMap<Flag<?>, Object> df = dataPlot.getFlags();
+            if (!pf.isEmpty() && !df.isEmpty()) {
+                if (pf.size() != df.size() || !StringMan
+                    .isEqual(StringMan.joinOrdered(pf.values(), ","),
+                        StringMan.joinOrdered(df.values(), ","))) {
+                    PlotSquared.debug("&8 - &7Correcting flags for: " + plot);
+                    setFlags(plot, pf);
+                }
+            }
+        }
+
+        for (Entry<String, HashMap<PlotId, Plot>> entry : database.entrySet()) {
+            HashMap<PlotId, Plot> map = entry.getValue();
+            if (!map.isEmpty()) {
+                for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
+                    PlotSquared.debug("$1Plot was deleted: " + entry2.getValue().toString()
+                        + "// TODO implement this when sure safe");
+                }
+            }
+        }
+        commit();
+    }
+
+    @Override
+    public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
+        final PlotId max) {
+        addGlobalTask(() -> {
+            if (min == null) {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `world` = ? WHERE `world` = ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `world` = ? WHERE `world` = ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.setInt(3, min.x);
+                    stmt.setInt(4, max.x);
+                    stmt.setInt(5, min.y);
+                    stmt.setInt(6, max.y);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.setInt(3, max.x);
+                    stmt.setInt(4, max.y);
+                    stmt.setInt(5, min.x);
+                    stmt.setInt(6, min.y);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @Override public void replaceUUID(final UUID old, final UUID now) {
+        addGlobalTask(() -> {
+            try (Statement stmt = SQLManager.this.connection.createStatement()) {
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
+                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now.toString()
+                        + "' WHERE `owner` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @Override public void close() {
+        try {
+            this.closed = true;
+            this.connection.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public abstract class UniqueStatement {
+
+        public final String method;
+
+        public UniqueStatement(String method) {
+            this.method = method;
+        }
+
+        public void addBatch(PreparedStatement statement) throws SQLException {
+            statement.addBatch();
+        }
+
+        public void execute(PreparedStatement statement) throws SQLException {
+            statement.executeBatch();
+        }
+
+        public abstract PreparedStatement get() throws SQLException;
+
+        public abstract void set(PreparedStatement stmt) throws SQLException;
+    }
+
+
+    private class UUIDPair {
+
+        public final int id;
+        public final UUID uuid;
+
+        public UUIDPair(int id, UUID uuid) {
+            this.id = id;
+            this.uuid = uuid;
+        }
+    }
+
+
+    private class SettingsPair {
+
+        public final int id;
+        public final PlotSettings settings;
+
+        public SettingsPair(int id, PlotSettings settings) {
+            this.id = id;
+            this.settings = settings;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
new file mode 100644
index 000000000..d42b1d67b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
@@ -0,0 +1,86 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.*;
+
+/**
+ * Connects to and uses a SQLite database.
+ */
+public class SQLite implements Database {
+
+    private final String dbLocation;
+    private Connection connection;
+
+    /**
+     * Creates a new SQLite instance
+     *
+     * @param dbLocation Location of the Database (Must end in .db)
+     */
+    public SQLite(File dbLocation) {
+        this.dbLocation = dbLocation.getAbsolutePath();
+    }
+
+    @Override public Connection openConnection() throws SQLException, ClassNotFoundException {
+        if (checkConnection()) {
+            return this.connection;
+        }
+        if (!PlotSquared.get().IMP.getDirectory().exists()) {
+            PlotSquared.get().IMP.getDirectory().mkdirs();
+        }
+        File file = new File(this.dbLocation);
+        if (!file.exists()) {
+            try {
+                file.createNewFile();
+            } catch (IOException ignored) {
+                PlotSquared.debug("&cUnable to create database!");
+            }
+        }
+        Class.forName("org.sqlite.JDBC");
+        this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation);
+        return this.connection;
+    }
+
+    @Override public boolean checkConnection() throws SQLException {
+        return (this.connection != null) && !this.connection.isClosed();
+    }
+
+    @Override public Connection getConnection() {
+        return this.connection;
+    }
+
+    @Override public boolean closeConnection() throws SQLException {
+        if (this.connection == null) {
+            return false;
+        }
+        this.connection.close();
+        this.connection = null;
+        return true;
+    }
+
+    @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException {
+        if (checkConnection()) {
+            openConnection();
+        }
+        try (Statement statement = this.connection.createStatement()) {
+            return statement.executeQuery(query);
+        }
+    }
+
+    @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException {
+        if (checkConnection()) {
+            openConnection();
+        }
+        try (Statement statement = this.connection.createStatement()) {
+            return statement.executeUpdate(query);
+        }
+    }
+
+    @Override public Connection forceConnection() throws SQLException, ClassNotFoundException {
+        Class.forName("org.sqlite.JDBC");
+        this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation);
+        return this.connection;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
new file mode 100644
index 000000000..2f3b5217f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
@@ -0,0 +1,39 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+public abstract class StmtMod<T> {
+
+    public abstract String getCreateMySQL(int size);
+
+    public String getCreateMySQL(int size, String query, int params) {
+        StringBuilder statement = new StringBuilder(query);
+        for (int i = 0; i < size - 1; i++) {
+            statement.append('(').append(StringMan.repeat(",?", params).substring(1)).append("),");
+        }
+        statement.append('(').append(StringMan.repeat(",?", params).substring(1)).append(')');
+        return statement.toString();
+    }
+
+    public String getCreateSQLite(int size, String query, int params) {
+        StringBuilder statement = new StringBuilder(query);
+        String modParams = StringMan.repeat(",?", params).substring(1);
+        for (int i = 0; i < size - 1; i++) {
+            statement.append("UNION SELECT ").append(modParams).append(' ');
+        }
+        return statement.toString();
+    }
+
+    public abstract String getCreateSQLite(int size);
+
+    public abstract String getCreateSQL();
+
+    public abstract void setMySQL(PreparedStatement stmt, int i, T obj) throws SQLException;
+
+    public abstract void setSQLite(PreparedStatement stmt, int i, T obj) throws SQLException;
+
+    public abstract void setSQL(PreparedStatement stmt, T obj) throws SQLException;
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
new file mode 100644
index 000000000..a492c9c0f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
@@ -0,0 +1,45 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+
+public class BooleanFlag extends Flag<Boolean> {
+
+    public BooleanFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return value + "";
+    }
+
+    @Override public Boolean parseValue(String value) {
+        switch (value.toLowerCase()) {
+            case "1":
+            case "yes":
+            case "allow":
+            case "true":
+                return true;
+            case "0":
+            case "no":
+            case "deny":
+            case "false":
+                return false;
+            default:
+                return null;
+        }
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a boolean (true|false)";
+    }
+
+    public boolean isTrue(Plot plot) {
+        Boolean value = FlagManager.getPlotFlagRaw(plot, this);
+        return Boolean.TRUE == value;
+    }
+
+    public boolean isFalse(Plot plot) {
+        Boolean value = FlagManager.getPlotFlagRaw(plot, this);
+        return Boolean.FALSE == value;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
new file mode 100644
index 000000000..9b46a2cde
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
@@ -0,0 +1,25 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+public class DoubleFlag extends Flag<Double> {
+
+    public DoubleFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return value.toString();
+    }
+
+    @Override public Double parseValue(String value) {
+        try {
+            return Double.parseDouble(value);
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a number.";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
new file mode 100644
index 000000000..3ba6b2457
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
@@ -0,0 +1,31 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.Arrays;
+import java.util.HashSet;
+
+public class EnumFlag extends Flag<String> {
+    private final HashSet<String> values;
+
+    public EnumFlag(String name, String... values) {
+        super(name);
+        this.values = new HashSet<>(Arrays.asList(values));
+    }
+
+    @Override public String valueToString(Object value) {
+        return value.toString();
+    }
+
+    @Override public String parseValue(String value) {
+        value = value.toLowerCase();
+        if (values.contains(value)) {
+            return value;
+        }
+        return null;
+    }
+
+    @Override public String getValueDescription() {
+        return "Must be one of: " + StringMan.getString(values);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
new file mode 100644
index 000000000..3b247d87a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
@@ -0,0 +1,60 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+
+public abstract class Flag<V> implements StringComparison.StringComparable {
+
+    private final String name;
+    private boolean reserved = false;
+
+    /**
+     * Flag object used to store basic information for a Plot. Flags are a
+     * key/value pair. For a flag to be usable by a player, you need to
+     * register it with PlotSquared.
+     *
+     * @param name the flag name
+     */
+    public Flag(String name) {
+        this.name = name;
+    }
+
+    public Flag<V> reserve() {
+        this.reserved = true;
+        return this;
+    }
+
+    public boolean isReserved() {
+        return this.reserved;
+    }
+
+    public void unreserve() {
+        this.reserved = false;
+    }
+
+    public void register() {
+        Flags.registerFlag(this);
+    }
+
+    public abstract String valueToString(Object value);
+
+    @Override public final String toString() {
+        return "Flag { name='" + getName() + "'}";
+    }
+
+    public abstract V parseValue(String value);
+
+    public abstract String getValueDescription();
+
+    public final String getName() {
+        return this.name;
+    }
+
+    public boolean isSet(Plot plot) {
+        return FlagManager.getPlotFlagRaw(plot, this) != null;
+    }
+
+    @Override public String getComparableString() {
+        return getName();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
new file mode 100644
index 000000000..1bac3e526
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -0,0 +1,299 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.google.common.collect.ImmutableSet;
+
+import java.util.*;
+
+/**
+ * Flag Manager Utility.
+ */
+public class FlagManager {
+
+    public static <V> Optional<V> getPlotFlag(Plot plot, Flag<V> key) {
+        V value = FlagManager.getPlotFlagRaw(plot, key);
+        return Optional.ofNullable(value);
+    }
+
+    /**
+     * Reserve a flag so that it cannot be set by players.
+     *
+     * @param flag the flag to reserve
+     * @return false if the flag was already reserved, otherwise true
+     */
+    public static boolean reserveFlag(Flag<?> flag) {
+        if (flag.isReserved()) {
+            return false;
+        }
+        flag.reserve();
+        return true;
+    }
+
+    /**
+     * Check if a flag is reserved.
+     *
+     * @param flag the flag to check
+     * @return true if the flag is reserved, false otherwise
+     */
+    public static boolean isReserved(Flag<?> flag) {
+        return flag.isReserved();
+    }
+
+    /**
+     * Get an immutable set of reserved flags.
+     *
+     * @return a set of reserved flags
+     */
+    public static Set<Flag<?>> getReservedFlags() {
+        ImmutableSet.Builder<Flag<?>> reserved = ImmutableSet.builder();
+        for (Flag flag : Flags.getFlags()) {
+            if (flag.isReserved()) {
+                reserved.add(flag);
+            }
+        }
+        return reserved.build();
+    }
+
+    /**
+     * Unreserve a flag.
+     *
+     * @param flag the flag to unreserve
+     * @return true if the flag was unreserved
+     */
+    public static boolean unreserveFlag(Flag<?> flag) {
+        if (flag.isReserved()) {
+            flag.unreserve();
+            return true;
+        }
+        return false;
+    }
+
+    public static String toString(HashMap<Flag<?>, Object> flags) {
+        StringBuilder flag_string = new StringBuilder();
+        int i = 0;
+        for (Map.Entry<Flag<?>, Object> entry : flags.entrySet()) {
+            try {
+                Flag flag = entry.getKey();
+                if (i != 0) {
+                    flag_string.append(',');
+                }
+                flag_string.append(
+                    flag.getName() + ':' + flag.valueToString(entry.getValue()).replaceAll(":", "¯")
+                        .replaceAll(",", "´"));
+                i++;
+            } catch (Exception e) {
+                PlotSquared
+                    .debug("Failed to parse flag: " + entry.getKey() + "->" + entry.getValue());
+                e.printStackTrace();
+            }
+        }
+        return flag_string.toString();
+    }
+
+    public static <V> V getSettingFlag(PlotArea area, PlotSettings settings, Flag<V> id) {
+        Object value;
+        if (settings.flags.isEmpty() || ((value = settings.flags.get(id)) == null)) {
+            if (area == null || area.DEFAULT_FLAGS.isEmpty()) {
+                return null;
+            }
+            return (V) area.DEFAULT_FLAGS.get(id);
+        }
+        return (V) value;
+    }
+
+    /**
+     * Returns the raw flag<br>
+     * - Faster
+     * - You should not modify the flag
+     *
+     * @param plot
+     * @param flag
+     * @return
+     */
+    @SuppressWarnings("deprecation") public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
+        if (plot.owner == null) {
+            return null;
+        }
+        return getSettingFlag(plot.getArea(), plot.getSettings(), flag);
+    }
+
+    /**
+     * Add a flag to a plot.
+     *
+     * @param origin
+     * @param flag
+     * @param value
+     */
+    public static <V> boolean addPlotFlag(Plot origin, Flag<V> flag, Object value) {
+        boolean result = EventUtil.manager.callFlagAdd(flag, origin);
+        if (!result) {
+            return false;
+        }
+        for (Plot plot : origin.getConnectedPlots()) {
+            plot.getFlags().put(flag, value);
+            plot.reEnter(); //TODO fix this so FlagTest will run during compile
+            DBFunc.setFlags(plot, plot.getFlags());
+        }
+        return true;
+    }
+
+    /**
+     * Returns a map of the {@link Flag}s and their values for the specified plot.
+     *
+     * @param plot the plot
+     * @return a map of the flags and values for the plot, returns an empty map for unowned plots
+     */
+    public static Map<Flag<?>, Object> getPlotFlags(Plot plot) {
+        if (!plot.hasOwner()) {
+            return Collections.emptyMap();
+        }
+        return getSettingFlags(plot.getArea(), plot.getSettings());
+    }
+
+    public static HashMap<Flag<?>, Object> getPlotFlags(PlotArea area, PlotSettings settings,
+        boolean ignorePluginflags) {
+        HashMap<Flag<?>, Object> flags = null;
+        if (area != null && !area.DEFAULT_FLAGS.isEmpty()) {
+            flags = new HashMap<>(area.DEFAULT_FLAGS.size());
+            flags.putAll(area.DEFAULT_FLAGS);
+        }
+        if (ignorePluginflags) {
+            if (flags == null) {
+                flags = new HashMap<>(settings.flags.size());
+            }
+            for (Map.Entry<Flag<?>, Object> flag : settings.flags.entrySet()) {
+                if (flag.getKey().isReserved()) {
+                    continue;
+                }
+                flags.put(flag.getKey(), flag.getValue());
+            }
+            return flags;
+        } else if (flags == null) {
+            return settings.flags;
+        } else {
+            flags.putAll(settings.flags);
+        }
+        return flags;
+    }
+
+    public static Map<Flag<?>, Object> getSettingFlags(PlotArea area, PlotSettings settings) {
+        return getPlotFlags(area, settings, false);
+    }
+
+    /**
+     * Removes a flag from a certain plot.
+     *
+     * @param origin the plot to remove the flag from
+     * @param id     the flag to remove
+     * @return true if the plot contained the flag and was removed successfully
+     */
+    public static boolean removePlotFlag(Plot origin, Flag<?> id) {
+        for (Plot plot : origin.getConnectedPlots()) {
+            Object value = plot.getFlags().remove(id);
+            if (value == null) {
+                return false;
+            }
+            if (plot == origin) {
+                boolean result = EventUtil.manager.callFlagRemove(id, plot, value);
+                if (!result) {
+                    plot.getFlags().put(id, value);
+                    return false;
+                }
+            }
+            plot.reEnter();
+            DBFunc.setFlags(plot, plot.getFlags());
+        }
+        return true;
+    }
+
+    public static void setPlotFlags(Plot origin, HashMap<Flag<?>, Object> flags) {
+        for (Plot plot : origin.getConnectedPlots()) {
+            if (flags != null && !flags.isEmpty()) {
+                plot.getFlags().clear();
+                for (Map.Entry<Flag<?>, Object> flag : flags.entrySet()) {
+                    plot.getFlags().put(flag.getKey(), flag.getValue());
+                }
+            } else if (plot.getFlags().isEmpty()) {
+                return;
+            } else {
+                plot.getFlags().clear();
+            }
+            plot.reEnter();
+            DBFunc.setFlags(plot, plot.getFlags());
+        }
+    }
+
+    /**
+     * Get a list of registered {@link Flag} objects based on player permissions.
+     *
+     * @param player the player
+     * @return a list of flags the specified player can use
+     */
+    public static List<Flag> getFlags(PlotPlayer player) {
+        List<Flag> returnFlags = new ArrayList<>();
+        for (Flag flag : Flags.getFlags()) {
+            if (Permissions
+                .hasPermission(player, "plots.set.flag." + flag.getName().toLowerCase())) {
+                returnFlags.add(flag);
+            }
+        }
+        return returnFlags;
+    }
+
+    /**
+     * Get a {@link Flag} specified by the specified {@code String}.
+     *
+     * @param string the flag name
+     * @return the {@code Flag} object defined by the {@code String}
+     */
+    public static Flag<?> getFlag(String string) {
+        return Flags.getFlag(string);
+    }
+
+    public static Flag<?> getFlag(String string, boolean ignoreReserved) {
+        Flag<?> flag = Flags.getFlag(string);
+        if (!ignoreReserved && flag != null && flag.isReserved()) {
+            return null;
+        }
+        return flag;
+    }
+
+    public static Flag<?> getOrCreateFlag(String string) {
+        Flag<?> flag = Flags.getFlag(string);
+        if (flag == null) {
+            flag = new StringFlag(string) {
+                @Override public String getValueDescription() {
+                    return "Generic Filler Flag";
+                }
+            };
+            flag.register();
+        }
+        return flag;
+    }
+
+
+    public static Map<Flag<?>, Object> parseFlags(List<String> flagStrings) {
+        HashMap<Flag<?>, Object> map = new HashMap<>();
+
+        for (String key : flagStrings) {
+            String[] split;
+            if (key.contains(";")) {
+                split = key.split(";");
+            } else {
+                split = key.split(":");
+            }
+            Flag<?> flag = getOrCreateFlag(split[0]);
+            Object value = flag.parseValue(split[1]);
+            map.put(flag, value);
+        }
+
+        return map;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
new file mode 100644
index 000000000..6b86a890a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
@@ -0,0 +1,207 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+
+public final class Flags {
+
+    public static final StringFlag MUSIC = new StringFlag("music");
+    public static final StringFlag DESCRIPTION = new StringFlag("description");
+    public static final IntegerListFlag ANALYSIS =
+        (IntegerListFlag) new IntegerListFlag("analysis").reserve();
+    public static final StringFlag GREETING = new StringFlag("greeting");
+    public static final StringFlag FAREWELL = new StringFlag("farewell");
+    public static final IntervalFlag FEED = new IntervalFlag("feed");
+    public static final IntervalFlag HEAL = new IntervalFlag("heal");
+    public static final GameModeFlag GAMEMODE = new GameModeFlag("gamemode");
+    public static final GameModeFlag GUEST_GAMEMODE = new GameModeFlag("guest-gamemode");
+    public static final StringFlag DONE = (StringFlag) new StringFlag("done").reserve();
+    public static final BooleanFlag REDSTONE = new BooleanFlag("redstone");
+    public static final BooleanFlag FLY = new BooleanFlag("fly");
+    public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave");
+    public static final BooleanFlag TITLES = new BooleanFlag("titles");
+    public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter");
+    public static final LongFlag TIME = new LongFlag("time");
+    public static final PlotWeatherFlag WEATHER = new PlotWeatherFlag("weather");
+    public static final DoubleFlag PRICE = new DoubleFlag("price") {
+        @Override public Double parseValue(String input) {
+            Double value = super.parseValue(input);
+            return value != null && value > 0 ? value : null;
+        }
+
+        @Override public String getValueDescription() {
+            return "Flag value must be a positive number.";
+        }
+    };
+    public static final BooleanFlag EXPLOSION = new BooleanFlag("explosion");
+    public static final BooleanFlag GRASS_GROW = new BooleanFlag("grass-grow");
+    public static final BooleanFlag VINE_GROW = new BooleanFlag("vine-grow");
+    public static final BooleanFlag MYCEL_GROW = new BooleanFlag("mycel-grow");
+    public static final BooleanFlag DISABLE_PHYSICS = new BooleanFlag("disable-physics");
+    public static final BooleanFlag LIQUID_FLOW = new BooleanFlag("liquid-flow");
+    public static final BooleanFlag SNOW_MELT = new BooleanFlag("snow-melt");
+    public static final BooleanFlag SNOW_FORM = new BooleanFlag("snow-form");
+    public static final BooleanFlag ICE_MELT = new BooleanFlag("ice-melt");
+    public static final BooleanFlag FIRE_SPREAD = new BooleanFlag("fire-spread");
+    public static final BooleanFlag BLOCK_BURN = new BooleanFlag("block-burn");
+    public static final BooleanFlag ICE_FORM = new BooleanFlag("ice-form");
+    public static final BooleanFlag BLOCK_IGNITION = new BooleanFlag("block-ignition");
+    public static final BooleanFlag SOIL_DRY = new BooleanFlag("soil-dry");
+    public static final StringListFlag BLOCKED_CMDS = new StringListFlag("blocked-cmds");
+    public static final PlotBlockListFlag USE = new PlotBlockListFlag("use");
+    public static final PlotBlockListFlag BREAK = new PlotBlockListFlag("break");
+    public static final PlotBlockListFlag PLACE = new PlotBlockListFlag("place");
+    public static final BooleanFlag DEVICE_INTERACT = new BooleanFlag("device-interact");
+    public static final BooleanFlag VEHICLE_BREAK = new BooleanFlag("vehicle-break");
+    public static final BooleanFlag VEHICLE_PLACE = new BooleanFlag("vehicle-place");
+    public static final BooleanFlag VEHICLE_USE = new BooleanFlag("vehicle-use");
+    public static final BooleanFlag HANGING_BREAK = new BooleanFlag("hanging-break");
+    public static final BooleanFlag HANGING_PLACE = new BooleanFlag("hanging-place");
+    public static final BooleanFlag HANGING_INTERACT = new BooleanFlag("hanging-interact");
+    public static final BooleanFlag MISC_PLACE = new BooleanFlag("misc-place");
+    public static final BooleanFlag MISC_BREAK = new BooleanFlag("misc-break");
+    public static final BooleanFlag MISC_INTERACT = new BooleanFlag("misc-interact");
+    public static final BooleanFlag VILLAGER_INTERACT = new BooleanFlag("villager-interact");
+    public static final BooleanFlag PLAYER_INTERACT = new BooleanFlag("player-interact");
+    public static final BooleanFlag TAMED_ATTACK = new BooleanFlag("tamed-attack");
+    public static final BooleanFlag TAMED_INTERACT = new BooleanFlag("tamed-interact");
+    public static final BooleanFlag ANIMAL_ATTACK = new BooleanFlag("animal-attack");
+    public static final BooleanFlag ANIMAL_INTERACT = new BooleanFlag("animal-interact");
+    public static final BooleanFlag HOSTILE_ATTACK = new BooleanFlag("hostile-attack");
+    public static final BooleanFlag HOSTILE_INTERACT = new BooleanFlag("hostile-interact");
+    public static final BooleanFlag MOB_PLACE = new BooleanFlag("mob-place");
+    public static final BooleanFlag MOB_BREAK = new BooleanFlag("mob-break");
+    public static final BooleanFlag FORCEFIELD = new BooleanFlag("forcefield");
+    public static final BooleanFlag INVINCIBLE = new BooleanFlag("invincible");
+    public static final BooleanFlag ITEM_DROP = new BooleanFlag("item-drop");
+    public static final BooleanFlag INSTABREAK = new BooleanFlag("instabreak");
+    public static final BooleanFlag DROP_PROTECTION = new BooleanFlag("drop-protection");
+    public static final BooleanFlag PVP = new BooleanFlag("pvp");
+    public static final BooleanFlag PVE = new BooleanFlag("pve");
+    public static final BooleanFlag NO_WORLDEDIT = new BooleanFlag("no-worldedit");
+    public static final IntegerFlag MISC_CAP = new IntegerFlag("misc-cap");
+    public static final IntegerFlag ENTITY_CAP = new IntegerFlag("entity-cap");
+    public static final IntegerFlag MOB_CAP = new IntegerFlag("mob-cap");
+    public static final IntegerFlag ANIMAL_CAP = new IntegerFlag("animal-cap");
+    public static final IntegerFlag HOSTILE_CAP = new IntegerFlag("hostile-cap");
+    public static final IntegerFlag VEHICLE_CAP = new IntegerFlag("vehicle-cap");
+    public static final Flag<?> KEEP = new Flag("keep") {
+        @Override public String valueToString(Object value) {
+            return value.toString();
+        }
+
+        @Override public Object parseValue(String value) {
+            if (MathMan.isInteger(value)) {
+                return Long.parseLong(value);
+            }
+            switch (value.toLowerCase()) {
+                case "true":
+                    return true;
+                case "false":
+                    return false;
+                default:
+                    return MainUtil.timeToSec(value) * 1000 + System.currentTimeMillis();
+            }
+        }
+
+        @Override public String getValueDescription() {
+            return "Flag value must a timestamp or a boolean";
+        }
+    };
+    public static final BooleanFlag SLEEP = new BooleanFlag("sleep");
+    public static final TeleportDenyFlag DENY_TELEPORT = new TeleportDenyFlag("deny-teleport");
+    public static final BooleanFlag DENY_EXIT = new BooleanFlag("deny-exit");
+
+
+    private static final HashMap<String, Flag<?>> flags;
+
+    static {
+        flags = new HashMap<>();
+        try {
+            for (Field field : Flags.class.getFields()) {
+                String fieldName = field.getName().replace("_", "-").toLowerCase();
+                Object fieldValue = field.get(null);
+                if (!(fieldValue instanceof Flag)) {
+                    continue;
+                }
+                Flag flag = (Flag) fieldValue;
+                if (!flag.getName().equals(fieldName)) {
+                    PlotSquared.debug(
+                        Flags.class + "Field doesn't match: " + fieldName + " != " + flag
+                            .getName());
+                }
+                flags.put(flag.getName(), flag);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Get an immutable collection of registered flags.
+     *
+     * @return a collection of registered flags.
+     */
+    public static Collection<Flag<?>> getFlags() {
+        return Collections.unmodifiableCollection(flags.values());
+    }
+
+    public static Flag<?> getFlag(String flag) {
+        return flags.get(flag);
+    }
+
+    public static void registerFlag(final Flag<?> flag) {
+        final Flag<?> duplicate = flags.put(flag.getName(), flag);
+        if (duplicate != null) {
+            PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+                @Override public void run(PlotArea value) {
+                    Object remove;
+                    if (value.DEFAULT_FLAGS.containsKey(duplicate)) {
+                        remove = value.DEFAULT_FLAGS.remove(duplicate);
+                        try {
+                            if (remove instanceof Collection
+                                && remove.getClass().getMethod("toString").getDeclaringClass()
+                                == Object.class) {
+                                value.DEFAULT_FLAGS.put(flag,
+                                    flag.parseValue(StringMan.join((Collection) remove, ',')));
+                            } else {
+                                value.DEFAULT_FLAGS.put(flag, flag.parseValue("" + remove));
+                            }
+                        } catch (NoSuchMethodException neverHappens) {
+                            neverHappens.printStackTrace();
+                        }
+                    }
+                }
+            });
+            PlotSquared.get().foreachPlotRaw(new RunnableVal<Plot>() {
+                @Override public void run(Plot value) {
+                    if (value.getFlags().containsKey(duplicate)) {
+                        Object remove = value.getFlags().remove(duplicate);
+                        try {
+                            if (remove instanceof Collection
+                                && remove.getClass().getMethod("toString").getDeclaringClass()
+                                == Object.class) {
+                                value.getFlags().put(flag,
+                                    flag.parseValue(StringMan.join((Collection) remove, ',')));
+                            } else {
+                                value.getFlags().put(flag, flag.parseValue("" + remove));
+                            }
+                        } catch (NoSuchMethodException neverHappens) {
+                            neverHappens.printStackTrace();
+                        }
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
new file mode 100644
index 000000000..3467171f2
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
@@ -0,0 +1,40 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
+
+public class GameModeFlag extends Flag<PlotGameMode> {
+
+    public GameModeFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return ((PlotGameMode) value).getName();
+    }
+
+    @Override public PlotGameMode parseValue(String value) {
+        switch (value.toLowerCase()) {
+            case "survival":
+            case "s":
+            case "0":
+                return PlotGameMode.SURVIVAL;
+            case "creative":
+            case "c":
+            case "1":
+                return PlotGameMode.CREATIVE;
+            case "adventure":
+            case "a":
+            case "2":
+                return PlotGameMode.ADVENTURE;
+            case "spectator":
+            case "3":
+                return PlotGameMode.SPECTATOR;
+            default:
+                return PlotGameMode.NOT_SET;
+        }
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a gamemode: 'survival', 'creative', 'adventure' or 'spectator'";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
new file mode 100644
index 000000000..2cafed4d1
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
@@ -0,0 +1,41 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+
+public class IntegerFlag extends Flag<Integer> {
+
+    public IntegerFlag(String name) {
+        super(name);
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a whole number";
+    }
+
+    @Override public String valueToString(Object value) {
+        return value.toString();
+    }
+
+    @Override public Integer parseValue(String value) {
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+    }
+
+    public boolean isEqual(Plot plot, int value) {
+        Integer existing = FlagManager.getPlotFlagRaw(plot, this);
+        return existing != null && existing == value;
+    }
+
+    public boolean isMore(Plot plot, int value) {
+        Integer existing = FlagManager.getPlotFlagRaw(plot, this);
+        return existing != null && existing > value;
+    }
+
+    public boolean isLess(Plot plot, int value) {
+        Integer existing = FlagManager.getPlotFlagRaw(plot, this);
+        return existing != null && existing < value;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
new file mode 100644
index 000000000..e46071b86
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
@@ -0,0 +1,31 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class IntegerListFlag extends ListFlag<List<Integer>> {
+
+    public IntegerListFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return StringMan.join((List<Integer>) value, ",");
+    }
+
+    @Override public List<Integer> parseValue(String value) {
+        String[] split = value.split(",");
+        ArrayList<Integer> numbers = new ArrayList<>();
+        for (String element : split) {
+            numbers.add(Integer.parseInt(element));
+        }
+        return numbers;
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be an integer list";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
new file mode 100644
index 000000000..ab7100cb6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
@@ -0,0 +1,41 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+public class IntervalFlag extends Flag<Integer[]> {
+
+    public IntervalFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        Integer[] value1 = (Integer[]) value;
+        return value1[0] + " " + value1[1];
+    }
+
+    @Override public Integer[] parseValue(String value) {
+        int seconds;
+        int amount;
+        String[] values = value.split(" ");
+        if (values.length < 2) {
+            seconds = 1;
+            try {
+                amount = Integer.parseInt(values[0]);
+            } catch (NumberFormatException ignored) {
+                return null;
+            }
+        } else if (values.length == 2) {
+            try {
+                amount = Integer.parseInt(values[0]);
+                seconds = Integer.parseInt(values[1]);
+            } catch (NumberFormatException ignored) {
+                return null;
+            }
+        } else {
+            return null;
+        }
+        return new Integer[] {amount, seconds};
+    }
+
+    @Override public String getValueDescription() {
+        return "Value(s) must be numeric. /plot set flag <flag> <interval> [amount]";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java
new file mode 100644
index 000000000..518c3df11
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java
@@ -0,0 +1,17 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+
+import java.util.Collection;
+
+public abstract class ListFlag<V extends Collection<?>> extends Flag<V> {
+
+    public ListFlag(String name) {
+        super(name);
+    }
+
+    public boolean contains(Plot plot, Object value) {
+        V existing = plot.getFlag(this, null);
+        return existing != null && existing.contains(value);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
new file mode 100644
index 000000000..464780af8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
@@ -0,0 +1,24 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+public class LongFlag extends Flag<Long> {
+
+    public LongFlag(String name) {
+        super(name);
+    }
+
+    @Override public Long parseValue(String value) {
+        try {
+            return Long.parseLong(value);
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
+
+    @Override public String valueToString(Object value) {
+        return value.toString();
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a whole number (large numbers allowed)";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
new file mode 100644
index 000000000..56cd0e901
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
@@ -0,0 +1,33 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.HashSet;
+
+public class PlotBlockListFlag extends ListFlag<HashSet<PlotBlock>> {
+
+    public PlotBlockListFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return StringMan.join((HashSet<PlotBlock>) value, ",");
+    }
+
+    @Override public HashSet<PlotBlock> parseValue(final String value) {
+        final HashSet<PlotBlock> list = new HashSet<>();
+        for (final String item : value.split(",")) {
+            final PlotBlock block = PlotSquared.get().IMP.getLegacyMappings().fromAny(item);
+            if (block != null) {
+                list.add(block);
+            }
+        }
+        return list;
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a block list";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
new file mode 100644
index 000000000..e6f93ee2d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
@@ -0,0 +1,35 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
+
+public class PlotWeatherFlag extends Flag<PlotWeather> {
+
+    public PlotWeatherFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return value.toString();
+    }
+
+    @Override public PlotWeather parseValue(String value) {
+        switch (value.toLowerCase()) {
+            case "rain":
+            case "storm":
+            case "on":
+            case "lightning":
+            case "thunder":
+                return PlotWeather.RAIN;
+            case "clear":
+            case "off":
+            case "sun":
+                return PlotWeather.CLEAR;
+            default:
+                return PlotWeather.RESET;
+        }
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag must be a weather: 'rain' or 'sun'";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
new file mode 100644
index 000000000..36a68f66b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
@@ -0,0 +1,21 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+
+public class StringFlag extends Flag<String> {
+
+    public StringFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return value.toString();
+    }
+
+    @Override public String parseValue(String value) {
+        return value;
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be alphanumeric. Some special characters are allowed.";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
new file mode 100644
index 000000000..8f02a3801
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
@@ -0,0 +1,26 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class StringListFlag extends ListFlag<List<String>> {
+
+    public StringListFlag(String name) {
+        super(name);
+    }
+
+    @Override public String valueToString(Object value) {
+        return StringMan.join((List<String>) value, ",");
+    }
+
+    @Override public List<String> parseValue(String value) {
+        return new ArrayList<>(Arrays.asList(value.split(",")));
+    }
+
+    @Override public String getValueDescription() {
+        return "Flag value must be a string list";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
new file mode 100644
index 000000000..b24f14faf
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
@@ -0,0 +1,39 @@
+package com.github.intellectualsites.plotsquared.plot.flag;
+
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+public class TeleportDenyFlag extends EnumFlag {
+    public TeleportDenyFlag(String name) {
+        super(name, "trusted", "members", "nonmembers", "nontrusted", "nonowners");
+    }
+
+    public boolean allowsTeleport(PlotPlayer player, Plot plot) {
+        String value = plot.getFlag(this, null);
+        if (value == null || !plot.hasOwner()) {
+            return true;
+        }
+        boolean result;
+        switch (plot.getFlag(this, null)) {
+            case "trusted":
+                result = !plot.getTrusted().contains(player.getUUID());
+                break;
+            case "members":
+                result = !plot.getMembers().contains(player.getUUID());
+                break;
+            case "nonmembers":
+                result = !plot.isAdded(player.getUUID());
+                break;
+            case "nontrusted":
+                result = !plot.getTrusted().contains(player.getUUID()) && !plot
+                    .isOwner(player.getUUID());
+                break;
+            case "nonowners":
+                result = !plot.isOwner(player.getUUID());
+                break;
+            default:
+                return true;
+        }
+        return result || player.hasPermission("plots.admin.entry.denied");
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
new file mode 100644
index 000000000..1d18cbdcd
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
@@ -0,0 +1,141 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+
+import java.util.Set;
+
+public class AugmentedUtils {
+
+    private static boolean enabled = true;
+
+    public static void bypass(boolean bypass, Runnable run) {
+        enabled = bypass;
+        run.run();
+        enabled = true;
+    }
+
+    public static boolean generate(final String world, final int cx, final int cz,
+        LocalBlockQueue queue) {
+        if (!enabled) {
+            return false;
+        }
+
+        final int bx = cx << 4;
+        final int bz = cz << 4;
+        RegionWrapper region = new RegionWrapper(bx, bx + 15, bz, bz + 15);
+        Set<PlotArea> areas = PlotSquared.get().getPlotAreas(world, region);
+        if (areas.isEmpty()) {
+            return false;
+        }
+        boolean toReturn = false;
+        for (final PlotArea area : areas) {
+            if (area.TYPE == 0) {
+                return false;
+            }
+            if (area.TERRAIN == 3) {
+                continue;
+            }
+            IndependentPlotGenerator generator = area.getGenerator();
+            if (generator == null) {
+                continue;
+            }
+            // Mask
+            if (queue == null) {
+                queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
+            }
+            LocalBlockQueue primaryMask;
+            // coords
+            int bxx;
+            int bzz;
+            int txx;
+            int tzz;
+            // gen
+            if (area.TYPE == 2) {
+                bxx = Math.max(0, area.getRegion().minX - bx);
+                bzz = Math.max(0, area.getRegion().minZ - bz);
+                txx = Math.min(15, area.getRegion().maxX - bx);
+                tzz = Math.min(15, area.getRegion().maxZ - bz);
+                primaryMask = new DelegateLocalBlockQueue(queue) {
+                    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
+                        if (area.contains(x, z)) {
+                            return super.setBlock(x, y, z, id);
+                        }
+                        return false;
+                    }
+
+                    @Override public boolean setBiome(int x, int z, String biome) {
+                        if (area.contains(x, z)) {
+                            return super.setBiome(x, z, biome);
+                        }
+                        return false;
+                    }
+                };
+            } else {
+                bxx = bzz = 0;
+                txx = tzz = 15;
+                primaryMask = queue;
+            }
+            LocalBlockQueue secondaryMask;
+            PlotBlock air = StringPlotBlock.EVERYTHING;
+            if (area.TERRAIN == 2) {
+                PlotManager manager = area.getPlotManager();
+                final boolean[][] canPlace = new boolean[16][16];
+                boolean has = false;
+                for (int x = bxx; x <= txx; x++) {
+                    for (int z = bzz; z <= tzz; z++) {
+                        int rx = x + bx;
+                        int rz = z + bz;
+                        boolean can = manager.getPlotId(area, rx, 0, rz) == null;
+                        if (can) {
+                            for (int y = 1; y < 128; y++) {
+                                queue.setBlock(rx, y, rz, air);
+                            }
+                            canPlace[x][z] = can;
+                            has = true;
+                        }
+                    }
+                }
+                if (!has) {
+                    continue;
+                }
+                toReturn = true;
+                secondaryMask = new DelegateLocalBlockQueue(primaryMask) {
+                    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
+                        if (canPlace[x - bx][z - bz]) {
+                            return super.setBlock(x, y, z, id);
+                        }
+                        return false;
+                    }
+
+                    @Override public boolean setBiome(int x, int y, String biome) {
+                        return super.setBiome(x, y, biome);
+                    }
+                };
+            } else {
+                secondaryMask = primaryMask;
+                for (int x = bxx; x <= txx; x++) {
+                    for (int z = bzz; z <= tzz; z++) {
+                        for (int y = 1; y < 128; y++) {
+                            queue.setBlock(bx + x, y, bz + z, air);
+                        }
+                    }
+                }
+                toReturn = true;
+            }
+            ScopedLocalBlockQueue scoped =
+                new ScopedLocalBlockQueue(secondaryMask, new Location(area.worldname, bx, 0, bz),
+                    new Location(area.worldname, bx + 15, 255, bz + 15));
+            generator.generateChunk(scoped, area);
+            generator.populateChunk(scoped, area);
+        }
+        if (queue != null) {
+            queue.flush();
+        }
+        return toReturn;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
new file mode 100644
index 000000000..a553140b2
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -0,0 +1,467 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+
+import java.util.List;
+
+/**
+ * A plot manager with square plots which tessellate on a square grid with the following sections: ROAD, WALL, BORDER (wall), PLOT, FLOOR (plot).
+ */
+public class ClassicPlotManager extends SquarePlotManager {
+
+    @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
+        BlockBucket blocks) {
+        switch (component) {
+            case "floor":
+                setFloor(plotArea, plotId, blocks);
+                return true;
+            case "wall":
+                setWallFilling(plotArea, plotId, blocks);
+                return true;
+            case "all":
+                setAll(plotArea, plotId, blocks);
+                return true;
+            case "air":
+                setAir(plotArea, plotId, blocks);
+                return true;
+            case "main":
+                setMain(plotArea, plotId, blocks);
+                return true;
+            case "middle":
+                setMiddle(plotArea, plotId, blocks);
+                return true;
+            case "outline":
+                setOutline(plotArea, plotId, blocks);
+                return true;
+            case "border":
+                setWall(plotArea, plotId, blocks);
+                return true;
+        }
+        return false;
+    }
+
+    @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        setWallFilling(dpw, plot.getId(), dpw.WALL_FILLING);
+        setWall(dpw, plot.getId(), dpw.WALL_BLOCK);
+        GlobalBlockQueue.IMP.addTask(whenDone);
+        return true;
+    }
+
+    public boolean setFloor(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        Plot plot = plotArea.getPlotAbs(plotId);
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        if (plot.isBasePlot()) {
+            ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+            for (RegionWrapper region : plot.getRegions()) {
+                Location pos1 =
+                    new Location(plotArea.worldname, region.minX, dpw.PLOT_HEIGHT, region.minZ);
+                Location pos2 =
+                    new Location(plotArea.worldname, region.maxX, dpw.PLOT_HEIGHT, region.maxZ);
+                queue.setCuboid(pos1, pos2, blocks);
+            }
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setAll(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        Plot plot = plotArea.getPlotAbs(plotId);
+        if (!plot.isBasePlot()) {
+            return false;
+        }
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        int maxY = plotArea.getPlotManager().getWorldHeight();
+        for (RegionWrapper region : plot.getRegions()) {
+            Location pos1 = new Location(plotArea.worldname, region.minX, 1, region.minZ);
+            Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
+            queue.setCuboid(pos1, pos2, blocks);
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setAir(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        Plot plot = plotArea.getPlotAbs(plotId);
+        if (!plot.isBasePlot()) {
+            return false;
+        }
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        int maxY = plotArea.getPlotManager().getWorldHeight();
+        for (RegionWrapper region : plot.getRegions()) {
+            Location pos1 =
+                new Location(plotArea.worldname, region.minX, dpw.PLOT_HEIGHT + 1, region.minZ);
+            Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
+            queue.setCuboid(pos1, pos2, blocks);
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setMain(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        Plot plot = plotArea.getPlotAbs(plotId);
+        if (!plot.isBasePlot()) {
+            return false;
+        }
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        for (RegionWrapper region : plot.getRegions()) {
+            Location pos1 = new Location(plotArea.worldname, region.minX, 1, region.minZ);
+            Location pos2 =
+                new Location(plotArea.worldname, region.maxX, dpw.PLOT_HEIGHT - 1, region.maxZ);
+            queue.setCuboid(pos1, pos2, blocks);
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setMiddle(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        Plot plot = plotArea.getPlotAbs(plotId);
+        if (!plot.isBasePlot()) {
+            return false;
+        }
+        Location[] corners = plot.getCorners();
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+
+        int x = MathMan.average(corners[0].getX(), corners[1].getX());
+        int z = MathMan.average(corners[0].getZ(), corners[1].getZ());
+        queue.setBlock(x, dpw.PLOT_HEIGHT, z, blocks.getBlock());
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setOutline(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        if (dpw.ROAD_WIDTH == 0) {
+            return false;
+        }
+        Plot plot = plotArea.getPlotAbs(plotId);
+        Location bottom = plot.getBottomAbs();
+        Location top = plot.getExtendedTopAbs();
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        int maxY = plotArea.getPlotManager().getWorldHeight();
+        if (!plot.getMerged(0)) {
+            int z = bottom.getZ();
+            for (int x = bottom.getX(); x <= top.getX(); x++) {
+                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        if (!plot.getMerged(3)) {
+            int x = bottom.getX();
+            for (int z = bottom.getZ(); z <= top.getZ(); z++) {
+                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+
+        if (!plot.getMerged(2)) {
+            int z = top.getZ();
+            for (int x = bottom.getX(); x <= top.getX(); x++) {
+                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        if (!plot.getMerged(1)) {
+            int x = top.getX();
+            for (int z = bottom.getZ(); z <= top.getZ(); z++) {
+                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        if (plot.isBasePlot()) {
+            for (RegionWrapper region : plot.getRegions()) {
+                Location pos1 = new Location(plotArea.worldname, region.minX, maxY, region.minZ);
+                Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
+                queue.setCuboid(pos1, pos2, blocks);
+            }
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setWallFilling(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        if (dpw.ROAD_WIDTH == 0) {
+            return false;
+        }
+        Plot plot = plotArea.getPlotAbs(plotId);
+        Location bot = plot.getExtendedBottomAbs()
+            .subtract(plot.getMerged(3) ? 0 : 1, 0, plot.getMerged(0) ? 0 : 1);
+        Location top = plot.getExtendedTopAbs().add(1, 0, 1);
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        if (!plot.getMerged(0)) {
+            int z = bot.getZ();
+            for (int x = bot.getX(); x < top.getX(); x++) {
+                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        if (!plot.getMerged(3)) {
+            int x = bot.getX();
+            for (int z = bot.getZ(); z < top.getZ(); z++) {
+                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        if (!plot.getMerged(2)) {
+            int z = top.getZ();
+            for (int x = bot.getX(); x < top.getX() + (plot.getMerged(1) ? 0 : 1); x++) {
+                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        if (!plot.getMerged(1)) {
+            int x = top.getX();
+            for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(2) ? 0 : 1); z++) {
+                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                    queue.setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    public boolean setWall(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        if (dpw.ROAD_WIDTH == 0) {
+            return false;
+        }
+        Plot plot = plotArea.getPlotAbs(plotId);
+        Location bot = plot.getExtendedBottomAbs()
+            .subtract(plot.getMerged(3) ? 0 : 1, 0, plot.getMerged(0) ? 0 : 1);
+        Location top = plot.getExtendedTopAbs().add(1, 0, 1);
+        PseudoRandom random = new PseudoRandom();
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        int y = dpw.WALL_HEIGHT + 1;
+        if (!plot.getMerged(0)) {
+            int z = bot.getZ();
+            for (int x = bot.getX(); x < top.getX(); x++) {
+                queue.setBlock(x, y, z, blocks.getBlock());
+            }
+        }
+        if (!plot.getMerged(3)) {
+            int x = bot.getX();
+            for (int z = bot.getZ(); z < top.getZ(); z++) {
+                queue.setBlock(x, y, z, blocks.getBlock());
+            }
+        }
+        if (!plot.getMerged(2)) {
+            int z = top.getZ();
+            for (int x = bot.getX(); x < top.getX() + (plot.getMerged(1) ? 0 : 1); x++) {
+                queue.setBlock(x, y, z, blocks.getBlock());
+            }
+        }
+        if (!plot.getMerged(1)) {
+            int x = top.getX();
+            for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(2) ? 0 : 1); z++) {
+                queue.setBlock(x, y, z, blocks.getBlock());
+            }
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    /**
+     * PLOT MERGING.
+     */
+    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
+        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+        int sx = pos2.getX() + 1;
+        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int sz = pos1.getZ() - 2;
+        int ez = pos2.getZ() + 2;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        int maxY = plotArea.getPlotManager().getWorldHeight();
+        queue.setCuboid(
+            new Location(plotArea.worldname, sx, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+                sz + 1), new Location(plotArea.worldname, ex, maxY, ez - 1),
+            PlotBlock.get((short) 0, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx, 0, sz + 1),
+            new Location(plotArea.worldname, ex, 0, ez - 1), PlotBlock.get((short) 7, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz + 1),
+            new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT, ez - 1), dpw.WALL_FILLING);
+        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT + 1, sz + 1),
+            new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT + 1, ez - 1), dpw.WALL_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, ex, 1, sz + 1),
+            new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT, ez - 1), dpw.WALL_FILLING);
+        queue.setCuboid(new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT + 1, sz + 1),
+            new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT + 1, ez - 1), dpw.WALL_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
+            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
+        queue.enqueue();
+        return true;
+    }
+
+    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
+        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+        int sz = pos2.getZ() + 1;
+        int ez = sz + dpw.ROAD_WIDTH - 1;
+        int sx = pos1.getX() - 2;
+        int ex = pos2.getX() + 2;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        queue.setCuboid(
+            new Location(plotArea.worldname, sx + 1, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+                sz),
+            new Location(plotArea.worldname, ex - 1, plotArea.getPlotManager().getWorldHeight(),
+                ez), PlotBlock.get((short) 0, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 0, sz),
+            new Location(plotArea.worldname, ex - 1, 0, ez), PlotBlock.get((short) 7, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz),
+            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT, sz), dpw.WALL_FILLING);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.WALL_HEIGHT + 1, sz),
+            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT + 1, sz), dpw.WALL_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, ez),
+            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT, ez), dpw.WALL_FILLING);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.WALL_HEIGHT + 1, ez),
+            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT + 1, ez), dpw.WALL_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
+            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
+        queue.enqueue();
+        return true;
+    }
+
+    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+        int sx = pos2.getX() + 1;
+        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int sz = pos2.getZ() + 1;
+        int ez = sz + dpw.ROAD_WIDTH - 1;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.ROAD_HEIGHT + 1, sz + 1),
+            new Location(plotArea.worldname, ex - 1, dpw.getPlotManager().getWorldHeight(), ez - 1),
+            PlotBlock.get((short) 0, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 0, sz + 1),
+            new Location(plotArea.worldname, ex - 1, 0, ez - 1),
+            PlotBlock.get((short) 7, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
+            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
+        queue.enqueue();
+        return true;
+    }
+
+    @Override public boolean removeRoadEast(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
+        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+        int sx = pos2.getX() + 1;
+        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int sz = pos1.getZ() - 1;
+        int ez = pos2.getZ() + 1;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        queue.setCuboid(
+            new Location(plotArea.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+                sz),
+            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
+            PlotBlock.get((short) 0, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz + 1),
+            new Location(plotArea.worldname, ex, dpw.PLOT_HEIGHT - 1, ez - 1), dpw.MAIN_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.PLOT_HEIGHT, sz + 1),
+            new Location(plotArea.worldname, ex, dpw.PLOT_HEIGHT, ez - 1), dpw.TOP_BLOCK);
+        queue.enqueue();
+        return true;
+    }
+
+    @Override public boolean removeRoadSouth(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
+        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+        int sz = pos2.getZ() + 1;
+        int ez = sz + dpw.ROAD_WIDTH - 1;
+        int sx = pos1.getX() - 1;
+        int ex = pos2.getX() + 1;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        queue.setCuboid(
+            new Location(plotArea.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+                sz),
+            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
+            PlotBlock.get((short) 0, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz),
+            new Location(plotArea.worldname, ex - 1, dpw.PLOT_HEIGHT - 1, ez), dpw.MAIN_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.PLOT_HEIGHT, sz),
+            new Location(plotArea.worldname, ex - 1, dpw.PLOT_HEIGHT, ez), dpw.TOP_BLOCK);
+        queue.enqueue();
+        return true;
+    }
+
+    @Override public boolean removeRoadSouthEast(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        Location location = getPlotTopLocAbs(dpw, plot.getId());
+        int sx = location.getX() + 1;
+        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int sz = location.getZ() + 1;
+        int ez = sz + dpw.ROAD_WIDTH - 1;
+        LocalBlockQueue queue = plotArea.getQueue(false);
+        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.ROAD_HEIGHT + 1, sz),
+            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
+            PlotBlock.get((short) 0, (byte) 0));
+        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz),
+            new Location(plotArea.worldname, ex, dpw.ROAD_HEIGHT - 1, ez), dpw.MAIN_BLOCK);
+        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.ROAD_HEIGHT, sz),
+            new Location(plotArea.worldname, ex, dpw.ROAD_HEIGHT, ez), dpw.TOP_BLOCK);
+        queue.enqueue();
+        return true;
+    }
+
+    /**
+     * Finishing off plot merging by adding in the walls surrounding the plot (OPTIONAL)(UNFINISHED).
+     */
+    @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+        final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
+        plotIds.forEach(id -> setWall(plotArea, id, block));
+        return true;
+    }
+
+    @Override public boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+        final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
+        plotIds.forEach(id -> setWall(plotArea, id, block));
+        return true;
+    }
+
+    @Override public boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+        return true;
+    }
+
+    @Override public boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+        return true;
+    }
+
+    @Override public boolean claimPlot(PlotArea plotArea, Plot plot) {
+        final BlockBucket claim = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
+        setWall(plotArea, plot.getId(), claim);
+        return true;
+    }
+
+    @Override public String[] getPlotComponents(PlotArea plotArea, PlotId plotId) {
+        return new String[] {"main", "floor", "air", "all", "border", "wall", "outline", "middle"};
+    }
+
+    /**
+     * Remove sign for a plot.
+     */
+    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
+        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+        plot = plot.getBasePlot(false);
+        Location bot = plot.getBottomAbs();
+        return new Location(plotArea.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1,
+            bot.getZ() - 2);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
new file mode 100644
index 000000000..755f694d6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
@@ -0,0 +1,117 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+
+import javax.annotation.Nonnull;
+import java.lang.reflect.Field;
+import java.util.Locale;
+
+@SuppressWarnings("WeakerAccess") public abstract class ClassicPlotWorld extends SquarePlotWorld {
+
+    public int ROAD_HEIGHT = 62;
+    public int PLOT_HEIGHT = 62;
+    public int WALL_HEIGHT = 62;
+    public BlockBucket MAIN_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone"));
+    // new PlotBlock[] {PlotBlock.get("stone")};
+    public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass_block"));
+    //new PlotBlock[] {PlotBlock.get("grass")};
+    public BlockBucket WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone_slab"));
+    // PlotBlock.get((short) 44, (byte) 0);
+    public BlockBucket CLAIMED_WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("sandstone_slab"));
+    // PlotBlock.get((short) 44, (byte) 1);
+    public BlockBucket WALL_FILLING = BlockBucket.withSingle(PlotBlock.get("stone"));
+    //PlotBlock.get((short) 1, (byte) 0);
+    public BlockBucket ROAD_BLOCK = BlockBucket.withSingle(PlotBlock.get("quartz_block"));
+    // PlotBlock.get((short) 155, (byte) 0);
+    public boolean PLOT_BEDROCK = true;
+
+    public ClassicPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+        PlotId min, PlotId max) {
+        super(worldName, id, generator, min, max);
+    }
+
+    /**
+     * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP.
+     * <p>
+     * <p>Set the last boolean to false if you do not check a specific config node to be set while using the setup
+     * command - this may be useful if a config value can be changed at a later date, and has no impact on the actual
+     * world generation</p>
+     */
+    @Nonnull @Override public ConfigurationNode[] getSettingNodes() {
+        return new ConfigurationNode[] {
+            new ConfigurationNode("plot.height", this.PLOT_HEIGHT, "Plot height",
+                Configuration.INTEGER),
+            new ConfigurationNode("plot.size", this.PLOT_WIDTH, "Plot width",
+                Configuration.INTEGER),
+            new ConfigurationNode("plot.filling", this.MAIN_BLOCK, "Plot block",
+                Configuration.BLOCK_BUCKET),
+            new ConfigurationNode("plot.floor", this.TOP_BLOCK, "Plot floor block",
+                Configuration.BLOCK_BUCKET),
+            new ConfigurationNode("wall.block", this.WALL_BLOCK, "Top wall block",
+                Configuration.BLOCK_BUCKET),
+            new ConfigurationNode("wall.block_claimed", this.CLAIMED_WALL_BLOCK,
+                "Wall block (claimed)", Configuration.BLOCK_BUCKET),
+            new ConfigurationNode("road.width", this.ROAD_WIDTH, "Road width",
+                Configuration.INTEGER),
+            new ConfigurationNode("road.height", this.ROAD_HEIGHT, "Road height",
+                Configuration.INTEGER),
+            new ConfigurationNode("road.block", this.ROAD_BLOCK, "Road block",
+                Configuration.BLOCK_BUCKET),
+            new ConfigurationNode("wall.filling", this.WALL_FILLING, "Wall filling block",
+                Configuration.BLOCK_BUCKET),
+            new ConfigurationNode("wall.height", this.WALL_HEIGHT, "Wall height",
+                Configuration.INTEGER),
+            new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, "Plot bedrock generation",
+                Configuration.BOOLEAN)};
+    }
+
+    /**
+     * This method is called when a world loads. Make sure you set all your constants here. You are provided with the
+     * configuration section for that specific world.
+     */
+    @Override public void loadConfiguration(ConfigurationSection config) {
+        super.loadConfiguration(config);
+        this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
+        this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));
+        this.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("plot.filling"));
+        this.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("plot.floor"));
+        this.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("wall.block"));
+        this.ROAD_HEIGHT = Math.min(255, config.getInt("road.height"));
+        this.ROAD_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("road.block"));
+        this.WALL_FILLING =
+            Configuration.BLOCK_BUCKET.parseString(config.getString("wall.filling"));
+        this.WALL_HEIGHT = Math.min(254, config.getInt("wall.height"));
+        this.CLAIMED_WALL_BLOCK =
+            Configuration.BLOCK_BUCKET.parseString(config.getString("wall.block_claimed"));
+
+        // Dump world settings
+        if (Settings.DEBUG) {
+            PlotSquared.debug(String
+                .format("- Dumping settings for ClassicPlotWorld with name %s", this.worldname));
+            final Field[] fields = this.getClass().getFields();
+            for (final Field field : fields) {
+                final String name = field.getName().toLowerCase(Locale.ENGLISH);
+                if (name.equalsIgnoreCase("g_sch")) {
+                    continue;
+                }
+                Object value;
+                try {
+                    final boolean accessible = field.isAccessible();
+                    field.setAccessible(true);
+                    value = field.get(this);
+                    field.setAccessible(accessible);
+                } catch (final IllegalAccessException e) {
+                    value = String.format("Failed to parse: %s", e.getMessage());
+                }
+                PlotSquared.debug(String.format("-- %s = %s", name, value));
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java
new file mode 100644
index 000000000..ec5f971fc
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java
@@ -0,0 +1,18 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+
+public interface GeneratorWrapper<T> {
+
+    IndependentPlotGenerator getPlotGenerator();
+
+    T getPlatformGenerator();
+
+    void augment(PlotArea area);
+
+    boolean isFull();
+
+    @Override String toString();
+
+    @Override boolean equals(Object obj);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
new file mode 100644
index 000000000..4ea841c3c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
@@ -0,0 +1,10 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
+
+/**
+ * A plot manager where plots tessellate in a grid formation symmetrical about x=z.
+ */
+public abstract class GridPlotManager extends PlotManager {
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
new file mode 100644
index 000000000..34dbef203
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
@@ -0,0 +1,14 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+
+public abstract class GridPlotWorld extends PlotArea {
+
+    public short SIZE;
+
+    public GridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+        PlotId min, PlotId max) {
+        super(worldName, id, generator, min, max);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
new file mode 100644
index 000000000..f2098036d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -0,0 +1,266 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+import java.util.HashMap;
+
+public class HybridGen extends IndependentPlotGenerator {
+
+    @Override public String getName() {
+        return PlotSquared.imp().getPluginName();
+    }
+
+    private void placeSchem(HybridPlotWorld world, ScopedLocalBlockQueue result, short relativeX,
+        short relativeZ, int x, int z, boolean isRoad) {
+        int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
+        if (isRoad || Settings.Schematics.PASTE_ON_TOP) {
+            minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
+        } else {
+            minY = 1;
+        }
+        BaseBlock[] blocks = world.G_SCH.get(MathMan.pair(relativeX, relativeZ));
+        if (blocks != null) {
+            for (int y = 0; y < blocks.length; y++) {
+                if (blocks[y] != null) {
+                    result.setBlock(x, minY + y, z, blocks[y]);
+                }
+            }
+        }
+    }
+
+    @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
+        BlockBucket[][] blockBuckets = new BlockBucket[16][];
+        HybridPlotWorld hpw = (HybridPlotWorld) settings;
+        // Bedrock
+        if (hpw.PLOT_BEDROCK) {
+            for (short x = 0; x < 16; x++) {
+                for (short z = 0; z < 16; z++) {
+                    blockBuckets[0][(z << 4) | x] =
+                        BlockBucket.withSingle(PlotBlock.get("bedrock"));
+                }
+            }
+        }
+        for (short x = 0; x < 16; x++) {
+            for (short z = 0; z < 16; z++) {
+                for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
+                    int layer = y >> 4;
+                    if (blockBuckets[layer] == null) {
+                        blockBuckets[layer] = new BlockBucket[4096];
+                    }
+                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
+                }
+                int layer = hpw.PLOT_HEIGHT >> 4;
+                if (blockBuckets[layer] == null) {
+                    blockBuckets[layer] = new BlockBucket[4096];
+                }
+                blockBuckets[layer][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
+            }
+        }
+        return blockBuckets;
+    }
+
+    @Override public void generateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
+        HybridPlotWorld hpw = (HybridPlotWorld) settings;
+        // Biome
+        result.fillBiome(hpw.PLOT_BIOME);
+        // Bedrock
+        if (hpw.PLOT_BEDROCK) {
+            for (short x = 0; x < 16; x++) {
+                for (short z = 0; z < 16; z++) {
+                    result.setBlock(x, 0, z, PlotBlock.get("bedrock"));
+                }
+            }
+        }
+        // Coords
+        Location min = result.getMin();
+        int bx = (min.getX()) - hpw.ROAD_OFFSET_X;
+        int bz = (min.getZ()) - hpw.ROAD_OFFSET_Z;
+        short rbx;
+        if (bx < 0) {
+            rbx = (short) (hpw.SIZE + (bx % hpw.SIZE));
+        } else {
+            rbx = (short) (bx % hpw.SIZE);
+        }
+        short rbz;
+        if (bz < 0) {
+            rbz = (short) (hpw.SIZE + (bz % hpw.SIZE));
+        } else {
+            rbz = (short) (bz % hpw.SIZE);
+        }
+        short[] rx = new short[16];
+        boolean[] gx = new boolean[16];
+        boolean[] wx = new boolean[16];
+        for (short i = 0; i < 16; i++) {
+            short v = (short) (rbx + i);
+            if (v >= hpw.SIZE) {
+                v -= hpw.SIZE;
+            }
+            rx[i] = v;
+            if (hpw.ROAD_WIDTH != 0) {
+                gx[i] = v < hpw.PATH_WIDTH_LOWER || v > hpw.PATH_WIDTH_UPPER;
+                wx[i] = v == hpw.PATH_WIDTH_LOWER || v == hpw.PATH_WIDTH_UPPER;
+            }
+        }
+        short[] rz = new short[16];
+        boolean[] gz = new boolean[16];
+        boolean[] wz = new boolean[16];
+        for (short i = 0; i < 16; i++) {
+            short v = (short) (rbz + i);
+            if (v >= hpw.SIZE) {
+                v -= hpw.SIZE;
+            }
+            rz[i] = v;
+            if (hpw.ROAD_WIDTH != 0) {
+                gz[i] = v < hpw.PATH_WIDTH_LOWER || v > hpw.PATH_WIDTH_UPPER;
+                wz[i] = v == hpw.PATH_WIDTH_LOWER || v == hpw.PATH_WIDTH_UPPER;
+            }
+        }
+        // generation
+        HashMap<Integer, BaseBlock[]> sch = hpw.G_SCH;
+        for (short x = 0; x < 16; x++) {
+            if (gx[x]) {
+                for (short z = 0; z < 16; z++) {
+                    // Road
+                    for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
+                        result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
+                    }
+                    if (hpw.ROAD_SCHEMATIC_ENABLED) {
+                        placeSchem(hpw, result, rx[x], rz[z], x, z, true);
+                    }
+                }
+            } else if (wx[x]) {
+                for (short z = 0; z < 16; z++) {
+                    if (gz[z]) {
+                        // road
+                        for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
+                            result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
+                        }
+                        if (hpw.ROAD_SCHEMATIC_ENABLED) {
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
+                        }
+                    } else {
+                        // wall
+                        for (int y = 1; y <= hpw.WALL_HEIGHT; y++) {
+                            result.setBlock(x, y, z, hpw.WALL_FILLING.getBlock());
+                        }
+                        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
+                            result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
+                        } else {
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
+                        }
+                    }
+                }
+            } else {
+                for (short z = 0; z < 16; z++) {
+                    if (gz[z]) {
+                        // road
+                        for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
+                            result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
+                        }
+                        if (hpw.ROAD_SCHEMATIC_ENABLED) {
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
+                        }
+                    } else if (wz[z]) {
+                        // wall
+                        for (int y = 1; y <= hpw.WALL_HEIGHT; y++) {
+                            result.setBlock(x, y, z, hpw.WALL_FILLING.getBlock());
+                        }
+                        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
+                            result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
+                        } else {
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
+                        }
+                    } else {
+                        // plot
+                        for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
+                            result.setBlock(x, y, z, hpw.MAIN_BLOCK.getBlock());
+                        }
+                        result.setBlock(x, hpw.PLOT_HEIGHT, z, hpw.TOP_BLOCK.getBlock());
+                        if (hpw.PLOT_SCHEMATIC) {
+                            placeSchem(hpw, result, rx[x], rz[z], x, z, false);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+/*    @Override public boolean populateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
+        HybridPlotWorld hpw = (HybridPlotWorld) settings;
+        if (hpw.G_SCH_STATE != null) {
+            Location min = result.getMin();
+            int cx = min.getX() >> 4;
+            int cz = min.getZ() >> 4;
+            int p1x = cx << 4;
+            int p1z = cz << 4;
+            int bx = p1x - hpw.ROAD_OFFSET_X;
+            int bz = p1z - hpw.ROAD_OFFSET_Z;
+            short rbx;
+            if (bx < 0) {
+                rbx = (short) (hpw.SIZE + (bx % hpw.SIZE));
+            } else {
+                rbx = (short) (bx % hpw.SIZE);
+            }
+            short rbz;
+            if (bz < 0) {
+                rbz = (short) (hpw.SIZE + (bz % hpw.SIZE));
+            } else {
+                rbz = (short) (bz % hpw.SIZE);
+            }
+            short[] rx = new short[16];
+            for (short i = 0; i < 16; i++) {
+                short v = (short) (rbx + i);
+                if (v >= hpw.SIZE) {
+                    v -= hpw.SIZE;
+                }
+                rx[i] = v;
+            }
+            short[] rz = new short[16];
+            for (short i = 0; i < 16; i++) {
+                short v = (short) (rbz + i);
+                if (v >= hpw.SIZE) {
+                    v -= hpw.SIZE;
+                }
+                rz[i] = v;
+            }
+            LocalBlockQueue queue = null;
+            for (short x = 0; x < 16; x++) {
+                for (short z = 0; z < 16; z++) {
+                    int pair = MathMan.pair(rx[x], rz[z]);
+                    HashMap<Integer, CompoundTag> map = hpw.G_SCH_STATE.get(pair);
+                    if (map != null) {
+                        for (Entry<Integer, CompoundTag> entry : map.entrySet()) {
+                            if (queue == null) {
+                                queue = GlobalBlockQueue.IMP.getNewQueue(hpw.worldname, false);
+                            }
+                            CompoundTag tag = entry.getValue();
+                            SchematicHandler.manager
+                                .restoreTile(queue, tag, p1x + x, entry.getKey(), p1z + z);
+                        }
+                    }
+                }
+            }
+            if (queue != null) {
+                queue.flush();
+            }
+        }
+        return false;
+    }*/
+
+    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
+        return new HybridPlotWorld(world, id, this, min, max);
+    }
+
+    @Override public PlotManager getNewPlotManager() {
+        return new HybridPlotManager();
+    }
+
+    @Override public void initialize(PlotArea area) {
+        // All initialization is done in the PlotArea class
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
new file mode 100644
index 000000000..1f6429dbd
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -0,0 +1,225 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.commands.Template;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collections;
+import java.util.HashSet;
+
+public class HybridPlotManager extends ClassicPlotManager {
+
+    public static boolean REGENERATIVE_CLEAR = true;
+
+    @Override public void exportTemplate(PlotArea plotArea) throws IOException {
+        HashSet<FileBytes> files = new HashSet<>(Collections.singletonList(
+            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml",
+                Template.getBytes(plotArea))));
+        String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator
+            + plotArea.worldname + File.separator;
+        String newDir =
+            "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__"
+                + File.separator;
+        try {
+            File sideroad =
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "sideroad.schematic");
+            if (sideroad.exists()) {
+                files.add(new FileBytes(newDir + "sideroad.schematic",
+                    Files.readAllBytes(sideroad.toPath())));
+            }
+            File intersection =
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "intersection.schematic");
+            if (intersection.exists()) {
+                files.add(new FileBytes(newDir + "intersection.schematic",
+                    Files.readAllBytes(intersection.toPath())));
+            }
+            File plot =
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "plot.schematic");
+            if (plot.exists()) {
+                files.add(
+                    new FileBytes(newDir + "plot.schematic", Files.readAllBytes(plot.toPath())));
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        Template.zipAll(plotArea.worldname, files);
+    }
+
+    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
+        super.createRoadEast(plotArea, plot);
+        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
+        PlotId id = plot.getId();
+        PlotId id2 = new PlotId(id.x + 1, id.y);
+        Location bot = getPlotBottomLocAbs(hpw, id2);
+        Location top = getPlotTopLocAbs(hpw, id);
+        Location pos1 = new Location(plotArea.worldname, top.getX() + 1, 0, bot.getZ() - 1);
+        Location pos2 =
+            new Location(plotArea.worldname, bot.getX(), Math.min(getWorldHeight(), 255),
+                top.getZ() + 1);
+        MainUtil.resetBiome(plotArea, pos1, pos2);
+        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
+            return true;
+        }
+        LocalBlockQueue queue = hpw.getQueue(false);
+        createSchemAbs(hpw, queue, pos1, pos2, true);
+        queue.enqueue();
+        return true;
+    }
+
+    private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
+        Location pos2, boolean clear) {
+        int size = hpw.SIZE;
+        int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+        for (int x = pos1.getX(); x <= pos2.getX(); x++) {
+            short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
+            if (absX < 0) {
+                absX += size;
+            }
+            for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
+                short absZ = (short) ((z - hpw.ROAD_OFFSET_Z) % size);
+                if (absZ < 0) {
+                    absZ += size;
+                }
+                BaseBlock[] blocks = hpw.G_SCH.get(MathMan.pair(absX, absZ));
+                if (blocks != null) {
+                    for (int y = 0; y < blocks.length; y++) {
+                        if (blocks[y] != null) {
+                            queue.setBlock(x, minY + y, z, blocks[y]);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
+        super.createRoadSouth(plotArea, plot);
+        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
+        PlotId id = plot.getId();
+        PlotId id2 = new PlotId(id.x, id.y + 1);
+        Location bot = getPlotBottomLocAbs(hpw, id2);
+        Location top = getPlotTopLocAbs(hpw, id);
+        Location pos1 = new Location(plotArea.worldname, bot.getX() - 1, 0, top.getZ() + 1);
+        Location pos2 =
+            new Location(plotArea.worldname, top.getX() + 1, Math.min(getWorldHeight(), 255),
+                bot.getZ());
+        MainUtil.resetBiome(plotArea, pos1, pos2);
+        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
+            return true;
+        }
+        LocalBlockQueue queue = hpw.getQueue(false);
+        createSchemAbs(hpw, queue, pos1, pos2, true);
+        queue.enqueue();
+        return true;
+    }
+
+    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
+        super.createRoadSouthEast(plotArea, plot);
+        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
+        PlotId id = plot.getId();
+        PlotId id2 = new PlotId(id.x + 1, id.y + 1);
+        Location pos1 = getPlotTopLocAbs(hpw, id).add(1, 0, 1);
+        Location pos2 = getPlotBottomLocAbs(hpw, id2);
+        pos1.setY(0);
+        pos2.setY(Math.min(getWorldHeight(), 255));
+        LocalBlockQueue queue = hpw.getQueue(false);
+        createSchemAbs(hpw, queue, pos1, pos2, true);
+        if (hpw.ROAD_SCHEMATIC_ENABLED) {
+            createSchemAbs(hpw, queue, pos1, pos2, true);
+        }
+        queue.enqueue();
+        return true;
+    }
+
+    /**
+     * <p>Clearing the plot needs to only consider removing the blocks - This implementation has used the setCuboidAsync
+     * function, as it is fast, and uses NMS code - It also makes use of the fact that deleting chunks is a lot faster
+     * than block updates This code is very messy, but you don't need to do something quite as complex unless you happen
+     * to have 512x512 sized plots. </p>
+     */
+    @Override public boolean clearPlot(final PlotArea plotArea, Plot plot,
+        final Runnable whenDone) {
+        final String world = plotArea.worldname;
+        final HybridPlotWorld dpw = (HybridPlotWorld) plotArea;
+        Location pos1 = plot.getBottomAbs();
+        Location pos2 = plot.getExtendedTopAbs();
+        // If augmented
+        final boolean canRegen =
+            (plotArea.TYPE == 0) && (plotArea.TERRAIN == 0) && REGENERATIVE_CLEAR;
+        // The component blocks
+        final BlockBucket plotfloor = dpw.TOP_BLOCK;
+        final BlockBucket filling = dpw.MAIN_BLOCK;
+        final PlotBlock bedrock;
+        if (dpw.PLOT_BEDROCK) {
+            bedrock = PlotBlock.get((short) 7, (byte) 0);
+        } else {
+            bedrock = PlotBlock.get((short) 0, (byte) 0);
+        }
+        final PlotBlock air = PlotBlock.get((short) 0, (byte) 0);
+        final String biome = dpw.PLOT_BIOME;
+        final LocalBlockQueue queue = plotArea.getQueue(false);
+        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+            @Override public void run(int[] value) {
+                // If the chunk isn't near the edge and it isn't an augmented world we can just regen the whole chunk
+                if (canRegen && (value[6] == 0)) {
+                    queue.regenChunk(value[0], value[1]);
+                    return;
+                }
+                ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                // Otherwise we need to set each component, as we don't want to regenerate the road or other plots that share the same chunk //
+                ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                // Set the biome
+                MainUtil.setBiome(world, value[2], value[3], value[4], value[5], biome);
+                // These two locations are for each component (e.g. bedrock, main block, floor, air)
+                Location bot = new Location(world, value[2], 0, value[3]);
+                Location top = new Location(world, value[4], 1, value[5]);
+                queue.setCuboid(bot, top, bedrock);
+                // Each component has a different layer
+                bot.setY(1);
+                top.setY(dpw.PLOT_HEIGHT);
+                queue.setCuboid(bot, top, filling);
+                bot.setY(dpw.PLOT_HEIGHT);
+                top.setY(dpw.PLOT_HEIGHT + 1);
+                queue.setCuboid(bot, top, plotfloor);
+                bot.setY(dpw.PLOT_HEIGHT + 1);
+                top.setY(getWorldHeight());
+                queue.setCuboid(bot, top, air);
+                // And finally set the schematic, the y value is unimportant for this function
+                pastePlotSchematic(dpw, queue, bot, top);
+            }
+        }, new Runnable() {
+            @Override public void run() {
+                queue.enqueue();
+                // And notify whatever called this when plot clearing is done
+                GlobalBlockQueue.IMP.addTask(whenDone);
+            }
+        }, 10);
+        return true;
+    }
+
+    public void pastePlotSchematic(HybridPlotWorld plotWorld, LocalBlockQueue queue, Location l1,
+        Location l2) {
+        if (!plotWorld.PLOT_SCHEMATIC) {
+            return;
+        }
+        createSchemAbs(plotWorld, queue, l1, l2, false);
+    }
+
+    /**
+     * Remove sign for a plot.
+     */
+    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
+        HybridPlotWorld dpw = (HybridPlotWorld) plotArea;
+        return dpw.getSignLocation(plot);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
new file mode 100644
index 000000000..53a9d6891
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -0,0 +1,283 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.jnbt.CompoundTagBuilder;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
+import com.sk89q.worldedit.internal.helper.MCDirections;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.math.Vector3;
+import com.sk89q.worldedit.math.transform.AffineTransform;
+import com.sk89q.worldedit.util.Direction;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+import java.io.File;
+import java.util.HashMap;
+
+public class HybridPlotWorld extends ClassicPlotWorld {
+
+    private static AffineTransform transform = new AffineTransform().rotateY(90);
+    public boolean ROAD_SCHEMATIC_ENABLED;
+    public boolean PLOT_SCHEMATIC = false;
+    public short PATH_WIDTH_LOWER;
+    public short PATH_WIDTH_UPPER;
+    public HashMap<Integer, BaseBlock[]> G_SCH;
+    private Location SIGN_LOCATION;
+
+    public HybridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+        PlotId min, PlotId max) {
+        super(worldName, id, generator, min, max);
+    }
+
+    public static byte wrap(byte data, int start) {
+        if ((data >= start) && (data < (start + 4))) {
+            data = (byte) ((((data - start) + 2) & 3) + start);
+        }
+        return data;
+    }
+
+    public static byte wrap2(byte data, int start) {
+        if ((data >= start) && (data < (start + 2))) {
+            data = (byte) ((((data - start) + 1) & 1) + start);
+        }
+        return data;
+    }
+
+    // FIXME depends on block ids
+    // Possibly make abstract?
+    public static BaseBlock rotate(BaseBlock id) {
+
+        CompoundTag tag = id.getNbtData();
+
+        if (tag != null) {
+            // Handle blocks which store their rotation in NBT
+            if (tag.containsKey("Rot")) {
+                int rot = tag.asInt("Rot");
+
+                Direction direction = MCDirections.fromRotation(rot);
+
+                if (direction != null) {
+                    Vector3 vector = transform.apply(direction.toVector())
+                        .subtract(transform.apply(Vector3.ZERO)).normalize();
+                    Direction newDirection = Direction.findClosest(vector,
+                        Direction.Flag.CARDINAL | Direction.Flag.ORDINAL
+                            | Direction.Flag.SECONDARY_ORDINAL);
+
+                    if (newDirection != null) {
+                        CompoundTagBuilder builder = tag.createBuilder();
+
+                        builder.putByte("Rot", (byte) MCDirections.toRotation(newDirection));
+
+                        id.setNbtData(builder.build());
+                    }
+                }
+            }
+        }
+        return BlockTransformExtent.transform(id, transform);
+    }
+
+    public Location getSignLocation(Plot plot) {
+        plot = plot.getBasePlot(false);
+        Location bot = plot.getBottomAbs();
+        if (SIGN_LOCATION == null) {
+            bot.setY(ROAD_HEIGHT + 1);
+            return bot.add(-1, 0, -2);
+        } else {
+            bot.setY(0);
+            Location loc =
+                bot.add(SIGN_LOCATION.getX(), SIGN_LOCATION.getY(), SIGN_LOCATION.getZ());
+            return loc;
+        }
+    }
+
+    /**
+     * <p>This method is called when a world loads. Make sure you set all your constants here. You are provided with the
+     * configuration section for that specific world.</p>
+     */
+    @Override public void loadConfiguration(ConfigurationSection config) {
+        super.loadConfiguration(config);
+        if ((this.ROAD_WIDTH & 1) == 0) {
+            this.PATH_WIDTH_LOWER = (short) (Math.floor(this.ROAD_WIDTH / 2) - 1);
+        } else {
+            this.PATH_WIDTH_LOWER = (short) Math.floor(this.ROAD_WIDTH / 2);
+        }
+        if (this.ROAD_WIDTH == 0) {
+            this.PATH_WIDTH_UPPER = (short) (this.SIZE + 1);
+        } else {
+            this.PATH_WIDTH_UPPER = (short) (this.PATH_WIDTH_LOWER + this.PLOT_WIDTH + 1);
+        }
+        try {
+            setupSchematics();
+        } catch (Exception ignored) {
+            PlotSquared.debug("&c - road schematics are disabled for this world.");
+        }
+    }
+
+    @Override public boolean isCompatible(PlotArea plotArea) {
+        if (!(plotArea instanceof SquarePlotWorld)) {
+            return false;
+        }
+        return ((SquarePlotWorld) plotArea).PLOT_WIDTH == this.PLOT_WIDTH;
+    }
+
+    public void setupSchematics() throws SchematicHandler.UnsupportedFormatException {
+        this.G_SCH = new HashMap<>();
+        File schematic1File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
+        File schematic2File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic");
+        File schem3File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic");
+        Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File);
+        Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File);
+        Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File);
+        int shift = this.ROAD_WIDTH / 2;
+        int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1;
+        int minY = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
+        if (schematic3 != null) {
+            this.PLOT_SCHEMATIC = true;
+            BlockArrayClipboard blockArrayClipboard3 = schematic3.getClipboard();
+
+            BlockVector3 d3 = blockArrayClipboard3.getDimensions();
+            short w3 = (short) d3.getX();
+            short l3 = (short) d3.getZ();
+            short h3 = (short) d3.getY();
+            if (w3 > PLOT_WIDTH || h3 > PLOT_WIDTH) {
+                this.ROAD_SCHEMATIC_ENABLED = true;
+            }
+            int centerShiftZ;
+            if (l3 < this.PLOT_WIDTH) {
+                centerShiftZ = (this.PLOT_WIDTH - l3) / 2;
+            } else {
+                centerShiftZ = (PLOT_WIDTH - l3) / 2;
+            }
+            int centerShiftX;
+            if (w3 < this.PLOT_WIDTH) {
+                centerShiftX = (this.PLOT_WIDTH - w3) / 2;
+            } else {
+                centerShiftX = (PLOT_WIDTH - w3) / 2;
+            }
+
+            int startY = minY - PLOT_HEIGHT;
+
+            for (short x = 0; x < w3; x++) {
+                for (short z = 0; z < l3; z++) {
+                    for (short y = 0; y < h3; y++) {
+                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x, y, z));
+                        if (!id.getBlockType().getMaterial().isAir()) {
+                            addOverlayBlock((short) (x + shift + oddshift + centerShiftX),
+                                (short) (y + startY), (short) (z + shift + oddshift + centerShiftZ),
+                                id, false, h3);
+                        }
+                    }
+                }
+            }
+/*            HashMap<BlockLoc, CompoundTag> items = schematic3.getTiles();
+            if (!items.isEmpty()) {
+                this.G_SCH_STATE = new HashMap<>();
+                outer:
+                for (Map.Entry<BlockLoc, CompoundTag> entry : items.entrySet()) {
+                    BlockLoc loc = entry.getKey();
+                    short x = (short) (loc.x + shift + oddshift + centerShiftX);
+                    short z = (short) (loc.z + shift + oddshift + centerShiftZ);
+                    short y = (short) (loc.y + this.PLOT_HEIGHT);
+                    int pair = MathMan.pair(x, z);
+                    HashMap<Integer, CompoundTag> existing = this.G_SCH_STATE.get(pair);
+                    if (existing == null) {
+                        existing = new HashMap<>();
+                        this.G_SCH_STATE.put(pair, existing);
+                    }
+                    existing.put((int) y, entry.getValue());
+
+                    CompoundTag tag = entry.getValue();
+                    Map<String, Tag> map = ReflectionUtils.getMap(tag.getValue());
+                    for (int i = 1; i <= 4; i++) {
+                        String ln = tag.getString("Line" + i);
+                        if (ln == null || ln.length() > 11)
+                            continue outer;
+                    }
+                    SIGN_LOCATION =
+                        new Location(worldname, loc.x + centerShiftX, this.PLOT_HEIGHT + loc.y,
+                            loc.z + centerShiftZ);
+                    ALLOW_SIGNS = true;
+                    continue outer;
+                }
+            }*/
+        }
+        if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
+            PlotSquared.debug(C.PREFIX + "&3 - schematic: &7false");
+            return;
+        }
+        this.ROAD_SCHEMATIC_ENABLED = true;
+        // Do not populate road if using schematic population
+        // TODO: What? this.ROAD_BLOCK = BlockBucket.empty(); // PlotBlock.getEmptyData(this.ROAD_BLOCK); // PlotBlock.get(this.ROAD_BLOCK.id, (byte) 0);
+
+        BlockArrayClipboard blockArrayClipboard1 = schematic1.getClipboard();
+        BlockArrayClipboard blockArrayClipboard2 = schematic2.getClipboard();
+
+        BlockVector3 d1 = blockArrayClipboard1.getDimensions();
+        short w1 = (short) d1.getX();
+        short l1 = (short) d1.getZ();
+        short h1 = (short) d1.getY();
+        BlockVector3 d2 = blockArrayClipboard2.getDimensions();
+        short w2 = (short) d2.getX();
+        short l2 = (short) d2.getZ();
+        short h2 = (short) d2.getY();
+        int startY = minY - ROAD_HEIGHT;
+        for (short x = 0; x < w1; x++) {
+            for (short z = 0; z < l1; z++) {
+                for (short y = 0; y < h1; y++) {
+                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x, y, z));
+                    if (!id.getBlockType().getMaterial().isAir()) {
+                        addOverlayBlock((short) (x - shift), (short) (y + startY),
+                            (short) (z + shift + oddshift), id, false, h1);
+                        addOverlayBlock((short) (z + shift + oddshift), (short) (y + startY),
+                            (short) (shift - x + (oddshift - 1)), id, true, h1);
+                    }
+                }
+            }
+        }
+        for (short x = 0; x < w2; x++) {
+            for (short z = 0; z < l2; z++) {
+                for (short y = 0; y < h2; y++) {
+                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x, y, z));
+                    if (!id.getBlockType().getMaterial().isAir()) {
+                        addOverlayBlock((short) (x - shift), (short) (y + startY),
+                            (short) (z - shift), id, false, h2);
+                    }
+                }
+            }
+        }
+    }
+
+    public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate,
+        int height) {
+        if (z < 0) {
+            z += this.SIZE;
+        } else if (z >= this.SIZE) {
+            z -= this.SIZE;
+        }
+        if (x < 0) {
+            x += this.SIZE;
+        } else if (x >= this.SIZE) {
+            x -= this.SIZE;
+        }
+        if (rotate) {
+            id = rotate(id);
+        }
+        int pair = MathMan.pair(x, z);
+        BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
+        existing[y] = id;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
new file mode 100644
index 000000000..4d46205ad
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -0,0 +1,381 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.listener.WEExtent;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+import java.io.File;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public abstract class HybridUtils {
+
+    public static HybridUtils manager;
+    public static Set<ChunkLoc> regions;
+    public static Set<ChunkLoc> chunks = new HashSet<>();
+    public static PlotArea area;
+    public static boolean UPDATE = false;
+
+    public abstract void analyzeRegion(String world, RegionWrapper region,
+        RunnableVal<PlotAnalysis> whenDone);
+
+    public void analyzePlot(final Plot origin, final RunnableVal<PlotAnalysis> whenDone) {
+        final ArrayDeque<RegionWrapper> zones = new ArrayDeque<>(origin.getRegions());
+        final ArrayList<PlotAnalysis> analysis = new ArrayList<>();
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (zones.isEmpty()) {
+                    if (!analysis.isEmpty()) {
+                        whenDone.value = new PlotAnalysis();
+                        for (PlotAnalysis data : analysis) {
+                            whenDone.value.air += data.air;
+                            whenDone.value.air_sd += data.air_sd;
+                            whenDone.value.changes += data.changes;
+                            whenDone.value.changes_sd += data.changes_sd;
+                            whenDone.value.data += data.data;
+                            whenDone.value.data_sd += data.data_sd;
+                            whenDone.value.faces += data.faces;
+                            whenDone.value.faces_sd += data.faces_sd;
+                            whenDone.value.variety += data.variety;
+                            whenDone.value.variety_sd += data.variety_sd;
+                        }
+                        whenDone.value.air /= analysis.size();
+                        whenDone.value.air_sd /= analysis.size();
+                        whenDone.value.changes /= analysis.size();
+                        whenDone.value.changes_sd /= analysis.size();
+                        whenDone.value.data /= analysis.size();
+                        whenDone.value.data_sd /= analysis.size();
+                        whenDone.value.faces /= analysis.size();
+                        whenDone.value.faces_sd /= analysis.size();
+                        whenDone.value.variety /= analysis.size();
+                        whenDone.value.variety_sd /= analysis.size();
+                    } else {
+                        whenDone.value = analysis.get(0);
+                    }
+                    List<Integer> result = new ArrayList<>();
+                    result.add(whenDone.value.changes);
+                    result.add(whenDone.value.faces);
+                    result.add(whenDone.value.data);
+                    result.add(whenDone.value.air);
+                    result.add(whenDone.value.variety);
+
+                    result.add(whenDone.value.changes_sd);
+                    result.add(whenDone.value.faces_sd);
+                    result.add(whenDone.value.data_sd);
+                    result.add(whenDone.value.air_sd);
+                    result.add(whenDone.value.variety_sd);
+                    FlagManager.addPlotFlag(origin, Flags.ANALYSIS, result);
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = zones.poll();
+                final Runnable task = this;
+                analyzeRegion(origin.getWorldName(), region, new RunnableVal<PlotAnalysis>() {
+                    @Override public void run(PlotAnalysis value) {
+                        analysis.add(value);
+                        TaskManager.runTaskLater(task, 1);
+                    }
+                });
+            }
+        };
+        run.run();
+    }
+
+    public int checkModified(LocalBlockQueue queue, int x1, int x2, int y1, int y2, int z1, int z2,
+        PlotBlock[] blocks) {
+        int count = 0;
+        for (int y = y1; y <= y2; y++) {
+            for (int x = x1; x <= x2; x++) {
+                for (int z = z1; z <= z2; z++) {
+                    PlotBlock block = queue.getBlock(x, y, z);
+                    boolean same = false;
+                    for (PlotBlock p : blocks) {
+                        if (WorldUtil.IMP.isBlockSame(block, p)) {
+                            same = true;
+                            break;
+                        }
+                    }
+                    if (!same) {
+                        count++;
+                    }
+                }
+            }
+        }
+        return count;
+    }
+
+    public final ArrayList<ChunkLoc> getChunks(ChunkLoc region) {
+        ArrayList<ChunkLoc> chunks = new ArrayList<>();
+        int sx = region.x << 5;
+        int sz = region.z << 5;
+        for (int x = sx; x < sx + 32; x++) {
+            for (int z = sz; z < sz + 32; z++) {
+                chunks.add(new ChunkLoc(x, z));
+            }
+        }
+        return chunks;
+    }
+
+    public boolean scheduleRoadUpdate(PlotArea area, int extend) {
+        if (HybridUtils.UPDATE) {
+            return false;
+        }
+        HybridUtils.UPDATE = true;
+        Set<ChunkLoc> regions = ChunkManager.manager.getChunkChunks(area.worldname);
+        return scheduleRoadUpdate(area, regions, extend);
+    }
+
+    public boolean scheduleRoadUpdate(final PlotArea area, Set<ChunkLoc> rgs, final int extend) {
+        HybridUtils.regions = rgs;
+        HybridUtils.area = area;
+        chunks = new HashSet<>();
+        final AtomicInteger count = new AtomicInteger(0);
+        TaskManager.runTask(new Runnable() {
+            @Override public void run() {
+                if (!UPDATE) {
+                    Iterator<ChunkLoc> iter = chunks.iterator();
+                    while (iter.hasNext()) {
+                        ChunkLoc chunk = iter.next();
+                        iter.remove();
+                        regenerateRoad(area, chunk, extend);
+                        ChunkManager.manager.unloadChunk(area.worldname, chunk, true, true);
+                    }
+                    PlotSquared.debug("&cCancelled road task");
+                    return;
+                }
+                count.incrementAndGet();
+                if (count.intValue() % 20 == 0) {
+                    PlotSquared.debug("PROGRESS: " + 100 * (2048 - chunks.size()) / 2048 + "%");
+                }
+                if (regions.isEmpty() && chunks.isEmpty()) {
+                    HybridUtils.UPDATE = false;
+                    PlotSquared.debug(C.PREFIX.s() + "Finished road conversion");
+                    // CANCEL TASK
+                } else {
+                    final Runnable task = this;
+                    TaskManager.runTaskAsync(() -> {
+                        try {
+                            if (chunks.size() < 1024) {
+                                if (!regions.isEmpty()) {
+                                    Iterator<ChunkLoc> iterator = regions.iterator();
+                                    ChunkLoc loc = iterator.next();
+                                    iterator.remove();
+                                    PlotSquared.debug("&3Updating .mcr: " + loc.x + ", " + loc.z
+                                        + " (aprrox 1024 chunks)");
+                                    PlotSquared.debug(" - Remaining: " + regions.size());
+                                    chunks.addAll(getChunks(loc));
+                                    System.gc();
+                                }
+                            }
+                            if (!chunks.isEmpty()) {
+                                TaskManager.IMP.sync(new RunnableVal<Object>() {
+                                    @Override public void run(Object value) {
+                                        long start = System.currentTimeMillis();
+                                        Iterator<ChunkLoc> iterator = chunks.iterator();
+                                        while (System.currentTimeMillis() - start < 20 && !chunks
+                                            .isEmpty()) {
+                                            final ChunkLoc chunk = iterator.next();
+                                            iterator.remove();
+                                            regenerateRoad(area, chunk, extend);
+                                        }
+                                    }
+                                });
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            Iterator<ChunkLoc> iterator = regions.iterator();
+                            ChunkLoc loc = iterator.next();
+                            iterator.remove();
+                            PlotSquared.debug(
+                                "&c[ERROR]&7 Could not update '" + area.worldname + "/region/r."
+                                    + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)");
+                            int sx = loc.x << 5;
+                            int sz = loc.z << 5;
+                            for (int x = sx; x < sx + 32; x++) {
+                                for (int z = sz; z < sz + 32; z++) {
+                                    ChunkManager.manager
+                                        .unloadChunk(area.worldname, new ChunkLoc(x, z), true,
+                                            true);
+                                }
+                            }
+                            PlotSquared.debug("&d - Potentially skipping 1024 chunks");
+                            PlotSquared.debug("&d - TODO: recommend chunkster if corrupt");
+                        }
+                        GlobalBlockQueue.IMP.addTask(() -> TaskManager.runTaskLater(task, 20));
+                    });
+                }
+            }
+        });
+        return true;
+    }
+
+    public boolean setupRoadSchematic(Plot plot) {
+        final String world = plot.getWorldName();
+        final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
+        Location bot = plot.getBottomAbs().subtract(1, 0, 1);
+        Location top = plot.getTopAbs();
+        final HybridPlotWorld plotworld = (HybridPlotWorld) plot.getArea();
+        PlotManager plotManager = plotworld.getPlotManager();
+        int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
+        int sz = bot.getZ() + 1;
+        int sy = plotworld.ROAD_HEIGHT;
+        int ex = bot.getX();
+        int ez = top.getZ();
+        int ey = get_ey(plotManager, queue, sx, ex, sz, ez, sy);
+        int bz = sz - plotworld.ROAD_WIDTH;
+        int tz = sz - 1;
+        int ty = get_ey(plotManager, queue, sx, ex, bz, tz, sy);
+
+        Set<RegionWrapper> sideRoad =
+            new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ey, sz, ez)));
+        final Set<RegionWrapper> intersection =
+            new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ty, bz, tz)));
+
+        final String dir =
+            "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.getArea()
+                .toString() + File.separator;
+        SchematicHandler.manager.getCompoundTag(world, sideRoad, new RunnableVal<CompoundTag>() {
+            @Override public void run(CompoundTag value) {
+                SchematicHandler.manager.save(value, dir + "sideroad.schematic");
+                SchematicHandler.manager
+                    .getCompoundTag(world, intersection, new RunnableVal<CompoundTag>() {
+                        @Override public void run(CompoundTag value) {
+                            SchematicHandler.manager.save(value, dir + "intersection.schematic");
+                            plotworld.ROAD_SCHEMATIC_ENABLED = true;
+                            try {
+                                plotworld.setupSchematics();
+                            } catch (SchematicHandler.UnsupportedFormatException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    });
+            }
+        });
+        return true;
+    }
+
+    public int get_ey(final PlotManager pm, LocalBlockQueue queue, int sx, int ex, int sz, int ez,
+        int sy) {
+        int ey = sy;
+        for (int x = sx; x <= ex; x++) {
+            for (int z = sz; z <= ez; z++) {
+                for (int y = sy; y <= pm.getWorldHeight(); y++) {
+                    if (y > ey) {
+                        PlotBlock block = queue.getBlock(x, y, z);
+                        if (!block.isAir()) {
+                            ey = y;
+                        }
+                    }
+                }
+            }
+        }
+        return ey;
+    }
+
+    public boolean regenerateRoad(final PlotArea area, final ChunkLoc chunk, int extend) {
+        int x = chunk.x << 4;
+        int z = chunk.z << 4;
+        int ex = x + 15;
+        int ez = z + 15;
+        HybridPlotWorld plotWorld = (HybridPlotWorld) area;
+        if (!plotWorld.ROAD_SCHEMATIC_ENABLED) {
+            return false;
+        }
+        boolean toCheck = false;
+        if (plotWorld.TYPE == 2) {
+            boolean c1 = area.contains(x, z);
+            boolean c2 = area.contains(ex, ez);
+            if (!c1 && !c2) {
+                return false;
+            } else {
+                toCheck = c1 ^ c2;
+            }
+        }
+        PlotManager manager = area.getPlotManager();
+        PlotId id1 = manager.getPlotId(plotWorld, x, 0, z);
+        PlotId id2 = manager.getPlotId(plotWorld, ex, 0, ez);
+        x -= plotWorld.ROAD_OFFSET_X;
+        z -= plotWorld.ROAD_OFFSET_Z;
+        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(plotWorld.worldname, false);
+        if (id1 == null || id2 == null || id1 != id2) {
+            boolean result = ChunkManager.manager.loadChunk(area.worldname, chunk, false);
+            if (result) {
+                if (id1 != null) {
+                    Plot p1 = area.getPlotAbs(id1);
+                    if (p1 != null && p1.hasOwner() && p1.isMerged()) {
+                        toCheck = true;
+                    }
+                }
+                if (id2 != null && !toCheck) {
+                    Plot p2 = area.getPlotAbs(id2);
+                    if (p2 != null && p2.hasOwner() && p2.isMerged()) {
+                        toCheck = true;
+                    }
+                }
+                int size = plotWorld.SIZE;
+                for (int X = 0; X < 16; X++) {
+                    short absX = (short) ((x + X) % size);
+                    for (int Z = 0; Z < 16; Z++) {
+                        short absZ = (short) ((z + Z) % size);
+                        if (absX < 0) {
+                            absX += size;
+                        }
+                        if (absZ < 0) {
+                            absZ += size;
+                        }
+                        boolean condition;
+                        if (toCheck) {
+                            condition = manager
+                                .getPlotId(plotWorld, x + X + plotWorld.ROAD_OFFSET_X, 1,
+                                    z + Z + plotWorld.ROAD_OFFSET_Z) == null;
+                            //                            condition = MainUtil.isPlotRoad(new Location(plotworld.worldname, x + X, 1, z + Z));
+                        } else {
+                            boolean gx = absX > plotWorld.PATH_WIDTH_LOWER;
+                            boolean gz = absZ > plotWorld.PATH_WIDTH_LOWER;
+                            boolean lx = absX < plotWorld.PATH_WIDTH_UPPER;
+                            boolean lz = absZ < plotWorld.PATH_WIDTH_UPPER;
+                            condition = !gx || !gz || !lx || !lz;
+                        }
+                        if (condition) {
+                            BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
+                            int minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
+                            int maxY = Math.max(extend, blocks.length);
+                            if (blocks != null) {
+                                for (int y = 0; y < maxY; y++) {
+                                    if (y > blocks.length - 1) {
+                                        queue.setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y,
+                                            z + Z + plotWorld.ROAD_OFFSET_Z, WEExtent.AIRBASE);
+                                    } else {
+                                        BaseBlock block = blocks[y];
+                                        if (block != null) {
+                                            queue
+                                                .setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y,
+                                                    z + Z + plotWorld.ROAD_OFFSET_Z, block);
+                                        } else {
+                                            queue
+                                                .setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y,
+                                                    z + Z + plotWorld.ROAD_OFFSET_Z,
+                                                    WEExtent.AIRBASE);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                queue.enqueue();
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
new file mode 100644
index 000000000..e06d7208e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
@@ -0,0 +1,90 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+
+/**
+ * This class allows for implementation independent world generation.
+ * - Sponge/Bukkit API
+ * Use the specify method to get the generator for that platform.
+ */
+public abstract class IndependentPlotGenerator {
+
+    /**
+     * Get the name of this generator.
+     */
+    public abstract String getName();
+
+    /**
+     * Generates a 16x4096 array of BlockBuckets corresponding to the area settings to allow for plot analysis
+     *
+     * @param settings
+     * @return
+     */
+    public abstract BlockBucket[][] generateBlockBucketChunk(PlotArea settings);
+
+    /**
+     * Use the setBlock or setBiome method of the PlotChunk result parameter to make changes.
+     * The PlotArea settings is the same one this was initialized with.
+     * The PseudoRandom random is a fast random object.
+     *
+     * @param result
+     * @param settings
+     */
+    public abstract void generateChunk(ScopedLocalBlockQueue result, PlotArea settings);
+
+    public boolean populateChunk(ScopedLocalBlockQueue result, PlotArea setting) {
+        return false;
+    }
+
+    /**
+     * Return a new PlotArea object.
+     *
+     * @param world world name
+     * @param id    (May be null) Area name
+     * @param min   Min plot id (may be null)
+     * @param max   Max plot id (may be null)
+     * @return
+     */
+    public abstract PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max);
+
+    /**
+     * Return a new PlotManager object.
+     *
+     * @return
+     */
+    public abstract PlotManager getNewPlotManager();
+
+    /**
+     * If any additional setup options need to be changed before world creation.
+     * - e.g. If setup doesn't support some standard options
+     *
+     * @param setup
+     */
+    public void processSetup(SetupObject setup) {
+    }
+
+    /**
+     * It is preferred for the PlotArea object to do most of the initialization necessary.
+     *
+     * @param area
+     */
+    public abstract void initialize(PlotArea area);
+
+    /**
+     * Get the generator for your specific implementation (bukkit/sponge).<br>
+     * - e.g. YourIndependentGenerator.&lt;ChunkGenerator&gt;specify() - Would return a ChunkGenerator object<br>
+     *
+     * @param <T>
+     * @param <T>
+     * @return
+     */
+    public <T> GeneratorWrapper<T> specify(String world) {
+        return (GeneratorWrapper<T>) PlotSquared.get().IMP.wrapPlotGenerator(world, this);
+    }
+
+    @Override public String toString() {
+        return getName();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java
new file mode 100644
index 000000000..88c7f2557
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java
@@ -0,0 +1,37 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
+import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
+
+public abstract class PlotGenerator<T> {
+
+    public final T generator;
+
+    public PlotGenerator(T generator) {
+        this.generator = generator;
+    }
+
+    public abstract void initialize(PlotArea plotArea);
+
+    /**
+     * TYPE = 2;
+     * new AugmentedPopulator(world, generator, cluster, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
+     * TYPE = 1
+     * new AugmentedPopulator(world, gen_class, null, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
+     *
+     * @param area
+     */
+    public abstract void augment(PlotArea area);
+
+    public abstract PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max);
+
+    public abstract PlotManager getPlotManager();
+
+    public abstract boolean isFull();
+
+    public abstract String getName();
+
+    public abstract void processSetup(SetupObject object);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
new file mode 100644
index 000000000..d65e4940e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
@@ -0,0 +1,220 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+
+/**
+ * A plot manager with a square grid layout, with square shaped plots.
+ */
+public abstract class SquarePlotManager extends GridPlotManager {
+
+    @Override
+    public boolean clearPlot(PlotArea plotArea, final Plot plot, final Runnable whenDone) {
+        final HashSet<RegionWrapper> regions = plot.getRegions();
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    whenDone.run();
+                    return;
+                }
+                Iterator<RegionWrapper> iterator = regions.iterator();
+                RegionWrapper region = iterator.next();
+                iterator.remove();
+                Location pos1 =
+                    new Location(plot.getWorldName(), region.minX, region.minY, region.minZ);
+                Location pos2 =
+                    new Location(plot.getWorldName(), region.maxX, region.maxY, region.maxZ);
+                ChunkManager.manager.regenerateRegion(pos1, pos2, false, this);
+            }
+        };
+        run.run();
+        return true;
+    }
+
+    @Override public Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId) {
+        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+        int px = plotId.x;
+        int pz = plotId.y;
+        int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - (int) Math
+            .floor(dpw.ROAD_WIDTH / 2) - 1;
+        int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - (int) Math
+            .floor(dpw.ROAD_WIDTH / 2) - 1;
+        return new Location(plotArea.worldname, x, Math.min(getWorldHeight(), 255), z);
+    }
+
+    @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
+        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+        if (dpw.ROAD_OFFSET_X != 0) {
+            x -= dpw.ROAD_OFFSET_X;
+        }
+        if (dpw.ROAD_OFFSET_Z != 0) {
+            z -= dpw.ROAD_OFFSET_Z;
+        }
+        int pathWidthLower;
+        int end;
+        if (dpw.ROAD_WIDTH == 0) {
+            pathWidthLower = -1;
+            end = dpw.PLOT_WIDTH;
+        } else {
+            if ((dpw.ROAD_WIDTH % 2) == 0) {
+                pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
+            } else {
+                pathWidthLower = dpw.ROAD_WIDTH / 2;
+            }
+            end = pathWidthLower + dpw.PLOT_WIDTH;
+        }
+        int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
+        int idx;
+        if (x < 0) {
+            idx = x / size;
+            x = size + (x % size);
+        } else {
+            idx = (x / size) + 1;
+            x = x % size;
+        }
+        int idz;
+        if (z < 0) {
+            idz = z / size;
+            z = size + (z % size);
+        } else {
+            idz = (z / size) + 1;
+            z = z % size;
+        }
+        if (z <= pathWidthLower || z > end || x <= pathWidthLower || x > end) {
+            return null;
+        } else {
+            return new PlotId(idx, idz);
+        }
+    }
+
+    public PlotId getNearestPlotId(PlotArea plotArea, int x, int y, int z) {
+        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+        if (dpw.ROAD_OFFSET_X != 0) {
+            x -= dpw.ROAD_OFFSET_X;
+        }
+        if (dpw.ROAD_OFFSET_Z != 0) {
+            z -= dpw.ROAD_OFFSET_Z;
+        }
+        int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
+        int idx;
+        if (x < 0) {
+            idx = x / size;
+        } else {
+            idx = (x / size) + 1;
+        }
+        int idz;
+        if (z < 0) {
+            idz = z / size;
+        } else {
+            idz = (z / size) + 1;
+        }
+        return new PlotId(idx, idz);
+    }
+
+    @Override public PlotId getPlotId(PlotArea plotArea, int x, int y, int z) {
+        try {
+            SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+            if (plotArea == null) {
+                return null;
+            }
+            x -= dpw.ROAD_OFFSET_X;
+            z -= dpw.ROAD_OFFSET_Z;
+            int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
+            int pathWidthLower;
+            int end;
+            if (dpw.ROAD_WIDTH == 0) {
+                pathWidthLower = -1;
+                end = dpw.PLOT_WIDTH;
+            } else {
+                if ((dpw.ROAD_WIDTH % 2) == 0) {
+                    pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
+                } else {
+                    pathWidthLower = dpw.ROAD_WIDTH / 2;
+                }
+                end = pathWidthLower + dpw.PLOT_WIDTH;
+            }
+            int dx;
+            int rx;
+            if (x < 0) {
+                dx = x / size;
+                rx = size + (x % size);
+            } else {
+                dx = (x / size) + 1;
+                rx = x % size;
+            }
+            int dz;
+            int rz;
+            if (z < 0) {
+                dz = z / size;
+                rz = size + (z % size);
+            } else {
+                dz = (z / size) + 1;
+                rz = z % size;
+            }
+            PlotId id = new PlotId(dx, dz);
+            boolean[] merged =
+                new boolean[] {rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
+            int hash = MainUtil.hash(merged);
+            // Not merged, and no need to check if it is
+            if (hash == 0) {
+                return id;
+            }
+            Plot plot = plotArea.getOwnedPlotAbs(id);
+            // Not merged, and standing on road
+            if (plot == null) {
+                return null;
+            }
+            switch (hash) {
+                case 8:
+                    // north
+                    return plot.getMerged(0) ? id : null;
+                case 4:
+                    // east
+                    return plot.getMerged(1) ? id : null;
+                case 2:
+                    // south
+                    return plot.getMerged(2) ? id : null;
+                case 1:
+                    // west
+                    return plot.getMerged(3) ? id : null;
+                case 12:
+                    // northest
+                    return plot.getMerged(4) ? id : null;
+                case 6:
+                    // southeast
+                    return plot.getMerged(5) ? id : null;
+                case 3:
+                    // southwest
+                    return plot.getMerged(6) ? id : null;
+                case 9:
+                    // northwest
+                    return plot.getMerged(7) ? id : null;
+            }
+            PlotSquared.debug("invalid location: " + Arrays.toString(merged));
+        } catch (Exception ignored) {
+            PlotSquared.debug(
+                "Invalid plot / road width in settings.yml for world: " + plotArea.worldname);
+        }
+        return null;
+    }
+
+    /**
+     * Get the bottom plot loc (some basic math).
+     */
+    @Override public Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId) {
+        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+        int px = plotId.x;
+        int pz = plotId.y;
+        int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH
+            - (int) Math.floor(dpw.ROAD_WIDTH / 2);
+        int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH
+            - (int) Math.floor(dpw.ROAD_WIDTH / 2);
+        return new Location(plotArea.worldname, x, plotArea.MIN_BUILD_HEIGHT, z);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
new file mode 100644
index 000000000..5401d221a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.plot.generator;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+
+public abstract class SquarePlotWorld extends GridPlotWorld {
+
+    public int PLOT_WIDTH = 42;
+    public int ROAD_WIDTH = 7;
+    public int ROAD_OFFSET_X = 0;
+    public int ROAD_OFFSET_Z = 0;
+
+    public SquarePlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+        PlotId min, PlotId max) {
+        super(worldName, id, generator, min, max);
+    }
+
+    @Override public void loadConfiguration(ConfigurationSection config) {
+        if (!config.contains("plot.height")) {
+            PlotSquared.debug(" - &cConfiguration is null? (" + config.getCurrentPath() + ')');
+        }
+        this.PLOT_WIDTH = config.getInt("plot.size");
+        this.ROAD_WIDTH = config.getInt("road.width");
+        this.ROAD_OFFSET_X = config.getInt("road.offset.x");
+        this.ROAD_OFFSET_Z = config.getInt("road.offset.z");
+        this.SIZE = (short) (this.PLOT_WIDTH + this.ROAD_WIDTH);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java
new file mode 100644
index 000000000..5d0c86858
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java
@@ -0,0 +1,12 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+import com.sk89q.worldedit.extent.AbstractDelegateExtent;
+import com.sk89q.worldedit.extent.Extent;
+
+public class ExtentWrapper extends AbstractDelegateExtent {
+
+    protected ExtentWrapper(final Extent extent) {
+        super(extent);
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java
new file mode 100644
index 000000000..815f5ea43
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java
@@ -0,0 +1,32 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+public enum PlayerBlockEventType {
+    // Non interactive
+    EAT, READ,
+
+    // Right click with monster egg
+    SPAWN_MOB,
+
+    // Dragon egg
+    TELEPORT_OBJECT,
+
+    // armor stands
+    PLACE_MISC, // blocks
+    PLACE_BLOCK, // paintings / item frames
+    PLACE_HANGING, // vehicles
+    PLACE_VEHICLE,
+
+    // armor stands
+    BREAK_MISC, // blocks
+    BREAK_BLOCK, // paintings / item frames
+    BREAK_HANGING, BREAK_VEHICLE,
+
+    // armor stands
+    INTERACT_MISC, // blocks
+    INTERACT_BLOCK, // vehicle
+    INTERACT_VEHICLE, // item frame / painting
+    INTERACT_HANGING,
+
+    // Pressure plate, tripwire etc
+    TRIGGER_PHYSICAL,
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
new file mode 100644
index 000000000..ed8b42f57
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
@@ -0,0 +1,260 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+public class PlotListener {
+
+    public static boolean plotEntry(final PlotPlayer player, final Plot plot) {
+        if (plot.isDenied(player.getUUID()) && !Permissions
+            .hasPermission(player, "plots.admin.entry.denied")) {
+            return false;
+        }
+        Plot last = player.getMeta(PlotPlayer.META_LAST_PLOT);
+        if ((last != null) && !last.getId().equals(plot.getId())) {
+            plotExit(player, last);
+        }
+        if (ExpireManager.IMP != null) {
+            ExpireManager.IMP.handleEntry(player, plot);
+        }
+        player.setMeta(PlotPlayer.META_LAST_PLOT, plot);
+        EventUtil.manager.callEntry(player, plot);
+        if (plot.hasOwner()) {
+            Map<Flag<?>, Object> flags = FlagManager.getPlotFlags(plot);
+
+            boolean titles;
+            if (!plot.getArea().DEFAULT_FLAGS.isEmpty()) {
+                Boolean value = (Boolean) plot.getArea().DEFAULT_FLAGS.get(Flags.TITLES);
+                titles = value != null ? value : Settings.TITLES;
+            } else {
+                titles = Settings.TITLES;
+            }
+            final String greeting;
+            if (flags.isEmpty()) {
+                if (titles) {
+                    greeting = "";
+                } else {
+                    return true;
+                }
+            } else {
+                titles = plot.getFlag(Flags.TITLES, titles);
+                Optional<String> greetingFlag = plot.getFlag(Flags.GREETING);
+                if (greetingFlag.isPresent()) {
+                    greeting = greetingFlag.get();
+                    MainUtil.format(C.PREFIX_GREETING.s() + greeting, plot, player, false,
+                        new RunnableVal<String>() {
+                            @Override public void run(String value) {
+                                MainUtil.sendMessage(player, value);
+                            }
+                        });
+                } else {
+                    greeting = "";
+                }
+                Optional<Boolean> enter = plot.getFlag(Flags.NOTIFY_ENTER);
+                if (enter.isPresent() && enter.get()) {
+                    if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) {
+                        for (UUID uuid : plot.getOwners()) {
+                            PlotPlayer owner = UUIDHandler.getPlayer(uuid);
+                            if (owner != null && !owner.getUUID().equals(player.getUUID())) {
+                                MainUtil.sendMessage(owner,
+                                    C.NOTIFY_ENTER.s().replace("%player", player.getName())
+                                        .replace("%plot", plot.getId().toString()));
+                            }
+                        }
+                    }
+                }
+                Optional<Boolean> flyFlag = plot.getFlag(Flags.FLY);
+                if (flyFlag.isPresent()) {
+                    boolean flight = player.getFlight();
+                    PlotGameMode gamemode = player.getGameMode();
+                    if (flight != (gamemode == PlotGameMode.CREATIVE
+                        || gamemode == PlotGameMode.SPECTATOR)) {
+                        player.setPersistentMeta("flight",
+                            ByteArrayUtilities.booleanToBytes(player.getFlight()));
+                    }
+                    if (flyFlag.get() != player.getFlight()) {
+                        player.setFlight(flyFlag.get());
+                    }
+                }
+                Optional<PlotGameMode> gamemodeFlag = plot.getFlag(Flags.GAMEMODE);
+                if (gamemodeFlag.isPresent()) {
+                    if (player.getGameMode() != gamemodeFlag.get()) {
+                        if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) {
+                            player.setGameMode(gamemodeFlag.get());
+                        } else {
+                            MainUtil.sendMessage(player, StringMan
+                                .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.getId(),
+                                    "{gamemode}", gamemodeFlag.get()));
+                        }
+                    }
+                }
+                Optional<PlotGameMode> guestGamemodeFlag = plot.getFlag(Flags.GUEST_GAMEMODE);
+                if (guestGamemodeFlag.isPresent()) {
+                    if (player.getGameMode() != guestGamemodeFlag.get() && !plot
+                        .isAdded(player.getUUID())) {
+                        if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) {
+                            player.setGameMode(guestGamemodeFlag.get());
+                        } else {
+                            MainUtil.sendMessage(player, StringMan
+                                .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.getId(),
+                                    "{gamemode}", guestGamemodeFlag.get()));
+                        }
+                    }
+                }
+                Optional<Long> timeFlag = plot.getFlag(Flags.TIME);
+                if (timeFlag.isPresent()) {
+                    try {
+                        long time = timeFlag.get();
+                        player.setTime(time);
+                    } catch (Exception ignored) {
+                        FlagManager.removePlotFlag(plot, Flags.TIME);
+                    }
+                }
+                Optional<PlotWeather> weatherFlag = plot.getFlag(Flags.WEATHER);
+                weatherFlag.ifPresent(player::setWeather);
+                Optional<String> musicFlag = plot.getFlag(Flags.MUSIC);
+                if (musicFlag.isPresent()) {
+                    final String id = musicFlag.get();
+                    final PlotBlock block = PlotBlock.get(id);
+                    final String rawId = block.getRawId().toString();
+                    if (rawId.contains("disc") || PlotBlock.isEverything(block) || block.isAir()) {
+                        Location loc = player.getLocation();
+                        Location lastLoc = player.getMeta("music");
+                        if (lastLoc != null) {
+                            player.playMusic(lastLoc, PlotBlock.get("air"));
+                            if (PlotBlock.isEverything(block) || block.isAir()) {
+                                player.deleteMeta("music");
+                            }
+                        }
+                        if (!(PlotBlock.isEverything(block) || block.isAir())) {
+                            try {
+                                player.setMeta("music", loc);
+                                player.playMusic(loc, block);
+                            } catch (Exception ignored) {
+                            }
+                        }
+                    }
+                } else {
+                    Location lastLoc = player.getMeta("music");
+                    if (lastLoc != null) {
+                        player.deleteMeta("music");
+                        player.playMusic(lastLoc, PlotBlock.get("air"));
+                    }
+                }
+                CommentManager.sendTitle(player, plot);
+            }
+            if (titles) {
+                if (!C.TITLE_ENTERED_PLOT.s().isEmpty() || !C.TITLE_ENTERED_PLOT_SUB.s()
+                    .isEmpty()) {
+                    TaskManager.runTaskLaterAsync(() -> {
+                        Plot lastPlot = player.getMeta(PlotPlayer.META_LAST_PLOT);
+                        if ((lastPlot != null) && plot.getId().equals(lastPlot.getId())) {
+                            Map<String, String> replacements = new HashMap<>();
+                            replacements.put("%x%", String.valueOf(lastPlot.getId().x));
+                            replacements.put("%z%", lastPlot.getId().y + "");
+                            replacements.put("%world%", plot.getArea().toString());
+                            replacements.put("%greeting%", greeting);
+                            replacements.put("%alias", plot.toString());
+                            replacements.put("%s", MainUtil.getName(plot.owner));
+                            String main =
+                                StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
+                            String sub = StringMan
+                                .replaceFromMap(C.TITLE_ENTERED_PLOT_SUB.s(), replacements);
+                            AbstractTitle.sendTitle(player, main, sub);
+                        }
+                    }, 20);
+                }
+            }
+            return true;
+        }
+        return true;
+    }
+
+    public static boolean plotExit(final PlotPlayer player, Plot plot) {
+        Object previous = player.deleteMeta(PlotPlayer.META_LAST_PLOT);
+        EventUtil.manager.callLeave(player, plot);
+        if (plot.hasOwner()) {
+            PlotArea pw = plot.getArea();
+            if (pw == null) {
+                return true;
+            }
+            if (Flags.DENY_EXIT.isTrue(plot) && !player.getMeta("kick", false)) {
+                if (previous != null) {
+                    player.setMeta(PlotPlayer.META_LAST_PLOT, previous);
+                }
+                return false;
+            }
+            if (plot.getFlag(Flags.GAMEMODE).isPresent() || plot.getFlag(Flags.GUEST_GAMEMODE)
+                .isPresent()) {
+                if (player.getGameMode() != pw.GAMEMODE) {
+                    if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) {
+                        player.setGameMode(pw.GAMEMODE);
+                    } else {
+                        MainUtil.sendMessage(player, StringMan
+                            .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.toString(),
+                                "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
+                    }
+                }
+            }
+            Optional<String> farewell = plot.getFlag(Flags.FAREWELL);
+            farewell.ifPresent(s -> MainUtil
+                .format(C.PREFIX_FAREWELL.s() + s, plot, player, false, new RunnableVal<String>() {
+                    @Override public void run(String value) {
+                        MainUtil.sendMessage(player, value);
+                    }
+                }));
+            Optional<Boolean> leave = plot.getFlag(Flags.NOTIFY_LEAVE);
+            if (leave.isPresent() && leave.get()) {
+                if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) {
+                    for (UUID uuid : plot.getOwners()) {
+                        PlotPlayer owner = UUIDHandler.getPlayer(uuid);
+                        if ((owner != null) && !owner.getUUID().equals(player.getUUID())) {
+                            MainUtil.sendMessage(owner,
+                                C.NOTIFY_LEAVE.s().replace("%player", player.getName())
+                                    .replace("%plot", plot.getId().toString()));
+                        }
+                    }
+                }
+            }
+            if (plot.getFlag(Flags.FLY).isPresent()) {
+                if (player.hasPersistentMeta("flight")) {
+                    player.setFlight(
+                        ByteArrayUtilities.bytesToBoolean(player.getPersistentMeta("flight")));
+                    player.removePersistentMeta("flight");
+                } else {
+                    PlotGameMode gameMode = player.getGameMode();
+                    if (gameMode == PlotGameMode.SURVIVAL || gameMode == PlotGameMode.ADVENTURE) {
+                        player.setFlight(false);
+                    } else if (!player.getFlight()) {
+                        player.setFlight(true);
+                    }
+                }
+            }
+            if (plot.getFlag(Flags.TIME).isPresent()) {
+                player.setTime(Long.MAX_VALUE);
+            }
+
+            if (plot.getFlag(Flags.WEATHER).isPresent()) {
+                player.setWeather(PlotWeather.CLEAR);
+            }
+
+            Location lastLoc = player.getMeta("music");
+            if (lastLoc != null) {
+                player.deleteMeta("music");
+                player.playMusic(lastLoc, PlotBlock.get("air"));
+            }
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
new file mode 100644
index 000000000..431c2c378
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
@@ -0,0 +1,178 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.entity.BaseEntity;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extent.AbstractDelegateExtent;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.extent.NullExtent;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+
+import java.lang.reflect.Field;
+import java.util.HashSet;
+
+public class ProcessedWEExtent extends AbstractDelegateExtent {
+
+    private final HashSet<RegionWrapper> mask;
+    private final String world;
+    private final int max;
+    int BScount = 0;
+    int Ecount = 0;
+    boolean BSblocked = false;
+    boolean Eblocked = false;
+    private int count;
+    private Extent parent;
+
+    public ProcessedWEExtent(String world, HashSet<RegionWrapper> mask, int max, Extent child,
+        Extent parent) {
+        super(child);
+        this.mask = mask;
+        this.world = world;
+        if (max == -1) {
+            max = Integer.MAX_VALUE;
+        }
+        this.max = max;
+        this.count = 0;
+        this.parent = parent;
+    }
+
+    @Override public BlockState getBlock(BlockVector3 location) {
+        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
+            return super.getBlock(location);
+        }
+        return WEExtent.AIRSTATE;
+    }
+
+    @Override public BaseBlock getFullBlock(BlockVector3 location) {
+        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
+            return super.getFullBlock(location);
+        }
+        return WEExtent.AIRBASE;
+    }
+
+    @Override public boolean setBlock(BlockVector3 location, BlockStateHolder block)
+        throws WorldEditException {
+        String id = block.getBlockType().getId();
+        switch (id) {
+            case "54":
+            case "130":
+            case "142":
+            case "27":
+            case "137":
+            case "52":
+            case "154":
+            case "84":
+            case "25":
+            case "144":
+            case "138":
+            case "176":
+            case "177":
+            case "63":
+            case "68":
+            case "323":
+            case "117":
+            case "116":
+            case "28":
+            case "66":
+            case "157":
+            case "61":
+            case "62":
+            case "140":
+            case "146":
+            case "149":
+            case "150":
+            case "158":
+            case "23":
+            case "123":
+            case "124":
+            case "29":
+            case "33":
+            case "151":
+            case "178":
+                if (this.BSblocked) {
+                    return false;
+                }
+                this.BScount++;
+                if (this.BScount > Settings.Chunk_Processor.MAX_TILES) {
+                    this.BSblocked = true;
+                    PlotSquared.debug(
+                        C.PREFIX + "&cdetected unsafe WorldEdit: " + location.getX() + ","
+                            + location.getZ());
+                }
+                if (WEManager
+                    .maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
+                    if (this.count++ > this.max) {
+                        if (this.parent != null) {
+                            try {
+                                Field field =
+                                    AbstractDelegateExtent.class.getDeclaredField("extent");
+                                field.setAccessible(true);
+                                field.set(this.parent, new NullExtent());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            this.parent = null;
+                        }
+                        return false;
+                    }
+                    return super.setBlock(location, block);
+                }
+                break;
+            default:
+                if (WEManager
+                    .maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
+                    if (this.count++ > this.max) {
+                        if (this.parent != null) {
+                            try {
+                                Field field =
+                                    AbstractDelegateExtent.class.getDeclaredField("extent");
+                                field.setAccessible(true);
+                                field.set(this.parent, new NullExtent());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                            this.parent = null;
+                        }
+                        return false;
+                    }
+                    super.setBlock(location, block);
+                }
+                return true;
+
+        }
+        return false;
+    }
+
+    @Override public Entity createEntity(Location location, BaseEntity entity) {
+        if (this.Eblocked) {
+            return null;
+        }
+        this.Ecount++;
+        if (this.Ecount > Settings.Chunk_Processor.MAX_ENTITIES) {
+            this.Eblocked = true;
+            PlotSquared.debug(
+                C.PREFIX + "&cdetected unsafe WorldEdit: " + location.getBlockX() + "," + location
+                    .getBlockZ());
+        }
+        if (WEManager.maskContains(this.mask, location.getBlockX(), location.getBlockY(),
+            location.getBlockZ())) {
+            return super.createEntity(location, entity);
+        }
+        return null;
+    }
+
+    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
+        return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
+            .setBiome(position, biome);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
new file mode 100644
index 000000000..ac0503886
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
@@ -0,0 +1,63 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.entity.BaseEntity;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extent.AbstractDelegateExtent;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
+
+import java.util.HashSet;
+
+public class WEExtent extends AbstractDelegateExtent {
+
+    public static BlockState AIRSTATE = BlockTypes.AIR.getDefaultState();
+    public static BaseBlock AIRBASE = BlockTypes.AIR.getDefaultState().toBaseBlock();
+    private final HashSet<RegionWrapper> mask;
+
+    public WEExtent(HashSet<RegionWrapper> mask, Extent extent) {
+        super(extent);
+        this.mask = mask;
+    }
+
+    @Override public boolean setBlock(BlockVector3 location, BlockStateHolder block)
+        throws WorldEditException {
+        return WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())
+            && super.setBlock(location, block);
+    }
+
+    @Override public Entity createEntity(Location location, BaseEntity entity) {
+        if (WEManager.maskContains(this.mask, location.getBlockX(), location.getBlockY(),
+            location.getBlockZ())) {
+            return super.createEntity(location, entity);
+        }
+        return null;
+    }
+
+    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
+        return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
+            .setBiome(position, biome);
+    }
+
+    @Override public BlockState getBlock(BlockVector3 location) {
+        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
+            return super.getBlock(location);
+        }
+        return AIRSTATE;
+    }
+
+    @Override public BaseBlock getFullBlock(BlockVector3 location) {
+        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
+            return super.getFullBlock(location);
+        }
+        return AIRBASE;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
new file mode 100644
index 000000000..0d80cab31
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
@@ -0,0 +1,101 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+
+import java.util.HashSet;
+import java.util.UUID;
+
+public class WEManager {
+
+    public static boolean maskContains(HashSet<RegionWrapper> mask, int x, int y, int z) {
+        for (RegionWrapper region : mask) {
+            if (region.isIn(x, y, z)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean maskContains(HashSet<RegionWrapper> mask, int x, int z) {
+        for (RegionWrapper region : mask) {
+            if (region.isIn(x, z)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean maskContains(HashSet<RegionWrapper> mask, double dx, double dy,
+        double dz) {
+        int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
+        int y = Math.toIntExact(Math.round(dy - 0.5));
+        int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
+        for (RegionWrapper region : mask) {
+            if (region.isIn(x, y, z)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean maskContains(HashSet<RegionWrapper> mask, double dx, double dz) {
+        int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
+        int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
+        for (RegionWrapper region : mask) {
+            if (region.isIn(x, z)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static HashSet<RegionWrapper> getMask(PlotPlayer player) {
+        HashSet<RegionWrapper> regions = new HashSet<>();
+        UUID uuid = player.getUUID();
+        Location location = player.getLocation();
+        String world = location.getWorld();
+        if (!PlotSquared.get().hasPlotArea(world)) {
+            regions.add(new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
+                Integer.MAX_VALUE));
+            return regions;
+        }
+        PlotArea area = player.getApplicablePlotArea();
+        if (area == null) {
+            return regions;
+        }
+        boolean allowMember = player.hasPermission("plots.worldedit.member");
+        Plot plot = player.getCurrentPlot();
+        HashSet<RegionWrapper> allowed = new HashSet<>();
+        if (plot == null) {
+            plot = player.getMeta("WorldEditRegionPlot");
+        }
+        if (plot != null && (!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot)) && (
+            (allowMember && plot.isAdded(uuid)) || (!allowMember && (plot.isOwner(uuid)) || plot
+                .getTrusted().contains(uuid))) && !(Flags.NO_WORLDEDIT.isTrue(plot))) {
+            for (RegionWrapper region : plot.getRegions()) {
+                RegionWrapper copy =
+                    new RegionWrapper(region.minX, region.maxX, area.MIN_BUILD_HEIGHT,
+                        area.MAX_BUILD_HEIGHT, region.minZ, region.maxZ);
+                regions.add(copy);
+            }
+            player.setMeta("WorldEditRegionPlot", plot);
+        }
+        return regions;
+    }
+
+    public static boolean intersects(RegionWrapper region1, RegionWrapper region2) {
+        return region1.intersects(region2);
+    }
+
+    public static boolean regionContains(RegionWrapper selection, HashSet<RegionWrapper> mask) {
+        for (RegionWrapper region : mask) {
+            if (intersects(region, selection)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
new file mode 100644
index 000000000..f86b9f53c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
@@ -0,0 +1,76 @@
+package com.github.intellectualsites.plotsquared.plot.listener;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.entity.Player;
+import com.sk89q.worldedit.event.extent.EditSessionEvent;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extent.NullExtent;
+import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.util.eventbus.EventHandler.Priority;
+import com.sk89q.worldedit.util.eventbus.Subscribe;
+import com.sk89q.worldedit.world.World;
+
+import java.util.HashSet;
+
+public class WESubscriber {
+
+    @Subscribe(priority = Priority.VERY_EARLY) public void onEditSession(EditSessionEvent event) {
+        WorldEdit worldedit = PlotSquared.get().worldedit;
+        if (worldedit == null) {
+            WorldEdit.getInstance().getEventBus().unregister(this);
+            return;
+        }
+        World worldObj = event.getWorld();
+        String world = worldObj.getName();
+        Actor actor = event.getActor();
+        if (actor != null && actor.isPlayer()) {
+            String name = actor.getName();
+            PlotPlayer pp = PlotPlayer.wrap(name);
+            HashSet<RegionWrapper> mask;
+            if (pp == null) {
+                Player player = (Player) actor;
+                Location loc = player.getLocation();
+                com.github.intellectualsites.plotsquared.plot.object.Location pLoc =
+                    new com.github.intellectualsites.plotsquared.plot.object.Location(
+                        player.getWorld().getName(), loc.getBlockX(), loc.getBlockX(),
+                        loc.getBlockZ());
+                Plot plot = pLoc.getPlot();
+                if (plot == null) {
+                    event.setExtent(new NullExtent());
+                    return;
+                }
+                mask = plot.getRegions();
+            } else if (pp.getAttribute("worldedit")) {
+                return;
+            } else {
+                mask = WEManager.getMask(pp);
+                if (mask.isEmpty()) {
+                    if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
+                        MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
+                    }
+                    if (PlotSquared.get().hasPlotArea(world)) {
+                        event.setExtent(new NullExtent());
+                    }
+                    return;
+                }
+            }
+            if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
+                if (PlotSquared.get().hasPlotArea(world)) {
+                    event.setExtent(
+                        new ProcessedWEExtent(world, mask, event.getMaxBlocks(), event.getExtent(),
+                            event.getExtent()));
+                }
+            } else if (PlotSquared.get().hasPlotArea(world)) {
+                event.setExtent(new WEExtent(mask, event.getExtent()));
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java
new file mode 100644
index 000000000..ed925a135
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java
@@ -0,0 +1,18 @@
+package com.github.intellectualsites.plotsquared.plot.logger;
+
+public class DelegateLogger implements ILogger {
+
+    private final ILogger parent;
+
+    public DelegateLogger(ILogger parent) {
+        this.parent = parent;
+    }
+
+    public ILogger getParent() {
+        return parent;
+    }
+
+    @Override public void log(String message) {
+        parent.log(message);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
new file mode 100644
index 000000000..29a45ac27
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
@@ -0,0 +1,5 @@
+package com.github.intellectualsites.plotsquared.plot.logger;
+
+@FunctionalInterface public interface ILogger {
+    void log(String message);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
new file mode 100644
index 000000000..3278b62d3
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
@@ -0,0 +1,276 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.google.common.collect.ImmutableMap;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * A block bucket is a container of block types, where each block
+ * has a specified chance of being randomly picked
+ */
+@EqualsAndHashCode @SuppressWarnings({"unused", "WeakerAccess"}) public final class BlockBucket
+    implements Iterable<PlotBlock>, ConfigurationSerializable {
+
+    private final Random random = new Random();
+    private final Map<Range, PlotBlock> ranges = new HashMap<>();
+    private final Map<PlotBlock, Integer> blocks;
+    private final BucketIterator bucketIterator = new BucketIterator();
+    private boolean compiled, singleItem;
+    private PlotBlock head;
+
+    public BlockBucket() {
+        this.blocks = new HashMap<>();
+    }
+
+    public static BlockBucket withSingle(@NonNull final PlotBlock block) {
+        final BlockBucket blockBucket = new BlockBucket();
+        blockBucket.addBlock(block, 100);
+        return blockBucket;
+    }
+
+    public static BlockBucket deserialize(@NonNull final Map<String, Object> map) {
+        if (!map.containsKey("blocks")) {
+            return null;
+        }
+        return Configuration.BLOCK_BUCKET.parseString(map.get("blocks").toString());
+    }
+
+    public void addBlock(@NonNull final PlotBlock block) {
+        this.addBlock(block, -1);
+    }
+
+    public void addBlock(@NonNull final PlotBlock block, final int chance) {
+        this.blocks.put(block, chance);
+        this.compiled = false;
+        if (head == null) {
+            head = block;
+        }
+    }
+
+    public boolean isEmpty() {
+        if (isCompiled()) {
+            return ranges.isEmpty();
+        }
+        return blocks.isEmpty();
+    }
+
+    /**
+     * Get all blocks that are configured in the bucket
+     *
+     * @return Immutable collection containing all blocks that can
+     * be found in the bucket
+     */
+    public Collection<PlotBlock> getBlocks() {
+        if (!isCompiled()) {
+            this.compile();
+        }
+        return Collections.unmodifiableCollection(this.ranges.values());
+    }
+
+    /**
+     * Get a collection containing a specified amount of randomly selected blocks
+     *
+     * @param count Number of blocks
+     * @return Immutable collection containing randomly selected blocks
+     */
+    public Collection<PlotBlock> getBlocks(final int count) {
+        return Arrays.asList(getBlockArray(count));
+    }
+
+    /**
+     * Get an array containing a specified amount of randomly selected blocks
+     *
+     * @param count Number of blocks
+     * @return Immutable collection containing randomly selected blocks
+     */
+    public PlotBlock[] getBlockArray(final int count) {
+        final PlotBlock[] blocks = new PlotBlock[count];
+        if (this.singleItem) {
+            Arrays.fill(blocks, 0, count, getBlock());
+        } else {
+            for (int i = 0; i < count; i++) {
+                blocks[i] = getBlock();
+            }
+        }
+        return blocks;
+    }
+
+    public boolean hasSingleItem() {
+        return this.singleItem;
+    }
+
+    public void compile() {
+        if (isCompiled()) {
+            return;
+        }
+
+        if (blocks.size() == 0) {
+            this.compiled = true;
+            return;
+        }
+
+        if (blocks.size() == 1) {
+            this.ranges.put(new Range(0, 100, true), blocks.keySet().toArray(new PlotBlock[1])[0]);
+            this.compiled = true;
+            this.singleItem = true;
+            return;
+        }
+
+        final Map<PlotBlock, Integer> temp = new HashMap<>(blocks.size());
+        final List<PlotBlock> unassigned = new ArrayList<>(blocks.size());
+
+        int sum = 0;
+        for (final Map.Entry<PlotBlock, Integer> entry : blocks.entrySet()) {
+            if (entry.getValue() == -1) {
+                unassigned.add(entry.getKey());
+            } else {
+                sum += entry.getValue();
+                temp.put(entry.getKey(), entry.getValue());
+            }
+        }
+        //
+        // If this doesn't amount to 100 add it up to exactly 100.
+        //
+        if (sum < 100) {
+            final int remaining = 100 - sum;
+            if (unassigned.isEmpty()) {
+                // If there are no unassigned values, we just add it to the first value
+                final Entry<PlotBlock, Integer> entry = temp.entrySet().iterator().next();
+                temp.put(entry.getKey(), (entry.getValue() + 1 + remaining));
+            } else {
+                final int perUnassigned = remaining / unassigned.size();
+                for (final PlotBlock block : unassigned) {
+                    temp.put(block, perUnassigned);
+                    sum += perUnassigned;
+                }
+                // Make sure there isn't a tiny difference remaining
+                if (sum < 100) {
+                    final int difference = 100 - sum;
+                    temp.put(unassigned.get(0), perUnassigned + difference);
+                    sum = 100;
+                }
+            }
+        } else if (!unassigned.isEmpty()) {
+            C.BUCKET_ENTRIES_IGNORED.send(ConsolePlayer.getConsole());
+        }
+        //
+        // If the sum adds up to more than 100, divide all values
+        //
+        if (sum > 100) {
+            final double ratio = 100D / sum;
+            for (final Map.Entry<PlotBlock, Integer> entry : blocks.entrySet()) {
+                if (entry.getValue() == -1) {
+                    continue;
+                }
+                temp.put(entry.getKey(), (int) (entry.getValue() * ratio));
+            }
+        } else {
+            temp.forEach(temp::put);
+        }
+        int start = 0;
+        for (final Map.Entry<PlotBlock, Integer> entry : temp.entrySet()) {
+            final int rangeStart = start;
+            final int rangeEnd = rangeStart + entry.getValue();
+            start = rangeEnd + 1;
+            final Range range =
+                new Range(rangeStart, rangeEnd, unassigned.contains(entry.getKey()));
+            this.ranges.put(range, entry.getKey());
+        }
+        this.blocks.clear();
+        this.compiled = true;
+    }
+
+    @Override public Iterator<PlotBlock> iterator() {
+        return this.bucketIterator;
+    }
+
+    public boolean isCompiled() {
+        return this.compiled;
+    }
+
+    /**
+     * Get a random block out of the bucket
+     *
+     * @return Randomly picked block (cased on specified rates)
+     */
+    public PlotBlock getBlock() {
+        if (!isCompiled()) {
+            this.compile();
+        }
+        if (this.isEmpty()) {
+            return StringPlotBlock.EVERYTHING;
+        } else if (this.hasSingleItem()) {
+            return this.head;
+        }
+        final int number = random.nextInt(101);
+        for (final Map.Entry<Range, PlotBlock> entry : ranges.entrySet()) {
+            if (entry.getKey().isInRange(number)) {
+                return entry.getValue();
+            }
+        }
+        // Didn't find a block? Try again
+        return getBlock();
+    }
+
+    @Override public String toString() {
+        if (!isCompiled()) {
+            compile();
+        }
+        final StringBuilder builder = new StringBuilder();
+        final Iterator<Entry<Range, PlotBlock>> iterator = this.ranges.entrySet().iterator();
+        while (iterator.hasNext()) {
+            final Entry<Range, PlotBlock> entry = iterator.next();
+            builder.append(entry.getValue().getRawId());
+            if (!entry.getKey().isAutomatic()) {
+                builder.append(":").append(entry.getKey().getWeight());
+            }
+            if (iterator.hasNext()) {
+                builder.append(",");
+            }
+        }
+        return builder.toString();
+    }
+
+    @Override public Map<String, Object> serialize() {
+        if (!isCompiled()) {
+            compile();
+        }
+        return ImmutableMap.of("blocks", this.toString());
+    }
+
+
+    @Getter @EqualsAndHashCode @RequiredArgsConstructor private final static class Range {
+
+        private final int min;
+        private final int max;
+        @Getter private final boolean automatic;
+
+        public int getWeight() {
+            return max - min;
+        }
+
+        public boolean isInRange(final int num) {
+            return num <= max && num >= min;
+        }
+    }
+
+
+    private final class BucketIterator implements Iterator<PlotBlock> {
+
+        @Override public boolean hasNext() {
+            return true;
+        }
+
+        @Override public PlotBlock next() {
+            return getBlock();
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java
new file mode 100644
index 000000000..d170054a8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java
@@ -0,0 +1,77 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public class BlockLoc {
+
+    public final int x;
+    public final int y;
+    public final int z;
+
+    public final float yaw;
+    public final float pitch;
+
+    public BlockLoc(int x, int y, int z, float yaw, float pitch) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+
+        this.yaw = yaw;
+        this.pitch = pitch;
+    }
+
+    public BlockLoc(int x, int y, int z) {
+        this(x, y, z, 0f, 0f);
+    }
+
+    public static BlockLoc fromString(String string) {
+        String[] parts = string.split(",");
+
+        float yaw;
+        float pitch;
+        if (parts.length == 3) {
+            yaw = 0f;
+            pitch = 0f;
+        }
+        if (parts.length == 5) {
+            yaw = Float.parseFloat(parts[3]);
+            pitch = Float.parseFloat(parts[4]);
+        } else {
+            return new BlockLoc(0, 0, 0);
+        }
+        int x = Integer.parseInt(parts[0]);
+        int y = Integer.parseInt(parts[1]);
+        int z = Integer.parseInt(parts[2]);
+
+        return new BlockLoc(x, y, z, yaw, pitch);
+    }
+
+    @Override public int hashCode() {
+        int prime = 31;
+        int result = 1;
+        result = prime * result + this.x;
+        result = prime * result + this.y;
+        result = prime * result + this.z;
+        return result;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return this.x == 0 && this.y == 0 && this.z == 0;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        BlockLoc other = (BlockLoc) obj;
+        return this.x == other.x && this.y == other.y && this.z == other.z;
+    }
+
+    @Override public String toString() {
+        if (this.x == 0 && this.y == 0 && this.z == 0) {
+            return "";
+        }
+        return this.x + "," + this.y + ',' + this.z + ',' + this.yaw + ',' + this.pitch;
+
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java
new file mode 100644
index 000000000..e125ca188
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java
@@ -0,0 +1,34 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import lombok.Getter;
+import lombok.NonNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class BlockRegistry<T> {
+
+    @Getter private final Class<T> type;
+    private final Map<PlotBlock, T> map = new HashMap<>();
+
+    public BlockRegistry(@NonNull final Class<T> type, final T... preInitializedItems) {
+        this.type = type;
+        for (final T preInitializedItem : preInitializedItems) {
+            this.addMapping(getPlotBlock(preInitializedItem), preInitializedItem);
+        }
+    }
+
+    public final void addMapping(@NonNull final PlotBlock plotBlock, @NonNull final T t) {
+        if (map.containsKey(plotBlock)) {
+            return;
+        }
+        this.map.put(plotBlock, t);
+    }
+
+    public abstract PlotBlock getPlotBlock(final T item);
+
+    public final T getItem(final PlotBlock plotBlock) {
+        return this.map.get(plotBlock);
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java
new file mode 100644
index 000000000..2035a8811
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java
@@ -0,0 +1,34 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public class ChunkLoc {
+
+    public int x;
+    public int z;
+
+    public ChunkLoc(int x, int z) {
+        this.x = x;
+        this.z = z;
+    }
+
+    @Override public int hashCode() {
+        return (x << 16) | (z & 0xFFFF);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        ChunkLoc other = (ChunkLoc) obj;
+        return (this.x == other.x) && (this.z == other.z);
+    }
+
+    @Override public String toString() {
+        return this.x + "," + this.z;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java
new file mode 100644
index 000000000..e665ea752
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java
@@ -0,0 +1,43 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+public class ChunkWrapper {
+
+    public final int x;
+    public final int z;
+    public final String world;
+
+    public ChunkWrapper(String world, int x, int z) {
+        this.world = world;
+        this.x = x;
+        this.z = z;
+    }
+
+    @Override public int hashCode() {
+        return MathMan.pair((short) x, (short) z);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (this.hashCode() != obj.hashCode()) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        ChunkWrapper other = (ChunkWrapper) obj;
+        return (this.x == other.x) && (this.z == other.z) && StringMan
+            .isEqual(this.world, other.world);
+    }
+
+    @Override public String toString() {
+        return this.world + ":" + this.x + "," + this.z;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java
new file mode 100644
index 000000000..27cb55216
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java
@@ -0,0 +1,11 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public class CmdInstance {
+    public final Runnable command;
+    public final long timestamp;
+
+    public CmdInstance(final Runnable command) {
+        this.command = command;
+        timestamp = System.currentTimeMillis();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
new file mode 100644
index 000000000..18a0ce7bc
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
@@ -0,0 +1,131 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
+import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
+
+import java.util.UUID;
+
+public class ConsolePlayer extends PlotPlayer {
+
+    private static ConsolePlayer instance;
+
+    private ConsolePlayer() {
+        PlotArea area = PlotSquared.get().getFirstPlotArea();
+        Location loc;
+        if (area != null) {
+            RegionWrapper region = area.getRegion();
+            loc = new Location(area.worldname, region.minX + region.maxX / 2, 0,
+                region.minZ + region.maxZ / 2);
+        } else {
+            loc = new Location("world", 0, 0, 0);
+        }
+        setMeta("location", loc);
+    }
+
+    public static ConsolePlayer getConsole() {
+        if (instance == null) {
+            instance = new ConsolePlayer();
+            instance.teleport(instance.getLocation());
+        }
+        return instance;
+    }
+
+    @Override public boolean canTeleport(Location loc) {
+        return true;
+    }
+
+    @Override public Location getLocation() {
+        return this.getMeta("location");
+    }
+
+    @Override public Location getLocationFull() {
+        return getLocation();
+    }
+
+    @Override public UUID getUUID() {
+        return DBFunc.EVERYONE;
+    }
+
+    @Override public long getLastPlayed() {
+        return 0;
+    }
+
+    @Override public boolean hasPermission(String permission) {
+        return true;
+    }
+
+    @Override public boolean isPermissionSet(String permission) {
+        return true;
+    }
+
+    @Override public void sendMessage(String message) {
+        PlotSquared.log(message);
+    }
+
+    @Override public void teleport(Location location) {
+        setMeta(PlotPlayer.META_LAST_PLOT, location.getPlot());
+        setMeta(PlotPlayer.META_LOCATION, location);
+    }
+
+    @Override public boolean isOnline() {
+        return true;
+    }
+
+    @Override public String getName() {
+        return "*";
+    }
+
+    @Override public void setCompassTarget(Location location) {
+    }
+
+    @Override public void setAttribute(String key) {
+    }
+
+    @Override public boolean getAttribute(String key) {
+        return false;
+    }
+
+    @Override public void removeAttribute(String key) {
+    }
+
+    @Override public RequiredType getSuperCaller() {
+        return RequiredType.CONSOLE;
+    }
+
+    @Override public void setWeather(PlotWeather weather) {
+    }
+
+    @Override public PlotGameMode getGameMode() {
+        return PlotGameMode.NOT_SET;
+    }
+
+    @Override public void setGameMode(PlotGameMode gameMode) {
+    }
+
+    @Override public void setTime(long time) {
+    }
+
+    @Override public boolean getFlight() {
+        return true;
+    }
+
+    @Override public void setFlight(boolean fly) {
+    }
+
+    @Override public void playMusic(Location location, PlotBlock id) {
+    }
+
+    @Override public void kick(String message) {
+    }
+
+    @Override public void stopSpectating() {
+    }
+
+    @Override public boolean isBanned() {
+        return false;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
new file mode 100644
index 000000000..da9c2c09d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
@@ -0,0 +1,55 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.commands.DebugExec;
+import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
+
+import javax.annotation.Nonnull;
+import javax.script.ScriptException;
+
+public abstract class Expression<T> {
+
+    @Nonnull public static <U> Expression<U> constant(final U value) {
+        return new Expression<U>() {
+            @Override public U evaluate(U arg) {
+                return value;
+            }
+        };
+    }
+
+    public static Expression<Double> linearDouble(final Double value) {
+        return new Expression<Double>() {
+            @Override public Double evaluate(Double arg) {
+                return (arg * value);
+            }
+        };
+    }
+
+    public static Expression<Double> doubleExpression(final String expression) {
+        try {
+            return constant(Double.parseDouble(expression));
+        } catch (NumberFormatException ignore) {
+        }
+        if (expression.endsWith("*{arg}")) {
+            try {
+                return linearDouble(
+                    Double.parseDouble(expression.substring(0, expression.length() - 6)));
+            } catch (NumberFormatException ignore) {
+            }
+        }
+        return new Expression<Double>() {
+            @Override public Double evaluate(Double arg) {
+                DebugExec exec = (DebugExec) MainCommand.getInstance().getCommand(DebugExec.class);
+                try {
+                    return (Double) exec.getEngine().eval(expression.replace("{arg}", "" + arg));
+                } catch (ScriptException e) {
+                    PlotSquared.debug("Invalid Expression: " + expression);
+                    e.printStackTrace();
+                }
+                return 0d;
+            }
+        };
+    }
+
+    public abstract T evaluate(T arg);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java
new file mode 100644
index 000000000..d34521ee9
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java
@@ -0,0 +1,12 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public class FileBytes {
+
+    public final String path;
+    public final byte[] data;
+
+    public FileBytes(String path, byte[] data) {
+        this.path = path;
+        this.data = data;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java
new file mode 100644
index 000000000..3413bd235
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java
@@ -0,0 +1,10 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public abstract class LazyBlock {
+
+    public abstract StringPlotBlock getPlotBlock();
+
+    public String getId() {
+        return getPlotBlock().getItemId();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java
new file mode 100644
index 000000000..8487c44be
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java
@@ -0,0 +1,19 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public abstract class LazyResult<T> {
+
+    private T result;
+
+    public T get() {
+        return this.result;
+    }
+
+    public T getOrCreate() {
+        if (this.result == null) {
+            return this.result = create();
+        }
+        return this.result;
+    }
+
+    public abstract T create();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
new file mode 100644
index 000000000..be551b372
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
@@ -0,0 +1,60 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import lombok.Getter;
+
+public class LegacyPlotBlock extends PlotBlock {
+
+    public static final PlotBlock EVERYTHING = new LegacyPlotBlock((short) 0, (byte) 0);
+    public static final PlotBlock[] CACHE = new PlotBlock[65535];
+
+    static {
+        for (int i = 0; i < 65535; i++) {
+            short id = (short) (i >> 4);
+            byte data = (byte) (i & 15);
+            CACHE[i] = new LegacyPlotBlock(id, data);
+        }
+    }
+
+    @Getter public final short id;
+    @Getter public final byte data;
+
+    public LegacyPlotBlock(short id, byte data) {
+        this.id = id;
+        this.data = data;
+    }
+
+    @Override public Object getRawId() {
+        return this.id;
+    }
+
+    @Override public boolean isAir() {
+        return this.id == 0;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        LegacyPlotBlock other = (LegacyPlotBlock) obj;
+        return (this.id == other.id) && ((this.data == other.data) || (this.data == -1) || (
+            other.data == -1));
+    }
+
+    @Override public int hashCode() {
+        return this.id;
+    }
+
+    @Override public String toString() {
+        if (this.data == -1) {
+            return this.id + "";
+        }
+        return this.id + ":" + this.data;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
new file mode 100644
index 000000000..d787d46e3
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
@@ -0,0 +1,205 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.sk89q.worldedit.math.BlockVector3;
+import lombok.Getter;
+import lombok.Setter;
+
+public class Location implements Cloneable, Comparable<Location> {
+
+    @Getter private int x;
+    @Getter private int y;
+    @Getter private int z;
+    @Getter @Setter private float yaw;
+    @Getter @Setter private float pitch;
+    @Getter @Setter private String world;
+    @Getter private BlockVector3 blockVector3;
+
+    public Location(String world, int x, int y, int z, float yaw, float pitch) {
+        this.world = world;
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.yaw = yaw;
+        this.pitch = pitch;
+        this.blockVector3 = BlockVector3.at(x, y, z);
+    }
+
+    public Location() {
+        this.world = "";
+    }
+
+    public Location(String world, int x, int y, int z) {
+        this(world, x, y, z, 0f, 0f);
+    }
+
+    public void setX(int x) {
+        this.x = x;
+        this.blockVector3 = BlockVector3.at(x, y, z);
+    }
+
+    public void setY(int y) {
+        this.y = y;
+        this.blockVector3 = BlockVector3.at(x, y, z);
+    }
+
+    public void setZ(int z) {
+        this.z = z;
+        this.blockVector3 = BlockVector3.at(x, y, z);
+    }
+
+    public void setBlockVector3(BlockVector3 blockVector3) {
+        this.blockVector3 = blockVector3;
+        this.x = blockVector3.getX();
+        this.y = blockVector3.getY();
+        this.z = blockVector3.getZ();
+    }
+
+    @Override public Location clone() {
+        return new Location(this.world, this.x, this.y, this.z, this.yaw, this.pitch);
+    }
+
+    public PlotArea getPlotArea() {
+        return PlotSquared.get().getPlotAreaAbs(this);
+    }
+
+    public Plot getOwnedPlot() {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        if (area != null) {
+            return area.getOwnedPlot(this);
+        } else {
+            return null;
+        }
+    }
+
+    public Plot getOwnedPlotAbs() {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        if (area != null) {
+            return area.getOwnedPlotAbs(this);
+        } else {
+            return null;
+        }
+    }
+
+    public boolean isPlotArea() {
+        return PlotSquared.get().getPlotAreaAbs(this) != null;
+    }
+
+    public boolean isPlotRoad() {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        return area != null && area.getPlotAbs(this) == null;
+    }
+
+    public boolean isUnownedPlotArea() {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        return area != null && area.getOwnedPlotAbs(this) == null;
+    }
+
+    public PlotManager getPlotManager() {
+        PlotArea pa = getPlotArea();
+        if (pa != null) {
+            return pa.getPlotManager();
+        } else {
+            return null;
+        }
+    }
+
+    public Plot getPlotAbs() {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        if (area != null) {
+            return area.getPlotAbs(this);
+        } else {
+            return null;
+        }
+    }
+
+    public Plot getPlot() {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        if (area != null) {
+            return area.getPlot(this);
+        } else {
+            return null;
+        }
+    }
+
+    public ChunkLoc getChunkLoc() {
+        return new ChunkLoc(this.x >> 4, this.z >> 4);
+    }
+
+    public Location add(int x, int y, int z) {
+        this.x += x;
+        this.y += y;
+        this.z += z;
+        return this;
+    }
+
+    public double getEuclideanDistanceSquared(Location l2) {
+        double x = getX() - l2.getX();
+        double y = getY() - l2.getY();
+        double z = getZ() - l2.getZ();
+        return x * x + y * y + z * z;
+    }
+
+    public double getEuclideanDistance(Location l2) {
+        return Math.sqrt(getEuclideanDistanceSquared(l2));
+    }
+
+    public boolean isInSphere(Location origin, int radius) {
+        return getEuclideanDistanceSquared(origin) < radius * radius;
+    }
+
+    @Override public int hashCode() {
+        return MathMan.pair((short) this.x, (short) this.z) * 17 + this.y;
+    }
+
+    public boolean isInAABB(Location min, Location max) {
+        return this.x >= min.getX() && this.x <= max.getX() && this.y >= min.getY() && this.y <= max
+            .getY() && this.z >= min.getX() && this.z < max.getZ();
+    }
+
+    public void lookTowards(int x, int y) {
+        double l = this.x - x;
+        double c = Math.sqrt(l * l + 0.0);
+        if (Math.asin(0 / c) / Math.PI * 180 > 90) {
+            setYaw((float) (180 - -Math.asin(l / c) / Math.PI * 180));
+        } else {
+            setYaw((float) (-Math.asin(l / c) / Math.PI * 180));
+        }
+    }
+
+    public Location subtract(int x, int y, int z) {
+        this.x -= x;
+        this.y -= y;
+        this.z -= z;
+        return this;
+    }
+
+    @Override public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
+        if (!(o instanceof Location)) {
+            return false;
+        }
+        Location l = (Location) o;
+        return this.x == l.getX() && this.y == l.getY() && this.z == l.getZ() && this.world
+            .equals(l.getWorld()) && this.yaw == l.getYaw() && this.pitch == l.getPitch();
+    }
+
+    @Override public int compareTo(Location o) {
+        if (this.x == o.getX() && this.y == o.getY() || this.z == o.getZ()) {
+            return 0;
+        }
+        if (this.x < o.getX() && this.y < o.getY() && this.z < o.getZ()) {
+            return -1;
+        }
+        return 1;
+    }
+
+    @Override public String toString() {
+        return "\"plotsquaredlocation\":{\"x\":" + this.x + ",\"y\":" + this.y + ",\"z\":" + this.z
+            + ",\"yaw\":" + this.yaw + ",\"pitch\":" + this.pitch + ",\"world\":\"" + this.world
+            + "\"}";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
new file mode 100644
index 000000000..709a7cee6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
@@ -0,0 +1,34 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import java.util.UUID;
+
+public interface OfflinePlotPlayer {
+
+    /**
+     * Get the {@code UUID} of this player
+     *
+     * @return the player {@link UUID}
+     */
+    UUID getUUID();
+
+    /**
+     * Get the time in milliseconds when the player was last seen online.
+     *
+     * @return the time in milliseconds when last online
+     */
+    long getLastPlayed();
+
+    /**
+     * Checks if this player is online.
+     *
+     * @return true if this player is online
+     */
+    boolean isOnline();
+
+    /**
+     * Get the name of this player.
+     *
+     * @return the player name
+     */
+    String getName();
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
new file mode 100644
index 000000000..c31404cd5
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -0,0 +1,2888 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.generator.SquarePlotWorld;
+import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
+import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.ImmutableSet;
+import com.sk89q.jnbt.CompoundTag;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.awt.geom.Area;
+import java.awt.geom.PathIterator;
+import java.awt.geom.Rectangle2D;
+import java.io.File;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * The plot class<br> [IMPORTANT] - Unclaimed plots will not have persistent information. - Any
+ * information set/modified in an unclaimed object may not be reflected in other instances - Using
+ * the `new` operator will create an unclaimed plot instance - Use the methods from the
+ * PlotArea/PS/Location etc to get existing plots
+ */
+public class Plot {
+
+    /**
+     * @deprecated raw access is deprecated
+     */
+    @Deprecated private static HashSet<Plot> connected_cache;
+    private static HashSet<RegionWrapper> regions_cache;
+    /**
+     * The {@link PlotId}.
+     */
+    private final PlotId id;
+    /**
+     * plot owner (Merged plots can have multiple owners) Direct access is Deprecated: use
+     * getOwners()
+     */
+    @Deprecated public UUID owner;
+    /**
+     * Has the plot changed since the last save cycle?
+     */
+    public boolean countsTowardsMax = true;
+    /**
+     * Represents whatever the database manager needs it to: <br> - A value of -1 usually indicates
+     * the plot will not be stored in the DB<br> - A value of 0 usually indicates that the DB manager
+     * hasn't set a value<br>
+     *
+     * @deprecated magical
+     */
+    @Deprecated public int temp;
+    /**
+     * Plot creation timestamp (not accurate if the plot was created before this was implemented)<br>
+     * - Milliseconds since the epoch<br>
+     */
+    private long timestamp;
+    /**
+     * List of trusted (with plot permissions).
+     */
+    private HashSet<UUID> trusted;
+    /**
+     * List of members users (with plot permissions).
+     */
+    private HashSet<UUID> members;
+    /**
+     * List of denied players.
+     */
+    private HashSet<UUID> denied;
+    /**
+     * External settings class. - Please favor the methods over direct access to this class<br> - The
+     * methods are more likely to be left unchanged from version changes<br>
+     */
+    private PlotSettings settings;
+    /**
+     * The {@link PlotArea}.
+     */
+    @Nonnull private PlotArea area;
+    /**
+     * Session only plot metadata (session is until the server stops)<br>
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @see FlagManager
+     */
+    private ConcurrentHashMap<String, Object> meta;
+    /**
+     * The cached origin plot. - The origin plot is used for plot grouping and relational data
+     */
+    private Plot origin;
+
+    /**
+     * Constructor for a new plot. (Only changes after plot.create() will be properly set in the
+     * database)
+     *
+     * @param area  the PlotArea where the plot is located
+     * @param id    the plot id
+     * @param owner the plot owner
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner) {
+        this.area = area;
+        this.id = id;
+        this.owner = owner;
+    }
+
+    /**
+     * Constructor for an unowned plot. (Only changes after plot.create() will be properly set in the
+     * database)
+     *
+     * @param area the PlotArea where the plot is located
+     * @param id   the plot id
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(@Nonnull PlotArea area, PlotId id) {
+        this.area = area;
+        this.id = id;
+    }
+
+    /**
+     * Constructor for a temporary plot (use -1 for temp)<br> The database will ignore any queries
+     * regarding temporary plots. Please note that some bulk plot management functions may still
+     * affect temporary plots (TODO: fix this)
+     *
+     * @param area  the PlotArea where the plot is located
+     * @param id    the plot id
+     * @param owner the owner of the plot
+     * @param temp  Represents whatever the database manager needs it to
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner, int temp) {
+        this.area = area;
+        this.id = id;
+        this.owner = owner;
+        this.temp = temp;
+    }
+
+    /**
+     * Constructor for a saved plots (Used by the database manager when plots are fetched)
+     *
+     * @param id      the plot id
+     * @param owner   the plot owner
+     * @param trusted the plot trusted players
+     * @param denied  the plot denied players
+     * @param merged  array giving merged plots
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
+        HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
+        @Nonnull PlotArea area, boolean[] merged, long timestamp, int temp) {
+        this.id = id;
+        this.area = area;
+        this.owner = owner;
+        this.settings = new PlotSettings();
+        this.members = members;
+        this.trusted = trusted;
+        this.denied = denied;
+        this.settings.setAlias(alias);
+        this.settings.setPosition(position);
+        this.settings.setMerged(merged);
+        if (flags != null) {
+            for (Flag flag : flags) {
+                this.settings.flags.put(flag, flag);
+            }
+        }
+        this.timestamp = timestamp;
+        this.temp = temp;
+    }
+
+    /**
+     * Get a plot from a string e.g. [area];[id]
+     *
+     * @param defaultArea If no area is specified
+     * @param string      plot id/area + id
+     * @return New or existing plot object
+     */
+    public static Plot fromString(PlotArea defaultArea, String string) {
+        String[] split = string.split(";|,");
+        if (split.length == 2) {
+            if (defaultArea != null) {
+                PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
+                return id != null ? defaultArea.getPlotAbs(id) : null;
+            }
+        } else if (split.length == 3) {
+            PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
+            if (pa != null) {
+                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
+                return pa.getPlotAbs(id);
+            }
+        } else if (split.length == 4) {
+            PlotArea pa = PlotSquared.get().getPlotArea(split[0], split[1]);
+            if (pa != null) {
+                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
+                return pa.getPlotAbs(id);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Return a new/cached plot object at a given location.
+     *
+     * @param location the location of the plot
+     * @return plot at location or null
+     * @see PlotPlayer#getCurrentPlot() if a player is expected here.
+     */
+    public static Plot getPlot(Location location) {
+        PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
+        if (pa != null) {
+            return pa.getPlot(location);
+        }
+        return null;
+    }
+
+    public String getWorldName() {
+        return area.worldname;
+    }
+
+    /**
+     * Session only plot metadata (session is until the server stops)<br>
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @param key   metadata key
+     * @param value metadata value
+     * @see FlagManager
+     */
+    public void setMeta(String key, Object value) {
+        if (this.meta == null) {
+            this.meta = new ConcurrentHashMap<>();
+        }
+        this.meta.put(key, value);
+    }
+
+    /**
+     * Get the metadata for a key<br>
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @param key metadata key to get value for
+     * @return Object value
+     */
+    public Object getMeta(String key) {
+        if (this.meta != null) {
+            return this.meta.get(key);
+        }
+        return null;
+    }
+
+    /**
+     * Delete the metadata for a key<br> - metadata is session only - deleting other plugin's metadata
+     * may cause issues
+     *
+     * @param key key to delete
+     */
+    public void deleteMeta(String key) {
+        if (this.meta != null) {
+            this.meta.remove(key);
+        }
+    }
+
+    /**
+     * Get the cluster this plot is associated with
+     *
+     * @return the PlotCluster object, or null
+     */
+    public PlotCluster getCluster() {
+        return this.getArea().getCluster(this.id);
+    }
+
+    /**
+     * Efficiently get the players currently inside this plot<br> - Will return an empty list if no
+     * players are in the plot<br> - Remember, you can cast a PlotPlayer to it's respective
+     * implementation (BukkitPlayer, SpongePlayer) to obtain the player object
+     *
+     * @return list of PlotPlayer(s) or an empty list
+     */
+    public List<PlotPlayer> getPlayersInPlot() {
+        ArrayList<PlotPlayer> players = new ArrayList<>();
+        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+            PlotPlayer pp = entry.getValue();
+            if (this.equals(pp.getCurrentPlot())) {
+                players.add(pp);
+            }
+        }
+        return players;
+    }
+
+    /**
+     * Check if the plot has an owner.
+     *
+     * @return false if there is no owner
+     */
+    public boolean hasOwner() {
+        return this.owner != null;
+    }
+
+    /**
+     * Check if a UUID is a plot owner (merged plots may have multiple owners)
+     *
+     * @param uuid the player uuid
+     * @return if the provided uuid is the owner of the plot
+     */
+    public boolean isOwner(UUID uuid) {
+        if (uuid.equals(this.owner)) {
+            return true;
+        }
+        if (!isMerged()) {
+            return false;
+        }
+        Set<Plot> connected = getConnectedPlots();
+        for (Plot current : connected) {
+            if (uuid.equals(current.owner)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isOwnerAbs(UUID uuid) {
+        return uuid.equals(this.owner);
+    }
+
+    /**
+     * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
+     *
+     * @return the plot owners
+     */
+    public Set<UUID> getOwners() {
+        if (this.owner == null) {
+            return ImmutableSet.of();
+        }
+        if (isMerged()) {
+            Set<Plot> plots = getConnectedPlots();
+            Plot[] array = plots.toArray(new Plot[0]);
+            ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
+            UUID last = this.owner;
+            owners.add(this.owner);
+            for (Plot current : array) {
+                if (last == null || current.owner.getMostSignificantBits() != last
+                    .getMostSignificantBits()) {
+                    owners.add(current.owner);
+                    last = current.owner;
+                }
+            }
+            return owners.build();
+        }
+        return ImmutableSet.of(this.owner);
+    }
+
+    /**
+     * Check if the player is either the owner or on the trusted/added list.
+     *
+     * @param uuid uuid to check
+     * @return true if the player is added/trusted or is the owner
+     */
+    public boolean isAdded(UUID uuid) {
+        if (this.owner == null || getDenied().contains(uuid)) {
+            return false;
+        }
+        if (isOwner(uuid)) {
+            return true;
+        }
+        if (getMembers().contains(uuid)) {
+            return isOnline();
+        }
+        if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.EVERYONE)) {
+            return true;
+        }
+        if (getMembers().contains(DBFunc.EVERYONE)) {
+            return isOnline();
+        }
+        return false;
+    }
+
+    /**
+     * Should the player be denied from entering.
+     *
+     * @param uuid uuid to check
+     * @return boolean false if the player is allowed to enter
+     */
+    public boolean isDenied(UUID uuid) {
+        return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid)
+            || !this.isAdded(uuid) && this.denied.contains(uuid));
+    }
+
+    /**
+     * Get the {@link PlotId}.
+     */
+    @Nonnull public PlotId getId() {
+        return this.id;
+    }
+
+    /**
+     * Get the plot world object for this plot<br> - The generic PlotArea object can be casted to its
+     * respective class for more control (e.g. HybridPlotWorld)
+     *
+     * @return PlotArea
+     */
+    @Nonnull public PlotArea getArea() {
+        return this.area;
+    }
+
+    /**
+     * Assign this plot to a plot area.<br> (Mostly used during startup when worlds are being
+     * created)<br> Note: Using this when it doesn't make sense will result in strange behavior
+     *
+     * @param area area to assign to
+     */
+    public void setArea(@Nonnull PlotArea area) {
+        if (this.getArea() == area) {
+            return;
+        }
+        this.area.removePlot(this.id);
+        this.area = area;
+        area.addPlot(this);
+    }
+
+    /**
+     * Get the plot manager object for this plot<br> - The generic PlotManager object can be casted to
+     * its respective class for more control (e.g. HybridPlotManager)
+     *
+     * @return PlotManager
+     */
+    public PlotManager getManager() {
+        return this.area.getPlotManager();
+    }
+
+    /**
+     * Get or create plot settings.
+     *
+     * @return PlotSettings
+     * @deprecated use equivalent plot method;
+     */
+    @Deprecated @Nonnull public PlotSettings getSettings() {
+        if (this.settings == null) {
+            this.settings = new PlotSettings();
+        }
+        return this.settings;
+    }
+
+    /**
+     * Returns true if the plot is not merged, or it is the base plot of multiple merged plots.
+     *
+     * @return Boolean
+     */
+    public boolean isBasePlot() {
+        return !this.isMerged() || this.equals(this.getBasePlot(false));
+    }
+
+    /**
+     * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
+     * - Merged plots need to be treated as a single plot for most purposes<br> - Some data such as
+     * home location needs to be associated with the group rather than each plot<br> - If the plot is
+     * not merged it will return itself.<br> - The result is cached locally
+     *
+     * @return base Plot
+     */
+    public Plot getBasePlot(boolean recalculate) {
+        if (this.origin != null && !recalculate) {
+            if (this.equals(this.origin)) {
+                return this;
+            }
+            return this.origin.getBasePlot(false);
+        }
+        if (!this.isMerged()) {
+            this.origin = this;
+            return this.origin;
+        }
+        this.origin = this;
+        PlotId min = this.id;
+        for (Plot plot : this.getConnectedPlots()) {
+            if (plot.id.y < min.y || plot.id.y == min.y && plot.id.x < min.x) {
+                this.origin = plot;
+                min = plot.id;
+            }
+        }
+        for (Plot plot : this.getConnectedPlots()) {
+            plot.origin = this.origin;
+        }
+        return this.origin;
+    }
+
+    /**
+     * Check if the plot is merged in any direction.
+     *
+     * @return is the plot merged or not
+     */
+    public boolean isMerged() {
+        return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
+            .getMerged(1) || getSettings().getMerged(3);
+    }
+
+    /**
+     * Get the timestamp of when the plot was created (unreliable)<br> - not accurate if the plot was
+     * created before this was implemented<br> - Milliseconds since the epoch<br>
+     *
+     * @return the creation date of the plot
+     */
+    public long getTimestamp() {
+        if (this.timestamp == 0) {
+            this.timestamp = System.currentTimeMillis();
+        }
+        return this.timestamp;
+    }
+
+    /**
+     * Get if the plot is merged in a direction<br> ------- Actual -------<br> 0 = north<br> 1 =
+     * east<br> 2 = south<br> 3 = west<br> ----- Artificial -----<br> 4 = north-east<br> 5 =
+     * south-east<br> 6 = south-west<br> 7 = north-west<br> ----------<br> Note: A plot that is merged
+     * north and east will not be merged northeast if the northeast plot is not part of the same
+     * group<br>
+     *
+     * @param direction direction to check for merged plot
+     * @return true if merged in that direction
+     */
+    public boolean getMerged(int direction) {
+        if (this.settings == null) {
+            return false;
+        }
+        switch (direction) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+                return this.getSettings().getMerged(direction);
+            case 7:
+                int i = direction - 4;
+                int i2 = 0;
+                if (this.getSettings().getMerged(i2)) {
+                    if (this.getSettings().getMerged(i)) {
+                        if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
+                            if (this.area.getPlotAbs(this.id.getRelative(i2)).getMerged(i)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            case 4:
+            case 5:
+            case 6:
+                i = direction - 4;
+                i2 = direction - 3;
+                return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
+                    && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
+                    .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
+
+        }
+        return false;
+    }
+
+    /**
+     * Get the denied users.
+     *
+     * @return a set of denied users
+     */
+    public HashSet<UUID> getDenied() {
+        if (this.denied == null) {
+            this.denied = new HashSet<>();
+        }
+        return this.denied;
+    }
+
+    /**
+     * Set the denied users for this plot.
+     *
+     * @param uuids uuids to deny
+     */
+    public void setDenied(Set<UUID> uuids) {
+        boolean larger = uuids.size() > getDenied().size();
+        HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
+        intersection.retainAll(larger ? uuids : getDenied());
+        uuids.removeAll(intersection);
+        HashSet<UUID> toRemove = new HashSet<>(getDenied());
+        toRemove.removeAll(intersection);
+        for (UUID uuid : toRemove) {
+            removeDenied(uuid);
+        }
+        for (UUID uuid : uuids) {
+            addDenied(uuid);
+        }
+    }
+
+    /**
+     * Get the trusted users.
+     *
+     * @return a set of trusted users
+     */
+    public HashSet<UUID> getTrusted() {
+        if (this.trusted == null) {
+            this.trusted = new HashSet<>();
+        }
+        return this.trusted;
+    }
+
+    /**
+     * Set the trusted users for this plot.
+     *
+     * @param uuids uuids to trust
+     */
+    public void setTrusted(Set<UUID> uuids) {
+        boolean larger = uuids.size() > getTrusted().size();
+        HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
+        intersection.retainAll(larger ? uuids : getTrusted());
+        uuids.removeAll(intersection);
+        HashSet<UUID> toRemove = new HashSet<>(getTrusted());
+        toRemove.removeAll(intersection);
+        for (UUID uuid : toRemove) {
+            removeTrusted(uuid);
+        }
+        for (UUID uuid : uuids) {
+            addTrusted(uuid);
+        }
+    }
+
+    /**
+     * Get the members
+     *
+     * @return a set of members
+     */
+    public HashSet<UUID> getMembers() {
+        if (this.members == null) {
+            this.members = new HashSet<>();
+        }
+        return this.members;
+    }
+
+    /**
+     * Set the members for this plot
+     *
+     * @param uuids uuids to set member status for
+     */
+    public void setMembers(Set<UUID> uuids) {
+        boolean larger = uuids.size() > getMembers().size();
+        HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
+        intersection.retainAll(larger ? uuids : getMembers());
+        uuids.removeAll(intersection);
+        HashSet<UUID> toRemove = new HashSet<>(getMembers());
+        toRemove.removeAll(intersection);
+        for (UUID uuid : toRemove) {
+            removeMember(uuid);
+        }
+        for (UUID uuid : uuids) {
+            addMember(uuid);
+        }
+    }
+
+    /**
+     * Deny someone (updates database as well)
+     *
+     * @param uuid the uuid of the player to deny.
+     */
+    public void addDenied(UUID uuid) {
+        for (Plot current : getConnectedPlots()) {
+            if (current.getDenied().add(uuid)) {
+                DBFunc.setDenied(current, uuid);
+            }
+        }
+    }
+
+    /**
+     * Add someone as a helper (updates database as well)
+     *
+     * @param uuid the uuid of the player to trust
+     */
+    public void addTrusted(UUID uuid) {
+        for (Plot current : getConnectedPlots()) {
+            if (current.getTrusted().add(uuid)) {
+                DBFunc.setTrusted(current, uuid);
+            }
+        }
+    }
+
+    /**
+     * Add someone as a trusted user (updates database as well)
+     *
+     * @param uuid the uuid of the player to add as a member
+     */
+    public void addMember(UUID uuid) {
+        for (Plot current : getConnectedPlots()) {
+            if (current.getMembers().add(uuid)) {
+                DBFunc.setMember(current, uuid);
+            }
+        }
+    }
+
+    /**
+     * Set the plot owner (and update the database)
+     *
+     * @param owner uuid to set as owner
+     */
+    public void setOwner(UUID owner) {
+        if (!hasOwner()) {
+            this.owner = owner;
+            create();
+            return;
+        }
+        if (!isMerged()) {
+            if (!this.owner.equals(owner)) {
+                this.owner = owner;
+                DBFunc.setOwner(this, owner);
+            }
+            return;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (!owner.equals(current.owner)) {
+                current.owner = owner;
+                DBFunc.setOwner(current, owner);
+            }
+        }
+    }
+
+    /**
+     * Set the plot owner (and update the database)
+     *
+     * @param owner     uuid to set as owner
+     * @param initiator player initiating set owner
+     * @return boolean
+     */
+    public boolean setOwner(UUID owner, PlotPlayer initiator) {
+        boolean result = EventUtil.manager
+            .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
+        if (!result) {
+            return false;
+        }
+        if (!hasOwner()) {
+            this.owner = owner;
+            create();
+            return true;
+        }
+        if (!isMerged()) {
+            if (!this.owner.equals(owner)) {
+                this.owner = owner;
+                DBFunc.setOwner(this, owner);
+            }
+            return true;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (!owner.equals(current.owner)) {
+                current.owner = owner;
+                DBFunc.setOwner(current, owner);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Clear a plot.
+     *
+     * @param whenDone A runnable to execute when clearing finishes, or null
+     * @see this#clear(boolean, boolean, Runnable)
+     * @see #deletePlot(Runnable) to clear and delete a plot
+     */
+    public void clear(Runnable whenDone) {
+        this.clear(false, false, whenDone);
+    }
+
+    public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
+        if (checkRunning && this.getRunning() != 0) {
+            return false;
+        }
+        if (isDelete) {
+            if (!EventUtil.manager.callDelete(this)) {
+                return false;
+            }
+        } else {
+            if (!EventUtil.manager.callClear(this)) {
+                return false;
+            }
+        }
+        final HashSet<RegionWrapper> regions = this.getRegions();
+        final Set<Plot> plots = this.getConnectedPlots();
+        final ArrayDeque<Plot> queue = new ArrayDeque<>(plots);
+        if (isDelete) {
+            this.removeSign();
+        }
+        this.unlinkPlot(true, !isDelete);
+        final PlotManager manager = this.area.getPlotManager();
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (queue.isEmpty()) {
+                    Runnable run = () -> {
+                        for (RegionWrapper region : regions) {
+                            Location[] corners = region.getCorners(getWorldName());
+                            ChunkManager.manager.clearAllEntities(corners[0], corners[1]);
+                        }
+                        TaskManager.runTask(whenDone);
+                    };
+                    for (Plot current : plots) {
+                        if (isDelete || current.owner == null) {
+                            manager.unclaimPlot(Plot.this.area, current, null);
+                        } else {
+                            manager.claimPlot(Plot.this.area, current);
+                        }
+                    }
+                    GlobalBlockQueue.IMP.addTask(run);
+                    return;
+                }
+                Plot current = queue.poll();
+                if (Plot.this.area.TERRAIN != 0) {
+                    ChunkManager.manager
+                        .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
+                    return;
+                }
+                manager.clearPlot(Plot.this.area, current, this);
+            }
+        };
+        run.run();
+        return true;
+    }
+
+    /**
+     * Set the biome for a plot asynchronously
+     *
+     * @param biome    The biome e.g. "forest"
+     * @param whenDone The task to run when finished, or null
+     */
+    public void setBiome(final String biome, final Runnable whenDone) {
+        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+        final int extendBiome;
+        if (area instanceof SquarePlotWorld) {
+            extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
+        } else {
+            extendBiome = 0;
+        }
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    Plot.this.refreshChunks();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = regions.poll();
+                Location pos1 = new Location(getWorldName(), region.minX - extendBiome, region.minY,
+                    region.minZ - extendBiome);
+                Location pos2 = new Location(getWorldName(), region.maxX + extendBiome, region.maxY,
+                    region.maxZ + extendBiome);
+                ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+                    @Override public void run(int[] value) {
+                        ChunkLoc loc = new ChunkLoc(value[0], value[1]);
+                        ChunkManager.manager.loadChunk(getWorldName(), loc, false);
+                        MainUtil.setBiome(getWorldName(), value[2], value[3], value[4], value[5],
+                            biome);
+                        ChunkManager.manager.unloadChunk(getWorldName(), loc, true, true);
+                    }
+                }, this, 5);
+
+            }
+        };
+        run.run();
+    }
+
+    /**
+     * Unlink the plot and all connected plots.
+     *
+     * @param createSign whether to recreate signs
+     * @param createRoad whether to recreate road
+     * @return success/!cancelled
+     */
+    public boolean unlinkPlot(boolean createRoad, boolean createSign) {
+        if (!this.isMerged()) {
+            return false;
+        }
+        final Set<Plot> plots = this.getConnectedPlots();
+        ArrayList<PlotId> ids = new ArrayList<>(plots.size());
+        for (Plot current : plots) {
+            current.setHome(null);
+            ids.add(current.getId());
+        }
+        boolean result = EventUtil.manager.callUnlink(this.area, ids);
+        if (!result) {
+            return false;
+        }
+        this.clearRatings();
+        if (createSign) {
+            this.removeSign();
+        }
+        PlotManager manager = this.area.getPlotManager();
+        if (createRoad) {
+            manager.startPlotUnlink(this.area, ids);
+        }
+        if (this.area.TERRAIN != 3 && createRoad) {
+            for (Plot current : plots) {
+                if (current.getMerged(1)) {
+                    manager.createRoadEast(current.area, current);
+                    if (current.getMerged(2)) {
+                        manager.createRoadSouth(current.area, current);
+                        if (current.getMerged(5)) {
+                            manager.createRoadSouthEast(current.area, current);
+                        }
+                    }
+                } else if (current.getMerged(2)) {
+                    manager.createRoadSouth(current.area, current);
+                }
+            }
+        }
+        for (Plot current : plots) {
+            boolean[] merged = new boolean[] {false, false, false, false};
+            current.setMerged(merged);
+        }
+        if (createSign) {
+            GlobalBlockQueue.IMP.addTask(() -> {
+                for (Plot current : plots) {
+                    current.setSign(MainUtil.getName(current.owner));
+                }
+            });
+        }
+        if (createRoad) {
+            manager.finishPlotUnlink(this.area, ids);
+        }
+        return true;
+    }
+
+    /**
+     * Set the sign for a plot to a specific name
+     *
+     * @param name name
+     */
+    public void setSign(final String name) {
+        if (!isLoaded()) {
+            return;
+        }
+        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+            TaskManager.runTask(() -> Plot.this.setSign(name));
+            return;
+        }
+        if (name == null) {
+            PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
+            return;
+        }
+        PlotManager manager = this.area.getPlotManager();
+        if (this.area.ALLOW_SIGNS) {
+            Location loc = manager.getSignLoc(this.area, this);
+            String id = this.id.x + ";" + this.id.y;
+            String[] lines = new String[] {C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
+                C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
+                C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
+                C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
+            WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
+        }
+    }
+
+    protected boolean isLoaded() {
+        return WorldUtil.IMP.isWorld(getWorldName());
+    }
+
+    /**
+     * This will return null if the plot hasn't been analyzed
+     *
+     * @return analysis of plot
+     */
+    public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
+        return PlotAnalysis.getAnalysis(this, settings);
+    }
+
+    public void analyze(RunnableVal<PlotAnalysis> whenDone) {
+        PlotAnalysis.analyzePlot(this, whenDone);
+    }
+
+    /**
+     * Set a flag for this plot
+     *
+     * @param flag  Flag to set
+     * @param value Flag value
+     */
+    public <V> boolean setFlag(Flag<V> flag, Object value) {
+        if (flag == Flags.KEEP && ExpireManager.IMP != null) {
+            ExpireManager.IMP.updateExpired(this);
+        }
+        return FlagManager.addPlotFlag(this, flag, value);
+    }
+
+    /**
+     * Remove a flag from this plot
+     *
+     * @param flag the flag to remove
+     * @return success
+     */
+    public boolean removeFlag(Flag<?> flag) {
+        return FlagManager.removePlotFlag(this, flag);
+    }
+
+    /**
+     * Get the flag for a given key
+     *
+     * @param key Flag to get value for
+     */
+    public <V> Optional<V> getFlag(Flag<V> key) {
+        return FlagManager.getPlotFlag(this, key);
+    }
+
+    /**
+     * Get the flag for a given key
+     *
+     * @param key          the flag
+     * @param defaultValue if the key is null, the value to return
+     */
+    public <V> V getFlag(Flag<V> key, V defaultValue) {
+        V value = FlagManager.getPlotFlagRaw(this, key);
+        if (value == null) {
+            return defaultValue;
+        } else {
+            return value;
+        }
+    }
+
+    /**
+     * Delete a plot (use null for the runnable if you don't need to be notified on completion)
+     *
+     * @see PlotSquared#removePlot(Plot, boolean)
+     * @see #clear(Runnable) to simply clear a plot
+     */
+    public boolean deletePlot(final Runnable whenDone) {
+        if (!this.hasOwner()) {
+            return false;
+        }
+        final Set<Plot> plots = this.getConnectedPlots();
+        this.clear(false, true, () -> {
+            for (Plot current : plots) {
+                current.unclaim();
+            }
+            TaskManager.runTask(whenDone);
+        });
+        return true;
+    }
+
+    /**
+     * Count the entities in a plot
+     *
+     * @return array of entity counts
+     * @see ChunkManager#countEntities(Plot) 0 = Entity 1 = Animal 2 = Monster 3 = Mob 4 = Boat 5 =
+     * Misc
+     */
+    public int[] countEntities() {
+        int[] count = new int[6];
+        for (Plot current : this.getConnectedPlots()) {
+            int[] result = ChunkManager.manager.countEntities(current);
+            count[0] += result[0];
+            count[1] += result[1];
+            count[2] += result[2];
+            count[3] += result[3];
+            count[4] += result[4];
+            count[5] += result[5];
+        }
+        return count;
+    }
+
+    /**
+     * Returns true if a previous task was running
+     *
+     * @return true if a previous task is running
+     */
+    public int addRunning() {
+        int value = this.getRunning();
+        for (Plot plot : this.getConnectedPlots()) {
+            plot.setMeta("running", value + 1);
+        }
+        return value;
+    }
+
+    /**
+     * Decrement the number of tracked tasks this plot is running<br> - Used to track/limit the number
+     * of things a player can do on the plot at once
+     *
+     * @return previous number of tasks (int)
+     */
+    public int removeRunning() {
+        int value = this.getRunning();
+        if (value < 2) {
+            for (Plot plot : this.getConnectedPlots()) {
+                plot.deleteMeta("running");
+            }
+        } else {
+            for (Plot plot : this.getConnectedPlots()) {
+                plot.setMeta("running", value - 1);
+            }
+        }
+        return value;
+    }
+
+    /**
+     * Get the number of tracked running tasks for this plot<br> - Used to track/limit the number of
+     * things a player can do on the plot at once
+     *
+     * @return number of tasks (int)
+     */
+    public int getRunning() {
+        Integer value = (Integer) this.getMeta("running");
+        return value == null ? 0 : value;
+    }
+
+    /**
+     * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in
+     * unclaimed plot objects.
+     *
+     * @return false if the Plot has no owner, otherwise true.
+     */
+    public boolean unclaim() {
+        if (this.owner == null) {
+            return false;
+        }
+        for (Plot current : getConnectedPlots()) {
+            List<PlotPlayer> players = current.getPlayersInPlot();
+            for (PlotPlayer pp : players) {
+                PlotListener.plotExit(pp, current);
+            }
+            getArea().removePlot(getId());
+            DBFunc.delete(current);
+            current.owner = null;
+            current.settings = null;
+            for (PlotPlayer pp : players) {
+                PlotListener.plotEntry(pp, current);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Unlink a plot and remove the roads
+     *
+     * @return true if plot was linked
+     * @see this#unlinkPlot(boolean, boolean)
+     */
+    public boolean unlink() {
+        return this.unlinkPlot(true, true);
+    }
+
+    public Location getCenter() {
+        Location[] corners = getCorners();
+        Location top = corners[0];
+        Location bot = corners[1];
+        Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
+            MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
+        if (!isLoaded()) {
+            return loc;
+        }
+        int y =
+            isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
+        if (area.ALLOW_SIGNS) {
+            y = Math.max(y, getManager().getSignLoc(area, this).getY());
+        }
+        loc.setY(1 + y);
+        return loc;
+    }
+
+    public Location getSide() {
+        RegionWrapper largest = getLargestRegion();
+        int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
+        int z = largest.minZ - 1;
+        PlotManager manager = getManager();
+        int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
+        if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
+            y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
+        }
+        return new Location(getWorldName(), x, y + 1, z);
+    }
+
+    /**
+     * Return the home location for the plot
+     *
+     * @return Home location
+     */
+    public Location getHome() {
+        BlockLoc home = this.getPosition();
+        if (home == null || home.x == 0 && home.z == 0) {
+            return this.getDefaultHome(true);
+        } else {
+            Location bot = this.getBottomAbs();
+            Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
+                bot.getZ() + home.z, home.yaw, home.pitch);
+            if (!isLoaded()) {
+                return loc;
+            }
+            if (!WorldUtil.IMP.getBlock(loc).isAir()) {
+                loc.setY(Math.max(
+                    1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
+                    bot.getY()));
+            }
+            return loc;
+        }
+    }
+
+    /**
+     * Set the home location
+     *
+     * @param location location to set as home
+     */
+    public void setHome(BlockLoc location) {
+        Plot plot = this.getBasePlot(false);
+        if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
+            return;
+        }
+        plot.getSettings().setPosition(location);
+        if (location != null) {
+            DBFunc.setPosition(plot, plot.getSettings().getPosition().toString());
+            return;
+        }
+        DBFunc.setPosition(plot, null);
+    }
+
+    /**
+     * Get the default home location for a plot<br> - Ignores any home location set for that specific
+     * plot
+     *
+     * @return Location
+     */
+    public Location getDefaultHome() {
+        return getDefaultHome(false);
+    }
+
+    public Location getDefaultHome(boolean member) {
+        Plot plot = this.getBasePlot(false);
+        PlotLoc loc = member ? area.DEFAULT_HOME : area.NONMEMBER_HOME;
+        if (loc != null) {
+            int x;
+            int z;
+            if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
+                // center
+                RegionWrapper largest = plot.getLargestRegion();
+                x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
+                z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
+            } else {
+                // specific
+                Location bot = plot.getBottomAbs();
+                x = bot.getX() + loc.x;
+                z = bot.getZ() + loc.z;
+            }
+            int y = loc.y < 1 ?
+                (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
+                loc.y;
+            PlotSquared.log("Getting home with Y " + y);
+            return new Location(plot.getWorldName(), x, y, z);
+        }
+        // Side
+        return plot.getSide();
+    }
+
+    public double getVolume() {
+        double count = 0;
+        for (RegionWrapper region : getRegions()) {
+            count +=
+                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
+                    * 256;
+        }
+        return count;
+    }
+
+    /**
+     * Get the average rating of the plot. This is the value displayed in /plot info
+     *
+     * @return average rating as double
+     */
+    public double getAverageRating() {
+        double sum = 0;
+        Collection<Rating> ratings = this.getRatings().values();
+        for (Rating rating : ratings) {
+            sum += rating.getAverageRating();
+        }
+        return sum / ratings.size();
+    }
+
+    /**
+     * Set a rating for a user<br> - If the user has already rated, the following will return false
+     *
+     * @param uuid   uuid of rater
+     * @param rating rating
+     * @return success
+     */
+    public boolean addRating(UUID uuid, Rating rating) {
+        Plot base = this.getBasePlot(false);
+        PlotSettings baseSettings = base.getSettings();
+        if (baseSettings.getRatings().containsKey(uuid)) {
+            return false;
+        }
+        int aggregate = rating.getAggregate();
+        baseSettings.getRatings().put(uuid, aggregate);
+        DBFunc.setRating(base, uuid, aggregate);
+        return true;
+    }
+
+    /**
+     * Clear the ratings for this plot
+     */
+    public void clearRatings() {
+        Plot base = this.getBasePlot(false);
+        PlotSettings baseSettings = base.getSettings();
+        if (baseSettings.ratings != null && !baseSettings.getRatings().isEmpty()) {
+            DBFunc.deleteRatings(base);
+            baseSettings.ratings = null;
+        }
+    }
+
+    /**
+     * Get the ratings associated with a plot<br> - The rating object may contain multiple categories
+     *
+     * @return Map of user who rated to the rating
+     */
+    public HashMap<UUID, Rating> getRatings() {
+        Plot base = this.getBasePlot(false);
+        HashMap<UUID, Rating> map = new HashMap<>();
+        if (!base.hasRatings()) {
+            return map;
+        }
+        for (Entry<UUID, Integer> entry : base.getSettings().getRatings().entrySet()) {
+            map.put(entry.getKey(), new Rating(entry.getValue()));
+        }
+        return map;
+    }
+
+    public boolean hasRatings() {
+        Plot base = this.getBasePlot(false);
+        return base.settings != null && base.settings.ratings != null;
+    }
+
+    /**
+     * Resend all chunks inside the plot to nearby players<br> This should not need to be called
+     */
+    public void refreshChunks() {
+        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
+        HashSet<ChunkLoc> chunks = new HashSet<>();
+        for (RegionWrapper region : Plot.this.getRegions()) {
+            for (int x = region.minX >> 4; x <= region.maxX >> 4; x++) {
+                for (int z = region.minZ >> 4; z <= region.maxZ >> 4; z++) {
+                    if (chunks.add(new ChunkLoc(x, z))) {
+                        queue.refreshChunk(x, z);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Remove the plot sign if it is set.
+     */
+    public void removeSign() {
+        PlotManager manager = this.area.getPlotManager();
+        if (!this.area.ALLOW_SIGNS) {
+            return;
+        }
+        Location loc = manager.getSignLoc(this.area, this);
+        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
+        queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
+        queue.flush();
+    }
+
+    /**
+     * Set the plot sign if plot signs are enabled.
+     */
+    public void setSign() {
+        if (this.owner == null) {
+            this.setSign("unknown");
+            return;
+        }
+        this.setSign(UUIDHandler.getName(this.owner));
+    }
+
+    /**
+     * Register a plot and create it in the database<br> - The plot will not be created if the owner
+     * is null<br> - Any setting from before plot creation will not be saved until the server is
+     * stopped properly. i.e. Set any values/options after plot creation.
+     *
+     * @return true if plot was created successfully
+     */
+    public boolean create() {
+        return this.create(this.owner, true);
+    }
+
+    public boolean claim(final PlotPlayer player, boolean teleport, String schematic) {
+        if (!canClaim(player)) {
+            return false;
+        }
+        return claim(player, teleport, schematic, true);
+    }
+
+    public boolean claim(final PlotPlayer player, boolean teleport, String schematic,
+        boolean updateDB) {
+        boolean result = EventUtil.manager.callClaim(player, this, false);
+        if (updateDB) {
+            if (!result || (!create(player.getUUID(), true))) {
+                return false;
+            }
+        } else {
+            area.addPlot(this);
+        }
+        setSign(player.getName());
+        MainUtil.sendMessage(player, C.CLAIMED);
+        if (teleport) {
+            teleportPlayer(player);
+        }
+        PlotArea plotworld = getArea();
+        if (plotworld.SCHEMATIC_ON_CLAIM) {
+            Schematic sch;
+            try {
+                if (schematic == null || schematic.isEmpty()) {
+                    sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
+                } else {
+                    sch = SchematicHandler.manager.getSchematic(schematic);
+                    if (sch == null) {
+                        sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
+                    }
+                }
+            } catch (SchematicHandler.UnsupportedFormatException e) {
+                e.printStackTrace();
+                return true;
+            }
+            SchematicHandler.manager.paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP,
+                new RunnableVal<Boolean>() {
+                    @Override public void run(Boolean value) {
+                        if (value) {
+                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                        } else {
+                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                        }
+                    }
+                });
+        }
+        plotworld.getPlotManager().claimPlot(plotworld, this);
+        return true;
+    }
+
+    /**
+     * Register a plot and create it in the database<br> - The plot will not be created if the owner
+     * is null<br> - Any setting from before plot creation will not be saved until the server is
+     * stopped properly. i.e. Set any values/options after plot creation.
+     *
+     * @param uuid   the uuid of the plot owner
+     * @param notify notify
+     * @return true if plot was created successfully
+     */
+    public boolean create(final UUID uuid, final boolean notify) {
+        if (uuid == null) {
+            throw new IllegalArgumentException("UUID cannot be null");
+        }
+        this.owner = uuid;
+        Plot existing = this.area.getOwnedPlotAbs(this.id);
+        if (existing != null) {
+            throw new IllegalStateException("Plot already exists!");
+        }
+        if (notify) {
+            Integer meta = (Integer) this.area.getMeta("worldBorder");
+            if (meta != null) {
+                this.updateWorldBorder();
+            }
+        }
+        connected_cache = null;
+        regions_cache = null;
+        this.getTrusted().clear();
+        this.getMembers().clear();
+        this.getDenied().clear();
+        this.settings = new PlotSettings();
+        if (this.area.addPlot(this)) {
+            DBFunc.createPlotAndSettings(this, () -> {
+                PlotArea plotworld = Plot.this.area;
+                if (notify && plotworld.AUTO_MERGE) {
+                    Plot.this.autoMerge(-1, Integer.MAX_VALUE, uuid, true);
+                }
+            });
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Set components such as border, wall, floor. (components are generator specific)
+     */
+    public boolean setComponent(String component, String blocks) {
+        BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
+        return !(parsed == null || parsed.isEmpty()) && this.setComponent(component, parsed);
+    }
+
+    /**
+     * Retrieve the biome of the plot.
+     *
+     * @return the name of the biome
+     */
+    public String getBiome() {
+        Location loc = this.getCenter();
+        return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
+    }
+
+    /**
+     * Return the top location for the plot.
+     */
+    public Location getTopAbs() {
+        Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
+        top.setWorld(getWorldName());
+        return top;
+    }
+
+    /**
+     * Return the bottom location for the plot.
+     */
+    public Location getBottomAbs() {
+        Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
+        loc.setWorld(getWorldName());
+        return loc;
+    }
+
+    /**
+     * Swap the settings for two plots.
+     *
+     * @param plot     the plot to swap data with
+     * @param whenDone the task to run at the end of this method.
+     */
+    public boolean swapData(Plot plot, Runnable whenDone) {
+        if (this.owner == null) {
+            if (plot != null && plot.hasOwner()) {
+                plot.moveData(this, whenDone);
+                return true;
+            }
+            return false;
+        }
+        if (plot == null || plot.owner == null) {
+            this.moveData(plot, whenDone);
+            return true;
+        }
+        // Swap cached
+        PlotId temp = new PlotId(this.getId().x, this.getId().y);
+        this.getId().x = plot.getId().x;
+        this.getId().y = plot.getId().y;
+        plot.getId().x = temp.x;
+        plot.getId().y = temp.y;
+        this.area.removePlot(this.getId());
+        plot.area.removePlot(plot.getId());
+        this.getId().recalculateHash();
+        plot.getId().recalculateHash();
+        this.area.addPlotAbs(this);
+        plot.area.addPlotAbs(plot);
+        // Swap database
+        DBFunc.swapPlots(plot, this);
+        TaskManager.runTaskLater(whenDone, 1);
+        return true;
+    }
+
+    /**
+     * Move the settings for a plot.
+     *
+     * @param plot the plot to move
+     */
+    public boolean moveData(Plot plot, Runnable whenDone) {
+        if (this.owner == null) {
+            PlotSquared.debug(plot + " is unowned (single)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        if (plot.hasOwner()) {
+            PlotSquared.debug(plot + " is unowned (multi)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        this.area.removePlot(this.id);
+        this.getId().x = plot.getId().x;
+        this.getId().y = plot.getId().y;
+        this.getId().recalculateHash();
+        this.area.addPlotAbs(this);
+        DBFunc.movePlot(this, plot);
+        TaskManager.runTaskLater(whenDone, 1);
+        return true;
+    }
+
+    /**
+     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like
+     * each plot treated as a small plot use getPlotTopLocAbs(...)
+     *
+     * @return Location top of mega plot
+     */
+    public Location getExtendedTopAbs() {
+        Location top = this.getTopAbs();
+        if (!this.isMerged()) {
+            return top;
+        }
+        if (this.getMerged(2)) {
+            top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
+        }
+        if (this.getMerged(1)) {
+            top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
+        }
+        return top;
+    }
+
+    /**
+     * Gets the bottom location for a plot.<br> - Does not respect mega plots<br> - Merged plots, only
+     * the road will be considered part of the plot<br>
+     *
+     * @return Location bottom of mega plot
+     */
+    public Location getExtendedBottomAbs() {
+        Location bot = this.getBottomAbs();
+        if (!this.isMerged()) {
+            return bot;
+        }
+        if (this.getMerged(0)) {
+            bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
+        }
+        if (this.getMerged(3)) {
+            bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
+        }
+        return bot;
+    }
+
+    /**
+     * Returns the top and bottom location.<br> - If the plot is not connected, it will return its own
+     * corners<br> - the returned locations will not necessarily correspond to claimed plots if the
+     * connected plots do not form a rectangular shape
+     *
+     * @return new Location[] { bottom, top }
+     * @deprecated as merged plots no longer need to be rectangular
+     */
+    @Deprecated public Location[] getCorners() {
+        if (!this.isMerged()) {
+            return new Location[] {this.getBottomAbs(), this.getTopAbs()};
+        }
+        return MainUtil.getCorners(this.getWorldName(), this.getRegions());
+    }
+
+    /**
+     * Remove the east road section of a plot<br> - Used when a plot is merged<br>
+     */
+    public void removeRoadEast() {
+        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+            if (this.area.TERRAIN == 3) {
+                return;
+            }
+            Plot other = this.getRelative(1);
+            Location bot = other.getBottomAbs();
+            Location top = this.getTopAbs();
+            Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
+            Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
+            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+        } else {
+            this.area.getPlotManager().removeRoadEast(this.area, this);
+        }
+    }
+
+    /**
+     * @deprecated in favor of getCorners()[0];<br>
+     */
+    // Won't remove as suggestion also points to deprecated method
+    @Deprecated public Location getBottom() {
+        return this.getCorners()[0];
+    }
+
+    /**
+     * @return the top corner of the plot
+     * @deprecated in favor of getCorners()[1];
+     */
+    // Won't remove as suggestion also points to deprecated method
+    @Deprecated public Location getTop() {
+        return this.getCorners()[1];
+    }
+
+    /**
+     * Swap the plot contents and settings with another location<br> - The destination must correspond
+     * to a valid plot of equal dimensions
+     *
+     * @param destination The other plot to swap with
+     * @param whenDone    A task to run when finished, or null
+     * @return boolean if swap was successful
+     * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain
+     * @see this#swapData(Plot, Runnable) to swap plot settings
+     * @see this#swapData(Plot, Runnable)
+     */
+    public boolean swap(Plot destination, Runnable whenDone) {
+        return this.move(destination, whenDone, true);
+    }
+
+    /**
+     * Move the plot to an empty location<br> - The location must be empty
+     *
+     * @param destination Where to move the plot
+     * @param whenDone    A task to run when done, or null
+     * @return if the move was successful
+     */
+    public boolean move(Plot destination, Runnable whenDone) {
+        return this.move(destination, whenDone, false);
+    }
+
+    /**
+     * Get plot display name.
+     *
+     * @return alias if set, else id
+     */
+    @Override public String toString() {
+        if (this.settings != null && this.settings.getAlias().length() > 1) {
+            return this.settings.getAlias();
+        }
+        return this.area + ";" + this.id.x + ";" + this.id.y;
+    }
+
+
+    /**
+     * Remove a denied player (use DBFunc as well)<br> Using the * uuid will remove all users
+     */
+    public boolean removeDenied(UUID uuid) {
+        if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
+            boolean result = false;
+            for (UUID other : new HashSet<>(getDenied())) {
+                result = rmvDenied(other) || result;
+            }
+            return result;
+        }
+        return rmvDenied(uuid);
+    }
+
+    private boolean rmvDenied(UUID uuid) {
+        for (Plot current : this.getConnectedPlots()) {
+            if (current.getDenied().remove(uuid)) {
+                DBFunc.removeDenied(current, uuid);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Remove a helper (use DBFunc as well)<br> Using the * uuid will remove all users
+     */
+    public boolean removeTrusted(UUID uuid) {
+        if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
+            boolean result = false;
+            for (UUID other : new HashSet<>(getTrusted())) {
+                result = rmvTrusted(other) || result;
+            }
+            return result;
+        }
+        return rmvTrusted(uuid);
+    }
+
+    private boolean rmvTrusted(UUID uuid) {
+        for (Plot plot : this.getConnectedPlots()) {
+            if (plot.getTrusted().remove(uuid)) {
+                DBFunc.removeTrusted(plot, uuid);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Remove a trusted user (use DBFunc as well)<br> Using the * uuid will remove all users
+     */
+    public boolean removeMember(UUID uuid) {
+        if (this.members == null) {
+            return false;
+        }
+        if (uuid == DBFunc.EVERYONE && !members.contains(uuid)) {
+            boolean result = false;
+            for (UUID other : new HashSet<>(this.members)) {
+                result = rmvMember(other) || result;
+            }
+            return result;
+        }
+        return rmvMember(uuid);
+    }
+
+    private boolean rmvMember(UUID uuid) {
+        for (Plot current : this.getConnectedPlots()) {
+            if (current.getMembers().remove(uuid)) {
+                DBFunc.removeMember(current, uuid);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Export the plot as a schematic to the configured output directory.
+     */
+    public void export(final RunnableVal<Boolean> whenDone) {
+        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
+            @Override public void run(final CompoundTag value) {
+                if (value == null) {
+                    if (whenDone != null) {
+                        whenDone.value = false;
+                        TaskManager.runTask(whenDone);
+                    }
+                } else {
+                    TaskManager.runTaskAsync(() -> {
+                        String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
+                            .getName(Plot.this.owner);
+                        boolean result = SchematicHandler.manager.save(value,
+                            Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
+                        if (whenDone != null) {
+                            whenDone.value = result;
+                            TaskManager.runTask(whenDone);
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    /**
+     * Upload the plot as a schematic to the configured web interface.
+     *
+     * @param whenDone value will be null if uploading fails
+     */
+    public void upload(final RunnableVal<URL> whenDone) {
+        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
+            @Override public void run(CompoundTag value) {
+                SchematicHandler.manager.upload(value, null, null, whenDone);
+            }
+        });
+    }
+
+    /**
+     * Upload this plot as a world file<br> - The mca files are each 512x512, so depending on the plot
+     * size it may also download adjacent plots<br> - Works best when (plot width + road width) % 512
+     * == 0<br>
+     *
+     * @see WorldUtil
+     */
+    public void uploadWorld(RunnableVal<URL> whenDone) {
+        WorldUtil.IMP.upload(this, null, null, whenDone);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (this.getClass() != obj.getClass()) {
+            return false;
+        }
+        Plot other = (Plot) obj;
+        return this.hashCode() == other.hashCode() && this.id.equals(other.id)
+            && this.area == other.area;
+    }
+
+    /**
+     * Get the plot hashcode<br> Note: The hashcode is unique if:<br> - Plots are in the same
+     * world<br> - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
+     *
+     * @return integer.
+     */
+    @Override public int hashCode() {
+        return this.id.hashCode();
+    }
+
+    /**
+     * Get the flags specific to this plot<br> - Does not take default flags into account<br>
+     */
+    public HashMap<Flag<?>, Object> getFlags() {
+        return this.getSettings().flags;
+    }
+
+    /**
+     * Set a flag for this plot.
+     */
+    public void setFlags(HashMap<Flag<?>, Object> flags) {
+        FlagManager.setPlotFlags(this, flags);
+    }
+
+    /**
+     * Get the plot alias. - Returns an empty string if no alias is set
+     *
+     * @return The plot alias
+     */
+    public String getAlias() {
+        if (this.settings == null) {
+            return "";
+        }
+        return this.settings.getAlias();
+    }
+
+    /**
+     * Set the plot alias.
+     *
+     * @param alias The alias
+     */
+    public void setAlias(String alias) {
+        for (Plot current : this.getConnectedPlots()) {
+            String name = this.getSettings().getAlias();
+            if (alias == null) {
+                alias = "";
+            }
+            if (name.equals(alias)) {
+                return;
+            }
+            current.getSettings().setAlias(alias);
+            DBFunc.setAlias(current, alias);
+        }
+    }
+
+    /**
+     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> ----------<br> 0 =
+     * north<br> 1 = east<br> 2 = south<br> 3 = west<br> ----------<br>
+     */
+    private void setMerged(int direction, boolean value) {
+        if (this.getSettings().setMerged(direction, value)) {
+            if (value) {
+                Plot other = this.getRelative(direction).getBasePlot(false);
+                if (!other.equals(this.getBasePlot(false))) {
+                    Plot base = other.id.y < this.id.y
+                        || other.id.y == this.id.y && other.id.x < this.id.x ? other : this.origin;
+                    this.origin.origin = base;
+                    other.origin = base;
+                    this.origin = base;
+                    connected_cache = null;
+                }
+            } else {
+                if (this.origin != null) {
+                    this.origin.origin = null;
+                    this.origin = null;
+                }
+                connected_cache = null;
+            }
+            DBFunc.setMerged(this, this.getSettings().getMerged());
+            regions_cache = null;
+        }
+    }
+
+    /**
+     * Get the merged array.
+     *
+     * @return boolean [ north, east, south, west ]
+     */
+    public boolean[] getMerged() {
+        return this.getSettings().getMerged();
+    }
+
+    /**
+     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> Get if the plot is
+     * merged in a direction<br> ----------<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+     * ----------<br> Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
+     */
+    public void setMerged(boolean[] merged) {
+        this.getSettings().setMerged(merged);
+        DBFunc.setMerged(this, merged);
+        clearCache();
+    }
+
+    private void clearCache() {
+        connected_cache = null;
+        regions_cache = null;
+        if (this.origin != null) {
+            this.origin.origin = null;
+            this.origin = null;
+        }
+    }
+
+    /**
+     * Get the set home location or 0,0,0 if no location is set<br> - Does not take the default home
+     * location into account
+     *
+     * @see #getHome()
+     */
+    public BlockLoc getPosition() {
+        return this.getSettings().getPosition();
+    }
+
+    /**
+     * Check if a plot can be claimed by the provided player.
+     *
+     * @param player the claiming player
+     */
+    public boolean canClaim(@Nullable PlotPlayer player) {
+        PlotCluster cluster = this.getCluster();
+        if (cluster != null && player != null) {
+            if (!cluster.isAdded(player.getUUID()) && !Permissions
+                .hasPermission(player, "plots.admin.command.claim")) {
+                return false;
+            }
+        }
+        return this.guessOwner() == null && !isMerged();
+    }
+
+    /**
+     * Guess the owner of a plot either by the value in memory, or the sign data<br> Note: Recovering
+     * from sign information is useful if e.g. PlotMe conversion wasn't successful
+     *
+     * @return UUID
+     */
+    public UUID guessOwner() {
+        if (this.hasOwner()) {
+            return this.owner;
+        }
+        if (!this.area.ALLOW_SIGNS) {
+            return null;
+        }
+        try {
+            final Location loc = this.getManager().getSignLoc(this.area, this);
+            String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
+                @Override public void run(String[] value) {
+                    ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
+                    this.value = WorldUtil.IMP.getSign(loc);
+                }
+            });
+            if (lines == null) {
+                return null;
+            }
+            loop:
+            for (int i = 4; i > 0; i--) {
+                String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
+                int index = caption.indexOf("%plr%");
+                if (index < 0) {
+                    continue;
+                }
+                String line = lines[i - 1];
+                if (line.length() <= index) {
+                    return null;
+                }
+                String name = line.substring(index);
+                if (name.isEmpty()) {
+                    return null;
+                }
+                UUID owner = UUIDHandler.getUUID(name, null);
+                if (owner != null) {
+                    this.owner = owner;
+                    break;
+                }
+                if (lines[i - 1].length() == 15) {
+                    BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
+                    for (Entry<StringWrapper, UUID> entry : map.entrySet()) {
+                        String key = entry.getKey().value;
+                        if (key.length() > name.length() && key.startsWith(name)) {
+                            this.owner = entry.getValue();
+                            break loop;
+                        }
+                    }
+                }
+                this.owner = UUID.nameUUIDFromBytes(
+                    ("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
+                break;
+            }
+            if (this.hasOwner()) {
+                this.create();
+            }
+            return this.owner;
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
+
+    /**
+     * Remove the south road section of a plot<br> - Used when a plot is merged<br>
+     */
+    public void removeRoadSouth() {
+        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+            if (this.area.TERRAIN == 3) {
+                return;
+            }
+            Plot other = this.getRelative(2);
+            Location bot = other.getBottomAbs();
+            Location top = this.getTopAbs();
+            Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
+            Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
+            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+        } else {
+            this.getManager().removeRoadSouth(this.area, this);
+        }
+    }
+
+    /**
+     * Auto merge a plot in a specific direction<br>
+     *
+     * @param dir         The direction to merge<br> -1 = All directions<br> 0 = north<br> 1 = east<br> 2 =
+     *                    south<br> 3 = west<br>
+     * @param max         The max number of merges to do
+     * @param uuid        The UUID it is allowed to merge with
+     * @param removeRoads Whether to remove roads
+     * @return true if a merge takes place
+     */
+    public boolean autoMerge(int dir, int max, UUID uuid, boolean removeRoads) {
+        if (this.owner == null) {
+            return false;
+        }
+        if (!EventUtil.manager.callMerge(this, dir, max)) {
+            return false;
+        }
+        HashSet<Plot> visited = new HashSet<>();
+        HashSet<PlotId> merged = new HashSet<>();
+        Set<Plot> connected = this.getConnectedPlots();
+        for (Plot current : connected) {
+            merged.add(current.getId());
+        }
+        ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
+        Plot current;
+        boolean toReturn = false;
+        while ((current = frontier.poll()) != null && max >= 0) {
+            if (visited.contains(current)) {
+                continue;
+            }
+            visited.add(current);
+            Set<Plot> plots;
+            if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
+                Plot other = current.getRelative(0);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+            if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
+                Plot other = current.getRelative(1);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+            if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
+                Plot other = current.getRelative(2);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+            if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
+                Plot other = current.getRelative(3);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+        }
+        if (removeRoads && toReturn) {
+            ArrayList<PlotId> ids = new ArrayList<>(merged);
+            this.getManager().finishPlotMerge(this.area, ids);
+        }
+        return toReturn;
+    }
+
+    /**
+     * Merge the plot settings<br> - Used when a plot is merged<br>
+     */
+    public void mergeData(Plot b) {
+        HashMap<Flag<?>, Object> flags1 = this.getFlags();
+        HashMap<Flag<?>, Object> flags2 = b.getFlags();
+        if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
+            boolean greater = flags1.size() > flags2.size();
+            if (greater) {
+                flags1.putAll(flags2);
+            } else {
+                flags2.putAll(flags1);
+            }
+            HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
+            this.setFlags(net);
+            b.setFlags(net);
+        }
+        if (!this.getAlias().isEmpty()) {
+            b.setAlias(this.getAlias());
+        } else if (!b.getAlias().isEmpty()) {
+            this.setAlias(b.getAlias());
+        }
+        for (UUID uuid : this.getTrusted()) {
+            b.addTrusted(uuid);
+        }
+        for (UUID uuid : b.getTrusted()) {
+            this.addTrusted(uuid);
+        }
+        for (UUID uuid : this.getMembers()) {
+            b.addMember(uuid);
+        }
+        for (UUID uuid : b.getMembers()) {
+            this.addMember(uuid);
+        }
+
+        for (UUID uuid : this.getDenied()) {
+            b.addDenied(uuid);
+        }
+        for (UUID uuid : b.getDenied()) {
+            this.addDenied(uuid);
+        }
+    }
+
+    /**
+     * Remove the SE road (only effects terrain)
+     */
+    public void removeRoadSouthEast() {
+        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+            if (this.area.TERRAIN == 3) {
+                return;
+            }
+            Plot other = this.getRelative(1, 1);
+            Location pos1 = this.getTopAbs().add(1, 0, 1);
+            Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
+            pos1.setY(0);
+            pos2.setY(256);
+            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+        } else {
+            this.area.getPlotManager().removeRoadSouthEast(this.area, this);
+        }
+    }
+
+    /**
+     * Get the plot in a relative location<br> Note: May be null if the partial plot area does not
+     * include the relative location
+     *
+     * @return Plot
+     */
+    public Plot getRelative(int x, int y) {
+        return this.area.getPlotAbs(this.id.getRelative(x, y));
+    }
+
+    public Plot getRelative(PlotArea area, int x, int y) {
+        return area.getPlotAbs(this.id.getRelative(x, y));
+    }
+
+    /**
+     * Get the plot in a relative direction<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+     * Note: May be null if the partial plot area does not include the relative location
+     */
+    public Plot getRelative(int direction) {
+        return this.area.getPlotAbs(this.id.getRelative(direction));
+    }
+
+    /**
+     * Get a set of plots connected (and including) this plot<br> - This result is cached globally
+     */
+    public Set<Plot> getConnectedPlots() {
+        if (this.settings == null || !this.isMerged()) {
+            return Collections.singleton(this);
+        }
+        boolean[] merged = this.getMerged();
+        int hash = MainUtil.hash(merged);
+        if (hash == 0) {
+            return Collections.singleton(this);
+        }
+        if (connected_cache != null && connected_cache.contains(this)) {
+            return connected_cache;
+        }
+        regions_cache = null;
+
+        HashSet<Plot> tmpSet = new HashSet<>();
+        ArrayDeque<Plot> frontier = new ArrayDeque<>();
+        HashSet<Object> queuecache = new HashSet<>();
+        tmpSet.add(this);
+        Plot tmp;
+        if (merged[0]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(0));
+            if (!tmp.getMerged(2)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(2, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(0, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        if (merged[1]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(1));
+            if (!tmp.getMerged(3)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(3, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(1, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        if (merged[2]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(2));
+            if (!tmp.getMerged(0)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(0, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(2, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        if (merged[3]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(3));
+            if (!tmp.getMerged(1)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(1, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(3, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        Plot current;
+        while ((current = frontier.poll()) != null) {
+            if (current.owner == null || current.settings == null) {
+                // Invalid plot
+                // merged onto unclaimed plot
+                PlotSquared
+                    .debug("Ignoring invalid merged plot: " + current + " | " + current.owner);
+                continue;
+            }
+            tmpSet.add(current);
+            queuecache.remove(current);
+            merged = current.getMerged();
+            if (merged[0]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(0));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+            if (merged[1]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(1));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+            if (merged[2]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(2));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+            if (merged[3]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(3));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+        }
+        connected_cache = tmpSet;
+        return tmpSet;
+    }
+
+    /**
+     * This will combine each plot into effective rectangular regions<br> - This result is cached
+     * globally<br> - Useful for handling non rectangular shapes
+     */
+    public HashSet<RegionWrapper> getRegions() {
+        if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
+            return regions_cache;
+        }
+        if (!this.isMerged()) {
+            Location pos1 = this.getBottomAbs();
+            Location pos2 = this.getTopAbs();
+            connected_cache = new HashSet<>(Collections.singletonList(this));
+            regions_cache = new HashSet<>(1);
+            regions_cache.add(
+                new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
+                    pos2.getZ()));
+            return regions_cache;
+        }
+        Set<Plot> plots = this.getConnectedPlots();
+        HashSet<RegionWrapper> regions = regions_cache = new HashSet<>();
+        HashSet<PlotId> visited = new HashSet<>();
+        for (Plot current : plots) {
+            if (visited.contains(current.getId())) {
+                continue;
+            }
+            boolean merge = true;
+            PlotId bot = new PlotId(current.getId().x, current.getId().y);
+            PlotId top = new PlotId(current.getId().x, current.getId().y);
+            while (merge) {
+                merge = false;
+                ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, bot.y - 1),
+                    new PlotId(top.x, bot.y - 1));
+                boolean tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    bot.y--;
+                }
+                ids = MainUtil.getPlotSelectionIds(new PlotId(top.x + 1, bot.y),
+                    new PlotId(top.x + 1, top.y));
+                tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    top.x++;
+                }
+                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, top.y + 1),
+                    new PlotId(top.x, top.y + 1));
+                tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    top.y++;
+                }
+                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x - 1, bot.y),
+                    new PlotId(bot.x - 1, top.y));
+                tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    bot.x--;
+                }
+            }
+            Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
+            Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
+            visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
+            for (int x = bot.x; x <= top.x; x++) {
+                Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
+                if (plot.getMerged(2)) {
+                    // south wedge
+                    Location toploc = plot.getExtendedTopAbs();
+                    Location botabs = plot.getBottomAbs();
+                    Location topabs = plot.getTopAbs();
+                    regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
+                        toploc.getZ()));
+                    if (plot.getMerged(5)) {
+                        regions.add(
+                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
+                                toploc.getZ()));
+                        // intersection
+                    }
+                }
+            }
+
+            for (int y = bot.y; y <= top.y; y++) {
+                Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
+                if (plot.getMerged(1)) {
+                    // east wedge
+                    Location toploc = plot.getExtendedTopAbs();
+                    Location botabs = plot.getBottomAbs();
+                    Location topabs = plot.getTopAbs();
+                    regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
+                        topabs.getZ()));
+                    if (plot.getMerged(5)) {
+                        regions.add(
+                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
+                                toploc.getZ()));
+                        // intersection
+                    }
+                }
+            }
+            regions.add(
+                new RegionWrapper(gbotabs.getX(), gtopabs.getX(), gbotabs.getZ(), gtopabs.getZ()));
+        }
+        return regions;
+    }
+
+    /**
+     * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular
+     * shapes)
+     */
+    public RegionWrapper getLargestRegion() {
+        HashSet<RegionWrapper> regions = this.getRegions();
+        RegionWrapper max = null;
+        double area = Double.NEGATIVE_INFINITY;
+        for (RegionWrapper region : regions) {
+            double current =
+                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1);
+            if (current > area) {
+                max = region;
+                area = current;
+            }
+        }
+        return max;
+    }
+
+    /**
+     * Do the plot entry tasks for each player in the plot<br> - Usually called when the plot state
+     * changes (unclaimed/claimed/flag change etc)
+     */
+    public void reEnter() {
+        TaskManager.runTaskLater(() -> {
+            for (PlotPlayer pp : Plot.this.getPlayersInPlot()) {
+                PlotListener.plotExit(pp, Plot.this);
+                PlotListener.plotEntry(pp, Plot.this);
+            }
+        }, 1);
+    }
+
+    /**
+     * Get all the corners of the plot (supports non-rectangular shapes).
+     *
+     * @return A list of the plot corners
+     */
+    public List<Location> getAllCorners() {
+        Area area = new Area();
+        for (RegionWrapper region : this.getRegions()) {
+            Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6,
+                region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
+            Area rectArea = new Area(rect);
+            area.add(rectArea);
+        }
+        List<Location> locs = new ArrayList<>();
+        double[] coords = new double[6];
+        for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
+            int type = pi.currentSegment(coords);
+            int x = (int) MathMan.inverseRound(coords[0]);
+            int z = (int) MathMan.inverseRound(coords[1]);
+            if (type != 4) {
+                locs.add(new Location(this.getWorldName(), x, 0, z));
+            }
+        }
+        return locs;
+    }
+
+    /**
+     * Teleport a player to a plot and send them the teleport message.
+     *
+     * @param player the player
+     * @return if the teleport succeeded
+     */
+    public boolean teleportPlayer(final PlotPlayer player) {
+        Plot plot = this.getBasePlot(false);
+        boolean result = EventUtil.manager.callTeleport(player, player.getLocation(), plot);
+        if (result) {
+            final Location location;
+            if (this.area.HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
+                location = this.getHome();
+            } else {
+                location = this.getDefaultHome(false);
+            }
+            if (Settings.Teleport.DELAY == 0 || Permissions
+                .hasPermission(player, "plots.teleport.delay.bypass")) {
+                MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+                player.teleport(location);
+                return true;
+            }
+            MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
+            final String name = player.getName();
+            TaskManager.TELEPORT_QUEUE.add(name);
+            TaskManager.runTaskLater(() -> {
+                if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
+                    MainUtil.sendMessage(player, C.TELEPORT_FAILED);
+                    return;
+                }
+                TaskManager.TELEPORT_QUEUE.remove(name);
+                if (player.isOnline()) {
+                    MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+                    player.teleport(location);
+                }
+            }, Settings.Teleport.DELAY * 20);
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isOnline() {
+        if (this.owner == null) {
+            return false;
+        }
+        if (!isMerged()) {
+            return UUIDHandler.getPlayer(this.owner) != null;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (current.hasOwner() && UUIDHandler.getPlayer(current.owner) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set a component for a plot to the provided blocks<br> - E.g. floor, wall, border etc.<br> - The
+     * available components depend on the generator being used<br>
+     */
+    public boolean setComponent(String component, BlockBucket blocks) {
+        if (StringMan
+            .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
+            EventUtil.manager.callComponentSet(this, component);
+        }
+        return this.getManager().setComponent(this.area, this.getId(), component, blocks);
+    }
+
+    public int getDistanceFromOrigin() {
+        Location bot = getManager().getPlotBottomLocAbs(this.area, id);
+        Location top = getManager().getPlotTopLocAbs(this.area, id);
+        return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
+            Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
+    }
+
+    /**
+     * Expand the world border to include the provided plot (if applicable).
+     */
+    public void updateWorldBorder() {
+        if (this.owner == null) {
+            return;
+        }
+        int border = this.area.getBorder();
+        if (border == Integer.MAX_VALUE) {
+            return;
+        }
+        int max = getDistanceFromOrigin();
+        if (max > border) {
+            this.area.setMeta("worldBorder", max);
+        }
+    }
+
+    /**
+     * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other
+     * <br> - saves to DB
+     */
+    public void mergePlot(Plot lesserPlot, boolean removeRoads) {
+        Plot greaterPlot = this;
+        if (lesserPlot.getId().x == greaterPlot.getId().x) {
+            if (lesserPlot.getId().y > greaterPlot.getId().y) {
+                Plot tmp = lesserPlot;
+                lesserPlot = greaterPlot;
+                greaterPlot = tmp;
+            }
+            if (!lesserPlot.getMerged(2)) {
+                lesserPlot.clearRatings();
+                greaterPlot.clearRatings();
+                lesserPlot.setMerged(2, true);
+                greaterPlot.setMerged(0, true);
+                lesserPlot.mergeData(greaterPlot);
+                if (removeRoads) {
+                    lesserPlot.removeRoadSouth();
+                    Plot diagonal = greaterPlot.getRelative(1);
+                    if (diagonal.getMerged(7)) {
+                        lesserPlot.removeRoadSouthEast();
+                    }
+                    Plot below = greaterPlot.getRelative(3);
+                    if (below.getMerged(4)) {
+                        below.getRelative(0).removeRoadSouthEast();
+                    }
+                }
+            }
+        } else {
+            if (lesserPlot.getId().x > greaterPlot.getId().x) {
+                Plot tmp = lesserPlot;
+                lesserPlot = greaterPlot;
+                greaterPlot = tmp;
+            }
+            if (!lesserPlot.getMerged(1)) {
+                lesserPlot.clearRatings();
+                greaterPlot.clearRatings();
+                lesserPlot.setMerged(1, true);
+                greaterPlot.setMerged(3, true);
+                lesserPlot.mergeData(greaterPlot);
+                if (removeRoads) {
+                    Plot diagonal = greaterPlot.getRelative(2);
+                    if (diagonal.getMerged(7)) {
+                        lesserPlot.removeRoadSouthEast();
+                    }
+                    lesserPlot.removeRoadEast();
+                }
+                Plot below = greaterPlot.getRelative(0);
+                if (below.getMerged(6)) {
+                    below.getRelative(3).removeRoadSouthEast();
+                }
+            }
+        }
+    }
+
+    /**
+     * Move a plot physically, as well as the corresponding settings.
+     *
+     * @param destination Plot moved to
+     * @param whenDone    task when done
+     * @param allowSwap   whether to swap plots
+     * @return success
+     */
+    public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
+        final PlotId offset = new PlotId(destination.getId().x - this.getId().x,
+            destination.getId().y - this.getId().y);
+        Location db = destination.getBottomAbs();
+        Location ob = this.getBottomAbs();
+        final int offsetX = db.getX() - ob.getX();
+        final int offsetZ = db.getZ() - ob.getZ();
+        if (this.owner == null) {
+            TaskManager.runTaskLater(whenDone, 1);
+            return false;
+        }
+        boolean occupied = false;
+        Set<Plot> plots = this.getConnectedPlots();
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            if (other.hasOwner()) {
+                if (!allowSwap) {
+                    TaskManager.runTaskLater(whenDone, 1);
+                    return false;
+                }
+                occupied = true;
+            } else {
+                plot.removeSign();
+            }
+        }
+        // world border
+        destination.updateWorldBorder();
+        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+        // move / swap data
+        final PlotArea originArea = getArea();
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            plot.swapData(other, null);
+        }
+        // copy terrain
+        Runnable move = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    Plot plot = destination.getRelative(0, 0);
+                    for (Plot current : plot.getConnectedPlots()) {
+                        getManager().claimPlot(current.getArea(), current);
+                        Plot originPlot = originArea.getPlotAbs(
+                            new PlotId(current.id.x - offset.x, current.id.y - offset.y));
+                        originPlot.getManager().unclaimPlot(originArea, originPlot, null);
+                    }
+                    plot.setSign();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                final Runnable task = this;
+                RegionWrapper region = regions.poll();
+                Location[] corners = region.getCorners(getWorldName());
+                final Location pos1 = corners[0];
+                final Location pos2 = corners[1];
+                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+                newPos.setWorld(destination.getWorldName());
+                ChunkManager.manager.copyRegion(pos1, pos2, newPos,
+                    () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
+            }
+        };
+        Runnable swap = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = regions.poll();
+                Location[] corners = region.getCorners(getWorldName());
+                Location pos1 = corners[0];
+                Location pos2 = corners[1];
+                Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
+                Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
+                pos3.setWorld(destination.getWorldName());
+                pos4.setWorld(destination.getWorldName());
+                ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
+            }
+        };
+        if (occupied) {
+            swap.run();
+        } else {
+            move.run();
+        }
+        return true;
+    }
+
+    /**
+     * Copy a plot to a location, both physically and the settings
+     */
+    public boolean copy(final Plot destination, final Runnable whenDone) {
+        PlotId offset = new PlotId(destination.getId().x - this.getId().x,
+            destination.getId().y - this.getId().y);
+        Location db = destination.getBottomAbs();
+        Location ob = this.getBottomAbs();
+        final int offsetX = db.getX() - ob.getX();
+        final int offsetZ = db.getZ() - ob.getZ();
+        if (this.owner == null) {
+            TaskManager.runTaskLater(whenDone, 1);
+            return false;
+        }
+        Set<Plot> plots = this.getConnectedPlots();
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            if (other.hasOwner()) {
+                TaskManager.runTaskLater(whenDone, 1);
+                return false;
+            }
+        }
+        // world border
+        destination.updateWorldBorder();
+        // copy data
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            other.create(plot.owner, false);
+            if (!plot.getFlags().isEmpty()) {
+                other.getSettings().flags = plot.getFlags();
+                DBFunc.setFlags(other, plot.getFlags());
+            }
+            if (plot.isMerged()) {
+                other.setMerged(plot.getMerged());
+            }
+            if (plot.members != null && !plot.members.isEmpty()) {
+                other.members = plot.members;
+                for (UUID member : plot.members) {
+                    DBFunc.setMember(other, member);
+                }
+            }
+            if (plot.trusted != null && !plot.trusted.isEmpty()) {
+                other.trusted = plot.trusted;
+                for (UUID trusted : plot.trusted) {
+                    DBFunc.setTrusted(other, trusted);
+                }
+            }
+            if (plot.denied != null && !plot.denied.isEmpty()) {
+                other.denied = plot.denied;
+                for (UUID denied : plot.denied) {
+                    DBFunc.setDenied(other, denied);
+                }
+            }
+        }
+        // copy terrain
+        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    for (Plot current : getConnectedPlots()) {
+                        destination.getManager().claimPlot(destination.getArea(), destination);
+                    }
+                    destination.setSign();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = regions.poll();
+                Location[] corners = region.getCorners(getWorldName());
+                Location pos1 = corners[0];
+                Location pos2 = corners[1];
+                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+                newPos.setWorld(destination.getWorldName());
+                ChunkManager.manager.copyRegion(pos1, pos2, newPos, this);
+            }
+        };
+        run.run();
+        return true;
+    }
+
+    public boolean hasFlag(Flag<?> flag) {
+        return getFlags().containsKey(flag);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
new file mode 100644
index 000000000..00a30e22d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -0,0 +1,961 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author Jesse Boyd, Alexander Söderberg
+ */
+public abstract class PlotArea {
+
+    public final String worldname;
+    public final String id;
+    public final PlotManager manager;
+    public final int worldhash;
+    protected final ConcurrentHashMap<PlotId, Plot> plots = new ConcurrentHashMap<>();
+    private final PlotId min;
+    private final PlotId max;
+    private final IndependentPlotGenerator generator;
+    private final BlockBucket[][] blockBucketChunk;
+    public int MAX_PLOT_MEMBERS = 128;
+    public boolean AUTO_MERGE = false;
+    public boolean ALLOW_SIGNS = true;
+    public boolean MISC_SPAWN_UNOWNED = false;
+    public boolean MOB_SPAWNING = false;
+    public boolean MOB_SPAWNER_SPAWNING = false;
+    public String PLOT_BIOME = "FOREST";
+    public boolean PLOT_CHAT = false;
+    public boolean SCHEMATIC_CLAIM_SPECIFY = false;
+    public boolean SCHEMATIC_ON_CLAIM = false;
+    public String SCHEMATIC_FILE = "null";
+    public List<String> SCHEMATICS = null;
+    public Map<Flag<?>, Object> DEFAULT_FLAGS;
+    public boolean USE_ECONOMY = false;
+    public Map<String, Expression<Double>> PRICES = new HashMap<>();
+    public boolean SPAWN_EGGS = false;
+    public boolean SPAWN_CUSTOM = true;
+    public boolean SPAWN_BREEDING = false;
+    public boolean WORLD_BORDER = false;
+    public int TYPE = 0;
+    public int TERRAIN = 0;
+    public boolean HOME_ALLOW_NONMEMBER = false;
+    public PlotLoc NONMEMBER_HOME;
+    public PlotLoc DEFAULT_HOME;
+    public int MAX_BUILD_HEIGHT = 256;
+    public int MIN_BUILD_HEIGHT = 1;
+    public PlotGameMode GAMEMODE = PlotGameMode.CREATIVE;
+    private int hash;
+    private RegionWrapper region;
+    private ConcurrentHashMap<String, Object> meta;
+    private QuadMap<PlotCluster> clusters;
+
+    public PlotArea(@Nonnull final String worldName, @Nullable final String id,
+        @Nullable IndependentPlotGenerator generator, @Nullable final PlotId min,
+        @Nullable final PlotId max) {
+        this.worldname = worldName;
+        this.id = id;
+        this.manager = generator != null ? generator.getNewPlotManager() : null;
+        this.generator = generator;
+        if (min == null || max == null) {
+            if (min != max) {
+                throw new IllegalArgumentException(
+                    "None of the ids can be null for this constructor");
+            }
+            this.min = null;
+            this.max = null;
+        } else {
+            this.min = min;
+            this.max = max;
+        }
+        this.worldhash = worldName.hashCode();
+        if (Settings.Enabled_Components.PLOT_EXPIRY && generator != null) {
+            blockBucketChunk = generator.generateBlockBucketChunk(this);
+        } else {
+            blockBucketChunk = null;
+        }
+    }
+
+    /**
+     * Create a new PlotArea object with no functionality/information.
+     * - Mainly used during startup before worlds are created as a temporary object
+     */
+    public static PlotArea createGeneric(@Nonnull final String world) {
+        return new PlotArea(world, null, null, null, null) {
+            @Override public void loadConfiguration(ConfigurationSection config) {
+            }
+
+            @Override public ConfigurationNode[] getSettingNodes() {
+                return null;
+            }
+        };
+    }
+
+    public LocalBlockQueue getQueue(final boolean autoQueue) {
+        return GlobalBlockQueue.IMP.getNewQueue(worldname, autoQueue);
+    }
+
+    /**
+     * Get an array of BlockBuckets corresponding to a chunk of a plot
+     *
+     * @return BlockBucket[][]
+     */
+    public BlockBucket[][] getBlockBucketChunk() {
+        if (blockBucketChunk != null) {
+            return blockBucketChunk;
+        }
+        if (generator != null) {
+            return generator.generateBlockBucketChunk(this);
+        }
+        return null;
+    }
+
+    /**
+     * Returns the region for this PlotArea or a RegionWrapper encompassing
+     * the whole world if none exists.
+     *
+     * @return RegionWrapper
+     */
+    public RegionWrapper getRegion() {
+        this.region = getRegionAbs();
+        if (this.region == null) {
+            return new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
+                Integer.MAX_VALUE);
+        }
+        return this.region;
+    }
+
+    /**
+     * Returns the region for this PlotArea.
+     *
+     * @return RegionWrapper or null if no applicable region
+     */
+    private RegionWrapper getRegionAbs() {
+        if (this.region == null) {
+            if (this.min != null) {
+                Location bot = getPlotManager().getPlotBottomLocAbs(this, this.min);
+                Location top = getPlotManager().getPlotTopLocAbs(this, this.max);
+                this.region = new RegionWrapper(bot.getX() - 1, top.getX() + 1, bot.getZ() - 1,
+                    top.getZ() + 1);
+            }
+        }
+        return this.region;
+    }
+
+    /**
+     * Returns the minimum value of a {@link PlotId}.
+     *
+     * @return the minimum value for a {@link PlotId}
+     */
+    public PlotId getMin() {
+        return this.min == null ? new PlotId(Integer.MIN_VALUE, Integer.MIN_VALUE) : this.min;
+    }
+
+    /**
+     * Returns the max PlotId.
+     *
+     * @return the maximum value for a {@link PlotId}
+     */
+    public PlotId getMax() {
+        return this.max == null ? new PlotId(Integer.MAX_VALUE, Integer.MAX_VALUE) : this.max;
+    }
+
+    /**
+     * Get the implementation independent generator for this area.
+     *
+     * @return the {@link IndependentPlotGenerator}
+     */
+    public IndependentPlotGenerator getGenerator() {
+        return this.generator;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        PlotArea plotarea = (PlotArea) obj;
+        return this.worldhash == plotarea.worldhash && this.worldname.equals(plotarea.worldname)
+            && StringMan.isEqual(this.id, plotarea.id);
+    }
+
+    public Set<PlotCluster> getClusters() {
+        return this.clusters == null ? new HashSet<>() : this.clusters.getAll();
+    }
+
+    /**
+     * Check if a PlotArea is compatible (move/copy etc).
+     *
+     * @param plotArea the {@code PlotArea} to compare
+     * @return true if both areas are compatible
+     */
+    public boolean isCompatible(PlotArea plotArea) {
+        ConfigurationSection section = PlotSquared.get().worlds.getConfigurationSection("worlds");
+        for (ConfigurationNode setting : plotArea.getSettingNodes()) {
+            Object constant = section.get(plotArea.worldname + '.' + setting.getConstant());
+            if (constant == null || !constant
+                .equals(section.get(this.worldname + '.' + setting.getConstant()))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * When a world is created, the following method will be called for each.
+     *
+     * @param config Configuration Section
+     */
+    public void loadDefaultConfiguration(ConfigurationSection config) {
+        if ((this.min != null || this.max != null) && !(this instanceof GridPlotWorld)) {
+            throw new IllegalArgumentException("Must extend GridPlotWorld to provide");
+        }
+        if (config.contains("generator.terrain")) {
+            this.TERRAIN = config.getInt("generator.terrain");
+            this.TYPE = config.getInt("generator.type");
+        }
+        this.MOB_SPAWNING = config.getBoolean("natural_mob_spawning");
+        this.MISC_SPAWN_UNOWNED = config.getBoolean("misc_spawn_unowned");
+        this.MOB_SPAWNER_SPAWNING = config.getBoolean("mob_spawner_spawning");
+        this.AUTO_MERGE = config.getBoolean("plot.auto_merge");
+        this.MAX_PLOT_MEMBERS = config.getInt("limits.max-members");
+        this.ALLOW_SIGNS = config.getBoolean("plot.create_signs");
+        this.PLOT_BIOME = Configuration.BIOME.parseString(config.getString("plot.biome"));
+        this.SCHEMATIC_ON_CLAIM = config.getBoolean("schematic.on_claim");
+        this.SCHEMATIC_FILE = config.getString("schematic.file");
+        this.SCHEMATIC_CLAIM_SPECIFY = config.getBoolean("schematic.specify_on_claim");
+        this.SCHEMATICS = config.getStringList("schematic.schematics");
+        this.USE_ECONOMY = config.getBoolean("economy.use") && EconHandler.getEconHandler() != null;
+        ConfigurationSection priceSection = config.getConfigurationSection("economy.prices");
+        if (this.USE_ECONOMY) {
+            this.PRICES = new HashMap<>();
+            for (String key : priceSection.getKeys(false)) {
+                this.PRICES.put(key, Expression.doubleExpression(priceSection.getString(key)));
+            }
+        }
+        this.PLOT_CHAT = config.getBoolean("chat.enabled");
+        this.WORLD_BORDER = config.getBoolean("world.border");
+        this.MAX_BUILD_HEIGHT = config.getInt("world.max_height");
+        this.MIN_BUILD_HEIGHT = config.getInt("world.min_height");
+
+        switch (config.getString("world.gamemode").toLowerCase()) {
+            case "survival":
+            case "s":
+            case "0":
+                this.GAMEMODE = PlotGameMode.SURVIVAL;
+                break;
+            case "creative":
+            case "c":
+            case "1":
+                this.GAMEMODE = PlotGameMode.CREATIVE;
+                break;
+            case "adventure":
+            case "a":
+            case "2":
+                this.GAMEMODE = PlotGameMode.ADVENTURE;
+                break;
+            case "spectator":
+            case "3":
+                this.GAMEMODE = PlotGameMode.SPECTATOR;
+                break;
+            default:
+                this.GAMEMODE = PlotGameMode.NOT_SET;
+                break;
+        }
+
+        String homeNonMembers = config.getString("home.nonmembers");
+        String homeDefault = config.getString("home.default");
+        this.DEFAULT_HOME = PlotLoc.fromString(homeDefault);
+        this.HOME_ALLOW_NONMEMBER = homeNonMembers.equalsIgnoreCase(homeDefault);
+        if (this.HOME_ALLOW_NONMEMBER) {
+            this.NONMEMBER_HOME = DEFAULT_HOME;
+        } else {
+            this.NONMEMBER_HOME = PlotLoc.fromString(homeNonMembers);
+        }
+
+        if ("side".equalsIgnoreCase(homeDefault)) {
+            this.DEFAULT_HOME = null;
+        } else if (StringMan.isEqualIgnoreCaseToAny(homeDefault, "center", "middle")) {
+            this.DEFAULT_HOME = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
+        } else {
+            try {
+                /*String[] split = homeDefault.split(",");
+                this.DEFAULT_HOME =
+                    new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));*/
+                this.DEFAULT_HOME = PlotLoc.fromString(homeDefault);
+            } catch (NumberFormatException ignored) {
+                this.DEFAULT_HOME = null;
+            }
+        }
+
+        List<String> flags = config.getStringList("flags.default");
+        if (flags.isEmpty()) {
+            flags = config.getStringList("flags");
+            if (flags.isEmpty()) {
+                flags = new ArrayList<>();
+                ConfigurationSection section = config.getConfigurationSection("flags");
+                Set<String> keys = section.getKeys(false);
+                for (String key : keys) {
+                    if (!"default".equals(key)) {
+                        flags.add(key + ';' + section.get(key));
+                    }
+                }
+            }
+        }
+        try {
+            this.DEFAULT_FLAGS = FlagManager.parseFlags(flags);
+        } catch (Exception e) {
+            e.printStackTrace();
+            PlotSquared.debug("&cInvalid default flags for " + this.worldname + ": " + StringMan
+                .join(flags, ","));
+            this.DEFAULT_FLAGS = new HashMap<>();
+        }
+        this.SPAWN_EGGS = config.getBoolean("event.spawn.egg");
+        this.SPAWN_CUSTOM = config.getBoolean("event.spawn.custom");
+        this.SPAWN_BREEDING = config.getBoolean("event.spawn.breeding");
+        loadConfiguration(config);
+    }
+
+    public abstract void loadConfiguration(ConfigurationSection config);
+
+    /**
+     * Saving core PlotArea settings.
+     *
+     * @param config Configuration Section
+     */
+    public void saveConfiguration(ConfigurationSection config) {
+        HashMap<String, Object> options = new HashMap<>();
+        options.put("natural_mob_spawning", this.MOB_SPAWNING);
+        options.put("misc_spawn_unowned", this.MISC_SPAWN_UNOWNED);
+        options.put("mob_spawner_spawning", this.MOB_SPAWNER_SPAWNING);
+        options.put("plot.auto_merge", this.AUTO_MERGE);
+        options.put("plot.create_signs", this.ALLOW_SIGNS);
+        options.put("plot.biome", "FOREST");
+        options.put("schematic.on_claim", this.SCHEMATIC_ON_CLAIM);
+        options.put("schematic.file", this.SCHEMATIC_FILE);
+        options.put("schematic.specify_on_claim", this.SCHEMATIC_CLAIM_SPECIFY);
+        options.put("schematic.schematics", this.SCHEMATICS);
+        options.put("economy.use", this.USE_ECONOMY);
+        options.put("economy.prices.claim", 100);
+        options.put("economy.prices.merge", 100);
+        options.put("economy.prices.sell", 100);
+        options.put("chat.enabled", this.PLOT_CHAT);
+        options.put("flags.default", null);
+        options.put("event.spawn.egg", this.SPAWN_EGGS);
+        options.put("event.spawn.custom", this.SPAWN_CUSTOM);
+        options.put("event.spawn.breeding", this.SPAWN_BREEDING);
+        options.put("world.border", this.WORLD_BORDER);
+        options.put("limits.max-members", this.MAX_PLOT_MEMBERS);
+        options.put("home.default", "side");
+        String position = config.getString("home.nonmembers",
+            config.getBoolean("home.allow-nonmembers", false) ?
+                config.getString("home.default", "side") :
+                "side");
+        options.put("home.nonmembers", position);
+        options.put("world.max_height", this.MAX_BUILD_HEIGHT);
+        options.put("world.min_height", this.MIN_BUILD_HEIGHT);
+        options.put("world.gamemode", this.GAMEMODE.name().toLowerCase());
+
+        if (this.TYPE != 0) {
+            options.put("generator.terrain", this.TERRAIN);
+            options.put("generator.type", this.TYPE);
+        }
+        ConfigurationNode[] settings = getSettingNodes();
+        /*
+         * Saving generator specific settings
+         */
+        for (ConfigurationNode setting : settings) {
+            options.put(setting.getConstant(), setting.getValue());
+        }
+        for (Entry<String, Object> stringObjectEntry : options.entrySet()) {
+            if (!config.contains(stringObjectEntry.getKey())) {
+                config.set(stringObjectEntry.getKey(), stringObjectEntry.getValue());
+            }
+        }
+        if (!config.contains("flags")) {
+            config.set("flags.use",
+                "63,64,68,69,71,77,96,143,167,193,194,195,196,197,77,143,69,70,72,147,148,107,183,184,185,186,187,132");
+        }
+    }
+
+    @Nonnull @Override public String toString() {
+        if (this.id == null) {
+            return this.worldname;
+        } else {
+            return this.worldname + ";" + this.id;
+        }
+    }
+
+    @Override public int hashCode() {
+        if (this.hash != 0) {
+            return this.hash;
+        }
+        return this.hash = toString().hashCode();
+    }
+
+    /**
+     * Used for the <b>/plot setup</b> command Return null if you do not want to support this feature
+     *
+     * @return ConfigurationNode[]
+     */
+    public abstract ConfigurationNode[] getSettingNodes();
+
+    /**
+     * Gets the {@code Plot} at a location.
+     *
+     * @param location the location
+     * @return the {@code Plot} or null if none exists
+     */
+    @Nullable public Plot getPlotAbs(@Nonnull final Location location) {
+        final PlotId pid =
+            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+        if (pid == null) {
+            return null;
+        }
+        return getPlotAbs(pid);
+    }
+
+    /**
+     * Gets the base plot at a location.
+     *
+     * @param location the location
+     * @return base Plot
+     */
+    @Nullable public Plot getPlot(@Nonnull final Location location) {
+        final PlotId pid =
+            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+        if (pid == null) {
+            return null;
+        }
+        return getPlot(pid);
+    }
+
+    /**
+     * Get the owned base plot at a location.
+     *
+     * @param location the location
+     * @return the base plot or null
+     */
+    @Nullable public Plot getOwnedPlot(@Nonnull final Location location) {
+        final PlotId pid =
+            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+        if (pid == null) {
+            return null;
+        }
+        Plot plot = this.plots.get(pid);
+        return plot == null ? null : plot.getBasePlot(false);
+    }
+
+    /**
+     * Get the owned plot at a location.
+     *
+     * @param location the location
+     * @return Plot or null
+     */
+    @Nullable public Plot getOwnedPlotAbs(@Nonnull final Location location) {
+        final PlotId pid =
+            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+        if (pid == null) {
+            return null;
+        }
+        return this.plots.get(pid);
+    }
+
+    /**
+     * Get the owned Plot at a PlotId.
+     *
+     * @param id the {@code PlotId}
+     * @return the plot or null
+     */
+    @Nullable public Plot getOwnedPlotAbs(@Nonnull final PlotId id) {
+        return this.plots.get(id);
+    }
+
+    @Nullable public Plot getOwnedPlot(@Nonnull final PlotId id) {
+        Plot plot = this.plots.get(id);
+        return plot == null ? null : plot.getBasePlot(false);
+    }
+
+    public boolean contains(final int x, final int z) {
+        return this.TYPE != 2 || getRegionAbs().isIn(x, z);
+    }
+
+    public boolean contains(@Nonnull final PlotId id) {
+        return this.min == null || (id.x >= this.min.x && id.x <= this.max.x && id.y >= this.min.y
+            && id.y <= this.max.y);
+    }
+
+    public boolean contains(@Nonnull final Location location) {
+        return StringMan.isEqual(location.getWorld(), this.worldname) && (getRegionAbs() == null
+            || this.region.isIn(location.getX(), location.getZ()));
+    }
+
+    @Nonnull Set<Plot> getPlotsAbs(final UUID uuid) {
+        if (uuid == null) {
+            return Collections.emptySet();
+        }
+        final HashSet<Plot> myPlots = new HashSet<>();
+        foreachPlotAbs(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (uuid.equals(value.owner)) {
+                    myPlots.add(value);
+                }
+            }
+        });
+        return myPlots;
+    }
+
+    @Nonnull public Set<Plot> getPlots(@Nonnull final UUID uuid) {
+        final Set<Plot> myplots = new HashSet<>();
+        for (final Plot plot : getPlots()) {
+            if (plot.isBasePlot() && plot.isOwner(uuid)) {
+                myplots.add(plot);
+            }
+        }
+        return myplots;
+    }
+
+    public Set<Plot> getPlots(@Nonnull final PlotPlayer player) {
+        return getPlots(player.getUUID());
+    }
+
+    /**
+     * A collection of the claimed plots in this {@code PlotArea}.
+     *
+     * @return a collection of claimed plots
+     */
+    public Collection<Plot> getPlots() {
+        return this.plots.values();
+    }
+
+    public int getPlotCount(@Nonnull final UUID uuid) {
+        if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+            int count = 0;
+            for (Plot plot : getPlotsAbs(uuid)) {
+                if (!plot.hasFlag(Flags.DONE)) {
+                    count++;
+                }
+            }
+            return count;
+        }
+        return getPlotsAbs(uuid).size();
+    }
+
+    public boolean hasPlot(@Nonnull final UUID uuid) {
+        for (Entry<PlotId, Plot> entry : this.plots.entrySet()) {
+            if (entry.getValue().isOwner(uuid))
+                return true;
+        }
+        return false;
+    }
+
+    public int getPlotCount(@Nullable final PlotPlayer player) {
+        return player != null ? getPlotCount(player.getUUID()) : 0;
+    }
+
+    @Nullable public Plot getPlotAbs(@Nonnull final PlotId id) {
+        Plot plot = getOwnedPlotAbs(id);
+        if (plot == null) {
+            if (this.min != null && (id.x < this.min.x || id.x > this.max.x || id.y < this.min.y
+                || id.y > this.max.y)) {
+                return null;
+            }
+            return new Plot(this, id);
+        }
+        return plot;
+    }
+
+    @Nullable public Plot getPlot(@Nonnull final PlotId id) {
+        final Plot plot = getOwnedPlotAbs(id);
+        if (plot == null) {
+            if (this.min != null && (id.x < this.min.x || id.x > this.max.x || id.y < this.min.y
+                || id.y > this.max.y)) {
+                return null;
+            }
+            return new Plot(this, id);
+        }
+        return plot.getBasePlot(false);
+    }
+
+    /**
+     * Retrieves the number of claimed plot in the {@code PlotArea}.
+     *
+     * @return the number of claimed plots
+     */
+    public int getPlotCount() {
+        return this.plots.size();
+    }
+
+    @Nullable public PlotCluster getCluster(@Nonnull final Location location) {
+        final Plot plot = getPlot(location);
+        if (plot == null) {
+            return null;
+        }
+        return this.clusters != null ? this.clusters.get(plot.getId().x, plot.getId().y) : null;
+    }
+
+    @Nullable public PlotCluster getFirstIntersectingCluster(@Nonnull final PlotId pos1,
+        @Nonnull final PlotId pos2) {
+        if (this.clusters == null) {
+            return null;
+        }
+        for (PlotCluster cluster : this.clusters.getAll()) {
+            if (cluster.intersects(pos1, pos2)) {
+                return cluster;
+            }
+        }
+        return null;
+    }
+
+    @Nullable PlotCluster getCluster(@Nonnull final PlotId id) {
+        return this.clusters != null ? this.clusters.get(id.x, id.y) : null;
+    }
+
+    public PlotManager getPlotManager() {
+        return this.manager;
+    }
+
+    /**
+     * Session only plot metadata (session is until the server stops).
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @see FlagManager
+     */
+    public void setMeta(@Nonnull final String key, @Nullable final Object value) {
+        if (this.meta == null) {
+            this.meta = new ConcurrentHashMap<>();
+        }
+        this.meta.put(key, value);
+    }
+
+    @Nullable public <T> T getMeta(@Nullable final String key, @Nullable final T def) {
+        final Object v = getMeta(key);
+        return v == null ? def : (T) v;
+    }
+
+    /**
+     * Get the metadata for a key<br>
+     * <br>
+     * For persistent metadata use the flag system
+     */
+    @Nullable public Object getMeta(@Nonnull final String key) {
+        if (this.meta != null) {
+            return this.meta.get(key);
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unused") @Nonnull public Set<Plot> getBasePlots() {
+        final HashSet<Plot> myPlots = new HashSet<>(getPlots());
+        myPlots.removeIf(plot -> !plot.isBasePlot());
+        return myPlots;
+    }
+
+    private void foreachPlotAbs(@Nonnull final RunnableVal<Plot> run) {
+        for (final Entry<PlotId, Plot> entry : this.plots.entrySet()) {
+            run.run(entry.getValue());
+        }
+    }
+
+    public void foreachBasePlot(@Nonnull final RunnableVal<Plot> run) {
+        for (final Plot plot : getPlots()) {
+            if (plot.isBasePlot()) {
+                run.run(plot);
+            }
+        }
+    }
+
+    @Nonnull public Map<PlotId, Plot> getPlotsRaw() {
+        return this.plots;
+    }
+
+    @Nonnull public Set<Entry<PlotId, Plot>> getPlotEntries() {
+        return this.plots.entrySet();
+    }
+
+    public boolean addPlot(@Nonnull final Plot plot) {
+        for (PlotPlayer pp : plot.getPlayersInPlot()) {
+            pp.setMeta(PlotPlayer.META_LAST_PLOT, plot);
+        }
+        return this.plots.put(plot.getId(), plot) == null;
+    }
+
+    public Plot getNextFreePlot(final PlotPlayer player, @Nullable PlotId start) {
+        int plots;
+        PlotId center;
+        PlotId min = getMin();
+        PlotId max = getMax();
+        if (TYPE == 2) {
+            center = new PlotId(MathMan.average(min.x, max.x), MathMan.average(min.y, max.y));
+            plots = Math.max(max.x - min.x, max.y - min.y) + 1;
+            if (start != null)
+                start = new PlotId(start.x - center.x, start.y - center.y);
+        } else {
+            center = new PlotId(0, 0);
+            plots = Integer.MAX_VALUE;
+        }
+        PlotId currentId;
+        for (int i = 0; i < plots; i++) {
+            if (start == null) {
+                start = getMeta("lastPlot", new PlotId(0, 0));
+            } else {
+                start = start.getNextId(1);
+            }
+            if (start == null) {
+                PlotSquared.debug("NPE possible in getNextFreePlot");
+            }
+            currentId = new PlotId(center.x + start.x, center.y + start.y);
+            Plot plot = getPlotAbs(currentId);
+            if (plot != null && plot.canClaim(player)) {
+                setMeta("lastPlot", currentId);
+                return plot;
+            }
+        }
+        return null;
+    }
+
+    public boolean addPlotIfAbsent(@Nonnull final Plot plot) {
+        if (this.plots.putIfAbsent(plot.getId(), plot) == null) {
+            for (PlotPlayer pp : plot.getPlayersInPlot()) {
+                pp.setMeta(PlotPlayer.META_LAST_PLOT, plot);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public boolean addPlotAbs(@Nonnull final Plot plot) {
+        return this.plots.put(plot.getId(), plot) == null;
+    }
+
+    /**
+     * Get the plot border distance for a world<br>
+     *
+     * @return The border distance or Integer.MAX_VALUE if no border is set
+     */
+    public int getBorder() {
+        final Integer meta = (Integer) getMeta("worldBorder");
+        if (meta != null) {
+            int border = meta + 1;
+            if (border == 0) {
+                return Integer.MAX_VALUE;
+            } else {
+                return border;
+            }
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    /**
+     * Setup the plot border for a world (usually done when the world is created).
+     */
+    public void setupBorder() {
+        if (!this.WORLD_BORDER) {
+            return;
+        }
+        final Integer meta = (Integer) getMeta("worldBorder");
+        if (meta == null) {
+            setMeta("worldBorder", 1);
+        }
+        for (final Plot plot : getPlots()) {
+            plot.updateWorldBorder();
+        }
+    }
+
+    /**
+     * Delete the metadata for a key.
+     * - metadata is session only
+     * - deleting other plugin's metadata may cause issues
+     *
+     * @param key Meta data key
+     */
+    public void deleteMeta(@Nonnull final String key) {
+        if (this.meta != null) {
+            this.meta.remove(key);
+        }
+    }
+
+    public boolean canClaim(@Nullable final PlotPlayer player, @Nonnull final PlotId pos1,
+        @Nonnull final PlotId pos2) {
+        if (pos1.x == pos2.x && pos1.y == pos2.y) {
+            if (getOwnedPlot(pos1) != null) {
+                return false;
+            }
+            final Plot plot = getPlotAbs(pos1);
+            if (plot == null) {
+                return false;
+            }
+            return plot.canClaim(player);
+        }
+        for (int x = pos1.x; x <= pos2.x; x++) {
+            for (int y = pos1.y; y <= pos2.y; y++) {
+                final PlotId id = new PlotId(x, y);
+                final Plot plot = getPlotAbs(id);
+                if (plot == null) {
+                    return false;
+                }
+                if (!plot.canClaim(player)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    public boolean removePlot(@Nonnull final PlotId id) {
+        return this.plots.remove(id) != null;
+    }
+
+    public boolean mergePlots(@Nonnull final List<PlotId> plotIds, final boolean removeRoads) {
+        if (plotIds.size() < 2) {
+            return false;
+        }
+
+        final PlotId pos1 = plotIds.get(0);
+        final PlotId pos2 = plotIds.get(plotIds.size() - 1);
+        final PlotManager manager = getPlotManager();
+
+        final boolean result = EventUtil.manager.callAutoMerge(getPlotAbs(pos1), plotIds);
+        if (!result) {
+            return false;
+        }
+
+        final Set<UUID> trusted = new HashSet<>();
+        final Set<UUID> members = new HashSet<>();
+        final Set<UUID> denied = new HashSet<>();
+
+        manager.startPlotMerge(this, plotIds);
+        for (int x = pos1.x; x <= pos2.x; x++) {
+            for (int y = pos1.y; y <= pos2.y; y++) {
+                PlotId id = new PlotId(x, y);
+                Plot plot = getPlotAbs(id);
+                trusted.addAll(plot.getTrusted());
+                members.addAll(plot.getMembers());
+                denied.addAll(plot.getDenied());
+                if (removeRoads) {
+                    plot.removeSign();
+                }
+            }
+        }
+        members.removeAll(trusted);
+        denied.removeAll(trusted);
+        denied.removeAll(members);
+        for (int x = pos1.x; x <= pos2.x; x++) {
+            for (int y = pos1.y; y <= pos2.y; y++) {
+                final boolean lx = x < pos2.x;
+                final boolean ly = y < pos2.y;
+                final PlotId id = new PlotId(x, y);
+                final Plot plot = getPlotAbs(id);
+
+                plot.setTrusted(trusted);
+                plot.setMembers(members);
+                plot.setDenied(denied);
+
+                Plot plot2;
+                if (lx) {
+                    if (ly) {
+                        if (!plot.getMerged(1) || !plot.getMerged(2)) {
+                            if (removeRoads) {
+                                plot.removeRoadSouthEast();
+                            }
+                        }
+                    }
+                    if (!plot.getMerged(1)) {
+                        plot2 = plot.getRelative(1, 0);
+                        plot.mergePlot(plot2, removeRoads);
+                    }
+                }
+                if (ly) {
+                    if (!plot.getMerged(2)) {
+                        plot2 = plot.getRelative(0, 1);
+                        plot.mergePlot(plot2, removeRoads);
+                    }
+                }
+            }
+        }
+        manager.finishPlotMerge(this, plotIds);
+        return true;
+    }
+
+    /**
+     * Get a set of owned plots within a selection (chooses the best algorithm based on selection size.
+     * i.e. A selection of billions of plots will work fine
+     *
+     * @param pos1 first corner of selection
+     * @param pos2 second corner of selection
+     * @return the plots in the selection which are owned
+     */
+    public Set<Plot> getPlotSelectionOwned(@Nonnull final PlotId pos1, @Nonnull final PlotId pos2) {
+        final int size = (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
+        final Set<Plot> result = new HashSet<>();
+        if (size < 16 || size < getPlotCount()) {
+            for (final PlotId pid : MainUtil.getPlotSelectionIds(pos1, pos2)) {
+                final Plot plot = getPlotAbs(pid);
+                if (plot.hasOwner()) {
+                    if (plot.getId().x > pos1.x || plot.getId().y > pos1.y
+                        || plot.getId().x < pos2.x || plot.getId().y < pos2.y) {
+                        result.add(plot);
+                    }
+                }
+            }
+        } else {
+            for (final Plot plot : getPlots()) {
+                if (plot.getId().x > pos1.x || plot.getId().y > pos1.y || plot.getId().x < pos2.x
+                    || plot.getId().y < pos2.y) {
+                    result.add(plot);
+                }
+            }
+        }
+        return result;
+    }
+
+    @SuppressWarnings("WeakerAccess")
+    public void removeCluster(@Nullable final PlotCluster plotCluster) {
+        if (this.clusters == null) {
+            throw new IllegalAccessError("Clusters not enabled!");
+        }
+        this.clusters.remove(plotCluster);
+    }
+
+    public void addCluster(@Nullable final PlotCluster plotCluster) {
+        if (this.clusters == null) {
+            this.clusters = new QuadMap<PlotCluster>(Integer.MAX_VALUE, 0, 0, 62) {
+                @Override public RegionWrapper getRegion(PlotCluster value) {
+                    return new RegionWrapper(value.getP1().x, value.getP2().x, value.getP1().y,
+                        value.getP2().y);
+                }
+            };
+        }
+        this.clusters.add(plotCluster);
+    }
+
+    @Nullable public PlotCluster getCluster(final String string) {
+        for (PlotCluster cluster : getClusters()) {
+            if (cluster.getName().equalsIgnoreCase(string)) {
+                return cluster;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
new file mode 100644
index 000000000..79521908e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
@@ -0,0 +1,136 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.google.common.collect.ImmutableMap;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import lombok.NonNull;
+
+import java.util.Collection;
+import java.util.Map;
+
+public abstract class PlotBlock implements ConfigurationSerializable {
+
+    private static Class<?> conversionType;
+    private static BlockRegistry blockRegistry;
+
+    protected PlotBlock() {
+    }
+
+    public static boolean isEverything(@NonNull final PlotBlock block) {
+        return block.equals(LegacyPlotBlock.EVERYTHING) || block.equals(StringPlotBlock.EVERYTHING);
+    }
+
+    public static boolean containsEverything(@NonNull final Collection<PlotBlock> blocks) {
+        for (final PlotBlock block : blocks) {
+            if (isEverything(block)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static PlotBlock get(char combinedId) {
+        switch (combinedId) {
+            case 0:
+                return null;
+            case 1:
+                return get(0, 0);
+            default:
+                return get(combinedId >> 4, combinedId & 15);
+        }
+    }
+
+    public static PlotBlock deserialize(@NonNull final Map<String, Object> map) {
+        if (map.containsKey("material")) {
+            final Object object = map.get("material");
+            return get(object.toString());
+        }
+        return null;
+    }
+
+    public static StringPlotBlock get(@NonNull final String itemId) {
+        if (Settings.Enabled_Components.BLOCK_CACHE) {
+            return StringPlotBlock.getOrAdd(itemId);
+        }
+        return new StringPlotBlock(itemId);
+    }
+
+    public static PlotBlock get(int id, int data) {
+        return Settings.Enabled_Components.BLOCK_CACHE && data > 0 ?
+            LegacyPlotBlock.CACHE[(id << 4) + data] :
+            new LegacyPlotBlock((short) id, (byte) data);
+    }
+
+    public static PlotBlock getEmptyData(@NonNull final PlotBlock plotBlock) {
+        if (plotBlock instanceof StringPlotBlock) {
+            return plotBlock;
+        }
+        return get(((LegacyPlotBlock) plotBlock).getId(), (byte) 0);
+    }
+
+    public static PlotBlock get(@NonNull final BaseBlock baseBlock) {
+        StringPlotBlock plotBlock = get(baseBlock.getBlockType().getId());
+        plotBlock.setBaseBlock(baseBlock);
+        return plotBlock;
+    }
+
+    public static PlotBlock get(@NonNull final Object type) {
+        if (blockRegistry == null) {
+            blockRegistry = PlotSquared.imp().getBlockRegistry();
+            if (blockRegistry == null) {
+                throw new UnsupportedOperationException(
+                    "The PlotSquared implementation has not registered a custom block registry."
+                        + " This method can't be used.");
+            }
+            conversionType = blockRegistry.getType();
+        }
+        if (!type.getClass().equals(conversionType)) {
+            throw new UnsupportedOperationException(
+                "The PlotSquared implementation has not registered a block registry for this object type");
+        }
+        return blockRegistry.getPlotBlock(type);
+    }
+
+    @Override public Map<String, Object> serialize() {
+        return ImmutableMap.of("material", this.getRawId());
+    }
+
+    public <T> T to(@NonNull final Class<T> clazz) {
+        if (blockRegistry == null) {
+            blockRegistry = PlotSquared.imp().getBlockRegistry();
+            if (blockRegistry == null) {
+                throw new UnsupportedOperationException(
+                    "The PlotSquared implementation has not registered a custom block registry."
+                        + " This method can't be used.");
+            }
+            conversionType = blockRegistry.getType();
+        }
+        if (!clazz.equals(conversionType)) {
+            throw new UnsupportedOperationException(
+                "The PlotSquared implementation has not registered a block registry for this object type");
+        }
+        return clazz.cast(blockRegistry.getItem(this));
+    }
+
+    public abstract boolean isAir();
+
+    public final boolean equalsAny(final int id, @NonNull final String stringId) {
+        if (this instanceof StringPlotBlock) {
+            final StringPlotBlock stringPlotBlock = (StringPlotBlock) this;
+            return stringPlotBlock.idEquals(stringId);
+        }
+        final LegacyPlotBlock legacyPlotBlock = (LegacyPlotBlock) this;
+        return legacyPlotBlock.id == id;
+    }
+
+    @Override public abstract boolean equals(Object obj);
+
+    @Override public abstract int hashCode();
+
+    @Override public abstract String toString();
+
+    public abstract Object getRawId();
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
new file mode 100644
index 000000000..ed9ca5fd8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
@@ -0,0 +1,187 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import lombok.Getter;
+
+import javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.UUID;
+
+public class PlotCluster {
+    public PlotArea area;
+    @Nonnull @Getter public PlotSettings settings;
+    public UUID owner;
+    public HashSet<UUID> helpers = new HashSet<>();
+    public HashSet<UUID> invited = new HashSet<>();
+    public int temp;
+    @Nonnull private PlotId pos1;
+    @Nonnull private PlotId pos2;
+    private RegionWrapper region;
+
+    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, @Nonnull PlotId pos2, UUID owner) {
+        this.area = area;
+        this.pos1 = pos1;
+        this.pos2 = pos2;
+        this.owner = owner;
+        this.settings = new PlotSettings();
+        this.temp = -1;
+        setRegion();
+    }
+
+    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, PlotId pos2, UUID owner, int temp) {
+        this.area = area;
+        this.pos1 = pos1;
+        this.pos2 = pos2;
+        this.owner = owner;
+        this.settings = new PlotSettings();
+        this.temp = temp;
+        setRegion();
+    }
+
+    public PlotId getP1() {
+        return this.pos1;
+    }
+
+    public void setP1(PlotId id) {
+        this.pos1 = id;
+        setRegion();
+    }
+
+    public PlotId getP2() {
+        return this.pos2;
+    }
+
+    public void setP2(PlotId id) {
+        this.pos2 = id;
+        setRegion();
+    }
+
+    private void setRegion() {
+        this.region = new RegionWrapper(this.pos1.x, this.pos2.x, this.pos1.y, this.pos2.y);
+    }
+
+    public RegionWrapper getRegion() {
+        return this.region;
+    }
+
+    public boolean isOwner(UUID uuid) {
+        return uuid.equals(owner);
+    }
+
+    public boolean isAdded(UUID uuid) {
+        return this.owner.equals(uuid) || this.invited.contains(uuid) || this.invited
+            .contains(DBFunc.EVERYONE) || this.helpers.contains(uuid) || this.helpers
+            .contains(DBFunc.EVERYONE);
+    }
+
+    public boolean hasHelperRights(UUID uuid) {
+        return this.owner.equals(uuid) || this.helpers.contains(uuid) || this.helpers
+            .contains(DBFunc.EVERYONE);
+    }
+
+    public String getName() {
+        return this.settings.getAlias();
+    }
+
+    public void setName(String name) {
+        this.settings.setAlias(name);
+    }
+
+    public String getAlias() {
+        return this.settings.getAlias();
+    }
+
+    /**
+     * Get the area (in plots).
+     *
+     * @return
+     */
+    public int getArea() {
+        return (1 + this.pos2.x - this.pos1.x) * (1 + this.pos2.y - this.pos1.y);
+    }
+
+    public void setArea(PlotArea plotArea) {
+        if (this.area != null) {
+            this.area.removeCluster(this);
+        }
+        this.area = plotArea;
+        plotArea.addCluster(this);
+    }
+
+    @Override public int hashCode() {
+        return this.pos1.hashCode();
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        PlotCluster other = (PlotCluster) obj;
+        return this.pos1.equals(other.pos1) && this.pos2.equals(other.pos2) && this.area
+            .equals(other.area);
+    }
+
+    @Override public String toString() {
+        return this.area + ";" + this.pos1.x + ";" + this.pos1.y + ";" + this.pos2.x + ";"
+            + this.pos2.y;
+    }
+
+    public Location getHome() {
+        BlockLoc home = this.settings.getPosition();
+        Location toReturn;
+        if (home.y == 0) {
+            // default pos
+            Plot center = getCenterPlot();
+            toReturn = center.getHome();
+            if (toReturn.getY() == 0) {
+                PlotManager manager = this.area.getPlotManager();
+                Location loc = manager.getSignLoc(this.area, center);
+                toReturn.setY(loc.getY());
+            }
+        } else {
+            toReturn = getClusterBottom().add(home.x, home.y, home.z);
+        }
+        int max = MainUtil.getHeighestBlock(this.area.worldname, toReturn.getX(), toReturn.getZ());
+        if (max > toReturn.getY()) {
+            toReturn.setY(1 + max);
+        }
+        return toReturn;
+    }
+
+    public PlotId getCenterPlotId() {
+        PlotId bot = getP1();
+        PlotId top = getP2();
+        return new PlotId((bot.x + top.x) / 2, (bot.y + top.y) / 2);
+    }
+
+    public Plot getCenterPlot() {
+        return this.area.getPlotAbs(getCenterPlotId());
+    }
+
+    public Location getClusterBottom() {
+        PlotManager manager = this.area.getPlotManager();
+        return manager.getPlotBottomLocAbs(this.area, getP1());
+    }
+
+    public Location getClusterTop() {
+        PlotManager manager = this.area.getPlotManager();
+        return manager.getPlotTopLocAbs(this.area, getP2());
+    }
+
+    public boolean intersects(PlotId pos1, PlotId pos2) {
+        return pos1.x <= this.pos2.x && pos2.x >= this.pos1.x && pos1.y <= this.pos2.y
+            && pos2.y >= this.pos1.y;
+    }
+
+    public boolean contains(PlotId id) {
+        return this.pos1.x <= id.x && this.pos1.y <= id.y && this.pos2.x >= id.x
+            && this.pos2.y >= id.y;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java
new file mode 100644
index 000000000..09759c09d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java
@@ -0,0 +1,11 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public abstract class PlotFilter {
+    public boolean allowsArea(final PlotArea area) {
+        return true;
+    }
+
+    public boolean allowsPlot(final Plot plot) {
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java
new file mode 100644
index 000000000..4faa17b76
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java
@@ -0,0 +1,19 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import java.util.Set;
+import java.util.UUID;
+
+public class PlotHandler {
+    public static boolean sameOwners(final Plot plot1, final Plot plot2) {
+        if (plot1.owner == null || plot2.owner == null) {
+            return false;
+        }
+        final Set<UUID> owners = plot1.getOwners();
+        for (UUID owner : owners) {
+            if (plot2.isOwner(owner)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
new file mode 100644
index 000000000..113495512
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
@@ -0,0 +1,180 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import javax.annotation.Nullable;
+
+public class PlotId {
+    /**
+     * x value
+     */
+    public int x;
+    /**
+     * y value
+     */
+    public int y;
+    private int hash;
+
+    /**
+     * PlotId class (PlotId x,y values do not correspond to Block locations)
+     *
+     * @param x The plot x coordinate
+     * @param y The plot y coordinate
+     */
+    public PlotId(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    /**
+     * Get a Plot Id based on a string
+     *
+     * @param string to create id from
+     * @return null if the string is invalid
+     */
+    public static PlotId fromString(String string) {
+        if (string == null) {
+            return null;
+        }
+        String[] parts = string.split("[;|,]");
+        if (parts.length < 2) {
+            return null;
+        }
+        int x;
+        int y;
+        try {
+            x = Integer.parseInt(parts[0]);
+            y = Integer.parseInt(parts[1]);
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+        return new PlotId(x, y);
+    }
+
+    public static PlotId of(@Nullable Plot plot) {
+        return plot != null ? plot.getId() : null;
+    }
+
+    /**
+     * Get the PlotId from the HashCode<br>
+     * Note: Only accurate for small x,z values (short)
+     *
+     * @param hash
+     * @return
+     */
+    public static PlotId unpair(int hash) {
+        return new PlotId(hash >> 16, hash & 0xFFFF);
+    }
+
+    public PlotId getNextId(int step) {
+        int absX = Math.abs(x);
+        int absY = Math.abs(y);
+        if (absX > absY) {
+            if (x > 0) {
+                return new PlotId(x, y + 1);
+            } else {
+                return new PlotId(x, y - 1);
+            }
+        } else if (absY > absX) {
+            if (y > 0) {
+                return new PlotId(x - 1, y);
+            } else {
+                return new PlotId(x + 1, y);
+            }
+        } else {
+            if (x == y && x > 0) {
+                return new PlotId(x, y + step);
+            }
+            if (x == absX) {
+                return new PlotId(x, y + 1);
+            }
+            if (y == absY) {
+                return new PlotId(x, y - 1);
+            }
+            return new PlotId(x + 1, y);
+        }
+    }
+
+    /**
+     * Get the PlotId in a relative direction
+     * 0 = north<br>
+     * 1 = east<br>
+     * 2 = south<br>
+     * 3 = west<br>
+     *
+     * @param direction
+     * @return PlotId
+     */
+    public PlotId getRelative(int direction) {
+        switch (direction) {
+            case 0:
+                return new PlotId(this.x, this.y - 1);
+            case 1:
+                return new PlotId(this.x + 1, this.y);
+            case 2:
+                return new PlotId(this.x, this.y + 1);
+            case 3:
+                return new PlotId(this.x - 1, this.y);
+        }
+        return this;
+    }
+
+    /**
+     * Get the PlotId in a relative location
+     *
+     * @param x
+     * @param y
+     * @return PlotId
+     */
+    public PlotId getRelative(int x, int y) {
+        return new PlotId(this.x + x, this.y + y);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (this.hashCode() != obj.hashCode()) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        PlotId other = (PlotId) obj;
+        return this.x == other.x && this.y == other.y;
+    }
+
+    /**
+     * e.g.
+     * 5;-6
+     *
+     * @return
+     */
+    @Override public String toString() {
+        return this.x + ";" + this.y;
+    }
+
+    public String toCommaSeparatedString() {
+        return this.x + "," + this.y;
+    }
+
+
+
+    /**
+     * The PlotId object caches the hashcode for faster mapping/fetching/sorting<br>
+     * - Recalculation is required if the x/y values change
+     * TODO maybe make x/y values private and add this to the mutators
+     */
+    public void recalculateHash() {
+        this.hash = 0;
+        hashCode();
+    }
+
+    @Override public int hashCode() {
+        if (this.hash == 0) {
+            this.hash = (this.x << 16) | (this.y & 0xFFFF);
+        }
+        return this.hash;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
new file mode 100644
index 000000000..5280d6459
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
@@ -0,0 +1,108 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil;
+import lombok.NonNull;
+
+public class PlotInventory {
+
+    private static final String META_KEY = "inventory";
+    public final PlotPlayer player;
+    public final int size;
+    private final PlotItemStack[] items;
+    private String title;
+    private boolean open = false;
+    public PlotInventory(PlotPlayer player) {
+        this.size = 4;
+        this.title = null;
+        this.player = player;
+        this.items = InventoryUtil.manager.getItems(player);
+    }
+    public PlotInventory(PlotPlayer player, int size, String name) {
+        this.size = size;
+        this.title = name == null ? "" : name;
+        this.player = player;
+        this.items = new PlotItemStack[size * 9];
+    }
+
+    public static boolean hasPlotInventoryOpen(@NonNull final PlotPlayer plotPlayer) {
+        return getOpenPlotInventory(plotPlayer) != null;
+    }
+
+    public static PlotInventory getOpenPlotInventory(@NonNull final PlotPlayer plotPlayer) {
+        return plotPlayer.getMeta(META_KEY, null);
+    }
+
+    public static void setPlotInventoryOpen(@NonNull final PlotPlayer plotPlayer,
+        @NonNull final PlotInventory plotInventory) {
+        plotPlayer.setMeta(META_KEY, plotInventory);
+    }
+
+    public static void removePlotInventoryOpen(@NonNull final PlotPlayer plotPlayer) {
+        plotPlayer.deleteMeta(META_KEY);
+    }
+
+    public boolean onClick(int index) {
+        return true;
+    }
+
+    public void openInventory() {
+        if (this.title == null) {
+            return;
+        }
+        if (hasPlotInventoryOpen(player)) {
+            PlotSquared.debug(String.format("Failed to open plot inventory for %s "
+                + "because the player already has an open plot inventory", player.getName()));
+        } else {
+            this.open = true;
+            setPlotInventoryOpen(player, this);
+            InventoryUtil.manager.open(this);
+        }
+    }
+
+    public void close() {
+        if (this.title == null) {
+            return;
+        }
+        removePlotInventoryOpen(player);
+        InventoryUtil.manager.close(this);
+        this.open = false;
+    }
+
+    public void setItem(int index, PlotItemStack item) {
+        this.items[index] = item;
+        InventoryUtil.manager.setItem(this, index, item);
+    }
+
+    public PlotItemStack getItem(int index) {
+        if ((index < 0) || (index >= this.items.length)) {
+            return null;
+        }
+        return this.items[index];
+    }
+
+    public PlotItemStack[] getItems() {
+        return this.items;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+
+    public void setTitle(String title) {
+        if (title == null) {
+            return;
+        }
+        boolean tmp = this.open;
+        close();
+        this.title = title;
+        if (tmp) {
+            openInventory();
+        }
+    }
+
+    public boolean isOpen() {
+        return this.open;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java
new file mode 100644
index 000000000..c0a9d93d0
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java
@@ -0,0 +1,44 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import lombok.Getter;
+
+public class PlotItemStack {
+
+    public final int amount;
+    public final String name;
+    public final String[] lore;
+    @Getter private final PlotBlock plotBlock;
+
+    /**
+     * @param id     Legacy numerical item ID
+     * @param data   Legacy numerical item data
+     * @param amount Amount of items in the stack
+     * @param name   The display name of the item stack
+     * @param lore   The item stack lore
+     * @deprecated Use {@link PlotItemStack(String, int, String, String...)}
+     */
+    @Deprecated public PlotItemStack(final int id, final short data, final int amount,
+        final String name, final String... lore) {
+        this.amount = amount;
+        this.name = name;
+        this.lore = lore;
+        this.plotBlock = PlotBlock.get(id, data);
+    }
+
+    /**
+     * @param id     String ID
+     * @param amount Amount of items in the stack
+     * @param name   The display name of the item stack
+     * @param lore   The item stack lore
+     */
+    public PlotItemStack(final String id, final int amount, final String name,
+        final String... lore) {
+        StringComparison<PlotBlock>.ComparisonResult match = WorldUtil.IMP.getClosestBlock(id);
+        this.plotBlock = match.best;
+        this.amount = amount;
+        this.name = name;
+        this.lore = lore;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
new file mode 100644
index 000000000..e1254a8db
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
@@ -0,0 +1,75 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+public class PlotLoc {
+
+    public int x;
+    public int y;
+    public int z;
+
+    public PlotLoc(int x, int z) {
+        this.x = x;
+        this.y = -1;
+        this.z = z;
+    }
+
+    public PlotLoc(int x, int y, int z) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+    }
+
+    public static PlotLoc fromString(String input) {
+        if ("side".equalsIgnoreCase(input)) {
+            return null;
+        } else if (StringMan.isEqualIgnoreCaseToAny(input, "center", "middle")) {
+            return new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
+        } else {
+            try {
+                String[] split = input.split(",");
+                if (split.length == 2) {
+                    return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
+                } else if (split.length == 3) {
+                    return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]),
+                        Integer.parseInt(split[2]));
+                } else {
+                    throw new IllegalArgumentException(
+                        String.format("Unable to deserialize: %s", input));
+                }
+            } catch (NumberFormatException ignored) {
+                return null;
+            }
+        }
+    }
+
+    @Override public int hashCode() {
+        int prime = 31;
+        int result = 1;
+        result = (prime * result) + this.x;
+        result = (prime * result) + this.y;
+        result = (prime * result) + this.z;
+        return result;
+    }
+
+    @Override public String toString() {
+        if (this.y == -1) {
+            return String.format("%d,%d", x, z);
+        }
+        return String.format("%d,%d,%d", x, y, z);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        PlotLoc other = (PlotLoc) obj;
+        return (this.x == other.x) && (this.y == other.y) && (this.z == other.z);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
new file mode 100644
index 000000000..0e99ce00a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
@@ -0,0 +1,82 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.commands.Template;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+
+public abstract class PlotManager {
+
+    /*
+     * Plot locations (methods with Abs in them will not need to consider mega
+     * plots).
+     */
+    public abstract PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z);
+
+    public abstract PlotId getPlotId(PlotArea plotArea, int x, int y, int z);
+
+    // If you have a circular plot, just return the corner if it were a square
+    public abstract Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId);
+
+    // the same applies here
+    public abstract Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId);
+
+    /*
+     * Plot clearing (return false if you do not support some method)
+     */
+    public abstract boolean clearPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
+
+    public abstract boolean claimPlot(PlotArea plotArea, Plot plot);
+
+    public abstract boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
+
+    public abstract Location getSignLoc(PlotArea plotArea, Plot plot);
+
+    /*
+     * Plot set functions (return false if you do not support the specific set
+     * method).
+     */
+    public abstract String[] getPlotComponents(PlotArea plotArea, PlotId plotId);
+
+    public abstract boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
+        BlockBucket blocks);
+
+    /*
+     * PLOT MERGING (return false if your generator does not support plot
+     * merging).
+     */
+    public abstract boolean createRoadEast(PlotArea plotArea, Plot plot);
+
+    public abstract boolean createRoadSouth(PlotArea plotArea, Plot plot);
+
+    public abstract boolean createRoadSouthEast(PlotArea plotArea, Plot plot);
+
+    public abstract boolean removeRoadEast(PlotArea plotArea, Plot plot);
+
+    public abstract boolean removeRoadSouth(PlotArea plotArea, Plot plot);
+
+    public abstract boolean removeRoadSouthEast(PlotArea plotArea, Plot plot);
+
+    public abstract boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds);
+
+    public abstract boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds);
+
+    public abstract boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds);
+
+    public abstract boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds);
+
+    public void exportTemplate(PlotArea plotArea) throws IOException {
+        HashSet<FileBytes> files = new HashSet<>(Collections.singletonList(
+            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml",
+                Template.getBytes(plotArea))));
+        Template.zipAll(plotArea.worldname, files);
+    }
+
+    public int getWorldHeight() {
+        return 255;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
new file mode 100644
index 000000000..6db234de3
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
@@ -0,0 +1,70 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager;
+import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
+
+public class PlotMessage {
+
+    private Object builder;
+
+    public PlotMessage() {
+        try {
+            reset(ChatManager.manager);
+        } catch (Throwable e) {
+            assert PlotSquared.imp() != null;
+            PlotSquared.debug(
+                PlotSquared.imp().getPluginName() + " doesn't support fancy chat for " + PlotSquared
+                    .get().IMP.getServerVersion());
+            ChatManager.manager = new PlainChatManager();
+            reset(ChatManager.manager);
+        }
+    }
+
+    public PlotMessage(String text) {
+        this();
+        text(text);
+    }
+
+    public <T> T $(ChatManager<T> manager) {
+        return (T) this.builder;
+    }
+
+    public <T> T reset(ChatManager<T> manager) {
+        return (T) (this.builder = manager.builder());
+    }
+
+    public PlotMessage text(String text) {
+        ChatManager.manager.text(this, text);
+        return this;
+    }
+
+    public PlotMessage tooltip(PlotMessage... tooltip) {
+        ChatManager.manager.tooltip(this, tooltip);
+        return this;
+    }
+
+    public PlotMessage tooltip(String tooltip) {
+        return tooltip(new PlotMessage(tooltip));
+    }
+
+    public PlotMessage command(String command) {
+        ChatManager.manager.command(this, command);
+        return this;
+    }
+
+    public PlotMessage suggest(String command) {
+        ChatManager.manager.suggest(this, command);
+        return this;
+    }
+
+    public PlotMessage color(String color) {
+        ChatManager.manager.color(this, C.color(color));
+        return this;
+    }
+
+    public void send(PlotPlayer player) {
+        ChatManager.manager.send(this, player);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
new file mode 100644
index 000000000..2fc42059f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -0,0 +1,648 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
+import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+import lombok.NonNull;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * The abstract class supporting {@code BukkitPlayer} and {@code SpongePlayer}.
+ */
+public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
+
+    public static final String META_LAST_PLOT = "lastplot";
+    public static final String META_LOCATION = "location";
+    private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
+    private Map<String, byte[]> metaMap = new HashMap<>();
+    /**
+     * The metadata map.
+     */
+    private ConcurrentHashMap<String, Object> meta;
+
+    public static <T> PlotPlayer from(@NonNull final T object) {
+        if (!converters.containsKey(object.getClass())) {
+            throw new IllegalArgumentException(String
+                .format("There is no registered PlotPlayer converter for type %s",
+                    object.getClass().getSimpleName()));
+        }
+        return converters.get(object.getClass()).convert(object);
+    }
+
+    public static <T> void registerConverter(@NonNull final Class<T> clazz,
+        final PlotPlayerConverter<T> converter) {
+        converters.put(clazz, converter);
+    }
+
+    /**
+     * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's
+     * already cached)<br> - Accepts sponge/bukkit Player (online) - Accepts player name (online) -
+     * Accepts UUID - Accepts bukkit OfflinePlayer (offline)
+     */
+    public static PlotPlayer wrap(Object player) {
+        return PlotSquared.get().IMP.wrapPlayer(player);
+    }
+
+    /**
+     * Get the cached PlotPlayer from a username<br> - This will return null if the player has not
+     * finished logging in or is not online
+     */
+    public static PlotPlayer get(String name) {
+        return UUIDHandler.getPlayer(name);
+    }
+
+    /**
+     * Set some session only metadata for this player.
+     */
+    public void setMeta(String key, Object value) {
+        if (value == null) {
+            deleteMeta(key);
+        } else {
+            if (this.meta == null) {
+                this.meta = new ConcurrentHashMap<>();
+            }
+            this.meta.put(key, value);
+        }
+    }
+
+    /**
+     * Get the session metadata for a key.
+     *
+     * @param key the name of the metadata key
+     * @param <T> the object type to return
+     * @return the value assigned to the key or null if it does not exist
+     */
+    public <T> T getMeta(String key) {
+        if (this.meta != null) {
+            return (T) this.meta.get(key);
+        }
+        return null;
+    }
+
+    public <T> T getMeta(String key, T defaultValue) {
+        T meta = getMeta(key);
+        if (meta == null) {
+            return defaultValue;
+        }
+        return meta;
+    }
+
+    /**
+     * Delete the metadata for a key. - metadata is session only - deleting other plugin's metadata
+     * may cause issues
+     */
+    public Object deleteMeta(String key) {
+        return this.meta == null ? null : this.meta.remove(key);
+    }
+
+    /**
+     * This player's name.
+     *
+     * @return the name of the player
+     */
+    @Override public String toString() {
+        return getName();
+    }
+
+    /**
+     * Get this player's current plot.
+     *
+     * @return the plot the player is standing on or null if standing on a road or not in a {@link
+     * PlotArea}
+     */
+    public Plot getCurrentPlot() {
+        Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
+        if (value == null && !Settings.Enabled_Components.EVENTS) {
+            return getLocation().getPlot();
+        }
+        return value;
+    }
+
+    /**
+     * Get the total number of allowed plots Possibly relevant: (To increment the player's allowed
+     * plots, see the example script on the wiki)
+     *
+     * @return number of allowed plots within the scope (globally, or in the player's current world as
+     * defined in the settings.yml)
+     */
+    public int getAllowedPlots() {
+        return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
+    }
+
+    /**
+     * Get the total number of allowed clusters
+     *
+     * @return number of allowed clusters within the scope (globally, or in the player's current world
+     * as defined in the settings.yml)
+     */
+    public int getAllowedClusters() {
+        return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
+    }
+
+    public int hasPermissionRange(String stub, int range) {
+        if (hasPermission(C.PERMISSION_ADMIN.s())) {
+            return Integer.MAX_VALUE;
+        }
+        String[] nodes = stub.split("\\.");
+        StringBuilder n = new StringBuilder();
+        for (int i = 0; i < (nodes.length - 1); i++) {
+            n.append(nodes[i]).append(".");
+            if (!stub.equals(n + C.PERMISSION_STAR.s())) {
+                if (hasPermission(n + C.PERMISSION_STAR.s())) {
+                    return Integer.MAX_VALUE;
+                }
+            }
+        }
+        if (hasPermission(stub + ".*")) {
+            return Integer.MAX_VALUE;
+        }
+        for (int i = range; i > 0; i--) {
+            if (hasPermission(stub + "." + i)) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * Get the number of plots this player owns.
+     *
+     * @return number of plots within the scope (globally, or in the player's current world as defined
+     * in the settings.yml)
+     * @see #getPlotCount(String);
+     * @see #getPlots()
+     */
+    public int getPlotCount() {
+        if (!Settings.Limit.GLOBAL) {
+            return getPlotCount(getLocation().getWorld());
+        }
+        final AtomicInteger count = new AtomicInteger(0);
+        final UUID uuid = getUUID();
+        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+                    for (Plot plot : value.getPlotsAbs(uuid)) {
+                        if (!plot.hasFlag(Flags.DONE)) {
+                            count.incrementAndGet();
+                        }
+                    }
+                } else {
+                    count.addAndGet(value.getPlotsAbs(uuid).size());
+                }
+            }
+        });
+        return count.get();
+    }
+
+    public int getClusterCount() {
+        if (!Settings.Limit.GLOBAL) {
+            return getClusterCount(getLocation().getWorld());
+        }
+        final AtomicInteger count = new AtomicInteger(0);
+        final UUID uuid = getUUID();
+        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                for (PlotCluster cluster : value.getClusters()) {
+                    if (cluster.isOwner(getUUID())) {
+                        count.incrementAndGet();
+                    }
+                }
+            }
+        });
+        return count.get();
+    }
+
+    /**
+     * Get the number of plots this player owns in the world.
+     *
+     * @param world the name of the plotworld to check.
+     */
+    public int getPlotCount(String world) {
+        UUID uuid = getUUID();
+        int count = 0;
+        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
+            if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+                for (Plot plot : area.getPlotsAbs(uuid)) {
+                    if (!plot.getFlag(Flags.DONE).isPresent()) {
+                        count++;
+                    }
+                }
+            } else {
+                count += area.getPlotsAbs(uuid).size();
+            }
+        }
+        return count;
+    }
+
+    public int getClusterCount(String world) {
+        UUID uuid = getUUID();
+        int count = 0;
+        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
+            for (PlotCluster cluster : area.getClusters()) {
+                if (cluster.isOwner(getUUID())) {
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Get a {@code Set} of plots owned by this player.
+     *
+     * @return a {@code Set} of plots owned by the player
+     * @see PlotSquared for more searching functions
+     * @see #getPlotCount() for the number of plots
+     */
+    public Set<Plot> getPlots() {
+        return PlotSquared.get().getPlots(this);
+    }
+
+    /**
+     * Return the PlotArea this player is currently in, or null.
+     */
+    public PlotArea getPlotAreaAbs() {
+        return PlotSquared.get().getPlotAreaAbs(getLocation());
+    }
+
+    public PlotArea getApplicablePlotArea() {
+        return PlotSquared.get().getApplicablePlotArea(getLocation());
+    }
+
+    @Override public RequiredType getSuperCaller() {
+        return RequiredType.PLAYER;
+    }
+
+    /**
+     * Get this player's last recorded location or null if they don't any plot relevant location.
+     *
+     * @return The location
+     */
+    public Location getLocation() {
+        Location location = getMeta("location");
+        if (location != null) {
+            return location;
+        }
+        return getLocationFull();
+    }
+
+    /////////////// PLAYER META ///////////////
+
+    ////////////// PARTIALLY IMPLEMENTED ///////////
+
+    /**
+     * Get this player's full location (including yaw/pitch)
+     */
+    public abstract Location getLocationFull();
+
+    ////////////////////////////////////////////////
+
+    /**
+     * Get this player's UUID. === !IMPORTANT ===<br> The UUID is dependent on the mode chosen in the
+     * settings.yml and may not be the same as Bukkit has (especially if using an old version of
+     * Bukkit that does not support UUIDs)
+     *
+     * @return UUID
+     */
+    @Override public abstract UUID getUUID();
+
+    public boolean canTeleport(Location loc) {
+        Location current = getLocationFull();
+        teleport(loc);
+        boolean result = true;
+        if (!getLocation().equals(loc)) {
+            result = false;
+        }
+        teleport(current);
+        return result;
+    }
+
+    /**
+     * Teleport this player to a location.
+     *
+     * @param location the target location
+     */
+    public abstract void teleport(Location location);
+
+    /**
+     * Kick this player to a location
+     *
+     * @param location the target location
+     */
+    public void plotkick(Location location) {
+        setMeta("kick", true);
+        teleport(location);
+        deleteMeta("kick");
+    }
+
+    /**
+     * Set this compass target.
+     *
+     * @param location the target location
+     */
+    public abstract void setCompassTarget(Location location);
+
+    /**
+     * Set player data that will persist restarts. - Please note that this is not intended to store
+     * large values - For session only data use meta
+     */
+    public void setAttribute(String key) {
+        setPersistentMeta("attrib_" + key, new byte[] {(byte) 1});
+    }
+
+    /**
+     * Retrieves the attribute of this player.
+     *
+     * @return the attribute will be either true or false
+     */
+    public boolean getAttribute(String key) {
+        if (!hasPersistentMeta("attrib_" + key)) {
+            return false;
+        }
+        return getPersistentMeta("attrib_" + key)[0] == 1;
+    }
+
+    /**
+     * Remove an attribute from a player.
+     */
+    public void removeAttribute(String key) {
+        removePersistentMeta("attrib_" + key);
+    }
+
+    /**
+     * Sets the local weather for this Player.
+     *
+     * @param weather the weather visible to the player
+     */
+    public abstract void setWeather(PlotWeather weather);
+
+    /**
+     * Get this player's gamemode.
+     *
+     * @return the gamemode of the player.
+     */
+    public abstract PlotGameMode getGameMode();
+
+    /**
+     * Set this player's gameMode.
+     *
+     * @param gameMode the gamemode to set
+     */
+    public abstract void setGameMode(PlotGameMode gameMode);
+
+    /**
+     * Set this player's local time (ticks).
+     *
+     * @param time the time visible to the player
+     */
+    public abstract void setTime(long time);
+
+    public abstract boolean getFlight();
+
+    /**
+     * Set this player's fly mode.
+     *
+     * @param fly if the player can fly
+     */
+    public abstract void setFlight(boolean fly);
+
+    /**
+     * Play music at a location for this player.
+     *
+     * @param location where to play the music
+     * @param id       the record item id
+     */
+    public abstract void playMusic(Location location, PlotBlock id);
+
+    /**
+     * Check if this player is banned.
+     *
+     * @return true if the player is banned, false otherwise.
+     */
+    public abstract boolean isBanned();
+
+    /**
+     * Kick this player from the game.
+     *
+     * @param message the reason for the kick
+     */
+    public abstract void kick(String message);
+
+    /**
+     * Called when this player quits.
+     */
+    public void unregister() {
+        Plot plot = getCurrentPlot();
+        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
+            .getArea() instanceof SinglePlotArea) {
+            PlotId id = plot.getId();
+            int x = id.x;
+            int z = id.y;
+            ByteBuffer buffer = ByteBuffer.allocate(13);
+            buffer.putShort((short) x);
+            buffer.putShort((short) z);
+            Location loc = getLocation();
+            buffer.putInt(loc.getX());
+            buffer.put((byte) loc.getY());
+            buffer.putInt(loc.getZ());
+            setPersistentMeta("quitLoc", buffer.array());
+        } else if (hasPersistentMeta("quitLoc")) {
+            removePersistentMeta("quitLoc");
+        }
+        if (plot != null) {
+            EventUtil.manager.callLeave(this, plot);
+        }
+        if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
+            for (Plot owned : getPlots()) {
+                owned.deletePlot(null);
+                PlotSquared.debug(String
+                    .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
+                        owned.getId(), getName()));
+            }
+        }
+        String name = getName();
+        if (ExpireManager.IMP != null) {
+            ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
+        }
+        UUIDHandler.getPlayers().remove(name);
+        PlotSquared.get().IMP.unregister(this);
+    }
+
+    /**
+     * Get the amount of clusters this player owns in the specific world.
+     */
+    public int getPlayerClusterCount(String world) {
+        UUID uuid = getUUID();
+        int count = 0;
+        for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
+            if (uuid.equals(cluster.owner)) {
+                count += cluster.getArea();
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Get the amount of clusters this player owns.
+     *
+     * @return the number of clusters this player owns
+     */
+    public int getPlayerClusterCount() {
+        final AtomicInteger count = new AtomicInteger();
+        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                count.addAndGet(value.getClusters().size());
+            }
+        });
+        return count.get();
+    }
+
+    /**
+     * Return a {@code Set} of all plots this player owns in a certain world.
+     *
+     * @param world the world to retrieve plots from
+     * @return a {@code Set} of plots this player owns in the provided world
+     */
+    public Set<Plot> getPlots(String world) {
+        UUID uuid = getUUID();
+        HashSet<Plot> plots = new HashSet<>();
+        for (Plot plot : PlotSquared.get().getPlots(world)) {
+            if (plot.isOwner(uuid)) {
+                plots.add(plot);
+            }
+        }
+        return plots;
+    }
+
+    public void populatePersistentMetaMap() {
+        if (Settings.Enabled_Components.PERSISTENT_META) {
+            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<Map<String, byte[]>>() {
+                @Override public void run(Map<String, byte[]> value) {
+                    try {
+                        PlotPlayer.this.metaMap = value;
+                        if (!value.isEmpty()) {
+                            if (Settings.Enabled_Components.PERSISTENT_META) {
+                                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
+                                if (manager instanceof SinglePlotAreaManager) {
+                                    PlotArea area = ((SinglePlotAreaManager) manager).getArea();
+                                    byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
+                                    if (arr != null) {
+                                        removePersistentMeta("quitLoc");
+
+                                        if (getMeta("teleportOnLogin", true)) {
+                                            ByteBuffer quitWorld = ByteBuffer.wrap(arr);
+                                            final int plotX = quitWorld.getShort();
+                                            final int plotZ = quitWorld.getShort();
+                                            PlotId id = new PlotId(plotX, plotZ);
+                                            int x = quitWorld.getInt();
+                                            int y = quitWorld.get() & 0xFF;
+                                            int z = quitWorld.getInt();
+                                            Plot plot = area.getOwnedPlot(id);
+                                            if (plot != null) {
+                                                final Location loc =
+                                                    new Location(plot.getWorldName(), x, y, z);
+                                                if (plot.isLoaded()) {
+                                                    TaskManager.runTask(() -> {
+                                                        if (getMeta("teleportOnLogin", true)) {
+                                                            teleport(loc);
+                                                            sendMessage(C.TELEPORTED_TO_PLOT.f()
+                                                                + " (quitLoc) (" + plotX + ","
+                                                                + plotZ + ")");
+                                                        }
+                                                    });
+                                                } else if (!PlotSquared.get()
+                                                    .isMainThread(Thread.currentThread())) {
+                                                    if (getMeta("teleportOnLogin", true)) {
+                                                        if (plot.teleportPlayer(PlotPlayer.this)) {
+                                                            TaskManager.runTask(() -> {
+                                                                if (getMeta("teleportOnLogin",
+                                                                    true)) {
+                                                                    teleport(loc);
+                                                                    sendMessage(
+                                                                        C.TELEPORTED_TO_PLOT.f()
+                                                                            + " (quitLoc-unloaded) ("
+                                                                            + plotX + "," + plotZ
+                                                                            + ")");
+                                                                }
+                                                            });
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+    }
+
+    public byte[] getPersistentMeta(String key) {
+        return this.metaMap.get(key);
+    }
+
+    public void removePersistentMeta(String key) {
+        if (this.metaMap.containsKey(key)) {
+            this.metaMap.remove(key);
+        }
+        if (Settings.Enabled_Components.PERSISTENT_META) {
+            DBFunc.removePersistentMeta(getUUID(), key);
+        }
+    }
+
+    public void setPersistentMeta(String key, byte[] value) {
+        boolean delete = hasPersistentMeta(key);
+        this.metaMap.put(key, value);
+        if (Settings.Enabled_Components.PERSISTENT_META) {
+            DBFunc.addPersistentMeta(getUUID(), key, value, delete);
+        }
+    }
+
+    public boolean hasPersistentMeta(String key) {
+        return this.metaMap.containsKey(key);
+    }
+
+    public abstract void stopSpectating();
+
+    /**
+     * The amount of money this Player has.
+     */
+    public double getMoney() {
+        return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
+    }
+
+    public void withdraw(double amount) {
+        if (EconHandler.manager != null) {
+            EconHandler.manager.withdrawMoney(this, amount);
+        }
+    }
+
+    public void deposit(double amount) {
+        if (EconHandler.manager != null) {
+            EconHandler.manager.depositMoney(this, amount);
+        }
+    }
+
+    public interface PlotPlayerConverter<BaseObject> {
+
+        PlotPlayer convert(BaseObject object);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
new file mode 100644
index 000000000..2ccaa47a8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -0,0 +1,185 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+
+import java.util.*;
+
+/**
+ * Generic settings class.
+ * - Does not keep a reference to a parent class
+ * - Direct changes here will not occur in the db (Use the parent plot object for that)
+ */
+public class PlotSettings {
+
+    /**
+     * Merged plots.
+     *
+     * @deprecated Raw access
+     */
+    @Deprecated public boolean[] merged = new boolean[] {false, false, false, false};
+    /**
+     * Plot alias.
+     *
+     * @deprecated Raw access
+     */
+    @Deprecated public String alias = "";
+    /**
+     * Comments.
+     *
+     * @deprecated Raw access
+     */
+    @Deprecated public List<PlotComment> comments = null;
+
+    /**
+     * The ratings for a plot.
+     *
+     * @deprecated Raw access
+     */
+    @Deprecated public HashMap<UUID, Integer> ratings;
+
+    /**
+     * Flags.
+     *
+     * @deprecated Raw access. Not compatible with PlotClusters.
+     */
+    @Deprecated public HashMap<Flag<?>, Object> flags = new HashMap<>();
+    /**
+     * Home Position.
+     *
+     * @deprecated Raw access
+     */
+    @Deprecated private BlockLoc position;
+
+    /**
+     * <b>Check if the plot is merged in a direction</b><br> 0 = North<br> 1 = East<br> 2 = South<br> 3 = West<br>
+     *
+     * @param direction Direction to check
+     * @return boolean merged
+     */
+    public boolean getMerged(int direction) {
+        return this.merged[direction];
+    }
+
+    /**
+     * Returns true if the plot is merged (i.e. if it's a mega plot)
+     */
+    public boolean isMerged() {
+        return this.merged[0] || this.merged[1] || this.merged[2] || this.merged[3];
+    }
+
+    public boolean[] getMerged() {
+        return this.merged;
+    }
+
+    public void setMerged(boolean[] merged) {
+        this.merged = merged;
+    }
+
+    public Map<UUID, Integer> getRatings() {
+        if (this.ratings == null) {
+            this.ratings = new HashMap<>();
+
+        }
+        return this.ratings;
+    }
+
+    boolean setMerged(int direction, boolean merged) {
+        if (this.merged[direction] != merged) {
+            this.merged[direction] = merged;
+            return true;
+        }
+        return false;
+    }
+
+    public BlockLoc getPosition() {
+        if (this.position == null) {
+            return new BlockLoc(0, 0, 0);
+        }
+        return this.position;
+    }
+
+    public void setPosition(BlockLoc position) {
+        if (position != null && position.x == 0 && position.y == 0 && position.z == 0) {
+            position = null;
+        }
+        this.position = position;
+    }
+
+    public String getAlias() {
+        return this.alias;
+    }
+
+    /**
+     * Set the plot alias.
+     *
+     * @param alias alias to be used
+     */
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getJoinMessage(PlotArea area) {
+        if (flags.containsKey(Flags.GREETING)) {
+            return (String) flags.get(Flags.GREETING);
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Get the "farewell" flag value.
+     *
+     * @param plotArea The PlotArea
+     * @return Farewell flag
+     */
+    public String getLeaveMessage(PlotArea plotArea) {
+        if (flags.containsKey(Flags.FAREWELL)) {
+            return (String) flags.get(Flags.FAREWELL);
+        } else {
+            return "";
+        }
+    }
+
+    //todo need a plot method
+    public Optional<ArrayList<PlotComment>> getComments(String inbox) {
+        ArrayList<PlotComment> c = new ArrayList<>();
+        if (this.comments == null) {
+            return Optional.empty();
+        }
+        for (PlotComment comment : this.comments) {
+            if (comment.inbox.equals(inbox)) {
+                c.add(comment);
+            }
+        }
+        return Optional.of(c);
+    }
+
+    //todo need a plot method
+    public void setComments(List<PlotComment> comments) {
+        this.comments = comments;
+    }
+
+    //todo need a plot method
+    public void removeComment(PlotComment comment) {
+        if (this.comments.contains(comment)) {
+            this.comments.remove(comment);
+        }
+    }
+
+    //todo need a plot method
+    public void removeComments(List<PlotComment> comments) {
+        for (PlotComment comment : comments) {
+            removeComment(comment);
+        }
+    }
+
+    //todo need a plot method
+    public void addComment(PlotComment comment) {
+        if (this.comments == null) {
+            this.comments = new ArrayList<>();
+        }
+        this.comments.add(comment);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java
new file mode 100644
index 000000000..490f8c926
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public class PseudoRandom {
+
+    public static final PseudoRandom random = new PseudoRandom();
+
+    public long state = System.nanoTime();
+
+    public long nextLong() {
+        long a = this.state;
+        this.state = xorShift64(a);
+        return a;
+    }
+
+    public long xorShift64(long a) {
+        a ^= a << 21;
+        a ^= a >>> 35;
+        a ^= a << 4;
+        return a;
+    }
+
+    public int random(int n) {
+        if (n == 1) {
+            return 0;
+        }
+        long r = ((nextLong() >>> 32) * n) >> 32;
+        return (int) r;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
new file mode 100644
index 000000000..874b6155c
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
@@ -0,0 +1,81 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map.Entry;
+
+public class Rating {
+    /**
+     * This is a map of the rating category to the rating value
+     */
+    private final HashMap<String, Integer> ratingMap;
+    private final int initial;
+    private boolean changed;
+
+    public Rating(int value) {
+        this.initial = value;
+        this.ratingMap = new HashMap<>();
+        if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
+            if (value < 10) {
+                for (String ratingCategory : Settings.Ratings.CATEGORIES) {
+                    this.ratingMap.put(ratingCategory, value);
+                }
+                this.changed = true;
+                return;
+            }
+            for (String ratingCategory : Settings.Ratings.CATEGORIES) {
+                this.ratingMap.put(ratingCategory, value % 10 - 1);
+                value = value / 10;
+            }
+        } else {
+            this.ratingMap.put(null, value);
+        }
+    }
+
+    public List<String> getCategories() {
+        if (this.ratingMap.size() == 1) {
+            return new ArrayList<>(0);
+        }
+        return new ArrayList<>(this.ratingMap.keySet());
+    }
+
+    public double getAverageRating() {
+        double total = 0;
+        for (Entry<String, Integer> entry : this.ratingMap.entrySet()) {
+            total += entry.getValue();
+        }
+        return total / this.ratingMap.size();
+    }
+
+    public Integer getRating(String category) {
+        return this.ratingMap.get(category);
+    }
+
+    public boolean setRating(String category, int value) {
+        this.changed = true;
+        if (!this.ratingMap.containsKey(category)) {
+            return false;
+        }
+        return this.ratingMap.put(category, value) != null;
+    }
+
+    public int getAggregate() {
+        if (!this.changed) {
+            return this.initial;
+        }
+        if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
+            int val = 0;
+            for (int i = 0; i < Settings.Ratings.CATEGORIES.size(); i++) {
+                val +=
+                    (i + 1) * Math.pow(10, this.ratingMap.get(Settings.Ratings.CATEGORIES.get(i)));
+            }
+            return val;
+        } else {
+            return this.ratingMap.get(null);
+        }
+
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java
new file mode 100644
index 000000000..ced127a22
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java
@@ -0,0 +1,71 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public class RegionWrapper {
+    public final int minX;
+    public final int maxX;
+    public final int minY;
+    public final int maxY;
+    public final int minZ;
+    public final int maxZ;
+
+    public RegionWrapper(int minX, int maxX, int minZ, int maxZ) {
+        this.maxX = maxX;
+        this.minX = minX;
+        this.maxZ = maxZ;
+        this.minZ = minZ;
+        this.minY = 0;
+        this.maxY = 256;
+    }
+
+    public RegionWrapper(int minX, int maxX, int minY, int maxY, int minZ, int maxZ) {
+        this.maxX = maxX;
+        this.minX = minX;
+        this.maxZ = maxZ;
+        this.minZ = minZ;
+        this.minY = minY;
+        this.maxY = maxY;
+    }
+
+    public boolean isIn(int x, int y, int z) {
+        return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ
+            && y >= this.minY && y <= this.maxY;
+    }
+
+    public boolean isIn(int x, int z) {
+        return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ;
+    }
+
+    public boolean intersects(RegionWrapper other) {
+        return other.minX <= this.maxX && other.maxX >= this.minX && other.minY <= this.maxY
+            && other.maxY >= this.minY;
+    }
+
+    @Override public int hashCode() {
+        return this.minX + 13 * this.maxX + 23 * this.minZ + 39 * this.maxZ;
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (obj == null) {
+            return false;
+        }
+        if (obj == this) {
+            return true;
+        }
+        if (obj instanceof RegionWrapper) {
+            RegionWrapper other = (RegionWrapper) obj;
+            return this.minX == other.minX && this.minZ == other.minZ && this.minY == other.minY
+                && this.maxX == other.maxX && this.maxZ == other.maxZ && this.maxY == other.maxY;
+        }
+        return false;
+    }
+
+    @Override public String toString() {
+        return this.minX + "->" + this.maxX + "," + this.minZ + "->" + this.maxZ;
+    }
+
+    public Location[] getCorners(String world) {
+        Location pos1 = new Location(world, this.minX, this.minY, this.minZ);
+        Location pos2 = new Location(world, this.maxX, this.maxY, this.maxZ);
+        return new Location[] {pos1, pos2};
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java
new file mode 100644
index 000000000..90074a63a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java
@@ -0,0 +1,18 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public abstract class RunnableVal<T> implements Runnable {
+    public T value;
+
+    public RunnableVal() {
+    }
+
+    public RunnableVal(T value) {
+        this.value = value;
+    }
+
+    @Override public void run() {
+        run(this.value);
+    }
+
+    public abstract void run(T value);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java
new file mode 100644
index 000000000..ee46a417f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java
@@ -0,0 +1,20 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public abstract class RunnableVal2<T, U> implements Runnable {
+    public T value1;
+    public U value2;
+
+    public RunnableVal2() {
+    }
+
+    public RunnableVal2(T value1, U value2) {
+        this.value1 = value1;
+        this.value2 = value2;
+    }
+
+    @Override public void run() {
+        run(this.value1, this.value2);
+    }
+
+    public abstract void run(T value1, U value2);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java
new file mode 100644
index 000000000..cb6b2a8be
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java
@@ -0,0 +1,22 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public abstract class RunnableVal3<T, U, V> implements Runnable {
+    public T value1;
+    public U value2;
+    public V value3;
+
+    public RunnableVal3() {
+    }
+
+    public RunnableVal3(T value1, U value2, V value3) {
+        this.value1 = value1;
+        this.value2 = value2;
+        this.value3 = value3;
+    }
+
+    @Override public void run() {
+        run(value1, value2, value3);
+    }
+
+    public abstract void run(T value1, U value2, V value3);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java
new file mode 100644
index 000000000..e203fa870
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java
@@ -0,0 +1,67 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
+import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+
+public class SetupObject {
+
+    /**
+     * Specify a SetupUtils object here to override the existing
+     */
+    public SetupUtils setupManager;
+
+    /**
+     * The current state
+     */
+    public int current = 0;
+
+    /**
+     * The index in generator specific settings
+     */
+    public int setup_index = 0;
+
+    /**
+     * The name of the world
+     */
+    public String world = null;
+
+    /**
+     * The name of the plot manager
+     */
+    public String plotManager = null;
+
+    /**
+     * The name of the generator to use for world creation
+     */
+    public String setupGenerator = null;
+
+    /**
+     * The management type (normal, augmented, partial)
+     */
+    public int type;
+
+    /**
+     * The terrain type
+     */
+    public int terrain;
+
+    /**
+     * Area ID (may be null)
+     */
+    public String id;
+
+    /**
+     * Minimum plot id (may be null)
+     */
+    public PlotId min;
+
+    /**
+     * Max plot id (may be null)
+     */
+    public PlotId max;
+
+    /**
+     * Generator specific configuration steps
+     */
+    public ConfigurationNode[] step = null;
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
new file mode 100644
index 000000000..7fcb07907
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
@@ -0,0 +1,95 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import com.sk89q.worldedit.world.block.BaseBlock;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.Setter;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+public class StringPlotBlock extends PlotBlock {
+
+    public static final PlotBlock EVERYTHING = new StringPlotBlock("air");
+    private static final Map<String, StringPlotBlock> STRING_PLOT_BLOCK_CACHE = new HashMap<>();
+    @Getter private final String nameSpace;
+    @Getter private final String itemId;
+    @Getter @Setter private BaseBlock baseBlock = null;
+    private boolean isForeign = false;
+
+    public StringPlotBlock(@NonNull final String nameSpace, @NonNull final String itemId) {
+        this.nameSpace = nameSpace.toLowerCase(Locale.ENGLISH);
+        this.itemId = itemId.toLowerCase(Locale.ENGLISH);
+        this.determineForeign();
+    }
+
+    public StringPlotBlock(@NonNull final String itemId) {
+        if (itemId.contains(":")) {
+            final String[] parts = itemId.split(":");
+            if (parts.length < 2) {
+                throw new IllegalArgumentException(String.format("Cannot parse \"%s\"", itemId));
+            }
+            this.nameSpace = parts[0].toLowerCase(Locale.ENGLISH);
+            this.itemId = parts[1].toLowerCase(Locale.ENGLISH);
+        } else {
+            this.nameSpace = "minecraft";
+            if (itemId.isEmpty()) {
+                this.itemId = "air";
+            } else {
+                this.itemId = itemId.toLowerCase(Locale.ENGLISH);
+            }
+        }
+        this.determineForeign();
+    }
+
+    public static StringPlotBlock getOrAdd(@NonNull final String itemId) {
+        // final String id = itemId.toLowerCase(Locale.ENGLISH);
+
+        StringPlotBlock plotBlock = STRING_PLOT_BLOCK_CACHE.get(itemId);
+        if (plotBlock == null) {
+            plotBlock = new StringPlotBlock(itemId);
+            STRING_PLOT_BLOCK_CACHE.put(itemId, plotBlock);
+        }
+
+        return plotBlock;
+    }
+
+    private void determineForeign() {
+        this.isForeign = !this.nameSpace.equals("minecraft");
+    }
+
+    @Override public String toString() {
+        return this.isForeign ? String.format("%s:%s", nameSpace, itemId) : itemId;
+    }
+
+    @Override public boolean isAir() {
+        return this.itemId.isEmpty() || this.itemId.equalsIgnoreCase("air");
+    }
+
+    @Override public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    public boolean idEquals(@NonNull final String id) {
+        return id.equalsIgnoreCase(this.itemId);
+    }
+
+    @Override public Object getRawId() {
+        return this.getItemId();
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        StringPlotBlock other = (StringPlotBlock) obj;
+        return other.nameSpace.equals(this.nameSpace) && other.itemId.equals(this.itemId);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
new file mode 100644
index 000000000..e3f0031ba
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
@@ -0,0 +1,72 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+/**
+
+ */
+public class StringWrapper {
+
+    public final String value;
+    private int hash;
+
+    /**
+     * Constructor
+     *
+     * @param value to wrap
+     */
+    public StringWrapper(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Check if a wrapped string equals another one
+     *
+     * @param obj to compare
+     * @return true if obj equals the stored value
+     */
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            if (obj.getClass() == String.class) {
+                return obj.toString().equalsIgnoreCase(this.value);
+            }
+            return false;
+        }
+        if (obj.hashCode() != hashCode()) {
+            return false;
+        }
+        StringWrapper other = (StringWrapper) obj;
+        if ((other.value == null) || (this.value == null)) {
+            return false;
+        }
+        return other.value.equalsIgnoreCase(this.value);
+    }
+
+    /**
+     * Get the string value.
+     *
+     * @return string value
+     */
+    @Override public String toString() {
+        return this.value;
+    }
+
+    /**
+     * Get the hash value.
+     *
+     * @return has value
+     */
+    @Override public int hashCode() {
+        if (this.value == null) {
+            return 0;
+        }
+        if (this.hash == 0) {
+            this.hash = this.value.toLowerCase().hashCode();
+        }
+        return this.hash;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
new file mode 100644
index 000000000..0972a4449
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
@@ -0,0 +1,43 @@
+package com.github.intellectualsites.plotsquared.plot.object.chat;
+
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PlainChatManager extends ChatManager<List<StringBuilder>> {
+
+    @Override public List<StringBuilder> builder() {
+        return new ArrayList<>();
+    }
+
+    @Override public void color(PlotMessage message, String color) {
+        List<StringBuilder> parts = message.$(this);
+        parts.get(parts.size() - 1).insert(0, color);
+    }
+
+    @Override public void tooltip(PlotMessage message, PlotMessage... tooltips) {
+    }
+
+    @Override public void command(PlotMessage message, String command) {
+    }
+
+    @Override public void text(PlotMessage message, String text) {
+        message.$(this).add(new StringBuilder(C.color(text)));
+    }
+
+    @Override public void send(PlotMessage plotMessage, PlotPlayer player) {
+        StringBuilder built = new StringBuilder();
+        for (StringBuilder sb : plotMessage.$(this)) {
+            built.append(sb);
+        }
+        player.sendMessage(built.toString());
+    }
+
+    @Override public void suggest(PlotMessage plotMessage, String command) {
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java
new file mode 100644
index 000000000..30d9b1230
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java
@@ -0,0 +1,64 @@
+package com.github.intellectualsites.plotsquared.plot.object.comment;
+
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+
+import java.util.List;
+
+public abstract class CommentInbox {
+
+    @Override public abstract String toString();
+
+    public boolean canRead(Plot plot, PlotPlayer player) {
+        if (Permissions.hasPermission(player, "plots.inbox.read." + toString(), true)) {
+            if (plot.isOwner(player.getUUID()) || Permissions
+                .hasPermission(player, "plots.inbox.read." + toString() + ".other", true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean canWrite(Plot plot, PlotPlayer player) {
+        if (plot == null) {
+            return Permissions.hasPermission(player, "plots.inbox.write." + toString(), true);
+        }
+        return Permissions.hasPermission(player, "plots.inbox.write." + toString(), true) && (
+            plot.isOwner(player.getUUID()) || Permissions
+                .hasPermission(player, "plots.inbox.write." + toString() + ".other", true));
+    }
+
+    public boolean canModify(Plot plot, PlotPlayer player) {
+        if (Permissions.hasPermission(player, "plots.inbox.modify." + toString(), true)) {
+            if (plot.isOwner(player.getUUID()) || Permissions
+                .hasPermission(player, "plots.inbox.modify." + toString() + ".other", true)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * <br>
+     * The `whenDone` parameter should be executed when it's done fetching the comments.
+     * The value should be set to List of comments
+     *
+     * @param plot
+     * @param whenDone
+     * @return
+     */
+    public abstract boolean getComments(Plot plot, RunnableVal<List<PlotComment>> whenDone);
+
+    public abstract boolean addComment(Plot plot, PlotComment comment);
+
+    public void removeComment(Plot plot, PlotComment comment) {
+        DBFunc.removeComment(plot, comment);
+    }
+
+    public void clearInbox(Plot plot) {
+        DBFunc.clearInbox(plot, toString());
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
new file mode 100644
index 000000000..d3a80013e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
@@ -0,0 +1,51 @@
+package com.github.intellectualsites.plotsquared.plot.object.comment;
+
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class InboxOwner extends CommentInbox {
+
+    @Override
+    public boolean getComments(final Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
+        Optional<ArrayList<PlotComment>> comments = plot.getSettings().getComments(toString());
+        if (comments.isPresent()) {
+            whenDone.value = comments.get();
+            TaskManager.runTask(whenDone);
+            return true;
+        }
+        DBFunc.getComments(plot, toString(), new RunnableVal<List<PlotComment>>() {
+            @Override public void run(List<PlotComment> value) {
+                whenDone.value = value;
+                if (value != null) {
+                    for (PlotComment comment : value) {
+                        plot.getSettings().addComment(comment);
+                    }
+                } else {
+                    plot.getSettings().setComments(new ArrayList<PlotComment>());
+                }
+                TaskManager.runTask(whenDone);
+            }
+        });
+        return true;
+    }
+
+    @Override public boolean addComment(Plot plot, PlotComment comment) {
+        if (plot.owner == null) {
+            return false;
+        }
+        plot.getSettings().addComment(comment);
+        DBFunc.setComment(plot, comment);
+        return true;
+    }
+
+    @Override public String toString() {
+        return "owner";
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
new file mode 100644
index 000000000..a14954e28
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
@@ -0,0 +1,47 @@
+package com.github.intellectualsites.plotsquared.plot.object.comment;
+
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class InboxPublic extends CommentInbox {
+
+    @Override
+    public boolean getComments(final Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
+        Optional<ArrayList<PlotComment>> comments = plot.getSettings().getComments(toString());
+        if (comments.isPresent()) {
+            whenDone.value = comments.get();
+            TaskManager.runTask(whenDone);
+            return true;
+        }
+        DBFunc.getComments(plot, toString(), new RunnableVal<List<PlotComment>>() {
+            @Override public void run(List<PlotComment> value) {
+                whenDone.value = value;
+                if (value != null) {
+                    for (PlotComment comment : value) {
+                        plot.getSettings().addComment(comment);
+                    }
+                }
+                TaskManager.runTask(whenDone);
+            }
+        });
+        return true;
+    }
+
+    @Override public boolean addComment(Plot plot, PlotComment comment) {
+        plot.getSettings().addComment(comment);
+        DBFunc.setComment(plot, comment);
+        return true;
+    }
+
+    @Override public String toString() {
+        return "public";
+    }
+
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
new file mode 100644
index 000000000..7c626d8e1
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
@@ -0,0 +1,34 @@
+package com.github.intellectualsites.plotsquared.plot.object.comment;
+
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.util.List;
+
+public class InboxReport extends CommentInbox {
+
+    @Override public boolean getComments(Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
+        DBFunc.getComments(null, toString(), new RunnableVal<List<PlotComment>>() {
+            @Override public void run(List<PlotComment> value) {
+                whenDone.value = value;
+                TaskManager.runTask(whenDone);
+            }
+        });
+        return true;
+    }
+
+    @Override public boolean addComment(Plot plot, PlotComment comment) {
+        if (plot.owner == null) {
+            return false;
+        }
+        DBFunc.setComment(plot, comment);
+        return true;
+    }
+
+    @Override public String toString() {
+        return "report";
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java
new file mode 100644
index 000000000..ada90457f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java
@@ -0,0 +1,22 @@
+package com.github.intellectualsites.plotsquared.plot.object.comment;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+
+public class PlotComment {
+    public final String comment;
+    public final String inbox;
+    public final String senderName;
+    public final PlotId id;
+    public final String world;
+    public final long timestamp;
+
+    public PlotComment(String world, PlotId id, String comment, String senderName, String inbox,
+        long timestamp) {
+        this.world = world;
+        this.id = id;
+        this.comment = comment;
+        this.senderName = senderName;
+        this.inbox = inbox;
+        this.timestamp = timestamp;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java
new file mode 100644
index 000000000..f558b5243
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java
@@ -0,0 +1,307 @@
+package com.github.intellectualsites.plotsquared.plot.object.schematic;
+
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+public enum ItemType {
+    AIR("air", 0), STONE("stone", 1), GRANITE("stone", 1, 1), POLISHED_GRANITE("stone", 1,
+        2), DIORITE("stone", 1, 3), POLISHED_DIORITE("stone", 1, 4), ANDESITE("stone", 1,
+        5), POLISHED_ANDESITE("stone", 1, 6), GRASS("grass", 2), DIRT("dirt", 3), COARSE_DIRT(
+        "dirt", 3, 1), PODZOL("dirt", 3, 2), COBBLESTONE("cobblestone", 4), OAK_WOOD_PLANK("planks",
+        5), SPRUCE_WOOD_PLANK("planks", 5, 1), BIRCH_WOOD_PLANK("planks", 5, 2), JUNGLE_WOOD_PLANK(
+        "planks", 5, 3), ACACIA_WOOD_PLANK("planks", 5, 4), DARK_OAK_WOOD_PLANK("planks", 5,
+        5), OAK_SAPLING("sapling", 6), SPRUCE_SAPLING("sapling", 6, 1), BIRCH_SAPLING("sapling", 6,
+        2), JUNGLE_SAPLING("sapling", 6, 3), ACACIA_SAPLING("sapling", 6, 4), DARK_OAK_SAPLING(
+        "sapling", 6, 5), BEDROCK("bedrock", 7), FLOWING_WATER("flowing_water", 8), STILL_WATER(
+        "water", 9), FLOWING_LAVA("flowing_lava", 10), STILL_LAVA("lava", 11), SAND("sand",
+        12), RED_SAND("sand", 12, 1), GRAVEL("gravel", 13), GOLD_ORE("gold_ore", 14), IRON_ORE(
+        "iron_ore", 15), COAL_ORE("coal_ore", 16), OAK_WOOD("log", 17), SPRUCE_WOOD("log", 17,
+        1), BIRCH_WOOD("log", 17, 2), JUNGLE_WOOD("log", 17, 3), OAK_LEAVES("leaves",
+        18), SPRUCE_LEAVES("leaves", 18, 1), BIRCH_LEAVES("leaves", 18, 2), JUNGLE_LEAVES("leaves",
+        18, 3), SPONGE("sponge", 19), WET_SPONGE("sponge", 19, 1), GLASS("glass",
+        20), LAPIS_LAZULI_ORE("lapis_ore", 21), LAPIS_LAZULI_BLOCK("lapis_block", 22), DISPENSER(
+        "dispenser", 23), SANDSTONE("sandstone", 24), CHISELED_SANDSTONE("sandstone", 24,
+        1), SMOOTH_SANDSTONE("sandstone", 24, 2), NOTE_BLOCK("noteblock", 25), BED("bed",
+        26), POWERED_RAIL("golden_rail", 27), DETECTOR_RAIL("detector_rail", 28), STICKY_PISTON(
+        "sticky_piston", 29), COBWEB("web", 30), DEAD_SHRUB("tallgrass", 31), TALLGRASS("tallgrass",
+        31, 1), FERN("tallgrass", 31, 2), DEAD_SHRUB1("deadbush", 32), PISTON("piston",
+        33), PISTON_HEAD("piston_head", 34), WHITE_WOOL("wool", 35), ORANGE_WOOL("wool", 35,
+        1), MAGENTA_WOOL("wool", 35, 2), LIGHT_BLUE_WOOL("wool", 35, 3), YELLOW_WOOL("wool", 35,
+        4), LIME_WOOL("wool", 35, 5), PINK_WOOL("wool", 35, 6), GRAY_WOOL("wool", 35,
+        7), LIGHT_GRAY_WOOL("wool", 35, 8), CYAN_WOOL("wool", 35, 9), PURPLE_WOOL("wool", 35,
+        10), BLUE_WOOL("wool", 35, 11), BROWN_WOOL("wool", 35, 12), GREEN_WOOL("wool", 35,
+        13), RED_WOOL("wool", 35, 14), BLACK_WOOL("wool", 35, 15), DANDELION("yellow_flower",
+        37), POPPY("red_flower", 38), BLUE_ORCHID("red_flower", 38, 1), ALLIUM("red_flower", 38,
+        2), AZURE_BLUET("red_flower", 38, 3), RED_TULIP("red_flower", 38, 4), ORANGE_TULIP(
+        "red_flower", 38, 5), WHITE_TULIP("red_flower", 38, 6), PINK_TULIP("red_flower", 38,
+        7), OXEYE_DAISY("red_flower", 38, 8), BROWN_MUSHROOM("brown_mushroom", 39), RED_MUSHROOM(
+        "red_mushroom", 40), GOLD_BLOCK("gold_block", 41), IRON_BLOCK("iron_block",
+        42), DOUBLE_STONE_SLAB("double_stone_slab", 43), DOUBLE_SANDSTONE_SLAB("double_stone_slab",
+        43, 1), DOUBLE_WOODEN_SLAB("double_stone_slab", 43, 2), DOUBLE_COBBLESTONE_SLAB(
+        "double_stone_slab", 43, 3), DOUBLE_BRICK_SLAB("double_stone_slab", 43,
+        4), DOUBLE_STONE_BRICK_SLAB("double_stone_slab", 43, 5), DOUBLE_NETHER_BRICK_SLAB(
+        "double_stone_slab", 43, 6), DOUBLE_QUARTZ_SLAB("double_stone_slab", 43, 7), STONE_SLAB(
+        "stone_slab", 44), SANDSTONE_SLAB("stone_slab", 44, 1), WOODEN_SLAB("stone_slab", 44,
+        2), COBBLESTONE_SLAB("stone_slab", 44, 3), BRICK_SLAB("stone_slab", 44,
+        4), STONE_BRICK_SLAB("stone_slab", 44, 5), NETHER_BRICK_SLAB("stone_slab", 44,
+        6), QUARTZ_SLAB("stone_slab", 44, 7), BRICKS("brick_block", 45), TNT("tnt", 46), BOOKSHELF(
+        "bookshelf", 47), MOSS_STONE("mossy_cobblestone", 48), OBSIDIAN("obsidian", 49), TORCH(
+        "torch", 50), FIRE("fire", 51), MONSTER_SPAWNER("mob_spawner", 52), OAK_WOOD_STAIRS(
+        "oak_stairs", 53), CHEST("chest", 54), REDSTONE_WIRE("redstone_wire", 55), DIAMOND_ORE(
+        "diamond_ore", 56), DIAMOND_BLOCK("diamond_block", 57), CRAFTING_TABLE("crafting_table",
+        58), WHEAT_CROPS("wheat", 59), FARMLAND("farmland", 60), FURNACE("furnace",
+        61), BURNING_FURNACE("lit_furnace", 62), STANDING_SIGN_BLOCK("standing_sign",
+        63), OAK_DOOR_BLOCK("wooden_door", 64), LADDER("ladder", 65), RAIL("rail",
+        66), COBBLESTONE_STAIRS("stone_stairs", 67), WALL_MOUNTED_SIGN_BLOCK("wall_sign",
+        68), LEVER("lever", 69), STONE_PRESSURE_PLATE("stone_pressure_plate", 70), IRON_DOOR_BLOCK(
+        "iron_door", 71), WOODEN_PRESSURE_PLATE("wooden_pressure_plate", 72), REDSTONE_ORE(
+        "redstone_ore", 73), GLOWING_REDSTONE_ORE("lit_redstone_ore", 74), REDSTONE_TORCH_OFF(
+        "unlit_redstone_torch", 75), REDSTONE_TORCH_ON("redstone_torch", 76), STONE_BUTTON(
+        "stone_button", 77), SNOW("snow_layer", 78), ICE("ice", 79), SNOW_BLOCK("snow", 80), CACTUS(
+        "cactus", 81), CLAY("clay", 82), SUGAR_CANES("reeds", 83), JUKEBOX("jukebox",
+        84), OAK_FENCE("fence", 85), PUMPKIN("pumpkin", 86), NETHERRACK("netherrack",
+        87), SOUL_SAND("soul_sand", 88), GLOWSTONE("glowstone", 89), NETHER_PORTAL("portal",
+        90), JACK_OLANTERN("lit_pumpkin", 91), CAKE_BLOCK("cake", 92), REDSTONE_REPEATER_BLOCK_OFF(
+        "unpowered_repeater", 93), REDSTONE_REPEATER_BLOCK_ON("powered_repeater",
+        94), WHITE_STAINED_GLASS("stained_glass", 95), ORANGE_STAINED_GLASS("stained_glass", 95,
+        1), MAGENTA_STAINED_GLASS("stained_glass", 95, 2), LIGHT_BLUE_STAINED_GLASS("stained_glass",
+        95, 3), YELLOW_STAINED_GLASS("stained_glass", 95, 4), LIME_STAINED_GLASS("stained_glass",
+        95, 5), PINK_STAINED_GLASS("stained_glass", 95, 6), GRAY_STAINED_GLASS("stained_glass", 95,
+        7), LIGHT_GRAY_STAINED_GLASS("stained_glass", 95, 8), CYAN_STAINED_GLASS("stained_glass",
+        95, 9), PURPLE_STAINED_GLASS("stained_glass", 95, 10), BLUE_STAINED_GLASS("stained_glass",
+        95, 11), BROWN_STAINED_GLASS("stained_glass", 95, 12), GREEN_STAINED_GLASS("stained_glass",
+        95, 13), RED_STAINED_GLASS("stained_glass", 95, 14), BLACK_STAINED_GLASS("stained_glass",
+        95, 15), WOODEN_TRAPDOOR("trapdoor", 96), STONE_MONSTER_EGG("monster_egg",
+        97), COBBLESTONE_MONSTER_EGG("monster_egg", 97, 1), STONE_BRICK_MONSTER_EGG("monster_egg",
+        97, 2), MOSSY_STONE_BRICK_MONSTER_EGG("monster_egg", 97,
+        3), CRACKED_STONE_BRICK_MONSTER_EGG("monster_egg", 97, 4), CHISELED_STONE_BRICK_MONSTER_EGG(
+        "monster_egg", 97, 5), STONE_BRICKS("stonebrick", 98), MOSSY_STONE_BRICKS("stonebrick", 98,
+        1), CRACKED_STONE_BRICKS("stonebrick", 98, 2), CHISELED_STONE_BRICKS("stonebrick", 98,
+        3), RED_MUSHROOM_CAP("stonebrick", 99), BROWN_MUSHROOM_CAP("stonebrick", 100), IRON_BARS(
+        "iron_bars", 101), GLASS_PANE("glass_pane", 102), MELON_BLOCK("melon_block",
+        103), PUMPKIN_STEM("pumpkin_stem", 104), MELON_STEM("melon_stem", 105), VINES("vine",
+        106), OAK_FENCE_GATE("fence_gate", 107), BRICK_STAIRS("brick_stairs",
+        108), STONE_BRICK_STAIRS("stone_brick_stairs", 109), MYCELIUM("mycelium", 110), LILY_PAD(
+        "waterlily", 111), NETHER_BRICK("nether_brick", 112), NETHER_BRICK_FENCE(
+        "nether_brick_fence", 113), NETHER_BRICK_STAIRS("nether_brick_stairs", 114), NETHER_WART(
+        "nether_wart", 115), ENCHANTMENT_TABLE("enchanting_table", 116), BREWING_STAND(
+        "brewing_stand", 117), CAULDRON("cauldron", 118), END_PORTAL("end_portal",
+        119), END_PORTAL_FRAME("end_portal_frame", 120), END_STONE("end_stone", 121), DRAGON_EGG(
+        "dragon_egg", 122), REDSTONE_LAMP_INACTIVE("redstone_lamp", 123), REDSTONE_LAMP_ACTIVE(
+        "lit_redstone_lamp", 124), DOUBLE_OAK_WOOD_SLAB("double_wooden_slab",
+        125), DOUBLE_SPRUCE_WOOD_SLAB("double_wooden_slab", 125, 1), DOUBLE_BIRCH_WOOD_SLAB(
+        "double_wooden_slab", 125, 2), DOUBLE_JUNGLE_WOOD_SLAB("double_wooden_slab", 125,
+        3), DOUBLE_ACACIA_WOOD_SLAB("double_wooden_slab", 125, 4), DOUBLE_DARK_OAK_WOOD_SLAB(
+        "double_wooden_slab", 125, 5), OAK_WOOD_SLAB("wooden_slab", 126), SPRUCE_WOOD_SLAB(
+        "wooden_slab", 126, 1), BIRCH_WOOD_SLAB("wooden_slab", 126, 2), JUNGLE_WOOD_SLAB(
+        "wooden_slab", 126, 3), ACACIA_WOOD_SLAB("wooden_slab", 126, 4), DARK_OAK_WOOD_SLAB(
+        "wooden_slab", 126, 5), COCOA("cocoa", 127), SANDSTONE_STAIRS("sandstone_stairs",
+        128), EMERALD_ORE("emerald_ore", 129), ENDER_CHEST("ender_chest", 130), TRIPWIRE_HOOK(
+        "tripwire_hook", 131), TRIPWIRE("tripwire_hook", 132), EMERALD_BLOCK("emerald_block",
+        133), SPRUCE_WOOD_STAIRS("spruce_stairs", 134), BIRCH_WOOD_STAIRS("birch_stairs",
+        135), JUNGLE_WOOD_STAIRS("jungle_stairs", 136), COMMAND_BLOCK("command_block", 137), BEACON(
+        "beacon", 138), COBBLESTONE_WALL("cobblestone_wall", 139), MOSSY_COBBLESTONE_WALL(
+        "cobblestone_wall", 139, 1), FLOWER_POT("flower_pot", 140), CARROTS("carrots",
+        141), POTATOES("potatoes", 142), WOODEN_BUTTON("wooden_button", 143), MOB_HEAD("skull",
+        144), ANVIL("anvil", 145), TRAPPED_CHEST("trapped_chest",
+        146), WEIGHTED_PRESSURE_PLATE_LIGHT("light_weighted_pressure_plate",
+        147), WEIGHTED_PRESSURE_PLATE_HEAVY("heavy_weighted_pressure_plate",
+        148), REDSTONE_COMPARATOR_INACTIVE("unpowered_comparator", 149), REDSTONE_COMPARATOR_ACTIVE(
+        "powered_comparator", 150), DAYLIGHT_SENSOR("daylight_detector", 151), REDSTONE_BLOCK(
+        "redstone_block", 152), NETHER_QUARTZ_ORE("quartz_ore", 153), HOPPER("hopper",
+        154), QUARTZ_BLOCK("quartz_block", 155), CHISELED_QUARTZ_BLOCK("quartz_block", 155,
+        1), PILLAR_QUARTZ_BLOCK("quartz_block", 155, 2), QUARTZ_STAIRS("quartz_stairs",
+        156), ACTIVATOR_RAIL("activator_rail", 157), DROPPER("dropper", 158), WHITE_STAINED_CLAY(
+        "stained_hardened_clay", 159), ORANGE_STAINED_CLAY("stained_hardened_clay", 159,
+        1), MAGENTA_STAINED_CLAY("stained_hardened_clay", 159, 2), LIGHT_BLUE_STAINED_CLAY(
+        "stained_hardened_clay", 159, 3), YELLOW_STAINED_CLAY("stained_hardened_clay", 159,
+        4), LIME_STAINED_CLAY("stained_hardened_clay", 159, 5), PINK_STAINED_CLAY(
+        "stained_hardened_clay", 159, 6), GRAY_STAINED_CLAY("stained_hardened_clay", 159,
+        7), LIGHT_GRAY_STAINED_CLAY("stained_hardened_clay", 159, 8), CYAN_STAINED_CLAY(
+        "stained_hardened_clay", 159, 9), PURPLE_STAINED_CLAY("stained_hardened_clay", 159,
+        10), BLUE_STAINED_CLAY("stained_hardened_clay", 159, 11), BROWN_STAINED_CLAY(
+        "stained_hardened_clay", 159, 12), GREEN_STAINED_CLAY("stained_hardened_clay", 159,
+        13), RED_STAINED_CLAY("stained_hardened_clay", 159, 14), BLACK_STAINED_CLAY(
+        "stained_hardened_clay", 159, 15), WHITE_STAINED_GLASS_PANE("stained_glass_pane",
+        160), ORANGE_STAINED_GLASS_PANE("stained_glass_pane", 160, 1), MAGENTA_STAINED_GLASS_PANE(
+        "stained_glass_pane", 160, 2), LIGHT_BLUE_STAINED_GLASS_PANE("stained_glass_pane", 160,
+        3), YELLOW_STAINED_GLASS_PANE("stained_glass_pane", 160, 4), LIME_STAINED_GLASS_PANE(
+        "stained_glass_pane", 160, 5), PINK_STAINED_GLASS_PANE("stained_glass_pane", 160,
+        6), GRAY_STAINED_GLASS_PANE("stained_glass_pane", 160, 7), LIGHT_GRAY_STAINED_GLASS_PANE(
+        "stained_glass_pane", 160, 8), CYAN_STAINED_GLASS_PANE("stained_glass_pane", 160,
+        9), PURPLE_STAINED_GLASS_PANE("stained_glass_pane", 160, 10), BLUE_STAINED_GLASS_PANE(
+        "stained_glass_pane", 160, 11), BROWN_STAINED_GLASS_PANE("stained_glass_pane", 160,
+        12), GREEN_STAINED_GLASS_PANE("stained_glass_pane", 160, 13), RED_STAINED_GLASS_PANE(
+        "stained_glass_pane", 160, 14), BLACK_STAINED_GLASS_PANE("stained_glass_pane", 160,
+        15), ACACIA_LEAVES("leaves2", 161), DARK_OAK_LEAVES("leaves2", 161, 1), ACACIA_WOOD("log2",
+        162), DARK_OAK_WOOD("log2", 162, 1), ACACIA_WOOD_STAIRS("acacia_stairs",
+        163), DARK_OAK_WOOD_STAIRS("dark_oak_stairs", 164), SLIME_BLOCK("slime", 165), BARRIER(
+        "barrier", 166), IRON_TRAPDOOR("iron_trapdoor", 167), PRISMARINE("prismarine",
+        168), PRISMARINE_BRICKS("prismarine", 168, 1), DARK_PRISMARINE("prismarine", 168,
+        2), SEA_LANTERN("sea_lantern", 169), HAY_BALE("hay_block", 170), WHITE_CARPET("carpet",
+        171), ORANGE_CARPET("carpet", 171, 1), MAGENTA_CARPET("carpet", 171, 2), LIGHT_BLUE_CARPET(
+        "carpet", 171, 3), YELLOW_CARPET("carpet", 171, 4), LIME_CARPET("carpet", 171,
+        5), PINK_CARPET("carpet", 171, 6), GRAY_CARPET("carpet", 171, 7), LIGHT_GRAY_CARPET(
+        "carpet", 171, 8), CYAN_CARPET("carpet", 171, 9), PURPLE_CARPET("carpet", 171,
+        10), BLUE_CARPET("carpet", 171, 11), BROWN_CARPET("carpet", 171, 12), GREEN_CARPET("carpet",
+        171, 13), RED_CARPET("carpet", 171, 14), BLACK_CARPET("carpet", 171, 15), HARDENED_CLAY(
+        "hardened_clay", 172), BLOCK_OF_COAL("coal_block", 173), PACKED_ICE("packed_ice",
+        174), SUNFLOWER("double_plant", 175), LILAC("double_plant", 175, 1), DOUBLE_TALLGRASS(
+        "double_plant", 175, 2), LARGE_FERN("double_plant", 175, 3), ROSE_BUSH("double_plant", 175,
+        4), PEONY("double_plant", 175, 5), FREE_STANDING_BANNER("standing_banner",
+        176), WALL_MOUNTED_BANNER("wall_banner", 177), INVERTED_DAYLIGHT_SENSOR(
+        "daylight_detector_inverted", 178), RED_SANDSTONE("red_sandstone",
+        179), SMOOTH_RED_SANDSTONE("red_sandstone", 179, 1), CHISELED_RED_SANDSTONE("red_sandstone",
+        179, 2), RED_SANDSTONE_STAIRS("red_sandstone_stairs", 180), DOUBLE_RED_SANDSTONE_SLAB(
+        "stone_slab2", 181), RED_SANDSTONE_SLAB("double_stone_slab2", 182), SPRUCE_FENCE_GATE(
+        "spruce_fence_gate", 183), BIRCH_FENCE_GATE("birch_fence_gate", 184), JUNGLE_FENCE_GATE(
+        "jungle_fence_gate", 185), DARK_OAK_FENCE_GATE("dark_oak_fence_gate",
+        186), ACACIA_FENCE_GATE("acacia_fence_gate", 187), SPRUCE_FENCE("spruce_fence",
+        188), BIRCH_FENCE("birch_fence", 189), JUNGLE_FENCE("jungle_fence", 190), DARK_OAK_FENCE(
+        "dark_oak_fence", 191), ACACIA_FENCE("acacia_fence", 192), SPRUCE_DOOR_BLOCK("spruce_door",
+        193), BIRCH_DOOR_BLOCK("birch_door", 194), JUNGLE_DOOR_BLOCK("jungle_door",
+        195), ACACIA_DOOR_BLOCK("acacia_door", 196), DARK_OAK_DOOR_BLOCK("dark_oak_door",
+        197), IRON_SHOVEL("iron_shovel", 256), IRON_PICKAXE("iron_pickaxe", 257), IRON_AXE(
+        "iron_axe", 258), FLINT_AND_STEEL("flint_and_steel", 259), APPLE("apple", 260), BOW("bow",
+        261), ARROW("arrow", 262), COAL("coal", 263), CHARCOAL("coal", 263, 1), DIAMOND("diamond",
+        264), IRON_INGOT("iron_ingot", 265), GOLD_INGOT("gold_ingot", 266), IRON_SWORD("iron_sword",
+        267), WOODEN_SWORD("wooden_sword", 268), WOODEN_SHOVEL("wooden_shovel",
+        269), WOODEN_PICKAXE("wooden_pickaxe", 270), WOODEN_AXE("wooden_axe", 271), STONE_SWORD(
+        "stone_sword", 272), STONE_SHOVEL("stone_shovel", 273), STONE_PICKAXE("stone_pickaxe",
+        274), STONE_AXE("stone_axe", 275), DIAMOND_SWORD("diamond_sword", 276), DIAMOND_SHOVEL(
+        "diamond_shovel", 277), DIAMOND_PICKAXE("diamond_pickaxe", 278), DIAMOND_AXE("diamond_axe",
+        279), STICK("stick", 280), BOWL("bowl", 281), MUSHROOM_STEW("mushroom_stew",
+        282), GOLDEN_SWORD("golden_sword", 283), GOLDEN_SHOVEL("golden_shovel",
+        284), GOLDEN_PICKAXE("golden_pickaxe", 285), GOLDEN_AXE("golden_axe", 286), STRING("string",
+        287), FEATHER("feather", 288), GUNPOWDER("gunpowder", 289), WOODEN_HOE("wooden_hoe",
+        290), STONE_HOE("stone_hoe", 291), IRON_HOE("iron_hoe", 292), DIAMOND_HOE("diamond_hoe",
+        293), GOLDEN_HOE("golden_hoe", 294), WHEAT_SEEDS("wheat_seeds", 295), WHEAT("wheat",
+        296), BREAD("bread", 297), LEATHER_HELMET("leather_helmet", 298), LEATHER_TUNIC(
+        "leather_chestplate", 299), LEATHER_PANTS("leather_leggings", 300), LEATHER_BOOTS(
+        "leather_boots", 301), CHAINMAIL_HELMET("chainmail_helmet", 302), CHAINMAIL_CHESTPLATE(
+        "chainmail_chestplate", 303), CHAINMAIL_LEGGINGS("chainmail_leggings",
+        304), CHAINMAIL_BOOTS("chainmail_boots", 305), IRON_HELMET("iron_helmet",
+        306), IRON_CHESTPLATE("iron_chestplate", 307), IRON_LEGGINGS("iron_leggings",
+        308), IRON_BOOTS("iron_boots", 309), DIAMOND_HELMET("diamond_helmet",
+        310), DIAMOND_CHESTPLATE("diamond_chestplate", 311), DIAMOND_LEGGINGS("diamond_leggings",
+        312), DIAMOND_BOOTS("diamond_boots", 313), GOLDEN_HELMET("golden_helmet",
+        314), GOLDEN_CHESTPLATE("golden_chestplate", 315), GOLDEN_LEGGINGS("golden_leggings",
+        316), GOLDEN_BOOTS("golden_boots", 317), FLINT("flint_and_steel", 318), RAW_PORKCHOP(
+        "porkchop", 319), COOKED_PORKCHOP("cooked_porkchop", 320), PAINTING("painting",
+        321), GOLDEN_APPLE("golden_apple", 322), ENCHANTED_GOLDEN_APPLE("golden_apple", 322,
+        1), SIGN("sign", 323), OAK_DOOR("wooden_door", 324), BUCKET("bucket", 325), WATER_BUCKET(
+        "water_bucket", 326), LAVA_BUCKET("lava_bucket", 327), MINECART("minecart", 328), SADDLE(
+        "saddle", 329), IRON_DOOR("iron_door", 330), REDSTONE("redstone", 331), SNOWBALL("snowball",
+        332), BOAT("boat", 333), LEATHER("leather", 334), MILK_BUCKET("milk_bucket", 335), BRICK(
+        "brick", 336), CLAY1("clay_ball", 337), SUGAR_CANES1("reeds", 338), PAPER("paper",
+        339), BOOK("book", 340), SLIMEBALL("slime_ball", 341), MINECART_WITH_CHEST("chest_minecart",
+        342), MINECART_WITH_FURNACE("furnace_minecart", 343), EGG("egg", 344), COMPASS("compass",
+        345), FISHING_ROD("fishing_rod", 346), CLOCK("clock", 347), GLOWSTONE_DUST("glowstone_dust",
+        348), RAW_FISH("fish", 349), RAW_SALMON("fish", 349, 1), CLOWNFISH("fish", 349,
+        2), PUFFERFISH("fish", 349, 3), COOKED_FISH("cooked_fish", 350), COOKED_SALMON(
+        "cooked_fish", 350, 1), INK_SACK("dye", 351), ROSE_RED("dye", 351, 1), CACTUS_GREEN("dye",
+        351, 2), COCO_BEANS("dye", 351, 3), LAPIS_LAZULI("dye", 351, 4), PURPLE_DYE("dye", 351,
+        5), CYAN_DYE("dye", 351, 6), LIGHT_GRAY_DYE("dye", 351, 7), GRAY_DYE("dye", 351,
+        8), PINK_DYE("dye", 351, 9), LIME_DYE("dye", 351, 10), DANDELION_YELLOW("dye", 351,
+        11), LIGHT_BLUE_DYE("dye", 351, 12), MAGENTA_DYE("dye", 351, 13), ORANGE_DYE("dye", 351,
+        14), BONE_MEAL("dye", 351, 15), BONE("bone", 352), SUGAR("sugar", 353), CAKE("cake",
+        354), BED1("bed", 355), REDSTONE_REPEATER("repeater", 356), COOKIE("cookie", 357), MAP(
+        "filled_map", 358), SHEARS("shears", 359), MELON("melon", 360), PUMPKIN_SEEDS(
+        "pumpkin_seeds", 361), MELON_SEEDS("melon_seeds", 362), RAW_BEEF("beef", 363), STEAK(
+        "cooked_beef", 364), RAW_CHICKEN("chicken", 365), COOKED_CHICKEN("cooked_chicken",
+        366), ROTTEN_FLESH("rotten_flesh", 367), ENDER_PEARL("ender_pearl", 368), BLAZE_ROD(
+        "blaze_rod", 369), GHAST_TEAR("ghast_tear", 370), GOLD_NUGGET("gold_nugget",
+        371), NETHER_WART1("nether_wart", 372), POTION("potion", 373), GLASS_BOTTLE("glass_bottle",
+        374), SPIDER_EYE("spider_eye", 375), FERMENTED_SPIDER_EYE("fermented_spider_eye",
+        376), BLAZE_POWDER("blaze_powder", 377), MAGMA_CREAM("magma_cream", 378), BREWING_STAND1(
+        "brewing_stand", 379), CAULDRON1("cauldron", 380), EYE_OF_ENDER("ender_eye",
+        381), GLISTERING_MELON("speckled_melon", 382), SPAWN_CREEPER("spawn_egg", 383,
+        50), SPAWN_SKELETON("spawn_egg", 383, 51), SPAWN_SPIDER("spawn_egg", 383, 52), SPAWN_ZOMBIE(
+        "spawn_egg", 383, 54), SPAWN_SLIME("spawn_egg", 383, 55), SPAWN_GHAST("spawn_egg", 383,
+        56), SPAWN_PIGMAN("spawn_egg", 383, 57), SPAWN_ENDERMAN("spawn_egg", 383,
+        58), SPAWN_CAVE_SPIDER("spawn_egg", 383, 59), SPAWN_SILVERFISH("spawn_egg", 383,
+        60), SPAWN_BLAZE("spawn_egg", 383, 61), SPAWN_MAGMA_CUBE("spawn_egg", 383, 62), SPAWN_BAT(
+        "spawn_egg", 383, 65), SPAWN_WITCH("spawn_egg", 383, 66), SPAWN_ENDERMITE("spawn_egg", 383,
+        67), SPAWN_GUARDIAN("spawn_egg", 383, 68), SPAWN_PIG("spawn_egg", 383, 90), SPAWN_SHEEP(
+        "spawn_egg", 383, 91), SPAWN_COW("spawn_egg", 383, 92), SPAWN_CHICKEN("spawn_egg", 383,
+        93), SPAWN_SQUID("spawn_egg", 383, 94), SPAWN_WOLF("spawn_egg", 383, 95), SPAWN_MOOSHROOM(
+        "spawn_egg", 383, 96), SPAWN_OCELOT("spawn_egg", 383, 98), SPAWN_HORSE("spawn_egg", 383,
+        100), SPAWN_RABBIT("spawn_egg", 383, 101), SPAWN_VILLAGER("spawn_egg", 383,
+        120), BOTTLE_O_ENCHANTING("experience_bottle", 384), FIRE_CHARGE("fire_charge",
+        385), BOOK_AND_QUILL("writable_book", 386), WRITTEN_BOOK("written_book", 387), EMERALD(
+        "emerald", 388), ITEM_FRAME("item_frame", 389), FLOWER_POT1("flower_pot", 390), CARROT(
+        "carrot", 391), POTATO("potato", 392), BAKED_POTATO("baked_potato", 393), POISONOUS_POTATO(
+        "poisonous_potato", 394), EMPTY_MAP("map", 395), GOLDEN_CARROT("golden_carrot",
+        396), MOB_HEAD_SKELETON("skull", 397), MOB_HEAD_WITHER_SKELETON("skull", 397,
+        1), MOB_HEAD_ZOMBIE("skull", 397, 2), MOB_HEAD_HUMAN("skull", 397, 3), MOB_HEAD_CREEPER(
+        "skull", 397, 4), CARROT_ON_A_STICK("carrot_on_a_stick", 398), NETHER_STAR("nether_star",
+        399), PUMPKIN_PIE("pumpkin_pie", 400), FIREWORK_ROCKET("fireworks", 401), FIREWORK_STAR(
+        "firework_charge", 402), ENCHANTED_BOOK("enchanted_book", 403), REDSTONE_COMPARATOR(
+        "comparator", 404), NETHER_BRICK1("netherbrick", 405), NETHER_QUARTZ("quartz",
+        406), MINECART_WITH_TNT("tnt_minecart", 407), MINECART_WITH_HOPPER("hopper_minecart",
+        408), PRISMARINE_SHARD("prismarine_shard", 409), PRISMARINE_CRYSTALS("prismarine_crystals",
+        410), RAW_RABBIT("rabbit", 411), COOKED_RABBIT("cooked_rabbit", 412), RABBIT_STEW(
+        "rabbit_stew", 413), RABBITS_FOOT("rabbit_foot", 414), RABBIT_HIDE("rabbit_hide",
+        415), ARMOR_STAND("armor_stand", 416), IRON_HORSE_ARMOR("iron_horse_armor",
+        417), GOLDEN_HORSE_ARMOR("golden_horse_armor", 418), DIAMOND_HORSE_ARMOR(
+        "diamond_horse_armor", 419), LEAD("lead", 420), NAME_TAG("name_tag",
+        421), MINECART_WITH_COMMAND_BLOCK("command_block_minecart", 422), RAW_MUTTON("mutton",
+        423), COOKED_MUTTON("cooked_mutton", 424), BANNER("banner", 425), SPRUCE_DOOR("spruce_door",
+        427), BIRCH_DOOR("birch_door", 428), JUNGLE_DOOR("jungle_door", 429), ACACIA_DOOR(
+        "acacia_door", 430), DARK_OAK_DOOR("dark_oak_door", 431), DISC_13("record_13",
+        2256), CAT_DISC("record_cat", 2257), BLOCKS_DISC("record_blocks", 2258), CHIRP_DISC(
+        "record_chirp", 2259), FAR_DISC("record_far", 2260), MALL_DISC("record_mall",
+        2261), MELLOHI_DISC("record_mellohi", 2262), STAL_DISC("record_stal", 2263), STRAD_DISC(
+        "record_strad", 2264), WARD_DISC("record_ward", 2265), DISC_11("record_11",
+        2266), WAIT_DISC("record_wait", 2267), END_ROD("end_rod", 198), CHORUS_PLANT("chorus_plant",
+        199), CHORUS_FLOWER("chorus_flower", 200), PURPUR_BLOCK("purpur_block", 201), PURPUR_PILLAR(
+        "purpur_pillar", 202), PURPUR_STAIRS("purpur_stairs", 203), PURPUR_DOUBLE_SLAB(
+        "purpur_double_slab", 204), PURPUR_SLAB("purpur_slab", 205), END_BRICKS("end_bricks",
+        206), BEETROOTS("beetroots", 207), GRASS_PATH("grass_path", 208), END_GATEWAY("end_gateway",
+        209), REPEATING_COMMAND_BLOCK("repeating_command_block", 210), CHAIN_COMMAND_BLOCK(
+        "chain_command_block", 211), FROSTED_ICE("frosted_ice", 212), STRUCTURE_BLOCK(
+        "structure_block", 255);
+
+    private static final Map<String, Integer> ids = new HashMap<>();
+    private static final Map<String, Byte> datas = new HashMap<>();
+
+    static {
+        for (ItemType type : EnumSet.allOf(ItemType.class)) {
+            ids.put(type.name, type.id);
+            datas.put(type.name, type.data);
+        }
+    }
+
+    private final int id;
+    private final byte data;
+    private final String name;
+
+    ItemType(String name, int id) {
+        this.id = id;
+        this.data = 0;
+        this.name = name;
+    }
+
+    ItemType(String name, int id, int data) {
+        this.id = id;
+        this.data = (byte) data;
+        this.name = name;
+    }
+
+    public static int getId(String name) {
+        Integer value = ids.get(name);
+        if (value == null) {
+            return 0;
+        }
+        return value;
+    }
+
+    public static byte getData(String name) {
+        Byte value = datas.get(name);
+        if (value == null) {
+            return 0;
+        }
+        return value;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java
new file mode 100644
index 000000000..2b7e31295
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java
@@ -0,0 +1,22 @@
+package com.github.intellectualsites.plotsquared.plot.object.schematic;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+
+public class PlotItem {
+
+    public final int x;
+    public final int y;
+    public final int z;
+    // public final short[] id;
+    // public final byte[] data;
+    public final PlotBlock[] types;
+    public final byte[] amount;
+
+    public PlotItem(short x, short y, short z, PlotBlock[] types, byte[] amount) {
+        this.x = x;
+        this.y = y;
+        this.z = z;
+        this.types = types;
+        this.amount = amount;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
new file mode 100644
index 000000000..df20b3300
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
@@ -0,0 +1,47 @@
+package com.github.intellectualsites.plotsquared.plot.object.schematic;
+
+import com.sk89q.jnbt.NBTOutputStream;
+import com.sk89q.jnbt.Tag;
+import com.sk89q.worldedit.WorldEditException;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicWriter;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import lombok.Getter;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Schematic {
+    // Lossy but fast
+    @Getter private final BlockArrayClipboard clipboard;
+    @Getter private Map<String, Tag> flags = new HashMap<>();
+
+    public Schematic(BlockArrayClipboard clip) {
+        this.clipboard = clip;
+    }
+
+    public void setFlags(Map<String, Tag> flags) {
+        this.flags = flags == null ? new HashMap<>() : flags;
+    }
+
+    public boolean setBlock(BlockVector3 position, BaseBlock block) throws WorldEditException {
+        if (clipboard.getRegion().contains(position)) {
+            BlockVector3 v = position.subtract(clipboard.getRegion().getMinimumPoint());
+            clipboard.setBlock(v, block);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void save(File file) throws IOException {
+        SpongeSchematicWriter ssw =
+            new SpongeSchematicWriter(new NBTOutputStream(new FileOutputStream(file)));
+        ssw.write(clipboard);
+        ssw.close();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java
new file mode 100644
index 000000000..a19404da2
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java
@@ -0,0 +1,54 @@
+package com.github.intellectualsites.plotsquared.plot.object.schematic;
+
+import com.sk89q.worldedit.entity.BaseEntity;
+import com.sk89q.worldedit.entity.Entity;
+import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.util.Location;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * An implementation of {@link Entity} that stores a {@link BaseEntity} with it.
+ *
+ * <p>Calls to {@link #getState()} return a clone.</p>
+ */
+abstract class StoredEntity implements Entity {
+
+    private final Location location;
+    private final BaseEntity entity;
+
+    /**
+     * Create a new instance.
+     *
+     * @param location the location
+     * @param entity   the entity (which will be copied)
+     */
+    StoredEntity(Location location, BaseEntity entity) {
+        checkNotNull(location);
+        checkNotNull(entity);
+        this.location = location;
+        this.entity = new BaseEntity(entity);
+    }
+
+    /**
+     * Get the entity state. This is not a copy.
+     *
+     * @return the entity
+     */
+    BaseEntity getEntity() {
+        return entity;
+    }
+
+    @Override public BaseEntity getState() {
+        return new BaseEntity(entity);
+    }
+
+    @Override public Location getLocation() {
+        return location;
+    }
+
+    @Override public Extent getExtent() {
+        return location.getExtent();
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
new file mode 100644
index 000000000..900471193
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
@@ -0,0 +1,30 @@
+package com.github.intellectualsites.plotsquared.plot.object.stream;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class AbstractDelegateOutputStream extends OutputStream {
+
+    private final OutputStream parent;
+
+    public AbstractDelegateOutputStream(OutputStream os) {
+        this.parent = os;
+    }
+
+    @Override public void write(int b) throws IOException {
+        parent.write(b);
+    }
+
+    @Override public void write(byte[] b) throws IOException {
+        parent.write(b);
+    }
+
+    @Override public void flush() throws IOException {
+        parent.flush();
+    }
+
+    @Override public void close() throws IOException {
+        parent.close();
+    }
+}
+
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
new file mode 100644
index 000000000..f53465b2a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -0,0 +1,231 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap;
+
+import java.util.*;
+
+public class DefaultPlotAreaManager implements PlotAreaManager {
+
+    protected final PlotArea[] noPlotAreas = new PlotArea[0];
+    // All plot areas mapped by world
+    private final HashMap<String, PlotArea[]> plotAreaMap = new HashMap<>();
+    // All plot areas mapped by position
+    private final HashMap<String, QuadMap<PlotArea>> plotAreaGrid = new HashMap<>();
+    private final HashSet<Integer> plotAreaHashCheck = new HashSet<>();
+    // All plot areas
+    private PlotArea[] plotAreas = new PlotArea[0];
+    // Optimization if there are no hash collisions
+    private boolean plotAreaHasCollision = false;
+    private String[] worlds = new String[0];
+
+    @Override public PlotArea[] getAllPlotAreas() {
+        return plotAreas;
+    }
+
+    @Override public PlotArea getApplicablePlotArea(Location location) {
+        switch (this.plotAreas.length) {
+            case 0:
+                return null;
+            case 1:
+                return this.plotAreas[0];
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                String world = location.getWorld();
+                int hash = world.hashCode();
+                for (PlotArea area : this.plotAreas) {
+                    if (hash == area.worldhash) {
+                        if (area.contains(location.getX(), location.getZ()) && (
+                            !this.plotAreaHasCollision || world.equals(area.worldname))) {
+                            return area;
+                        }
+                    }
+                }
+                return null;
+            default:
+                PlotArea[] areas = this.plotAreaMap.get(location.getWorld());
+                if (areas == null) {
+                    return null;
+                }
+                int y;
+                int x;
+                switch (areas.length) {
+                    case 1:
+                        return areas[0];
+                    case 2:
+                    case 3:
+                    case 4:
+                    case 5:
+                    case 6:
+                    case 7:
+                    case 8:
+                        x = location.getX();
+                        y = location.getY();
+                        for (PlotArea area : areas) {
+                            if (area.contains(x, y)) {
+                                return area;
+                            }
+                        }
+                        return null;
+                    default:
+                        QuadMap<PlotArea> search = this.plotAreaGrid.get(location.getWorld());
+                        return search.get(location.getX(), location.getZ());
+                }
+        }
+    }
+
+    @Override public void addPlotArea(PlotArea plotArea) {
+        HashSet<PlotArea> localAreas =
+            new HashSet<>(Arrays.asList(getPlotAreas(plotArea.worldname, null)));
+        HashSet<PlotArea> globalAreas = new HashSet<>(Arrays.asList(plotAreas));
+        localAreas.add(plotArea);
+        globalAreas.add(plotArea);
+        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
+        this.plotAreaMap.put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
+        QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
+        if (map == null) {
+            map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
+                @Override public RegionWrapper getRegion(PlotArea value) {
+                    return value.getRegion();
+                }
+            };
+            this.plotAreaGrid.put(plotArea.worldname, map);
+        }
+        map.add(plotArea);
+    }
+
+    @Override public void removePlotArea(PlotArea area) {
+        ArrayList<PlotArea> globalAreas = new ArrayList<>(Arrays.asList(plotAreas));
+        globalAreas.remove(area);
+        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
+        if (globalAreas.isEmpty()) {
+            this.plotAreaMap.remove(area.worldname);
+            this.plotAreaGrid.remove(area.worldname);
+        } else {
+            this.plotAreaMap.put(area.worldname, globalAreas.toArray(new PlotArea[0]));
+            this.plotAreaGrid.get(area.worldname).remove(area);
+        }
+    }
+
+    @Override public PlotArea getPlotArea(String world, String id) {
+        PlotArea[] areas = this.plotAreaMap.get(world);
+        if (areas == null) {
+            return null;
+        }
+        if (areas.length == 1) {
+            return areas[0];
+        } else if (id == null) {
+            return null;
+        }
+        for (PlotArea area : areas) {
+            if (StringMan.isEqual(id, area.id)) {
+                return area;
+            }
+        }
+        return null;
+    }
+
+    @Override public PlotArea getPlotArea(Location location) {
+        switch (this.plotAreas.length) {
+            case 0:
+                return null;
+            case 1:
+                PlotArea pa = this.plotAreas[0];
+                return pa.contains(location) ? pa : null;
+            case 2:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                String world = location.getWorld();
+                int hash = world.hashCode();
+                for (PlotArea area : this.plotAreas) {
+                    if (hash == area.worldhash) {
+                        if (area.contains(location.getX(), location.getZ()) && (
+                            !this.plotAreaHasCollision || world.equals(area.worldname))) {
+                            return area;
+                        }
+                    }
+                }
+                return null;
+            default:
+                PlotArea[] areas = this.plotAreaMap.get(location.getWorld());
+                if (areas == null) {
+                    return null;
+                }
+                int x;
+                int y;
+                switch (areas.length) {
+                    case 0:
+                        PlotArea a = areas[0];
+                        return a.contains(location.getX(), location.getZ()) ? a : null;
+                    case 2:
+                    case 3:
+                    case 4:
+                    case 5:
+                    case 6:
+                    case 7:
+                    case 8:
+                        x = location.getX();
+                        y = location.getY();
+                        for (PlotArea area : areas) {
+                            if (area.contains(x, y)) {
+                                return area;
+                            }
+                        }
+                        return null;
+                    default:
+                        QuadMap<PlotArea> search = this.plotAreaGrid.get(location.getWorld());
+                        return search.get(location.getX(), location.getZ());
+                }
+        }
+    }
+
+    @Override public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
+        if (region == null) {
+            PlotArea[] areas = this.plotAreaMap.get(world);
+            if (areas == null) {
+                return noPlotAreas;
+            }
+            return areas;
+        }
+        QuadMap<PlotArea> areas = this.plotAreaGrid.get(world);
+        if (areas == null) {
+            return noPlotAreas;
+        } else {
+            Set<PlotArea> found = areas.get(region);
+            return found.toArray(new PlotArea[0]);
+        }
+    }
+
+    @Override public void addWorld(String worldName) {
+        if (!this.plotAreaHasCollision && !this.plotAreaHashCheck.add(worldName.hashCode())) {
+            this.plotAreaHasCollision = true;
+        }
+        Set<String> tmp = new LinkedHashSet<>();
+        Collections.addAll(tmp, worlds);
+        tmp.add(worldName);
+        worlds = tmp.toArray(new String[0]);
+    }
+
+    @Override public void removeWorld(String worldName) {
+        Set<String> tmp = new LinkedHashSet<>();
+        Collections.addAll(tmp, worlds);
+        tmp.remove(worldName);
+        worlds = tmp.toArray(new String[0]);
+    }
+
+    @Override public String[] getAllWorlds() {
+        return worlds;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
new file mode 100644
index 000000000..7a59dab9d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
@@ -0,0 +1,28 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+
+public interface PlotAreaManager {
+    PlotArea getApplicablePlotArea(Location location);
+
+    PlotArea getPlotArea(Location location);
+
+    PlotArea getPlotArea(String world, String id);
+
+    PlotArea[] getPlotAreas(String world, RegionWrapper region);
+
+    PlotArea[] getAllPlotAreas();
+
+    String[] getAllWorlds();
+
+    void addPlotArea(PlotArea area);
+
+    void removePlotArea(PlotArea area);
+
+    void addWorld(String worldName);
+
+    void removeWorld(String worldName);
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
new file mode 100644
index 000000000..5cf07cc14
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
@@ -0,0 +1,71 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.UUID;
+
+public class SinglePlot extends Plot {
+    private HashSet<RegionWrapper> regions;
+
+    {
+        regions = new HashSet<>();
+        regions.add(new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
+            Integer.MAX_VALUE));
+    }
+
+    public SinglePlot(PlotArea area, PlotId id, UUID owner) {
+        super(area, id, owner);
+    }
+
+    public SinglePlot(PlotArea area, PlotId id) {
+        super(area, id);
+    }
+
+    public SinglePlot(PlotArea area, PlotId id, UUID owner, int temp) {
+        super(area, id, owner, temp);
+    }
+
+    public SinglePlot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
+        HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
+        PlotArea area, boolean[] merged, long timestamp, int temp) {
+        super(id, owner, trusted, members, denied, alias, position, flags, area, merged, timestamp,
+            temp);
+    }
+
+    @Override public String getWorldName() {
+        return getId().toCommaSeparatedString();
+    }
+
+    @Nonnull @Override public SinglePlotArea getArea() {
+        return (SinglePlotArea) super.getArea();
+    }
+
+    public boolean teleportPlayer(final PlotPlayer player) {
+        if (isLoaded()) {
+            return super.teleportPlayer(player);
+        } else {
+            C.NOT_LOADED.send(player);
+            return false;
+        }
+    }
+
+    @Override public Location getSide() {
+        return getCenter();
+    }
+
+    @Override protected boolean isLoaded() {
+        getArea().loadWorld(getId());
+        return super.isLoaded();
+    }
+
+    @Override public HashSet<RegionWrapper> getRegions() {
+        return regions;
+    }
+
+    // getCenter getSide getHome getDefaultHome getBiome
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
new file mode 100644
index 000000000..1cc49f682
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -0,0 +1,139 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
+import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class SinglePlotArea extends GridPlotWorld {
+
+    public boolean VOID = false;
+
+    public SinglePlotArea() {
+        super("*", null, new SingleWorldGenerator(), null, null);
+        this.ALLOW_SIGNS = false;
+        this.DEFAULT_HOME = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
+    }
+
+    @Override public void loadConfiguration(ConfigurationSection config) {
+        VOID = config.getBoolean("void", false);
+    }
+
+    public void loadWorld(final PlotId id) {
+        TaskManager.IMP.sync(new RunnableVal<Object>() {
+            @Override public void run(Object value) {
+                String worldName = id.toCommaSeparatedString();
+                if (WorldUtil.IMP.isWorld(worldName))
+                    return;
+                SetupObject setup = new SetupObject();
+                setup.plotManager = "PlotSquared:single";
+                setup.setupGenerator = "PlotSquared:single";
+                setup.type = 0;
+                setup.terrain = 0;
+                setup.step = new ConfigurationNode[0];
+                setup.world = worldName;
+                SetupUtils.manager.setupWorld(setup);
+            }
+        });
+        //        String worldName = plot.getWorldName();
+        //        World world = Bukkit.getWorld(worldName);
+        //        if (world != null) {
+        //            return world;
+        //        }
+        //        WorldCreator wc = new WorldCreator(worldName);
+        //        wc.generator("PlotSquared:single");
+        //        wc.environment(World.Environment.NORMAL);
+        //        wc.type(WorldType.FLAT);
+        //        return AsyncWorld.create(wc);
+    }
+
+
+
+    @Override public ConfigurationNode[] getSettingNodes() {
+        return new ConfigurationNode[] {
+            new ConfigurationNode("void", this.VOID, "Void world", Configuration.BOOLEAN)};
+    }
+
+    @Nullable @Override public Plot getOwnedPlot(@Nonnull final Location location) {
+        PlotId pid = PlotId.fromString(location.getWorld());
+        if (pid == null) {
+            return null;
+        }
+        Plot plot = this.plots.get(pid);
+        return plot == null ? null : plot.getBasePlot(false);
+    }
+
+    @Nullable @Override public Plot getOwnedPlotAbs(@Nonnull Location location) {
+        PlotId pid = PlotId.fromString(location.getWorld());
+        if (pid == null) {
+            return null;
+        }
+        return plots.get(pid);
+    }
+
+    @Nullable @Override public Plot getPlot(@Nonnull final Location location) {
+        PlotId pid = PlotId.fromString(location.getWorld());
+        if (pid == null) {
+            return null;
+        }
+        return getPlot(pid);
+    }
+
+    @Nullable @Override public Plot getPlotAbs(@Nonnull final Location location) {
+        final PlotId pid = PlotId.fromString(location.getWorld());
+        if (pid == null) {
+            return null;
+        }
+        return getPlotAbs(pid);
+    }
+
+    public boolean addPlot(@Nonnull Plot plot) {
+        plot = adapt(plot);
+        return super.addPlot(plot);
+    }
+
+    @Override public boolean addPlotAbs(@Nonnull Plot plot) {
+        plot = adapt(plot);
+        return super.addPlotAbs(plot);
+    }
+
+    @Override public boolean addPlotIfAbsent(@Nonnull Plot plot) {
+        plot = adapt(plot);
+        return super.addPlotIfAbsent(plot);
+    }
+
+    private Plot adapt(Plot p) {
+        if (p instanceof SinglePlot) {
+            return p;
+        }
+        PlotSettings s = p.getSettings();
+        p = new SinglePlot(p.getId(), p.owner, p.getTrusted(), p.getMembers(), p.getDenied(),
+            s.alias, s.getPosition(), null, this, s.merged, p.getTimestamp(), p.temp);
+        p.getSettings().flags = s.flags;
+        return p;
+    }
+
+    @Nullable public Plot getPlotAbs(@Nonnull final PlotId id) {
+        Plot plot = getOwnedPlotAbs(id);
+        if (plot == null) {
+            return new SinglePlot(this, id);
+        }
+        return plot;
+    }
+
+    @Nullable public Plot getPlot(@Nonnull PlotId id) {
+        // TODO
+        Plot plot = getOwnedPlotAbs(id);
+        if (plot == null) {
+            return new SinglePlot(this, id);
+        }
+        return plot.getBasePlot(false);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
new file mode 100644
index 000000000..a3b398136
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -0,0 +1,131 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.github.intellectualsites.plotsquared.plot.util.ArrayUtil;
+import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+
+public class SinglePlotAreaManager extends DefaultPlotAreaManager {
+    private final SinglePlotArea[] array;
+    private SinglePlotArea area;
+    private PlotArea[] all;
+
+    public SinglePlotAreaManager() {
+        this.area = new SinglePlotArea();
+        this.array = new SinglePlotArea[] {area};
+        this.all = new PlotArea[] {area};
+        SetupUtils.generators.put("PlotSquared:single",
+            new SingleWorldGenerator().specify("CheckingPlotSquaredGenerator"));
+    }
+
+    public SinglePlotArea getArea() {
+        return area;
+    }
+
+    public void setArea(SinglePlotArea area) {
+        this.area = area;
+        array[0] = area;
+        all = ArrayUtil.concatAll(super.getAllPlotAreas(), array);
+    }
+
+    public boolean isWorld(String id) {
+        int mode = 0;
+        char[] chars = id.toCharArray();
+        if (chars.length == 1 && chars[0] == '*') {
+            return true;
+        }
+        for (char c : chars) {
+            switch (mode) {
+                case 0:
+                    mode = 1;
+                    if (c == '-') {
+                        continue;
+                    }
+                case 1:
+                    if ((c <= '/') || (c >= ':')) {
+                        if (c == ';' || c == ',') {
+                            mode = 2;
+                            continue;
+                        }
+                        return false;
+                    } else {
+                        continue;
+                    }
+                case 2:
+                    mode = 3;
+                    if (c == '-') {
+                        continue;
+                    }
+                case 3:
+                    if ((c <= '/') || (c >= ':')) {
+                        return false;
+                    }
+                    continue;
+            }
+        }
+        return true;
+    }
+
+    @Override public PlotArea getApplicablePlotArea(Location location) {
+        PlotArea found = super.getApplicablePlotArea(location);
+        if (found != null)
+            return found;
+        String world = location.getWorld();
+        return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
+            area :
+            null;
+    }
+
+    @Override public PlotArea getPlotArea(Location location) {
+        PlotArea found = super.getPlotArea(location);
+        if (found != null)
+            return found;
+        return isWorld(location.getWorld()) || location.getWorld().equals("*") ? area : null;
+    }
+
+    @Override public PlotArea getPlotArea(String world, String id) {
+        PlotArea found = super.getPlotArea(world, id);
+        if (found != null)
+            return found;
+        return isWorld(world) || world.equals("*") ? area : null;
+    }
+
+    @Override public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
+        PlotArea[] found = super.getPlotAreas(world, region);
+        if (found != null && found.length != 0)
+            return found;
+        return isWorld(world) || world.equals("*") ? array : noPlotAreas;
+    }
+
+    @Override public PlotArea[] getAllPlotAreas() {
+        return all;
+    }
+
+    @Override public String[] getAllWorlds() {
+        return super.getAllWorlds();
+    }
+
+    @Override public void addPlotArea(PlotArea area) {
+        if (area == this.area) {
+            return;
+        }
+        super.addPlotArea(area);
+        all = ArrayUtil.concatAll(super.getAllPlotAreas(), array);
+    }
+
+    @Override public void removePlotArea(PlotArea area) {
+        if (area == this.area) {
+            throw new UnsupportedOperationException("Cannot remove base area!");
+        }
+        super.removePlotArea(area);
+    }
+
+    @Override public void addWorld(String worldName) {
+        super.addWorld(worldName);
+    }
+
+    @Override public void removeWorld(String worldName) {
+        super.removeWorld(worldName);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
new file mode 100644
index 000000000..f8e4ab000
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -0,0 +1,104 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.io.File;
+import java.util.List;
+
+public class SinglePlotManager extends PlotManager {
+    @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
+        return new PlotId(0, 0);
+    }
+
+    @Override public PlotId getPlotId(PlotArea plotArea, int x, int y, int z) {
+        return new PlotId(0, 0);
+    }
+
+    @Override public Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId) {
+        return new Location(plotId.toCommaSeparatedString(), -30000000, 0, -30000000);
+    }
+
+    @Override public Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId) {
+        return new Location(plotId.toCommaSeparatedString(), 30000000, 0, 30000000);
+    }
+
+    @Override public boolean clearPlot(PlotArea plotArea, Plot plot, final Runnable whenDone) {
+        SetupUtils.manager.unload(plot.getWorldName(), false);
+        final File worldFolder =
+            new File(PlotSquared.get().IMP.getWorldContainer(), plot.getWorldName());
+        TaskManager.IMP.taskAsync(() -> {
+            MainUtil.deleteDirectory(worldFolder);
+            if (whenDone != null)
+                whenDone.run();
+        });
+        return true;
+    }
+
+    @Override public boolean claimPlot(PlotArea plotArea, Plot plot) {
+        // TODO
+        return true;
+    }
+
+    @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
+        if (whenDone != null)
+            whenDone.run();
+        return true;
+    }
+
+    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
+        return null;
+    }
+
+    @Override public String[] getPlotComponents(PlotArea plotArea, PlotId plotId) {
+        return new String[0];
+    }
+
+    @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
+        BlockBucket blocks) {
+        return false;
+    }
+
+    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean removeRoadEast(PlotArea plotArea, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean removeRoadSouth(PlotArea plotArea, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean removeRoadSouthEast(PlotArea plotArea, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+        return false;
+    }
+
+    @Override public boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+        return false;
+    }
+
+    @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+        return false;
+    }
+
+    @Override public boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+        return false;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
new file mode 100644
index 000000000..ba498f971
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
@@ -0,0 +1,91 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+
+public class SingleWorldGenerator extends IndependentPlotGenerator {
+    private Location bedrock1 = new Location(null, 0, 0, 0);
+    private Location bedrock2 = new Location(null, 15, 0, 15);
+    private Location dirt1 = new Location(null, 0, 1, 0);
+    private Location dirt2 = new Location(null, 15, 2, 15);
+    private Location grass1 = new Location(null, 0, 3, 0);
+    private Location grass2 = new Location(null, 15, 3, 15);
+
+    @Override public String getName() {
+        return "PlotSquared:single";
+    }
+
+    @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
+        BlockBucket[][] blockBuckets = new BlockBucket[16][];
+        SinglePlotArea area = (SinglePlotArea) settings;
+        if (area.VOID) {
+            return blockBuckets;
+        }
+        for (int x = bedrock1.getX(); x <= bedrock2.getX(); x++) {
+            for (int z = bedrock1.getZ(); z <= bedrock2.getZ(); z++) {
+                for (int y = bedrock1.getY(); y <= bedrock2.getY(); y++) {
+                    int layer = y >> 4;
+                    if (blockBuckets[layer] == null) {
+                        blockBuckets[layer] = new BlockBucket[4096];
+                    }
+                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
+                        BlockBucket.withSingle(PlotBlock.get("bedrock"));
+                }
+            }
+        }
+        for (int x = dirt1.getX(); x <= dirt2.getX(); x++) {
+            for (int z = dirt1.getZ(); z <= dirt2.getZ(); z++) {
+                for (int y = dirt1.getY(); y <= dirt2.getY(); y++) {
+                    int layer = y >> 4;
+                    if (blockBuckets[layer] == null) {
+                        blockBuckets[layer] = new BlockBucket[4096];
+                    }
+                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
+                        BlockBucket.withSingle(PlotBlock.get("dirt"));
+                }
+            }
+        }
+        for (int x = grass1.getX(); x <= grass2.getX(); x++) {
+            for (int z = grass1.getZ(); z <= grass2.getZ(); z++) {
+                for (int y = grass1.getY(); y <= grass2.getY(); y++) {
+                    int layer = y >> 4;
+                    if (blockBuckets[layer] == null) {
+                        blockBuckets[layer] = new BlockBucket[4096];
+                    }
+                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
+                        BlockBucket.withSingle(PlotBlock.get("grass_block"));
+                }
+            }
+        }
+        return blockBuckets;
+    }
+
+    @Override public void generateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
+        SinglePlotArea area = (SinglePlotArea) settings;
+        if (area.VOID) {
+            Location min = result.getMin();
+            if (min.getX() == 0 && min.getZ() == 0) {
+                result.setBlock(0, 0, 0, PlotBlock.get("bedrock"));
+            }
+        } else {
+            result.setCuboid(bedrock1, bedrock2, PlotBlock.get("bedrock"));
+            result.setCuboid(dirt1, dirt2, PlotBlock.get("dirt"));
+            result.setCuboid(grass1, grass2, PlotBlock.get("grass_block"));
+        }
+        result.fillBiome("PLAINS");
+    }
+
+    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
+        return ((SinglePlotAreaManager) PlotSquared.get().getPlotAreaManager()).getArea();
+    }
+
+    @Override public PlotManager getNewPlotManager() {
+        return new SinglePlotManager();
+    }
+
+    @Override public void initialize(PlotArea area) {
+
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
new file mode 100644
index 000000000..329230eaf
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
@@ -0,0 +1,20 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+public abstract class AbstractTitle {
+    public static AbstractTitle TITLE_CLASS;
+
+    public static void sendTitle(PlotPlayer player, String head, String sub) {
+        if (player instanceof ConsolePlayer) {
+            return;
+        }
+        if (TITLE_CLASS != null && !player.getAttribute("disabletitles")) {
+            TITLE_CLASS.sendTitle(player, head, sub, 1, 2, 1);
+        }
+    }
+
+    protected abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
+        int out);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
new file mode 100644
index 000000000..6052c2a93
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
@@ -0,0 +1,19 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import java.util.Arrays;
+
+public class ArrayUtil {
+    public static final <T> T[] concatAll(T[] first, T[]... rest) {
+        int totalLength = first.length;
+        for (T[] array : rest) {
+            totalLength += array.length;
+        }
+        T[] result = Arrays.copyOf(first, totalLength);
+        int offset = first.length;
+        for (T[] array : rest) {
+            System.arraycopy(array, 0, result, offset, array.length);
+            offset += array.length;
+        }
+        return result;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java
new file mode 100644
index 000000000..ace8bb7e4
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java
@@ -0,0 +1,26 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+public class ByteArrayUtilities {
+
+    public static byte[] integerToBytes(int i) {
+        byte[] bytes = new byte[4];
+        bytes[0] = (byte) (i >> 24);
+        bytes[1] = (byte) (i >> 16);
+        bytes[2] = (byte) (i >> 8);
+        bytes[3] = (byte) (i);
+        return bytes;
+    }
+
+    public static int bytesToInteger(byte[] bytes) {
+        return (bytes[0] << 24) & 0xff000000 | (bytes[1] << 16) & 0x00ff0000
+            | (bytes[2] << 8) & 0x0000ff00 | (bytes[3]) & 0x000000ff;
+    }
+
+    public static boolean bytesToBoolean(byte[] bytes) {
+        return bytes[0] == 1;
+    }
+
+    public static byte[] booleanToBytes(boolean b) {
+        return new byte[] {(byte) (b ? 1 : 0)};
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java
new file mode 100644
index 000000000..1177206e6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java
@@ -0,0 +1,22 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+public abstract class ChatManager<T> {
+    public static ChatManager<?> manager;
+
+    public abstract T builder();
+
+    public abstract void color(PlotMessage message, String color);
+
+    public abstract void tooltip(PlotMessage message, PlotMessage... tooltip);
+
+    public abstract void command(PlotMessage message, String command);
+
+    public abstract void text(PlotMessage message, String text);
+
+    public abstract void send(PlotMessage plotMessage, PlotPlayer player);
+
+    public abstract void suggest(PlotMessage plotMessage, String command);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
new file mode 100644
index 000000000..cf2ca96ed
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -0,0 +1,296 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+public abstract class ChunkManager {
+
+    public static ChunkManager manager = null;
+    private static RunnableVal<ScopedLocalBlockQueue> CURRENT_FORCE_CHUNK;
+    private static RunnableVal<ScopedLocalBlockQueue> CURRENT_ADD_CHUNK;
+
+    public static ChunkLoc getChunkChunk(Location location) {
+        int x = location.getX() >> 9;
+        int z = location.getZ() >> 9;
+        return new ChunkLoc(x, z);
+    }
+
+    public static void setChunkInPlotArea(RunnableVal<ScopedLocalBlockQueue> force,
+        RunnableVal<ScopedLocalBlockQueue> add, String world, ChunkLoc loc) {
+        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
+        if (PlotSquared.get().isAugmented(world)) {
+            int bx = loc.x << 4;
+            int bz = loc.z << 4;
+            ScopedLocalBlockQueue scoped =
+                new ScopedLocalBlockQueue(queue, new Location(world, bx, 0, bz),
+                    new Location(world, bx + 15, 255, bz + 15));
+            if (force != null) {
+                force.run(scoped);
+            } else {
+                scoped.regenChunk(loc.x, loc.z);
+                if (add != null) {
+                    add.run(scoped);
+                }
+            }
+            queue.flush();
+        } else {
+            CURRENT_FORCE_CHUNK = force;
+            CURRENT_ADD_CHUNK = add;
+            queue.regenChunk(loc.x, loc.z);
+            CURRENT_FORCE_CHUNK = null;
+            CURRENT_ADD_CHUNK = null;
+        }
+    }
+
+    public static boolean preProcessChunk(ScopedLocalBlockQueue queue) {
+        if (CURRENT_FORCE_CHUNK != null) {
+            CURRENT_FORCE_CHUNK.run(queue);
+            CURRENT_FORCE_CHUNK = null;
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean postProcessChunk(ScopedLocalBlockQueue queue) {
+        if (CURRENT_ADD_CHUNK != null) {
+            CURRENT_ADD_CHUNK.run(queue);
+            CURRENT_ADD_CHUNK = null;
+            return true;
+        }
+        return false;
+    }
+
+    public static void largeRegionTask(final String world, final RegionWrapper region,
+        final RunnableVal<ChunkLoc> task, final Runnable whenDone) {
+        TaskManager.runTaskAsync(() -> {
+            HashSet<ChunkLoc> chunks = new HashSet<>();
+            Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
+            for (ChunkLoc mcr : mcrs) {
+                int bx = mcr.x << 9;
+                int bz = mcr.z << 9;
+                int tx = bx + 511;
+                int tz = bz + 511;
+                if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
+                    && tz >= region.minZ) {
+                    for (int x = bx >> 4; x <= (tx >> 4); x++) {
+                        int cbx = x << 4;
+                        int ctx = cbx + 15;
+                        if (cbx <= region.maxX && ctx >= region.minX) {
+                            for (int z = bz >> 4; z <= (tz >> 4); z++) {
+                                int cbz = z << 4;
+                                int ctz = cbz + 15;
+                                if (cbz <= region.maxZ && ctz >= region.minZ) {
+                                    chunks.add(new ChunkLoc(x, z));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
+
+                @Override public void run(ChunkLoc value) {
+                    if (manager.loadChunk(world, value, false)) {
+                        task.run(value);
+                    }
+                }
+            }, whenDone);
+        });
+    }
+
+    public static void chunkTask(final Plot plot, final RunnableVal<int[]> task,
+        final Runnable whenDone, final int allocate) {
+        final ArrayList<RegionWrapper> regions = new ArrayList<>(plot.getRegions());
+        Runnable smallTask = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper value = regions.remove(0);
+                Location pos1 = new Location(plot.getWorldName(), value.minX, 0, value.minZ);
+                Location pos2 = new Location(plot.getWorldName(), value.maxX, 0, value.maxZ);
+                chunkTask(pos1, pos2, task, this, allocate);
+            }
+        };
+        smallTask.run();
+    }
+
+    /**
+     * The int[] will be in the form: [chunkx, chunkz, pos1x, pos1z, pos2x, pos2z, isedge] and will represent the bottom and top parts of the chunk
+     *
+     * @param pos1
+     * @param pos2
+     * @param task
+     * @param whenDone
+     */
+    public static void chunkTask(Location pos1, Location pos2, final RunnableVal<int[]> task,
+        final Runnable whenDone, final int allocate) {
+        final int p1x = pos1.getX();
+        final int p1z = pos1.getZ();
+        final int p2x = pos2.getX();
+        final int p2z = pos2.getZ();
+        final int bcx = p1x >> 4;
+        final int bcz = p1z >> 4;
+        final int tcx = p2x >> 4;
+        final int tcz = p2z >> 4;
+        final ArrayList<ChunkLoc> chunks = new ArrayList<>();
+
+        for (int x = bcx; x <= tcx; x++) {
+            for (int z = bcz; z <= tcz; z++) {
+                chunks.add(new ChunkLoc(x, z));
+            }
+        }
+        TaskManager.runTask(new Runnable() {
+            @Override public void run() {
+                long start = System.currentTimeMillis();
+                while (!chunks.isEmpty() && ((System.currentTimeMillis() - start) < allocate)) {
+                    ChunkLoc chunk = chunks.remove(0);
+                    task.value = new int[7];
+                    task.value[0] = chunk.x;
+                    task.value[1] = chunk.z;
+                    task.value[2] = task.value[0] << 4;
+                    task.value[3] = task.value[1] << 4;
+                    task.value[4] = task.value[2] + 15;
+                    task.value[5] = task.value[3] + 15;
+                    if (task.value[0] == bcx) {
+                        task.value[2] = p1x;
+                        task.value[6] = 1;
+                    }
+                    if (task.value[0] == tcx) {
+                        task.value[4] = p2x;
+                        task.value[6] = 1;
+                    }
+                    if (task.value[1] == bcz) {
+                        task.value[3] = p1z;
+                        task.value[6] = 1;
+                    }
+                    if (task.value[1] == tcz) {
+                        task.value[5] = p2z;
+                        task.value[6] = 1;
+                    }
+                    task.run();
+                }
+                if (!chunks.isEmpty()) {
+                    TaskManager.runTaskLater(this, 1);
+                } else {
+                    TaskManager.runTask(whenDone);
+                }
+            }
+        });
+    }
+
+    /**
+     * 0 = Entity
+     * 1 = Animal
+     * 2 = Monster
+     * 3 = Mob
+     * 4 = Boat
+     * 5 = Misc
+     *
+     * @param plot
+     * @return
+     */
+    public abstract int[] countEntities(Plot plot);
+
+    public abstract boolean loadChunk(String world, ChunkLoc loc, boolean force);
+
+    public abstract void unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe);
+
+    public Set<ChunkLoc> getChunkChunks(String world) {
+        File folder =
+            new File(PlotSquared.get().IMP.getWorldContainer(), world + File.separator + "region");
+        File[] regionFiles = folder.listFiles();
+        HashSet<ChunkLoc> chunks = new HashSet<>();
+        if (regionFiles == null) {
+            throw new RuntimeException(
+                "Could not find worlds folder: " + folder + " ? (no read access?)");
+        }
+        for (File file : regionFiles) {
+            String name = file.getName();
+            if (name.endsWith("mca")) {
+                String[] split = name.split("\\.");
+                try {
+                    int x = Integer.parseInt(split[1]);
+                    int z = Integer.parseInt(split[2]);
+                    ChunkLoc loc = new ChunkLoc(x, z);
+                    chunks.add(loc);
+                } catch (NumberFormatException ignored) {
+                }
+            }
+        }
+        return chunks;
+    }
+
+    public void deleteRegionFiles(String world, Collection<ChunkLoc> chunks) {
+        deleteRegionFiles(world, chunks, null);
+    }
+
+    public void deleteRegionFiles(final String world, final Collection<ChunkLoc> chunks,
+        final Runnable whenDone) {
+        TaskManager.runTaskAsync(() -> {
+            for (ChunkLoc loc : chunks) {
+                String directory =
+                    world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z
+                        + ".mca";
+                File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
+                PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
+                if (file.exists()) {
+                    file.delete();
+                }
+            }
+            TaskManager.runTask(whenDone);
+        });
+    }
+
+    public Plot hasPlot(String world, ChunkLoc chunk) {
+        int x1 = chunk.x << 4;
+        int z1 = chunk.z << 4;
+        int x2 = x1 + 15;
+        int z2 = z1 + 15;
+        Location bot = new Location(world, x1, 0, z1);
+        Plot plot = bot.getOwnedPlotAbs();
+        if (plot != null) {
+            return plot;
+        }
+        Location top = new Location(world, x2, 0, z2);
+        plot = top.getOwnedPlotAbs();
+        if (plot != null) {
+            return plot;
+        }
+        return null;
+    }
+
+    /**
+     * Copy a region to a new location (in the same world)
+     */
+    public abstract boolean copyRegion(Location pos1, Location pos2, Location newPos,
+        Runnable whenDone);
+
+    /**
+     * Assumptions:<br>
+     * - pos1 and pos2 are in the same plot<br>
+     * It can be harmful to the world if parameters outside this scope are provided
+     *
+     * @param pos1
+     * @param pos2
+     * @param whenDone
+     * @return
+     */
+    public abstract boolean regenerateRegion(Location pos1, Location pos2, boolean ignoreAugment,
+        Runnable whenDone);
+
+    public abstract void clearAllEntities(Location pos1, Location pos2);
+
+    public abstract void swap(Location bot1, Location top1, Location bot2, Location top2,
+        Runnable whenDone);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
new file mode 100644
index 000000000..d0b4012a6
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
@@ -0,0 +1,27 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.CmdInstance;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+public class CmdConfirm {
+
+    public static CmdInstance getPending(PlotPlayer player) {
+        return player.getMeta("cmdConfirm");
+    }
+
+    public static void removePending(PlotPlayer player) {
+        player.deleteMeta("cmdConfirm");
+    }
+
+    public static void addPending(final PlotPlayer player, String commandStr,
+        final Runnable runnable) {
+        removePending(player);
+        if (commandStr != null)
+            MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
+        TaskManager.runTaskLater(() -> {
+            CmdInstance cmd = new CmdInstance(runnable);
+            player.setMeta("cmdConfirm", cmd);
+        }, 1);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
new file mode 100644
index 000000000..524ea7f67
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -0,0 +1,65 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.comment.*;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class CommentManager {
+
+    public static final HashMap<String, CommentInbox> inboxes = new HashMap<>();
+
+    public static void sendTitle(final PlotPlayer player, final Plot plot) {
+        if (!Settings.Enabled_Components.COMMENT_NOTIFIER || !plot.isOwner(player.getUUID())) {
+            return;
+        }
+        TaskManager.runTaskLaterAsync(() -> {
+            Collection<CommentInbox> boxes = CommentManager.inboxes.values();
+            final AtomicInteger count = new AtomicInteger(0);
+            final AtomicInteger size = new AtomicInteger(boxes.size());
+            for (final CommentInbox inbox : inboxes.values()) {
+                inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+                    @Override public void run(List<PlotComment> value) {
+                        int total;
+                        if (value != null) {
+                            int num = 0;
+                            for (PlotComment comment : value) {
+                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
+                                    num++;
+                                }
+                            }
+                            total = count.addAndGet(num);
+                        } else {
+                            total = count.get();
+                        }
+                        if ((size.decrementAndGet() == 0) && (total > 0)) {
+                            AbstractTitle.sendTitle(player, "",
+                                C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
+                        }
+                    }
+                });
+            }
+        }, 20);
+    }
+
+    public static long getTimestamp(PlotPlayer player, String inbox) {
+        return player.getMeta("inbox:" + inbox, player.getLastPlayed());
+    }
+
+    public static void addInbox(CommentInbox inbox) {
+        inboxes.put(inbox.toString().toLowerCase(), inbox);
+    }
+
+    public static void registerDefaultInboxes() {
+        addInbox(new InboxReport());
+        addInbox(new InboxPublic());
+        addInbox(new InboxOwner());
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
new file mode 100644
index 000000000..5e9c87a7a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
@@ -0,0 +1,87 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+public class ConsoleColors {
+    public static String fromString(String input) {
+        input = input.replaceAll("&0", fromChatColor("&0")).replaceAll("&1", fromChatColor("&1"))
+            .replaceAll("&2", fromChatColor("&2")).replaceAll("&3", fromChatColor("&3"))
+            .replaceAll("&4", fromChatColor("&4")).replaceAll("&5", fromChatColor("&5"))
+            .replaceAll("&6", fromChatColor("&6")).replaceAll("&7", fromChatColor("&7"))
+            .replaceAll("&8", fromChatColor("&8")).replaceAll("&9", fromChatColor("&9"))
+            .replaceAll("&a", fromChatColor("&a")).replaceAll("&b", fromChatColor("&b"))
+            .replaceAll("&c", fromChatColor("&c")).replaceAll("&d", fromChatColor("&d"))
+            .replaceAll("&e", fromChatColor("&e")).replaceAll("&f", fromChatColor("&f"))
+            .replaceAll("&k", fromChatColor("&k")).replaceAll("&l", fromChatColor("&l"))
+            .replaceAll("&m", fromChatColor("&m")).replaceAll("&n", fromChatColor("&n"))
+            .replaceAll("&o", fromChatColor("&o")).replaceAll("&r", fromChatColor("&r"));
+        return input + "\u001B[0m";
+    }
+
+    /*
+     * public static final String ANSI_RESET = "\u001B[0m"; public static final
+     * String ANSI_BLACK = "\u001B[30m"; public static final String ANSI_RED =
+     * "\u001B[31m"; public static final String ANSI_GREEN = "\u001B[32m";
+     * public static final String ANSI_YELLOW = "\u001B[33m"; public static
+     * final String ANSI_BLUE = "\u001B[34m"; public static final String
+     * ANSI_PURPLE = "\u001B[35m"; public static final String ANSI_CYAN =
+     * "\u001B[36m"; public static final String ANSI_WHITE = "\u001B[37m";
+     * public static final String ANSI_BOLD = "\033[1m"; public static final
+     * String ANSI_UNDERLINE = "\033[0m"; public static final String ANSI_ITALIC
+     * = "\033[3m]";
+     */
+    public static String fromChatColor(final String color) {
+        return chatColor(color).getLin();
+    }
+
+    public static ConsoleColor chatColor(final String color) {
+        switch (color) {
+            case "&r":
+                return ConsoleColor.RESET;
+            case "&7":
+            case "&8":
+                return ConsoleColor.WHITE;
+            case "&0":
+                return ConsoleColor.BLACK;
+            case "&4":
+            case "&c":
+                return ConsoleColor.RED;
+            case "&6":
+            case "&e":
+                return ConsoleColor.YELLOW;
+            case "&a":
+            case "&2":
+                return ConsoleColor.GREEN;
+            case "&b":
+            case "&3":
+                return ConsoleColor.CYAN;
+            case "&d":
+            case "&5":
+                return ConsoleColor.PURPLE;
+            case "&9":
+            case "&1":
+                return ConsoleColor.BLUE;
+            case "&n":
+                return ConsoleColor.UNDERLINE;
+            case "&o":
+                return ConsoleColor.ITALIC;
+            case "&l":
+                return ConsoleColor.BOLD;
+            default:
+                return ConsoleColor.RESET;
+        }
+    }
+
+    enum ConsoleColor {
+        RESET("\u001B[0m"), BLACK("\u001B[30m"), RED("\u001B[31m"), GREEN("\u001B[32m"), YELLOW(
+            "\u001B[33m"), BLUE("\u001B[34m"), PURPLE("\u001B[35m"), CYAN("\u001B[36m"), WHITE(
+            "\u001B[37m"), BOLD("\033[1m"), UNDERLINE("\033[0m"), ITALIC("\033[3m");
+        private final String lin;
+
+        ConsoleColor(final String lin) {
+            this.lin = lin;
+        }
+
+        public String getLin() {
+            return lin;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java
new file mode 100644
index 000000000..4912b6e83
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java
@@ -0,0 +1,41 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
+import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+public abstract class EconHandler {
+
+    public static EconHandler manager;
+    private static boolean initialized;
+
+    public static EconHandler getEconHandler() {
+        if (initialized) {
+            return manager;
+        }
+        initialized = true;
+        return manager = PlotSquared.get().IMP.getEconomyHandler();
+    }
+
+    public double getMoney(PlotPlayer player) {
+        if (player instanceof ConsolePlayer) {
+            return Double.MAX_VALUE;
+        }
+        return getBalance(player);
+    }
+
+    public abstract double getBalance(PlotPlayer player);
+
+    public abstract void withdrawMoney(PlotPlayer player, double amount);
+
+    public abstract void depositMoney(PlotPlayer player, double amount);
+
+    public abstract void depositMoney(OfflinePlotPlayer player, double amount);
+
+    public abstract boolean hasPermission(String world, String player, String perm);
+
+    public boolean hasPermission(String player, String perm) {
+        return hasPermission(null, player, perm);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
new file mode 100644
index 000000000..fa543b21a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
@@ -0,0 +1,76 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.flag.IntegerFlag;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import lombok.NonNull;
+import lombok.experimental.UtilityClass;
+
+/**
+ * Entity related general utility methods
+ */
+@UtilityClass public final class EntityUtil {
+
+    private static int capNumeral(@NonNull final String flagName) {
+        int i;
+        switch (flagName) {
+            case "entity-cap":
+                i = 0;
+                break;
+            case "mob-cap":
+                i = 3;
+                break;
+            case "hostile-cap":
+                i = 2;
+                break;
+            case "animal-cap":
+                i = 1;
+                break;
+            case "vehicle-cap":
+                i = 4;
+                break;
+            case "misc-cap":
+                i = 5;
+                break;
+            default:
+                i = 0;
+        }
+        return i;
+    }
+
+    public static boolean checkEntity(Plot plot, IntegerFlag... flags) {
+        if (Settings.Done.RESTRICT_BUILDING && Flags.DONE.isSet(plot)) {
+            return true;
+        }
+        int[] mobs = null;
+        for (IntegerFlag flag : flags) {
+            final int i = capNumeral(flag.getName());
+            int cap = plot.getFlag(flag, Integer.MAX_VALUE);
+            if (cap == Integer.MAX_VALUE) {
+                continue;
+            }
+            if (cap == 0) {
+                return true;
+            }
+            if (mobs == null) {
+                mobs = plot.countEntities();
+            }
+            if (mobs[i] >= cap) {
+                plot.setMeta("EntityCount", mobs);
+                plot.setMeta("EntityCountTime", System.currentTimeMillis());
+                return true;
+            }
+        }
+        if (mobs != null) {
+            for (IntegerFlag flag : flags) {
+                final int i = capNumeral(flag.getName());
+                mobs[i]++;
+            }
+            plot.setMeta("EntityCount", mobs);
+            plot.setMeta("EntityCountTime", System.currentTimeMillis());
+        }
+        return false;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
new file mode 100644
index 000000000..7d82e5236
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -0,0 +1,428 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+
+import javax.annotation.Nullable;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+public abstract class EventUtil {
+
+    public static EventUtil manager = null;
+
+    /**
+     * Submit a plot rate event and return the updated rating
+     *
+     * @param player Player that rated the plot
+     * @param plot   Plot that was rated
+     * @param rating Rating given to the plot
+     * @return Updated rating or null if the event was cancelled
+     */
+    @Nullable public abstract Rating callRating(PlotPlayer player, Plot plot, Rating rating);
+
+    public abstract boolean callClaim(PlotPlayer player, Plot plot, boolean auto);
+
+    public abstract boolean callTeleport(PlotPlayer player, Location from, Plot plot);
+
+    public abstract boolean callComponentSet(Plot plot, String component);
+
+    public abstract boolean callClear(Plot plot);
+
+    public abstract boolean callDelete(Plot plot);
+
+    public abstract boolean callFlagAdd(Flag flag, Plot plot);
+
+    public abstract boolean callFlagRemove(Flag<?> flag, Plot plot, Object value);
+
+    public abstract boolean callMerge(Plot plot, int dir, int max);
+
+    public abstract boolean callAutoMerge(Plot plot, List<PlotId> plots);
+
+    public abstract boolean callUnlink(PlotArea area, List<PlotId> plots);
+
+    public abstract void callEntry(PlotPlayer player, Plot plot);
+
+    public abstract void callLeave(PlotPlayer player, Plot plot);
+
+    public abstract void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added);
+
+    public abstract void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added);
+
+    public abstract void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added);
+
+    public abstract boolean callOwnerChange(PlotPlayer initiator, Plot plot, UUID newOwner,
+        UUID oldOwner, boolean hasOldOwner);
+
+    public void doJoinTask(final PlotPlayer player) {
+        if (player == null) {
+            return; //possible future warning message to figure out where we are retrieving null
+        }
+        if (ExpireManager.IMP != null) {
+            ExpireManager.IMP.handleJoin(player);
+        }
+        if (PlotSquared.get().worldedit != null) {
+            if (player.getAttribute("worldedit")) {
+                MainUtil.sendMessage(player, C.WORLDEDIT_BYPASSED);
+            }
+        }
+        final Plot plot = player.getCurrentPlot();
+        if (Settings.Teleport.ON_LOGIN && plot != null) {
+            TaskManager.runTask(() -> plot.teleportPlayer(player));
+            MainUtil.sendMessage(player,
+                C.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
+                    .getId().y + ")");
+        }
+    }
+
+    public void doRespawnTask(final PlotPlayer player) {
+        final Plot plot = player.getCurrentPlot();
+        if (Settings.Teleport.ON_DEATH && plot != null) {
+            TaskManager.runTask(() -> plot.teleportPlayer(player));
+            MainUtil.sendMessage(player, C.TELEPORTED_TO_ROAD);
+        }
+    }
+
+    public boolean checkPlayerBlockEvent(PlotPlayer player, PlayerBlockEventType type,
+        Location location, LazyBlock block, boolean notifyPerms) {
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(location);
+        Plot plot;
+        if (area != null) {
+            plot = area.getPlot(location);
+        } else {
+            plot = null;
+        }
+        if (plot == null) {
+            if (area == null) {
+                return true;
+            }
+        } else if (plot.isAdded(player.getUUID())) {
+            return true;
+        }
+        switch (type) {
+            case TELEPORT_OBJECT:
+                return false;
+            case EAT:
+            case READ:
+                return true;
+            case BREAK_BLOCK:
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
+                if (use.isPresent()) {
+                    HashSet<PlotBlock> value = use.get();
+                    if (PlotBlock.containsEverything(value) || value
+                        .contains(block.getPlotBlock())) {
+                        return true;
+                    }
+                }
+                Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
+                if (destroy.isPresent()) {
+                    HashSet<PlotBlock> value = destroy.get();
+                    if (PlotBlock.containsEverything(value) || value
+                        .contains(block.getPlotBlock())) {
+                        return true;
+                    }
+                }
+                if (Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                    return true;
+                }
+                return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                    C.FLAG_USE.s() + '/' + C.FLAG_BREAK.s()));
+            case BREAK_HANGING:
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (plot.getFlag(Flags.HANGING_BREAK).orElse(false)) {
+                    return true;
+                }
+                if (plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
+                        !notifyPerms || MainUtil
+                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_HANGING_BREAK.s()));
+                }
+                return Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+            case BREAK_MISC:
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (plot.getFlag(Flags.MISC_BREAK).orElse(false)) {
+                    return true;
+                }
+                if (plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
+                        !notifyPerms || MainUtil
+                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_MISC_BREAK.s()));
+                }
+                return Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+            case BREAK_VEHICLE:
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (plot.getFlag(Flags.VEHICLE_BREAK).orElse(false)) {
+                    return true;
+                }
+                if (plot.hasOwner()) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_VEHICLE_BREAK.s()));
+                }
+                return Permissions
+                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+            case INTERACT_BLOCK: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
+                HashSet<PlotBlock> value = flagValue.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
+                        !notifyPerms || MainUtil
+                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s()));
+                }
+                return true;
+            }
+            case PLACE_BLOCK: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_UNOWNED.s(), notifyPerms);
+                }
+                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.PLACE);
+                HashSet<PlotBlock> value = flagValue.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_PLACE.s()));
+                }
+                return true;
+            }
+            case TRIGGER_PHYSICAL: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), false);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), false);
+                }
+                if (plot.getFlag(Flags.DEVICE_INTERACT).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
+                HashSet<PlotBlock> value = flagValue.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return false;
+                }
+                return true;
+            }
+            case INTERACT_HANGING: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                if (plot.getFlag(Flags.HOSTILE_INTERACT).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
+                HashSet<PlotBlock> value = flagValue.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                        C.FLAG_USE.s() + '/' + C.FLAG_HANGING_INTERACT.s()));
+                }
+                return true;
+            }
+            case INTERACT_MISC: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                if (plot.getFlag(Flags.MISC_INTERACT).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE);
+                HashSet<PlotBlock> value = flag.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                        C.FLAG_USE.s() + '/' + C.FLAG_MISC_INTERACT.s()));
+                }
+                return true;
+            }
+            case INTERACT_VEHICLE: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                if (plot.getFlag(Flags.VEHICLE_USE).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE);
+                HashSet<PlotBlock> value = flag.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                        C.FLAG_USE.s() + '/' + C.FLAG_VEHICLE_USE.s()));
+                }
+                return true;
+            }
+            case SPAWN_MOB: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                if (plot.getFlag(Flags.MOB_PLACE).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.PLACE);
+                HashSet<PlotBlock> value = flagValue.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                        C.FLAG_MOB_PLACE.s() + '/' + C.FLAG_PLACE.s()));
+                }
+                return true;
+            }
+            case PLACE_HANGING: // Handled elsewhere
+                return true;
+            case PLACE_MISC: {
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                if (plot.getFlag(Flags.MISC_PLACE).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.PLACE);
+                HashSet<PlotBlock> value = flag.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                        C.FLAG_MISC_PLACE.s() + '/' + C.FLAG_PLACE.s()));
+                }
+
+                return true;
+            }
+            case PLACE_VEHICLE:
+                if (plot == null) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                }
+                if (!plot.hasOwner()) {
+                    return Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            notifyPerms);
+                }
+                if (plot.getFlag(Flags.VEHICLE_PLACE).orElse(false)) {
+                    return true;
+                }
+                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.PLACE);
+                HashSet<PlotBlock> value = flag.orElse(null);
+                if (value == null || !PlotBlock.containsEverything(value) && !value
+                    .contains(block.getPlotBlock())) {
+                    if (Permissions
+                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        return true;
+                    }
+                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
+                        C.FLAG_VEHICLE_PLACE.s() + '/' + C.FLAG_PLACE.s()));
+                }
+                return true;
+            default:
+                break;
+        }
+        return true;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
new file mode 100644
index 000000000..d2495b646
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
@@ -0,0 +1,65 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class HastebinUtility {
+
+    public static final String BIN_URL = "https://hastebin.com/documents", USER_AGENT =
+        "Mozilla/5.0";
+    public static final Pattern PATTERN = Pattern.compile("\\{\"key\":\"([\\S\\s]*)\"\\}");
+
+    public static String upload(final String string) throws IOException {
+        final URL url = new URL(BIN_URL);
+        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("User-Agent", USER_AGENT);
+        connection.setDoOutput(true);
+
+        try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
+            outputStream.write(string.getBytes());
+            outputStream.flush();
+        }
+
+        StringBuilder response;
+        try (BufferedReader in = new BufferedReader(
+            new InputStreamReader(connection.getInputStream()))) {
+            response = new StringBuilder();
+
+            String inputLine;
+            while ((inputLine = in.readLine()) != null) {
+                response.append(inputLine);
+            }
+        }
+
+        Matcher matcher = PATTERN.matcher(response.toString());
+        if (matcher.matches()) {
+            return "https://hastebin.com/" + matcher.group(1);
+        } else {
+            throw new RuntimeException("Couldn't read response!");
+        }
+    }
+
+    public static String upload(final File file) throws IOException {
+        final StringBuilder content = new StringBuilder();
+        List<String> lines = new ArrayList<>();
+        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String line;
+            int i = 0;
+            while ((line = reader.readLine()) != null) {
+                lines.add(line);
+            }
+        }
+        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
+            content.append(lines.get(i)).append("\n");
+        }
+        return upload(content.toString());
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java
new file mode 100644
index 000000000..761c5aa0a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+
+public class HttpUtil {
+
+    public static String readUrl(String urlString) {
+        try (BufferedReader reader = new BufferedReader(
+            new InputStreamReader(new URL(urlString).openStream()))) {
+            StringBuilder buffer = new StringBuilder();
+            int read;
+            char[] chars = new char[1024];
+            while ((read = reader.read(chars)) != -1) {
+                buffer.append(chars, 0, read);
+            }
+            return buffer.toString();
+        } catch (IOException e) {
+            if (Settings.DEBUG) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
new file mode 100644
index 000000000..18a822d07
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
@@ -0,0 +1,191 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.google.common.base.Charsets;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.*;
+
+/**
+ * Single class paster for the Incendo paste service
+ */
+@SuppressWarnings({"unused", "WeakerAccess"}) public final class IncendoPaster {
+
+    /**
+     * Upload service URL
+     */
+    public static final String UPLOAD_PATH = "https://incendo.org/paste/upload";
+    /**
+     * Valid paste applications
+     */
+    public static final Collection<String> VALID_APPLICATIONS =
+        Arrays.asList("plotsquared", "fastasyncworldedit", "incendopermissions", "kvantum");
+
+    private final Collection<PasteFile> files = new ArrayList<>();
+    private final String pasteApplication;
+
+    /**
+     * Construct a new paster
+     *
+     * @param pasteApplication The application that is sending the paste
+     */
+    public IncendoPaster(final String pasteApplication) {
+        if (pasteApplication == null || pasteApplication.isEmpty()) {
+            throw new IllegalArgumentException("paste application cannot be null, nor empty");
+        }
+        if (!VALID_APPLICATIONS.contains(pasteApplication.toLowerCase(Locale.ENGLISH))) {
+            throw new IllegalArgumentException(
+                String.format("Unknown application name: %s", pasteApplication));
+        }
+        this.pasteApplication = pasteApplication;
+    }
+
+    /**
+     * Get an immutable collection containing all the files that have been added to this paster
+     *
+     * @return Unmodifiable collection
+     */
+    public final Collection<PasteFile> getFiles() {
+        return Collections.unmodifiableCollection(this.files);
+    }
+
+    /**
+     * Add a file to the paster
+     *
+     * @param file File to paste
+     */
+    public void addFile(final PasteFile file) {
+        if (file == null) {
+            throw new IllegalArgumentException("File cannot be null");
+        }
+        // Check to see that no duplicate files are submitted
+        for (final PasteFile pasteFile : this.files) {
+            if (pasteFile.fileName.equalsIgnoreCase(file.getFileName())) {
+                throw new IllegalArgumentException(
+                    String.format("Found duplicate file with name %s", file.getFileName()));
+            }
+        }
+        this.files.add(file);
+    }
+
+    /**
+     * Create a JSON string from the submitted information
+     *
+     * @return compiled JSON string
+     */
+    private String toJsonString() {
+        final StringBuilder builder = new StringBuilder("{\n");
+        builder.append("\"paste_application\": \"").append(this.pasteApplication)
+            .append("\",\n\"files\": \"");
+        Iterator<PasteFile> fileIterator = this.files.iterator();
+        while (fileIterator.hasNext()) {
+            final PasteFile file = fileIterator.next();
+            builder.append(file.getFileName());
+            if (fileIterator.hasNext()) {
+                builder.append(",");
+            }
+        }
+        builder.append("\",\n");
+        fileIterator = this.files.iterator();
+        while (fileIterator.hasNext()) {
+            final PasteFile file = fileIterator.next();
+            builder.append("\"file-").append(file.getFileName()).append("\": \"")
+                .append(file.getContent().replaceAll("\"", "\\\\\"")).append("\"");
+            if (fileIterator.hasNext()) {
+                builder.append(",\n");
+            }
+        }
+        builder.append("\n}");
+        return builder.toString();
+    }
+
+    /**
+     * Upload the paste and return the status message
+     *
+     * @return Status message
+     * @throws Throwable any and all exceptions
+     */
+    public final String upload() throws Throwable {
+        final URL url = new URL(UPLOAD_PATH);
+        final URLConnection connection = url.openConnection();
+        final HttpURLConnection httpURLConnection = (HttpURLConnection) connection;
+        httpURLConnection.setRequestMethod("POST");
+        httpURLConnection.setDoOutput(true);
+        final byte[] content = toJsonString().getBytes(Charsets.UTF_8);
+        httpURLConnection.setFixedLengthStreamingMode(content.length);
+        httpURLConnection.setRequestProperty("Content-Type", "application/json");
+        httpURLConnection.setRequestProperty("Accept", "*/*");
+        httpURLConnection.connect();
+        try (final OutputStream stream = httpURLConnection.getOutputStream()) {
+            stream.write(content);
+        }
+        if (!httpURLConnection.getResponseMessage().contains("OK")) {
+            if (httpURLConnection.getResponseCode() == 413) {
+                final long size = content.length;
+                PlotSquared.debug(String.format("Paste Too Big > Size: %dMB", size / 1_000_000));
+            }
+            throw new IllegalStateException(String
+                .format("Server returned status: %d %s", httpURLConnection.getResponseCode(),
+                    httpURLConnection.getResponseMessage()));
+        }
+        final StringBuilder input = new StringBuilder();
+        try (final BufferedReader inputStream = new BufferedReader(
+            new InputStreamReader(httpURLConnection.getInputStream()))) {
+            String line;
+            while ((line = inputStream.readLine()) != null) {
+                input.append(line).append("\n");
+            }
+        }
+        return input.toString();
+    }
+
+    /**
+     * Simple class that represents a paste file
+     */
+    public static class PasteFile {
+
+        private final String fileName;
+        private final String content;
+
+        /**
+         * Construct a new paste file
+         *
+         * @param fileName File name, cannot be empty, nor null
+         * @param content  File content, cannot be empty, nor null
+         */
+        public PasteFile(final String fileName, final String content) {
+            if (fileName == null || fileName.isEmpty()) {
+                throw new IllegalArgumentException("file name cannot be null, nor empty");
+            }
+            if (content == null || content.isEmpty()) {
+                throw new IllegalArgumentException("content cannot be null, nor empty");
+            }
+            this.fileName = fileName;
+            this.content = content;
+        }
+
+        /**
+         * Get the file name
+         *
+         * @return File name
+         */
+        public String getFileName() {
+            return this.fileName;
+        }
+
+        /**
+         * Get the file content as a single string
+         *
+         * @return File content
+         */
+        public String getContent() {
+            return this.content;
+        }
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java
new file mode 100644
index 000000000..03b87fc2b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java
@@ -0,0 +1,27 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotInventory;
+import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+/**
+ * This class is only used by internal functions, for most cases use the PlotInventory class
+ */
+public abstract class InventoryUtil {
+
+    /**
+     * This class is only used by internal functions, for most cases use the PlotInventory class
+     */
+    public static InventoryUtil manager = null;
+
+    public abstract void open(final PlotInventory inv);
+
+    public abstract void close(final PlotInventory inv);
+
+    public abstract void setItem(final PlotInventory plotInventory, final int index,
+        final PlotItemStack item);
+
+    public abstract PlotItemStack[] getItems(final PlotPlayer player);
+
+    public abstract boolean isOpen(final PlotInventory plotInventory);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
new file mode 100644
index 000000000..13c2647cd
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -0,0 +1,134 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import lombok.NonNull;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Converts legacy configurations into the new (BlockBucket) format
+ */
+@SuppressWarnings("unused") public final class LegacyConverter {
+
+    public static final String CONFIGURATION_VERSION = "post_flattening";
+    private static final HashMap<String, ConfigurationType> TYPE_MAP = new HashMap<>();
+
+    static {
+        TYPE_MAP.put("plot.filling", ConfigurationType.BLOCK_LIST);
+        TYPE_MAP.put("plot.floor", ConfigurationType.BLOCK_LIST);
+        TYPE_MAP.put("wall.filling", ConfigurationType.BLOCK);
+        TYPE_MAP.put("wall.block_claimed", ConfigurationType.BLOCK);
+        TYPE_MAP.put("wall.block", ConfigurationType.BLOCK);
+        TYPE_MAP.put("road.block", ConfigurationType.BLOCK);
+    }
+
+    private final ConfigurationSection configuration;
+
+    public LegacyConverter(@NonNull final ConfigurationSection configuration) {
+        this.configuration = configuration;
+    }
+
+    private BlockBucket blockToBucket(@NonNull final String block) {
+        final PlotBlock plotBlock = WorldUtil.IMP.getClosestBlock(block).best;
+        return BlockBucket.withSingle(plotBlock);
+    }
+
+    private void setString(@NonNull final ConfigurationSection section,
+        @NonNull final String string, @NonNull final BlockBucket blocks) {
+        if (!section.contains(string)) {
+            throw new IllegalArgumentException(String.format("No such key: %s", string));
+        }
+        section.set(string, blocks.toString());
+    }
+
+    private BlockBucket blockListToBucket(@NonNull final PlotBlock[] blocks) {
+        final Map<PlotBlock, Integer> counts = new HashMap<>();
+        for (final PlotBlock block : blocks) {
+            if (!counts.containsKey(block)) {
+                counts.put(block, 0);
+            }
+            counts.put(block, counts.get(block) + 1);
+        }
+        boolean includeRatios = false;
+        for (final Integer integer : counts.values()) {
+            if (integer > 1) {
+                includeRatios = true;
+                break;
+            }
+        }
+        final BlockBucket bucket = new BlockBucket();
+        if (includeRatios) {
+            final double ratio = 100D / blocks.length;
+            for (final Map.Entry<PlotBlock, Integer> count : counts.entrySet()) {
+                bucket.addBlock(count.getKey(), (int) (count.getValue() * ratio));
+            }
+        } else {
+            counts.keySet().forEach(bucket::addBlock);
+        }
+        return bucket;
+    }
+
+    private PlotBlock[] splitBlockList(@NonNull final List<String> list) {
+        final PlotBlock[] entries = new PlotBlock[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+            entries[i] = WorldUtil.IMP.getClosestBlock(list.get(i)).best;
+        }
+        return entries;
+    }
+
+    private void convertBlock(@NonNull final ConfigurationSection section,
+        @NonNull final String key, @NonNull final String block) {
+        final BlockBucket bucket = this.blockToBucket(block);
+        this.setString(section, key, bucket);
+        PlotSquared.log(C.LEGACY_CONFIG_REPLACED.f(block, bucket.toString()));
+    }
+
+    private void convertBlockList(@NonNull final ConfigurationSection section,
+        @NonNull final String key, @NonNull final List<String> blockList) {
+        final PlotBlock[] blocks = this.splitBlockList(blockList);
+        final BlockBucket bucket = this.blockListToBucket(blocks);
+        this.setString(section, key, bucket);
+        PlotSquared
+            .log(C.LEGACY_CONFIG_REPLACED.f(plotBlockArrayString(blocks), bucket.toString()));
+    }
+
+    private String plotBlockArrayString(@NonNull final PlotBlock[] blocks) {
+        final StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < blocks.length; i++) {
+            builder.append(blocks[i].toString());
+            if ((i + 1) < blocks.length) {
+                builder.append(",");
+            }
+        }
+        return builder.toString();
+    }
+
+    public void convert() {
+        // Section is the "worlds" section
+        final Collection<String> worlds = this.configuration.getKeys(false);
+        for (final String world : worlds) {
+            final ConfigurationSection worldSection = configuration.getConfigurationSection(world);
+            for (final Map.Entry<String, ConfigurationType> entry : TYPE_MAP.entrySet()) {
+                if (entry.getValue() == ConfigurationType.BLOCK) {
+                    this.convertBlock(worldSection, entry.getKey(),
+                        worldSection.getString(entry.getKey()));
+                } else {
+                    this.convertBlockList(worldSection, entry.getKey(),
+                        worldSection.getStringList(entry.getKey()));
+                }
+            }
+        }
+    }
+
+    private enum ConfigurationType {
+        BLOCK, BLOCK_LIST
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java
new file mode 100644
index 000000000..d79ad6653
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java
@@ -0,0 +1,15 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+
+public abstract class LegacyMappings {
+
+    public abstract PlotBlock fromAny(final String string);
+
+    public abstract PlotBlock fromLegacyToString(final int id, final int data);
+
+    public abstract PlotBlock fromLegacyToString(final String id);
+
+    public abstract PlotBlock fromStringToLegacy(final String id);
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
new file mode 100644
index 000000000..5dcc954a8
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -0,0 +1,867 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.DoubleFlag;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.stream.AbstractDelegateOutputStream;
+import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Paths;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.Map.Entry;
+
+/**
+ * plot functions
+ */
+public class MainUtil {
+
+    /**
+     * If the NMS code for sending chunk updates is functional<br>
+     * - E.g. If using an older version of Bukkit, or before the plugin is updated to 1.5<br>
+     * - Slower fallback code will be used if not.<br>
+     */
+    public static boolean canSendChunk = false;
+    /**
+     * Cache of mapping x,y,z coordinates to the chunk array<br>
+     * - Used for efficent world generation<br>
+     */
+    public static short[][] x_loc;
+    public static short[][] y_loc;
+    public static short[][] z_loc;
+    public static short[][][] CACHE_I = null;
+    public static short[][][] CACHE_J = null;
+
+    /**
+     * This cache is used for world generation and just saves a bit of calculation time when checking if something is in the plot area.
+     */
+    public static void initCache() {
+        if (x_loc == null) {
+            x_loc = new short[16][4096];
+            y_loc = new short[16][4096];
+            z_loc = new short[16][4096];
+            for (int i = 0; i < 16; i++) {
+                int i4 = i << 4;
+                for (int j = 0; j < 4096; j++) {
+                    int y = i4 + (j >> 8);
+                    int a = j - ((y & 0xF) << 8);
+                    int z1 = a >> 4;
+                    int x1 = a - (z1 << 4);
+                    x_loc[i][j] = (short) x1;
+                    y_loc[i][j] = (short) y;
+                    z_loc[i][j] = (short) z1;
+                }
+            }
+        }
+        if (CACHE_I == null) {
+            CACHE_I = new short[256][16][16];
+            CACHE_J = new short[256][16][16];
+            for (int x = 0; x < 16; x++) {
+                for (int z = 0; z < 16; z++) {
+                    for (int y = 0; y < 256; y++) {
+                        short i = (short) (y >> 4);
+                        short j = (short) ((y & 0xF) << 8 | z << 4 | x);
+                        CACHE_I[y][x][z] = i;
+                        CACHE_J[y][x][z] = j;
+                    }
+                }
+            }
+        }
+    }
+
+    public static void sendAdmin(final String s) {
+        for (final PlotPlayer player : UUIDHandler.getPlayers().values()) {
+            if (player.hasPermission(C.PERMISSION_ADMIN.s())) {
+                player.sendMessage(C.color(s));
+            }
+        }
+        PlotSquared.debug(s);
+    }
+
+    public static void upload(UUID uuid, String file, String extension,
+        final RunnableVal<OutputStream> writeTask, final RunnableVal<URL> whenDone) {
+        if (writeTask == null) {
+            PlotSquared.debug("&cWrite task cannot be null");
+            TaskManager.runTask(whenDone);
+            return;
+        }
+        final String filename;
+        final String website;
+        if (uuid == null) {
+            uuid = UUID.randomUUID();
+            website = Settings.Web.URL + "upload.php?" + uuid;
+            filename = "plot." + extension;
+        } else {
+            website = Settings.Web.URL + "save.php?" + uuid;
+            filename = file + '.' + extension;
+        }
+        final URL url;
+        try {
+            url = new URL(Settings.Web.URL + "?key=" + uuid + "&type=" + extension);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+            whenDone.run();
+            return;
+        }
+        TaskManager.runTaskAsync(() -> {
+            try {
+                String boundary = Long.toHexString(System.currentTimeMillis());
+                URLConnection con = new URL(website).openConnection();
+                con.setDoOutput(true);
+                con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
+                try (OutputStream output = con.getOutputStream();
+                    PrintWriter writer = new PrintWriter(
+                        new OutputStreamWriter(output, StandardCharsets.UTF_8), true)) {
+                    String CRLF = "\r\n";
+                    writer.append("--" + boundary).append(CRLF);
+                    writer.append("Content-Disposition: form-data; name=\"param\"").append(CRLF);
+                    writer.append(
+                        "Content-Type: text/plain; charset=" + StandardCharsets.UTF_8.displayName())
+                        .append(CRLF);
+                    String param = "value";
+                    writer.append(CRLF).append(param).append(CRLF).flush();
+                    writer.append("--" + boundary).append(CRLF);
+                    writer.append(
+                        "Content-Disposition: form-data; name=\"schematicFile\"; filename=\""
+                            + filename + '"').append(CRLF);
+                    writer
+                        .append("Content-Type: " + URLConnection.guessContentTypeFromName(filename))
+                        .append(CRLF);
+                    writer.append("Content-Transfer-Encoding: binary").append(CRLF);
+                    writer.append(CRLF).flush();
+                    writeTask.value = new AbstractDelegateOutputStream(output) {
+                        @Override public void close() {
+                        } // Don't close
+                    };
+                    writeTask.run();
+                    output.flush();
+                    writer.append(CRLF).flush();
+                    writer.append("--" + boundary + "--").append(CRLF).flush();
+                }
+                try (Reader response = new InputStreamReader(con.getInputStream(),
+                    StandardCharsets.UTF_8)) {
+                    final char[] buffer = new char[256];
+                    final StringBuilder result = new StringBuilder();
+                    while (true) {
+                        final int r = response.read(buffer);
+                        if (r < 0) {
+                            break;
+                        }
+                        result.append(buffer, 0, r);
+                    }
+                    if (!result.toString().startsWith("Success")) {
+                        PlotSquared.debug(result);
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                int responseCode = ((HttpURLConnection) con).getResponseCode();
+                if (responseCode == 200) {
+                    whenDone.value = url;
+                }
+                TaskManager.runTask(whenDone);
+            } catch (IOException e) {
+                e.printStackTrace();
+                TaskManager.runTask(whenDone);
+            }
+        });
+    }
+
+    /**
+     * Resets the biome if it was modified
+     *
+     * @param area
+     * @param pos1
+     * @param pos2
+     * @return true if any changes were made
+     */
+    public static boolean resetBiome(PlotArea area, Location pos1, Location pos2) {
+        String biome = area.PLOT_BIOME;
+        if (!StringMan.isEqual(WorldUtil.IMP
+            .getBiome(area.worldname, (pos1.getX() + pos2.getX()) / 2,
+                (pos1.getZ() + pos2.getZ()) / 2), biome)) {
+            MainUtil.setBiome(area.worldname, pos1.getX(), pos1.getZ(), pos2.getX(), pos2.getZ(),
+                biome);
+            return true;
+        }
+        return false;
+    }
+
+    public static String secToTime(long time) {
+        StringBuilder toreturn = new StringBuilder();
+        if (time >= 33868800) {
+            int years = (int) (time / 33868800);
+            time -= years * 33868800;
+            toreturn.append(years + "y ");
+        }
+        if (time >= 604800) {
+            int weeks = (int) (time / 604800);
+            time -= weeks * 604800;
+            toreturn.append(weeks + "w ");
+        }
+        if (time >= 86400) {
+            int days = (int) (time / 86400);
+            time -= days * 86400;
+            toreturn.append(days + "d ");
+        }
+        if (time >= 3600) {
+            int hours = (int) (time / 3600);
+            time -= hours * 3600;
+            toreturn.append(hours + "h ");
+        }
+        if (time >= 60) {
+            int minutes = (int) (time / 60);
+            time -= minutes * 60;
+            toreturn.append(minutes + "m ");
+        }
+        if (toreturn.equals("") || time > 0) {
+            toreturn.append((time) + "s ");
+        }
+        return toreturn.toString().trim();
+    }
+
+    public static long timeToSec(String string) {
+        if (MathMan.isInteger(string)) {
+            return Long.parseLong(string);
+        }
+        string = string.toLowerCase().trim().toLowerCase();
+        if (string.equalsIgnoreCase("false")) {
+            return 0;
+        }
+        String[] split = string.split(" ");
+        long time = 0;
+        for (String value : split) {
+            int nums = Integer.parseInt(value.replaceAll("[^\\d]", ""));
+            String letters = value.replaceAll("[^a-z]", "");
+            switch (letters) {
+                case "week":
+                case "weeks":
+                case "wks":
+                case "w":
+
+                    time += 604800 * nums;
+                case "days":
+                case "day":
+                case "d":
+                    time += 86400 * nums;
+                case "hour":
+                case "hr":
+                case "hrs":
+                case "hours":
+                case "h":
+                    time += 3600 * nums;
+                case "minutes":
+                case "minute":
+                case "mins":
+                case "min":
+                case "m":
+                    time += 60 * nums;
+                case "seconds":
+                case "second":
+                case "secs":
+                case "sec":
+                case "s":
+                    time += nums;
+            }
+        }
+        return time;
+    }
+
+    /**
+     * Hashcode of a boolean array.<br>
+     * - Used for traversing mega plots quickly.
+     *
+     * @param array
+     * @return hashcode
+     */
+    public static int hash(boolean[] array) {
+        if (array.length == 4) {
+            if (!array[0] && !array[1] && !array[2] && !array[3]) {
+                return 0;
+            }
+            return ((array[0] ? 1 : 0) << 3) + ((array[1] ? 1 : 0) << 2) + ((array[2] ? 1 : 0) << 1)
+                + (array[3] ? 1 : 0);
+        }
+        int n = 0;
+        for (boolean anArray : array) {
+            n = (n << 1) + (anArray ? 1 : 0);
+        }
+        return n;
+    }
+
+    /**
+     * Get a list of plot ids within a selection.
+     *
+     * @param pos1
+     * @param pos2
+     * @return
+     */
+    public static ArrayList<PlotId> getPlotSelectionIds(PlotId pos1, PlotId pos2) {
+        ArrayList<PlotId> myPlots = new ArrayList<>();
+        for (int x = pos1.x; x <= pos2.x; x++) {
+            for (int y = pos1.y; y <= pos2.y; y++) {
+                myPlots.add(new PlotId(x, y));
+            }
+        }
+        return myPlots;
+    }
+
+    /**
+     * Get the name from a UUID.
+     *
+     * @param owner
+     * @return The player's name, None, Everyone or Unknown
+     */
+    public static String getName(UUID owner) {
+        if (owner == null) {
+            return C.NONE.s();
+        }
+        if (owner.equals(DBFunc.EVERYONE)) {
+            return C.EVERYONE.s();
+        }
+        String name = UUIDHandler.getName(owner);
+        if (name == null) {
+            return C.UNKNOWN.s();
+        }
+        return name;
+    }
+
+    /**
+     * Get the corner locations for a list of regions.
+     *
+     * @param world
+     * @param regions
+     * @return
+     * @see Plot#getCorners()
+     */
+    public static Location[] getCorners(String world, Collection<RegionWrapper> regions) {
+        Location min = null;
+        Location max = null;
+        for (RegionWrapper region : regions) {
+            Location[] corners = region.getCorners(world);
+            if (min == null) {
+                min = corners[0];
+                max = corners[1];
+                continue;
+            }
+            Location pos1 = corners[0];
+            Location pos2 = corners[1];
+            if (pos2.getX() > max.getX()) {
+                max.setX(pos2.getX());
+            }
+            if (pos1.getX() < min.getX()) {
+                min.setX(pos1.getX());
+            }
+            if (pos2.getZ() > max.getZ()) {
+                max.setZ(pos2.getZ());
+            }
+            if (pos1.getZ() < min.getZ()) {
+                min.setZ(pos1.getZ());
+            }
+        }
+        return new Location[] {min, max};
+    }
+
+    /**
+     * Fuzzy plot search with spaces separating terms.
+     * - Terms: type, alias, world, owner, trusted, member
+     *
+     * @param search
+     * @return
+     */
+    public static List<Plot> getPlotsBySearch(String search) {
+        String[] split = search.split(" ");
+        int size = split.length * 2;
+
+        List<UUID> uuids = new ArrayList<>();
+        PlotId id = null;
+        PlotArea area = null;
+        String alias = null;
+
+        for (String term : split) {
+            try {
+                UUID uuid = UUIDHandler.getUUID(term, null);
+                if (uuid == null) {
+                    uuid = UUID.fromString(term);
+                }
+                uuids.add(uuid);
+            } catch (Exception ignored) {
+                id = PlotId.fromString(term);
+                if (id != null) {
+                    continue;
+                }
+                area = PlotSquared.get().getPlotAreaByString(term);
+                if (area == null) {
+                    alias = term;
+                }
+            }
+        }
+
+        ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
+        for (int i = 0; i < size; i++) {
+            plotList.add(new ArrayList<>());
+        }
+
+        for (Plot plot : PlotSquared.get().getPlots()) {
+            int count = 0;
+            if (!uuids.isEmpty()) {
+                for (UUID uuid : uuids) {
+                    if (plot.isOwner(uuid)) {
+                        count += 2;
+                    } else if (plot.isAdded(uuid)) {
+                        count++;
+                    }
+                }
+            }
+            if (id != null) {
+                if (plot.getId().equals(id)) {
+                    count++;
+                }
+            }
+            if (plot.getArea().equals(area)) {
+                count++;
+            }
+            if (alias != null && alias.equals(plot.getAlias())) {
+                count += 2;
+            }
+            if (count != 0) {
+                plotList.get(count - 1).add(plot);
+            }
+        }
+
+        List<Plot> plots = new ArrayList<>();
+        for (int i = plotList.size() - 1; i >= 0; i--) {
+            if (!plotList.get(i).isEmpty()) {
+                plots.addAll(plotList.get(i));
+            }
+        }
+        return plots;
+    }
+
+    /**
+     * Get the plot from a string.
+     *
+     * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
+     * @param arg     The search term
+     * @param message If a message should be sent to the player if a plot cannot be found
+     * @return The plot if only 1 result is found, or null
+     */
+    public static Plot getPlotFromString(PlotPlayer player, String arg, boolean message) {
+        if (arg == null) {
+            if (player == null) {
+                if (message) {
+                    PlotSquared.log(C.NOT_VALID_PLOT_WORLD);
+                }
+                return null;
+            }
+            return player.getCurrentPlot();
+        }
+        PlotArea area;
+        if (player != null) {
+            area = PlotSquared.get().getPlotAreaByString(arg);
+            if (area == null) {
+                area = player.getApplicablePlotArea();
+            }
+        } else {
+            area = ConsolePlayer.getConsole().getApplicablePlotArea();
+        }
+        String[] split = arg.split(";|,");
+        PlotId id;
+        if (split.length == 4) {
+            area = PlotSquared.get().getPlotAreaByString(split[0] + ';' + split[1]);
+            id = PlotId.fromString(split[2] + ';' + split[3]);
+        } else if (split.length == 3) {
+            area = PlotSquared.get().getPlotAreaByString(split[0]);
+            id = PlotId.fromString(split[1] + ';' + split[2]);
+        } else if (split.length == 2) {
+            id = PlotId.fromString(arg);
+        } else {
+            Collection<Plot> plots;
+            if (area == null) {
+                plots = PlotSquared.get().getPlots();
+            } else {
+                plots = area.getPlots();
+            }
+            for (Plot p : plots) {
+                String name = p.getAlias();
+                if (!name.isEmpty() && StringMan.isEqualIgnoreCase(name, arg)) {
+                    return p;
+                }
+            }
+            if (message) {
+                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            }
+            return null;
+        }
+        if (id == null) {
+            if (message) {
+                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            }
+            return null;
+        }
+        if (area == null) {
+            if (message) {
+                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+            }
+            return null;
+        }
+        return area.getPlotAbs(id);
+    }
+
+    public static File getFile(File base, String path) {
+        if (Paths.get(path).isAbsolute()) {
+            return new File(path);
+        }
+        return new File(base, path);
+    }
+
+    /**
+     * Synchronously set the biome in a selection.
+     *
+     * @param world
+     * @param p1x
+     * @param p1z
+     * @param p2x
+     * @param p2z
+     * @param biome
+     */
+    public static void setBiome(String world, int p1x, int p1z, int p2x, int p2z, String biome) {
+        RegionWrapper region = new RegionWrapper(p1x, p2x, p1z, p2z);
+        WorldUtil.IMP.setBiomes(world, region, biome);
+    }
+
+    /**
+     * Get the highest block at a location.
+     *
+     * @param world
+     * @param x
+     * @param z
+     * @return
+     */
+    public static int getHeighestBlock(String world, int x, int z) {
+        int result = WorldUtil.IMP.getHighestBlock(world, x, z);
+        if (result == 0) {
+            return 63;
+        }
+        return result;
+    }
+
+    /**
+     * Send a message to the player.
+     *
+     * @param player Player to receive message
+     * @param msg    Message to send
+     * @return true Can be used in things such as commands (return PlayerFunctions.sendMessage(...))
+     */
+    public static boolean sendMessage(PlotPlayer player, String msg) {
+        return sendMessage(player, msg, true);
+    }
+
+    /**
+     * Send a message to console.
+     *
+     * @param caption
+     * @param args
+     */
+    public static void sendConsoleMessage(C caption, String... args) {
+        sendMessage(null, caption, args);
+    }
+
+    /**
+     * Send a message to a player.
+     *
+     * @param player Can be null to represent console, or use ConsolePlayer.getConsole()
+     * @param msg
+     * @param prefix If the message should be prefixed with the configured prefix
+     * @return
+     */
+    public static boolean sendMessage(PlotPlayer player, String msg, boolean prefix) {
+        if (!msg.isEmpty()) {
+            if (player == null) {
+                String message = (prefix ? C.PREFIX.s() : "") + msg;
+                PlotSquared.log(message);
+            } else {
+                player.sendMessage((prefix ? C.PREFIX.s() : "") + C.color(msg));
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Send a message to the player.
+     *
+     * @param player  the recipient of the message
+     * @param caption the message to send
+     * @return boolean success
+     */
+    public static boolean sendMessage(PlotPlayer player, C caption, String... args) {
+        return sendMessage(player, caption, (Object[]) args);
+    }
+
+    /**
+     * Send a message to the player
+     *
+     * @param player  the recipient of the message
+     * @param caption the message to send
+     * @return boolean success
+     */
+    public static boolean sendMessage(final PlotPlayer player, final C caption,
+        final Object... args) {
+        if (caption.s().isEmpty()) {
+            return true;
+        }
+        TaskManager.runTaskAsync(() -> {
+            String m = C.format(caption, args);
+            if (player == null) {
+                PlotSquared.log(m);
+            } else {
+                player.sendMessage(m);
+            }
+        });
+        return true;
+    }
+
+    /**
+     * If rating categories are enabled, get the average rating by category.<br>
+     * - The index corresponds to the index of the category in the config
+     *
+     * @param plot
+     * @return
+     */
+    public static double[] getAverageRatings(Plot plot) {
+        HashMap<UUID, Integer> rating;
+        if (plot.getSettings().ratings != null) {
+            rating = plot.getSettings().ratings;
+        } else if (Settings.Enabled_Components.RATING_CACHE) {
+            rating = new HashMap<>();
+        } else {
+            rating = DBFunc.getRatings(plot);
+        }
+        int size = 1;
+        if (!Settings.Ratings.CATEGORIES.isEmpty()) {
+            size = Math.max(1, Settings.Ratings.CATEGORIES.size());
+        }
+        double[] ratings = new double[size];
+        if (rating == null || rating.isEmpty()) {
+            return ratings;
+        }
+        for (Entry<UUID, Integer> entry : rating.entrySet()) {
+            int current = entry.getValue();
+            if (Settings.Ratings.CATEGORIES.isEmpty()) {
+                ratings[0] += current;
+            } else {
+                for (int i = 0; i < Settings.Ratings.CATEGORIES.size(); i++) {
+                    ratings[i] += current % 10 - 1;
+                    current /= 10;
+                }
+            }
+        }
+        for (int i = 0; i < size; i++) {
+            ratings[i] /= rating.size();
+        }
+        return ratings;
+    }
+
+    public static Set<UUID> getUUIDsFromString(String list) {
+        String[] split = list.split(",");
+        HashSet<UUID> result = new HashSet<>();
+        for (String name : split) {
+            if (name.isEmpty()) {
+                // Invalid
+                return Collections.emptySet();
+            }
+            if ("*".equals(name)) {
+                result.add(DBFunc.EVERYONE);
+                continue;
+            }
+            if (name.length() > 16) {
+                try {
+                    result.add(UUID.fromString(name));
+                    continue;
+                } catch (IllegalArgumentException ignored) {
+                    return Collections.emptySet();
+                }
+            }
+            UUID uuid = UUIDHandler.getUUID(name, null);
+            if (uuid == null) {
+                return Collections.emptySet();
+            }
+            result.add(uuid);
+        }
+        return result;
+    }
+
+    /**
+     * Format a string with plot information.
+     *
+     * @param info
+     * @param plot
+     * @param player
+     * @param full
+     * @param whenDone
+     */
+    public static void format(String info, final Plot plot, PlotPlayer player, final boolean full,
+        final RunnableVal<String> whenDone) {
+        int num = plot.getConnectedPlots().size();
+        String alias = !plot.getAlias().isEmpty() ? plot.getAlias() : C.NONE.s();
+        Location bot = plot.getCorners()[0];
+        String biome = WorldUtil.IMP.getBiome(plot.getWorldName(), bot.getX(), bot.getZ());
+        String trusted = getPlayerList(plot.getTrusted());
+        String members = getPlayerList(plot.getMembers());
+        String denied = getPlayerList(plot.getDenied());
+        String seen;
+        if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
+            if (plot.isOnline()) {
+                seen = C.NOW.s();
+            } else {
+                int time = (int) (ExpireManager.IMP.getAge(plot) / 1000);
+                if (time != 0) {
+                    seen = MainUtil.secToTime(time);
+                } else {
+                    seen = C.UNKNOWN.s();
+                }
+            }
+        } else {
+            seen = C.NEVER.s();
+        }
+        Optional<String> descriptionFlag = plot.getFlag(Flags.DESCRIPTION);
+        String description = !descriptionFlag.isPresent() ?
+            C.NONE.s() :
+            Flags.DESCRIPTION.valueToString(descriptionFlag.get());
+
+        StringBuilder flags = new StringBuilder();
+        HashMap<Flag<?>, Object> flagMap =
+            FlagManager.getPlotFlags(plot.getArea(), plot.getSettings(), true);
+        if (flagMap.isEmpty()) {
+            flags.append(C.NONE.s());
+        } else {
+            String prefix = "";
+            for (Entry<Flag<?>, Object> entry : flagMap.entrySet()) {
+                Object value = entry.getValue();
+                if (entry.getKey() instanceof DoubleFlag && !Settings.General.SCIENTIFIC) {
+                    DecimalFormat df = new DecimalFormat("0");
+                    df.setMaximumFractionDigits(340);
+                    value = df.format(value);
+                }
+                flags.append(prefix).append(C.PLOT_FLAG_LIST.f(entry.getKey().getName(), value));
+                prefix = ", ";
+            }
+        }
+        boolean build = plot.isAdded(player.getUUID());
+        String owner = plot.getOwners().isEmpty() ? "unowned" : getPlayerList(plot.getOwners());
+        info = info.replace("%id%", plot.getId().toString());
+        info = info.replace("%alias%", alias);
+        info = info.replace("%num%", String.valueOf(num));
+        info = info.replace("%desc%", description);
+        info = info.replace("%biome%", biome);
+        info = info.replace("%owner%", owner);
+        info = info.replace("%members%", members);
+        info = info.replace("%player%", player.getName());
+        info = info.replace("%trusted%", trusted);
+        info = info.replace("%helpers%", members);
+        info = info.replace("%denied%", denied);
+        info = info.replace("%seen%", seen);
+        info = info.replace("%flags%", flags);
+        info = info.replace("%build%", String.valueOf(build));
+        info = info.replace("%desc%", "No description set.");
+        if (info.contains("%rating%")) {
+            final String newInfo = info;
+            TaskManager.runTaskAsync(() -> {
+                int max = 10;
+                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
+                    max = 8;
+                }
+                String info1;
+                if (full && Settings.Ratings.CATEGORIES != null
+                    && Settings.Ratings.CATEGORIES.size() > 1) {
+                    double[] ratings = MainUtil.getAverageRatings(plot);
+                    String rating = "";
+                    String prefix = "";
+                    for (int i = 0; i < ratings.length; i++) {
+                        rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
+                            .format("%.1f", ratings[i]);
+                        prefix = ",";
+                    }
+                    info1 = newInfo.replaceAll("%rating%", rating);
+                } else {
+                    info1 = newInfo.replaceAll("%rating%",
+                        String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                }
+                whenDone.run(info1);
+            });
+            return;
+        }
+        whenDone.run(info);
+    }
+
+    public static boolean deleteDirectory(File directory) {
+        if (directory.exists()) {
+            File[] files = directory.listFiles();
+            if (null != files) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        deleteDirectory(file);
+                    } else {
+                        PlotSquared.debug("Deleting file: " + file + " | " + file.delete());
+                    }
+                }
+            }
+        }
+        return (directory.delete());
+    }
+
+    /**
+     * Get a list of names given a list of uuids.<br>
+     * - Uses the format {@link C#PLOT_USER_LIST} for the returned string
+     *
+     * @param uuids
+     * @return
+     */
+    public static String getPlayerList(Collection<UUID> uuids) {
+        ArrayList<UUID> l = new ArrayList<>(uuids);
+        if (l.size() < 1) {
+            return C.NONE.s();
+        }
+        List<String> users = new ArrayList<>();
+        for (UUID u : l) {
+            users.add(getName(u));
+        }
+        Collections.sort(users);
+        String c = C.PLOT_USER_LIST.s();
+        StringBuilder list = new StringBuilder();
+        for (int x = 0; x < users.size(); x++) {
+            if (x + 1 == l.size()) {
+                list.append(c.replace("%user%", users.get(x)).replace(",", ""));
+            } else {
+                list.append(c.replace("%user%", users.get(x)));
+            }
+        }
+        return list.toString();
+    }
+
+    public static void getPersistentMeta(UUID uuid, final String key,
+        final RunnableVal<byte[]> result) {
+        PlotPlayer player = UUIDHandler.getPlayer(uuid);
+        if (player != null) {
+            result.run(player.getPersistentMeta(key));
+        } else {
+            DBFunc.getPersistentMeta(uuid, new RunnableVal<Map<String, byte[]>>() {
+                @Override public void run(Map<String, byte[]> value) {
+                    result.run(value.get(key));
+                }
+            });
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
new file mode 100644
index 000000000..2e65e9305
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
@@ -0,0 +1,323 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+public class MathMan {
+
+    private static final int ATAN2_BITS = 7;
+    private static final int ATAN2_BITS2 = ATAN2_BITS << 1;
+    private static final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
+    private static final int ATAN2_COUNT = ATAN2_MASK + 1;
+    private static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
+    private static final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
+    private static final float[] atan2 = new float[ATAN2_COUNT];
+    private static final int[] table =
+        {0, 16, 22, 27, 32, 35, 39, 42, 45, 48, 50, 53, 55, 57, 59, 61, 64, 65, 67, 69, 71, 73, 75,
+            76, 78, 80, 81, 83, 84, 86, 87, 89, 90, 91, 93, 94, 96, 97, 98, 99, 101, 102, 103, 104,
+            106, 107, 108, 109, 110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+            124, 125, 126, 128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
+            141, 142, 143, 144, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155,
+            155, 156, 157, 158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
+            169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178, 179, 180, 181,
+            181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, 190, 191, 192, 192,
+            193, 193, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201, 201, 202, 203, 203,
+            204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211, 212, 212, 213, 214,
+            214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 221, 221, 222, 222, 223, 224,
+            224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230, 230, 231, 231, 232, 232, 233,
+            234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239, 240, 240, 241, 241, 242, 242,
+            243, 243, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 249, 249, 250, 250, 251,
+            251, 252, 252, 253, 253, 254, 254, 255};
+
+    static {
+        for (int i = 0; i < ATAN2_DIM; i++) {
+            for (int j = 0; j < ATAN2_DIM; j++) {
+                float x0 = (float) i / ATAN2_DIM;
+                float y0 = (float) j / ATAN2_DIM;
+
+                atan2[(j * ATAN2_DIM) + i] = (float) Math.atan2(y0, x0);
+            }
+        }
+    }
+
+    public static long pairInt(int x, int y) {
+        return (((long) x) << 32) | (y & 0xffffffffL);
+    }
+
+    public static int unpairIntX(long pair) {
+        return (int) (pair >> 32);
+    }
+
+    public static int unpairIntY(long pair) {
+        return (int) pair;
+    }
+
+    public static byte pair16(byte x, byte y) {
+        return (byte) (x + (y << 4));
+    }
+
+    public static byte unpair16x(byte value) {
+        return (byte) (value & 0xF);
+    }
+
+    public static byte unpair16y(byte value) {
+        return (byte) ((value >> 4) & 0xF);
+    }
+
+    public static long inverseRound(double val) {
+        long round = Math.round(val);
+        return (long) (round + Math.signum(val - round));
+    }
+
+    public static int sqrt(int x) {
+        int xn;
+
+        if (x >= 0x10000) {
+            if (x >= 0x1000000) {
+                if (x >= 0x10000000) {
+                    if (x >= 0x40000000) {
+                        xn = table[x >> 24] << 8;
+                    } else {
+                        xn = table[x >> 22] << 7;
+                    }
+                } else {
+                    if (x >= 0x4000000) {
+                        xn = table[x >> 20] << 6;
+                    } else {
+                        xn = table[x >> 18] << 5;
+                    }
+                }
+
+                xn = (xn + 1 + (x / xn)) >> 1;
+                xn = (xn + 1 + (x / xn)) >> 1;
+                return ((xn * xn) > x) ? --xn : xn;
+            } else {
+                if (x >= 0x100000) {
+                    if (x >= 0x400000) {
+                        xn = table[x >> 16] << 4;
+                    } else {
+                        xn = table[x >> 14] << 3;
+                    }
+                } else {
+                    if (x >= 0x40000) {
+                        xn = table[x >> 12] << 2;
+                    } else {
+                        xn = table[x >> 10] << 1;
+                    }
+                }
+
+                xn = (xn + 1 + (x / xn)) >> 1;
+
+                return ((xn * xn) > x) ? --xn : xn;
+            }
+        } else {
+            if (x >= 0x100) {
+                if (x >= 0x1000) {
+                    if (x >= 0x4000) {
+                        xn = (table[x >> 8]) + 1;
+                    } else {
+                        xn = (table[x >> 6] >> 1) + 1;
+                    }
+                } else {
+                    if (x >= 0x400) {
+                        xn = (table[x >> 4] >> 2) + 1;
+                    } else {
+                        xn = (table[x >> 2] >> 3) + 1;
+                    }
+                }
+
+                return ((xn * xn) > x) ? --xn : xn;
+            } else {
+                if (x >= 0) {
+                    return table[x] >> 4;
+                }
+            }
+        }
+        throw new IllegalArgumentException("Invalid number:" + x);
+    }
+
+
+    public static double getMean(int[] array) {
+        double count = 0;
+        for (int i : array) {
+            count += i;
+        }
+        return count / array.length;
+    }
+
+    public static double getMean(double[] array) {
+        double count = 0;
+        for (double i : array) {
+            count += i;
+        }
+        return count / array.length;
+    }
+
+    public static int pair(short x, short y) {
+        return (x << 16) | (y & 0xFFFF);
+    }
+
+    public static final int average(int a, int b) {
+        return (a & b) + (a ^ b) / 2;
+    }
+
+    public static short unpairX(int hash) {
+        return (short) (hash >> 16);
+    }
+
+    public static short unpairY(int hash) {
+        return (short) (hash & 0xFFFF);
+    }
+
+    /**
+     * Returns [x, y, z]
+     *
+     * @param yaw
+     * @param pitch
+     * @return
+     */
+    public static float[] getDirection(float yaw, float pitch) {
+        double pitch_sin = Math.sin(pitch);
+        return new float[] {(float) (pitch_sin * Math.cos(yaw)),
+            (float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
+    }
+
+    public static int floorMod(int x, int y) {
+        int i = x % y;
+        if (i < 0)
+            i += y;
+        return i;
+    }
+
+    public static int roundInt(double value) {
+        return (int) (value < 0 ? (value == (int) value) ? value : value - 1 : value);
+    }
+
+    /**
+     * Returns [ pitch, yaw ]
+     *
+     * @param x
+     * @param y
+     * @param z
+     * @return
+     */
+    public static float[] getPitchAndYaw(float x, float y, float z) {
+        float distance = sqrtApprox((z * z) + (x * x));
+        return new float[] {atan2(y, distance), atan2(x, z)};
+    }
+
+    public static final float atan2(float y, float x) {
+        float add;
+        float mul;
+
+        if (x < 0.0f) {
+            if (y < 0.0f) {
+                x = -x;
+                y = -y;
+
+                mul = 1.0f;
+            } else {
+                x = -x;
+                mul = -1.0f;
+            }
+
+            add = -3.141592653f;
+        } else {
+            if (y < 0.0f) {
+                y = -y;
+                mul = -1.0f;
+            } else {
+                mul = 1.0f;
+            }
+
+            add = 0.0f;
+        }
+
+        float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
+
+        int xi = (int) (x * invDiv);
+        int yi = (int) (y * invDiv);
+
+        return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
+    }
+
+    public static float sqrtApprox(float f) {
+        return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
+    }
+
+    public static double sqrtApprox(double d) {
+        return Double
+            .longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
+    }
+
+    public static float invSqrt(float x) {
+        float xhalf = 0.5f * x;
+        int i = Float.floatToIntBits(x);
+        i = 0x5f3759df - (i >> 1);
+        x = Float.intBitsToFloat(i);
+        x = x * (1.5f - (xhalf * x * x));
+        return x;
+    }
+
+    public static int getPositiveId(int i) {
+        if (i < 0) {
+            return (-i * 2) - 1;
+        }
+        return i * 2;
+    }
+
+    public static boolean isInteger(String str) {
+        if (str == null) {
+            return false;
+        }
+        int length = str.length();
+        if (length == 0) {
+            return false;
+        }
+        int i = 0;
+        if (str.charAt(0) == '-') {
+            if (length == 1) {
+                return false;
+            }
+            i = 1;
+        }
+        for (; i < length; i++) {
+            char c = str.charAt(i);
+            if ((c <= '/') || (c >= ':')) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static double getSD(double[] array, double av) {
+        double sd = 0;
+        for (double element : array) {
+            sd += Math.pow(Math.abs(element - av), 2);
+        }
+        return Math.sqrt(sd / array.length);
+    }
+
+    public static double getSD(int[] array, double av) {
+        double sd = 0;
+        for (int element : array) {
+            sd += Math.pow(Math.abs(element - av), 2);
+        }
+        return Math.sqrt(sd / array.length);
+    }
+
+    public static int mod(int x, int y) {
+        if (isPowerOfTwo(y)) {
+            return x & (y - 1);
+        }
+        return x % y;
+    }
+
+    public static int unsignedmod(int x, int y) {
+        if (isPowerOfTwo(y)) {
+            return x & (y - 1);
+        }
+        return x % y;
+    }
+
+    public static boolean isPowerOfTwo(int number) {
+        return (number & (number - 1)) == 0;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
new file mode 100644
index 000000000..bcd71b186
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
@@ -0,0 +1,126 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+import java.util.HashMap;
+
+/**
+ * The Permissions class handles checking user permissions.<br>
+ * - This will respect * nodes and plots.admin and can be used to check permission ranges (e.g. plots.plot.5)<br>
+ * - Checking the PlotPlayer class directly will not take the above into account<br>
+ */
+public class Permissions {
+
+    public static boolean hasPermission(PlotPlayer player, C caption, boolean notify) {
+        return hasPermission(player, caption.s(), notify);
+    }
+
+    /**
+     * Check if a player has a permission (C class helps keep track of permissions).
+     *
+     * @param player
+     * @param caption
+     * @return
+     */
+    public static boolean hasPermission(PlotPlayer player, C caption) {
+        return hasPermission(player, caption.s());
+    }
+
+    /**
+     * Check if a {@link PlotPlayer} has a permission.
+     *
+     * @param player
+     * @param permission
+     * @return
+     */
+    public static boolean hasPermission(PlotPlayer player, String permission) {
+        if (!Settings.Enabled_Components.PERMISSION_CACHE) {
+            return hasPermission((CommandCaller) player, permission);
+        }
+        HashMap<String, Boolean> map = player.getMeta("perm");
+        if (map != null) {
+            Boolean result = map.get(permission);
+            if (result != null) {
+                return result;
+            }
+        } else {
+            map = new HashMap<>();
+            player.setMeta("perm", map);
+        }
+        boolean result = hasPermission((CommandCaller) player, permission);
+        map.put(permission, result);
+        return result;
+    }
+
+    /**
+     * Check if a {@code CommandCaller} has a permission.
+     *
+     * @param caller
+     * @param permission
+     * @return
+     */
+    public static boolean hasPermission(CommandCaller caller, String permission) {
+        if (caller.hasPermission(permission)) {
+            return true;
+        } else if (caller.isPermissionSet(permission)) {
+            return false;
+        }
+        if (caller.hasPermission(C.PERMISSION_ADMIN.s())) {
+            return true;
+        }
+        permission = permission.toLowerCase().replaceAll("^[^a-z|0-9|\\.|_|-]", "");
+        String[] nodes = permission.split("\\.");
+        StringBuilder n = new StringBuilder();
+        for (int i = 0; i <= (nodes.length - 1); i++) {
+            n.append(nodes[i] + ".");
+            String combined = n + C.PERMISSION_STAR.s();
+            if (!permission.equals(combined)) {
+                if (caller.hasPermission(combined)) {
+                    return true;
+                } else if (caller.isPermissionSet(combined)) {
+                    return false;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if a PlotPlayer has a permission, and optionally send the no permission message if applicable.
+     *
+     * @param player
+     * @param permission
+     * @param notify
+     * @return
+     */
+    public static boolean hasPermission(PlotPlayer player, String permission, boolean notify) {
+        if (!hasPermission(player, permission)) {
+            if (notify) {
+                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, permission);
+            }
+            return false;
+        }
+        return true;
+    }
+
+    public static int hasPermissionRange(PlotPlayer player, C perm, int range) {
+        return hasPermissionRange(player, perm.s(), range);
+    }
+
+    /**
+     * Check the the highest permission a PlotPlayer has within a specified range.<br>
+     * - Excessively high values will lag<br>
+     * - The default range that is checked is {@link Settings.Limit#MAX_PLOTS}<br>
+     *
+     * @param player
+     * @param stub   The permission stub to check e.g. for `plots.plot.#` the stub is `plots.plot`
+     * @param range  The range to check
+     * @return The highest permission they have within that range
+     */
+    public static int hasPermissionRange(PlotPlayer player, String stub, int range) {
+        return player.hasPermissionRange(stub, range);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java
new file mode 100644
index 000000000..b3b1fd5a7
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java
@@ -0,0 +1,32 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+public enum PlotGameMode {
+    NOT_SET(-1, ""), SURVIVAL(0, "survival"), CREATIVE(1, "creative"), ADVENTURE(2,
+        "adventure"), SPECTATOR(3, "spectator");
+
+    private final int id;
+    private final String name;
+
+    PlotGameMode(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    /**
+     * The magic-value id of the GameMode.
+     *
+     * @return the GameMode id
+     */
+    public int getId() {
+        return this.id;
+    }
+
+    /**
+     * Get the name of this GameMode
+     *
+     * @return the GameMode name
+     */
+    public String getName() {
+        return this.name;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java
new file mode 100644
index 000000000..62ea9cc33
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java
@@ -0,0 +1,5 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+public enum PlotWeather {
+    RAIN, CLEAR, RESET
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
new file mode 100644
index 000000000..cf6bbee2d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
@@ -0,0 +1,677 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import java.lang.reflect.*;
+import java.util.*;
+
+/**
+ * @author DPOH-VAR
+ * @version 1.0
+ */
+public class ReflectionUtils {
+
+    /**
+     * prefix of bukkit classes
+     */
+    private static String preClassB = "org.bukkit.craftbukkit";
+    /**
+     * prefix of minecraft classes
+     */
+    private static String preClassM = "net.minecraft.server";
+
+    public ReflectionUtils(String version) {
+        if (version != null) {
+            preClassB += '.' + version;
+            preClassM += '.' + version;
+        }
+    }
+
+    public static <T, V> Map<T, V> getMap(Map<T, V> map) {
+        try {
+            Class<? extends Map> clazz = map.getClass();
+            Field m = clazz.getDeclaredField("m");
+            m.setAccessible(true);
+            return (Map<T, V>) m.get(map);
+        } catch (Throwable e) {
+            e.printStackTrace();
+            return map;
+        }
+    }
+
+    public static Method findMethod(Class<?> clazz, boolean isStatic, Class<?> returnType,
+        Class... types) {
+        loop:
+        for (Method method : clazz.getMethods()) {
+            Class<?> result = method.getReturnType();
+            Class<?>[] param = method.getParameterTypes();
+            int paramCount = param.length;
+            boolean stc = Modifier.isStatic(method.getModifiers());
+            if (stc == isStatic && result == returnType && types.length == paramCount) {
+                for (int i = 0; i < types.length; i++) {
+                    if (types[i] != param[i]) {
+                        continue loop;
+                    }
+                }
+                method.setAccessible(true);
+                return method;
+            }
+        }
+        throw new RuntimeException("no such method");
+    }
+
+    public static Field findField(Class<?> clazz, Class<?> fieldClass) {
+        for (Field field : clazz.getFields()) {
+            if (fieldClass == field.getType() || fieldClass.isAssignableFrom(field.getType())) {
+                field.setAccessible(true);
+                return field;
+            }
+        }
+        return null;
+    }
+
+    public static <T> List<T> getStaticFields(Class clazz) {
+        ArrayList<T> list = new ArrayList<T>();
+        try {
+            Field[] fields = clazz.getFields();
+            for (Field field : fields) {
+                Object value = field.get(null);
+                try {
+                    list.add((T) value);
+                } catch (ClassCastException ignored) {
+                }
+            }
+        } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+    public static Class<?> getNmsClass(String name) {
+        String className = preClassM + '.' + name;
+        return getClass(className);
+    }
+
+    public static Class<?> getCbClass(String name) {
+        String className = preClassB + '.' + name;
+        return getClass(className);
+    }
+
+    public static Class<?> getUtilClass(String name) {
+        try {
+            return Class.forName(name); //Try before 1.8 first
+        } catch (ClassNotFoundException ignored) {
+        }
+        try {
+            return Class.forName("net.minecraft.util." + name); //Not 1.8
+        } catch (ClassNotFoundException ignored) {
+            return null;
+        }
+    }
+
+    public static Object getHandle(Object wrapper) {
+        Method getHandle = makeMethod(wrapper.getClass(), "getHandle");
+        return callMethod(getHandle, wrapper);
+    }
+
+    //Utils
+    public static Method makeMethod(Class<?> clazz, String methodName, Class<?>... paramaters) {
+        try {
+            return clazz.getDeclaredMethod(methodName, paramaters);
+        } catch (NoSuchMethodException ignored) {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T callMethod(Method method, Object instance, Object... paramaters) {
+        if (method == null) {
+            throw new RuntimeException("No such method");
+        }
+        method.setAccessible(true);
+        try {
+            return (T) method.invoke(instance, paramaters);
+        } catch (InvocationTargetException ex) {
+            throw new RuntimeException(ex.getCause());
+        } catch (IllegalAccessException | IllegalArgumentException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Constructor<T> makeConstructor(Class<?> clazz, Class<?>... paramaterTypes) {
+        try {
+            return (Constructor<T>) clazz.getConstructor(paramaterTypes);
+        } catch (NoSuchMethodException ignored) {
+            return null;
+        }
+    }
+
+    public static <T> T callConstructor(Constructor<T> constructor, Object... paramaters) {
+        if (constructor == null) {
+            throw new RuntimeException("No such constructor");
+        }
+        constructor.setAccessible(true);
+        try {
+            return constructor.newInstance(paramaters);
+        } catch (InvocationTargetException ex) {
+            throw new RuntimeException(ex.getCause());
+        } catch (IllegalAccessException | IllegalArgumentException | InstantiationException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    public static Field makeField(Class<?> clazz, String name) {
+        try {
+            return clazz.getDeclaredField(name);
+        } catch (NoSuchFieldException ignored) {
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked") public static <T> T getField(Field field, Object instance) {
+        if (field == null) {
+            throw new RuntimeException("No such field");
+        }
+        field.setAccessible(true);
+        try {
+            return (T) field.get(instance);
+        } catch (IllegalAccessException | IllegalArgumentException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    public static void setField(Field field, Object instance, Object value) {
+        if (field == null) {
+            throw new RuntimeException("No such field");
+        }
+        field.setAccessible(true);
+        try {
+            field.set(instance, value);
+        } catch (IllegalAccessException | IllegalArgumentException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    public static Class<?> getClass(String name) {
+        try {
+            return Class.forName(name);
+        } catch (ClassNotFoundException ignored) {
+            return null;
+        }
+    }
+
+    public static <T> Class<? extends T> getClass(String name, Class<T> superClass) {
+        try {
+            return Class.forName(name).asSubclass(superClass);
+        } catch (ClassCastException | ClassNotFoundException ignored) {
+            return null;
+        }
+    }
+
+    /**
+     * Get class for name. Replace {nms} to net.minecraft.server.V*. Replace {cb} to org.bukkit.craftbukkit.V*. Replace
+     * {nm} to net.minecraft
+     *
+     * @param className possible class paths
+     * @return RefClass object
+     * @throws ClassNotFoundException if no class found
+     */
+    public static RefClass getRefClass(String className) throws ClassNotFoundException {
+        className = className.replace("{cb}", preClassB).replace("{nms}", preClassM)
+            .replace("{nm}", "net.minecraft");
+        return getRefClass(Class.forName(className));
+    }
+
+    /**
+     * get RefClass object by real class
+     *
+     * @param clazz class
+     * @return RefClass based on passed class
+     */
+    public static RefClass getRefClass(Class clazz) {
+        return new RefClass(clazz);
+    }
+
+    /**
+     * RefClass - utility to simplify work with reflections.
+     */
+    public static class RefClass {
+
+        private final Class<?> clazz;
+
+        private RefClass(Class<?> clazz) {
+            this.clazz = clazz;
+        }
+
+        /**
+         * get passed class
+         *
+         * @return class
+         */
+        public Class<?> getRealClass() {
+            return this.clazz;
+        }
+
+        /**
+         * see {@link Class#isInstance(Object)}
+         *
+         * @param object the object to check
+         * @return true if object is an instance of this class
+         */
+        public boolean isInstance(Object object) {
+            return this.clazz.isInstance(object);
+        }
+
+        /**
+         * get existing method by name and types
+         *
+         * @param name  name
+         * @param types method parameters. can be Class or RefClass
+         * @return RefMethod object
+         * @throws RuntimeException if method not found
+         */
+        public RefMethod getMethod(String name, Object... types) throws NoSuchMethodException {
+            Class[] classes = new Class[types.length];
+            int i = 0;
+            for (Object e : types) {
+                if (e instanceof Class) {
+                    classes[i++] = (Class) e;
+                } else if (e instanceof RefClass) {
+                    classes[i++] = ((RefClass) e).getRealClass();
+                } else {
+                    classes[i++] = e.getClass();
+                }
+            }
+            try {
+                return new RefMethod(this.clazz.getMethod(name, classes));
+            } catch (NoSuchMethodException ignored) {
+                return new RefMethod(this.clazz.getDeclaredMethod(name, classes));
+            }
+        }
+
+        /**
+         * get existing constructor by types
+         *
+         * @param types parameters. can be Class or RefClass
+         * @return RefMethod object
+         * @throws RuntimeException if constructor not found
+         */
+        public RefConstructor getConstructor(Object... types) throws NoSuchMethodException {
+            Class[] classes = new Class[types.length];
+            int i = 0;
+            for (Object e : types) {
+                if (e instanceof Class) {
+                    classes[i++] = (Class) e;
+                } else if (e instanceof RefClass) {
+                    classes[i++] = ((RefClass) e).getRealClass();
+                } else {
+                    classes[i++] = e.getClass();
+                }
+            }
+            try {
+                return new RefConstructor(this.clazz.getConstructor(classes));
+            } catch (NoSuchMethodException ignored) {
+                return new RefConstructor(this.clazz.getDeclaredConstructor(classes));
+            }
+        }
+
+        /**
+         * find method by type parameters
+         *
+         * @param types parameters. can be Class or RefClass
+         * @return RefMethod object
+         * @throws RuntimeException if method not found
+         */
+        public RefMethod findMethod(Object... types) {
+            Class[] classes = new Class[types.length];
+            int t = 0;
+            for (Object e : types) {
+                if (e instanceof Class) {
+                    classes[t++] = (Class) e;
+                } else if (e instanceof RefClass) {
+                    classes[t++] = ((RefClass) e).getRealClass();
+                } else {
+                    classes[t++] = e.getClass();
+                }
+            }
+            List<Method> methods = new ArrayList<>();
+            Collections.addAll(methods, this.clazz.getMethods());
+            Collections.addAll(methods, this.clazz.getDeclaredMethods());
+            findMethod:
+            for (Method m : methods) {
+                Class<?>[] methodTypes = m.getParameterTypes();
+                if (methodTypes.length != classes.length) {
+                    continue;
+                }
+                for (Class aClass : classes) {
+                    if (!Arrays.equals(classes, methodTypes)) {
+                        continue findMethod;
+                    }
+                    return new RefMethod(m);
+                }
+            }
+            throw new RuntimeException("no such method");
+        }
+
+        /**
+         * find method by name
+         *
+         * @param names possible names of method
+         * @return RefMethod object
+         * @throws RuntimeException if method not found
+         */
+        public RefMethod findMethodByName(String... names) {
+            List<Method> methods = new ArrayList<>();
+            Collections.addAll(methods, this.clazz.getMethods());
+            Collections.addAll(methods, this.clazz.getDeclaredMethods());
+            for (Method m : methods) {
+                for (String name : names) {
+                    if (m.getName().equals(name)) {
+                        return new RefMethod(m);
+                    }
+                }
+            }
+            throw new RuntimeException("no such method");
+        }
+
+        /**
+         * find method by return value
+         *
+         * @param type type of returned value
+         * @return RefMethod
+         * @throws RuntimeException if method not found
+         */
+        public RefMethod findMethodByReturnType(RefClass type) {
+            return findMethodByReturnType(type.clazz);
+        }
+
+        /**
+         * find method by return value
+         *
+         * @param type type of returned value
+         * @return RefMethod
+         * @throws RuntimeException if method not found
+         */
+        public RefMethod findMethodByReturnType(Class type) {
+            if (type == null) {
+                type = void.class;
+            }
+            List<Method> methods = new ArrayList<>();
+            Collections.addAll(methods, this.clazz.getMethods());
+            Collections.addAll(methods, this.clazz.getDeclaredMethods());
+            for (Method m : methods) {
+                if (type.equals(m.getReturnType())) {
+                    return new RefMethod(m);
+                }
+            }
+            throw new RuntimeException("no such method");
+        }
+
+        /**
+         * find constructor by number of arguments
+         *
+         * @param number number of arguments
+         * @return RefConstructor
+         * @throws RuntimeException if constructor not found
+         */
+        public RefConstructor findConstructor(int number) {
+            List<Constructor> constructors = new ArrayList<>();
+            Collections.addAll(constructors, this.clazz.getConstructors());
+            Collections.addAll(constructors, this.clazz.getDeclaredConstructors());
+            for (Constructor m : constructors) {
+                if (m.getParameterTypes().length == number) {
+                    return new RefConstructor(m);
+                }
+            }
+            throw new RuntimeException("no such constructor");
+        }
+
+        /**
+         * get field by name
+         *
+         * @param name field name
+         * @return RefField
+         * @throws RuntimeException if field not found
+         */
+        public RefField getField(String name) throws NoSuchFieldException {
+            try {
+                return new RefField(this.clazz.getField(name));
+            } catch (NoSuchFieldException ignored) {
+                return new RefField(this.clazz.getDeclaredField(name));
+            }
+        }
+
+        /**
+         * find field by type
+         *
+         * @param type field type
+         * @return RefField
+         * @throws RuntimeException if field not found
+         */
+        public RefField findField(RefClass type) {
+            return findField(type.clazz);
+        }
+
+        /**
+         * find field by type
+         *
+         * @param type field type
+         * @return RefField
+         * @throws RuntimeException if field not found
+         */
+        public RefField findField(Class type) {
+            if (type == null) {
+                type = void.class;
+            }
+            List<Field> fields = new ArrayList<>();
+            Collections.addAll(fields, this.clazz.getFields());
+            Collections.addAll(fields, this.clazz.getDeclaredFields());
+            for (Field f : fields) {
+                if (type.equals(f.getType())) {
+                    return new RefField(f);
+                }
+            }
+            throw new RuntimeException("no such field");
+        }
+    }
+
+
+    /**
+     * Method wrapper
+     */
+    public static class RefMethod {
+
+        private final Method method;
+
+        private RefMethod(Method method) {
+            this.method = method;
+            method.setAccessible(true);
+        }
+
+        /**
+         * @return passed method
+         */
+        public Method getRealMethod() {
+            return this.method;
+        }
+
+        /**
+         * @return owner class of method
+         */
+        public RefClass getRefClass() {
+            return new RefClass(this.method.getDeclaringClass());
+        }
+
+        /**
+         * @return class of method return type
+         */
+        public RefClass getReturnRefClass() {
+            return new RefClass(this.method.getReturnType());
+        }
+
+        /**
+         * apply method to object
+         *
+         * @param e object to which the method is applied
+         * @return RefExecutor with method call(...)
+         */
+        public RefExecutor of(Object e) {
+            return new RefExecutor(e);
+        }
+
+        /**
+         * call static method
+         *
+         * @param params sent parameters
+         * @return return value
+         */
+        public Object call(Object... params) {
+            try {
+                return this.method.invoke(null, params);
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        public class RefExecutor {
+
+            final Object e;
+
+            public RefExecutor(Object e) {
+                this.e = e;
+            }
+
+            /**
+             * apply method for selected object
+             *
+             * @param params sent parameters
+             * @return return value
+             * @throws RuntimeException if something went wrong
+             */
+            public Object call(Object... params) {
+                try {
+                    return RefMethod.this.method.invoke(this.e, params);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Constructor wrapper
+     */
+    public static class RefConstructor {
+
+        private final Constructor constructor;
+
+        private RefConstructor(Constructor constructor) {
+            this.constructor = constructor;
+            constructor.setAccessible(true);
+        }
+
+        /**
+         * @return passed constructor
+         */
+        public Constructor getRealConstructor() {
+            return this.constructor;
+        }
+
+        /**
+         * @return owner class of method
+         */
+        public RefClass getRefClass() {
+            return new RefClass(this.constructor.getDeclaringClass());
+        }
+
+        /**
+         * create new instance with constructor
+         *
+         * @param params parameters for constructor
+         * @return new object
+         * @throws ReflectiveOperationException
+         * @throws IllegalArgumentException
+         */
+        public Object create(Object... params)
+            throws ReflectiveOperationException, IllegalArgumentException {
+            return this.constructor.newInstance(params);
+        }
+    }
+
+
+    public static class RefField {
+
+        private final Field field;
+
+        private RefField(Field field) {
+            this.field = field;
+            field.setAccessible(true);
+        }
+
+        /**
+         * @return passed field
+         */
+        public Field getRealField() {
+            return this.field;
+        }
+
+        /**
+         * @return owner class of field
+         */
+        public RefClass getRefClass() {
+            return new RefClass(this.field.getDeclaringClass());
+        }
+
+        /**
+         * @return type of field
+         */
+        public RefClass getFieldRefClass() {
+            return new RefClass(this.field.getType());
+        }
+
+        /**
+         * apply fiend for object
+         *
+         * @param e applied object
+         * @return RefExecutor with getter and setter
+         */
+        public RefExecutor of(Object e) {
+            return new RefExecutor(e);
+        }
+
+        public class RefExecutor {
+
+            final Object e;
+
+            public RefExecutor(Object e) {
+                this.e = e;
+            }
+
+            /**
+             * set field value for applied object
+             *
+             * @param param value
+             */
+            public void set(Object param) {
+                try {
+                    RefField.this.field.set(this.e, param);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            /**
+             * get field value for applied object
+             *
+             * @return value of field
+             */
+            public Object get() {
+                try {
+                    return RefField.this.field.get(this.e);
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java
new file mode 100644
index 000000000..b9fc6ff09
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java
@@ -0,0 +1,15 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class RegExUtil {
+
+    public static Map<String, Pattern> compiledPatterns;
+
+    static {
+        compiledPatterns = new HashMap<>();
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
new file mode 100644
index 000000000..05eeee166
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -0,0 +1,463 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.json.JSONArray;
+import com.github.intellectualsites.plotsquared.json.JSONException;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.generator.ClassicPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.sk89q.jnbt.*;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.io.*;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+public abstract class SchematicHandler {
+    public static SchematicHandler manager;
+
+    private boolean exportAll = false;
+
+    public boolean exportAll(Collection<Plot> collection, final File outputDir,
+        final String namingScheme, final Runnable ifSuccess) {
+        if (this.exportAll) {
+            return false;
+        }
+        if (collection.isEmpty()) {
+            return false;
+        }
+        this.exportAll = true;
+        final ArrayList<Plot> plots = new ArrayList<>(collection);
+        TaskManager.runTask(new Runnable() {
+            @Override public void run() {
+                if (plots.isEmpty()) {
+                    SchematicHandler.this.exportAll = false;
+                    TaskManager.runTask(ifSuccess);
+                    return;
+                }
+                Iterator<Plot> i = plots.iterator();
+                final Plot plot = i.next();
+                i.remove();
+                String o = UUIDHandler.getName(plot.guessOwner());
+                if (o == null) {
+                    o = "unknown";
+                }
+                final String name;
+                if (namingScheme == null) {
+                    name = plot.getId().x + ";" + plot.getId().y + ',' + plot.getArea() + ',' + o;
+                } else {
+                    name = namingScheme.replaceAll("%owner%", o)
+                        .replaceAll("%id%", plot.getId().toString())
+                        .replaceAll("%idx%", plot.getId().x + "")
+                        .replaceAll("%idy%", plot.getId().y + "")
+                        .replaceAll("%world%", plot.getArea().toString());
+                }
+                final String directory;
+                if (outputDir == null) {
+                    directory = Settings.Paths.SCHEMATICS;
+                } else {
+                    directory = outputDir.getAbsolutePath();
+                }
+                final Runnable THIS = this;
+                SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
+                    @Override public void run(final CompoundTag value) {
+                        if (value == null) {
+                            MainUtil.sendMessage(null, "&7 - Skipped plot &c" + plot.getId());
+                        } else {
+                            TaskManager.runTaskAsync(() -> {
+                                MainUtil.sendMessage(null, "&6ID: " + plot.getId());
+                                boolean result = SchematicHandler.manager
+                                    .save(value, directory + File.separator + name + ".schematic");
+                                if (!result) {
+                                    MainUtil
+                                        .sendMessage(null, "&7 - Failed to save &c" + plot.getId());
+                                } else {
+                                    MainUtil.sendMessage(null, "&7 - &a  success: " + plot.getId());
+                                }
+                                TaskManager.runTask(THIS);
+                            });
+                        }
+                    }
+                });
+            }
+        });
+        return true;
+    }
+
+    /**
+     * Paste a schematic.
+     *
+     * @param schematic the schematic object to paste
+     * @param plot      plot to paste in
+     * @param xOffset   offset x to paste it from plot origin
+     * @param zOffset   offset z to paste it from plot origin
+     * @return boolean true if succeeded
+     */
+    public void paste(final Schematic schematic, final Plot plot, final int xOffset,
+        final int yOffset, final int zOffset, final boolean autoHeight,
+        final RunnableVal<Boolean> whenDone) {
+
+        TaskManager.runTask(() -> {
+            if (whenDone != null) {
+                whenDone.value = false;
+            }
+            if (schematic == null) {
+                PlotSquared.debug("Schematic == null :|");
+                TaskManager.runTask(whenDone);
+                return;
+            }
+            try {
+                // Set flags
+                if (plot.hasOwner()) {
+                    Map<String, Tag> flags = schematic.getFlags();
+                    if (!flags.isEmpty()) {
+                        for (Map.Entry<String, Tag> entry : flags.entrySet()) {
+                            plot.setFlag(Flags.getFlag(entry.getKey()),
+                                StringTag.class.cast(entry.getValue()).getValue());
+                        }
+
+                    }
+                }
+                final LocalBlockQueue queue = plot.getArea().getQueue(false);
+                BlockVector3 dimension = schematic.getClipboard().getDimensions();
+                final int WIDTH = dimension.getX();
+                final int LENGTH = dimension.getZ();
+                final int HEIGHT = dimension.getY();
+                // Validate dimensions
+                RegionWrapper region = plot.getLargestRegion();
+                if (((region.maxX - region.minX + xOffset + 1) < WIDTH) || (
+                    (region.maxZ - region.minZ + zOffset + 1) < LENGTH) || (HEIGHT > 256)) {
+                    PlotSquared.debug("Schematic is too large");
+                    PlotSquared.debug(
+                        "(" + WIDTH + ',' + LENGTH + ',' + HEIGHT + ") is bigger than (" + (
+                            region.maxX - region.minX) + ',' + (region.maxZ - region.minZ)
+                            + ",256)");
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                // block type and data arrays
+                final BlockArrayClipboard blockArrayClipboard = schematic.getClipboard();
+                // Calculate the optimal height to paste the schematic at
+                final int y_offset_actual;
+                if (autoHeight) {
+                    if (HEIGHT >= 256) {
+                        y_offset_actual = yOffset;
+                    } else {
+                        PlotArea pw = plot.getArea();
+                        if (pw instanceof ClassicPlotWorld) {
+                            y_offset_actual = yOffset + ((ClassicPlotWorld) pw).PLOT_HEIGHT;
+                        } else {
+                            y_offset_actual = yOffset + 1 + MainUtil
+                                .getHeighestBlock(plot.getWorldName(), region.minX + 1,
+                                    region.minZ + 1);
+                        }
+                    }
+                } else {
+                    y_offset_actual = yOffset;
+                }
+                Location pos1 =
+                    new Location(plot.getWorldName(), region.minX + xOffset, y_offset_actual,
+                        region.minZ + zOffset);
+                Location pos2 = pos1.clone().add(WIDTH - 1, HEIGHT - 1, LENGTH - 1);
+                final int p1x = pos1.getX();
+                final int p1z = pos1.getZ();
+                final int p2x = pos2.getX();
+                final int p2z = pos2.getZ();
+                final int bcx = p1x >> 4;
+                final int bcz = p1z >> 4;
+                final int tcx = p2x >> 4;
+                final int tcz = p2z >> 4;
+
+                ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+                    @Override public void run(int[] value) {
+                        ChunkLoc chunk = new ChunkLoc(value[0], value[1]);
+                        int x = chunk.x;
+                        int z = chunk.z;
+                        int xxb = x << 4;
+                        int zzb = z << 4;
+                        int xxt = xxb + 15;
+                        int zzt = zzb + 15;
+                        if (x == bcx) {
+                            xxb = p1x;
+                        }
+                        if (x == tcx) {
+                            xxt = p2x;
+                        }
+                        if (z == bcz) {
+                            zzb = p1z;
+                        }
+                        if (z == tcz) {
+                            zzt = p2z;
+                        }
+                        // Paste schematic here
+
+                        for (int ry = 0; ry < Math.min(256, HEIGHT); ry++) {
+                            int yy = y_offset_actual + ry;
+                            if (yy > 255) {
+                                continue;
+                            }
+                            for (int rz = zzb - p1z; rz <= (zzt - p1z); rz++) {
+                                for (int rx = xxb - p1x; rx <= (xxt - p1x); rx++) {
+                                    int xx = p1x + xOffset + rx;
+                                    int zz = p1z + zOffset + rz;
+                                    BaseBlock id = blockArrayClipboard
+                                        .getFullBlock(BlockVector3.at(rx, ry, rz));
+                                    queue.setBlock(xx, yy, zz, id);
+                                }
+                            }
+                        }
+                        queue.enqueue();
+                    }
+                }, () -> {
+                    if (whenDone != null) {
+                        whenDone.value = true;
+                        whenDone.run();
+                    }
+                }, 10);
+            } catch (Exception e) {
+                e.printStackTrace();
+                TaskManager.runTask(whenDone);
+            }
+        });
+    }
+
+    public abstract boolean restoreTile(LocalBlockQueue queue, CompoundTag tag, int x, int y,
+        int z);
+
+    /**
+     * Get a schematic
+     *
+     * @param name to check
+     * @return schematic if found, else null
+     */
+    public Schematic getSchematic(String name) throws UnsupportedFormatException {
+        File parent =
+            MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
+        if (!parent.exists()) {
+            if (!parent.mkdir()) {
+                throw new RuntimeException("Could not create schematic parent directory");
+            }
+        }
+        File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+            Settings.Paths.SCHEMATICS + File.separator + name + (name.endsWith(".schem") ?
+                "" :
+                ".schematic"));
+        return getSchematic(file);
+    }
+
+    /**
+     * Get an immutable collection containing all schematic names
+     *
+     * @return Immutable collection with schematic names
+     */
+    public Collection<String> getShematicNames() {
+        final File parent =
+            MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
+        final List<String> names = new ArrayList<>();
+        if (parent.exists()) {
+            final String[] rawNames = parent.list((dir, name) -> name.endsWith(".schematic"));
+            if (rawNames != null) {
+                final List<String> transformed = Arrays.stream(rawNames)
+                    .map(rawName -> rawName.substring(0, rawName.length() - 10))
+                    .collect(Collectors.toList());
+                names.addAll(transformed);
+            }
+        }
+        return Collections.unmodifiableList(names);
+    }
+
+    /**
+     * Get a schematic
+     *
+     * @param file to check
+     * @return schematic if found, else null
+     */
+    public Schematic getSchematic(File file) throws UnsupportedFormatException {
+        if (!file.exists()) {
+            return null;
+        }
+        try {
+            ClipboardFormat format = ClipboardFormats.findByFile(file);
+            if (format != null) {
+                ClipboardReader reader = format.getReader(new FileInputStream(file));
+                BlockArrayClipboard clip = (BlockArrayClipboard) reader.read();
+                return new Schematic(clip);
+            } else {
+                throw new UnsupportedFormatException(
+                    "This schematic format is not recognised or supported.");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public Schematic getSchematic(URL url) {
+        try {
+            ReadableByteChannel rbc = Channels.newChannel(url.openStream());
+            InputStream is = Channels.newInputStream(rbc);
+            return getSchematic(is);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public Schematic getSchematic(InputStream is) {
+        if (is == null) {
+            return null;
+        }
+        try {
+            SpongeSchematicReader ssr =
+                new SpongeSchematicReader(new NBTInputStream(new GZIPInputStream(is)));
+            BlockArrayClipboard clip = (BlockArrayClipboard) ssr.read();
+            return new Schematic(clip);
+        } catch (IOException ignored) {
+            try {
+                MCEditSchematicReader msr =
+                    new MCEditSchematicReader(new NBTInputStream(new GZIPInputStream(is)));
+                BlockArrayClipboard clip = (BlockArrayClipboard) msr.read();
+                return new Schematic(clip);
+            } catch (IOException e) {
+                e.printStackTrace();
+                PlotSquared.debug(is.toString() + " | " + is.getClass().getCanonicalName()
+                    + " is not in GZIP format : " + e.getMessage());
+            }
+        }
+        return null;
+    }
+
+    public List<String> getSaves(UUID uuid) {
+        StringBuilder rawJSON = new StringBuilder();
+        try {
+            String website = Settings.Web.URL + "list.php?" + uuid.toString();
+            URL url = new URL(website);
+            URLConnection connection = new URL(url.toString()).openConnection();
+            connection.setRequestProperty("User-Agent", "Mozilla/5.0");
+            BufferedReader reader =
+                new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                rawJSON.append(line);
+            }
+            reader.close();
+            JSONArray array = new JSONArray(rawJSON.toString());
+            List<String> schematics = new ArrayList<>();
+            for (int i = 0; i < array.length(); i++) {
+                String schematic = array.getString(i);
+                schematics.add(schematic);
+            }
+            return schematics;
+        } catch (JSONException | IOException e) {
+            e.printStackTrace();
+            PlotSquared.debug("ERROR PARSING: " + rawJSON);
+        }
+        return null;
+    }
+
+    public void upload(final CompoundTag tag, UUID uuid, String file, RunnableVal<URL> whenDone) {
+        if (tag == null) {
+            PlotSquared.debug("&cCannot save empty tag");
+            TaskManager.runTask(whenDone);
+            return;
+        }
+        MainUtil.upload(uuid, file, "schematic", new RunnableVal<OutputStream>() {
+            @Override public void run(OutputStream output) {
+                try (NBTOutputStream nos = new NBTOutputStream(
+                    new GZIPOutputStream(output, true))) {
+                    nos.writeNamedTag("Schematic", tag);
+                } catch (IOException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        }, whenDone);
+    }
+
+    /**
+     * Saves a schematic to a file path.
+     *
+     * @param tag  to save
+     * @param path to save in
+     * @return true if succeeded
+     */
+    public boolean save(CompoundTag tag, String path) {
+        if (tag == null) {
+            PlotSquared.debug("&cCannot save empty tag");
+            return false;
+        }
+        try {
+            File tmp = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), path);
+            tmp.getParentFile().mkdirs();
+            try (NBTOutputStream nbtStream = new NBTOutputStream(
+                new GZIPOutputStream(new FileOutputStream(tmp)))) {
+                nbtStream.writeNamedTag("Schematic", tag);
+            }
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    public abstract void getCompoundTag(String world, Set<RegionWrapper> regions,
+        RunnableVal<CompoundTag> whenDone);
+
+    public void getCompoundTag(final Plot plot, final RunnableVal<CompoundTag> whenDone) {
+        getCompoundTag(plot.getWorldName(), plot.getRegions(), new RunnableVal<CompoundTag>() {
+            @Override public void run(CompoundTag value) {
+                if (!plot.getFlags().isEmpty()) {
+                    HashMap<String, Tag> flagMap = new HashMap<>();
+                    for (Map.Entry<Flag<?>, Object> entry : plot.getFlags().entrySet()) {
+                        String key = entry.getKey().getName();
+                        flagMap.put(key,
+                            new StringTag(entry.getKey().valueToString(entry.getValue())));
+                    }
+                    CompoundTag tag = new CompoundTag(flagMap);
+                    HashMap<String, Tag> map = new HashMap<>(value.getValue());
+                    map.put("Flags", tag);
+                    value.setValue(map);
+                }
+                whenDone.run(value);
+            }
+        });
+    }
+
+
+    public class UnsupportedFormatException extends Exception {
+        /**
+         * Throw with a message.
+         *
+         * @param message the message
+         */
+        public UnsupportedFormatException(String message) {
+            super(message);
+        }
+
+        /**
+         * Throw with a message and a cause.
+         *
+         * @param message the message
+         * @param cause   the cause
+         */
+        public UnsupportedFormatException(String message, Throwable cause) {
+            super(message, cause);
+        }
+
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java
new file mode 100644
index 000000000..b77d991fe
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java
@@ -0,0 +1,22 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
+
+import java.util.HashMap;
+
+public abstract class SetupUtils {
+
+    public static SetupUtils manager;
+
+    public static HashMap<String, GeneratorWrapper<?>> generators = new HashMap<>();
+
+    public abstract void updateGenerators();
+
+    public abstract String getGenerator(final PlotArea plotArea);
+
+    public abstract String setupWorld(final SetupObject object);
+
+    public abstract void unload(String world, boolean save);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java
new file mode 100644
index 000000000..dd6a1f960
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java
@@ -0,0 +1,157 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+/**
+ * String comparison library.
+ */
+public class StringComparison<T> {
+
+    private T bestMatch;
+    private double match = Integer.MAX_VALUE;
+    private T bestMatchObject;
+
+    /**
+     * Constructor
+     *
+     * @param input   Input Base Value
+     * @param objects Objects to compare
+     */
+    public StringComparison(String input, T[] objects) {
+        init(input, objects);
+    }
+
+    public StringComparison(String input, Collection<T> objects) {
+        init(input, (T[]) objects.toArray());
+    }
+
+    /**
+     * You should call init(...) when you are ready to get a String comparison value.
+     */
+    public StringComparison() {
+    }
+
+    /**
+     * Compare two strings
+     *
+     * @param s1 String Base
+     * @param s2 Object
+     * @return match
+     */
+    public static int compare(String s1, String s2) {
+        int distance = StringMan.getLevenshteinDistance(s1, s2);
+        if (s2.contains(s1)) {
+            distance -= Math.min(s1.length(), s2.length());
+        }
+        if (s2.startsWith(s1)) {
+            distance -= 4;
+        }
+        return distance;
+    }
+
+    /**
+     * Create an ArrayList containing pairs of letters
+     *
+     * @param s string to split
+     * @return ArrayList
+     */
+    public static ArrayList<String> wLetterPair(String s) {
+        ArrayList<String> aPairs = new ArrayList<>();
+        String[] wo = s.split("\\s");
+        for (String aWo : wo) {
+            String[] po = sLetterPair(aWo);
+            Collections.addAll(aPairs, po);
+        }
+        return aPairs;
+    }
+
+    /**
+     * Get an array containing letter pairs
+     *
+     * @param s string to split
+     * @return Array
+     */
+    public static String[] sLetterPair(String s) {
+        int numPair = s.length() - 1;
+        String[] p = new String[numPair];
+        for (int i = 0; i < numPair; i++) {
+            p[i] = s.substring(i, i + 2);
+        }
+        return p;
+    }
+
+    public void init(String input, T[] objects) {
+        int c;
+        this.bestMatch = objects[0];
+        this.bestMatchObject = objects[0];
+        input = input.toLowerCase();
+        for (T o : objects) {
+            if ((c = compare(input, getString(o).toLowerCase())) < this.match) {
+                this.match = c;
+                this.bestMatch = o;
+                this.bestMatchObject = o;
+            }
+        }
+    }
+
+    public String getString(T o) {
+        if (o instanceof StringComparable) {
+            return ((StringComparable) o).getComparableString();
+        }
+        return o.toString();
+    }
+
+    /**
+     * Get the object
+     *
+     * @return match object
+     */
+    public T getMatchObject() {
+        return this.bestMatchObject;
+    }
+
+    /**
+     * Get the best match value
+     *
+     * @return match value
+     */
+    public String getBestMatch() {
+        return getString(this.bestMatch);
+    }
+
+    /**
+     * Will return both the match number, and the actual match string
+     *
+     * @return object[] containing: double, String
+     */
+    public ComparisonResult getBestMatchAdvanced() {
+        return new ComparisonResult(this.match, this.bestMatch);
+    }
+
+    public interface StringComparable {
+        String getComparableString();
+    }
+
+
+    /**
+     * The comparison result
+     */
+    public class ComparisonResult {
+
+        public final T best;
+        public final double match;
+
+        /**
+         * The constructor
+         *
+         * @param match Match value
+         * @param best  Best Match
+         */
+        public ComparisonResult(double match, T best) {
+            this.match = match;
+            this.best = best;
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
new file mode 100644
index 000000000..739c31bec
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
@@ -0,0 +1,290 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import java.lang.reflect.Array;
+import java.util.*;
+import java.util.Map.Entry;
+
+public class StringMan {
+
+    public static String replaceFromMap(String string, Map<String, String> replacements) {
+        StringBuilder sb = new StringBuilder(string);
+        int size = string.length();
+        for (Entry<String, String> entry : replacements.entrySet()) {
+            if (size == 0) {
+                break;
+            }
+            String key = entry.getKey();
+            String value = entry.getValue();
+            int start = sb.indexOf(key, 0);
+            while (start > -1) {
+                int end = start + key.length();
+                int nextSearchStart = start + value.length();
+                sb.replace(start, end, value);
+                size -= end - start;
+                start = sb.indexOf(key, nextSearchStart);
+            }
+        }
+        return sb.toString();
+    }
+
+    public static int intersection(Set<String> options, String[] toCheck) {
+        int count = 0;
+        for (String check : toCheck) {
+            if (options.contains(check)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    public static String getString(Object obj) {
+        if (obj == null) {
+            return "null";
+        }
+        if (obj instanceof String) {
+            return (String) obj;
+        }
+        if (obj.getClass().isArray()) {
+            StringBuilder result = new StringBuilder();
+            String prefix = "";
+
+            for (int i = 0; i < Array.getLength(obj); i++) {
+                result.append(prefix).append(getString(Array.get(obj, i)));
+                prefix = ",";
+            }
+            return "( " + result + " )";
+        } else if (obj instanceof Collection<?>) {
+            StringBuilder result = new StringBuilder();
+            String prefix = "";
+            for (Object element : (Collection<?>) obj) {
+                result.append(prefix).append(getString(element));
+                prefix = ",";
+            }
+            return "[ " + result + " ]";
+        } else {
+            return obj.toString();
+        }
+    }
+
+    public static String replaceFirst(char c, String s) {
+        if (s == null) {
+            return "";
+        }
+        if (s.isEmpty()) {
+            return s;
+        }
+        char[] chars = s.toCharArray();
+        char[] newChars = new char[chars.length];
+        int used = 0;
+        boolean found = false;
+        for (char cc : chars) {
+            if (!found && (c == cc)) {
+                found = true;
+            } else {
+                newChars[used++] = cc;
+            }
+        }
+        if (found) {
+            chars = new char[newChars.length - 1];
+            System.arraycopy(newChars, 0, chars, 0, chars.length);
+            return String.valueOf(chars);
+        }
+        return s;
+    }
+
+    public static String replaceAll(String string, Object... pairs) {
+        StringBuilder sb = new StringBuilder(string);
+        for (int i = 0; i < pairs.length; i += 2) {
+            String key = pairs[i] + "";
+            String value = pairs[i + 1] + "";
+            int start = sb.indexOf(key, 0);
+            while (start > -1) {
+                int end = start + key.length();
+                int nextSearchStart = start + value.length();
+                sb.replace(start, end, value);
+                start = sb.indexOf(key, nextSearchStart);
+            }
+        }
+        return sb.toString();
+    }
+
+    public static boolean isAlphanumeric(String str) {
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c
+                > 0x7a)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean isAlphanumericUnd(String str) {
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (c < 0x30 || (c >= 0x3a) && (c <= 0x40) || (c > 0x5a) && (c <= 0x60) || (c > 0x7a)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean isAlpha(String str) {
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if ((c <= 0x40) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static String join(Collection<?> collection, String delimiter) {
+        return join(collection.toArray(), delimiter);
+    }
+
+    public static String joinOrdered(Collection<?> collection, String delimiter) {
+        Object[] array = collection.toArray();
+        Arrays.sort(array, new Comparator<Object>() {
+            @Override public int compare(Object a, Object b) {
+                return a.hashCode() - b.hashCode();
+            }
+
+        });
+        return join(array, delimiter);
+    }
+
+    public static String join(Collection<?> collection, char delimiter) {
+        return join(collection.toArray(), delimiter + "");
+    }
+
+    public static boolean isAsciiPrintable(char c) {
+        return (c >= ' ') && (c < '');
+    }
+
+    public static boolean isAsciiPrintable(String s) {
+        for (char c : s.toCharArray()) {
+            if (!isAsciiPrintable(c)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static int getLevenshteinDistance(String s, String t) {
+        int n = s.length();
+        int m = t.length();
+        if (n == 0) {
+            return m;
+        } else if (m == 0) {
+            return n;
+        }
+        if (n > m) {
+            String tmp = s;
+            s = t;
+            t = tmp;
+            n = m;
+            m = t.length();
+        }
+        int p[] = new int[n + 1];
+        int d[] = new int[n + 1];
+        int i;
+        for (i = 0; i <= n; i++) {
+            p[i] = i;
+        }
+        for (int j = 1; j <= m; j++) {
+            char t_j = t.charAt(j - 1);
+            d[0] = j;
+
+            for (i = 1; i <= n; i++) {
+                int cost = s.charAt(i - 1) == t_j ? 0 : 1;
+                d[i] = Math.min(Math.min(d[i - 1] + 1, p[i] + 1), p[i - 1] + cost);
+            }
+            int[] _d = p;
+            p = d;
+            d = _d;
+        }
+        return p[n];
+    }
+
+    public static String join(Object[] array, String delimiter) {
+        StringBuilder result = new StringBuilder();
+        for (int i = 0, j = array.length; i < j; i++) {
+            if (i > 0) {
+                result.append(delimiter);
+            }
+            result.append(array[i]);
+        }
+        return result.toString();
+    }
+
+    public static String join(int[] array, String delimiter) {
+        Integer[] wrapped = new Integer[array.length];
+        for (int i = 0; i < array.length; i++) {
+            wrapped[i] = array[i];
+        }
+        return join(wrapped, delimiter);
+    }
+
+    public static boolean isEqualToAny(String a, String... args) {
+        for (String arg : args) {
+            if (StringMan.isEqual(a, arg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isEqualIgnoreCaseToAny(String a, String... args) {
+        for (String arg : args) {
+            if (StringMan.isEqualIgnoreCase(a, arg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isEqual(String a, String b) {
+        return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && (
+            a.hashCode() == b.hashCode()) && a.equals(b));
+        // return a.equals(b) || b != null && a.length() == b.length() && a.hashCode() == b.hashCode()
+        //    && a.equals(b);
+    }
+
+    public static boolean isEqualIgnoreCase(String a, String b) {
+        return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
+            .equalsIgnoreCase(b));
+    }
+
+    public static String repeat(String s, int n) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < n; i++) {
+            sb.append(s);
+        }
+        return sb.toString();
+    }
+
+    public static boolean contains(String name, char c) {
+        for (char current : name.toCharArray()) {
+            if (c == current) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public <T> Collection<T> match(Collection<T> col, String startsWith) {
+        if (col == null) {
+            return null;
+        }
+        startsWith = startsWith.toLowerCase();
+        Iterator iterator = col.iterator();
+        while (iterator.hasNext()) {
+            Object item = iterator.next();
+            if (item == null || !item.toString().toLowerCase().startsWith(startsWith)) {
+                iterator.remove();
+            }
+        }
+        return col;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
new file mode 100644
index 000000000..f6e86cd92
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
@@ -0,0 +1,168 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public abstract class TaskManager {
+
+    public static final HashSet<String> TELEPORT_QUEUE = new HashSet<>();
+    public static final HashMap<Integer, Integer> tasks = new HashMap<>();
+    public static TaskManager IMP;
+    public static AtomicInteger index = new AtomicInteger(0);
+
+    public static int runTaskRepeat(Runnable runnable, int interval) {
+        if (runnable != null) {
+            if (IMP == null) {
+                throw new IllegalArgumentException("disabled");
+            }
+            return IMP.taskRepeat(runnable, interval);
+        }
+        return -1;
+    }
+
+    public static int runTaskRepeatAsync(Runnable runnable, int interval) {
+        if (runnable != null) {
+            if (IMP == null) {
+                throw new IllegalArgumentException("disabled");
+            }
+            return IMP.taskRepeatAsync(runnable, interval);
+        }
+        return -1;
+    }
+
+    public static void runTaskAsync(Runnable runnable) {
+        if (runnable != null) {
+            if (IMP == null) {
+                runnable.run();
+                return;
+            }
+            IMP.taskAsync(runnable);
+        }
+    }
+
+    public static void runTask(Runnable runnable) {
+        if (runnable != null) {
+            if (IMP == null) {
+                runnable.run();
+                return;
+            }
+            IMP.task(runnable);
+        }
+    }
+
+    /**
+     * Run task later.
+     *
+     * @param runnable The task
+     * @param delay    The delay in ticks
+     */
+    public static void runTaskLater(Runnable runnable, int delay) {
+        if (runnable != null) {
+            if (IMP == null) {
+                runnable.run();
+                return;
+            }
+            IMP.taskLater(runnable, delay);
+        }
+    }
+
+    public static void runTaskLaterAsync(Runnable runnable, int delay) {
+        if (runnable != null) {
+            if (IMP == null) {
+                runnable.run();
+                return;
+            }
+            IMP.taskLaterAsync(runnable, delay);
+        }
+    }
+
+    /**
+     * Break up a series of tasks so that they can run without lagging the server.
+     *
+     * @param objects
+     * @param task
+     * @param whenDone
+     */
+    public static <T> void objectTask(Collection<T> objects, final RunnableVal<T> task,
+        final Runnable whenDone) {
+        final Iterator<T> iterator = objects.iterator();
+        TaskManager.runTask(new Runnable() {
+            @Override public void run() {
+                long start = System.currentTimeMillis();
+                boolean hasNext;
+                while ((hasNext = iterator.hasNext()) && System.currentTimeMillis() - start < 5) {
+                    task.value = iterator.next();
+                    task.run();
+                }
+                if (!hasNext) {
+                    TaskManager.runTaskLater(whenDone, 1);
+                } else {
+                    TaskManager.runTaskLater(this, 1);
+                }
+            }
+        });
+    }
+
+    public <T> T sync(final RunnableVal<T> function) {
+        return sync(function, Integer.MAX_VALUE);
+    }
+
+    public <T> T sync(final RunnableVal<T> function, int timeout) {
+        if (PlotSquared.get().isMainThread(Thread.currentThread())) {
+            function.run();
+            return function.value;
+        }
+        final AtomicBoolean running = new AtomicBoolean(true);
+        RunnableVal<RuntimeException> run = new RunnableVal<RuntimeException>() {
+            @Override public void run(RuntimeException value) {
+                try {
+                    function.run();
+                } catch (RuntimeException e) {
+                    this.value = e;
+                } catch (Throwable neverHappens) {
+                    neverHappens.printStackTrace();
+                } finally {
+                    running.set(false);
+                }
+                synchronized (function) {
+                    function.notifyAll();
+                }
+            }
+        };
+        TaskManager.IMP.task(run);
+        try {
+            synchronized (function) {
+                while (running.get()) {
+                    function.wait(timeout);
+                }
+            }
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        if (run.value != null) {
+            throw run.value;
+        }
+        return function.value;
+    }
+
+    public abstract int taskRepeat(Runnable runnable, int interval);
+
+    public abstract int taskRepeatAsync(Runnable runnable, int interval);
+
+    public abstract void taskAsync(Runnable runnable);
+
+    public abstract void task(Runnable runnable);
+
+    public abstract void taskLater(Runnable runnable, int delay);
+
+    public abstract void taskLaterAsync(Runnable runnable, int delay);
+
+    public abstract void cancelTask(int task);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
new file mode 100644
index 000000000..aafba9da9
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
@@ -0,0 +1,169 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
+import com.google.common.collect.BiMap;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+
+public class UUIDHandler {
+
+    public static UUIDHandlerImplementation implementation;
+
+    public static void add(StringWrapper name, UUID uuid) {
+        implementation.add(name, uuid);
+    }
+
+    /**
+     * Get the map containing all names/uuids.
+     *
+     * @return map with names + uuids
+     * @see BiMap
+     */
+    public static BiMap<StringWrapper, UUID> getUuidMap() {
+        return implementation.getUUIDMap();
+    }
+
+    /**
+     * Check if a uuid is cached
+     *
+     * @param uuid to check
+     * @return true of the uuid is cached
+     * @see BiMap#containsValue(Object)
+     */
+    public static boolean uuidExists(UUID uuid) {
+        return implementation.uuidExists(uuid);
+    }
+
+    /**
+     * Check if a name is cached
+     *
+     * @param name to check
+     * @return true of the name is cached
+     * @see BiMap#containsKey(Object)
+     */
+    public static boolean nameExists(StringWrapper name) {
+        return implementation.nameExists(name);
+    }
+
+    public static HashSet<UUID> getAllUUIDS() {
+        final HashSet<UUID> uuids = new HashSet<>();
+        PlotSquared.get().foreachPlotRaw(new RunnableVal<Plot>() {
+            @Override public void run(Plot plot) {
+                if (plot.hasOwner()) {
+                    uuids.add(plot.owner);
+                    uuids.addAll(plot.getTrusted());
+                    uuids.addAll(plot.getMembers());
+                    uuids.addAll(plot.getDenied());
+                }
+            }
+        });
+        return uuids;
+    }
+
+    public static UUIDWrapper getUUIDWrapper() {
+        return implementation.getUUIDWrapper();
+    }
+
+    public static void setUUIDWrapper(UUIDWrapper wrapper) {
+        implementation.setUUIDWrapper(wrapper);
+    }
+
+    public static void startCaching(Runnable whenDone) {
+        implementation.startCaching(whenDone);
+    }
+
+    public static void cache(BiMap<StringWrapper, UUID> toAdd) {
+        implementation.add(toAdd);
+    }
+
+    public static UUID getUUID(PlotPlayer player) {
+        if (implementation == null) {
+            return null;
+        }
+        return implementation.getUUID(player);
+    }
+
+    public static UUID getUUID(OfflinePlotPlayer player) {
+        if (implementation == null) {
+            return null;
+        }
+        return implementation.getUUID(player);
+    }
+
+    public static String getName(UUID uuid) {
+        if (implementation == null) {
+            return null;
+        }
+        return implementation.getName(uuid);
+    }
+
+    public static PlotPlayer getPlayer(UUID uuid) {
+        if (implementation == null) {
+            return null;
+        }
+        return check(implementation.getPlayer(uuid));
+    }
+
+    public static PlotPlayer getPlayer(String name) {
+        if (implementation == null) {
+            return null;
+        }
+        return check(implementation.getPlayer(name));
+    }
+
+    private static PlotPlayer check(PlotPlayer plr) {
+        if (plr != null && !plr.isOnline()) {
+            UUIDHandler.getPlayers().remove(plr.getName());
+            PlotSquared.get().IMP.unregister(plr);
+            plr = null;
+        }
+        return plr;
+    }
+
+    public static UUID getUUIDFromString(String nameOrUUIDString) {
+        if (implementation == null) {
+            return null;
+        }
+        if (nameOrUUIDString.length() > 16) {
+            try {
+                return UUID.fromString(nameOrUUIDString);
+            } catch (IllegalArgumentException e) {
+                return null;
+            }
+        }
+        return UUIDHandler.getUUID(nameOrUUIDString, null);
+    }
+
+    public static UUID getUUID(String name, RunnableVal<UUID> ifFetch) {
+        if (implementation == null) {
+            return null;
+        }
+        return implementation.getUUID(name, ifFetch);
+    }
+
+    public static UUID getCachedUUID(String name, RunnableVal<UUID> ifFetch) {
+        if (implementation == null) {
+            return null;
+        }
+        return implementation.getUUIDMap().get(new StringWrapper(name));
+    }
+
+    public static Map<String, PlotPlayer> getPlayers() {
+        if (implementation == null) {
+            return new HashMap<>();
+        }
+        return implementation.getPlayers();
+    }
+
+    public static void handleShutdown() {
+        if (implementation == null) {
+            return;
+        }
+        implementation.handleShutdown();
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
new file mode 100644
index 000000000..b5fbb8b65
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
@@ -0,0 +1,286 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
+import com.google.common.base.Charsets;
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+public abstract class UUIDHandlerImplementation {
+
+    public final ConcurrentHashMap<String, PlotPlayer> players;
+    public final HashSet<UUID> unknown = new HashSet<>();
+    public UUIDWrapper uuidWrapper;
+    private boolean cached = false;
+    private BiMap<StringWrapper, UUID> uuidMap =
+        HashBiMap.create(new HashMap<StringWrapper, UUID>());
+    //    private BiMap<UUID, StringWrapper> nameMap = uuidMap.inverse();
+
+    public UUIDHandlerImplementation(UUIDWrapper wrapper) {
+        this.uuidWrapper = wrapper;
+        this.players = new ConcurrentHashMap<>();
+    }
+
+    /**
+     * If the UUID is not found, some commands can request to fetch the UUID when possible.
+     *
+     * @param name
+     * @param ifFetch
+     */
+    public abstract void fetchUUID(String name, RunnableVal<UUID> ifFetch);
+
+    /**
+     * Start UUID caching (this should be an async task)
+     * Recommended to override this is you want to cache offline players
+     */
+    public boolean startCaching(Runnable whenDone) {
+        if (this.cached) {
+            return false;
+        }
+        return this.cached = true;
+    }
+
+    public UUIDWrapper getUUIDWrapper() {
+        return this.uuidWrapper;
+    }
+
+    public void setUUIDWrapper(UUIDWrapper wrapper) {
+        this.uuidWrapper = wrapper;
+    }
+
+    public void rename(UUID uuid, StringWrapper name) {
+        this.uuidMap.inverse().remove(uuid);
+        this.uuidMap.put(name, uuid);
+    }
+
+    public void add(BiMap<StringWrapper, UUID> toAdd) {
+        if (this.uuidMap.isEmpty()) {
+            this.uuidMap = toAdd;
+        }
+        for (Map.Entry<StringWrapper, UUID> entry : toAdd.entrySet()) {
+            UUID uuid = entry.getValue();
+            StringWrapper name = entry.getKey();
+            if (uuid == null || name == null) {
+                continue;
+            }
+            StringWrapper oldName = this.uuidMap.inverse().get(uuid);
+            if (oldName != null) {
+                if (this.uuidMap.containsKey(name)) {
+                    continue;
+                }
+                if (getPlayer(uuid) == null) {
+                    rename(uuid, name);
+                }
+                continue;
+            }
+            this.uuidMap.put(name, uuid);
+        }
+        PlotSquared.debug(C.PREFIX + "&6Cached a total of: " + this.uuidMap.size() + " UUIDs");
+    }
+
+    public boolean add(final StringWrapper name, final UUID uuid) {
+        if (uuid == null) {
+            PlotSquared.debug("UUID cannot be null!");
+            return false;
+        }
+        if (name == null) {
+            try {
+                this.unknown.add(uuid);
+            } catch (Exception e) {
+                PlotSquared.log("&c(minor) Invalid UUID mapping: " + uuid);
+                e.printStackTrace();
+            }
+            return false;
+        }
+
+        /*
+         * lazy UUID conversion:
+         *  - Useful if the person misconfigured the database, or settings before
+         *   PlotMe conversion
+         */
+        if (!Settings.UUID.OFFLINE && !this.unknown.isEmpty()) {
+            TaskManager.runTaskAsync(new Runnable() {
+                @Override public void run() {
+                    UUID offline = UUID.nameUUIDFromBytes(
+                        ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
+                    if (!UUIDHandlerImplementation.this.unknown.contains(offline) && !name.value
+                        .equals(name.value.toLowerCase())) {
+                        offline = UUID.nameUUIDFromBytes(
+                            ("OfflinePlayer:" + name.value.toLowerCase()).getBytes(Charsets.UTF_8));
+                        if (!UUIDHandlerImplementation.this.unknown.contains(offline)) {
+                            offline = null;
+                        }
+                    }
+                    if (offline != null && !offline.equals(uuid)) {
+                        UUIDHandlerImplementation.this.unknown.remove(offline);
+                        Set<Plot> plots = PlotSquared.get().getPlotsAbs(offline);
+                        if (!plots.isEmpty()) {
+                            for (Plot plot : plots) {
+                                plot.owner = uuid;
+                            }
+                            DBFunc.replaceUUID(offline, uuid);
+                            PlotSquared.debug("&cDetected invalid UUID stored for: " + name.value);
+                            PlotSquared.debug(
+                                "&7 - Did you recently switch to online-mode storage without running `uuidconvert`?");
+                            PlotSquared.debug("&6" + PlotSquared.imp().getPluginName()
+                                + " will update incorrect entries when the user logs in, or you can reconstruct your database.");
+                        }
+                    }
+                }
+            });
+        } else if (Settings.UUID.FORCE_LOWERCASE && !this.unknown.isEmpty() && !name.value
+            .equals(name.value.toLowerCase())) {
+            TaskManager.runTaskAsync(new Runnable() {
+                @Override public void run() {
+                    UUID offlineUpper = UUID.nameUUIDFromBytes(
+                        ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
+                    if (UUIDHandlerImplementation.this.unknown.contains(offlineUpper)
+                        && !offlineUpper.equals(uuid)) {
+                        UUIDHandlerImplementation.this.unknown.remove(offlineUpper);
+                        Set<Plot> plots = PlotSquared.get().getPlotsAbs(offlineUpper);
+                        if (!plots.isEmpty()) {
+                            for (Plot plot : plots) {
+                                plot.owner = uuid;
+                            }
+                            replace(offlineUpper, uuid, name.value);
+                        }
+                    }
+                }
+            });
+        }
+        try {
+            UUID offline = this.uuidMap.put(name, uuid);
+            if (offline != null) {
+                if (!offline.equals(uuid)) {
+                    Set<Plot> plots = PlotSquared.get().getPlots(offline);
+                    if (!plots.isEmpty()) {
+                        for (Plot plot : plots) {
+                            plot.owner = uuid;
+                        }
+                        replace(offline, uuid, name.value);
+                    }
+                    return true;
+                } else {
+                    StringWrapper oName = this.uuidMap.inverse().get(offline);
+                    if (!oName.equals(name)) {
+                        this.uuidMap.remove(name);
+                        this.uuidMap.put(name, uuid);
+                    }
+                }
+                return false;
+            }
+        } catch (Exception ignored) {
+            BiMap<UUID, StringWrapper> inverse = this.uuidMap.inverse();
+            StringWrapper oldName = inverse.get(uuid);
+            if (oldName != null) {
+                if (this.uuidMap.containsKey(name)) {
+                    return false;
+                }
+                PlotPlayer player = getPlayer(uuid);
+                if (player == null || player.getName().equalsIgnoreCase(name.value)) {
+                    rename(uuid, name);
+                }
+                return false;
+            }
+            this.uuidMap.put(name, uuid);
+        }
+        return true;
+    }
+
+    private void replace(UUID from, UUID to, String name) {
+        DBFunc.replaceUUID(from, to);
+        PlotSquared.debug("&cDetected invalid UUID stored for: " + name);
+        PlotSquared.debug(
+            "&7 - Did you recently switch to online-mode storage without running `uuidconvert`?");
+        PlotSquared.debug("&6" + PlotSquared.imp().getPluginName()
+            + " will update incorrect entries when the user logs in, or you can reconstruct your database.");
+    }
+
+    public boolean uuidExists(UUID uuid) {
+        return this.uuidMap.containsValue(uuid);
+    }
+
+    public BiMap<StringWrapper, UUID> getUUIDMap() {
+        return this.uuidMap;
+    }
+
+    public boolean nameExists(StringWrapper wrapper) {
+        return this.uuidMap.containsKey(wrapper);
+    }
+
+    public void handleShutdown() {
+        this.players.clear();
+        this.uuidMap.clear();
+    }
+
+    public String getName(UUID uuid) {
+        if (uuid == null) {
+            return null;
+        }
+        StringWrapper name = this.uuidMap.inverse().get(uuid);
+        if (name != null) {
+            return name.value;
+        }
+        return null;
+    }
+
+    public UUID getUUID(String name, RunnableVal<UUID> ifFetch) {
+        if (name.isEmpty()) {
+            return null;
+        }
+        // check online
+        PlotPlayer player = getPlayer(name);
+        if (player != null) {
+            return player.getUUID();
+        }
+        // check cache
+        StringWrapper wrap = new StringWrapper(name);
+        UUID uuid = this.uuidMap.get(wrap);
+        if (uuid != null) {
+            return uuid;
+        }
+        // Read from disk OR convert directly to offline UUID
+        if (Settings.UUID.OFFLINE && !StringMan.contains(name, ';')) {
+            uuid = this.uuidWrapper.getUUID(name);
+            add(new StringWrapper(name), uuid);
+            return uuid;
+        }
+        if ((ifFetch != null)) {
+            fetchUUID(name, ifFetch);
+            return null;
+        }
+        return null;
+    }
+
+    public UUID getUUID(PlotPlayer player) {
+        return this.uuidWrapper.getUUID(player);
+    }
+
+    public UUID getUUID(OfflinePlotPlayer player) {
+        return this.uuidWrapper.getUUID(player);
+    }
+
+    public PlotPlayer getPlayer(UUID uuid) {
+        String name = getName(uuid);
+        if (name != null) {
+            return getPlayer(name);
+        }
+        return null;
+    }
+
+    public PlotPlayer getPlayer(String name) {
+        return this.players.get(name);
+    }
+
+    public Map<String, PlotPlayer> getPlayers() {
+        return this.players;
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
new file mode 100644
index 000000000..bb376f431
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
@@ -0,0 +1,150 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem;
+import com.sk89q.jnbt.*;
+
+import java.io.*;
+import java.net.URL;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+public abstract class WorldUtil {
+    public static WorldUtil IMP;
+
+    public abstract int getBiomeFromString(String value);
+
+    public abstract String[] getBiomeList();
+
+    public abstract String getMainWorld();
+
+    public abstract boolean isWorld(String worldName);
+
+    public abstract String[] getSign(Location location);
+
+    public abstract Location getSpawn(String world);
+
+    public abstract Location getSpawn(PlotPlayer pp);
+
+    public abstract void setSpawn(Location location);
+
+    public abstract void saveWorld(String world);
+
+    public abstract String getClosestMatchingName(PlotBlock plotBlock);
+
+    public abstract boolean isBlockSolid(PlotBlock block);
+
+    public abstract StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name);
+
+    public abstract String getBiome(String world, int x, int z);
+
+    public abstract PlotBlock getBlock(Location location);
+
+    public abstract int getHighestBlock(String world, int x, int z);
+
+    public abstract boolean addItems(String world, PlotItem item);
+
+    public abstract void setSign(String world, int x, int y, int z, String[] lines);
+
+    public abstract void setBiomes(String world, RegionWrapper region, String biome);
+
+    public abstract com.sk89q.worldedit.world.World getWeWorld(String world);
+
+    public void upload(final Plot plot, UUID uuid, String file, RunnableVal<URL> whenDone) {
+        if (plot == null) {
+            throw new IllegalArgumentException("Plot may not be null!");
+        }
+        final Location home = plot.getHome();
+        MainUtil.upload(uuid, file, "zip", new RunnableVal<OutputStream>() {
+            @Override public void run(OutputStream output) {
+                try (final ZipOutputStream zos = new ZipOutputStream(output)) {
+                    File dat = getDat(plot.getWorldName());
+                    Location spawn = getSpawn(plot.getWorldName());
+                    byte[] buffer = new byte[1024];
+                    if (dat != null) {
+                        ZipEntry ze = new ZipEntry("world" + File.separator + dat.getName());
+                        zos.putNextEntry(ze);
+                        try (NBTInputStream nis = new NBTInputStream(
+                            new GZIPInputStream(new FileInputStream(dat)))) {
+                            CompoundTag tag = (CompoundTag) nis.readNamedTag().getTag();
+                            CompoundTag data = (CompoundTag) tag.getValue().get("Data");
+                            Map<String, Tag> map = ReflectionUtils.getMap(data.getValue());
+                            map.put("SpawnX", new IntTag(home.getX()));
+                            map.put("SpawnY", new IntTag(home.getY()));
+                            map.put("SpawnZ", new IntTag(home.getZ()));
+                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                            try (NBTOutputStream out = new NBTOutputStream(
+                                new GZIPOutputStream(baos, true))) {
+                                //TODO Find what this should be called
+                                out.writeNamedTag("Schematic????", tag);
+                            }
+                            zos.write(baos.toByteArray());
+                        }
+                    }
+                    setSpawn(spawn);
+                    for (Plot current : plot.getConnectedPlots()) {
+                        Location bot = current.getBottomAbs();
+                        Location top = current.getTopAbs();
+                        int brx = bot.getX() >> 9;
+                        int brz = bot.getZ() >> 9;
+                        int trx = top.getX() >> 9;
+                        int trz = top.getZ() >> 9;
+                        Set<ChunkLoc> files = ChunkManager.manager.getChunkChunks(bot.getWorld());
+                        for (ChunkLoc mca : files) {
+                            if (mca.x >= brx && mca.x <= trx && mca.z >= brz && mca.z <= trz) {
+                                final File file = getMcr(plot.getWorldName(), mca.x, mca.z);
+                                if (file != null) {
+                                    //final String name = "r." + (x - cx) + "." + (z - cz) + ".mca";
+                                    String name = file.getName();
+                                    final ZipEntry ze = new ZipEntry(
+                                        "world" + File.separator + "region" + File.separator
+                                            + name);
+                                    zos.putNextEntry(ze);
+                                    final FileInputStream in = new FileInputStream(file);
+                                    int len;
+                                    while ((len = in.read(buffer)) > 0) {
+                                        zos.write(buffer, 0, len);
+                                    }
+                                    in.close();
+                                    zos.closeEntry();
+                                }
+                            }
+                        }
+                    }
+                    zos.closeEntry();
+                    zos.flush();
+                    zos.finish();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }, whenDone);
+    }
+
+    public File getDat(String world) {
+        File file = new File(
+            PlotSquared.get().IMP.getWorldContainer() + File.separator + world + File.separator
+                + "level.dat");
+        if (file.exists()) {
+            return file;
+        }
+        return null;
+    }
+
+    public File getMcr(String world, int x, int z) {
+        File file = new File(PlotSquared.get().IMP.getWorldContainer(),
+            world + File.separator + "region" + File.separator + "r." + x + '.' + z + ".mca");
+        if (file.exists()) {
+            return file;
+        }
+        return null;
+    }
+
+    public abstract boolean isBlockSame(PlotBlock block1, PlotBlock block2);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java
new file mode 100644
index 000000000..133088a2e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java
@@ -0,0 +1,297 @@
+package com.github.intellectualsites.plotsquared.plot.util.area;
+
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class QuadMap<T> {
+
+    public final int size;
+    public final int x;
+    public final int z;
+    private final int newsize;
+    private final int min;
+    public HashSet<T> objects;
+    public QuadMap<T> one;
+    public QuadMap<T> two;
+    public QuadMap<T> three;
+    public QuadMap<T> four;
+    public QuadMap<T> skip;
+
+    public QuadMap(int size, int x, int z) {
+        this.size = size;
+        this.x = x;
+        this.z = z;
+        this.newsize = size >> 1;
+        this.min = 512;
+    }
+
+    public QuadMap(int size, int x, int z, int min) {
+        this.size = size;
+        this.x = x;
+        this.z = z;
+        this.newsize = size >> 1;
+        this.min = min;
+    }
+
+    public int count() {
+        int size = countBelow();
+        if (this.objects != null) {
+            size += this.objects.size();
+        }
+        return size;
+    }
+
+    public Set<T> getAll() {
+        HashSet<T> all = new HashSet<>();
+        if (this.objects != null) {
+            all.addAll(this.objects);
+        }
+        if (this.skip != null) {
+            all.addAll(this.skip.getAll());
+            return all;
+        }
+        if (this.one != null) {
+            all.addAll(this.one.getAll());
+        }
+        if (this.two != null) {
+            all.addAll(this.two.getAll());
+        }
+        if (this.three != null) {
+            all.addAll(this.three.getAll());
+        }
+        if (this.four != null) {
+            all.addAll(this.four.getAll());
+        }
+        return all;
+    }
+
+    public int countCurrent() {
+        return this.objects == null ? 0 : this.objects.size();
+    }
+
+    public int countBelow() {
+        int size = 0;
+        if (this.one != null) {
+            size += this.one.count();
+        }
+        if (this.two != null) {
+            size += this.two.count();
+        }
+        if (this.three != null) {
+            size += this.three.count();
+        }
+        if (this.four != null) {
+            size += this.four.count();
+        }
+        return size;
+    }
+
+    public void add(T area) {
+        if (this.size <= this.min) {
+            if (this.objects == null) {
+                this.objects = new HashSet<>();
+            }
+            this.objects.add(area);
+            return;
+        }
+        RegionWrapper region = getRegion(area);
+        if (region.minX >= this.x) {
+            if (region.minZ >= this.z) {
+                if (this.one == null) {
+                    this.one =
+                        newInstance(this.newsize, this.x + this.newsize, this.z + this.newsize,
+                            this.min);
+                }
+                this.one.add(area);
+                recalculateSkip();
+                return;
+            } else if (region.maxZ < this.z) {
+                if (this.two == null) {
+                    this.two =
+                        newInstance(this.newsize, this.x + this.newsize, this.z - this.newsize,
+                            this.min);
+                }
+                this.two.add(area);
+                recalculateSkip();
+                return;
+            }
+        } else if (region.maxX < this.x) {
+            if (region.minZ >= this.z) {
+                if (this.four == null) {
+                    this.four =
+                        newInstance(this.newsize, this.x - this.newsize, this.z + this.newsize,
+                            this.min);
+                }
+                this.four.add(area);
+                recalculateSkip();
+                return;
+            } else if (region.maxZ < this.z) {
+                if (this.three == null) {
+                    this.three =
+                        newInstance(this.newsize, this.x - this.newsize, this.z - this.newsize,
+                            this.min);
+                }
+                this.three.add(area);
+                recalculateSkip();
+                return;
+            }
+        }
+        if (this.objects == null) {
+            this.objects = new HashSet<>();
+        }
+        this.objects.add(area);
+    }
+
+    public RegionWrapper getRegion(T value) {
+        return null;
+    }
+
+    public QuadMap<T> newInstance(int newsize, int x, int z, int min) {
+        try {
+            return new QuadMap<T>(newsize, x, z, min) {
+                @Override public RegionWrapper getRegion(T value) {
+                    return QuadMap.this.getRegion(value);
+                }
+            };
+        } catch (Throwable e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    public boolean remove(T area) {
+        if (this.objects != null) {
+            if (this.objects.remove(area)) {
+                return this.objects.isEmpty();
+            }
+        }
+        if (this.skip != null) {
+            if (this.skip.remove(area)) {
+                this.skip = null;
+            }
+        } else {
+            RegionWrapper region = getRegion(area);
+            if (region.minX >= this.x) {
+                if (region.minZ >= this.z) {
+                    if (this.one != null) {
+                        if (this.one.remove(area)) {
+                            this.one = null;
+                        }
+                        return countCurrent() == 0;
+                    }
+                } else {
+                    if (this.two != null) {
+                        if (this.two.remove(area)) {
+                            this.two = null;
+                        }
+                        return countCurrent() == 0;
+                    }
+                }
+            } else {
+                if (region.minZ >= this.z) {
+                    if (this.four != null) {
+                        if (this.four.remove(area)) {
+                            this.four = null;
+                        }
+                        return countCurrent() == 0;
+                    }
+                } else {
+                    if (this.three != null) {
+                        if (this.three.remove(area)) {
+                            this.three = null;
+                        }
+                        return countCurrent() == 0;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public void recalculateSkip() {
+        QuadMap<T> map = null;
+        for (QuadMap<T> current : new QuadMap[] {this.one, this.two, this.three, this.four}) {
+            if (current != null) {
+                if (map != null) {
+                    this.skip = null;
+                    return;
+                }
+                map = current;
+            }
+        }
+        this.skip = map.skip == null ? map : map.skip;
+    }
+
+    public Set<T> get(RegionWrapper region) {
+        HashSet<T> set = new HashSet<>();
+        if (this.objects != null) {
+            for (T obj : this.objects) {
+                if (getRegion(obj).intersects(region)) {
+                    set.add(obj);
+                }
+            }
+        }
+        if (this.skip != null) {
+            if (this.skip.intersects(region)) {
+                set.addAll(this.skip.get(region));
+            }
+        } else {
+            if (this.one != null && this.one.intersects(region)) {
+                set.addAll(this.one.get(region));
+            }
+            if (this.two != null && this.two.intersects(region)) {
+                set.addAll(this.two.get(region));
+            }
+            if (this.three != null && this.three.intersects(region)) {
+                set.addAll(this.three.get(region));
+            }
+            if (this.four != null && this.four.intersects(region)) {
+                set.addAll(this.four.get(region));
+            }
+        }
+        return set;
+    }
+
+    public boolean intersects(RegionWrapper other) {
+        return (other.minX <= this.x + this.size) && (other.maxX >= this.x - this.size) && (
+            other.minZ <= this.z + this.size) && (other.maxZ >= this.z - this.size);
+    }
+
+    public T get(int x, int z) {
+        if (this.objects != null) {
+            for (T obj : this.objects) {
+                if (getRegion(obj).isIn(x, z)) {
+                    return obj;
+                }
+            }
+        }
+        if (this.skip != null) {
+            return this.skip.get(x, z);
+        } else {
+            if (x >= this.x) {
+                if (z >= this.z) {
+                    if (this.one != null) {
+                        return this.one.get(x, z);
+                    }
+                } else {
+                    if (this.two != null) {
+                        return this.two.get(x, z);
+                    }
+                }
+            } else {
+                if (z >= this.z) {
+                    if (this.four != null) {
+                        return this.four.get(x, z);
+                    }
+                } else {
+                    if (this.three != null) {
+                        return this.three.get(x, z);
+                    }
+                }
+            }
+        }
+        return null;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
new file mode 100644
index 000000000..8784ebf35
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -0,0 +1,278 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import lombok.Getter;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
+
+    private final String world;
+    private final ConcurrentHashMap<Long, LocalChunk> blockChunks = new ConcurrentHashMap<>();
+    private final ConcurrentLinkedDeque<LocalChunk> chunks = new ConcurrentLinkedDeque<>();
+    private long modified;
+    private LocalChunk lastWrappedChunk;
+    private int lastX = Integer.MIN_VALUE;
+    private int lastZ = Integer.MIN_VALUE;
+    @Getter private boolean baseBlocks = false;
+
+    public BasicLocalBlockQueue(String world) {
+        super(world);
+        this.world = world;
+        this.modified = System.currentTimeMillis();
+    }
+
+    public abstract LocalChunk getLocalChunk(int x, int z);
+
+    @Override public abstract PlotBlock getBlock(int x, int y, int z);
+
+    public abstract void setComponents(LocalChunk<T> lc);
+
+    @Override public final String getWorld() {
+        return world;
+    }
+
+    @Override public final boolean next() {
+        lastX = Integer.MIN_VALUE;
+        lastZ = Integer.MIN_VALUE;
+        try {
+            if (this.blockChunks.size() == 0) {
+                return false;
+            }
+            synchronized (blockChunks) {
+                LocalChunk chunk = chunks.poll();
+                if (chunk != null) {
+                    blockChunks.remove(chunk.longHash());
+                    this.execute(chunk);
+                    return true;
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    public final boolean execute(final LocalChunk<T> lc) {
+        if (lc == null) {
+            return false;
+        }
+        this.setComponents(lc);
+        return true;
+    }
+
+    @Override public void startSet(boolean parallel) {
+        // Do nothing
+    }
+
+    @Override public void endSet(boolean parallel) {
+        // Do nothing
+    }
+
+    @Override public final int size() {
+        return chunks.size();
+    }
+
+    @Override public final long getModified() {
+        return modified;
+    }
+
+    @Override public final void setModified(long modified) {
+        this.modified = modified;
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
+        if ((y > 255) || (y < 0)) {
+            return false;
+        }
+        baseBlocks = true;
+        int cx = x >> 4;
+        int cz = z >> 4;
+        if (cx != lastX || cz != lastZ) {
+            lastX = cx;
+            lastZ = cz;
+            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
+            lastWrappedChunk = this.blockChunks.get(pair);
+            if (lastWrappedChunk == null) {
+                lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
+                lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
+                LocalChunk previous = this.blockChunks.put(pair, lastWrappedChunk);
+                if (previous == null) {
+                    chunks.add(lastWrappedChunk);
+                    return true;
+                }
+                this.blockChunks.put(pair, previous);
+                lastWrappedChunk = previous;
+            }
+        }
+        lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
+        return true;
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
+        if ((y > 255) || (y < 0)) {
+            return false;
+        }
+        int cx = x >> 4;
+        int cz = z >> 4;
+        if (cx != lastX || cz != lastZ) {
+            lastX = cx;
+            lastZ = cz;
+            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
+            lastWrappedChunk = this.blockChunks.get(pair);
+            if (lastWrappedChunk == null) {
+                lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
+                lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
+                LocalChunk previous = this.blockChunks.put(pair, lastWrappedChunk);
+                if (previous == null) {
+                    chunks.add(lastWrappedChunk);
+                    return true;
+                }
+                this.blockChunks.put(pair, previous);
+                lastWrappedChunk = previous;
+            }
+        }
+        lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
+        return true;
+    }
+
+    @Override public final boolean setBiome(int x, int z, String biome) {
+        long pair = (long) (x >> 4) << 32 | (z >> 4) & 0xFFFFFFFFL;
+        LocalChunk result = this.blockChunks.get(pair);
+        if (result == null) {
+            result = this.getLocalChunk(x >> 4, z >> 4);
+            LocalChunk previous = this.blockChunks.put(pair, result);
+            if (previous != null) {
+                this.blockChunks.put(pair, previous);
+                result = previous;
+            } else {
+                chunks.add(result);
+            }
+        }
+        result.setBiome(x & 15, z & 15, biome);
+        return true;
+    }
+
+    public final void setChunk(LocalChunk<T> chunk) {
+        LocalChunk previous = this.blockChunks.put(chunk.longHash(), chunk);
+        if (previous != null) {
+            chunks.remove(previous);
+        }
+        chunks.add(chunk);
+    }
+
+    @Override public void flush() {
+        GlobalBlockQueue.IMP.dequeue(this);
+        TaskManager.IMP.sync(new RunnableVal<Object>() {
+            @Override public void run(Object value) {
+                while (next())
+                    ;
+            }
+        });
+    }
+
+
+    public abstract class LocalChunk<T> {
+        public final BasicLocalBlockQueue parent;
+        public final int z;
+        public final int x;
+
+        public T[] blocks;
+        public BaseBlock[][] baseblocks;
+        public String[][] biomes;
+
+        public LocalChunk(BasicLocalBlockQueue<T> parent, int x, int z) {
+            this.parent = parent;
+            this.x = x;
+            this.z = z;
+        }
+
+        /**
+         * Get the parent queue this chunk belongs to
+         *
+         * @return
+         */
+        public BasicLocalBlockQueue getParent() {
+            return parent;
+        }
+
+        public int getX() {
+            return x;
+        }
+
+        public int getZ() {
+            return z;
+        }
+
+        public abstract void setBlock(final int x, final int y, final int z, final PlotBlock block);
+
+        public abstract void setBlock(final int x, final int y, final int z, final BaseBlock block);
+
+        public void setBiome(int x, int z, String biome) {
+            if (this.biomes == null) {
+                this.biomes = new String[16][];
+            }
+            String[] index = this.biomes[x];
+            if (index == null) {
+                index = this.biomes[x] = new String[16];
+            }
+            index[z] = biome;
+        }
+
+        public long longHash() {
+            return MathMan.pairInt(x, z);
+        }
+
+        @Override public int hashCode() {
+            return MathMan.pair((short) x, (short) z);
+        }
+    }
+
+
+    public class BasicLocalChunk extends LocalChunk<PlotBlock[]> {
+        public BasicLocalChunk(BasicLocalBlockQueue parent, int x, int z) {
+            super(parent, x, z);
+            blocks = new PlotBlock[16][];
+            baseblocks = new BaseBlock[16][];
+        }
+
+        @Override public void setBlock(int x, int y, int z, PlotBlock block) {
+            this.setInternal(x, y, z, block);
+        }
+
+        private void setInternal(final int x, final int y, final int z, final PlotBlock plotBlock) {
+            final int i = MainUtil.CACHE_I[y][x][z];
+            final int j = MainUtil.CACHE_J[y][x][z];
+            PlotBlock[] array = blocks[i];
+            if (array == null) {
+                array = (blocks[i] = new PlotBlock[4096]);
+            }
+            array[j] = plotBlock;
+        }
+
+        @Override public void setBlock(int x, int y, int z, BaseBlock block) {
+            this.setInternal(x, y, z, block);
+        }
+
+        private void setInternal(final int x, final int y, final int z, final BaseBlock baseBlock) {
+            final int i = MainUtil.CACHE_I[y][x][z];
+            final int j = MainUtil.CACHE_J[y][x][z];
+            BaseBlock[] array = baseblocks[i];
+            if (array == null) {
+                array = (baseblocks[i] = new BaseBlock[4096]);
+            }
+            array[j] = baseBlock;
+        }
+
+        public void setBlock(final int x, final int y, final int z, final int id, final int data) {
+            final PlotBlock block = PlotBlock.get(id, data);
+            this.setInternal(x, y, z, block);
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
new file mode 100644
index 000000000..cd3a4a81d
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
@@ -0,0 +1,110 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+public class DelegateLocalBlockQueue extends LocalBlockQueue {
+
+    private final LocalBlockQueue parent;
+
+    public DelegateLocalBlockQueue(LocalBlockQueue parent) {
+        super(parent == null ? null : parent.getWorld());
+        this.parent = parent;
+    }
+
+    public LocalBlockQueue getParent() {
+        return parent;
+    }
+
+    @Override public boolean next() {
+        return parent.next();
+    }
+
+    @Override public void startSet(boolean parallel) {
+        if (parent != null) {
+            parent.startSet(parallel);
+        }
+    }
+
+    @Override public void endSet(boolean parallel) {
+        if (parent != null) {
+            parent.endSet(parallel);
+        }
+    }
+
+    @Override public int size() {
+        if (parent != null) {
+            return parent.size();
+        }
+        return 0;
+    }
+
+    @Override public void optimize() {
+        if (parent != null) {
+            parent.optimize();
+        }
+    }
+
+    @Override public long getModified() {
+        if (parent != null) {
+            return parent.getModified();
+        }
+        return 0;
+    }
+
+    @Override public void setModified(long modified) {
+        if (parent != null) {
+            parent.setModified(modified);
+        }
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
+        return parent.setBlock(x, y, z, id);
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
+        return parent.setBlock(x, y, z, id);
+    }
+
+    @Override public PlotBlock getBlock(int x, int y, int z) {
+        return parent.getBlock(x, y, z);
+    }
+
+    @Override public boolean setBiome(int x, int y, String biome) {
+        return parent.setBiome(x, y, biome);
+    }
+
+    @Override public String getWorld() {
+        return parent.getWorld();
+    }
+
+    @Override public void flush() {
+        if (parent != null) {
+            parent.flush();
+        }
+    }
+
+    @Override public void refreshChunk(int x, int z) {
+        if (parent != null) {
+            parent.refreshChunk(x, z);
+        }
+    }
+
+    @Override public void fixChunkLighting(int x, int z) {
+        if (parent != null) {
+            parent.fixChunkLighting(x, z);
+        }
+    }
+
+    @Override public void regenChunk(int x, int z) {
+        if (parent != null) {
+            parent.regenChunk(x, z);
+        }
+    }
+
+    @Override public void enqueue() {
+        if (parent != null) {
+            parent.enqueue();
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
new file mode 100644
index 000000000..84d5f7ef4
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -0,0 +1,303 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.util.ArrayList;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class GlobalBlockQueue {
+
+    public static GlobalBlockQueue IMP;
+    private final int PARALLEL_THREADS;
+    private final ConcurrentLinkedDeque<LocalBlockQueue> activeQueues;
+    private final ConcurrentLinkedDeque<LocalBlockQueue> inactiveQueues;
+    private final ConcurrentLinkedDeque<Runnable> runnables;
+    private final AtomicBoolean running;
+    private QueueProvider provider;
+    /**
+     * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the
+     * server
+     */
+    private long last;
+    private long secondLast;
+    private long lastSuccess;
+    private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
+        new RunnableVal2<Long, LocalBlockQueue>() {
+            @Override public void run(Long free, LocalBlockQueue queue) {
+                do {
+                    boolean more = queue.next();
+                    if (!more) {
+                        lastSuccess = last;
+                        if (inactiveQueues.size() == 0 && activeQueues.size() == 0) {
+                            tasks();
+                        }
+                        return;
+                    }
+                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
+                    - GlobalBlockQueue.this.last) < free);
+            }
+        };
+
+    public GlobalBlockQueue(QueueProvider provider, int threads) {
+        this.provider = provider;
+        activeQueues = new ConcurrentLinkedDeque<>();
+        inactiveQueues = new ConcurrentLinkedDeque<>();
+        runnables = new ConcurrentLinkedDeque<>();
+        running = new AtomicBoolean();
+        this.PARALLEL_THREADS = threads;
+    }
+
+    public QueueProvider getProvider() {
+        return provider;
+    }
+
+    public void setProvider(QueueProvider provider) {
+        this.provider = provider;
+    }
+
+    public LocalBlockQueue getNewQueue(String world, boolean autoQueue) {
+        LocalBlockQueue queue = provider.getNewQueue(world);
+        if (autoQueue) {
+            inactiveQueues.add(queue);
+        }
+        return queue;
+    }
+
+    public boolean stop() {
+        if (!running.get()) {
+            return false;
+        }
+        running.set(false);
+        return true;
+    }
+
+    public boolean runTask() {
+        if (running.get()) {
+            return false;
+        }
+        running.set(true);
+        TaskManager.runTaskRepeat(() -> {
+            if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
+                lastSuccess = System.currentTimeMillis();
+                tasks();
+                return;
+            }
+            SET_TASK.value1 = 50 + Math.min(
+                (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
+                    System.currentTimeMillis()),
+                GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
+            SET_TASK.value2 = getNextQueue();
+            if (SET_TASK.value2 == null) {
+                return;
+            }
+            if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                throw new IllegalStateException(
+                    "This shouldn't be possible for placement to occur off the main thread");
+            }
+            // Disable the async catcher as it can't discern async vs parallel
+            SET_TASK.value2.startSet(true);
+            try {
+                if (PARALLEL_THREADS <= 1) {
+                    SET_TASK.run();
+                } else {
+                    ArrayList<Thread> threads = new ArrayList<Thread>();
+                    for (int i = 0; i < PARALLEL_THREADS; i++) {
+                        threads.add(new Thread(SET_TASK));
+                    }
+                    for (Thread thread : threads) {
+                        thread.start();
+                    }
+                    for (Thread thread : threads) {
+                        try {
+                            thread.join();
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } catch (Throwable e) {
+                e.printStackTrace();
+            } finally {
+                // Enable it again (note that we are still on the main thread)
+                SET_TASK.value2.endSet(true);
+            }
+        }, 1);
+        return true;
+    }
+
+    public QueueStage getStage(LocalBlockQueue queue) {
+        if (activeQueues.contains(queue)) {
+            return QueueStage.ACTIVE;
+        } else if (inactiveQueues.contains(queue)) {
+            return QueueStage.INACTIVE;
+        }
+        return QueueStage.NONE;
+    }
+
+    public boolean isStage(LocalBlockQueue queue, QueueStage stage) {
+        switch (stage) {
+            case ACTIVE:
+                return activeQueues.contains(queue);
+            case INACTIVE:
+                return inactiveQueues.contains(queue);
+            case NONE:
+                return !activeQueues.contains(queue) && !inactiveQueues.contains(queue);
+        }
+        return false;
+    }
+
+    public void enqueue(LocalBlockQueue queue) {
+        inactiveQueues.remove(queue);
+        if (queue.size() > 0 && !activeQueues.contains(queue)) {
+            queue.optimize();
+            activeQueues.add(queue);
+        }
+    }
+
+    public void dequeue(LocalBlockQueue queue) {
+        inactiveQueues.remove(queue);
+        activeQueues.remove(queue);
+    }
+
+    public List<LocalBlockQueue> getAllQueues() {
+        ArrayList<LocalBlockQueue> list =
+            new ArrayList<>(activeQueues.size() + inactiveQueues.size());
+        list.addAll(inactiveQueues);
+        list.addAll(activeQueues);
+        return list;
+    }
+
+    public List<LocalBlockQueue> getActiveQueues() {
+        return new ArrayList<>(activeQueues);
+    }
+
+    public List<LocalBlockQueue> getInactiveQueues() {
+        return new ArrayList<>(inactiveQueues);
+    }
+
+    public void flush(LocalBlockQueue queue) {
+        SET_TASK.value1 = Long.MAX_VALUE;
+        SET_TASK.value2 = queue;
+        if (SET_TASK.value2 == null) {
+            return;
+        }
+        if (PlotSquared.get().isMainThread(Thread.currentThread())) {
+            throw new IllegalStateException("Must be flushed on the main thread!");
+        }
+        // Disable the async catcher as it can't discern async vs parallel
+        SET_TASK.value2.startSet(true);
+        try {
+            if (PARALLEL_THREADS <= 1) {
+                SET_TASK.run();
+            } else {
+                ArrayList<Thread> threads = new ArrayList<>();
+                for (int i = 0; i < PARALLEL_THREADS; i++) {
+                    threads.add(new Thread(SET_TASK));
+                }
+                for (Thread thread : threads) {
+                    thread.start();
+                }
+                for (Thread thread : threads) {
+                    try {
+                        thread.join();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        } finally {
+            // Enable it again (note that we are still on the main thread)
+            SET_TASK.value2.endSet(true);
+            dequeue(queue);
+        }
+    }
+
+    public LocalBlockQueue getNextQueue() {
+        long now = System.currentTimeMillis();
+        while (activeQueues.size() > 0) {
+            LocalBlockQueue queue = activeQueues.peek();
+            if (queue != null && queue.size() > 0) {
+                queue.setModified(now);
+                return queue;
+            } else {
+                activeQueues.poll();
+            }
+        }
+        int size = inactiveQueues.size();
+        if (size > 0) {
+            Iterator<LocalBlockQueue> iter = inactiveQueues.iterator();
+            try {
+                int total = 0;
+                LocalBlockQueue firstNonEmpty = null;
+                while (iter.hasNext()) {
+                    LocalBlockQueue queue = iter.next();
+                    long age = now - queue.getModified();
+                    total += queue.size();
+                    if (queue.size() == 0) {
+                        if (age > 1000) {
+                            iter.remove();
+                        }
+                        continue;
+                    }
+                    if (firstNonEmpty == null) {
+                        firstNonEmpty = queue;
+                    }
+                    if (total > 64) {
+                        firstNonEmpty.setModified(now);
+                        return firstNonEmpty;
+                    }
+                    if (age > 60000) {
+                        queue.setModified(now);
+                        return queue;
+                    }
+                }
+            } catch (ConcurrentModificationException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    public boolean isDone() {
+        return activeQueues.size() == 0 && inactiveQueues.size() == 0;
+    }
+
+    public boolean addTask(final Runnable whenDone) {
+        if (this.isDone()) {
+            // Run
+            this.tasks();
+            if (whenDone != null) {
+                whenDone.run();
+            }
+            return true;
+        }
+        if (whenDone != null) {
+            this.runnables.add(whenDone);
+        }
+        return false;
+    }
+
+    public synchronized boolean tasks() {
+        if (this.runnables.isEmpty()) {
+            return false;
+        }
+        final ArrayList<Runnable> tmp = new ArrayList<>(this.runnables);
+        this.runnables.clear();
+        for (final Runnable runnable : tmp) {
+            runnable.run();
+        }
+        return true;
+    }
+
+    public enum QueueStage {
+        INACTIVE, ACTIVE, NONE
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
new file mode 100644
index 000000000..65dc13971
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
@@ -0,0 +1,108 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+import java.util.Map;
+
+public abstract class LocalBlockQueue {
+
+    public LocalBlockQueue(String world) {
+        // Implement this elsewhere
+    }
+
+    public ScopedLocalBlockQueue getForChunk(int x, int z) {
+        int bx = x << 4;
+        int bz = z << 4;
+        return new ScopedLocalBlockQueue(this, new Location(getWorld(), bx, 0, bz),
+            new Location(getWorld(), bx + 15, 255, bz + 15));
+    }
+
+    public abstract boolean next();
+
+    public abstract void startSet(boolean parallel);
+
+    public abstract void endSet(boolean parallel);
+
+    public abstract int size();
+
+    public abstract void optimize();
+
+    public abstract long getModified();
+
+    public abstract void setModified(long modified);
+
+    public abstract boolean setBlock(final int x, final int y, final int z, final PlotBlock id);
+
+    public abstract boolean setBlock(final int x, final int y, final int z, final BaseBlock id);
+
+    public boolean setTile(int x, int y, int z, CompoundTag tag) {
+        SchematicHandler.manager.restoreTile(this, tag, x, y, z);
+        return true;
+    }
+
+    public abstract PlotBlock getBlock(int x, int y, int z);
+
+    public abstract boolean setBiome(int x, int z, String biome);
+
+    public abstract String getWorld();
+
+    public abstract void flush();
+
+    public final void setModified() {
+        setModified(System.currentTimeMillis());
+    }
+
+    public abstract void refreshChunk(int x, int z);
+
+    public abstract void fixChunkLighting(int x, int z);
+
+    public abstract void regenChunk(int x, int z);
+
+    public final void regenChunkSafe(int x, int z) {
+        regenChunk(x, z);
+        fixChunkLighting(x, z);
+        ChunkLoc loc = new ChunkLoc(x, z);
+        for (Map.Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+            PlotPlayer pp = entry.getValue();
+            Location pLoc = pp.getLocation();
+            if (!StringMan.isEqual(getWorld(), pLoc.getWorld()) || !pLoc.getChunkLoc()
+                .equals(loc)) {
+                continue;
+            }
+            pLoc.setY(WorldUtil.IMP.getHighestBlock(getWorld(), pLoc.getX(), pLoc.getZ()));
+            pp.teleport(pLoc);
+        }
+    }
+
+    public void enqueue() {
+        GlobalBlockQueue.IMP.enqueue(this);
+    }
+
+    public void setCuboid(Location pos1, Location pos2, PlotBlock block) {
+        for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
+            for (int x = pos1.getX(); x <= pos2.getX(); x++) {
+                for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
+                    setBlock(x, y, z, block);
+                }
+            }
+        }
+    }
+
+    public void setCuboid(Location pos1, Location pos2, BlockBucket blocks) {
+        for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
+            for (int x = pos1.getX(); x <= pos2.getX(); x++) {
+                for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
+                    // int i = PseudoRandom.random.random(blocks.length);
+                    // PlotBlock block = blocks[i];
+                    setBlock(x, y, z, blocks.getBlock());
+                }
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java
new file mode 100644
index 000000000..d0a561111
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java
@@ -0,0 +1,24 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+public class OffsetLocalBlockQueue extends DelegateLocalBlockQueue {
+    private final int ox;
+    private final int oy;
+    private final int oz;
+
+    public OffsetLocalBlockQueue(LocalBlockQueue parent, int ox, int oy, int oz) {
+        super(parent);
+        this.ox = ox;
+        this.oy = oy;
+        this.oz = oz;
+    }
+
+    @Override public boolean setBiome(int x, int y, String biome) {
+        return super.setBiome(ox + x, oy + y, biome);
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
+        return super.setBlock(ox + x, oy + y, oz + z, id);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java
new file mode 100644
index 000000000..3c96e0d5f
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java
@@ -0,0 +1,30 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+public abstract class QueueProvider {
+    public static QueueProvider of(final Class<? extends LocalBlockQueue> primary,
+        final Class<? extends LocalBlockQueue> fallback) {
+        return new QueueProvider() {
+
+            private boolean failed = false;
+
+            @Override public LocalBlockQueue getNewQueue(String world) {
+                if (!failed) {
+                    try {
+                        return (LocalBlockQueue) primary.getConstructors()[0].newInstance(world);
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                        failed = true;
+                    }
+                }
+                try {
+                    return (LocalBlockQueue) fallback.getConstructors()[0].newInstance(world);
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                }
+                return null;
+            }
+        };
+    }
+
+    public abstract LocalBlockQueue getNewQueue(String world);
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
new file mode 100644
index 000000000..352465aea
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
@@ -0,0 +1,98 @@
+package com.github.intellectualsites.plotsquared.plot.util.block;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.sk89q.worldedit.world.block.BaseBlock;
+
+public class ScopedLocalBlockQueue extends DelegateLocalBlockQueue {
+    private final int minX;
+    private final int minY;
+    private final int minZ;
+
+    private final int maxX;
+    private final int maxY;
+    private final int maxZ;
+
+    private final int dx;
+    private final int dy;
+    private final int dz;
+
+    public ScopedLocalBlockQueue(LocalBlockQueue parent, Location min, Location max) {
+        super(parent);
+        this.minX = min.getX();
+        this.minY = min.getY();
+        this.minZ = min.getZ();
+
+        this.maxX = max.getX();
+        this.maxY = max.getY();
+        this.maxZ = max.getZ();
+
+        this.dx = maxX - minX;
+        this.dy = maxY - minY;
+        this.dz = maxZ - minZ;
+    }
+
+
+    @Override public boolean setBiome(int x, int z, String biome) {
+        return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setBiome(x + minX, z + minZ, biome);
+    }
+
+    public void fillBiome(String biome) {
+        for (int x = 0; x <= dx; x++) {
+            for (int z = 0; z < dz; z++) {
+                setBiome(x, z, biome);
+            }
+        }
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
+        return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super
+            .setBlock(x + minX, y + minY, z + minZ, id);
+    }
+
+    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
+        return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super
+            .setBlock(x + minX, y + minY, z + minZ, id);
+    }
+
+    public Location getMin() {
+        return new Location(getWorld(), minX, minY, minZ);
+    }
+
+    public Location getMax() {
+        return new Location(getWorld(), maxX, maxY, maxZ);
+    }
+
+    /**
+     * Run a task for each x,z value corresponding to the plot at that location<br>
+     * - Plot: The plot at the x,z (may be null)<br>
+     * - Location: The location in the chunk (y = 0)<br>
+     * - PlotChunk: Reference to this chunk object<br>
+     *
+     * @param task
+     */
+    public void mapByType2D(RunnableVal3<Plot, Integer, Integer> task) {
+        int bx = minX;
+        int bz = minZ;
+        PlotArea area = PlotSquared.get().getPlotArea(getWorld(), null);
+        Location loc = new Location(getWorld(), bx, 0, bz);
+        if (area != null) {
+            PlotManager manager = area.getPlotManager();
+            for (int x = 0; x < 16; x++) {
+                loc.setX(bx + x);
+                for (int z = 0; z < 16; z++) {
+                    loc.setZ(bz + z);
+                    task.run(area.getPlotAbs(loc), x, z);
+                }
+            }
+        } else {
+            for (int x = 0; x < 16; x++) {
+                loc.setX(bx + x);
+                for (int z = 0; z < 16; z++) {
+                    loc.setZ(bz + z);
+                    task.run(loc.getPlotAbs(), x, z);
+                }
+            }
+        }
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
new file mode 100644
index 000000000..0362e0831
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -0,0 +1,449 @@
+package com.github.intellectualsites.plotsquared.plot.util.expiry;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+public class ExpireManager {
+
+    public static ExpireManager IMP;
+    private final ConcurrentHashMap<UUID, Long> dates_cache;
+    private final ConcurrentHashMap<UUID, Long> account_age_cache;
+    private volatile HashSet<Plot> plotsToDelete;
+    private ArrayDeque<ExpiryTask> tasks;
+    /**
+     * 0 = stopped, 1 = stopping, 2 = running
+     */
+    private int running;
+
+    public ExpireManager() {
+        tasks = new ArrayDeque<>();
+        dates_cache = new ConcurrentHashMap<>();
+        account_age_cache = new ConcurrentHashMap<>();
+    }
+
+    public void addTask(ExpiryTask task) {
+        PlotSquared.debug("Adding new expiry task!");
+        this.tasks.add(task);
+    }
+
+    public void handleJoin(PlotPlayer pp) {
+        storeDate(pp.getUUID(), System.currentTimeMillis());
+        if (plotsToDelete != null && !plotsToDelete.isEmpty()) {
+            for (Plot plot : pp.getPlots()) {
+                plotsToDelete.remove(plot);
+            }
+        }
+        confirmExpiry(pp);
+    }
+
+    public void handleEntry(PlotPlayer pp, Plot plot) {
+        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
+            .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
+            if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
+                confirmExpiry(pp);
+            } else {
+                plotsToDelete.remove(plot);
+                confirmExpiry(pp);
+            }
+        }
+    }
+
+    /**
+     * Gets the account last joined - first joined (or Long.MAX_VALUE)
+     *
+     * @return result
+     */
+    public long getAccountAge(UUID uuid) {
+        Long value = this.account_age_cache.get(uuid);
+        return value == null ? Long.MAX_VALUE : value;
+    }
+
+    public long getTimestamp(UUID uuid) {
+        Long value = this.dates_cache.get(uuid);
+        return value == null ? 0 : value;
+    }
+
+    public void updateExpired(Plot plot) {
+        if (plotsToDelete != null && !plotsToDelete.isEmpty() && plotsToDelete.contains(plot)) {
+            if (isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
+                plotsToDelete.remove(plot);
+            }
+        }
+    }
+
+    public void confirmExpiry(final PlotPlayer pp) {
+        if (pp.getMeta("ignoreExpireTask") != null) {
+            return;
+        }
+        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
+            .hasPermission("plots.admin.command.autoclear")) {
+            final int num = plotsToDelete.size();
+            while (!plotsToDelete.isEmpty()) {
+                Iterator<Plot> iter = plotsToDelete.iterator();
+                final Plot current = iter.next();
+                if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
+                    TaskManager.runTask(() -> {
+                        pp.setMeta("ignoreExpireTask", true);
+                        pp.teleport(current.getCenter());
+                        pp.deleteMeta("ignoreExpireTask");
+                        PlotMessage msg = new PlotMessage()
+                            .text(num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
+                            .color("$1").text(current.toString()).color("$2")
+                            .suggest("/plot list expired").tooltip("/plot list expired")
+                            //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
+                            .text("\n - ").color("$3").text("Delete this (/plot delete)")
+                            .color("$2").suggest("/plot delete").tooltip("/plot delete")
+                            .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
+                            .color("$2").suggest("/plot set keep 1d").tooltip("/plot set keep 1d")
+                            .text("\n - ").color("$3").text("Keep this (/plot set keep true)")
+                            .color("$2").suggest("/plot set keep true")
+                            .tooltip("/plot set keep true").text("\n - ").color("$3")
+                            .text("Don't show me this").color("$2")
+                            .suggest("/plot toggle clear-confirmation")
+                            .tooltip("/plot toggle clear-confirmation");
+                        msg.send(pp);
+                    });
+                    return;
+                } else {
+                    iter.remove();
+                }
+            }
+            plotsToDelete.clear();
+        }
+    }
+
+
+    public boolean cancelTask() {
+        if (this.running != 2) {
+            return false;
+        }
+        this.running = 1;
+        return true;
+    }
+
+    public boolean runAutomatedTask() {
+        return runTask(new RunnableVal3<Plot, Runnable, Boolean>() {
+            @Override public void run(Plot plot, Runnable runnable, Boolean confirm) {
+                if (confirm) {
+                    if (plotsToDelete == null) {
+                        plotsToDelete = new HashSet<>();
+                    }
+                    plotsToDelete.add(plot);
+                    runnable.run();
+                } else {
+                    deleteWithMessage(plot, runnable);
+                }
+            }
+        });
+    }
+
+    public Collection<ExpiryTask> isExpired(ArrayDeque<ExpiryTask> applicable, Plot plot) {
+        // Filter out invalid worlds
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask et = applicable.poll();
+            if (et.applies(plot.getArea())) {
+                applicable.add(et);
+            }
+        }
+        if (applicable.isEmpty()) {
+            return new ArrayList<>();
+        }
+        boolean shouldCheckAccountAge = false;
+
+        long diff = getAge(plot);
+        if (diff == 0) {
+            return new ArrayList<>();
+        }
+        // Filter out non old plots
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask et = applicable.poll();
+            if (et.applies(diff)) {
+                applicable.add(et);
+                shouldCheckAccountAge |= et.getSettings().SKIP_ACCOUNT_AGE_DAYS != -1;
+            }
+        }
+        if (applicable.isEmpty()) {
+            return new ArrayList<>();
+        }
+        // Check account age
+        if (shouldCheckAccountAge) {
+            long accountAge = getAge(plot);
+            for (int i = 0; i < applicable.size(); i++) {
+                ExpiryTask et = applicable.poll();
+                if (et.appliesAccountAge(accountAge)) {
+                    applicable.add(et);
+                }
+            }
+            if (applicable.isEmpty()) {
+                return new ArrayList<>();
+            }
+        }
+
+        // Run applicable non confirming tasks
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask expiryTask = applicable.poll();
+            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
+                if (!expiryTask.requiresConfirmation()) {
+                    return Collections.singletonList(expiryTask);
+                }
+            }
+            applicable.add(expiryTask);
+        }
+        // Run applicable confirming tasks
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask expiryTask = applicable.poll();
+            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
+                return Collections.singletonList(expiryTask);
+            }
+            applicable.add(expiryTask);
+        }
+        return applicable;
+    }
+
+    public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
+        ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
+        queue.removeIf(expiryTask -> !expiryTask.applies(area));
+        return queue;
+    }
+
+    public void passesComplexity(PlotAnalysis analysis, Collection<ExpiryTask> applicable,
+        RunnableVal<Boolean> success, Runnable failure) {
+        if (analysis != null) {
+            // Run non confirming tasks
+            for (ExpiryTask et : applicable) {
+                if (!et.requiresConfirmation() && et.applies(analysis)) {
+                    success.run(false);
+                    return;
+                }
+            }
+            for (ExpiryTask et : applicable) {
+                if (et.applies(analysis)) {
+                    success.run(true);
+                    return;
+                }
+            }
+            failure.run();
+        }
+    }
+
+    public boolean runTask(final RunnableVal3<Plot, Runnable, Boolean> expiredTask) {
+        if (this.running != 0) {
+            return false;
+        }
+        this.running = 2;
+        final ConcurrentLinkedDeque<Plot> plots =
+            new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                final Runnable task = this;
+                if (ExpireManager.this.running != 2) {
+                    ExpireManager.this.running = 0;
+                    return;
+                }
+                long start = System.currentTimeMillis();
+                while (!plots.isEmpty()) {
+                    if (ExpireManager.this.running != 2) {
+                        ExpireManager.this.running = 0;
+                        return;
+                    }
+                    Plot plot = plots.poll();
+                    PlotArea area = plot.getArea();
+                    final Plot newPlot = area.getPlot(plot.getId());
+                    final ArrayDeque<ExpiryTask> applicable = new ArrayDeque<>(tasks);
+                    final Collection<ExpiryTask> expired = isExpired(applicable, newPlot);
+                    if (expired.isEmpty()) {
+                        continue;
+                    }
+                    for (ExpiryTask expiryTask : expired) {
+                        if (!expiryTask.needsAnalysis()) {
+                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                                expiryTask.requiresConfirmation());
+                            return;
+                        }
+                    }
+                    final RunnableVal<PlotAnalysis> handleAnalysis =
+                        new RunnableVal<PlotAnalysis>() {
+                            @Override public void run(final PlotAnalysis changed) {
+                                passesComplexity(changed, expired, new RunnableVal<Boolean>() {
+                                    @Override public void run(Boolean confirmation) {
+                                        expiredTask.run(newPlot,
+                                            () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                                            confirmation);
+                                    }
+                                }, () -> {
+                                    FlagManager
+                                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
+                                    TaskManager.runTaskLaterAsync(task, 20);
+                                });
+                            }
+                        };
+                    final Runnable doAnalysis =
+                        () -> HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
+
+                    PlotAnalysis analysis = newPlot.getComplexity(null);
+                    if (analysis != null) {
+                        passesComplexity(analysis, expired, new RunnableVal<Boolean>() {
+                            @Override public void run(Boolean value) {
+                                doAnalysis.run();
+                            }
+                        }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
+                    } else {
+                        doAnalysis.run();
+                    }
+                    return;
+                }
+                if (plots.isEmpty()) {
+                    ExpireManager.this.running = 3;
+                    TaskManager.runTaskLater(() -> {
+                        if (ExpireManager.this.running == 3) {
+                            ExpireManager.this.running = 2;
+                            runTask(expiredTask);
+                        }
+                    }, 86400000);
+                } else {
+                    TaskManager.runTaskLaterAsync(task, 20 * 10);
+                }
+            }
+        });
+        return true;
+    }
+
+    public void storeDate(UUID uuid, long time) {
+        Long existing = this.dates_cache.put(uuid, time);
+        if (existing != null) {
+            long diff = time - existing;
+            if (diff > 0) {
+                Long account_age = this.account_age_cache.get(uuid);
+                if (account_age != null) {
+                    this.account_age_cache.put(uuid, account_age + diff);
+                }
+            }
+        }
+    }
+
+    public void storeAccountAge(UUID uuid, long time) {
+        this.account_age_cache.put(uuid, time);
+    }
+
+    public HashSet<Plot> getPendingExpired() {
+        return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
+    }
+
+    public void deleteWithMessage(Plot plot, Runnable whenDone) {
+        if (plot.isMerged()) {
+            plot.unlinkPlot(true, false);
+        }
+        for (UUID helper : plot.getTrusted()) {
+            PlotPlayer player = UUIDHandler.getPlayer(helper);
+            if (player != null) {
+                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+            }
+        }
+        for (UUID helper : plot.getMembers()) {
+            PlotPlayer player = UUIDHandler.getPlayer(helper);
+            if (player != null) {
+                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+            }
+        }
+        Set<Plot> plots = plot.getConnectedPlots();
+        plot.deletePlot(whenDone);
+        PlotAnalysis changed = plot.getComplexity(null);
+        int changes = changed == null ? 0 : changed.changes_sd;
+        int modified = changed == null ? 0 : changed.changes;
+        PlotSquared.debug(
+            "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
+                + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
+                .getString(plots));
+        PlotSquared.debug("$4 - Area: " + plot.getArea());
+        if (plot.hasOwner()) {
+            PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
+        } else {
+            PlotSquared.debug("$4 - Owner: Unowned");
+        }
+    }
+
+    public long getAge(UUID uuid) {
+        if (UUIDHandler.getPlayer(uuid) != null) {
+            return 0;
+        }
+        String name = UUIDHandler.getName(uuid);
+        if (name != null) {
+            Long last = this.dates_cache.get(uuid);
+            if (last == null) {
+                OfflinePlotPlayer opp;
+                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
+                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
+                } else {
+                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(name);
+                }
+                if (opp != null && (last = opp.getLastPlayed()) != 0) {
+                    this.dates_cache.put(uuid, last);
+                } else {
+                    return 0;
+                }
+            }
+            if (last == 0) {
+                return 0;
+            }
+            return System.currentTimeMillis() - last;
+        }
+        return 0;
+    }
+
+    public long getAccountAge(Plot plot) {
+        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
+            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+            return Long.MAX_VALUE;
+        }
+        long max = 0;
+        for (UUID owner : plot.getOwners()) {
+            long age = getAccountAge(owner);
+            max = Math.max(age, max);
+        }
+        return max;
+    }
+
+    public long getAge(Plot plot) {
+        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
+            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+            return 0;
+        }
+        Optional<?> keep = plot.getFlag(Flags.KEEP);
+        if (keep.isPresent()) {
+            Object value = keep.get();
+            if (value instanceof Boolean) {
+                if (Boolean.TRUE.equals(value)) {
+                    return 0;
+                }
+            } else if (value instanceof Long) {
+                if ((Long) value > System.currentTimeMillis()) {
+                    return 0;
+                }
+            } else { // Invalid?
+                return 0;
+            }
+        }
+        long min = Long.MAX_VALUE;
+        for (UUID owner : plot.getOwners()) {
+            long age = getAge(owner);
+            if (age < min) {
+                min = age;
+            }
+        }
+        return min;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
new file mode 100644
index 000000000..ab95068da
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
@@ -0,0 +1,4 @@
+package com.github.intellectualsites.plotsquared.plot.util.expiry;
+
+public class ExpirySettings {
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
new file mode 100644
index 000000000..df1244a12
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
@@ -0,0 +1,127 @@
+package com.github.intellectualsites.plotsquared.plot.util.expiry;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotFilter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+public class ExpiryTask {
+    private final Settings.Auto_Clear settings;
+    private long cutoffThreshold = Long.MIN_VALUE;
+
+    public ExpiryTask(Settings.Auto_Clear settings) {
+        this.settings = settings;
+    }
+
+    public Settings.Auto_Clear getSettings() {
+        return settings;
+    }
+
+    public boolean allowsArea(PlotArea area) {
+        return settings.WORLDS.contains(area.toString()) || settings.WORLDS.contains(area.worldname)
+            || settings.WORLDS.contains("*");
+    }
+
+    public boolean applies(PlotArea area) {
+        if (allowsArea(area)) {
+            if (settings.REQUIRED_PLOTS <= 0) {
+                return true;
+            }
+            Set<Plot> plots = null;
+            if (cutoffThreshold != Long.MAX_VALUE
+                && area.getPlots().size() > settings.REQUIRED_PLOTS
+                || (plots = getPlotsToCheck()).size() > settings.REQUIRED_PLOTS) {
+                // calculate cutoff
+                if (cutoffThreshold == Long.MIN_VALUE) {
+                    plots = plots != null ? plots : getPlotsToCheck();
+                    int diff = settings.REQUIRED_PLOTS;
+                    boolean min = true;
+                    if (settings.REQUIRED_PLOTS - plots.size() < settings.REQUIRED_PLOTS) {
+                        min = false;
+                        diff = settings.REQUIRED_PLOTS - plots.size();
+                    }
+                    List<Long> entireList = new ArrayList<>();
+                    for (Plot plot : plots) {
+                        entireList.add(ExpireManager.IMP.getAge(plot));
+                    }
+                    List<Long> top = new ArrayList<>(diff + 1);
+                    if (diff > 1000) {
+                        Collections.sort(entireList);
+                        cutoffThreshold = entireList.get(settings.REQUIRED_PLOTS);
+                    } else {
+                        loop:
+                        for (long num : entireList) {
+                            int size = top.size();
+                            if (size == 0) {
+                                top.add(num);
+                                continue;
+                            }
+                            long end = top.get(size - 1);
+                            if (min ? num < end : num > end) {
+                                for (int i = 0; i < size; i++) {
+                                    long existing = top.get(i);
+                                    if (min ? num < existing : num > existing) {
+                                        top.add(i, num);
+                                        if (size == diff) {
+                                            top.remove(size);
+                                        }
+                                        continue loop;
+                                    }
+                                }
+                            }
+                            if (size < diff) {
+                                top.add(num);
+                            }
+                        }
+                        cutoffThreshold = top.get(top.size() - 1);
+                    }
+                    // Add half a day, as expiry is performed each day
+                    cutoffThreshold += (TimeUnit.DAYS.toMillis(1) / 2);
+                }
+                return true;
+            } else {
+                cutoffThreshold = Long.MAX_VALUE;
+            }
+        }
+        return false;
+    }
+
+    public Set<Plot> getPlotsToCheck() {
+        return PlotSquared.get().getPlots(new PlotFilter() {
+            @Override public boolean allowsArea(PlotArea area) {
+                return ExpiryTask.this.allowsArea(area);
+            }
+        });
+    }
+
+    public boolean applies(long diff) {
+        return diff > TimeUnit.DAYS.toMillis(settings.DAYS) && diff > cutoffThreshold;
+    }
+
+    public boolean appliesAccountAge(long accountAge) {
+        if (settings.SKIP_ACCOUNT_AGE_DAYS != -1)
+            return accountAge <= TimeUnit.DAYS.toMillis(settings.SKIP_ACCOUNT_AGE_DAYS);
+        return false;
+    }
+
+    public boolean needsAnalysis() {
+        return settings.THRESHOLD > 0;
+    }
+
+    public boolean applies(PlotAnalysis analysis) {
+        return analysis.getComplexity(settings) <= settings.THRESHOLD;
+    }
+
+    public boolean requiresConfirmation() {
+        return settings.CONFIRMATION;
+    }
+
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
new file mode 100644
index 000000000..2e7854828
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
@@ -0,0 +1,552 @@
+package com.github.intellectualsites.plotsquared.plot.util.expiry;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.lang.reflect.Array;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class PlotAnalysis {
+    public static boolean running = false;
+    public int changes;
+    public int faces;
+    public int data;
+    public int air;
+    public int variety;
+    public int changes_sd;
+    public int faces_sd;
+    public int data_sd;
+    public int air_sd;
+    public int variety_sd;
+    private int complexity;
+
+    public static PlotAnalysis getAnalysis(Plot plot, Settings.Auto_Clear settings) {
+        Optional<List<Integer>> flag = plot.getFlag(Flags.ANALYSIS);
+        if (flag.isPresent()) {
+            PlotAnalysis analysis = new PlotAnalysis();
+            List<Integer> values = flag.get();
+            analysis.changes = values.get(0); // 2126
+            analysis.faces = values.get(1); // 90
+            analysis.data = values.get(2); // 0
+            analysis.air = values.get(3); // 19100
+            analysis.variety = values.get(4); // 266
+
+            analysis.changes_sd = values.get(5); // 2104
+            analysis.faces_sd = values.get(6); // 89
+            analysis.data_sd = values.get(7); // 0
+            analysis.air_sd = values.get(8); // 18909
+            analysis.variety_sd = values.get(9); // 263
+
+            analysis.complexity = settings != null ? analysis.getComplexity(settings) : 0;
+            return analysis;
+        }
+        return null;
+    }
+
+    public static void analyzePlot(Plot plot, RunnableVal<PlotAnalysis> whenDone) {
+        HybridUtils.manager.analyzePlot(plot, whenDone);
+    }
+
+    /**
+     * This will set the optimal modifiers for the plot analysis based on the current plot ratings<br>
+     * - Will be used to calibrate the threshold for plot clearing
+     *
+     * @param whenDone
+     * @param threshold
+     */
+    public static void calcOptimalModifiers(final Runnable whenDone, final double threshold) {
+        if (running) {
+            PlotSquared.debug("Calibration task already in progress!");
+            return;
+        }
+        if (threshold <= 0 || threshold >= 1) {
+            PlotSquared.debug(
+                "Invalid threshold provided! (Cannot be 0 or 100 as then there's no point calibrating)");
+            return;
+        }
+        running = true;
+        PlotSquared.debug(" - Fetching all plots");
+        final ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots());
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                Iterator<Plot> iterator = plots.iterator();
+                PlotSquared.debug(
+                    " - $1Reducing " + plots.size() + " plots to those with sufficient data");
+                while (iterator.hasNext()) {
+                    Plot plot = iterator.next();
+                    if (plot.getSettings().ratings == null || plot.getSettings().getRatings()
+                        .isEmpty()) {
+                        iterator.remove();
+                    } else {
+                        plot.addRunning();
+                    }
+                }
+                PlotSquared.debug(" - | Reduced to " + plots.size() + " plots");
+
+                if (plots.size() < 3) {
+                    PlotSquared.debug(
+                        "Calibration cancelled due to insufficient comparison data, please try again later");
+                    running = false;
+                    for (Plot plot : plots) {
+                        plot.removeRunning();
+                    }
+                    return;
+                }
+
+                PlotSquared.debug(" - $1Analyzing plot contents (this may take a while)");
+
+                int[] changes = new int[plots.size()];
+                int[] faces = new int[plots.size()];
+                int[] data = new int[plots.size()];
+                int[] air = new int[plots.size()];
+                int[] variety = new int[plots.size()];
+
+                int[] changes_sd = new int[plots.size()];
+                int[] faces_sd = new int[plots.size()];
+                int[] data_sd = new int[plots.size()];
+                int[] air_sd = new int[plots.size()];
+                int[] variety_sd = new int[plots.size()];
+
+                final int[] ratings = new int[plots.size()];
+
+                final AtomicInteger mi = new AtomicInteger(0);
+
+                Thread ratingAnalysis = new Thread(() -> {
+                    for (; mi.intValue() < plots.size(); mi.incrementAndGet()) {
+                        int i = mi.intValue();
+                        Plot plot = plots.get(i);
+                        ratings[i] = (int) (
+                            (plot.getAverageRating() + plot.getSettings().getRatings().size())
+                                * 100);
+                        PlotSquared.debug(" | " + plot + " (rating) " + ratings[i]);
+                    }
+                });
+                ratingAnalysis.start();
+
+                ArrayDeque<Plot> plotsQueue = new ArrayDeque<>(plots);
+                while (true) {
+                    final Plot queuePlot = plotsQueue.poll();
+                    if (queuePlot == null) {
+                        break;
+                    }
+                    PlotSquared.debug(" | " + queuePlot);
+                    final Object lock = new Object();
+                    TaskManager.runTask(new Runnable() {
+                        @Override public void run() {
+                            analyzePlot(queuePlot, new RunnableVal<PlotAnalysis>() {
+                                @Override public void run(PlotAnalysis value) {
+                                    try {
+                                        synchronized (this) {
+                                            wait(10000);
+                                        }
+                                    } catch (InterruptedException e) {
+                                        e.printStackTrace();
+                                    }
+                                    synchronized (lock) {
+                                        queuePlot.removeRunning();
+                                        lock.notify();
+                                    }
+                                }
+                            });
+                        }
+                    });
+                    try {
+                        synchronized (lock) {
+                            lock.wait();
+                        }
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                PlotSquared.debug(
+                    " - $1Waiting on plot rating thread: " + mi.intValue() * 100 / plots.size()
+                        + "%");
+                try {
+                    ratingAnalysis.join();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+
+                PlotSquared
+                    .debug(" - $1Processing and grouping single plot analysis for bulk processing");
+                for (int i = 0; i < plots.size(); i++) {
+                    Plot plot = plots.get(i);
+                    PlotSquared.debug(" | " + plot);
+                    PlotAnalysis analysis = plot.getComplexity(null);
+
+                    changes[i] = analysis.changes;
+                    faces[i] = analysis.faces;
+                    data[i] = analysis.data;
+                    air[i] = analysis.air;
+                    variety[i] = analysis.variety;
+
+                    changes_sd[i] = analysis.changes_sd;
+                    faces_sd[i] = analysis.faces_sd;
+                    data_sd[i] = analysis.data_sd;
+                    air_sd[i] = analysis.air_sd;
+                    variety_sd[i] = analysis.variety_sd;
+                }
+
+                PlotSquared.debug(" - $1Calculating rankings");
+
+                int[] rankRatings = rank(ratings);
+                int n = rankRatings.length;
+
+                int optimalIndex = (int) Math.round((1 - threshold) * (n - 1));
+
+                PlotSquared.debug(" - $1Calculating rank correlation: ");
+                PlotSquared.debug(
+                    " - The analyzed plots which were processed and put into bulk data will be compared and correlated to the plot ranking");
+                PlotSquared.debug(
+                    " - The calculated correlation constant will then be used to calibrate the threshold for auto plot clearing");
+
+                Settings.Auto_Clear settings = new Settings.Auto_Clear();
+
+                int[] rankChanges = rank(changes);
+                int[] sdChanges = getSD(rankChanges, rankRatings);
+                int[] varianceChanges = square(sdChanges);
+                int sumChanges = sum(varianceChanges);
+                double factorChanges = getCC(n, sumChanges);
+                settings.CALIBRATION.CHANGES = factorChanges == 1 ?
+                    0 :
+                    (int) (factorChanges * 1000 / MathMan.getMean(changes));
+                PlotSquared.debug(" - | changes " + factorChanges);
+
+                int[] rankFaces = rank(faces);
+                int[] sdFaces = getSD(rankFaces, rankRatings);
+                int[] varianceFaces = square(sdFaces);
+                int sumFaces = sum(varianceFaces);
+                double factorFaces = getCC(n, sumFaces);
+                settings.CALIBRATION.FACES =
+                    factorFaces == 1 ? 0 : (int) (factorFaces * 1000 / MathMan.getMean(faces));
+                PlotSquared.debug(" - | faces " + factorFaces);
+
+                int[] rankData = rank(data);
+                int[] sdData = getSD(rankData, rankRatings);
+                int[] variance_data = square(sdData);
+                int sum_data = sum(variance_data);
+                double factor_data = getCC(n, sum_data);
+                settings.CALIBRATION.DATA =
+                    factor_data == 1 ? 0 : (int) (factor_data * 1000 / MathMan.getMean(data));
+                PlotSquared.debug(" - | data " + factor_data);
+
+                int[] rank_air = rank(air);
+                int[] sd_air = getSD(rank_air, rankRatings);
+                int[] variance_air = square(sd_air);
+                int sum_air = sum(variance_air);
+                double factor_air = getCC(n, sum_air);
+                settings.CALIBRATION.AIR =
+                    factor_air == 1 ? 0 : (int) (factor_air * 1000 / MathMan.getMean(air));
+                PlotSquared.debug(" - | air " + factor_air);
+
+                int[] rank_variety = rank(variety);
+                int[] sd_variety = getSD(rank_variety, rankRatings);
+                int[] variance_variety = square(sd_variety);
+                int sum_variety = sum(variance_variety);
+                double factor_variety = getCC(n, sum_variety);
+                settings.CALIBRATION.VARIETY = factor_variety == 1 ?
+                    0 :
+                    (int) (factor_variety * 1000 / MathMan.getMean(variety));
+                PlotSquared.debug(" - | variety " + factor_variety);
+
+                int[] rank_changes_sd = rank(changes_sd);
+                int[] sd_changes_sd = getSD(rank_changes_sd, rankRatings);
+                int[] variance_changes_sd = square(sd_changes_sd);
+                int sum_changes_sd = sum(variance_changes_sd);
+                double factor_changes_sd = getCC(n, sum_changes_sd);
+                settings.CALIBRATION.CHANGES_SD = factor_changes_sd == 1 ?
+                    0 :
+                    (int) (factor_changes_sd * 1000 / MathMan.getMean(changes_sd));
+                PlotSquared.debug(" - | changes_sd " + factor_changes_sd);
+
+                int[] rank_faces_sd = rank(faces_sd);
+                int[] sd_faces_sd = getSD(rank_faces_sd, rankRatings);
+                int[] variance_faces_sd = square(sd_faces_sd);
+                int sum_faces_sd = sum(variance_faces_sd);
+                double factor_faces_sd = getCC(n, sum_faces_sd);
+                settings.CALIBRATION.FACES_SD = factor_faces_sd == 1 ?
+                    0 :
+                    (int) (factor_faces_sd * 1000 / MathMan.getMean(faces_sd));
+                PlotSquared.debug(" - | faces_sd " + factor_faces_sd);
+
+                int[] rank_data_sd = rank(data_sd);
+                int[] sd_data_sd = getSD(rank_data_sd, rankRatings);
+                int[] variance_data_sd = square(sd_data_sd);
+                int sum_data_sd = sum(variance_data_sd);
+                double factor_data_sd = getCC(n, sum_data_sd);
+                settings.CALIBRATION.DATA_SD = factor_data_sd == 1 ?
+                    0 :
+                    (int) (factor_data_sd * 1000 / MathMan.getMean(data_sd));
+                PlotSquared.debug(" - | data_sd " + factor_data_sd);
+
+                int[] rank_air_sd = rank(air_sd);
+                int[] sd_air_sd = getSD(rank_air_sd, rankRatings);
+                int[] variance_air_sd = square(sd_air_sd);
+                int sum_air_sd = sum(variance_air_sd);
+                double factor_air_sd = getCC(n, sum_air_sd);
+                settings.CALIBRATION.AIR_SD =
+                    factor_air_sd == 1 ? 0 : (int) (factor_air_sd * 1000 / MathMan.getMean(air_sd));
+                PlotSquared.debug(" - | air_sd " + factor_air_sd);
+
+                int[] rank_variety_sd = rank(variety_sd);
+                int[] sd_variety_sd = getSD(rank_variety_sd, rankRatings);
+                int[] variance_variety_sd = square(sd_variety_sd);
+                int sum_variety_sd = sum(variance_variety_sd);
+                double factor_variety_sd = getCC(n, sum_variety_sd);
+                settings.CALIBRATION.VARIETY_SD = factor_variety_sd == 1 ?
+                    0 :
+                    (int) (factor_variety_sd * 1000 / MathMan.getMean(variety_sd));
+                PlotSquared.debug(" - | variety_sd " + factor_variety_sd);
+
+                int[] complexity = new int[n];
+
+                PlotSquared.debug(" $1Calculating threshold");
+                int max = 0;
+                int min = 0;
+                for (int i = 0; i < n; i++) {
+                    Plot plot = plots.get(i);
+                    PlotAnalysis analysis = plot.getComplexity(settings);
+                    complexity[i] = analysis.complexity;
+                    if (analysis.complexity < min) {
+                        min = analysis.complexity;
+                    } else if (analysis.complexity > max) {
+                        max = analysis.complexity;
+                    }
+                }
+                int optimalComplexity = Integer.MAX_VALUE;
+                if (min > 0 && max < 102400) { // If low size, use my fast ranking algorithm
+                    int[] rankComplexity = rank(complexity, max + 1);
+                    for (int i = 0; i < n; i++) {
+                        if (rankComplexity[i] == optimalIndex) {
+                            optimalComplexity = complexity[i];
+                            break;
+                        }
+                    }
+                    logln("Complexity: ");
+                    logln(rankComplexity);
+                    logln("Ratings: ");
+                    logln(rankRatings);
+                    logln("Correlation: ");
+                    logln(getCC(n, sum(square(getSD(rankComplexity, rankRatings)))));
+                    if (optimalComplexity == Integer.MAX_VALUE) {
+                        PlotSquared.debug(
+                            "Insufficient data to determine correlation! " + optimalIndex + " | "
+                                + n);
+                        running = false;
+                        for (Plot plot : plots) {
+                            plot.removeRunning();
+                        }
+                        return;
+                    }
+                } else { // Use the fast radix sort algorithm
+                    int[] sorted = complexity.clone();
+                    sort(sorted);
+                    optimalComplexity = sorted[optimalIndex];
+                    logln("Complexity: ");
+                    logln(complexity);
+                    logln("Ratings: ");
+                    logln(rankRatings);
+                }
+
+                // Save calibration
+                PlotSquared.debug(" $1Saving calibration");
+                Settings.AUTO_CLEAR.put("auto-calibrated", settings);
+                Settings.save(PlotSquared.get().worldsFile);
+                PlotSquared.debug("$1Done!");
+                running = false;
+                for (Plot plot : plots) {
+                    plot.removeRunning();
+                }
+                whenDone.run();
+            }
+        });
+    }
+
+    public static void logln(Object obj) {
+        PlotSquared.debug(log(obj));
+    }
+
+    public static String log(Object obj) {
+        String result = "";
+        if (obj.getClass().isArray()) {
+            String prefix = "";
+
+            for (int i = 0; i < Array.getLength(obj); i++) {
+                result += prefix + log(Array.get(obj, i));
+                prefix = ",";
+            }
+            return "( " + result + " )";
+        } else if (obj instanceof List<?>) {
+            String prefix = "";
+            for (Object element : (List<?>) obj) {
+                result += prefix + log(element);
+                prefix = ",";
+            }
+            return "[ " + result + " ]";
+        } else {
+            return obj.toString();
+        }
+    }
+
+    /**
+     * Get correlation coefficient.
+     *
+     * @return
+     */
+    public static double getCC(int n, int sum) {
+        return 1 - 6 * (double) sum / (n * (n * n - 1));
+    }
+
+    /**
+     * Sum of an array
+     *
+     * @param array
+     * @return
+     */
+    public static int sum(int[] array) {
+        int sum = 0;
+        for (int value : array) {
+            sum += value;
+        }
+        return sum;
+    }
+
+    /**
+     * A simple array squaring algorithm.
+     * - Used for calculating the variance
+     */
+    public static int[] square(int[] array) {
+        array = array.clone();
+        for (int i = 0; i < array.length; i++) {
+            array[i] *= array[i];
+        }
+        return array;
+    }
+
+    /**
+     * An optimized lossy standard deviation algorithm.
+     */
+    public static int[] getSD(int[]... ranks) {
+        if (ranks.length == 0) {
+            return null;
+        }
+        int[] result = new int[ranks[0].length];
+        for (int j = 0; j < ranks[0].length; j++) {
+            int sum = 0;
+            for (int[] rank : ranks) {
+                sum += rank[j];
+            }
+            int mean = sum / ranks.length;
+            int sd = 0;
+            for (int[] rank : ranks) {
+                int value = rank[j];
+                sd += value < mean ? mean - value : value - mean;
+            }
+            result[j] = sd;
+        }
+        return result;
+    }
+
+    /**
+     * An optimized algorithm for ranking a very specific set of inputs<br>
+     * - Input is an array of int with a max size of 102400<br>
+     * - A reduced sample space allows for sorting (and ranking in this case) in linear time
+     */
+    public static int[] rank(int[] input) {
+        return rank(input, 102400);
+    }
+
+    /**
+     * An optimized algorithm for ranking a very specific set of inputs.
+     */
+    public static int[] rank(int[] input, int size) {
+        int[] cache = new int[size];
+        int max = 0;
+        if (input.length < size) {
+            for (int value : input) {
+                if (value > max) {
+                    max = value;
+                }
+                cache[value]++;
+            }
+        } else {
+            max = cache.length - 1;
+            for (int value : input) {
+                cache[value]++;
+            }
+        }
+        int last = 0;
+        for (int i = max; i >= 0; i--) {
+            if (cache[i] != 0) {
+                cache[i] += last;
+                last = cache[i];
+                if (last == input.length) {
+                    break;
+                }
+            }
+        }
+
+        int[] ranks = new int[input.length];
+        for (int i = 0; i < input.length; i++) {
+            int index = input[i];
+            ranks[i] = cache[index];
+            cache[index]--;
+        }
+        return ranks;
+    }
+
+    public static void sort(int[] input) {
+        int SIZE = 10;
+        List<Integer>[] bucket = new ArrayList[SIZE];
+        for (int i = 0; i < bucket.length; i++) {
+            bucket[i] = new ArrayList<>();
+        }
+        boolean maxLength = false;
+        int placement = 1;
+        while (!maxLength) {
+            maxLength = true;
+            for (Integer i : input) {
+                int tmp = i / placement;
+                bucket[tmp % SIZE].add(i);
+                if (maxLength && tmp > 0) {
+                    maxLength = false;
+                }
+            }
+            int a = 0;
+            for (int b = 0; b < SIZE; b++) {
+                for (Integer i : bucket[b]) {
+                    input[a++] = i;
+                }
+                bucket[b].clear();
+            }
+            placement *= SIZE;
+        }
+    }
+
+    public List<Integer> asList() {
+        return Arrays
+            .asList(this.changes, this.faces, this.data, this.air, this.variety, this.changes_sd,
+                this.faces_sd, this.data_sd, this.air_sd, this.variety_sd);
+    }
+
+    public int getComplexity(Settings.Auto_Clear settings) {
+        Settings.Auto_Clear.CALIBRATION modifiers = settings.CALIBRATION;
+        if (this.complexity != 0) {
+            return this.complexity;
+        }
+        this.complexity = this.changes * modifiers.CHANGES + this.faces * modifiers.FACES
+            + this.data * modifiers.DATA + this.air * modifiers.AIR
+            + this.variety * modifiers.VARIETY + this.changes_sd * modifiers.CHANGES_SD
+            + this.faces_sd * modifiers.FACES_SD + this.data_sd * modifiers.DATA_SD
+            + this.air_sd * modifiers.AIR_SD + this.variety_sd * modifiers.VARIETY_SD;
+        return this.complexity;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
new file mode 100644
index 000000000..c4716b8ef
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
@@ -0,0 +1,58 @@
+package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
+
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
+import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+import java.util.List;
+
+public class HelpMenu {
+
+    public static final int PER_PAGE = 5;
+
+    private final PlotPlayer player;
+    private HelpPage page = new HelpPage(CommandCategory.INFO, 0, 0);
+    private int maxPage;
+    private CommandCategory commandCategory;
+    private List<Command> commands;
+
+    public HelpMenu(PlotPlayer player) {
+        this.player = player;
+    }
+
+    public HelpMenu setCategory(CommandCategory commandCategory) {
+        this.commandCategory = commandCategory;
+        return this;
+    }
+
+    public HelpMenu getCommands() {
+        this.commands = MainCommand.getInstance().getCommands(this.commandCategory, this.player);
+        return this;
+    }
+
+    public HelpMenu generateMaxPages() {
+        this.maxPage = Math.max((this.commands.size() - 1) / PER_PAGE, 0);
+        return this;
+    }
+
+    public HelpMenu generatePage(int currentPage, String label) {
+        if (currentPage > this.maxPage) {
+            currentPage = this.maxPage;
+        }
+        if (currentPage < 0) {
+            currentPage = 0;
+        }
+        this.page = new HelpPage(this.commandCategory, currentPage, this.maxPage);
+        int max = Math.min((currentPage * PER_PAGE) + (PER_PAGE - 1), this.commands.size());
+        for (int i = currentPage * PER_PAGE; i < max; i++) {
+            this.page.addHelpItem(new HelpObject(this.commands.get(i), label));
+        }
+        return this;
+    }
+
+    public void render() {
+        this.page.render(this.player);
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
new file mode 100644
index 000000000..f972f5d8e
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
@@ -0,0 +1,36 @@
+package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
+
+import com.github.intellectualsites.plotsquared.commands.Argument;
+import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+public class HelpObject {
+
+    private final String _rendered;
+
+    public HelpObject(final Command command, final String label) {
+        _rendered = StringMan.replaceAll(C.HELP_ITEM.s(), "%usage%",
+            command.getUsage().replaceAll("\\{label\\}", label), "[%alias%]",
+            !command.getAliases().isEmpty() ?
+                "(" + StringMan.join(command.getAliases(), "|") + ")" :
+                "", "%desc%", command.getDescription(), "%arguments%",
+            buildArgumentList(command.getRequiredArguments()), "{label}", label);
+    }
+
+    @Override public String toString() {
+        return _rendered;
+    }
+
+    private String buildArgumentList(final Argument[] arguments) {
+        if (arguments == null) {
+            return "";
+        }
+        final StringBuilder builder = new StringBuilder();
+        for (final Argument<?> argument : arguments) {
+            builder.append("[").append(argument.getName()).append(" (")
+                .append(argument.getExample()).append(")],");
+        }
+        return arguments.length > 0 ? builder.substring(0, builder.length() - 1) : "";
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
new file mode 100644
index 000000000..6d521627b
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
@@ -0,0 +1,37 @@
+package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
+
+import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class HelpPage {
+
+    private final List<HelpObject> helpObjects;
+    private final String header;
+
+    public HelpPage(CommandCategory category, int currentPage, int maxPages) {
+        this.helpObjects = new ArrayList<>();
+        this.header = C.HELP_PAGE_HEADER.s()
+            .replace("%category%", category == null ? "ALL" : category.toString())
+            .replace("%current%", (currentPage + 1) + "").replace("%max%", (maxPages + 1) + "");
+    }
+
+    public void render(PlotPlayer player) {
+        if (this.helpObjects.size() < 1) {
+            MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0)");
+        } else {
+            String message = C.HELP_HEADER.s() + "\n" + this.header + "\n" + StringMan
+                .join(this.helpObjects, "\n") + "\n" + C.HELP_FOOTER.s();
+            MainUtil.sendMessage(player, message, false);
+        }
+    }
+
+    public void addHelpItem(HelpObject object) {
+        this.helpObjects.add(object);
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
new file mode 100644
index 000000000..55f3697f7
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
@@ -0,0 +1,21 @@
+package com.github.intellectualsites.plotsquared.plot.uuid;
+
+import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+import java.util.UUID;
+
+public interface UUIDWrapper {
+
+    UUID getUUID(PlotPlayer player);
+
+    UUID getUUID(OfflinePlotPlayer player);
+
+    UUID getUUID(String name);
+
+    OfflinePlotPlayer getOfflinePlayer(UUID uuid);
+
+    OfflinePlotPlayer getOfflinePlayer(String name);
+
+    OfflinePlotPlayer[] getOfflinePlayers();
+}
diff --git a/Bukkit/src/main/resources/LICENSE b/Bukkit/src/main/resources/LICENSE
new file mode 100644
index 000000000..c95a26732
--- /dev/null
+++ b/Bukkit/src/main/resources/LICENSE
@@ -0,0 +1,553 @@
+GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+                            Preamble
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+                       TERMS AND CONDITIONS
+  0. Definitions.
+  "This License" refers to version 3 of the GNU General Public License.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+  1. Source Code.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+  The Corresponding Source for a work in source code form is that
+same work.
+  2. Basic Permissions.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+  4. Conveying Verbatim Copies.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+  5. Conveying Modified Source Versions.
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+  6. Conveying Non-Source Forms.
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+  7. Additional Terms.
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+  8. Termination.
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+  9. Acceptance Not Required for Having Copies.
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+  10. Automatic Licensing of Downstream Recipients.
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+  11. Patents.
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+  12. No Surrender of Others' Freedom.
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+  13. Use with the GNU Affero General Public License.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+  14. Revised Versions of this License.
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+  15. Disclaimer of Warranty.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+  16. Limitation of Liability.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+  17. Interpretation of Sections 15 and 16.
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+                     END OF TERMS AND CONDITIONS
+            How to Apply These Terms to Your New Programs
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+Also add information on how to contact you by electronic and paper mail.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Bukkit/src/main/resources/addplots.js b/Bukkit/src/main/resources/addplots.js
new file mode 100644
index 000000000..5691c181c
--- /dev/null
+++ b/Bukkit/src/main/resources/addplots.js
@@ -0,0 +1,18 @@
+/*
+This will increase a player's allowed plots by the provided value
+/plot debugexec runasync addperm <player> <amount>
+*/
+var uuid = UUIDHandler.getUUID('%s0', null);
+if (uuid === null) {
+    C_INVALID_PLAYER.send(PlotPlayer, '%s0');
+}
+else if (!MathMan.class.static.isInteger('%s1')) {
+    C_NOT_VALID_NUMBER.send(PlotPlayer, '(0, ' + Settings.MAX_PLOTS + ')');
+}
+else {
+    var amount = parseInt('%s1');
+    var pp = IMP.wrapPlayer(UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid).player);
+    var allowed = pp.getAllowedPlots();
+    MainUtil.class.static.sendMessage(PlotPlayer, '$4Setting permission: plots.plot.' + (allowed + amount) + ' for %s0');
+    IMP.getEconomyHandler().setPermission("", pp.getName(), 'plots.plot.' + (allowed + amount), true);
+}
diff --git a/Bukkit/src/main/resources/addsigns.js b/Bukkit/src/main/resources/addsigns.js
new file mode 100644
index 000000000..7f0996ca1
--- /dev/null
+++ b/Bukkit/src/main/resources/addsigns.js
@@ -0,0 +1,12 @@
+/*
+This script will fix all signs in the world.
+*/
+var plots = PS.sortPlots(PS.getPlots());
+for (var i = 0; i < plots.size(); i++) {
+    var plot = plots.get(i);
+    if (!plot.isMerged() || !plot.getMerged(0)) {
+        plot.setSign();
+        PS.class.static.log('&cSetting sign for: ' + plot);
+    }
+    java.lang.Thread.sleep(10);
+}
diff --git a/Bukkit/src/main/resources/automerge.js b/Bukkit/src/main/resources/automerge.js
new file mode 100644
index 000000000..b8326e842
--- /dev/null
+++ b/Bukkit/src/main/resources/automerge.js
@@ -0,0 +1,48 @@
+/*
+Need to script something quick with PlotSquared?
+/plot debugexec runasync automerge.js <removeroads>
+
+This is an example script that will auto merge all plots
+
+The following utility classes are usable:
+ - PlotSquared
+ - TaskManager
+ - TitleManager
+ - ConsolePlayer
+ - SchematicHandler
+ - ChunkManager
+ - BlockManager
+ - SetupUtils
+ - EventUtil
+ - UUIDHandler
+ - DBFunc
+ - HybridUtils
+ - IMP ( BukkitMain or SpongeMain)
+ - MainCommand
+ - MainUtil
+ - Settings
+ - StringMan
+ - MathMan
+ - C ( use C_ )
+ - Permissions ( use Permissions_ )
+ 
+ For more information see: https://github.com/IntellectualSites/PlotSquared/wiki/Scripting
+*/
+var plots = PS.sortPlots(PS.getPlots());
+PS.class.static.log("Attempting to auto merge " + plots.size() + " plots");
+if ("%s0" === "true") {
+    for (var i = 0; i < plots.size(); i++) {
+        var plot = plots.get(i);
+        plot.autoMerge(-1, 250000, plot.owner, true);
+    }
+}
+else if ("%s0" === "false") {
+    for (var i = 0; i < plots.size(); i++) {
+        var plot = plots.get(i);
+        plot.autoMerge(-1, 250000, plot.owner, false);
+    }
+}
+else {
+    C_COMMAND_SYNTAX.send(PlotPlayer, "/plot debugexec automerge.js <removeroads>");
+    MainUtil.class.static.sendMessage(PlotPlayer, "$1<removeroads> is true or false if you want to remove roads when auto merging");
+}
diff --git a/Bukkit/src/main/resources/bridge.template b/Bukkit/src/main/resources/bridge.template
new file mode 100644
index 0000000000000000000000000000000000000000..d5f9ccd933cdd4107dc56b07265ed7bc13946f00
GIT binary patch
literal 5325
zcmbVQWl$W-vR>TX9fAf35-hm8yDp0c7TvH|a0r^<fk1E%?(P=cJ-E9CPhjCC_rAL4
zoLlewIIpL=YNl#tx~jXsuI^7m83B<HfQpI=sO3YD2mDDyf9;``w$_g3u3$^3iM*^D
zNK0K(2Ba;mAgd~=qbO|x0_n)AYJg-EwLl;fDA>x{#o647<3DfU_z?ylXg;9+@1G|r
zT~4VIxS{>ZbJ&{L*93RlX+DP(wRU;bM%NQ^Xl>aEy@mD0U(<5Myv(_|Qn{YbQ1b-C
zth&a%3?BVIvsCqv-GQ8wCWTZsjd321hB-YvmROns32D?g1r*bICvVt=#gLw$$uc-^
z8W)578h*B65=Dy3eTTga6xcteEs^VAE7=OW6I(@8j~<<6f?Uw4NCo_$A&u&cJ#iEr
zvM!*TKX+|?;(L4O<0JoA@b;uHqD)si!+!iZ9X(Xl_bCBM&{Qcqn;cnUin?Ky)~*m5
z@#ZKBnJ<s#uvrER!`t(cd^_KcMHTqL#J{-Rjv#*qbvDxO2*if}Qt7-?)keI7ijFQ9
z5ofuvoxA|W$pnNojUZ575qc0vQCz|Fam#zdLZsYPpN!FSJ#?s0C*QYY%6BB1XOo@u
zG!kC~B5nQ4^M+Sd{R~zK>w&5DWX}tafn^AZN6G(sL2pTrQYyW~2aXRBCMi&qL!<uL
zKIRB+VT!K-3~i#_t1!Ez!|;u1@YB+#Hoefe=Mu&69&Xi1j#RGHud5)pPj^~Elu@2@
zVm)^`W0OexlkAuKpK$ipHg&B;F$>Hdo-ZylD|?nmfcnL?+{6OE-_KSoWiA~*=g6<K
znJ^+U+A;DTI-XLE1#_+tZDq`<UvJpACfO6F$P@7m-I&ZK8;nB_96a@FdiFb8U2ud@
zhu)NaAip>9Ry!`cF!R<{eV_r4KIJm$x<6TY!BrZle>rk+b{$gdvEb)vF&U4`n6;<v
zvyq4dJ$O^oj<sc#hg?yn3#ZS`87!s2_!c>KYrJrDI9Rt@C9!xXX6gzB2i-W%s7^mu
zCym&td^taii`5K5af0+^?@(3$)%WxIJy)Grv-(HZ-`gO8HLi)jFQ!->d%LqL<IcoD
z|Ltwj>3-^u|M~-a=W~ku;#q>_>)&B0f8cF$GRC2Vp1uqA77ccDQZ|0_9enmJHP6kD
zz3Q5->#?WORJjF2I_Mj6V38j2IBAU`Y6rZU&YeV36NbghiE3X@>CV2@R}=PS!SaXe
zYpRG{Rt5kxlu=N@bDEvP2mk>8FV*;4lnVYcltO;F^$&zv>v@O}K2qpwY3a$hx8pNw
z#mDImjI53g4XnzajtPRW*xroA@u<02rKb}$N7hsecyPE_jZa%&ZOvz{-R@=X!TiKC
z$B*7-jEl!;h|sTqO7RR4Ua=!`I?VlK8h$})JrO}PA?`KEfc#9{O8qC=?KvWQVTg6u
zenGPr6OV@`caZwfGvSbh@wUf|yIsM+xWU6I!>Xh9TqQL^OIwL;@o{=X+8~^aOh#8C
z<U9IH&UPVnE&X}>u7^~==<SXU{x*LX%zaL~;tk(dcjC%9Knwb-LIRQ7gxmzpzF4;8
zx`clIv>_4?-)z<lFh-I4feV8=hxO9hqV{pFA?cZA{!G0O?K=ulXAU`HTL0m=(rVR}
zYO}eW@)HXAcEoSNeK<!gV`42G`QRJbgEXk%M><n<$37ZtzkBP&7h7dvDh3u)3m-ro
z0mWASsj~^IH|CIYJyKJ|&G&99jrUsok9!(!3fXS~xpc3TGF4w@&#1gux1}PiwD1&h
zKa<OCLj-kb9aQPST^3Z-O_mQwc_LwrkxhyGsFbp|JEW0SNCtX(5y8z^^9T$$t!2^S
zEdW_0*feVL$xBe#^_Tl7Y?n|Jb=GC=>=<nkGV>INe{>tKBqIi2@COZ~%zg|UV==Ca
zoqsusG^iBa^-(HeRpmrj;{DKLCkM_{ZTw=Z<%_QOFMGjL!UWpFgH8eaC(2Vvwud2V
zdbaQvi&<WLVd{i}YNSyENOO`J&+NMl4JId09Ky2t!Y*WC`rS-BDi<94a~2_h>$RLp
zWB1kOf)2?DaVa=MVR*62O(z)s@y!aig*jR6+A?WPlMX3FZEwO$(?l#=Buk3NF~6a+
zO`AGYER%qWJCg}t72I7@f=i{VtCwRMf}W~!2yQDT4A4Mw5>6oi3{LxHw8HYq5xbkE
z+^OP=aXC?ff?G&gt8A8?3S-u3d<sYwts$Klged+6C_=3FhfWm4tKYHgiXB%l)Erjt
zi?7U0%@s(0q_IW6{PF=~UiF61t22Ku$@Hi^N#y|rsr*Eiv>o0M`y7DmNl4|gKWGyF
zun1L-6mH3BKSpX<tEFsn&AE(W%%LDgOH<8&DOc4?;|V<2ubkbMxwdX6ojyD8^W3_~
z%e8R_M%Hd!NBiXS3Tn3%JHbCs7pnb~wns!b-t)x=mvtelzTmP2Al$B@kRL!}0z#5D
zL2)Uz^m}j^lRZM9EHm}Mfu6l9C%3jBCY}5tRf+;_8-)o6jbvREe<I0b4BNZkL+pm;
z!~mDEK3!g1LNY~F^*?zHlg$UV4f`OiCLKnMnULTMY3Cs&yneHy43W}^8s+ZUv^z`a
z6rGE6=%Zo0PG+TH&Ye$FeQjp+*$=K#9kf-LP#tT=r*l?ciP}KPQJLaC0gM~gs=SHF
z8lkx4-9DzqY_1ppdP~0Px|+X%-<j3pT8nMG4&JV3ho3&qNQPa!EI*$rD{hMNnmG+u
zW7BIt4s%`(&PZCU9qbQpgeE4AyRNNb@+v$ZmFBxBPTH1~SH94=F|zKsY+Xw9$<E0q
z8(P0zORsN<?815vIbQ4$eY-2)L+gEj{-yj)(r%wtf<u(OEnCktZ17_STyz)h!}cqP
zB#vW~qQTlXT)Wn{J9_3HwN(Z(1s6I#%Lh{)$C)vSV=+>Qv?<K63{KzNl7u84hCc<t
z1j+Ab64GKyD23fI4nSfDYLwJ+-BI;QnMcg8T$_r%_}*OSzaI7)v${b=b4Pc%$+nuG
zWOTn4n%f|4Vj%1y<S{(S$7UT>78t7CawTT$&K8NH@p&J!-UTg~&Ze@=^;2G*pW;s!
zZ>I}wuA3E%POhlV8s-k08D;K-wHRuPQJKi^7+2k{2hpALbIPAY$qabHZ_8<Y4OtJ>
zYLSp=P}wK%cV?79YA+tC__A4&DE;wi3rsmOa{oC{eUbnB)cuLw(BT}!@_Q+MMXBUy
z?SXxAzHTQOJ>pNLlc`A~Y1&4m-fi0G{NYvn;$$60+9*#37tD>DlpO(#6F6_y?UjVx
z-P;9?ax7*|G3)%0bF^Z_4eX;2kzLp3Csui4w?YP8@7Q$SxKmffxx0ntU1%dE_9fXR
z&Q8!Cot8J1dr!Djie^S4D3H_)yy*@Voj(!wmPw_ZOc&K&Rk2jPvZKkqAt=TX3h>QL
z2%0lF>(okW?E`y~v%)FXpDz_vOI~Q%os9t4-P`#B$Yy+W>GKRE)Cw}>IW`79EN~Da
zY_#ta_!Q*YU809m=2f=nU5*g0{+zMBobCF8*Lsc+T8tUV#U>xILl|aR*l19jPt798
zH4ar`;@Mb?HUH_Rna0pQJ`^n;{z~viC&k=WxucxU-1$;C#JA&Bn?aV6XsfS3Nahx-
zT%T6j(D@}%%4mgm<n6N)(Q-4{DNWYO9c{Btz<%<@bm#yB5>pl++=C4``;IaPeX(J=
z6H}P@_2moGAH6-#GQKx&#$>vIk>6bgBYN5ll>A7|K_@cgVmu4QWyGe+d_-_E*;VSq
zV7bUw|L&{ut)O#$j)~fT_`2TQNXXY{w8gyT9fJ75KCH94UVvbu7QN|M&um$hmC*SG
z3m$AaoIh$I<9Sc|J^$QTKkQ_FpWR%A;iv3*MN@V!H&na`E!ypIW|p{Xi~jC-2XFK%
zjogI8{wmMc9?p;`#j+aqj$l5+J4iFIj+bw;p?(5QiMyF&%-F$}_D~&d$}kH#v2)|Q
z2t0`runir_PbQOuT-cTBhu~HKi{u`W)~P#h!_#n8O;`6~nigY)eu96=mr~O77hG4_
zZA!UL-uW!znDOU+86!wekvF8KEu#%|v;zAfGkjEB%@zxV{S%1lPGaN>%!=Q{OcNYQ
zNxUUrc6Se3$WFv#Cw$;1E$dL0#(pp2!Xa@1<_pm1hq?QWAunq7&kIDk8>-R750?Wz
zmGV&~S58mEP}+-(C`0DebA^Jjhg^n_O20pn2{ngFw5Bt_zvpw;!w~xZY}k_5(FF?P
zHzF#^&{BroU=-n-q7#!Ie<OHg3@n@xw`ld)?Kpe-+H>eRxfY;EVo{EyK-Aih79N5r
zyX^(hf35qzUp_+gVtWEGnG?!bAbbzBklGSap<MiS0$Lh|NRv5onOwOdtej9)%#KX~
zGgAzwxAKhlq;d{kU9EjR9a;f8dnDqOEwXXrOKqlG-DJGTZoWHDT-KgBD=&&G@7U^!
zE7ZH~ogT6nvybqU-|T=0wzQApnKBCTWPT#<sWbW*-nfP=)2gLOgT?Oe!)j+*d(vpR
zBV@Z`gqkc&<X}HEYheOOPx9tA7<g}ovP23CnH~;uzA1mp!>JTk0nQ7L!E05B{Na!j
zNAziTW}u>!84W~V<(O*1sxGIg88WAm!eh$KL>#G}|0*USjj@*bmc|jEGb5T>g3l{0
zdNRwcWS6HI4d~R$_Jws@i}fp1F|<2W2*Uc<4n`IpWOKWlbx9KV6gR|*M&Q@2W^r$a
zwca-O@*KGMoGK`NtHSE;snk-j)w$s=nXy?{m>5Jz)nSu6rJ3hAIQfB@<6AXlhSLpc
zB#>jjhL}6d?L02tm3Q#{1M@28^sM-G%%Kq>^g@5MzB@h|`2@&lr3J6X&QDAuKYkRR
zqjpK?TVY*-EeD+^a039j%ULsSZeuE(X=<pg7wbJmM5S-Vf49j^7Q1Dg=m5ajFa7&A
zS@NH?$zUf}YZs`sr7PIk>5q09jthPq_NRgN)2P#;1YyY80;XpU`{C_6qY<ALNm;XP
z?#zneOrR!rSy03FH(~!9N(v^-dVIGo$pIU=+l+fS{u`_a=Mq)jq$rbo2I|vxF|pH<
zU6ki&L#OUh4pwy?lSh%gN!3LeR!u7e{vEKE=L9MK#oJ!f6T<r(u6(8bKd(QU3<J3h
zQo$H0zU--5G1ifBcsx?$MoW&B1c^7k$0$3FL$r^!PG`0Y(+Q>;@tzpK<WAZR6+L_f
zvoAyA=*?W_RtB^uL(rYi-8BZi^5=7-q(Aoqemw9ZnDjEph){Uo@{D<jeS)(Id3?=b
zQG-hi2a^enm2z0MM?J-z2s`Ao3CHb$@<XVrtM=T|WD2&$tP7l98MgMXUcS>Pot{|Q
zJXp0suMA(GG`+m{)qFybRyen{qE1I#@k?4NzU3;&Xcg0MajVH*3ch>ykiQbNOH=Q!
z*Kym-yeFbq_iB8WZT5o<SsU+CL8n6_RShJuxP+x~<<uLr<;`7#r95hIL{L|fmE@K&
zuY6CJR2P3)t5Yq1=x$dS%%L(+h3w4@<-#BczwnviL<A;ty=0Gd-)Xu~*(f@?3oq9J
zQLW0Ote4{UAUU{UWOKeb|47z1*Ya&Qz>ig0Av<lXWUYwh;#2Rv1`IV6^`NOtAMxw+
z7`}=u8~VL#*gif^Tim;}yDn-RleVQ%gjf;v>wclDq~+W|Ut_wSw%gnOMCV-U9`UVi
zhq-0^e~)s9GF9b#@BjeUFa7%*CH|G8uGWqa2Xj|zD5t9<<b{>Ft2xJ8M+a*y)tVVv
z+}2Armtk<3mHlOH<B{(0o~W#u6bnkYkAsiVqeob5LyNlem5RFhbXJ!n?jXuo%ImMC
zQCp)VR|h}jiQx#14@|r;NZS}zMS!Ry`$xS+;PF=b170%cK!Hp#f7sna6oj_}6&nZ+
zL^t)@Q$;639R@t>B8_tYu9t?D^X4b+NlD?rU<`2(Q<0$=BC<ZDCA0DUXd=P^3PATY
zj#^QmAA)uC;L=j{b@OV=(RDdT+vQFEz%D9If*C_^vuX}k-i*geixa1e#P;a@MnKrg
zB1nm4=UKR)u;3Z{0-98-GF!5&96CQak^}wb6PRXl+2S)Krl!q=`n-_>LHEdaIEduE
zc;&r$;g!H<swSAO#iss8fLkXD(uR{JhRX>N(9T~F`a+h?FS<f%ZzDpsDImXKdzQP(
zI0<i9>a35xPJgg5i1%{%&KV_&4~&y?rQT5a^Ad%Lq)J@m6}NfQ>-1zzTZ@Oso-_qP
zRLZi<KA4AyPejM>B6BAZBIFAP0POuMfN=1HfIm31KhNpEIkUgYf7r194}+$m{8v+d
zu64f$|39SQ7fJ9BO#PJx_-`|RPS@Xs^A8!t{zqp1?=t$|=Kk#5-x&Bq-r)TmA~ckd
TkbmDp{Ix=U1?DBe@6-PPqm#)9

literal 0
HcmV?d00001

diff --git a/Bukkit/src/main/resources/de-DE.yml b/Bukkit/src/main/resources/de-DE.yml
new file mode 100644
index 000000000..8a52ce9a6
--- /dev/null
+++ b/Bukkit/src/main/resources/de-DE.yml
@@ -0,0 +1,414 @@
+# Translated by: Krauti2 / EvilOlaf
+# Adjusted and updated by: NotMyFault
+BORDER: $2Du befindest dich außerhalb der aktuellen Weltengrenze.
+confirm:
+  failed_confirm: $2Es gibt keine zur Bestätigung ausstehenden Befehle!
+  requires_confirm: '$2Bist du sicher, dass du diesen Befehl ausführen willst: $1%s$2?&-$2Die
+    Änderung ist unwiderruflich! Wenn du sicher bist: $1/plot confirm'
+  expired_confirm: $2Bestätigung abgelaufgen, führe den Befehl erneut aus!
+move:
+  move_success: $4Plot erfolgreich verschoben.
+  copy_success: $4Plot erfolgreich kopiert.
+  requires_unowned: $2Der angegebene Ort ist bereits belegt.
+compass:
+  compass_target: $4Plot erfolgreich mit dem Kompass anvisiert.
+cluster:
+  cluster_available_args: '$1Die folgenden Parameter sind verfügbar: $4list$2, $4create$2,
+    $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4helpers$2, $4info$2,
+    $4tp$2, $4sethome'
+  cluster_list_heading: $2Es gibt $1%s$2 Cluster in dieser Welt.
+  cluster_list_element: $2 - $1%sn
+  cluster_intersection: $2Der vorgeschlagene Bereich überlappt mit $1%s$2 existierendem/n
+    Cluster/n
+  cluster_added: $4Cluster erfolgreich erstellt.
+  cluster_deleted: $4Cluster erfolgreich gelöscht.
+  cluster_resized: $4Größe des Clusters wurde erfolgreich geändert.
+  cluster_added_user: $4Spieler erfolgreich zum Cluster hinzugefügt.
+  cannot_kick_player: $2Du kannst diesen Spieler nicht kicken.
+  cluster_invited: '$1Du wurdest in folgenden Cluster eingeladen: $2%s'
+  cluster_removed: '$1Du wurdest aus folgendem Cluster entfernt: $2%s'
+  cluster_kicked_user: $4Spieler erfolgreich gekickt.
+  invalid_cluster: '$1Clustername ungültig: $2%s'
+  cluster_not_added: $2Dieser Spieler war nicht zum Cluster hinzugefügt.
+  cluster_cannot_leave: $1Du musst deinen Besitz löschen oder transferieren bevor
+    du gehen kannst.
+  cluster_added_helper: $4Helfer erfolgreich hinzugefügt.
+  cluster_removed_helper: $4Helfer erfolgreich vom Cluster entfernt.
+  cluster_regenerated: $4Clusterregeneration erfolgreich gestartet
+  cluster_teleporting: $4Teleportiere...
+  cluster_info: '$1Aktueller Cluster: $2%id%&-$1Name: $2%name%&-$1Besitzer: $2%owner%&-$1Größe:
+    $2%size%&-$1Rechte: $2%rights%'
+  cluster_outside: '$2Der vorgeschlagene Bereich liegt außerhalb der Plot Grenze: %s0'
+unclaim:
+  unclaim_success: $4Dieser Plot gehört dir jetzt nicht mehr.
+  unclaim_failed: $2Plot konnte nicht enteignet werden.
+worldedit masks:
+  require_selection_in_mask: $2%s deiner Selektion befindet sich nicht innerhalb deines
+    Plots. Du kannst Änderungen nur innerhalb deines Plots vornehmen.
+  worldedit_volume: $2Du kannst die Menge %current% nicht auswählen. Die maximale
+    Grenze liegt bei %max%.
+  worldedit_iterations: $2Du kannst nicht %current% mal wiederholen. Die maximalen
+    Wiederholungen liegen bei %max%.
+  worldedit_unsafe: $2Der Zugriff auf diesen Befehl wurde verwehrt.
+  worldedit_bypass: $2&oUm die Beschränkung außer Kraft zu setzen, verwende $4/plot
+    wea
+  worldedit_unmasked: $1Dein WorldEdit-Bereich ist jetzt nicht mehr begrenzt.
+  worldedit_restricted: $1Dein WorldEdit-Bereich ist jetzt begrenzt.
+  worldedit_delayed: $2Bitte warte während deine WorldEdit Aktion verarbeitet wird...
+  worldedit_run: '$2Sorry für die Wartezeit. Starte jetzt: %s'
+  worldedit_bypassed: $2Beschränkungen werden nun ignoriert.
+records:
+  record_play: $2%player $2startete Spielaufzeichnung $1%name
+  notify_enter: $2%player $2betritt deinen Plot ($1%plot$2)
+  notify_leave: $2%player $2verließ deinen Plot ($1%plot$2)
+swap:
+  swap_overlap: $2Der geplante Bereich darf nicht überlappen.
+  swap_dimensions: $2Die geplanten Bereiche müssen vergleichbare Dimensionen aufweisen.
+  swap_syntax: $2/plot swap <plot id>
+  swap_success: $4Plots erfolgreich getauscht.
+  started_swap: $2Plot swap Aufgabe gestartet. Du erhälst eine Meldung wenn sie beendet
+    ist.
+comment:
+  not_valid_inbox_index: $2Keine Kommentar auf Seite %s
+  inbox_item: $2 - $4%s
+  comment_syntax: $2Verwende /plot comment [X;Z] <%s> <comment>
+  invalid_inbox: '$2Dieses Postfach ist ungültig.&-$1Akzeptierte Werte: %s'
+  no_perm_inbox: $2Du hast keine Berechtigung für dieses Postfach.
+  no_perm_inbox_modify: $2Du hast keine Berechtigung.
+  no_plot_inbox: $2Du musst an einem Plot stehen oder einen solchen angeben.
+  comment_removed: $4Kommentar/e n$2 - '$3%s$2' erfolgreich gelöscht.
+  comment_added: $4Ein Kommentar wurde hinterlassen.
+  comment_header: $2------ Kommentare ------
+  inbox_notification: '%s ungelesene Nachrichten. Öffne sie mit /plot inbox'
+  inbox_empty: $2Keine Kommentare.
+console:
+  not_console: $2Aus Sicherheitsgründen kann dieser Befehl nur von der Konsole ausgeführt
+    werden.
+  is_console: $2Dieser Befehl kann nur von einem Spieler ausgeführt werden.
+clipboard:
+  clipboard_set: $2Der aktuelle Plot wird in die Zwischenablage kopiert. Benutze $1/plot
+    paste$2 um ihn einzufügen.
+  pasted: $4Die Plotauswahl wurde erfolgreich eingefügt. Die Zwischenablage wurde
+    geleert.
+  paste_failed: '$2Einfügen fehlgeschlagen: $2%s'
+  no_clipboard: $2Deine Zwischenablage ist leer.
+  clipboard_info: '$2Aktuelle Auswahl - Plot ID: $1%id$2, Breite: $1%width$2, Anzahl
+    Blöcke: $1%total$2'
+ratings:
+  rating_not_valid: $2Wähle eine Zahl zwischen 1 und 10
+  rating_already_exists: '$2Du hast diesen Plot bereits bewertet: $2%s'
+  rating_applied: '$4Du hast diesen Plot erfolgreich bewertet: $2%s'
+  rating_not_your_own: $2Du kannst deinen eigenen Plot nicht selbst bewerten.
+  rating_not_owned: $2Plots ohne Besitzer können nicht bewertet werden.
+  ratings_purged: $2Bewertungen für diesen Plot wurden gelöscht.
+  rating_not_done: $2Du kannst nur beendete Plots bewerten.
+economy:
+  econ_disabled: $2Ökonomie ist nicht aktiviert.
+  cannot_afford_plot: $2Du kannst dir diesen Plot nicht leisten. Er kostet $1%s
+  not_for_sale: $2Dieser Plot steht nicht zum Verkauf.
+  cannot_buy_own: $2Du kannst deinen eigenen Plot nicht kaufen.
+  plot_sold: $4Dein Plot $1%s$4 wurde an $1%s$4 für $1$%s$4 verkauft.
+  cannot_afford_merge: $2Du kannst dir das Zusammenfügen der Plots nicht leisten.
+    Es kostet $1%s
+  added_balance: $1%s $2wurden deinem Guthaben hinzugefügt.
+  removed_balance: $1%s $2wurden von deinem Guthaben abgezogen.
+  removed_granted_plot: $2Du hast %s plot grant(s) benutzt, du hast $1%s $2übrig.
+setup:
+  setup_init: '$1Verwendung: $2/plot setup <value>'
+  setup_step: '$3[$1Schritt %s$3] $1%s $2- $1Erwarte: $2%s $1Standard: $2%s'
+  setup_invalid_arg: '$2%s ist kein gültiger Wert für Schritt %s. Um Setup abzubrechen
+    verwende: $1/plot setup cancel'
+  setup_valid_arg: $2Wert $1%s $2gesetzt auf %s
+  setup_finished: $3Falls du MULTIVERSE oder MULTIWORLD verwendest, sollte die Welt
+    generiert worden sein. Andernfalls musst du die Welt manuell über bukkit.yml hinzufügen.
+  setup_world_taken: $2%s ist bereits eine bekannte Plotwelt.
+  setup_missing_world: $2Du musst einen Namen für die Welt vergeben ($1/plot setup
+    &l<world>$1 <generator>$2)&-$1Zusätzliche Befehle:&-$2 - $1/plot setup <value>&-$2
+    - $1/plot setup backn$2 - $1/plot setup cancel
+  setup_missing_generator: $2Du musst einen Generator angeben ($1/plot setup <world>
+    &l<generator>&r$2)&-$1Zusätzliche Befehle:&-$2 - $1/plot setup <value>&-$2 - $1/plot
+    setup backn$2 - $1/plot setup cancel
+  setup_invalid_generator: '$2Ungültiger Generarator. Mögliche Optionen: %s'
+schematics:
+  schematic_missing_arg: '$2Du musst einen Wert angeben. Gültige Werte: $1test <name>$2
+    , $1save$2 , $1paste $2, $1exportall'
+  schematic_invalid: '$2Diese Schematic ist ungültig: $2%s'
+  schematic_valid: $2Diese Schematic ist gültig.
+  schematic_paste_failed: $2Einfügen der Schematic fehlgeschlagen.
+  schematic_paste_success: $4Einfügen der Schematic erfolgreich.
+  schematic_too_large: $2Der Plot ist zu groß für diese Aktion.
+titles:
+  title_entered_plot: Du betrittst Plot %world%;%x%;%z%
+  title_entered_plot_sub: 'Besitzer: %s'
+  prefix_greeting: '$1%id%$2> '
+  prefix_farewell: '$1%id%$2> '
+core:
+  prefix: '$3[$1P2$3] '
+  enabled: $1PlotSquared wurde aktiviert
+  task_start: Starte Aufgabe...
+reload:
+  reloaded_configs: $1Übersetzungen und Welteneinstellungen wurden neu geladen.
+  reload_failed: $2Erneutes Laden der Konfiguration fehlgeschlagen.
+alias:
+  alias_set_to: $2Plot Alias auf $1%alias% gesetzt.
+  missing_alias: $2Du musst einen Alias angeben.
+  alias_too_long: $2Der Alias darf nicht länger als 50 Zeichen sein.
+  alias_is_taken: $2Dieser Alias wird bereits verwendet.
+  alias_removed: $2Der Alias wurde gelöscht.
+position:
+  missing_position: '$2Du musst eine Position angeben. Mögliche Werte sind: $1none'
+  position_set: $1Der Plot Spawn wurde auf deinen aktuellen Standort gesetzt.
+  home_argument: $2Verwende /plot set home [none]
+  invalid_position: $2Dies ist eine ungültige Position.
+  position_unset: $1Home Position zurückgesetzt auf standard Wert.
+time:
+  time_format: $1%hours%, %min%, %sec%
+permission:
+  no_schematic_permission: '$2Du hast keine Berechtigung um Schematics zu verwenden:
+    $1%s'
+  no_permission: '$2Dir fehlt folgende Berechtigung: $1%s'
+  no_plot_perms: $2Diese Aktion kann nur der Besitzer des Plots ausführen.
+  cant_claim_more_plots: $2Du kannst keine weiteren Plots besitzen.
+  cant_transfer_more_plots: $2Du kannst keine weiteren Plots diesem Spieler übergeben.
+  cant_claim_more_plots_num: $2Du kannst nicht mehr als $1%s $2Plots auf einmal einnehmen.
+  you_be_denied: $2Es ist dir nicht gestattet diesen Plot zu betreten.
+  merge_request_confirm: '%s möchte sein Plot mit deinem verbinden.'
+  no_permission_event: '$2Dir fehlt folgende Berechtigung: $1%s'
+  cant_claim_more_clusters: $2Du kannst nicht mehr Cluster besitzen.
+merge:
+  no_perm_merge: $2Du bist nicht Besitzer des Plots $1%plot%
+  unlink_required: $2Die Plots müssen vorher getrennt (unlink) werden.
+  unlink_impossible: $2Die Trennung (unlink) funktioniert nur auf Megaplots.
+  unlink_success: $2Trennung erfolgreich.
+  merge_not_valid: $2Diese Anfrage ist nicht länger gültig.
+  merge_accepted: $2Die Anfrage wurde akzeptiert.
+  success_merge: $2Plots wurden zusammengeführt.
+  merge_requested: $2Anfrage erfolgreich verschickt.
+  no_available_automerge: $2Dir gehören keine benachbarten Plots oder du darfst die Plot Zusammenführungsgröße nicht überschreiten.
+commandconfig:
+  not_valid_subcommand: $2Das ist kein gültiger Parameter.
+  did_you_mean: '$2Meintest du: $1%s'
+  name_little: $2%s Name ist zu kurz, $1%s$2<$1%s
+  no_commands: $2Du hast für keinen Befehl eine Berechtigung.
+  subcommand_set_options_header: '$2Mögliche Werte: '
+  command_syntax: '$1Verwendung: $2%s'
+  flag_tutorial_usage: '$1Folgende Flags fehlen zur Benutzung: $2%s'
+errors:
+  invalid_player: '$2Spieler nicht gefunden: $1%s$2.'
+  command_went_wrong: $2Beim Ausführen des Befehls ging etwas schief...
+  no_free_plots: $2Es sind keine freien Plots verfügbar.
+  not_in_plot: $2Du befindest dich nicht auf einem Plot.
+  not_in_cluster: $2Du musst dich innerhalb eines Plot Clusters befinden um das zu
+    tun.
+  not_in_plot_world: $2Du befindest dich nicht in einer Plotwelt.
+  plotworld_incompatible: $2Die beiden Welten müssen kompatibel sein.
+  not_valid_world: $2Das ist keine gültige Welt (Groß- / Kleinschreibung beachten)
+  not_valid_plot_world: $2Das ist keine gültige Plotwelt (Groß- / Kleinschreibung
+    beachten)
+  no_plots: $2Du hast keine Plots.
+  wait_for_timer: $2Ein Zeitgeber wurde an den Plot oder an dich gebunden. Bitte warte
+    bis die Zeit abgelaufen ist.
+  invalid_player_wait: '$2Spieler nicht gefunden: $1%s$2. Versuche es später nochmal.'
+  invalid_player_offline: '$2Der Spieler muss online sein: $1%s.'
+  invalid_command_flag: '$2Ungültige Flag: %s0'
+  error: '$2Ein Fehler ist aufgetreten: %s'
+  not_loaded: $2Der Plot konnte nicht geladen werden.
+purge:
+  purge_success: $4%s Plots erfolgreich gelöscht.
+trim:
+  trim_in_progress: Die Weltenbeschneidung ist bereits gestartet!
+  not_valid_hybrid_plot_world: Hybrid Plot Manager wird für diese Aktion benötigt.
+block list:
+  block_list_separater: '$1,$2 '
+biome:
+  need_biome: $2Du musst ein Biom angeben.
+  biome_set_to: '$2Plot Biome gesetzt: $2'
+teleport:
+  teleported_to_plot: $1Du wurdest teleportiert.
+  teleported_to_road: $2Du wurdest auf die Straße teleportiert.
+  teleport_in_seconds: $1Teleportiere in %s Sekunden. Bewege dich nicht...
+  teleport_failed: $2Teleportation wurde wegen einer Bewegung oder Schaden abgebrochen.
+set block:
+  set_block_action_finished: $1Die letze Setblock-Aktion wurde fertiggestellt.
+debug:
+  debug_section: $2>> $1&l%val%
+  debug_line: $2>> $1%var%$2:$1 %val%&-
+  debug_header: $1Debug Information&-
+  requires_unmerged: Diser Plot kann nicht verbunden werden.
+invalid:
+  not_valid_data: $2Das ist kein gültiger Datenwert.
+  not_valid_block: $2Das ist kein gültiger Block.
+  not_valid_number: $2Das ist keine gültige Zahl.
+  not_valid_plot_id: $2Das ist keine gültige Plot-ID.
+  plot_id_form: '$2Die Plot-ID muss wie folgt angegeben werden: $1X;Y $2z.B. $1-5;7'
+  not_your_plot: $2Das ist nicht dein Plot.
+  no_such_plot: $2Ein solcher Plot existiert nicht.
+  player_has_not_been_on: $2Dieser Spieler war nicht in der Plotwelt.
+  found_no_plots: $2Dein Suchmuster ergab keine Treffer.
+  not_allowed_block: '$2Dieser Block ist nicht erlaubt: %s'
+  found_no_plots_for_player: '$2Keine Grundstücke für %s gefunden.'
+camera:
+  camera_started: $2Du verwendest den Kameramodus für Plot $1%s
+  camera_stopped: $2Der Kameramodus wurde abeschaltet.
+need:
+  need_plot_number: $2Du musst eine Plotnummer oder einen Alias angeben.
+  need_block: $2Du musst einen Block angeben.
+  need_plot_id: $2Du musst eine Plot-ID angeben.
+  need_plot_world: $2Du musst eine Plotwelt angeben.
+  need_user: $2Du musst einen Spielernamen angeben.
+info:
+  plot_unowned: $2Für diese Aktion muss dieser Plot einen Besitzer aufweisen.
+  plot_info_unclaimed: $2Plot $1%s$2 hat bisher keinen Besitzer.
+  plot_info_header: $3&m---------&r $1INFO $3&m---------
+  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Besitzer: $2%owner%$1&-$1Biom:
+    $2%biome%$1&-$1Baurechte: $2%build%$1&-$1Bewertung: $2%rating%$1/$210$1&-$1Helfer:
+    $2%helpers%$1&-$1Vertraut: $2%trusted%$1&-$1Verboten: $2%denied%$1&-$1Flags: $2%flags%'
+  plot_info_trusted: $1Vertraute:$2 %trusted%
+  plot_info_denied: $1Verboten:$2 %denied%
+  plot_info_flags: $1Flags:$2 %flags%
+  plot_info_biome: $1Biom:$2 %biome%
+  plot_info_rating: $1Bewertung:$2 %rating%
+  plot_info_owner: $1Besitzer:$2 %owner%
+  plot_info_id: $1ID:$2 %id%
+  plot_info_alias: $1Alias:$2 %alias%
+  plot_info_size: $1Größe:$2 %size%
+  plot_user_list: ' $1%user%$2,'
+  info_syntax_console: $2/plot info <world> X;Y
+  none: Keiner
+  now: Jetzt
+  never: Niemals
+  unknown: Unbekannt
+  everyone: Jeder
+  plot_info_footer: $3&m---------&r $1INFO $3&m---------
+  plot_info_members: $1Members:$2 %members%
+  plot_info_seen: $1Seen:$2 %seen%
+  plot_flag_list: $1%s0:%s1$2
+working:
+  generating_component: $1Die Generierung wurde gemäß deiner Einstellungen gestartet.
+  clearing_plot: $2Plot wird asynchron geleert.
+  clearing_done: $4Erfolgreich in %sms geleert.
+  plot_not_claimed: $2Dieser Plot hat keinen Besitzer.
+  plot_is_claimed: $2Dieser Plot hat bereits einen Besitzer.
+  claimed: $4Plot erfolgreich in Besitz genommen.
+  deleting_done: $4Löschung in %sms abgeschlossen.
+list:
+  plot_list_header_paged: $2(Seite $1%von$2/$1%max$2) $1Liste Plots nach %word%
+  plot_list_header: $1Liste aller %word% Plots.
+  plot_list_item: $2>> $1%id$2:$1%Welt $2- $1%owner
+  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%Welt $2- $1%owner
+  plot_list_footer: $2>> $1%word% umfasst insgesamt $2%num% $1Plots %plot%.
+  comment_list_header_paged: $2(Seite $1%cur$2/$1%max$2) $1Liste %amount% Kommentare auf.
+  clickable: ' (interactive)'
+  area_list_header_paged: $2(Seite $1%cur$2/$1%max$2) $1Liste %amount% of Plot-Areas auf.
+left:
+  left_plot: $2Du hast einen Plot verlassen.
+chat:
+  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_forced: $2Diese Welt zwingt jeden Spieler dazu den Plot Chat zu benutzen.
+  plot_chat_on: $4Plot Chat aktiviert.
+  plot_chat_off: $4Plot Chat deaktiviert.
+deny:
+  denied_removed: $4Der Spieler darf diesen Plot wieder betreten.
+  denied_added: $4Der Spieler darf diesen Plot nicht mehr betreten.
+  denied_need_argument: $2Argumente fehlen. $1/plot denied add <name> $2oder $1/plot
+    helpers remove <name>
+  was_not_denied: $2Der Spieler durfte diesen Plot bereits betreten.
+  you_got_denied: $4Du wurdest von dem Plot gebannt auf dem du dich befunden hast und wurdest zum Spawn teleportiert.
+rain:
+  need_on_off: '$2Du musst einen Wert angeben. Mögliche Werte: $1on$2, $1off'
+  setting_updated: $4Einstellungen erfolgreich aktualisiert.
+flag:
+  flag_key: '$2Schlüssel: %s'
+  flag_type: '$2Typ: %s'
+  flag_desc: '$2Beschreibung: %s'
+  not_valid_flag: $2Ungültige Flag
+  not_valid_value: $2Wert der Flag muss alphanumerisch angegeben werden.
+  flag_not_in_plot: $2Diese Flag wurde in diesem Plot nicht gesetzt.
+  flag_not_removed: $2Die Flag konnte nicht entfernt werden.
+  flag_not_added: $2Flag konnte nicht gesetzt werden.
+  flag_removed: $4Flag erfolgreich entfernt.
+  flag_added: $4Flag erfolreich hinzugefügt
+  not_valid_flag_suggested: '$2Ungültige Flag. Meintest du: $1%s'
+trusted:
+  was_not_added: $2Dieser Spieler war bisher kein Helfer auf diesem Plot.
+  trusted_added: $4Spieler erfolgreich in diesem Plot vertraut.
+  trusted_removed: $1Diesem Spieler wird auf diesem Plot nicht mehr vertraut.
+  plot_removed_user: $1Plot %s wurde wegen Inaktivität des Plot Besitzers gelöscht.
+member:
+  already_owner: $2Dieser Spieler ist bereits Besitzer des Plots.
+  already_added: $2Dieser Spieler ist bereits in dieser Kategorie.
+  removed_players: $2%s Spieler wurde von dem Plot entfernt.
+  member_added: $4Dieser Spieler kann nun bauen wenn der Plot Besitzer online ist.
+  member_removed: $1Du hast einen Spieler von dem Plot entfernt.
+  member_was_not_added: $2Dieser Spieler war nicht diesem Plot hinzugefügt.
+  plot_max_members: $2Du kannst nicht mehr Spieler diesem Plot hinzufügen.
+owner:
+  set_owner: $4Plotbesitzer erfolgreich gesetzt.
+  now_owner: $4Du bist jetzt Besitzer des Plots %s
+  set_owner_cancelled: Die Plotübergabe wurde abgebrochen.
+signs:
+  owner_sign_line_1: '$1ID: $1%id%'
+  owner_sign_line_2: '$1Besitzer:'
+  owner_sign_line_3: $2%plr%
+  owner_sign_line_4: $3in Besitz
+help:
+  help_header: $3&m---------&r $1Plot² Hilfe $3&m---------
+  help_info_item: $1/plot help %category% $3- $2%category_desc%
+  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
+  direction: '$1Aktuelle Himmelsrichtung: %dir%'
+  help_page_header: '$1Kategorie: $2%category%$2,$1 Seite: $2%current%$3/$2%max%$2'
+  help_footer: $3&m---------&r $1Plot² Hilfe $3&m---------
+'-':
+  custom_string: '-'
+set:
+  set_attribute: $4Successfully set %s0 set to %s1
+web:
+  generating_link: $1Lade Plot hoch...
+  generating_link_failed: $2Es konnte kein Download Link erstellt werden!
+  save_failed: $2Konnte Plot nicht speichern.
+  load_null: $2Benutze $4/plot load $2um eine Liste der Schematics zu bekommen.
+  load_failed: $2Fehler beim Laden des Plots.
+  load_list: '$2Um eine Schematic zu laden benutze $1/plot load #'
+  save_success: $1Gespeichert!
+gamemode:
+  gamemode_was_bypassed: $1Du ignorierst den Spielmodus ($2{gamemode}$1) $1im Plot $2{plot}
+height limit:
+  height_limit: $1Diese Plot Region hat ein Höhenlimit von $2{limit}
+inventory:
+  inventory_usage: '&cBenutzung: &6{usage}'
+  inventory_desc: '&cBeschreibung: &6{desc}'
+  inventory_category: '&cKategorie: &6{category}'
+toggle:
+  toggle_enabled: '$2Einstellungen aktiviert: %s'
+  toggle_disabled: '$2Einstellungen deaktiviert: %s'
+blocked command:
+  command_blocked: $2Dieser Befehl darf nicht in diesem Plot genutzt werden.
+done:
+  done_already_done: $2Dieses Plot ist bereits als fertig markiert.
+  done_not_done: $2Dieses Plot ist nicht als fertig markiert.
+  done_insufficient_complexity: $2Dieses Plot ist zu simpel. Füge mehr Struktur und Terrain hinzu bevor du den Befehl erneut benutzt.
+  done_success: $1Plot als fertig markiert.
+  done_removed: $1Du kannst nun weiterbauen.
+tutorial:
+  rate_this: $2Bewerte dieses Plot.
+  comment_this: '$2Hinterlasse deine Meinung über das Plot: %s'
+desc:
+  desc_set: $2Plot Beschreibung gesetzt.
+  desc_unset: $2Plot Beschreibung gelöscht.
+  missing_desc: $2Du musst eine Beschreibung angeben.
+cap:
+  entity_cap: $2Du darfst hier keine Mobs spawnen.
+paste:
+  debug_report_created: '$1Debug-Log hochgeladen: $1%url%'
+unsafe:
+  debugallowunsafe_on: $2Unsichere Aktionen sind jetzt erlaubt.
+  debugallowunsafe_off: $2Unsichere Aktionen sind jetzt nicht mehr erlaubt.
+near:
+  plot_near: '$2Spieler: %s0'
+kick:
+  you_got_kicked: $4Du wurdest gekickt!
+grants:
+  granted_plots: '$Ergebnis: $2%s $1Zuschuss übrig'
+  granted_plot: $1Du gewährst %s0 Plot an $2%s1
+  granted_plot_failed: '$1Gewährung gescheitert: $2%s'
diff --git a/Bukkit/src/main/resources/es-ES.yml b/Bukkit/src/main/resources/es-ES.yml
new file mode 100644
index 000000000..f4459649d
--- /dev/null
+++ b/Bukkit/src/main/resources/es-ES.yml
@@ -0,0 +1,394 @@
+confirm:
+  failed_confirm: $2No tienes acciones pendientes por confirmar.
+  requires_confirm: '$2¿Estas seguro de realizar este comando?: $1%s$2?&-$2¡No hay vuelta atras! Si estas seguro escribe: $1/plot confirm'
+  expired_confirm: $2La confirmación ha expirado, por favor ejecute el comando otra vez!
+move:
+  move_success: $4La parcela fue movida correctamente.
+  copy_success: $4La parcela fue copiada correctamente.
+  requires_unowned: $2La localizacion especificada ya esta ocupada.
+web:
+  generating_link: $1Procesando parcela...
+  generating_link_failed: $2¡Fallo al generar un link de descarga!
+  save_failed: $2Fallo al guardar.
+  load_null: $2Por favor usa $4/plot load $2para conseguir una schematic.
+  load_failed: $2Fallo al cargar schematic.
+  load_list: '$2Para cargar una schematic usa $1/plot load #'
+  save_success: $1¡Guardado completado!
+compass:
+  compass_target: $4Parcela seleccionada con la brujula completada.
+cluster:
+  cluster_available_args: '$1Los siguientes subcomandos estan disponibles: $4list$2,
+    $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2,
+    $4info$2, $4tp$2, $4sethome'
+  cluster_list_heading: $2Hay $1%s$2 agrupaciones en este mundo.
+  cluster_list_element: $2 - $1%s&-
+  cluster_intersection: $2El area propuesta se solapa con $1%s$2 de la parcela existente.
+  cluster_added: $4Creacion de agrupaciones completado.
+  cluster_deleted: $4Borrado de agrupaciones completado.
+  cluster_resized: $4Reescalado de agrupaciones completado.
+  cluster_added_user: $4Añadido usuario a la agrupacion con exito.
+  cannot_kick_player: $2Tu no puedes expulsar a este jugador.
+  cluster_invited: '$1Has sido invitado a la siguiente agrupacion: $2%s'
+  cluster_removed: '$1Has sido eliminado de la agrupacion: $2%s'
+  cluster_kicked_user: $4Usuario expulsado con exito.
+  invalid_cluster: '$1Nombre de agrupacion invalido: $2%s'
+  cluster_not_added: $2Este jugador no fue añadido a la agrupacion de parcelas.
+  cluster_cannot_leave: $1Debes eliminar o transferir el dueño antes de salir.
+  cluster_added_helper: $4Ayudante añadido a la agrupacion con exito.
+  cluster_removed_helper: $4Ayudante eliminado de la agrupacion con exito.
+  cluster_regenerated: $4Regeneracion de la agrupacion comenzada con exito.
+  cluster_teleporting: $4Teletransportando...
+  cluster_info: '$1Agrupacion actual: $2%id%&-$1Nombre: $2%name%&-$1Propietario: $2%owner%&-$1Tamaño:
+    $2%size%&-$1Derechos: $2%rights%'
+  cluster_outside: '$2El área propuesta está fuera del área de la parcela: %s0'
+border:
+  border: $2Estas en las afueras del borde del mapa.
+unclaim:
+  unclaim_success: $4Desclaimeaste la parcela correctamente.
+  unclaim_failed: $2No se pudo desclaimear la parcela.
+worldedit masks:
+  worldedit_delayed: $2Por favor espere mientras se procesa tu accion de WorldEdit...
+  worldedit_run: '$2Sentimos la tardanza. Ejecutando: %s'
+  require_selection_in_mask: $2%s la seleccion no esta en tu parcela. Solo puedes editar la zona de tu parcela.
+  worldedit_volume: $2No puedes seleccionar el volumen de %current%. El volumen maximo de modificacion es %max%.
+  worldedit_iterations: $2No puedes repetir %current% veces. El límite es %max%.
+  worldedit_unsafe: $2El acceso a ese comando ha sido bloqueado.
+  worldedit_bypass: $2&oPara evitar las restrinciones usa $4/plot wea
+  worldedit_bypassed: $2 Sobrepasando las restrincciones de WorlEdit.
+  worldedit_unmasked: $1El WorldEdit desactivo tus restricciones. Tus permisos de WorldEdit son ilimitados.
+  worldedit_restricted: $1Tus permisos de WorldEdit estan restringidos.
+gamemode:
+  gamemode_was_bypassed: $1Has omitido el modo de juego ($2{gamemode}$1) $1set for $2{plot}
+height limit:
+  height_limit: $1Esta parcela tiene un limite de altura de $2{limit}
+records:
+  record_play: $2%player $2comenzando a registrar la parcela $1%name
+  notify_enter: $2%player $2introduce tu parcela ($1%plot$2)
+  notify_leave: $2%player $2abandona tu parcela ($1%plot$2)
+swap:
+  swap_overlap: $2Las áreas propuestas no pueden superponerse.
+  swap_dimensions: $2El area propuesta debe tener dimensiones comparables.
+  swap_syntax: $2/plot swap <plot id>
+  swap_success: $4Intercambio de parcelas completado
+  started_swap: $2 Intercambiando las tareas de las parcelas. Serás notificado cuando el proceso haya terminado.
+comment:
+  inbox_notification: '%s Mensajes no leidos. Usa /plot inbox'
+  not_valid_inbox_index: $2No hay comentarios %s
+  inbox_item: $2 - $4%s
+  comment_syntax: $2Usa /plot comment [X;Z] <%s> <comment>
+  invalid_inbox: '$2Esta no es una bandeja de entrada valida.&-$1Los valores aceptados: %s'
+  no_perm_inbox: $2No tienes permisos para ingresar a esta bandeja de entrada.
+  no_perm_inbox_modify: $2No tienes permisos para modificar esta bandeja de entrada.
+  no_plot_inbox: $2Debes permanecer en la parcela para poder escribir el comentario.
+  comment_removed: $4Comentario eliminado satisfactoriamente/s:n$2 - '$3%s$2'
+  comment_added: $4Te han dejado un comentario.
+  comment_header: $2&m---------&r $1Comentarios $2&m---------&r
+  inbox_empty: $2No hay comentarios.
+console:
+  not_console: $2Por razones de seguridad, este comando solo se puede ejecutar desde la consola.
+  is_console: $2Este comando solo puede ser ejecutado por los jugadores.
+inventory:
+  inventory_usage: '&cUso: &6{usage}'
+  inventory_desc: '&cDescripcion: &6{desc}'
+  inventory_category: '&cCategoria: &6{category}'
+clipboard:
+  clipboard_set: $2La parcela actual fue copiada a tu portapapeles, usa $1/plot paste$2 para copiarla.
+  pasted: $4La seleccion de la parcela ha sido copiada correctamente.
+  paste_failed: '$2Fallo al copiar la seleccion. Razon: $2%s'
+  no_clipboard: $2No tienes nada seleccionado en el portapapeles.
+  clipboard_info: '$2Seleccion actual - Plot ID: $1%id$2, Ancho: $1%width$2, Bloques totales: $1%total$2'
+toggle:
+  toggle_enabled: '$2Ajustes activados : %s'
+  toggle_disabled: '$2Ajustes desactivados : %s'
+blocked command:
+  command_blocked: $2El comando no esta permitido en esta parcela.
+done:
+  done_already_done: $2Esta parcela esta finalizada.
+  done_not_done: $2Esta parcela no esta finalizada.
+  done_insufficient_complexity: $2Esta parcela es muy simple. Porfavor añade mas detalles antes de usar este comando.
+  done_success: $1Parcela finalizada con exito.
+  done_removed: $1Ya puedes continuar construyendo en esta parcela.
+ratings:
+  rating_not_valid: $2Tienes que especificar un número entre 1 y 10.
+  rating_already_exists: $2Ya has valorado la parcela. $2%s
+  rating_applied: $4Has valorado correctamente la parcela. $2%s
+  rating_not_your_own: $2No puedes valorar tu propia parcela.
+  rating_not_done: $2Solo puedes valorar parcelas terminadas.
+  rating_not_owned: $2No puedes valorar una parcela que no pertenece a nadie.
+  ratings_purged: $2Calificaciones purgadas para esta parcela
+tutorial:
+  rate_this: $2¡Valora esta parcela!
+  comment_this: '$2Deja tu opinion de esta parcela: %s'
+economy:
+  econ_disabled: $2La economia no esta activada.
+  cannot_afford_plot: $2No te puedes permitir comprar esta parcela. Cuesta $1%s
+  not_for_sale: $2Esta parcela no esta a la venta.
+  cannot_buy_own: $2No puedes comprar tu propia parcela.
+  plot_sold: $4Tu parcela; $1%s0$4, se ha vendido por $1%s1$4 para $1$%s2
+  cannot_afford_merge: $2Tu no puedes permitirte combinar las parcelas. Cuesta $1%s
+  added_balance: $1%s $2 fue añadido a tu fondo de dinero.
+  removed_balance: $1%s $2 fue removido de tu fondo de dinero.
+  removed_granted_plot: $2Usaste %s concesiones de trama, te quedan 5 $1%s
+setup:
+  setup_init: '$1Uso: $2/plot setup <cantidad>'
+  setup_step: '$3[$1Step %s0$3] $1%s1 $2- $1Espectando: $2%s2 $1Default: $2%s3'
+  setup_invalid_arg: '$2%s0 no es un argumento valido para este paso %s1. Para cancelar la configuracion usa: $1/plot setup cancel'
+  setup_valid_arg: $2Valor $1%s0 $2ajustado a %s1
+  setup_finished: $4Deberias haber sido teletransportado al mundo creado, sino tendras que generarlo manualmente usando el bukkit.yml
+  setup_world_taken: $2%s este mundo ya esta registrado.
+  setup_missing_world: $2 Necesitas especificar el nombre del mundo ($1/plot setup
+    &l<world>$1 <generator>$2)&-$1Comandos adicionales:&-$2 - $1/plot setup <value>&-$2
+    - $1/plot setup back&-$2 - $1/plot setup cancel
+  setup_missing_generator: $2Tienes que especificar un generador ($1/plot setup <world>
+    &l<generator>&r$2)&-$1Comandos adicionales:&-$2 - $1/plot setup <value>&-$2 - $1/plot
+    setup back&-$2 - $1/plot setup cancel
+  setup_invalid_generator: '$2Generador inválido. Opciones posibles: %s'
+schematics:
+  schematic_missing_arg: '$2Necesitas especificar un argumento. Valores posibles:
+    $1test <name>$2 , $1save$2 , $1paste $2, $1exportall'
+  schematic_invalid: '$2Este no es un schematic valido. Razon: $2%s'
+  schematic_valid: $2Este es un schematic valido.
+  schematic_paste_failed: $2Fallo al pegar el schematic.
+  schematic_paste_success: $4El schematic ha sido copiado correctamente.
+  schematic_too_large: $2¡La trama es demasiado grande para esta acción!
+titles:
+  title_entered_plot: '$1Parcela: %world%;%x%;%z%'
+  title_entered_plot_sub: $4Propiedad de %s
+  prefix_greeting: '$1%id%$2> '
+  prefix_farewell: '$1%id%$2> '
+core:
+  task_start: Comenzando la tarea...
+  prefix: $3[$1P2$3] $2
+  enabled: $1PlotSquared esta activado.
+reload:
+  reloaded_configs: $1Las traducciones y opciones del mundo han sido cargados.
+  reload_failed: $2Fallo al cargar las configuraciones de los archivos.
+desc:
+  desc_set: $2Descripcion de la parcela.
+  desc_unset: $2Descripcion de la parcela no especificada.
+  missing_desc: $2Necesitas especificar una descripcion.
+alias:
+  alias_set_to: $2Alias de la parcela establecido en $1%alias%
+  missing_alias: $2Necesitas especificar un alias.
+  alias_too_long: $2El alias debe ser < de 50 caracteres
+  alias_is_taken: $2Ese alias ya ha sido utilizado.
+  alias_removed: $2Parcela alias eliminado
+position:
+  missing_position: '$2Necesitas especificar una posicion. Valores posibles: $1none'
+  position_set: $1Hogar establecido en tu posicion actual.
+  position_unset: $1Hogar reseteado a la posicion por defecto.
+  home_argument: $2Usa /plot set home [none]
+  invalid_position: $2Valor de posicion no valida.
+time:
+  time_format: $1%hours%, %min%, %sec%
+permission:
+  no_schematic_permission: $2No tienes permisos para usar schematic $1%s
+  no_permission: '$2Careces de los permisos de este nodo: $1%s'
+  no_permission_event: '$2Careces de los permisos de este nodo: $1%s'
+  no_plot_perms: $2Tienes que ser el dueño de la parcela para realizar esta accion.
+  cant_claim_more_plots: $2No puedes claimear mas parcelas.
+  cant_transfer_more_plots: $2No puedes enviar mas parcelas a ese usuario.
+  cant_claim_more_plots_num: $2No puedes claimear mas de $1%s $2parcelas a la vez.
+  you_be_denied: $2No tienes permitido entrar en esta parcela.
+  merge_request_confirm: Peticion de agrupamiento de %s
+  cant_claim_more_clusters: $2No puedes reclamar más grupos.
+merge:
+  merge_not_valid: $2La peticion de agrupacion ya no es valida.
+  merge_accepted: $2La peticion de agrupacion ha sido aceptada.
+  success_merge: $2¡Las parcelas se han agrupado!
+  merge_requested: $2Se ha enviado con exito la peticion de agrupar.
+  no_perm_merge: '$2No eres el dueño de la parcela: $1%plot%'
+  no_available_automerge: $2 No eres propietario de ninguna parcela adyacente en la direccion especificada o no tienes permitido agrupar el tamaño requerido.
+  unlink_required: $2Se requiere una desconexion para hacer esto.
+  unlink_impossible: $2Solo puedes desconectar una mega-parcela.
+  unlink_success: $2Se han desconectado las parcelas.
+errors:
+  invalid_player_wait: '$2Jugador no encontrado: $1%s$2, buscando. Prueba mas tarde.'
+  invalid_player: '$2Jugador no encontrado: $1%s$2.'
+  invalid_player_offline: '$2El jugador debe estar conectado: $1%s.'
+  command_went_wrong: $2Algo ocurrio ejecutando este comando...
+  no_free_plots: $2No hay parcelas libres disponibles.
+  not_in_plot: $2No estas en ninguna parcela.
+  not_in_cluster: $2Debes tener una agrupacion de parcelas para realizar esta accion.
+  not_in_plot_world: $2No estas en el mundo de parcelas.
+  plotworld_incompatible: $2Los dos mundos deben ser compatibles.
+  not_valid_world: $2Esto no es un mundo valido. (caso sensitivo)
+  not_valid_plot_world: $2Esta no es una parcela valida. (caso sensitivo)
+  no_plots: $2No tienes ninguna parcela.
+  wait_for_timer: $2El temporizador del selector de bloque esta ligado a ti o a la parcela actual. Por favor espere a que termine.
+  invalid_command_flag: '$2Indicador de comando no válido: %s0'
+  error: '$2Ocurrió un error: %s'
+  not_loaded: $2No se pudo cargar la trama
+paste:
+  debug_report_created: '$1Se ha enviado una depuracion a: $1%url%'
+purge:
+  purge_success: $4Se ha limpiado %s parcelas.
+trim:
+  trim_in_progress: La tarea de recorte esta en proceso!
+  not_valid_hybrid_plot_world: Es necesario el dueño de las parcelas para realizar esta accion.
+block list:
+  block_list_separater: '$1,$2 '
+biome:
+  need_biome: $2Necesitas especificar un bioma valido.
+  biome_set_to: $2El bioma de la parcela ha sido cambiado a $2
+teleport:
+  teleported_to_plot: $1Has sido teletransportado.
+  teleported_to_road: $2Has sido teletransportado a la carretera.
+  teleport_in_seconds: $1Teletransporte en %s segundos. No te muevas...
+  teleport_failed: $2Teletransporte cancelado debido a movimiento o daño.
+set block:
+  set_block_action_finished: $1La ultima accion de seleccion de bloque se ha finalizado.
+unsafe:
+  debugallowunsafe_on: $2Acciones inseguras habilitadas.
+  debugallowunsafe_off: $2Acciones inseguras deshabilitadas.
+debug:
+  debug_header: $1Informacion de Debug&-
+  debug_section: $2>> $1&l%val%
+  debug_line: $2>> $1%var%$2:$1 %val%&-
+invalid:
+  not_valid_data: $2No es una informacion de id valida.
+  not_valid_block: '$2No es un bloque valido: %s'
+  not_allowed_block: '$2Ese bloque no esta permitido: %s'
+  not_valid_number: '$2No es un numero valido en el rango: %s'
+  not_valid_plot_id: $2No es una id de parcela valida.
+  plot_id_form: '$2La id de la parcela tiene que estar de manera: $1X;Y $2e.g. $1-5;7'
+  not_your_plot: $2Esa no es tu parcela.
+  no_such_plot: $2No existe dicha parcela.
+  player_has_not_been_on: $2Este usuario no ha estado en el mundo de parcelas.
+  found_no_plots: $2No se ha encontrado parcelas con esta informacion.
+  found_no_plots_for_player: '$2No se encontraron parcelas para jugador: %s'
+camera:
+  camera_started: $2Has entrado en modo camara para la parcela $1%s
+  camera_stopped: $2Ya no estas en modo camara.
+need:
+  need_plot_number: $2Necesitas especificar un alias o numero de parcela.
+  need_block: $2Necesitas especificar un bloque.
+  need_plot_id: $2Necesitas especificar la id de una parcela.
+  need_plot_world: $2Necesitas especificar un mundo de parcelas.
+  need_user: $2Necesitas especificar un usuario.
+info:
+  none: Ninguno
+  unknown: Desconocido
+  everyone: Todos
+  plot_unowned: $2La parcela actual tiene que tener un propietario para ejecutar esa accion.
+  plot_info_unclaimed: $2Parcela $1%s$2 aun no esta claimeada.
+  plot_info_header: $3&m---------&r $1INFO $3&m---------
+  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Propietario: $2%owner%$1&-$1Bioma:
+    $2%biome%$1&-$1Puede construir: $2%build%$1&-$1Clasificacion: $2%rating%&-$1Confianza:
+    $2%trusted%$1&-$1Miembros: $2%members%$1&-$1Denegados: $2%denied%$1&-$1Flags:
+    $2%flags%'
+  plot_info_footer: $3&m---------&r $1INFO $3&m---------
+  plot_info_trusted: $1Confianza:$2 %trusted%
+  plot_info_members: $1Miembros:$2 %members%
+  plot_info_denied: $1Denegado:$2 %denied%
+  plot_info_flags: $1Flags:$2 %flags%
+  plot_info_biome: $1Bioma:$2 %biome%
+  plot_info_rating: $1Clasificacion:$2 %rating%
+  plot_info_owner: $1Propietario:$2 %owner%
+  plot_info_id: $1ID:$2 %id%
+  plot_info_alias: $1Alias:$2 %alias%
+  plot_info_size: $1Tamaño:$2 %size%
+  plot_user_list: ' $1%user%$2,'
+  info_syntax_console: $2/plot info X;Y
+  now: Ahora
+  never: Nunca
+  plot_info_seen: $1Seen:$2 %seen%
+  plot_flag_list: $1%s0:%s1$2
+working:
+  generating_component: $1Empezando a generar componentes desde tus opciones.
+  clearing_plot: $2Limpiando parcela async.
+  clearing_done: $4¡Limpieza completada! Ha tardado %sms.
+  plot_not_claimed: $2Parcela no reclamada.
+  plot_is_claimed: $2Esta parcela ya esta reclamada.
+  claimed: $4Has reclamado con exito esta parcela.
+  deleting_done: $4Eliminar completado! Tomó %sms.
+list:
+  comment_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Lista de %amount% comentarios.
+  clickable: ' (interactive)'
+  plot_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Lista de %amount% parcelas.
+  plot_list_header: $1Lista de %word% parcelas.
+  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner.
+  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner.
+  plot_list_footer: $2>> $1%word% un total $2%num% $1claimeado %plot%.
+  area_list_header_paged: $2(Página $1%cur$2/$1%max$2) $1lista de %amount% areas
+left:
+  left_plot: $2Has abandonado una parcela.
+chat:
+  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_forced: $2Este mundo obliga a usar el chat de parcela.
+  plot_chat_on: $4Chat de parcela activado.
+  plot_chat_off: $4Chat de parcela desactivado.
+  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+deny:
+  denied_removed: $4Este usuario ya no esta denegado en esta parcela.
+  denied_added: $4Has denegado este usuario de tu parcela.
+  denied_need_argument: $2Faltan argumentos. $1/plot denied add <name> $2o $1/plot denied remove <name>
+  was_not_denied: $2Ese usuario no ha sido denegado de este plot.
+  you_got_denied: $4Has sido denegado de la parcela, se te ha teletransportado al spawn.
+rain:
+  need_on_off: '$2Necesitas un valor especifico. Posible valores: $1on$2, $1off'
+  setting_updated: $4Has actualizado las opciones.
+flag:
+  flag_key: '$2Llave: %s'
+  flag_type: '$2Tipo: %s'
+  flag_desc: '$2Desc: %s'
+  not_valid_flag: $2No es una flag valida.
+  not_valid_value: $2El valor de la flag tiene que ser alfanumerico.
+  flag_not_in_plot: $2La parcela no tiene flag.
+  flag_not_removed: $2No se ha podido remover la flag.
+  flag_not_added: $2La flag no se ha podido añadir.
+  flag_removed: $4Flag removida con exito.
+  flag_added: $4Flag añadida con exito.
+  not_valid_flag_suggested: '$2Eso no es una bandera válida. Querías decir: $1%s'
+trusted:
+  trusted_added: $4Has añadido un usuario de confianza en esta parcela.
+  trusted_removed: $4Has removido un usuario de confianza en esta parcela.
+  was_not_added: $2Ese usuario no es de confianza en esta parcela.
+  plot_removed_user: $1La parcela %s en la que estabas añadido fue removida por inactividad.
+member:
+  removed_players: $2Removido %s jugadores de esta parcela.
+  already_owner: $2Ese usuario es el dueño del parcela.
+  already_added: $2Ese usuario ya esta en esa categoria.
+  member_added: $4Este usuario puede construir mientras el dueño de la parcela este conectado.
+  member_removed: $1Has removido a un usuario de tu parcela.
+  member_was_not_added: $2Ese usuario no fue añadido a tu parcela.
+  plot_max_members: $2No puedes añadir mas personas.
+owner:
+  set_owner: $4Has añadido con exito el dueño de la parcela.
+  now_owner: $4Ahora eres dueño de esta parcela %s
+  set_owner_cancelled: $2La setowner la acción fue cancelada
+signs:
+  owner_sign_line_1: '$1ID: $1%id%'
+  owner_sign_line_2: '$1Propietario:'
+  owner_sign_line_3: $2%plr%
+  owner_sign_line_4: $3Claimeado
+help:
+  help_header: $3&m---------&r $1Plot² Ayuda $3&m---------
+  help_page_header: '$1Categoria: $2%category%$2,$1 Página: $2%current%$3/$2%max%$2'
+  help_footer: $3&m---------&r $1Plot² Ayuda $3&m---------
+  help_info_item: $1/plot help %category% $3- $2%category_desc%
+  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
+  direction: '$1Direccion actual: %dir%'
+'-':
+  custom_string: '-'
+commandconfig:
+  not_valid_subcommand: $2No es un subcomando valido.
+  did_you_mean: '$2Quisiste decir: $1%s'
+  name_little: $2%s0 el nombre es muy corto, $1%s1$2<$1%s3
+  no_commands: $2No tienes permitido utilizar cualquier subcomando.
+  subcommand_set_options_header: '$2Valores posibles: '
+  command_syntax: '$1Usos: $2%s'
+  flag_tutorial_usage: '$1Haz que un administrador coloque la bandera: $2%s'
+bar api: {}
+set:
+  set_attribute: $4Establecer con éxito %s0 ajustado a %s1
+cap:
+  entity_cap: $2No tienes permitido engendrar más mobs
+near:
+  plot_near: '$1Jugadores: %s0'
+kick:
+  you_got_kicked: $4Te patearon!
+grants:
+  granted_plots: '$1Resultado: $2%s $1grants left'
+  granted_plot: $1You granted %s0 plot to $2%s1
+  granted_plot_failed: '$1Subvención fallida: $2%s'
diff --git a/Bukkit/src/main/resources/fr-FR.yml b/Bukkit/src/main/resources/fr-FR.yml
new file mode 100644
index 000000000..4867aff98
--- /dev/null
+++ b/Bukkit/src/main/resources/fr-FR.yml
@@ -0,0 +1,393 @@
+#Translated by Bobbber#5545
+#12.12.2018
+confirm:
+  expired_confirm: $2La confirmation a expiré, veuillez relancer la commande.!
+  failed_confirm: '$2Vous n''avez aucune action en attente à confirmer!'
+  requires_confirm: '$2Êtes-vous sûr de vouloir exécuter: $1%s$2?&-$2Ça ne peut pas être inversé! Si vous êtes certain: $1/plot confirm'
+move:
+  move_success: $4Parcelle déplacée avec succès.
+  copy_success: $4Parcelle copiée avec succès.
+  requires_unowned: '$2L''emplacement spécifié est déjà occupé.'
+set:
+  set_attribute: $4Réglé avec succès %s0 mis à %s1
+web:
+  generating_link: $1Parcelle en traitement...
+  generating_link_failed: $2Impossible de générer le lien de téléchargement!
+  save_failed: $2Échec de la sauvegarde
+  load_null: $2Veuillez utiliser $4/plot load $2pour obtenir une liste des schématics
+  load_failed: $2Impossible de charger le schématic
+  load_list: '$2Pour charger un schématic, utilisez $1/plot load #'
+  save_success: $1Enregistré avec succès!
+compass:
+  compass_target: $4Parcelle ciblée avec la boussole, réussi.
+cluster:
+  cluster_available_args: '$1Les sous-commandes suivantes sont disponibles: $4list$2, $4create$2,
+    $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2,
+    $4tp$2, $4sethome'
+  cluster_list_heading: $2Il y a $1%s$2 clusters dans ce monde
+  cluster_list_element: $2 - $1%s&-
+  cluster_intersection: '$2La zone proposée chevauche avec: %s0'
+  cluster_outside: '$2La zone proposée est en dehors de la parcelle: %s0'
+  cluster_added: $4Cluster créé avec succès.
+  cluster_deleted: $4Cluster supprimé avec succès.
+  cluster_resized: $4Cluster redimensionné avec succès.
+  cluster_added_user: $4Utilisateur ajouté avec succès au cluster.
+  cannot_kick_player: $2Vous ne pouvez pas kick ce joueur
+  cluster_invited: '$1Vous avez été invité au cluster suivant: $2%s'
+  cluster_removed: '$1Vous avez été retiré du cluster: $2%s'
+  cluster_kicked_user: '$4Vous avez expulsé avec succès l''utilisateur'
+  invalid_cluster: '$1Nom de cluster non valide: $2%s'
+  cluster_not_added: '$2Ce joueur n''a pas été ajouté au parcelle de cluster'
+  cluster_cannot_leave: $1Vous devez supprimer ou transférer la propriété avant de partir
+  cluster_added_helper: '$4Ajout réussi d''un assistant au cluster'
+  cluster_removed_helper: '$4Suppression réussie d''un assistant du cluster'
+  cluster_regenerated: $4La régénération de cluster a démarré avec succès
+  cluster_teleporting: $4Téléportation...
+  cluster_info: '$1Cluster actuel: $2%id%&-$1Nom: $2%name%&-$1Propriétaire: $2%owner%&-$1Taille:
+    $2%size%&-$1Droits: $2%rights%'
+border:
+  border: $2Vous êtes en dehors de la bordure de la map actuelle
+unclaim:
+  unclaim_success: $4Vous avez réussi à canceller votre claim de plot.
+  unclaim_failed: $2Impossible de canceller votre claim de plot
+worldedit masks:
+  worldedit_delayed: $2Veuillez patienter pendant que nous traitons votre action WorldEdit...
+  worldedit_run: '$2Toutes mes excuses pour le délais. Nous exécutons: %s'
+  require_selection_in_mask: '$2%s de votre sélection n''est pas dans votre masque de parcelle. Vous pouvez seulement éditer dans votre parcelle.'
+  worldedit_volume: $2Vous ne pouvez pas sélectionner un volume de %current%. Le volume maximum que vous pouvez modifier est %max%.
+  worldedit_iterations: '$2Vous ne pouvez pas itérer %current% fois. Le nombre maximum d''itérations autorisé est %max%.'
+  worldedit_unsafe: '$2L''accès à cette commande a été bloqué'
+  worldedit_bypass: $2&oPour contourner vos restrictions, utilisez $4/plot wea
+  worldedit_bypassed: $2Restriction actuellement contourné de WorldEdit.
+  worldedit_unmasked: $1Votre WorldEdit est maintenant illimité.
+  worldedit_restricted: $1Votre WorldEdit est maintenant limité.
+gamemode:
+  gamemode_was_bypassed: $1Vous avez contourné le GameMode ($2{gamemode}$1) $1fixé pour $2{plot}
+height limit:
+  height_limit: $1Ce plot a une limite de hauteur de $2{limit}
+records:
+  record_play: $2%Joueur $2started playing record $1%name
+  notify_enter: $2%Joueur $2entré dans votre plot ($1%plot$2)
+  notify_leave: $2%Joueur $2quitté votre plot ($1%plot$2)
+swap:
+  swap_overlap: $2Les zones proposées ne peuvent pas se chevaucher
+  swap_dimensions: $2Les zones proposées doivent avoir des dimensions comparables
+  swap_syntax: $2/plot swap <id>
+  swap_success: $4Parcelles échangées avec succès
+  started_swap: '$2La tâche d''échange de parcelle est commencé. Vous serez averti quand elle sera terminée'
+comment:
+  inbox_notification: '%s messages non lus. Utilisez /plot inbox'
+  not_valid_inbox_index: '$2Aucun commentaire à l''index %s'
+  inbox_item: $2 - $4%s
+  comment_syntax: $2Utilisez /plot comment [X;Z] <%s> <comment>
+  invalid_inbox: '$2Ce n''est pas une boîte de réception valide.&-$1Valeurs acceptées: %s'
+  no_perm_inbox: '$2Vous n''avez pas la permission pour cette boîte de réception'
+  no_perm_inbox_modify: '$2Vous n''êtes pas autorisé à modifier cette boîte de réception'
+  no_plot_inbox: $2Vous devez être présent ou fournir un argument de plot
+  comment_removed: $4Commentaire supprimé avec succès/s:n$2 - '$3%s$2'
+  comment_added: $4Un commentaire a été laissé
+  comment_header: $2&m---------&r $1Commentaires $2&m---------&r
+  inbox_empty: $2Sans commentaires
+console:
+  not_console: $2Pour des raisons de sécurité, cette commande ne peut être exécutée que par la console.
+  is_console: $2Cette commande ne peut être exécutée que par un joueur.
+inventory:
+  inventory_usage: '&cUsage: &6{usage}'
+  inventory_desc: '&cDescription: &6{desc}'
+  inventory_category: '&cCatégorie: &6{category}'
+clipboard:
+  clipboard_set: $2Le plot actuel est maintenant copié dans votre presse-papiers, utilisez $1/plot paste$2 pour le coller
+  pasted: $4La sélection de plot a été collée avec succès. Il a été effacé de votre presse-papiers.
+  paste_failed: '$2Impossible de coller la sélection. Raison: $2%s'
+  no_clipboard: '$2Vous n''avez pas de choix dans votre presse-papiers'
+  clipboard_info: '$2Sélection actuelle - Plot ID: $1%id$2, Largeur: $1%width$2, nombre total de blocs: $1%total$2'
+toggle:
+  toggle_enabled: '$2Paramètre activé: %s'
+  toggle_disabled: '$2Paramètre désactivé: %s'
+blocked command:
+  command_blocked: '$2Cette commande n''est pas autorisée dans ce plot'
+done:
+  done_already_done: $2Ce plot est déjà marquée comme étant terminée
+  done_not_done: '$2Ce plot n''est pas marquée comme étant terminée.'
+  done_insufficient_complexity: '$2Ce complot est trop simple. S''il vous plaît ajouter plus de détails avant d''utiliser cette commande.'
+  done_success: $1Marqué avec succès ce plot comme étant terminée.
+  done_removed: $1Vous pouvez maintenant continuer à construire dans ce plot.
+ratings:
+  ratings_purged: $2Notes purgées pour ce plot
+  rating_not_valid: $2Vous devez spécifier un nombre entre 1 et 10
+  rating_already_exists: $2Vous avez déjà évalué ce plot $2%s
+  rating_applied: $4Vous avez évalué ce plot avec succès $2%s
+  rating_not_your_own: $2Vous ne pouvez pas évaluer votre propre plot
+  rating_not_done: $2Vous ne pouvez évaluer que les parcelles finies.
+  rating_not_owned: '$2Vous ne pouvez pas évaluer un terrain qui n''est revendiqué par personne'
+tutorial:
+  rate_this: $2Noter ce plot!
+  comment_this: '$2Laisser des commentaires sur ce plot: %s'
+economy:
+  econ_disabled: '$2L''économie n''est pas activée'
+  cannot_afford_plot: '$2Vous ne pouvez pas vous permettre d''acheter ce plot. Il coute $1%s'
+  not_for_sale: '$2Ce plot n''est pas à vendre'
+  cannot_buy_own: $2Vous ne pouvez pas acheter votre propre plot
+  plot_sold: $4Votre plot; $1%s0$4, a été vendu à $1%s1$4 pour $1$%s2
+  cannot_afford_merge: $2Vous ne pouvez pas vous permettre de fusionner ces plots. Il coute $1%s
+  added_balance: $1%s $2a été ajouté à votre solde
+  removed_balance: $1%s $2a été pris sur votre solde
+  removed_granted_plot: '$2Vous avez utilisé %s plot grant(s), il vous $2reste $1%s'
+setup:
+  setup_init: '$1Usage: $2/plot setup <valeur>'
+  setup_step: '$3[$1Step %s0$3] $1%s1 $2- $1Attendant: $2%s2 $1Défaut: $2%s3'
+  setup_invalid_arg: '$2%s0 n''est pas un argument valable pour l''étape %s1. Pour annuler la configuration, utilisez: $1/plot setup cancel'
+  setup_valid_arg: $2valeur $1%s0 $2mis à %s1
+  setup_finished: '$4Vous auriez dû être téléporté dans le monde créé. Sinon, vous devrez configurer le générateur manuellement à l''aide du fichier bukkit.yml ou du plug-in de gestion de monde votre choix.'
+  setup_world_taken: $2%s est déjà un monde
+  setup_missing_world: $2Vous devez spécifier un nom de monde ($1/plot setup &l<monde>$1
+    <generateur>$2)&-$1Commandes supplémentaires:&-$2 - $1/plot setup <valeur>&-$2 - $1/plot
+    setup back&-$2 - $1/plot setup cancel
+  setup_missing_generator: $2Vous devez spécifier un générateur ($1/plot setup <monde> $l<generateur>&r$2)&-$1Commandes supplémentaires:&-$2 - $1/plot setup <valeur>&-$2 - $1/plot
+    setup back&-$2 - $1/plot setup cancel
+  setup_invalid_generator: '$2Générateur invalide. Options possibles: %s'
+schematics:
+  schematic_too_large: $2Ce plot est trop grand pour cette action!
+  schematic_missing_arg: '$2Vous devez spécifier un argument. Valeurs possibles: $1test <nom>$2 , $1save$2 , $1paste $2, $1exportall'
+  schematic_invalid: '$2Ce n''est pas un schématic valide. Raison: $2%s'
+  schematic_valid: '$2C''est un schématic valide'
+  schematic_paste_failed: $2Impossible de coller le schématic
+  schematic_paste_success: $4Le schématic a été collé avec succès
+titles:
+  title_entered_plot: '$1Plot: %world%;%x%;%z%'
+  title_entered_plot_sub: $4Propriété de %s
+  prefix_greeting: '$1%id%$2> '
+  prefix_farewell: '$1%id%$2> '
+core:
+  task_start: Début de tâche...
+  prefix: $3[$1P2$3] $2
+  enabled: $1%s0 est maintenant activé
+reload:
+  reloaded_configs: $1Les traductions et les paramètres du monde ont été rechargés
+  reload_failed: $2Impossible de recharger les configurations de fichier
+desc:
+  desc_set: $2Description des configurations du plot
+  desc_unset: $2Description du plot non défini
+  missing_desc: $2Vous devez spécifier une description
+alias:
+  alias_set_to: $2Alias du plot défini sur $1%alias%
+  alias_removed: $2Alias du plot a été retiré
+  missing_alias: $2Vous devez spécifier un alias
+  alias_too_long: '$2L''alias doit être < 50 caractères de long'
+  alias_is_taken: $2Cet alias est déjà pris
+position:
+  missing_position: '$2Vous devez spécifier une position. Valeurs possibles: $1none'
+  position_set: $1Home définie sur votre position actuelle
+  position_unset: '$1Home, position réinitialisée à l''emplacement par défaut'
+  home_argument: $2Utilisez /plot set home [none]
+  invalid_position: '$2Ce n''est pas une valeur de position valide'
+cap:
+  entity_cap: '$2Vous n''êtes pas autorisé à générer plus de créatures'
+time:
+  time_format: $1%hours%, %min%, %sec%
+permission:
+  no_schematic_permission: '$2Vous ne disposez pas de l''autorisation nécessaire pour utiliser le schématic $1%s'
+  no_permission: '$2Il vous manque la permission: $1%s'
+  no_permission_event: '$2Il vous manque la permission: $1%s'
+  no_plot_perms: $2Vous devez être le propriétaire du plot pour effectuer cette action.
+  cant_claim_more_plots: $2Vous ne pouvez pas réclamer plus de plot.
+  cant_claim_more_clusters: $2Vous ne pouvez pas réclamer plus de clusters.
+  cant_transfer_more_plots: $2Vous ne pouvez pas envoyer plus de plot à cet utilisateur
+  cant_claim_more_plots_num: $2Vous ne pouvez pas réclamer plus que $1%s $2plots à la fois
+  you_be_denied: '$2Vous n''êtes pas autorisé à entrer dans ce plot'
+  merge_request_confirm: Demande de fusionnement de la part de %s
+merge:
+  merge_not_valid: '$2Cette demande de fusion n''est plus valide.'
+  merge_accepted: $2La demande de fusion a été acceptée.
+  success_merge: $2Les plots ont été fusionnés!
+  merge_requested: $2Envoyé avec succès une demande de fusion
+  no_perm_merge: '$2Vous n''êtes pas propriétaire du plot: $1%plot%'
+  no_available_automerge: '$2Vous ne possédez aucun plot adjacent dans la direction spécifiée ou vous n''êtes pas autorisé à fusionner à la taille requise.'
+  unlink_required: $2Une dissociation est nécessaire pour faire ceci.
+  unlink_impossible: $2Vous pouvez seulement dissocier un méga-plot
+  unlink_success: $2Plot dissocié avec succès.
+commandconfig:
+  not_valid_subcommand: '$2Ce n''est pas une sous-commande valide'
+  did_you_mean: '$2Vouliez-vous dire: $1%s'
+  name_little: $2%s0 Le nom est trop court, $1%s1$2<$1%s3
+  no_commands: '$2Je suis désolé, mais vous n''êtes autorisé à utiliser aucune sous-commande.'
+  subcommand_set_options_header: '$2Valeurs possibles: '
+  command_syntax: '$1Usage: $2%s'
+  flag_tutorial_usage: '$1Avoir un administrateur pour mettre le flag: $2%s'
+errors:
+  invalid_player_wait: '$2Joueur non trouvé: $1%s$2, Réessayez bientôt.'
+  invalid_player: '$2Joueur non trouvé: $1%s$2.'
+  invalid_player_offline: '$2Le joueur doit être en ligne: $1%s.'
+  invalid_command_flag: '$2Commande de flag invalide: %s0'
+  error: '$2Une erreur est survenue: %s'
+  command_went_wrong: '$2Quelque chose s''est mal passé lors de l''exécution de cette commande...'
+  no_free_plots: '$2Il n''y a plus de plots gratuits disponibles'
+  not_in_plot: '$2Vous n''êtes pas dans un plot'
+  not_loaded: '$2Le plot n''a pas pu être chargée'
+  not_in_cluster: $2Vous devez être dans un cluster de plot pour effectuer cette action.
+  not_in_plot_world: '$2Vous n''êtes pas dans un plot'
+  plotworld_incompatible: $2Les deux mondes doivent être compatibles
+  not_valid_world: '$2Ce n''est pas un monde valide (sensible aux majuscules et minuscules)'
+  not_valid_plot_world: '$2Ce n''est pas un plot valide (sensible aux majuscules et minuscules)'
+  no_plots: '$2Vous n''avez pas de plots'
+  wait_for_timer: $2Un minuteur est lié au plot actuel ou à vous. Merci d'attendre la fin
+paste:
+  debug_report_created: '$1Téléchargé un débogage complet vers: $1%url%'
+purge:
+  purge_success: $4Purgé avec succès %s plots
+trim:
+  trim_in_progress: Une tâche de trim du monde est déjà en cours!
+  not_valid_hybrid_plot_world: Le gestionnaire de plot hybride est requis pour effectuer cette action.
+block list:
+  block_list_separater: '$1,$2 '
+biome:
+  need_biome: $2Vous devez spécifier un biome valide.
+  biome_set_to: $2Biome du plot mis à $2
+teleport:
+  teleported_to_plot: $1Vous avez été téléporté
+  teleported_to_road: $2Vous avez été téléporté sur la route
+  teleport_in_seconds: $1Téléportation dans %s secondes. Ne bougez pas...
+  teleport_failed: $2Téléportation annulée pour cause de mouvement ou de dommage
+set block:
+  set_block_action_finished: $1La dernière action setblock est maintenant terminée.
+unsafe:
+  debugallowunsafe_on: $2Actions dangereuses autorisées
+  debugallowunsafe_off: $2Actions dangereuses désactivées
+debug:
+  debug_header: $1Informations de débogage&-
+  debug_section: $2>> $1&l%val%
+  debug_line: $2>> $1%var%$2:$1 %val%&-
+invalid:
+  not_valid_data: '$2Ce n''est pas un identifiant de données valide.'
+  not_valid_block: '$2Ce n''est pas un bloc valide: %s'
+  not_allowed_block: '$2Ce bloc n''est pas autorisé: %s'
+  not_valid_number: '$2Ce n''est pas un nombre valide: %s'
+  not_valid_plot_id: $2Ce n''est pas un identifiant de plot valide.
+  plot_id_form: '$2L''identifiant de plot doit être sous la forme: $1X;Y $2e.g. $1-5;7'
+  not_your_plot: '$2Ce n''est pas votre plot.'
+  no_such_plot: '$2Il n''y a pas un tel plot'
+  player_has_not_been_on: '$2Ce joueur n''a pas été dans ce monde de plot'
+  found_no_plots: '$2Nous n''avons trouvé aucun plot avec votre requête de recherche'
+  found_no_plots_for_player: '$2Aucun plot trouvé pour le joueur: %s'
+camera:
+  camera_started: $2Vous êtes entré en mode caméra pour le plot $1%s
+  camera_stopped: '$2Vous n''êtes plus en mode caméra'
+need:
+  need_plot_number: $2Vous devez spécifier un numéro de plot ou un alias
+  need_block: $2Vous devez spécifier un bloc
+  need_plot_id: $2Vous devez spécifier un identifiant de plot.
+  need_plot_world: $2Vous devez spécifier une zone ou plot.
+  need_user: '$2Vous devez spécifier un nom d''utilisateur'
+near:
+  plot_near: '$1Joueurs: %s0'
+info:
+  none: Aucun
+  now: À présent
+  never: Jamais
+  unknown: Inconnu
+  everyone: Toutes les personnes
+  plot_unowned: $2Le plot actuel doit avoir un propriétaire pour effectuer cette action
+  plot_info_unclaimed: '$2Plot $1%s$2 n''est pas encore réclamé'
+  plot_info_header: $3&m---------&r $1INFO $3&m---------
+  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Propriétaire: $2%owner%$1&-$1Biome:
+    $2%biome%$1&-$1Can Construit: $2%build%$1&-$1Évaluation: $2%rating%&-$1Vu: $2%seen%&-$1De confiance:
+    $2%trusted%$1&-$1Membres: $2%members%$1&-$1Refusé: $2%denied%$1&-$1Flags: $2%flags%'
+  plot_info_footer: $3&m---------&r $1INFO $3&m---------
+  plot_info_trusted: $1De confiance:$2 %trusted%
+  plot_info_members: $1Membres:$2 %members%
+  plot_info_denied: $1Refusé:$2 %denied%
+  plot_info_flags: $1Flags:$2 %flags%
+  plot_info_biome: $1Biome:$2 %biome%
+  plot_info_rating: $1Évaluation:$2 %rating%
+  plot_info_owner: $1Propriétaire:$2 %owner%
+  plot_info_id: $1ID:$2 %id%
+  plot_info_alias: $1Alias:$2 %alias%
+  plot_info_size: $1Taille:$2 %size%
+  plot_info_seen: $1Vu:$2 %seen%
+  plot_user_list: ' $1%user%$2,'
+  plot_flag_list: $1%s0:%s1$2
+  info_syntax_console: $2/plot info X;Y
+working:
+  generating_component: $1Début de génération des composants à partir de vos paramètres
+  clearing_plot: $2Effacement des items du plot.
+  clearing_done: $4Effacer terminé! Cela a pris %sms.
+  deleting_done: $4Supprimer terminé! Cela a pris %sms.
+  plot_not_claimed: $2Plot non réclamé
+  plot_is_claimed: $2Ce plot a déja été réclamé
+  claimed: $4Vous avez réclamé avec succès ce plot
+list:
+  comment_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Liste de %amount% commentaires
+  clickable: ' (interactive)'
+  area_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Liste de  %amount% zones
+  plot_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Liste de  %amount% plots
+  plot_list_header: $1Liste de  %word% plots
+  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
+  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
+  plot_list_footer: $2>> $1%word% un total de $2%num% %plot% $1réclamé.
+left:
+  left_plot: $2Tu as quitté le plot
+chat:
+  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_forced: $2Ce monde oblige tout le monde à utiliser le chat de plot.
+  plot_chat_on: $4Chat du plot activé.
+  plot_chat_off: $4Chat du plot désactivé.
+deny:
+  denied_removed: $4Vous avez réussi à retirer ce joueur de la liste des joueurs interdits
+  denied_added: $4Vous avez réussi à ajouter ce joueur à la liste des joueurs interdits
+  denied_need_argument: $2Arguments manquants. $1/plot denied add <nom du joueur> $2or $1/plot
+    denied remove <nom du joueur>
+  was_not_denied: '$2Ce joueur n''est pas interdit sur ce plot'
+  you_got_denied: $4Le plot sur lequel vous étiez précédemmment vous a été refusé et vous avez été téléporté au spawn
+kick:
+  you_got_kicked: $4Vous avez été expulsé!
+rain:
+  need_on_off: '$2Vous devez spécifier une valeur. Valeurs possibles: $1on$2, $1off'
+  setting_updated: $4Vous avez mis à jour les paramètres avec succès
+flag:
+  flag_key: '$2Key: %s'
+  flag_type: '$2Type: %s'
+  flag_desc: '$2Desc: %s'
+  not_valid_flag: '$2Ceci n''est pas un flag valide'
+  not_valid_flag_suggested: '$2Ce n''est pas un flag valide. Vouliez-vous dire: $1%s'
+  not_valid_value: $2Les valeurs du flag doivent être alphanumériques
+  flag_not_in_plot: '$2Ce plot n''a pas ce flag'
+  flag_not_removed: $2Ce flag ne peut pas etre retiré
+  flag_not_added: $2Ce flag ne peut pas etre ajouté
+  flag_removed: $4Flag retiré avec succès
+  flag_added: $4Flag ajouté avec succès
+trusted:
+  trusted_added: $4Vous avez réussi à ajouter ce joueur à la liste des joueurs fiables pour ce plot
+  trusted_removed: $4Vous avez réussi à retirer ce joueur de la liste des joueurs fiables pour ce plot
+  was_not_added: $2Ce joueur fait partie de la liste des joueurs non-fiables
+  plot_removed_user: 'Le $1Plot %s dont vous avez été ajouté a été supprimé en raison de l''inactivité du propriétaire'
+member:
+  removed_players: $2Suppression du joueur %s de ce plot.
+  already_owner: '$2Cet utilisateur est déjà propriétaire de ce plot: %s0'
+  already_added: '$2Cet utilisateur est déjà ajouté à cette catégorie: %s0'
+  member_added: $4Cet utilisateur peut maintenant construire pendant que le propriétaire du plot est en ligne
+  member_removed: $1Vous avez supprimé avec succès un utilisateur du plot
+  member_was_not_added: '$2Ce joueur n''a pas été ajouté en tant qu''utilisateur sur ce plot'
+  plot_max_members: '$2Vous n''êtes pas autorisé à ajouter d''autres joueurs à ce plot'
+owner:
+  set_owner: $4You successfully set the plot owner
+  set_owner_cancelled: $2The setowner action was cancelled
+  now_owner: $4You are now owner of plot %s
+signs:
+  owner_sign_line_1: '$1ID: $1%id%'
+  owner_sign_line_2: '$1Owner:'
+  owner_sign_line_3: $2%plr%
+  owner_sign_line_4: $3Claimed
+help:
+  help_header: $3&m---------&r $1Plot² Help $3&m---------
+  help_page_header: '$1Category: $2%category%$2,$1 Page: $2%current%$3/$2%max%$2'
+  help_footer: $3&m---------&r $1Plot² Help $3&m---------
+  help_info_item: $1/plot help %category% $3- $2%category_desc%
+  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
+  direction: '$1Current direction: %dir%'
+grants:
+  granted_plots: '$1Résultat: $2%s $1Ajout retiré'
+  granted_plot: $1Vous avez été ajouté %s0 au plot $2%s1
+  granted_plot_failed: '$1L''ajout a échoué: $2%s'
+'-':
+  custom_string: '-'
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/furthest.js b/Bukkit/src/main/resources/furthest.js
new file mode 100644
index 000000000..b0f973088
--- /dev/null
+++ b/Bukkit/src/main/resources/furthest.js
@@ -0,0 +1,33 @@
+/*
+* Script to find the furthest plot from origin in a world:
+*  - /plot debugexec runasync furthest.js <plotworld>
+*/
+
+if (PS.hasPlotArea("%s0")) {
+    var plots = PS.getAllPlotsRaw().get("%s0").values().toArray();
+    var max = 0;
+    var maxplot;
+    for (var i in plots) {
+        var plot = plots[i];
+        if (plot.x > max) {
+            max = plot.x;
+            maxplot = plot;
+        }
+        if (plot.y > max) {
+            max = plot.y;
+            maxplot = plot;
+        }
+        if (-plot.x > max) {
+            max = -plot.x;
+            maxplot = plot;
+        }
+        if (-plot.y > max) {
+            max = -plot.y;
+            maxplot = plot;
+        }
+    }
+    PS.class.static.log(plot);
+}
+else {
+    PlotPlayer.sendMessage("Usage: /plot debugexec runasync furthest.js <plotworld>");
+}
diff --git a/Bukkit/src/main/resources/it-IT.yml b/Bukkit/src/main/resources/it-IT.yml
new file mode 100644
index 000000000..6419a2234
--- /dev/null
+++ b/Bukkit/src/main/resources/it-IT.yml
@@ -0,0 +1,393 @@
+confirm:
+  expired_confirm: $2La conferma è scaduta, esegui nuovamente il comando!
+  failed_confirm: $2Non hai azioni in sospeso da confermare!
+  requires_confirm: '$2Sei sicuro di voler eseguire: $1%s$2?&-$2Questo non può essere annullato! Se sei sicuro: $1/plot confirm'
+move:
+  move_success: $4Lotto spostato con successo.
+  copy_success: $4Lotto copiato con successo.
+  requires_unowned: $2La posizione specificata è già occupata.
+set:
+  set_attribute: $4Impostato con successo %s0 a %s1
+web:
+  generating_link: $1Elaborazione del lotto in corso...
+  generating_link_failed: $2Generazione del link per il download fallita!
+  save_failed: $2Salvataggio fallito
+  load_null: $2Usa $4/plot load $2per ottenere una lista delle schematiche
+  load_failed: $2Caricamento schematica fallito
+  load_list: '$2Per caricare una schematica, usa $1/plot load #'
+  save_success: $1Salvata con successo!
+compass:
+  compass_target: $4Lotto mirato con successo con la bussola
+cluster:
+  cluster_available_args: '$1Sono disponibili i seguenti sotto comandi: $4list$2, 
+    $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2,
+    $4info$2, $4tp$2, $4sethome'
+  cluster_list_heading: $2Ci sono $1%s$2 cluster in questo mondo
+  cluster_list_element: $2 - $1%s&-
+  cluster_intersection: '$2L''area proposta si sovrappone a: %s0'
+  cluster_outside: '$2L''area proposta è fuori dall''area dei lotti: %s0'
+  cluster_added: $4Cluster creato con successo.
+  cluster_deleted: $4Cluster eliminato con successo.
+  cluster_resized: $4Cluster ridimensionato con successo.
+  cluster_added_user: $4Utente aggiunto al cluster con successo.
+  cannot_kick_player: $2Non puoi cacciare quel giocatore
+  cluster_invited: '$1Sei stato invitato nel cluster seguente: $2%s'
+  cluster_removed: '$1Sei stato rimosso dal cluster: $2%s'
+  cluster_kicked_user: $4Utente cacciato con successo
+  invalid_cluster: '$1Nome cluster non valido: $2%s'
+  cluster_not_added: $2Quel giocatore non è stato aggiunto al cluster di lotti
+  cluster_cannot_leave: $1Devi eliminare o trasferire la proprietà prima di uscire
+  cluster_added_helper: $4Aggiunto con successo un aiutante al cluster
+  cluster_removed_helper: $4Rimosso con successo un aiutante dal cluster
+  cluster_regenerated: $4Rigenerazione cluster iniziata correttamente
+  cluster_teleporting: $4Teletrasporto in corso...
+  cluster_info: '$1Cluster attuale: $2%id%&-$1Nome: $2%name%&-$1Proprietario: $2%owner%&-$1Dimensione: $2%size%&-$1Permessi: $2%rights%'
+border:
+  border: $2Sei fuori dal confine della mappa attuale
+unclaim:
+  unclaim_success: $4Hai liberato il lotto con successo.
+  unclaim_failed: $2Impossibile liberare il lotto
+worldedit masks:
+  worldedit_delayed: $2Attendi durante l'elaborazione della tua azione WorldEdit...
+  worldedit_run: '$2Scuse per il ritardo. Ora in esecuzione: %s'
+  require_selection_in_mask: $2%s della tua selezione non è all'interno del tuo lotto. Puoi apportare modifiche solo dentro il tuo lotto.
+  worldedit_volume: $2Non puoi selezionare un volume di %current%. Il volume massimo che puoi modificare è %max%.
+  worldedit_iterations: $2Non puoi iterare %current% volte. Il massimo numero di iterazioni consentite è %max%.
+  worldedit_unsafe: $2L'accesso a quel comando è stato bloccato
+  worldedit_bypass: $2&oPer bypassare le tue restrizioni usa $4/plot wea
+  worldedit_bypassed: $2Attualmente bypassando le restrizioni di WorldEdit.
+  worldedit_unmasked: $1Il tuo WorldEdit è ora libero.
+  worldedit_restricted: $1Il tuo WorldEdit è ora ristretto.
+gamemode:
+  gamemode_was_bypassed: $1Hai bypassato la modalità di gioco ($2{gamemode}$1) $1impostata per $2{plot}
+height limit:
+  height_limit: $1Questa area lotti ha un limite di altezza di $2{limit}
+records:
+  record_play: $2%player $2ha iniziato a riprodurre il disco $1%name
+  notify_enter: $2%player $2è entrato nel tuo lotto ($1%plot$2)
+  notify_leave: $2%player $2è uscito dal tuo lotto ($1%plot$2)
+swap:
+  swap_overlap: $2Le aree proposte non possono sovrapporsi
+  swap_dimensions: $2Le aree proposte devono avere le stesse dimensioni
+  swap_syntax: $2/plot swap <id lotto>
+  swap_success: $4Lotti scambiati con successo
+  started_swap: $2Scambio lotti avviato. Sarai avvisato al termine
+comment:
+  inbox_notification: '%s messaggi non letti. Usa /plot inbox'
+  not_valid_inbox_index: $2Nessun commento all'indice %s
+  inbox_item: $2 - $4%s
+  comment_syntax: $2Usa /plot comment [X;Z] <%s> <commento>
+  invalid_inbox: '$2Quella non è una casella di posta valida.&-$1Valori accettati: %s'
+  no_perm_inbox: $2Non hai il permesso per quella casella di posta
+  no_perm_inbox_modify: $2Non hai il permesso di modificare quella casella di posta
+  no_plot_inbox: $2Devi stare in un lotto o fornirlo nell'argomento
+  comment_removed: $4Cancellato con successo il commento/i:n$2 - '$3%s$2'
+  comment_added: $4È stato lasciato un commento
+  comment_header: $2&m---------&r $1Commenti $2&m---------&r
+  inbox_empty: $2Nessun commento
+console:
+  not_console: $2Per ragioni di sicurezza, questo commando può essere eseguito solo dalla console.
+  is_console: $2Questo comando può essere eseguito solo da un giocatore.
+inventory:
+  inventory_usage: '&cUso: &6{usage}'
+  inventory_desc: '&cDescrizione: &6{desc}'
+  inventory_category: '&cCategoria: &6{category}'
+clipboard:
+  clipboard_set: $2Il lotto corrente è ora copiato nei tuoi appunti, usa $1/plot paste$2 per incollarlo
+  pasted: $4La selezione del lotto è stata incollata. È stata cancellata dai tuoi appunti.
+  paste_failed: '$2Incollaggio della selezione fallito. Motivo: $2%s'
+  no_clipboard: $2Non hai una selezione nei tuoi appunti
+  clipboard_info: '$2Selezione Attuale - ID Lotto: $1%id$2, Larghezza: $1%width$2, Blocchi Totali: $1%total$2'
+toggle:
+  toggle_enabled: '$2Impostazione abilitata: %s'
+  toggle_disabled: '$2Impostazione disabilitata: %s'
+blocked command:
+  command_blocked: $2Quel comando non è consentito in questo lotto
+done:
+  done_already_done: $2Questo lotto è già contrassegnato come finito
+  done_not_done: $2Questo lotto non è contrassegnato come finito.
+  done_insufficient_complexity: $2Questo lotto è troppo semplice. Aggiungi altri dettagli prima di usare questo comando.
+  done_success: $1Questo lotto è stato contrassegnato con successo come finito.
+  done_removed: $1Ora puoi continuare a costruire in questo lotto.
+ratings:
+  ratings_purged: $2Valutazioni di questo lotto eliminate
+  rating_not_valid: $2Devi specificare un numero compreso tra 1 e 10
+  rating_already_exists: $2Hai già valutato il lotto $2%s
+  rating_applied: $4Hai valutato con successo il lotto $2%s
+  rating_not_your_own: $2Non puoi valutare il tuo stesso lotto
+  rating_not_done: $2Puoi valutare solo lotti finiti.
+  rating_not_owned: $2Non puoi valutare un lotto che non è stato claimato
+tutorial:
+  rate_this: $2Valuta questo lotto!
+  comment_this: '$2Lascia un feedback a questo lotto: %s'
+economy:
+  econ_disabled: $2L'economia non è abilitata
+  cannot_afford_plot: $2Non ti puoi permettere di comprare questo lotto. Costa $1%s
+  not_for_sale: $2Questo lotto non è in vendita
+  cannot_buy_own: $2Non puoi comprare il tuo stesso lotto
+  plot_sold: $4Il tuo lotto; $1%s0$4, è stato venduto a $1%s1$4 per $1$%s2
+  cannot_afford_merge: $2Non puoi permetterti di unire i lotti. Costa $1%s
+  added_balance: $1%s $2sono stati aggiunti al tuo bilancio
+  removed_balance: $1%s $2sono stati presi dal tuo bilancio
+  removed_granted_plot: $2Hai usato la concessione del lotto di %s, hai $1%s $2rimanenti
+setup:
+  setup_init: '$1Uso: $2/plot setup <valore>'
+  setup_step: '$3[$1Passaggio %s0$3] $1%s1 $2- $1Stimato: $2%s2 $1Predefinito: $2%s3'
+  setup_invalid_arg: '$2%s0 non è un argomento valido per il passaggio %s1. Per cancellare il setup usa: $1/plot setup cancel'
+  setup_valid_arg: $2Valore $1%s0 $2impostato a %s1
+  setup_finished: $4Dovresti essere stato teletrasportato nel mondo creato. Altrimenti
+    sarà necessario impostare manualmente il generatore usando il file bukkit.yml
+    o il tuo plugin di gestione dei mondi scelto.
+  setup_world_taken: $2%s è già un mondo lotti
+  setup_missing_world: $2Devi specificare un nome per il mondo ($1/plot setup &l<mondo>$1
+    <generatore>$2)&-$1Comandi aggiuntivi:&-$2 - $1/plot setup <valore>&-$2 - $1/plot
+    setup back&-$2 - $1/plot setup cancel
+  setup_missing_generator: $2Devi specificare un generatore ($1/plot setup <mondo>
+    &l<generatore>&r$2)&-$1Comandi aggiuntivi:&-$2 - $1/plot setup <valore>&-$2 -
+    $1/plot setup back&-$2 - $1/plot setup cancel
+  setup_invalid_generator: '$2Generatore non valido. Opzioni possibili: %s'
+schematics:
+  schematic_too_large: $2Il lotto è troppo grande per questa azione!
+  schematic_missing_arg: '$2Devi specificare un argomento. Valori possibili: $1test <nome>$2 , $1save$2 , $1paste $2, $1exportall'
+  schematic_invalid: '$2Quella non è una schematica valida. Motivo: $2%s'
+  schematic_valid: $2Quella è una schematica valida
+  schematic_paste_failed: $2L'incollaggio della schematica è fallito
+  schematic_paste_success: $4Schematica incollata con successo
+titles:
+  title_entered_plot: '$1Lotto: %world%;%x%;%z%'
+  title_entered_plot_sub: $4Proprietà di %s
+  prefix_greeting: '$1%id%$2> '
+  prefix_farewell: '$1%id%$2> '
+core:
+  task_start: Avviando l'attività...
+  prefix: $3[$1P2$3] $2
+  enabled: $1%s0 è ora abilitato
+reload:
+  reloaded_configs: $1Le traduzioni e le configurazioni del mondo sono state ricaricate
+  reload_failed: $2Ricarimento dei file di configurazione fallito
+desc:
+  desc_set: $2Descrizione del lotto impostata
+  desc_unset: $2Descrizione del lotto eliminata
+  missing_desc: $2Devi specificare una descrizione
+alias:
+  alias_set_to: $2Alias del lotto impostato a $1%alias%
+  alias_removed: $2Alias del lotto rimosso
+  missing_alias: $2Devi specificare un alias
+  alias_too_long: $2L'alias deve esssere deve essere lungo meno di 50 caratteri
+  alias_is_taken: $2Quell'alias è già in uso
+position:
+  missing_position: '$2Devi specificare una posizione. Valori possibili: $1none'
+  position_set: $1Casa impostata alla tua posizione attuale
+  position_unset: $1Posizione della casa ripristinata al punto predefinito
+  home_argument: $2Usa /plot set home [none]
+  invalid_position: $2Quella non è una posizione valida
+cap:
+  entity_cap: $2Non puoi spawnare ulteriori mob
+time:
+  time_format: $1%hours%, %min%, %sec%
+permission:
+  no_schematic_permission: $2Non hai il permesso richiesto per usare la schematica $1%s
+  no_permission: '$2Ti manca il permesso: $1%s'
+  no_permission_event: '$2Ti manca il permesso: $1%s'
+  no_plot_perms: $2Devi essere il proprietario del lotto per eseguire questa azione
+  cant_claim_more_plots: $2Non puoi avere ulteriori lotti.
+  cant_claim_more_clusters: $2Non puoi avere ulteriori cluster.
+  cant_transfer_more_plots: $2Non puoi trasferire ulteriori lotti a quell'utente
+  cant_claim_more_plots_num: $2Non puoi claimare più di $1%s $2lotti alla volta
+  you_be_denied: $2Non ti è permesso entrare in questo lotto
+  merge_request_confirm: Richiesta di fusione dei lotti da %s
+merge:
+  merge_not_valid: $2Questa richiesta di fusione dei lotti non è più valida.
+  merge_accepted: $2La richiesta di fusione dei lotti è stata accettata
+  success_merge: $2I lotti sono stati uniti!
+  merge_requested: $2Richiesta di fusione dei lotti inviata
+  no_perm_merge: '$2Non sei il proprietario del lotto: $1%plot%'
+  no_available_automerge: $2Non possiedi alcun lotto adiacente nella direzione specificata o non puoi unire i lotti alla dimensione richiesta.
+  unlink_required: $2Per fare questo è necessario uno scollegamento dei lotti.
+  unlink_impossible: $2Puoi scollegare solo un mega-lotto
+  unlink_success: $2Lotti scollegati con successo.
+commandconfig:
+  not_valid_subcommand: $2Quello non è un sottocomando valido
+  did_you_mean: '$2Forse intendevi: $1%s'
+  name_little: $2Il nome %s0 è troppo corto, $1%s1$2<$1%s3
+  no_commands: $2Non ti è permesso usare alcun sottocomando.
+  subcommand_set_options_header: '$2Valori Possibili: '
+  command_syntax: '$1Uso: $2%s'
+  flag_tutorial_usage: '$1Avere un amministratore che imposta la flag: $2%s'
+errors:
+  invalid_player_wait: '$2Giocatore non trovato: $1%s$2, ricerca in corso. Riprova presto.'
+  invalid_player: '$2Giocatore non trovato: $1%s$2.'
+  invalid_player_offline: '$2Il giocatore deve essere online: $1%s.'
+  invalid_command_flag: '$2Flag dei comandi non valida: %s0'
+  error: '$2Si è verificato un errore: %s'
+  command_went_wrong: $2Qualcosa è andato storto durante l'esecuzione di quel comando...
+  no_free_plots: $2Non ci sono lotti liberi disponibili
+  not_in_plot: $2Non sei in un lotto
+  not_loaded: $2Non è stato possibile caricare il lotto
+  not_in_cluster: $2Devi essere dentro un cluster di lotti per eseguire questa azione
+  not_in_plot_world: $2Non sei in un mondo lotti
+  plotworld_incompatible: $2I due mondi devono essere compatibili
+  not_valid_world: $2Quello non è un mondo valido (case sensitive)
+  not_valid_plot_world: $2Quello non è un mondo lotti valido (case sensitive)
+  no_plots: $2Non hai nessun lotto
+  wait_for_timer: $2Un timer setblock è impostato sul lotto attuale o su di te. Aspetta che finisca
+paste:
+  debug_report_created: '$1Un debug completo è stato caricato a: $1%url%'
+purge:
+  purge_success: $4Eliminati con successo %s lotti
+trim:
+  trim_in_progress: Un'attività di trim del mondo è già in esecuzione!
+  not_valid_hybrid_plot_world: Il gestore di lotti ibridi è richiesto per eseguire questa azione
+block list:
+  block_list_separater: '$1,$2 '
+biome:
+  need_biome: $2Devi specificare un bioma valido.
+  biome_set_to: $2Bioma del lotto impostato a $2
+teleport:
+  teleported_to_plot: $1Sei stato teletrasportato
+  teleported_to_road: $2Sei stato teletrasportato sulla strada
+  teleport_in_seconds: $1Teletrasporto tra %s secondi. Non muoverti...
+  teleport_failed: $2Teletrasporto annullato a causa di movimenti o danni
+set block:
+  set_block_action_finished: $1L'ultima azione setblock è ora terminata.
+unsafe:
+  debugallowunsafe_on: $2Azioni non sicure consentite
+  debugallowunsafe_off: $2Azioni non sicure disabilitate
+debug:
+  debug_header: $1Informazioni di Debug&-
+  debug_section: $2>> $1&l%val%
+  debug_line: $2>> $1%var%$2:$1 %val%&-
+invalid:
+  not_valid_data: $2Quello non è un id valido.
+  not_valid_block: '$2Questo non è un blocco valido: %s'
+  not_allowed_block: '$2Questo blocco non è consentito: %s'
+  not_valid_number: '$2Quello non è un numero valido all''interno dell''intervallo: %s'
+  not_valid_plot_id: $2Quello non è un id lotto valido.
+  plot_id_form: '$2L''id del lotto deve essere scritto in questa forma: $1X;Y $2es. $1-5;7'
+  not_your_plot: $2Quel lotto non è tuo.
+  no_such_plot: $2Quel lotto non esiste
+  player_has_not_been_on: $2Quel giocatore non è mai stato nel mondo lotti
+  found_no_plots: $2Non sono stati trovati lotti con la tua ricerca
+  found_no_plots_for_player: '$2Nessun lotto trovato per il giocatore: %s'
+camera:
+  camera_started: $2Hai inserito la modalità telecamera per il lotto $1%s
+  camera_stopped: $2Non sei più in modalità telecamera
+need:
+  need_plot_number: $2Devi specificare un numero lotto o un alias
+  need_block: $2Devi specificare un blocco
+  need_plot_id: $2Devi specificare un id lotto.
+  need_plot_world: $2Devi specificare un mondo lotti.
+  need_user: $2Devi specificare un nome utente
+near:
+  plot_near: '$1Giocatori: %s0'
+info:
+  none: Nessuno
+  now: Adesso
+  never: Mai
+  unknown: Sconosciuto
+  everyone: Tutti
+  plot_unowned: $2Il lotto attuale deve avere un proprietario per eseguire questa azione
+  plot_info_unclaimed: $2Il lotto $1%s$2 non è ancora claimato
+  plot_info_header: $3&m---------&r $1INFO $3&m---------
+  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Proprietario: $2%owner%$1&-$1Bioma:
+    $2%biome%$1&-$1Puoi costruire: $2%build%$1&-$1Valutazione: $2%rating%&-$1Visto:
+    $2%seen%&-$1Membri fidati: $2%trusted%$1&-$1Membri: $2%members%$1&-$1Bloccati:
+    $2%denied%$1&-$1Flag: $2%flags%'
+  plot_info_footer: $3&m---------&r $1INFO $3&m---------
+  plot_info_trusted: $1Membri fidati:$2 %trusted%
+  plot_info_members: $1Membri:$2 %members%
+  plot_info_denied: $1Bloccati:$2 %denied%
+  plot_info_flags: $1Flag:$2 %flags%
+  plot_info_biome: $1Bioma:$2 %biome%
+  plot_info_rating: $1Valutazione:$2 %rating%
+  plot_info_owner: $1Proprietario:$2 %owner%
+  plot_info_id: $1ID:$2 %id%
+  plot_info_alias: $1Alias:$2 %alias%
+  plot_info_size: $1Dimensione:$2 %size%
+  plot_info_seen: $1Visto:$2 %seen%
+  plot_user_list: ' $1%user%$2,'
+  plot_flag_list: $1%s0:%s1$2
+  info_syntax_console: $2/plot info X;Y
+working:
+  generating_component: $1Iniziato a generare componenti dalle tue impostazioni
+  clearing_plot: $2Pulizia del lotto.
+  clearing_done: $4Pulizia completata! Impiegati %sms.
+  deleting_done: $4Cancellazione completata! Impiegati %sms.
+  plot_not_claimed: $2Lotto non claimato
+  plot_is_claimed: $2Questo lotto è già claimato
+  claimed: $4Hai claimato il lotto con successo
+list:
+  comment_list_header_paged: $2(Pagina $1%cur$2/$1%max$2) $1Elenco di %amount% commenti
+  clickable: ' (interattivo)'
+  area_list_header_paged: $2(Pagina $1%cur$2/$1%max$2) $1Elenco di %amount% aree
+  plot_list_header_paged: $2(Pagina $1%cur$2/$1%max$2) $1Elenco di %amount% lotti
+  plot_list_header: $1Elenco dei lotti di %word%
+  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
+  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
+  plot_list_footer: $2>> $1%word% con un totale di $2%num% $1%plot% claimati.
+left:
+  left_plot: $2Hai lasciato il lotto
+chat:
+  plot_chat_spy_format: '$2[$1Spia Chat Lotti$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_format: '$2[$1Chat Lotti$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_forced: $2Questo mondo costringe tutti a usare la chat dei lotti.
+  plot_chat_on: $4Chat lotti abilitata.
+  plot_chat_off: $4Chat lotti disabilitata.
+deny:
+  denied_removed: $4Hai sbloccato con successo il giocatore da questo lotto
+  denied_added: $4Hai bloccato con successo il giocatore da questo lotto
+  denied_need_argument: $2Gli argomenti sono mancanti. $1/plot denied add <nome> $2o $1/plot denied remove <nome>
+  was_not_denied: $2Quel giocatore non è bloccato in questo lotto
+  you_got_denied: $4Sei stato bloccato dal lotto dove eri prima, e sei stato teletrasportato allo spawn
+kick:
+  you_got_kicked: $4Sei stato cacciato!
+rain:
+  need_on_off: '$2Devi specificare un valore. Valori possibili: $1on$2, $1off'
+  setting_updated: $4Hai aggiornato l'impostazione con successo
+flag:
+  flag_key: '$2Key: %s'
+  flag_type: '$2Tipo: %s'
+  flag_desc: '$2Desc: %s'
+  not_valid_flag: $2Quella non è una flag valida
+  not_valid_flag_suggested: '$2Quella non è una flag valida. Forse intendevi: $1%s'
+  not_valid_value: $2Il valore delle flag deve essere alfanumerico
+  flag_not_in_plot: $2Il lotto non ha quella flag
+  flag_not_removed: $2La flag non può essere rimossa
+  flag_not_added: $2La flag non può essere aggiunta
+  flag_removed: $4Flag rimossa con successo
+  flag_added: $4Flag aggiunta con successo
+trusted:
+  trusted_added: $4Quell'utente ora può costruire nel tuo lotto
+  trusted_removed: $4Hai rimosso con successo un amico dal lotto
+  was_not_added: $2Quel giocatore non è aggiunto come amico in questo lotto
+  plot_removed_user: $1Il lotto %s in cui eri aggiunto è stato eliminato a causa dell'inattività del proprietario
+member:
+  removed_players: $2Rimossi %s giocatori dal lotto.
+  already_owner: $2L'utente %s0 è già il proprietario di questo lotto.
+  already_added: $2L'utente %s0 è già aggiunto a quella categoria.
+  member_added: $4Quell'utente ora può costruire quando il proprietario è online
+  member_removed: $1Hai rimosso con successo un utente dal lotto
+  member_was_not_added: $2Quel giocatore non è aggiunto a questo lotto
+  plot_max_members: $2Non puoi aggiungere altri giocatori a questo lotto
+owner:
+  set_owner: $4Hai impostato correttamente il proprietario del lotto
+  now_owner: $4Sei ora proprietario del lotto %s
+  set_owner_cancelled: $2L'azione del proprietario è stata annullata
+signs:
+  owner_sign_line_1: '$1ID: $1%id%'
+  owner_sign_line_2: '$1Proprietario:'
+  owner_sign_line_3: $2%plr%
+  owner_sign_line_4: $3Claimato
+help:
+  help_header: $3&m---------&r $1Aiuto Plot² $3&m---------
+  help_page_header: '$1Categoria: $2%category%$2,$1 Pagina: $2%current%$3/$2%max%$2'
+  help_footer: $3&m---------&r $1Aiuto Plot² $3&m---------
+  help_info_item: $1/plot help %category% $3- $2%category_desc%
+  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
+  direction: '$1Direzione attuale: %dir%'
+grants:
+  granted_plots: '$1Risultato: $2%s $1concessioni rimanenti'
+  granted_plot: $1Hai concesso il lotto %s0 a $2%s1
+  granted_plot_failed: '$1Concessione fallita: $2%s'
+'-':
+  custom_string: '-'
diff --git a/Bukkit/src/main/resources/ko-KR.yml b/Bukkit/src/main/resources/ko-KR.yml
new file mode 100644
index 000000000..07d6caca5
--- /dev/null
+++ b/Bukkit/src/main/resources/ko-KR.yml
@@ -0,0 +1,402 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Translate by Protocodyne Korean Translate team 
+# First Author <bmr02039@protocodyne.com>, 2015.
+confirm:
+  failed_confirm: $2이 작업이 완료되기 위한 행동이 당신에게 존재하지 않습니다!
+  requires_confirm: '$2정말로 실행되길 원하나요: $1%s$2?&-$2이 작업은 되돌릴 수 없습니다! 확실하다면 다음 명령어를 입력하세요:
+    $1/plot confirm'
+  expired_confirm: $2확인이 만료되었습니다. 명령을 다시 실행하십시오.!
+move:
+  move_success: $4성공적으로 땅이 옮겨졌습니다.
+  copy_success: $4성공적으로 땅이 복사되었습니다.
+  requires_unowned: $2이 지역은 이미 사용되고 있습니다.
+web:
+  generating_link: $1땅을 생성중입니다...
+  generating_link_failed: $2다운로드 링크 생성에 실패하였습니다!
+  save_failed: $2저장에 실패하였습니다.
+  load_null: $2/plot load $4명령어를 사용하여 $2schematics 리스트를 가져오십시오
+  load_failed: $2schematic 로드를 실패하였습니다.
+  load_list: '$2schematic로드를 원한다면, 다음명령어를 사용하세요 $1/plot load #'
+  save_success: $1성공적으로 저장되었습니다!
+compass:
+  compass_target: $4나침반과 함께 음모를 성공적으로 지정했습니다.
+cluster:
+  cluster_available_args: '$1다음 하위명령어가 사용 가능합니다.: $4list$2, $4create$2, $4delete$2,
+    $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2, $4tp$2, $4sethome'
+  cluster_list_heading: $2이 월드에 $1%s$2 cluster가 있습니다
+  cluster_list_element: $2 - $1%s&-
+  cluster_intersection: $2제안 된 영역이 겹칩니다 와 $1%s$2 기존의 cluster
+  cluster_added: $4cluster가 성공적으로 생성되었습니다.
+  cluster_deleted: $4cluster가 성공적으로 삭제되었습니다.
+  cluster_resized: $4cluster가 성공적으로 재조정 되었습니다.
+  cluster_added_user: $4cluster에 성공적으로 유저가 추가되었습니다.
+  cannot_kick_player: $2당신은 해당 플레이어를 추방 할 수 없습니다.
+  cluster_invited: '$1당신은 다음 cluster으로 초대받았습니다: $2%s'
+  cluster_removed: '$1당신은 다음cluster에서 삭제되었습니다: $2%s'
+  cluster_kicked_user: $4성공적으로 해당 유저를 추방 하였습니다
+  invalid_cluster: '$1올바르지 않은 cluster 이름입니다: $2%s'
+  cluster_not_added: $2해당 플레이어는  plot cluster 추가되지 않았습니다
+  cluster_cannot_leave: $1당신은 떠나기전에 cluster를 반드시 삭제하거나 소유권을 이전해야합니다
+  cluster_added_helper: $4helper가 성공적으로 cluster에 추가되었습니다
+  cluster_removed_helper: $4helper가 성공적으로 cluster에서 제거되었습니다
+  cluster_regenerated: $4성공적으로 cluster가 재생성 되었습니다
+  cluster_teleporting: $4이동중...
+  cluster_info: '$1현재 cluster: $2%id%&-$1이름: $2%name%&-$1소유자: $2%owner%&-$1크기: $2%size%&-$1Rights:
+    $2%rights%'
+  cluster_outside: '$2제안 된 영역이 플롯 영역 밖에 있습니다: %s0'
+border:
+  border: $2당신은 현재 지도의 경계 밖에 있습니다
+unclaim:
+  unclaim_success: $4성공적으로 땅을 판매하였습니다.
+  unclaim_failed: $2땅을 판매할 수 없습니다
+worldedit masks:
+  worldedit_delayed: $2당신의 WorldEdit 행동을 처리중이니 기다려주시기 바랍니다...
+  worldedit_run: '$2처리가 지연되어 죄송합니다. 해당 명령어를 실행합니다: %s'
+  require_selection_in_mask: $2%s 선택한 마스크가 플롯 마스크 안에 있지 않습니다..
+    플롯 내에서만 편집 할 수 있습니다..
+  worldedit_volume: $2당신은 a volume of %current%를 선택 할 수 없습니다. 당신이  수정할 수 있는 최대부피는 %max% 입니다.
+  worldedit_iterations: $2당신은 %current%번 반복 적용시킬 수 없습니다. 당신이 수정가능한 최대 부피는 %max% 입니다.
+  worldedit_unsafe: $2해당 명령어는 실행 될 수 없습니다.
+  worldedit_bypass: $2&o당신의 제한을 우회하고 싶다면 $4/plot wea를 사용하십시오
+  worldedit_bypassed: $2현재 WorldEdit의 제한을 수정하는 중입니다.
+  worldedit_unmasked: $1당신의  WorldEdit 제한이 제거되었습니다.
+  worldedit_restricted: $1당신의 WorldEdit은 제한됩니다.
+gamemode:
+  gamemode_was_bypassed: $1당신은 gamemode를 무시합니다 ($2{gamemode}$1) $1set for $2{plot}
+height limit:
+  height_limit: $1이 Plot World는 $2{limit}만큼 제한이 있습니다
+records:
+  record_play: $2%player가 $2플레이 기록을 시작합니다 $1%name
+  notify_enter: $2%player가 $2당신의 plot에 입장합니다 ($1%plot$2)
+  notify_leave: $2%player가 $2당신의 plot를 떠납니다 ($1%plot$2)
+swap:
+  swap_overlap: $2해당 구역은 덮어쓰기가 허용되지 않습니다.
+  swap_dimensions: $2해당 지역은 반드시 비교 가능한 차원이 있어야 합니다.
+  swap_syntax: $2/plot swap <plot id>
+  swap_success: $4성공적으로 땅이 교환되었습니다
+  started_swap: $2땅 교환이 시작되었습니다. 작업 완료시 장신에게 통보 될 예정입니다.
+comment:
+  inbox_notification: '%s 읽지않은 메세지가 있습니다. 다음 명령어를 사용해주세요 /plot inbox'
+  not_valid_inbox_index: $2메일함에 comment가 존재하지 않습니다 %s
+  inbox_item: $2 - $4%s
+  comment_syntax: $2다음 명령어를 사용해주세요 /plot comment [X;Z] <%s> <comment>
+  invalid_inbox: '$2올바르지 않은 메일함 입니다..&-$1Accepted values: %s'
+  no_perm_inbox: $2당신은 해당 메일함에 권한이 없습니다
+  no_perm_inbox_modify: $2당신은 해당 메일함을 수정할 권한이 없습니다
+  no_plot_inbox: $2당신은 서 있거나 줄거리를 제공해야합니다
+  comment_removed: $4comment가 성공적으로 삭제되었습니다/s:n$2 - '$3%s$2'
+  comment_added: $4A comment가 남아있습니다
+  comment_header: $2&m---------&r $1댓글 $2&m---------&r
+  inbox_empty: $2comment가 없습니다
+console:
+  not_console: $2보안상의 이유로, 이 명령어는 Console에서만 입력 가능합니다.
+  is_console: $2해당 명령어는 Player만 사용 가능합니다.
+inventory:
+  inventory_usage: '&c시용: &6{usage}'
+  inventory_desc: '&c설명: &6{desc}'
+  inventory_category: '&c카테고리: &6{category}'
+clipboard:
+  clipboard_set: $2현재 땅은 당신의 클리보드로 복사되었습니다, 다음명령어를 사용하여 $1/plot paste$2 붙여넣으세요.
+  pasted: $4해당 땅은 성공적으로 붙여넣어졌습니다. 해당 땅은 클립보드로부터 제거됩니다.
+  paste_failed: '$2선택된 땅의 복사가 실패했습니다. 사유: $2%s'
+  no_clipboard: $2클립보드에 복사된 땅이 존재하지 않습니다
+  clipboard_info: '$2현재 선택 - Plot ID: $1%id$2, Width: $1%width$2, Total Blocks: $1%total$2'
+toggle:
+  toggle_enabled: '$2가능한 세팅: %s'
+  toggle_disabled: '$2불가능한 세팅: %s'
+blocked command:
+  command_blocked: $2해당 명령어는 이 plot에서 허가되지 않았습니다
+done:
+  done_already_done: $2이 땅은 이미 완료로 표기 되어 있습니다.
+  done_not_done: $2이 땅은 완료로 표기되어 있지 않습니다.
+  done_insufficient_complexity: $2이 땅은 너무 간단합니다. 이 명령어를 사용하기전 더 많은 정보를 입력해주시기 바랍니다.
+  done_success: $1성공적으로 이 땅에 완료표시를 하였습니다.
+  done_removed: $1이 땅에 건축을 진행해도 좋습니다.
+ratings:
+  rating_not_valid: $2당신은 1 과 10 사이의 숫자를 입력해야 합니다
+  rating_already_exists: $2당신은 이미 이 땅에 투표하였습니다 $2%s
+  rating_applied: $4성공적으로 투표되었습니다 $2%s
+  rating_not_your_own: $2당신은 자신의 땅에 투표 할 수 없습니다
+  rating_not_done: $2당신은 완료된 땅에만 투표 할 수 있습니다.
+  rating_not_owned: $2당신은 소유자가 없는 땅에 투표 할 수 없습니다
+  ratings_purged: $2Purged ratings for this plot
+tutorial:
+  rate_this: $2이 땅에 투표해보세요!
+  comment_this: '$2이땅에 피드백을 남겨보세요: %s'
+economy:
+  econ_disabled: $2Economy 가 활성화 되있지 않습니다
+  cannot_afford_plot: $2당신은 이 땅을 구입 할 수 없습니다. 이 땅의 가격은 $1%s 입니다
+  not_for_sale: $2이 땅은 판매 불가능합니다
+  cannot_buy_own: $2당신은 본인의 땅을 구입 불가능 합니다
+  plot_sold: $4당신의 땅; $1%s0$4, 판매 된 $1%s1$4 에 대한 $1$%s2
+  cannot_afford_merge: $2당신은 이 땅을 함칠 수 없습니다. 이 땅의 가격은 $1%s 입니다
+  added_balance: $1%s $2이 당신의 통장에 추가되었습니다
+  removed_balance: $1%s $2이 당신의 통장에서 빠져나갔습니다
+  removed_granted_plot: $2너는 사용했다 %s 계획 교부금 (들), 당신이있어 $1%s $2왼쪽
+setup:
+  setup_init: '$1용법: $2/plot setup <value>'
+  setup_step: '$3[$1Step %s0$3] $1%s1 $2- $1기대: $2%s2 $1태만: $2%s3'
+  setup_invalid_arg: '$2%s0 는 올바르지 않은 값입니다  %s1. 설정 취소를 원하시면 다음 명령어를 사용하십시오: $1/plot
+    setup cancel'
+  setup_valid_arg: $2Value $1%s0 $2set to %s1
+  setup_finished: $4당신은 만들어진 World로 이동되있어야 합니다. 그렇지 않으면 당신은 bukkit.yml를 통하여 워드를 설정하거나
+    다중월드 플러그인을 사용하여 월드를 생성하여야 합니다.
+  setup_world_taken: $2%s 는 이미 등록된 Plot World 입니다
+  setup_missing_world: $2당신은 월드의 이름을 지정해야 합니다 ($1/plot setup &l<world>$1 <generator>$2)&-$1Additional
+    commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup
+    cancel
+  setup_missing_generator: $2당신은 생성기를 지정해야 합니다 ($1/plot setup <world> &l<generator>&r$2)&-$1Additional
+    commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup
+    cancel
+  setup_invalid_generator: '$2올바르지 않은 생성기 입니다. 가능한 옵션: %s'
+schematics:
+  schematic_missing_arg: '$2당신은 인수를 지정해야 합니다. 가능한 값: $1test <name>$2 , $1save$2 ,
+    $1paste $2, $1exportall'
+  schematic_invalid: '$2이것은 올바르지 않은 schematic파일 입니다. 사유: $2%s'
+  schematic_valid: $2이것은 올바른 schematic파일 입니다
+  schematic_paste_failed: $2schematic 적용에 실패하엿습니다
+  schematic_paste_success: $4schematic이 성공적으로 적용되었습니다
+  schematic_too_large: $2플롯이 너무 커서이 작업을 수행 할 수 없습니다!
+titles:
+  title_entered_plot: '$1Plot: %world%;%x%;%z%'
+  title_entered_plot_sub: $4에게 소유 된 %s
+  prefix_greeting: '$1%id%$2> '
+  prefix_farewell: '$1%id%$2> '
+core:
+  task_start: 작업을 시작합니다...
+  prefix: $3[$1P2$3] $2
+  enabled: $1PlotSquared 가 실행됩니다
+reload:
+  reloaded_configs: $1번역 파일 및 월드 설정 파일이 성공적으로 리로드 되었습니다
+  reload_failed: $2설정파일의 리로드에 실패하였습니다
+desc:
+  desc_set: $2Plot 설명 설정
+  desc_unset: $2Plot 설명 설정취소
+  missing_desc: $2당신은 설명을 지정해야 합니다
+alias:
+  alias_set_to: $2땅의 별명을 $1%alias%로 성정합니다
+  missing_alias: $2당신은 별명을 설정해야 합니다
+  alias_too_long: $2별명은 50자 이내여야 합니다
+  alias_is_taken: $2이 별명은 이미 존재합니다
+  alias_removed: $2플롯 별칭이 제거되었습니다
+position:
+  missing_position: '$2당신은 위치를 지정해야합니다. 가능한 값: $1none'
+  position_set: $1Home 위치를 현재 위치로 지정합니다
+  position_unset: $1Home 위치를 기본위치로 초기화 합니다
+  home_argument: $2다음 명령어를 사용하십시오 /plot set home [none]
+  invalid_position: $2해당 위치는 유효하지 않습니다
+time:
+  time_format: $1%시간%, %분%, %초%
+permission:
+  no_schematic_permission: $2당신은 schematic을 이용하기 위한 권한이 없습니다 $1%s
+  no_permission: '$2당신은 해당 퍼미션 노드가 존재하지 않습니다: $1%s'
+  no_permission_event: '$2당신은 해당 퍼미션 노드가 존재하지 않습니다: $1%s'
+  no_plot_perms: $2이 행동을 하기 위해선 반드시 땅의 소유자여야 합니다
+  cant_claim_more_plots: $2당신은 더 많은 땅들을 소유할 수 없습니다
+  cant_transfer_more_plots: $2당신은 해당 유저에게 더 많은 땅을 보낼 수 없습니다
+  cant_claim_more_plots_num: $2당신은 한번에 $1%s $2plots보다 더 많이 소유할 수 없습니다
+  you_be_denied: $2당신은 이 땅에 들어갈 수 없습니다
+  merge_request_confirm: 병합요청이 들어왔습니다 %s
+  cant_claim_more_clusters: $2더 많은 클러스터를 청구 할 수 없습니다.
+merge:
+  merge_not_valid: $2이 병합 요청은 더이상 유효하지 않습니다
+  merge_accepted: $2병합 요청이 수락되었습니다
+  success_merge: $2땅이 병합되었습니다
+  merge_requested: $2병합요청이 성공적으로 전송되었습니다
+  no_perm_merge: '$2당신은 이 땅의 소유자가 아닙니다: $1%plot%'
+  no_available_automerge: $2당신은 지정한 방향으로 인접한 plots를 소유하지 않았거나 plots를 필요한 크기로 합병 할
+    수 없습니다.
+  unlink_required: $2An unlink는 이것을 하는데 요구 됩니다.
+  unlink_impossible: $2당신은 오직 mega-plot만 unlink 할 수 있습니다
+  unlink_success: $2성공적으로 plots을 unlink 하였습니다.
+errors:
+  invalid_player_wait: '$2플레이어를 찾지 못했습니다: $1%s$2, fetching it. 잠시 후 시도해주세요.'
+  invalid_player_offline: '$2플레이어는 반드시 접속 중이어야 합니다: $1%s.'
+  invalid_player: '$2플레이어를 찾지 못했습니다: $1%s.'
+  command_went_wrong: $2해당 명령어를 실행 중 오류가 발생 하였습니다...
+  no_free_plots: $2그곳에는 사용가능한 Free Plot이 없습니다
+  not_in_plot: $2당신은 땅에 있지 않습니다
+  not_in_cluster: $2당신은 그 행동을 하기 위해서 plot cluster 내부에 있어야만 합니다.
+  not_in_plot_world: $2당신은 plot world에 있지 않습니다.
+  plotworld_incompatible: $2해당 월드는 호환되지 않습니다
+  not_valid_world: $2옳바르지 않은 World 입니다
+  not_valid_plot_world: $2올바르지 않은 plot world 입니다 (case sensitive)
+  no_plots: $2당신은 어떤 땅도 가지고 있지 않습니다
+  wait_for_timer: $2A setblock 타이머는 현재의 땅 또는 당신에게 묶여있습니다. 완료까지 잠시 기다려주시기 바랍니다
+  invalid_command_flag: '$2잘못된 명령 플래그: %s0'
+  error: '$2오류가 발생했습니다: %s'
+  not_loaded: $2플롯을로드 할 수 없습니다
+paste:
+  debug_report_created: '$1전체 디버그를에 업로드했습니다.: $1%url%'
+purge:
+  purge_success: $4%s 땅들을 성공적으로 제거하였습니다
+trim:
+  trim_in_progress: 최적화 작업이 이미 진행중입니다!
+  not_valid_hybrid_plot_world: 이 행동을 위하여 hybrid plot manager가 필요합니다.
+block list:
+  block_list_separater: '$1,$2 '
+biome:
+  need_biome: $2당신은 유효한 생태계를 지정해야 합니다.
+  biome_set_to: $2플롯 생물 설정 $2
+teleport:
+  teleported_to_plot: $1당신은 이동 되었습니다.
+  teleported_to_road: $2당신은 길로 이동 되었습니다.
+  teleport_in_seconds: $1%s초 후 이동됩니다. 움직이지 마세요...
+  teleport_failed: $2이동이 움직임 또는 데미지 때문에 취소되었습니다.
+set block:
+  set_block_action_finished: $1마지막 setblock 행동이 이제 끝났습니다.
+unsafe:
+  debugallowunsafe_on: $2안전하지 않은 행동을 허가합니다
+  debugallowunsafe_off: $2안전하지 않은 행동을 차단합니다
+debug:
+  debug_header: $1Debug Information&-
+  debug_section: $2>> $1&l%val%
+  debug_line: $2>> $1%var%$2:$1 %val%&-
+invalid:
+  not_valid_data: $2그것은 유효한 데이터 ID가 아닙니다.
+  not_valid_block: '$2그것은 유효한 블록이 아닙니다.: %s 그것은 유효한 블록이 아닙니다.'
+  not_allowed_block: '$2그 블록은 허락되지 않았습니다 : %s'
+  not_valid_number: $2그것은 %s범위내에서 유효하지 않은 숫자입니다.
+  not_valid_plot_id: $2그 땅의 ID는 유효하지 않습니다.
+  plot_id_form: '$2땅의 ID는 반드시 형식에 있어야 합니다: $1X;Y $2e.g. $1-5;7'
+  not_your_plot: $2그것은 당신의 땅이 아닙니다.
+  no_such_plot: $2거기엔 어떤 땅도 없습니다.
+  player_has_not_been_on: $2해당 플레이어는 plotworld에 없습니다.
+  found_no_plots: $2당신의 검색에서 아무 땅도 발견하지 못했습니다
+  found_no_plots_for_player: '$2No plots found for player: %s'
+camera:
+  camera_started: $2당신은 땅을 위한 카메라 모드에 입장했습니다 $1%s
+  camera_stopped: $2카메라 모드를 종료합니다
+need:
+  need_plot_number: $2당신은 땅의 번호 또는 별칭을 지정해야합니다.
+  need_block: $2당신은 블록을 지정해야합니다
+  need_plot_id: $2당신은 Plot ID를 지정할 수 있습니다
+  need_plot_world: $2당신은 Plot world를 지정할 수 있습니다
+  need_user: $2당신은 유저이름을 지정할 필요가 있습니다
+info:
+  none: None
+  unknown: Unknown
+  everyone: Everyone
+  plot_unowned: $2이 행동을 실행하기 위해선 현재 plot에 소유자가 있어야 합니다
+  plot_info_unclaimed: $2땅 $1%s$2 이 아직 판매되지 않았습니다
+  plot_info_header: $3&m---------&r $1INFO $3&m---------
+  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Owner: $2%owner%$1&-$1Biome:
+    $2%biome%$1&-$1Can Build: $2%build%$1&-$1Rating: $2%rating%&-$1Trusted: $2%trusted%$1&-$1Members:
+    $2%members%$1&-$1Denied: $2%denied%$1&-$1Flags: $2%flags%'
+  plot_info_footer: $3&m---------&r $1INFO $3&m---------
+  plot_info_trusted: $1Trusted:$2 %trusted%
+  plot_info_members: $1Members:$2 %members%
+  plot_info_denied: $1Denied:$2 %denied%
+  plot_info_flags: $1Flags:$2 %flags%
+  plot_info_biome: $1Biome:$2 %biome%
+  plot_info_rating: $1Rating:$2 %rating%
+  plot_info_owner: $1Owner:$2 %owner%
+  plot_info_id: $1ID:$2 %id%
+  plot_info_alias: $1Alias:$2 %alias%
+  plot_info_size: $1Size:$2 %size%
+  plot_user_list: ' $1%user%$2,'
+  info_syntax_console: $2/plot info X;Y
+  now: 지금
+  never: 못
+  plot_info_seen: $1Seen:$2 %seen%
+  plot_flag_list: $1%s0:%s1$2
+working:
+  generating_component: $1당신의 설정값으로부터 component 생성을 시작합니다
+  clearing_plot: $2플롯 비동기 지우기.
+  clearing_done: $4명확한 완료. 했다 %sms.
+  plot_not_claimed: $2땅이 판매되지 않았습니다
+  plot_is_claimed: $2이 땅은 이미 판매되었습니다
+  claimed: $4성공적으로 땅을 판매하였습니다
+  deleting_done: $4삭제가 완료되었습니다! 가져왔다 %sms.
+list:
+  comment_list_header_paged: $2(페이지 $1%cur$2/$1%max$2) $1목록 %amount% 코멘트
+  clickable: ' (상호 작용하는)'
+  plot_list_header_paged: $2(페이지 $1%cur$2/$1%max$2) $1목록 %amount% plots
+  plot_list_header: $1목록 %word% plots
+  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
+  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
+  plot_list_footer: $2>> $1%word% 총 $2%num% $1claimed %plot%.
+  area_list_header_paged: $2(페이지 $1%cur$2/$1%max$2) $1목록f %amount% areas
+left:
+  left_plot: $2당신은 땅을 떠났습니다.
+chat:
+  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_forced: $이 월드는 모두가 plot chat을 쓰도록 강제합니다
+  plot_chat_on: $4플롯 채팅 사용 설정 됨.
+  plot_chat_off: $4플롯 채팅 사용 중지됨.
+  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+deny:
+  denied_removed: $4당신은 이 땅으로부터 플레이어를 차단 해제 했습니다.
+  denied_added: $4당신은 이 땅으로부터 플레이어를 성공적으로 차단 했습니다.
+  denied_need_argument: $2변수가 빠졌습니다. $1/plot denied add <name> $2or $1/plot denied
+    remove <name>
+  was_not_denied: $2해당 플레이어는 이 땅에서 차단되지 않았습니다.
+  you_got_denied: $4당신은 해당 땅으로부터 차단되었습니다 따라서 spawn으로 자동 이동 되었습니다.
+rain:
+  need_on_off: '$2당신은 올바른 값을 선택하여야 합니다. 가능한 값: $1on$2, $1off'
+  setting_updated: $4당신은 설정을 성공적으로 업데이트 했습니다
+flag:
+  flag_key: '$2Key: %s'
+  flag_type: '$2Type: %s'
+  flag_desc: '$2Desc: %s'
+  not_valid_flag: $2그것은 유효한 깃발이 아닙니다
+  not_valid_value: $2깃발 값은 무조건 문자 숫자여야만 한다
+  flag_not_in_plot: $2그땅은 그 깃발을 가지고 있지 않습니다
+  flag_not_removed: $2그 깃발은 제거될 수 없습니다
+  flag_not_added: $2그 깃발은 추가될 수 없습니다
+  flag_removed: $4깃발이 성공적으로 제거되었습니다
+  flag_added: $4깃발이 성공적으로 추가되었습니다
+  not_valid_flag_suggested: '$2That is not a valid flag. Did you mean: $1%s'
+trusted:
+  trusted_added: $4당신은 그 땅에 유저를 성공적으로 위탁했습니다
+  trusted_removed: $4당신은 그 땅으로부터 신용(위탁)받은 유저를 성공적으로 제거했습니다.
+  was_not_added: $2그 플레이어는 이 땅에서 신용(위탁)받지 못했습니다.
+  plot_removed_user: $1당신이 추가되었던 땅 %s가 소유자의 비활성의 이유로 삭제되었습니다.
+member:
+  removed_players: $2이 땅으로부터 %s 플레이어가 제거되었습니다
+  already_owner: $2해당 유저는 이미 땅의 주인입니다
+  already_added: $2그 유저는 그 카테고리에 이미 추가되었습니다.
+  member_added: $4그 유저는 이제 그 땅의 소유자가 온라인에 있는 동안 지을 수 있습니다.
+  member_removed: $1당신은 땅으로부터 유저를 성공적으로 제거되었습니다.
+  member_was_not_added: $2그 플레이어는 이 땅에 유저로서 추가되지 않았습니다
+  plot_max_members: $2당신은 이 땅에 어떤 플레이어를 더 추가 할 수 없습니다
+owner:
+  set_owner: $4당신은 땅의 소유자를 성공적으로 설정했습니다
+  now_owner: $4당신은 이제 %s땅의 소유자입니다
+  set_owner_cancelled: $2The setowner action was cancelled
+signs:
+  owner_sign_line_1: '$1ID: $1%id%'
+  owner_sign_line_2: '$1소유자:'
+  owner_sign_line_3: $2%plr%
+  owner_sign_line_4: $3Claimed
+help:
+  help_header: $3&m---------&r $1Plot² 도움말 $3&m---------
+  help_page_header: '$1범주: $2%category%$2,$1 페이지: $2%current%$3/$2%max%$2'
+  help_footer: $3&m---------&r $1Plot² 도움말 $3&m---------
+  help_info_item: $1/plot help %category% $3- $2%category_desc%
+  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
+  direction: '$1현재 방향: %dir%'
+'-':
+  custom_string: '-'
+commandconfig:
+  not_valid_subcommand: $2이것은 유효하지 않은 하위 명령어 입니다
+  did_you_mean: '$2이것을 명령어를 의미하나요: $1%s'
+  name_little: $2%s0 아름이 너무 짧습니다, $1%s1$2<$1%s3
+  no_commands: $2죄송합니다 당신은 하위명령어 사용을 허가받지 못했습니다.
+  subcommand_set_options_header: '$2Possible Values: '
+  command_syntax: '$1Usage: $2%s'
+  flag_tutorial_usage: '$1관리자에게 국기를 설정하게하십시오: $2%s'
+bar api: {}
+set:
+  set_attribute: $4설정 완료 %s0 로 설정 %s1
+cap:
+  entity_cap: $2더 많은 몹을 스폰하는 것은 허용되지 않습니다.
+near:
+  plot_near: '$1선수: %s0'
+kick:
+  you_got_kicked: $4너는 쫓겨났다
+grants:
+  granted_plots: '$1결과: $2%s $1grants left'
+  granted_plot: $1You granted %s0 plot to $2%s1
+  granted_plot_failed: '$1Grant failed: $2%s'
diff --git a/Bukkit/src/main/resources/mycommand.js b/Bukkit/src/main/resources/mycommand.js
new file mode 100644
index 000000000..e5a3f27c3
--- /dev/null
+++ b/Bukkit/src/main/resources/mycommand.js
@@ -0,0 +1,2 @@
+// This command is registered from the start.js file which is run during startup
+PlotPlayer.sendMessage("Hello World!");
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/plugin.properties b/Bukkit/src/main/resources/plugin.properties
new file mode 100644
index 000000000..9ff2dd711
--- /dev/null
+++ b/Bukkit/src/main/resources/plugin.properties
@@ -0,0 +1,3 @@
+version=${version}
+commit=${commit}
+date=${date}
diff --git a/Bukkit/src/main/resources/setbiomes.js b/Bukkit/src/main/resources/setbiomes.js
new file mode 100644
index 000000000..b3d1dd4ff
--- /dev/null
+++ b/Bukkit/src/main/resources/setbiomes.js
@@ -0,0 +1,12 @@
+/*
+This script will reset all biomes in claimed plots
+*/
+var plots = PS.sortPlots(PS.getPlots());
+for (var i = 0; i < plots.size(); i++) {
+    var plot = plots.get(i);
+    if (!plot.isMerged() || !plot.getMerged(0)) {
+        plot.setBiome("%s0", null);
+        PS.class.static.log('&cSetting biome for: ' + plot);
+    }
+    java.lang.Thread.sleep(1000);
+}
diff --git a/Bukkit/src/main/resources/skyblock.template b/Bukkit/src/main/resources/skyblock.template
new file mode 100644
index 0000000000000000000000000000000000000000..1801175de6ef386cdbffe98679a3ca4f2fdee3ff
GIT binary patch
literal 1127
zcmWIWW@Zs#;Nak35SkY4#()GYf$ZYsjMUu3lFa1d7<X5{_#l5rm-t|34_9Bu5Krfr
z`1lZ4-+*`*&!G7Dn1Y=A5<R$j#$}9=|Kz(lpys`u;_ZLPL8SHl6tP=ut{!)OYsc&e
zR=CLWm`PYp+L*`LdLh3P`{IB3cP001)#c#|HBdQLVb*^6_WLa}za%wZP1F0nQe+K7
z*z!taDc6`XMu*J@a@c}A4k}9<&q#<3KDoT9N>JkYy(3GdMD%wS#BgqN`u^<m&&`v5
z8_s>QvcToS;S*Et9Q_^dy}*3Ml8VQie_o4w+|J&;@A|j>x~ZkVc3A0)P04RPel=B9
zOd@>J@AnHcn$+3?zPcW`Ii>H3B==v=UZt4(Y+qL%7Gzi~caF)E<3+Cil#jcPUw9}a
z)xsF>{6f<)=#fVyPioP$?;^UXTHa}=ej4y=E;(^fNHFJab!x*rrsLiR7JvVeXONt%
zSL~q7+Pmwta%R&#uA3HiwVztrvliJedi{d`qvGR3BGEPlOSreOxw-RvoF3WqsI@(2
z$-j*gTeVz5&3yKJQq2GGqxr^yoE=japIXJGQs{K*q`~J;-({BShFl0qJ-oKY_3HWQ
z`>tf3%b9NHY8sN&86I9_c7K`P`t{pV=U<u=wRPL1^02Vr-;wvFt!#6j_5&j*z?+?8
z`pu|gs~H&>mH}}9I7Kipa4?kcv$_{;pZDGdC|btEz#s;U&63pIf}F&X)MEXT+ydQ{
z#F9k4%G{jTfP;RA4S4px*Dku9xncoh(7OUxrgx#UcI37QhkNeIQursU9=m;7%%tyc
zz9;Qx)I2#?!1l&E{~#M#NtfTeK{E0`ZbrGh-hHP?VCov9R+mIylLV%h`kGO#f<}oa
zHy(U_`}gVN>dCSWsw)=1t(l_KYG}UFFz~HH$p#MfR*lUvo1@L*9o7a$vM-ykeI?f&
zK6#IsZww<RSFOum75(0h|D?!&ugeD~mp_o=__(dTF|7AQ5U-u%jf0)<bvm18)zocB
zWH7Kf9eR{~7w?s1pC{|O`IjfIJNIChUB;&;=WdquY{=pabDmRw+H%9?+R(e9tsMtu
zc0NDOty8J@wUcR<kOnJrVqwoN_T`hV7Wqy3{k_iRj<Jfpd+kfz)lJ*p?)(>jaj#Zj
zLpX0!<O{LT<DCEgyxZfI91vlh^=i^}ttIvW-i%Bl42V3492cNGhzj62jMN+nvc?{0
z4fcptf!d+~q=kS{jXj#V7(nt242%pC40<ayCZ0QYfzc&b_xo8SI>4Ki4Wxz%2+srQ
ICT0*10BLf<asU7T

literal 0
HcmV?d00001

diff --git a/Bukkit/src/main/resources/start.js b/Bukkit/src/main/resources/start.js
new file mode 100644
index 000000000..f58be7459
--- /dev/null
+++ b/Bukkit/src/main/resources/start.js
@@ -0,0 +1,7 @@
+// Add your commands to this list
+var commands = ["mycommand"];
+
+// Command registration:
+for (var i in commands) {
+    MainCommand.class.static.onCommand(PlotPlayer, "plot", "debugexec", "addcmd", commands[i] + ".js");
+}
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/town.template b/Bukkit/src/main/resources/town.template
new file mode 100644
index 0000000000000000000000000000000000000000..f655fbd0a11b4b4b97ddac0914dc9bba7d4b348c
GIT binary patch
literal 1771
zcmbVNc~BBq9L6iCJn+b-n#8uuR?V!mGBrcZ3lA){#v>%9Gz2eFbG=s0ifqk1(2P7r
zSKaa;HOd3ZD<ko~6-m=nj1=(#MHhE=(rwzEX}>qWnfLy9@6G#u-}gN@OiWw>00Myk
zs5{Q4fK4zE&I8;%Q5Yo7%RRuw?3@kaye-rOalzR9oHf+m!q^3Yus>%FN0?ZgM<84R
zygX3;K1dJEuX_@wKe<Ill7m{7w*v7chIg7V3KfHutC{467^$6sR-Pm#y#ZTJ@*2KI
z3JN+|1zvq)haTEHGQpkiEzn~yBg`I$@mf8b1-i~<J~JzfBFa+Nu#~!>crWD!|6^Ms
z)j+o{qNVGIG?}^B#4026sI7$J+3IE5qJByk!f%j2^p-Mf=mKM-DGXwLby#{Yl}Vr(
z75VTgY#NtejO`^5VL>rlJPzB)616e(ENjAx&@N{KBn+S5+a9@N^;Z&M96P{PIYvxg
zYm9HfGhiVsz45C<zcEJr_(1Z_#i!1Fzg(<TFb(&eAQ70Oeyq21O=|&Sb^0n(kbbR|
z#~*g%yw61BSh65m$A_YrZ!}RON%1X2sM>2QPC%19SWOx4Y<OHBnjd*6JoUv*PBI(V
z#JF$Uk}4OHt<(82t~=4#NzE(UWf(FVMEqhWD;L;$A?;LjmN|(FdLJtlMeQapr<l${
zGD5TZXEJVeRxAXKpD=F_7*ZB3b@jw*n+S-hK$b>TJI|7qTUNGY_S7ZoQ=;f_UWd{x
z-J;J@r#WzT64qnNp}11LTPOBOZ^lm*KK%I0Z`GwLMcoI2Wi%95H3J2O&OiI~V*R#Q
z&A5$BEzB_yL4(if5#`>*es6AJHMfWE)3-Z({#wq_o)sQuO`4J(#(O^QkoHob(h^a<
zw17@zu(*Qh#cnpK(TU2cN}s-OKzO=p#vM0vD2-qU5~+?@NXJE9|Lc@xNl5@41_U*G
zO$_RY0st1mg8!>N6@~i5p)kJQNE|BQ2oB?W*aL|}YTm?nyC&FPh}HtvPlw_MPfec1
zup3>APj~Cd*T@}<J%D|9tcz2bZm7^UKp~8=zsT$_M{hGS1&89KUNM2ldR6V5Gxk|Z
zF-b<8-T-4-MFGvzve1td*vHB=qYv#FX*KRNvfVd2$(!fQDQX*MN;|2)e2$i%w;{_b
z%Mitq74d17yQ1~dYG{J+yYUsMhxo1h&pl&Tt8bLk_vL#*O0Tw69v$S)tTj(P;0NzC
z{FDhOcu#nB@2=z(i97cBv7e)~+PRmg;@CVHTUownbEcdLdg9p?*=*TN+k0b`*}#=}
zkD=2Bg&IwLE0jlEOYv04kczrXKFE%!s9)(Fa)c6$1H<uM30UjlM`XhGk(D#(q`R;@
z60qu^(}@}rqMLQYZa!=*Hx6EYogmvY*$t4d%@wTGm_C9>W)tHg)CQt+^j8*&r;Y5!
z6KH|$uIa%TWx-#4Dc*Iw+Fk?zxc{Ghf&N%-cwuoU{{WOb&dUe8ksTu2Mdnr^_dtK=
z5&Jw8TcZVj{JV}@T_N*>eBs#<c%8_BLnqaB-r*lO)=@comaGt+G0G#)T<dPZCYL@C
zIbZtq{2~5Ic_Dd{^{%+fr7gkEfVRcjtQdo0IkQ}8qQN0vLSlGa;f);`rPtptU!syR
zx2YZyA+8~2bl%iJ*Umf)OyuHil~%Xls3RgSVyUsz*w=AT)gn>}P}jk9+5#m}2U|$~
zL-UC#EuTeYUXP0K1-&VlIZzbruoxXFFG3Y9vXoRzn)JgqKG5VRYqX&`AmT})>cM*M
z{!xGZ0q<=X$F780<{nC3%&d+cBE!jATcrRxnlsz(KvYYavvb8mR0GMF$SvzO0D{at
z!4qI1{o92Fhlz+P05*bqvt`zU`=9t4$^R$DzrAX+3f4WiflQ$;zVFCy&)EEwb-irh
cl=u(*I^S0h93~;;3;+-l4kaO5WQq0FpAlUTS^xk5

literal 0
HcmV?d00001

diff --git a/Bukkit/src/main/resources/zh-CN.yml b/Bukkit/src/main/resources/zh-CN.yml
new file mode 100644
index 000000000..4afc3564a
--- /dev/null
+++ b/Bukkit/src/main/resources/zh-CN.yml
@@ -0,0 +1,407 @@
+# This file is translated by c7w, w/1345979462 and 佛壁灯(f0rb1d)
+# Translation Guide
+# 1. 句子与变量、命令、数字之间保留空隙，全角符号除外
+# 2. 使用已成功/已复制/正在/未启用/已启用/请使用开头
+# 3. 使用阁下（其实好像也无所谓）
+# 4. 失败/成功/无效应放在句末
+# 就差不多这些
+confirm:
+  expired_confirm: $2确认已过期，请重新执行命令！
+  failed_confirm: $2阁下没有待确认的操作！
+  requires_confirm: '$2阁下是否确定执行：$1%s$2?&-$2此操作无法恢复！若阁下确定，请输入：$1/plot confirm'
+move:
+  move_success: $4已成功移除地皮。
+  copy_success: $4已成功复制地皮。
+  requires_unowned: $2指定地点已被占用。
+set:
+  set_attribute: $4已成功设置 %s0 为 %s1
+web:
+  generating_link: $1正在处理地皮···
+  generating_link_failed: $2生成下载链接失败！
+  save_failed: $2保存失败
+  load_null: $2请使用 $4/plot load$2 获取布局列表
+  load_failed: $2载入布局失败
+  load_list: '$2要载入布局，请使用 $1/plot load #'
+  save_success: $1已成功保存！
+compass:
+  compass_target: $4已成功将指南针指向地皮
+cluster:
+  cluster_available_args: '$1以下子指令可用：$4list$2, $4create$2,
+    $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2,
+    $4tp$2, $4sethome'
+  cluster_list_heading: $2此世界中有 $1%s$2 个群集
+  cluster_list_element: $2 - $1%s&-
+  cluster_intersection: '$计划的区域与%s0重叠'
+  cluster_outside: '$2计划的区域在地皮区域%s0外'
+  cluster_added: $4已成功创建群集。
+  cluster_deleted: $4已成功删除群集。
+  cluster_resized: $4已成功调整群集尺寸。
+  cluster_added_user: $4已成功将玩家添加到群集。
+  cannot_kick_player: $2阁下无法踢出此玩家
+  cluster_invited: '$1阁下已被邀请至群集 $2%s'
+  cluster_removed: '$1阁下已被群集 $2%s $1移除'
+  cluster_kicked_user: $4已成功踢出此玩家
+  invalid_cluster: '$1群集名 $2%s 无效'
+  cluster_not_added: $2此玩家未被添加至地皮群集
+  cluster_cannot_leave: $1阁下必须在离开前先删除群集或转移所有权
+  cluster_added_helper: $4已成功将帮手添加到群集
+  cluster_removed_helper: $4已成功将帮手从群集移除
+  cluster_regenerated: $4已成功开始群集重生
+  cluster_teleporting: $4正在传送···
+  cluster_info: '$1当前群集：$2%id%&-$1名称：$2%name%&-$1所有者：$2%owner%&-$1大小：
+    $2%size%&-$1权限：$2%rights%'
+border:
+  border: $2阁下处于当前地图边界外
+unclaim:
+  unclaim_success: $4阁下已成功解除认领地皮。
+  unclaim_failed: $2无法解除认领地皮
+worldedit masks:
+  worldedit_delayed: $2请在我们处理阁下的WorldEdit操作时稍等片刻···
+  worldedit_run: '$2很抱歉造成了延迟。现正执行：%s'
+  require_selection_in_mask: $2选中的 %s 不在阁下的地皮覆盖范围内。
+    阁下仅可对自己的地皮做出修改。
+  worldedit_volume: $2阁下无法选择 %current% 体积。阁下可编辑的最大
+    体积为 %max%。
+  worldedit_iterations: $2阁下无法重复 %current% 次。容许的最大
+    重复次数为 %max%。
+  worldedit_unsafe: $2已禁止对此命令的访问
+  worldedit_bypass: $2&o要绕过对阁下的限制，请使用 $4/plot wea
+  worldedit_bypassed: $2当前正绕过WorldEdit功能限制。
+  worldedit_unmasked: $1阁下的WorldEdit功能现已解除限制。
+  worldedit_restricted: $1阁下的WorldEdit功能现已受限制。
+gamemode:
+  gamemode_was_bypassed: $1阁下绕过了为 $2{plot} $1设置的游戏模式（$2{gamemode}$1）限制
+height limit:
+  height_limit: $1此地皮拥有高度 $2{limit} 的限制
+records:
+  record_play: $2%player $2已开始游玩记录 $1%name
+  notify_enter: $2%player $2已进入阁下的地皮（$1%plot$2）
+  notify_leave: $2%player $2已离开阁下的地皮（$1%plot$2）
+swap:
+  swap_overlap: $2计划的区域不允许重叠
+  swap_dimensions: $2计划的区域必须有可对比的维度
+  swap_syntax: $2/plot swap <编号>
+  swap_success: $4已成功交换地皮
+  started_swap: $2已开始地皮交换任务。阁下将会在完成时收到提醒
+comment:
+  inbox_notification: '%s 条未读消息。请使用 /plot inbox 阅读'
+  not_valid_inbox_index: $2索引 %s 处无评论
+  inbox_item: $2 - $4%s
+  comment_syntax: $2请使用 /plot comment [X;Z] <%s> <评论>
+  invalid_inbox: '$2此收件箱无效。&-$1接受的值：%s'
+  no_perm_inbox: $2阁下没有此收件箱的权限
+  no_perm_inbox_modify: $2阁下没有编辑此收件箱的权限
+  no_plot_inbox: $2阁下必须站在地皮内或提供地皮参数
+  comment_removed: $4已成功删除评论$2 - '$3%s$2'
+  comment_added: $4有玩家留下了一条评论
+  comment_header: $2&m---------&r $1评论 $2&m---------&r
+  inbox_empty: $2无评论
+console:
+  not_console: $2由于安全考虑，此命令只可由控制台执行。
+  is_console: $2此命令只可被玩家执行。
+inventory:
+  inventory_usage: '&c用法：&6{usage}'
+  inventory_desc: '&c描述：&6{desc}'
+  inventory_category: '&c分类：&6{category}'
+clipboard:
+  clipboard_set: $2当前地皮已复制到阁下的剪贴板，请使用 $1/plot paste$2 粘贴
+  pasted: $4已成功粘贴选择项并已从剪贴板中清除。
+  paste_failed: '$2无法粘贴选择项。理由：$2%s'
+  no_clipboard: $2阁下的剪贴板内无选择项
+  clipboard_info: '$2当前选择项 - 地皮编号：$1%id$2, 宽度：$1%width$2, 方块
+    总数： $1%total$2'
+toggle:
+  toggle_enabled: '$2已启用设置：%s'
+  toggle_disabled: '$2已禁用设置：%s'
+blocked command:
+  command_blocked: $2此地皮中不允许使用此命令
+done:
+  done_already_done: $2此地皮已被标记为已完成
+  done_not_done: $2此地皮未标记为已完成。
+  done_insufficient_complexity: $2此地皮过于简单。请在使用此命令前添加更多的细节。
+  done_success: $1已成功标记此地皮为已完成。
+  done_removed: $1阁下现在可以在此地皮中继续建造了。
+ratings:
+  ratings_purged: $2已清除此地皮的评分
+  rating_not_valid: $2阁下需要指定介于 1 到 10 之间的数字
+  rating_already_exists: $2阁下已评价过地皮 $2%s
+  rating_applied: $4阁下已成功评价地皮 $2%s
+  rating_not_your_own: $2阁下无法评价自己的地皮
+  rating_not_done: $2阁下仅可评价已完成的地皮。
+  rating_not_owned: $2阁下无法评价尚未被任何玩家拥有的地皮
+tutorial:
+  rate_this: $2评价此地皮！
+  comment_this: '$2请为地皮 %s 留下反馈'
+economy:
+  econ_disabled: $2未启用经济系统
+  cannot_afford_plot: $2阁下无法购买此地皮。此地皮价值 $1%s
+  not_for_sale: $2此地皮恕不出售
+  cannot_buy_own: $2阁下无法购买自己的地皮
+  plot_sold: $4阁下的地皮 $1%s0$4 已以 $1$%s2$4 的价格售给了 $1%s1
+  cannot_afford_merge: $2阁下无法合并地皮。此操作花费 $1%s
+  added_balance: $1%s $2已转入您的余额
+  removed_balance: $1%s $2已从您的余额中转出
+  removed_granted_plot: $2阁下已使用了授予的 %s 块地皮，剩余 $1%s $2块
+setup:
+  setup_init: '$1用法：$2/plot setup <值>'
+  setup_step: '$3[$1步骤 %s0$3] $1%s1 $2- $1预期值：$2%s2 $1默认值：$2%s3'
+  setup_invalid_arg: '$2%s0 不是步骤 %s1 的有效参数。要取消配置
+    请使用：$1/plot setup cancel'
+  setup_valid_arg: $2值 $1%s0 $2已设置为 %s1
+  setup_finished: $4阁下应已被传送至新建的世界。否则阁下将需
+    在 bukkit.yml 或世界管理插件中手动设置生成器。
+  setup_world_taken: $2%s 已是一个世界
+  setup_missing_world: $2阁下需要指定世界名（$1/plot setup &l<世界名>$1
+    <生成器>$2）&-$1附加指令：&-$2 - $1/plot setup <值>&-$2 - $1/plot
+    setup back&-$2 - $1/plot setup cancel
+  setup_missing_generator: $2阁下需要指定生成器（$1/plot setup <世界名>
+    &l<生成器>&r$2)&-$1附加指令&-$2 - $1/plot setup <值>&-$2 - $1/plot
+    setup back&-$2 - $1/plot setup cancel
+  setup_invalid_generator: '$2无效的生成器。可能选项：%s'
+schematics:
+  schematic_too_large: $2此地皮过大无法进行此操作！
+  schematic_missing_arg: '$2阁下需要指定参数。可能的值：$1test
+    <名称>$2 , $1save$2 , $1paste $2, $1exportall'
+  schematic_invalid: '$2布局无效。理由：$2%s'
+  schematic_valid: $2布局无效
+  schematic_paste_failed: $2粘贴布局失败
+  schematic_paste_success: $4已成功粘贴布局
+titles:
+  title_entered_plot: '$1地皮：%world%;%x%;%z%'
+  title_entered_plot_sub: $4由 %s 所有
+  prefix_greeting: '$1%id%$2> '
+  prefix_farewell: '$1%id%$2> '
+core:
+  task_start: 正在启动任务···
+  prefix: $3[$1P2$3] $2
+  enabled: $1%s0 现已启用
+reload:
+  reloaded_configs: $1已重载翻译及世界设置
+  reload_failed: $2重载文件配置失败
+desc:
+  desc_set: $2已设置地皮描述
+  desc_unset: $2已重置地皮描述
+  missing_desc: $2阁下需要指定描述
+alias:
+  alias_set_to: $2地皮别名已设置为 $1%alias%
+  alias_removed: $2已移除地皮别名
+  missing_alias: $2阁下需要指定别名
+  alias_too_long: $2别名长度必须小于 50 个字符
+  alias_is_taken: $2此别名已被占用
+position:
+  missing_position: '$2阁下需要指定位置。可能的值：$1none'
+  position_set: $1已设置家为阁下的当前位置
+  position_unset: $1已重置家为默认位置
+  home_argument: $2使用 /plot set home [无]
+  invalid_position: $2位置值无效
+cap:
+  entity_cap: $2阁下被禁止生成更多怪物
+time:
+  time_format: $1%hours%, %min%, %sec%
+permission:
+  no_schematic_permission: $2阁下没有使用布局的所需权限
+    $1%s
+  no_permission: '$2阁下缺少权限节点：$1%s'
+  no_permission_event: '$2阁下缺少权限节点：$1%s'
+  no_plot_perms: $2阁下必须为地皮所有者才能执行此操作
+  cant_claim_more_plots: $2阁下无法拥有更多地皮。
+  cant_claim_more_clusters: $2阁下无法拥有更多群集。
+  cant_transfer_more_plots: $2阁下无法赠予此用户更多地皮
+  cant_claim_more_plots_num: $2阁下无法同时拥有多于 $1%s $2块地皮
+  you_be_denied: $2阁下被禁止进入此地皮
+  merge_request_confirm: 来自 %s 的合并请求
+merge:
+  merge_not_valid: $2此合并请求已不再可用。
+  merge_accepted: $2此合并请求已被接受
+  success_merge: $2已合并地皮！
+  merge_requested: $2已成功发送合并请求
+  no_perm_merge: '$2阁下不是地皮 $1%plot% $2的所有者'
+  no_available_automerge: $2阁下在指定方向不拥有任何相邻的地皮
+    或阁下被禁止合并所需的大小。
+  unlink_required: $2需要解除关联才能执行此操作。
+  unlink_impossible: $2阁下只能解除关联大地皮
+  unlink_success: $2已成功将地皮解除关联。
+commandconfig:
+  not_valid_subcommand: $2此子命令无效
+  did_you_mean: '$2阁下的意思是否是：$1%s'
+  name_little: $2%s0 名称过短，$1%s1$2<$1%s3
+  no_commands: $2很抱歉，但阁下无法使用任何子命令。
+  subcommand_set_options_header: '$2可能的值：'
+  command_syntax: '$1用法：$2%s'
+  flag_tutorial_usage: '$1请让管理员设置标记：$2%s'
+errors:
+  invalid_player_wait: '$2未找到玩家：$1%s$2，正在获取。请稍后再试。'
+  invalid_player: '$2未找到玩家：$1%s$2.'
+  invalid_player_offline: '$2玩家 $1%s $2必须在线。'
+  invalid_command_flag: '$2无效的命令标记：%s0'
+  error: '$2发生了 %s 错误'
+  command_went_wrong: $2执行此命令时发生错误···
+  no_free_plots: $2无可用的免费地皮
+  not_in_plot: $2阁下不在地皮上
+  not_loaded: $2无法加载地皮
+  not_in_cluster: $2阁下必须在地皮群集上以进行此操作
+  not_in_plot_world: $2阁下不在地皮区域上
+  plotworld_incompatible: $2两个世界必须相互兼容
+  not_valid_world: $2世界无效（大小写敏感）
+  not_valid_plot_world: $2地皮区域无效（大小写敏感）
+  no_plots: $2阁下不拥有任何地皮
+  wait_for_timer: $2一个设置方块计时器已关联到当前地皮或阁下上。请等待此操作完成
+paste:
+  debug_report_created: '$1已上传完整调试日志至：$1%url%'
+purge:
+  purge_success: $4已成功清除了 %s 块地皮
+trim:
+  trim_in_progress: 世界修整任务正在进行中！
+  not_valid_hybrid_plot_world: 需要混合地皮管理以执行此操作
+block list:
+  block_list_separater: '$1,$2 '
+biome:
+  need_biome: $2阁下需要指定一个有效的生态群落。
+  biome_set_to: $2地皮生态群落被设置为 $2
+teleport:
+  teleported_to_plot: $1阁下已被传送
+  teleported_to_road: $2阁下已被传送到道路上
+  teleport_in_seconds: $1%s 秒后传送。请勿移动···
+  teleport_failed: $2传送由于移动或伤害取消
+set block:
+  set_block_action_finished: $1已完成最后一个设置方块操作。
+unsafe:
+  debugallowunsafe_on: $2已允许不安全的操作
+  debugallowunsafe_off: $2已禁用不安全的操作
+debug:
+  debug_header: $1调试信息&-
+  debug_section: $2>> $1&l%val%
+  debug_line: $2>> $1%var%$2:$1 %val%&-
+invalid:
+  not_valid_data: $2数据编号无效。
+  not_valid_block: '$2%s 不是有效的方块。'
+  not_allowed_block: '$2方块 %s 被禁止'
+  not_valid_number: '$2%s 不是区间内的有效数字'
+  not_valid_plot_id: $2地皮编号无效。
+  plot_id_form: '$2地皮编号必须为 $1X;Y 形式 $2例如:$1-5;7'
+  not_your_plot: $2此地皮不为阁下拥有
+  no_such_plot: $2没有此地皮
+  player_has_not_been_on: $2此玩家从未进入过地皮世界
+  found_no_plots: $2阁下的搜索查询未找到地皮
+  found_no_plots_for_player: '$2未找到玩家 %s 的地皮'
+camera:
+  camera_started: $2阁下已进入地皮 $1%s 的摄像模式
+  camera_stopped: $2阁下已不再处于摄像模式
+need:
+  need_plot_number: $2阁下必须指定地皮数字或别名
+  need_block: $2阁下必须指定方块
+  need_plot_id: $2阁下必须指定地皮编号。
+  need_plot_world: $2阁下必须指定地皮区域。
+  need_user: $2阁下必须指定用户名
+near:
+  plot_near: '$1玩家：%s0'
+info:
+  none: 无
+  now: 现在
+  never: 从不
+  unknown: 未知
+  everyone: 所有人
+  plot_unowned: $2当前地皮必须有所有者才能执行此操作
+  plot_info_unclaimed: $2地皮 $1%s$2 尚未被领取
+  plot_info_header: $3&m---------&r $1信息 $3&m---------
+  plot_info: '$1编号：$2%id%$1&-$1别名：$2%alias%$1&-$1所有者：$2%owner%$1&-$1生态群落：
+    $2%biome%$1&-$1可以建造：$2%build%$1&-$1评分：$2%rating%&-$1可见：$2%seen%&-$1受信：
+    $2%trusted%$1&-$1成员：$2%members%$1&-$1拒绝：$2%denied%$1&-$1标记：$2%flags%'
+  plot_info_footer: $3&m---------&r $1信息 $3&m---------
+  plot_info_trusted: $1受信：$2 %trusted%
+  plot_info_members: $1成员：$2 %members%
+  plot_info_denied: $1拒绝：$2 %denied%
+  plot_info_flags: $1标记：$2 %flags%
+  plot_info_biome: $1生态群落：$2 %biome%
+  plot_info_rating: $1评分：$2 %rating%
+  plot_info_owner: $1所有者：$2 %owner%
+  plot_info_id: $1编号：$2 %id%
+  plot_info_alias: $1别名：$2 %alias%
+  plot_info_size: $1大小：$2 %size%
+  plot_info_seen: $1可见：$2 %seen%
+  plot_user_list: ' $1%user%$2,'
+  plot_flag_list: $1%s0:%s1$2
+  info_syntax_console: $2/plot info X;Y
+working:
+  generating_component: $1已开始从阁下的设置中生成元件
+  clearing_plot: $2正在清除地皮异步。
+  clearing_done: $4已清除！此操作花费了 %s 毫秒。
+  deleting_done: $4已删除！此操作花费了 %s 毫秒。
+  plot_not_claimed: $2地皮未领取
+  plot_is_claimed: $2此地皮已被领取
+  claimed: $4阁下已成功领取地皮
+list:
+  comment_list_header_paged: $2（页面 $1%cur$2/$1%max$2） $1共计 %amount% 条评论
+  clickable: '（可交互）'
+  area_list_header_paged: $2（页面 $1%cur$2/$1%max$2） $1共计 %amount% 块区域
+  plot_list_header_paged: $2（页面 $1%cur$2/$1%max$2） $1共计 %amount% 块地皮
+  plot_list_header: $1共计 %word% 块地皮
+  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
+  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
+  plot_list_footer: $2>> $1%word% 共计 $2%num% $1领取了地皮 %plot%。
+left:
+  left_plot: $2阁下已离开地皮
+chat:
+  plot_chat_spy_format: '$2[$1地皮间谍$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_format: '$2[$1地皮老铁$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
+  plot_chat_forced: $2此世界强制所有人使用地皮聊天。
+  plot_chat_on: $4已启用地皮聊天。
+  plot_chat_off: $4已禁用地皮聊天。
+deny:
+  denied_removed: $4阁下已成功解禁此玩家进入地皮
+  denied_added: $4阁下已成功禁止此玩家进入地皮
+  denied_need_argument: $2缺少参数。$1/plot denied add <名称> $2或 $1/plot
+    denied remove <名称>
+  was_not_denied: $2此玩家未被此地皮封禁
+  you_got_denied: $4阁下已被禁止进入先前所在的地皮并已被传送至出生点
+kick:
+  you_got_kicked: $4阁下已被踢出！
+rain:
+  need_on_off: '$2阁下需要指定值。可能的值：$1on$2, $1off'
+  setting_updated: $4阁下已成功更新设置
+flag:
+  flag_key: '$2关键词：%s'
+  flag_type: '$2类型：%s'
+  flag_desc: '$2描述：%s'
+  not_valid_flag: $2标记无效
+  not_valid_flag_suggested: '$2标记无效。阁下的意思是否是：$1%s'
+  not_valid_value: $2标记值必须为字母数字混合编制
+  flag_not_in_plot: $2此地皮不拥有此标记
+  flag_not_removed: $2无法移除此标记
+  flag_not_added: $2无法添加此标记
+  flag_removed: $4已成功移除标记
+  flag_added: $4已成功添加标记
+trusted:
+  trusted_added: $4阁下已成功将用户添加到地皮受信列表
+  trusted_removed: $4阁下已成功将用户从地皮受信列表中移除
+  was_not_added: $2此用户在此地皮上不受信任
+  plot_removed_user: $1阁下所添加至的地皮 %s 由于所有者不活跃已被删除
+member:
+  removed_players: $2已从此地皮中移除了 %s 位玩家。
+  already_owner: '$2此玩家已是地皮所有者：%s0'
+  already_added: '$2此玩家已被添加到此分类：%s0'
+  member_added: $4此用户现已可以在地皮所有者在线时建造
+  member_removed: $1阁下已成功从此地皮中移除了用户
+  member_was_not_added: $2此玩家并未被添加到此地皮的用户列表
+  plot_max_members: $2阁下被禁止添加更多玩家至此地皮
+owner:
+  set_owner: $4阁下已成功设置地皮所有者
+  now_owner: $4阁下现在是地皮 %s 的所有者
+signs:
+  owner_sign_line_1: '$1编号：$1%id%'
+  owner_sign_line_2: '$1所有者：'
+  owner_sign_line_3: $2%plr%
+  owner_sign_line_4: $3已被领取
+help:
+  help_header: $3&m---------&r $1Plot² 帮助 $3&m---------
+  help_page_header: '$1分类：$2%category%$2,$1 页面：$2%current%$3/$2%max%$2'
+  help_footer: $3&m---------&r $1Plot² 帮助 $3&m---------
+  help_info_item: $1/plot help %category% $3- $2%category_desc%
+  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
+  direction: '$1当前方向：%dir%'
+grants:
+  granted_plots: '$1结果：剩余 $2%s $1次授权'
+  granted_plot: $1阁下授权了 %s0 地皮至 $2%s1
+  granted_plot_failed: '$1授权失败：$2%s'
+'-':
+  custom_string: '-'
diff --git a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java
new file mode 100644
index 000000000..c2b81a729
--- /dev/null
+++ b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java
@@ -0,0 +1,51 @@
+package com.github.intellectualsites.plotsquared.plot;
+
+import com.github.intellectualsites.plotsquared.plot.database.AbstractDBTest;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtilTest;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+
+public class FlagTest {
+
+    private Object testBlock;
+    private Flag<? extends Collection<?>> use = Flags.USE;
+
+    @Before public void setUp() throws Exception {
+        EventUtil.manager = new EventUtilTest();
+        DBFunc.dbManager = new AbstractDBTest();
+    }
+
+    @Test public void flagTest() throws Exception {
+        Plot plot = new Plot(null, new PlotId(0, 0));
+        plot.owner = UUID.fromString("84499644-ad72-454b-a19d-f28c28df382b");
+        //plot.setFlag(use, use.parseValue("33,33:1,6:4")); //TODO fix this so FlagTest will run during compile
+        Optional<? extends Collection> flag = plot.getFlag(use);
+        if (flag.isPresent()) {
+            System.out.println(Flags.USE.valueToString(flag.get()));
+            testBlock = PlotBlock.get((short) 1, (byte) 0);
+            flag.get().add(testBlock);
+        }
+        flag.ifPresent(collection -> System.out.println(Flags.USE.valueToString(collection)));
+        Optional<HashSet<PlotBlock>> flag2 = plot.getFlag(Flags.USE);
+        if (flag2.isPresent()) {
+            //   assertThat(flag2.get(), (Matcher<? super HashSet<PlotBlock>>) IsCollectionContaining.hasItem(testBlock));
+        }
+        if (flag.isPresent() && flag2.isPresent()) {
+            assertEquals(flag.get(), flag2.get());
+        }
+    }
+}
diff --git a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
new file mode 100644
index 000000000..1ef04abba
--- /dev/null
+++ b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
@@ -0,0 +1,183 @@
+package com.github.intellectualsites.plotsquared.plot.database;
+
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+
+import java.util.*;
+
+public class AbstractDBTest implements AbstractDB {
+
+    @Override public void setOwner(Plot plot, UUID uuid) {
+    }
+
+    @Override public void createPlotsAndData(List<Plot> plots, Runnable whenDone) {
+    }
+
+    @Override public void createPlotSafe(Plot plot, Runnable success, Runnable failure) {
+    }
+
+    @Override public void createTables() {
+    }
+
+    @Override public void delete(Plot plot) {
+    }
+
+    @Override public void deleteSettings(Plot plot) {
+    }
+
+    @Override public void deleteHelpers(Plot plot) {
+    }
+
+    @Override public void deleteTrusted(Plot plot) {
+    }
+
+    @Override public void deleteDenied(Plot plot) {
+    }
+
+    @Override public void deleteComments(Plot plot) {
+    }
+
+    @Override public void deleteRatings(Plot plot) {
+    }
+
+    @Override public void delete(PlotCluster cluster) {
+    }
+
+    @Override public void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete) {
+    }
+
+    @Override public void removePersistentMeta(UUID uuid, String key) {
+    }
+
+    @Override public void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result) {
+    }
+
+    @Override public void createPlotSettings(int id, Plot plot) {
+    }
+
+    @Override public int getId(Plot plot) {
+        return 0;
+    }
+
+    @Override public int getClusterId(PlotCluster cluster) {
+        return 0;
+    }
+
+    @Override public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
+        return null;
+    }
+
+    @Override public void validateAllPlots(Set<Plot> toValidate) {
+    }
+
+    @Override public HashMap<String, Set<PlotCluster>> getClusters() {
+        return null;
+    }
+
+    @Override public void setMerged(Plot plot, boolean[] merged) {
+    }
+
+    @Override public void swapPlots(Plot plot1, Plot plot2) {
+    }
+
+    @Override public void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
+    }
+
+    @Override public void setClusterName(PlotCluster cluster, String name) {
+    }
+
+    @Override public void setAlias(Plot plot, String alias) {
+    }
+
+    @Override public void purgeIds(Set<Integer> uniqueIds) {
+    }
+
+    @Override public void purge(PlotArea area, Set<PlotId> plotIds) {
+    }
+
+    @Override public void setPosition(Plot plot, String position) {
+    }
+
+    @Override public void setPosition(PlotCluster cluster, String position) {
+    }
+
+    @Override public void removeTrusted(Plot plot, UUID uuid) {
+    }
+
+    @Override public void removeHelper(PlotCluster cluster, UUID uuid) {
+    }
+
+    @Override public void removeMember(Plot plot, UUID uuid) {
+    }
+
+    @Override public void removeInvited(PlotCluster cluster, UUID uuid) {
+    }
+
+    @Override public void setTrusted(Plot plot, UUID uuid) {
+    }
+
+    @Override public void setHelper(PlotCluster cluster, UUID uuid) {
+    }
+
+    @Override public void setMember(Plot plot, UUID uuid) {
+    }
+
+    @Override public void setInvited(PlotCluster cluster, UUID uuid) {
+    }
+
+    @Override public void removeDenied(Plot plot, UUID uuid) {
+    }
+
+    @Override public void setDenied(Plot plot, UUID uuid) {
+    }
+
+    @Override public HashMap<UUID, Integer> getRatings(Plot plot) {
+        return null;
+    }
+
+    @Override public void setRating(Plot plot, UUID rater, int value) {
+    }
+
+    @Override public void removeComment(Plot plot, PlotComment comment) {
+    }
+
+    @Override public void clearInbox(Plot plot, String inbox) {
+    }
+
+    @Override public void setComment(Plot plot, PlotComment comment) {
+    }
+
+    @Override
+    public void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone) {
+    }
+
+    @Override public void createPlotAndSettings(Plot plot, Runnable whenDone) {
+    }
+
+    @Override public void createCluster(PlotCluster cluster) {
+    }
+
+    @Override public void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
+    }
+
+    @Override public void movePlot(Plot originalPlot, Plot newPlot) {
+    }
+
+    @Override public void replaceUUID(UUID old, UUID now) {
+    }
+
+    @Override public boolean deleteTables() {
+        return false;
+    }
+
+    @Override public void close() {
+    }
+
+    @Override public void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) {
+    }
+
+    @Override public void updateTables(int[] oldVersion) {
+    }
+}
+
diff --git a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
new file mode 100644
index 000000000..6ae75a86d
--- /dev/null
+++ b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
@@ -0,0 +1,75 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+
+import java.util.List;
+import java.util.UUID;
+
+public class EventUtilTest extends EventUtil {
+
+    @Override public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
+        return null;
+    }
+
+    @Override public boolean callClaim(PlotPlayer player, Plot plot, boolean auto) {
+        return false;
+    }
+
+    @Override public boolean callTeleport(PlotPlayer player, Location from, Plot plot) {
+        return false;
+    }
+
+    @Override public boolean callComponentSet(Plot plot, String component) {
+        return false;
+    }
+
+    @Override public boolean callClear(Plot plot) {
+        return false;
+    }
+
+    @Override public boolean callDelete(Plot plot) {
+        return false;
+    }
+
+    @Override public boolean callFlagAdd(Flag flag, Plot plot) {
+        return true;
+    }
+
+    @Override public boolean callFlagRemove(Flag<?> flag, Plot plot, Object value) {
+        return true;
+    }
+
+    @Override public boolean callMerge(Plot plot, int dir, int max) {
+        return false;
+    }
+
+    @Override public boolean callAutoMerge(Plot plot, List<PlotId> plots) {
+        return false;
+    }
+
+    @Override public boolean callUnlink(PlotArea area, List<PlotId> plots) {
+        return false;
+    }
+
+    @Override public void callEntry(PlotPlayer player, Plot plot) {
+    }
+
+    @Override public void callLeave(PlotPlayer player, Plot plot) {
+    }
+
+    @Override public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    }
+
+    @Override public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    }
+
+    @Override public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    }
+
+    @Override
+    public boolean callOwnerChange(PlotPlayer initiator, Plot plot, UUID newOwner, UUID oldOwner,
+        boolean hasOldOwner) {
+        return false;
+    }
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
index 8f3446487..9d694c1ec 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import java.util.Map;
 import javax.annotation.Nonnull;
+import java.util.Map;
 
 /**
  * Represents a source of configurable options and settings.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
index ac9d2d536..9e15a9030 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
@@ -1,9 +1,9 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
+import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nonnull;
 
 /**
  * Represents a section of a {@link Configuration}.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
index d44c0f3b2..d1677c54d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import java.util.Map;
 import javax.annotation.Nonnull;
+import java.util.Map;
 
 /**
  * This is a {@link Configuration} implementation that does not save or load
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
index 73f50476d..26f6760c8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
@@ -1,817 +1,771 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import java.util.*;
 import javax.annotation.Nonnull;
+import java.util.*;
 
 /**
  * A type of {@link ConfigurationSection} that is stored in memory.
  */
 public class MemorySection implements ConfigurationSection {
 
-  protected final Map<String, Object> map = new LinkedHashMap<>();
-  private final Configuration root;
-  private final ConfigurationSection parent;
-  private final String path;
-  private final String fullPath;
+    protected final Map<String, Object> map = new LinkedHashMap<>();
+    private final Configuration root;
+    private final ConfigurationSection parent;
+    private final String path;
+    private final String fullPath;
 
-  /**
-   * Creates an empty MemorySection for use as a root {@link Configuration} section.
-   *
-   * <p>Note that calling this without being yourself a {@link Configuration}
-   * will throw an exception!
-   *
-   * @throws IllegalStateException Thrown if this is not a {@link Configuration} root.
-   */
-  protected MemorySection() {
-    if (!(this instanceof Configuration)) {
-      throw new IllegalStateException(
-          "Cannot construct a root MemorySection when not a Configuration");
+    /**
+     * Creates an empty MemorySection for use as a root {@link Configuration} section.
+     *
+     * <p>Note that calling this without being yourself a {@link Configuration}
+     * will throw an exception!
+     *
+     * @throws IllegalStateException Thrown if this is not a {@link Configuration} root.
+     */
+    protected MemorySection() {
+        if (!(this instanceof Configuration)) {
+            throw new IllegalStateException(
+                "Cannot construct a root MemorySection when not a Configuration");
+        }
+
+        this.path = "";
+        this.fullPath = "";
+        this.parent = null;
+        this.root = (Configuration) this;
     }
 
-    this.path = "";
-    this.fullPath = "";
-    this.parent = null;
-    this.root = (Configuration) this;
-  }
+    /**
+     * Creates an empty MemorySection with the specified parent and path.
+     *
+     * @param parent Parent section that contains this own section.
+     * @param path   Path that you may access this section from via the root {@link Configuration}.
+     * @throws IllegalArgumentException Thrown is parent or path is null, or if parent contains no
+     *                                  root Configuration.
+     */
+    protected MemorySection(ConfigurationSection parent, String path) {
+        this.path = path;
+        this.parent = parent;
+        this.root = parent.getRoot();
 
-  /**
-   * Creates an empty MemorySection with the specified parent and path.
-   *
-   * @param parent Parent section that contains this own section.
-   * @param path Path that you may access this section from via the root {@link Configuration}.
-   * @throws IllegalArgumentException Thrown is parent or path is null, or if parent contains no
-   * root Configuration.
-   */
-  protected MemorySection(ConfigurationSection parent, String path) {
-    this.path = path;
-    this.parent = parent;
-    this.root = parent.getRoot();
+        if (this.root == null) {
+            throw new NullPointerException("Path may not be orphaned");
+        }
 
-    if (this.root == null) {
-      throw new NullPointerException("Path may not be orphaned");
+        this.fullPath = createPath(parent, path);
     }
 
-    this.fullPath = createPath(parent, path);
-  }
-
-  public static double toDouble(Object obj, double def) {
-    if (obj instanceof Number) {
-      return ((Number) obj).doubleValue();
-    }
-    if (obj instanceof String) {
-      try {
-        return Double.parseDouble((String) obj);
-      } catch (NumberFormatException ignored) {
-      }
-    } else if (obj instanceof List) {
-      List<?> val = (List<?>) obj;
-      if (!val.isEmpty()) {
-        return toDouble(val.get(0), def);
-      }
-    }
-    return def;
-  }
-
-  public static int toInt(Object obj, int def) {
-    if (obj instanceof Number) {
-      return ((Number) obj).intValue();
-    }
-    if (obj instanceof String) {
-      try {
-        return Integer.parseInt((String) obj);
-      } catch (NumberFormatException ignored) {
-      }
-    } else if (obj instanceof List) {
-      List<?> val = (List<?>) obj;
-      if (!val.isEmpty()) {
-        return toInt(val.get(0), def);
-      }
-    }
-    return def;
-  }
-
-  public static long toLong(Object obj, long def) {
-    if (obj instanceof Number) {
-      return ((Number) obj).longValue();
-    }
-    if (obj instanceof String) {
-      try {
-        return Long.parseLong((String) obj);
-      } catch (NumberFormatException ignored) {
-      }
-    } else if (obj instanceof List) {
-      List<?> val = (List<?>) obj;
-      if (!val.isEmpty()) {
-        return toLong(val.get(0), def);
-      }
-    }
-    return def;
-  }
-
-  /**
-   * Creates a full path to the given {@link ConfigurationSection} from its root {@link
-   * Configuration}.
-   *
-   * <p>You may use this method for any given {@link ConfigurationSection}, not
-   * only {@link MemorySection}.
-   *
-   * @param section Section to create a path for.
-   * @param key Name of the specified section.
-   * @return Full path of the section from its root.
-   */
-  public static String createPath(ConfigurationSection section, String key) {
-    return createPath(section, key, section.getRoot());
-  }
-
-  /**
-   * Creates a relative path to the given {@link ConfigurationSection} from the given relative
-   * section.
-   *
-   * <p>You may use this method for any given {@link ConfigurationSection}, not
-   * only {@link MemorySection}.
-   *
-   * @param section Section to create a path for.
-   * @param key Name of the specified section.
-   * @param relativeTo Section to create the path relative to.
-   * @return Full path of the section from its root.
-   */
-  public static String createPath(ConfigurationSection section, String key,
-      ConfigurationSection relativeTo) {
-    Configuration root = section.getRoot();
-    if (root == null) {
-      throw new IllegalStateException("Cannot create path without a root");
-    }
-    char separator = root.options().pathSeparator();
-
-    StringBuilder builder = new StringBuilder();
-    for (ConfigurationSection parent = section;
-        (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
-      if (builder.length() > 0) {
-        builder.insert(0, separator);
-      }
-
-      builder.insert(0, parent.getName());
+    public static double toDouble(Object obj, double def) {
+        if (obj instanceof Number) {
+            return ((Number) obj).doubleValue();
+        }
+        if (obj instanceof String) {
+            try {
+                return Double.parseDouble((String) obj);
+            } catch (NumberFormatException ignored) {
+            }
+        } else if (obj instanceof List) {
+            List<?> val = (List<?>) obj;
+            if (!val.isEmpty()) {
+                return toDouble(val.get(0), def);
+            }
+        }
+        return def;
     }
 
-    if ((key != null) && !key.isEmpty()) {
-      if (builder.length() > 0) {
-        builder.append(separator);
-      }
-
-      builder.append(key);
+    public static int toInt(Object obj, int def) {
+        if (obj instanceof Number) {
+            return ((Number) obj).intValue();
+        }
+        if (obj instanceof String) {
+            try {
+                return Integer.parseInt((String) obj);
+            } catch (NumberFormatException ignored) {
+            }
+        } else if (obj instanceof List) {
+            List<?> val = (List<?>) obj;
+            if (!val.isEmpty()) {
+                return toInt(val.get(0), def);
+            }
+        }
+        return def;
     }
 
-    return builder.toString();
-  }
-
-  @Override
-  public Set<String> getKeys(boolean deep) {
-    Set<String> result = new LinkedHashSet<>();
-
-    Configuration root = getRoot();
-    if ((root != null) && root.options().copyDefaults()) {
-      ConfigurationSection defaults = getDefaultSection();
-
-      if (defaults != null) {
-        result.addAll(defaults.getKeys(deep));
-      }
+    public static long toLong(Object obj, long def) {
+        if (obj instanceof Number) {
+            return ((Number) obj).longValue();
+        }
+        if (obj instanceof String) {
+            try {
+                return Long.parseLong((String) obj);
+            } catch (NumberFormatException ignored) {
+            }
+        } else if (obj instanceof List) {
+            List<?> val = (List<?>) obj;
+            if (!val.isEmpty()) {
+                return toLong(val.get(0), def);
+            }
+        }
+        return def;
     }
 
-    mapChildrenKeys(result, this, deep);
-
-    return result;
-  }
-
-  @Override
-  public Map<String, Object> getValues(boolean deep) {
-    Map<String, Object> result = new LinkedHashMap<>();
-
-    Configuration root = getRoot();
-    if ((root != null) && root.options().copyDefaults()) {
-      ConfigurationSection defaults = getDefaultSection();
-
-      if (defaults != null) {
-        result.putAll(defaults.getValues(deep));
-      }
+    /**
+     * Creates a full path to the given {@link ConfigurationSection} from its root {@link
+     * Configuration}.
+     *
+     * <p>You may use this method for any given {@link ConfigurationSection}, not
+     * only {@link MemorySection}.
+     *
+     * @param section Section to create a path for.
+     * @param key     Name of the specified section.
+     * @return Full path of the section from its root.
+     */
+    public static String createPath(ConfigurationSection section, String key) {
+        return createPath(section, key, section.getRoot());
     }
 
-    mapChildrenValues(result, this, deep);
+    /**
+     * Creates a relative path to the given {@link ConfigurationSection} from the given relative
+     * section.
+     *
+     * <p>You may use this method for any given {@link ConfigurationSection}, not
+     * only {@link MemorySection}.
+     *
+     * @param section    Section to create a path for.
+     * @param key        Name of the specified section.
+     * @param relativeTo Section to create the path relative to.
+     * @return Full path of the section from its root.
+     */
+    public static String createPath(ConfigurationSection section, String key,
+        ConfigurationSection relativeTo) {
+        Configuration root = section.getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot create path without a root");
+        }
+        char separator = root.options().pathSeparator();
 
-    return result;
-  }
+        StringBuilder builder = new StringBuilder();
+        for (ConfigurationSection parent = section;
+             (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
+            if (builder.length() > 0) {
+                builder.insert(0, separator);
+            }
 
-  @Override
-  public boolean contains(@Nonnull String path) {
-    return get(path) != null;
-  }
+            builder.insert(0, parent.getName());
+        }
 
-  @Override
-  public boolean isSet(@Nonnull String path) {
-    Configuration root = getRoot();
-    if (root == null) {
-      return false;
-    }
-    if (root.options().copyDefaults()) {
-      return contains(path);
-    }
-    return getOrDefault(path, null) != null;
-  }
+        if ((key != null) && !key.isEmpty()) {
+            if (builder.length() > 0) {
+                builder.append(separator);
+            }
 
-  @Override
-  public String getCurrentPath() {
-    return this.fullPath;
-  }
+            builder.append(key);
+        }
 
-  @Override
-  public String getName() {
-    return this.path;
-  }
-
-  @Override
-  public Configuration getRoot() {
-    return this.root;
-  }
-
-  @Override
-  public ConfigurationSection getParent() {
-    return this.parent;
-  }
-
-  @Override
-  public void addDefault(@Nonnull String path, Object value) {
-    Configuration root = getRoot();
-    if (root == null) {
-      throw new IllegalStateException("Cannot add default without root");
-    }
-    if (root == this) {
-      throw new UnsupportedOperationException(
-          "Unsupported addDefault(String, Object) implementation");
-    }
-    root.addDefault(createPath(this, path), value);
-  }
-
-  @Override
-  public ConfigurationSection getDefaultSection() {
-    Configuration root = getRoot();
-    Configuration defaults = root == null ? null : root.getDefaults();
-
-    if (defaults != null) {
-      if (defaults.isConfigurationSection(getCurrentPath())) {
-        return defaults.getConfigurationSection(getCurrentPath());
-      }
+        return builder.toString();
     }
 
-    return null;
-  }
+    @Override public Set<String> getKeys(boolean deep) {
+        Set<String> result = new LinkedHashSet<>();
 
-  @Override
-  public void set(String path, Object value) {
-    Configuration root = getRoot();
-    if (root == null) {
-      throw new IllegalStateException("Cannot use section without a root");
-    }
+        Configuration root = getRoot();
+        if ((root != null) && root.options().copyDefaults()) {
+            ConfigurationSection defaults = getDefaultSection();
 
-    char separator = root.options().pathSeparator();
-    // i1 is the leading (higher) index
-    // i2 is the trailing (lower) index
-    int i1 = -1;
-    int i2;
-    ConfigurationSection section = this;
-    while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-      String node = path.substring(i2, i1);
-      ConfigurationSection subSection = section.getConfigurationSection(node);
-      if (subSection == null) {
-        section = section.createSection(node);
-      } else {
-        section = subSection;
-      }
-    }
+            if (defaults != null) {
+                result.addAll(defaults.getKeys(deep));
+            }
+        }
 
-    String key = path.substring(i2);
-    if (section == this) {
-      if (value == null) {
-        this.map.remove(key);
-      } else {
-        this.map.put(key, value);
-      }
-    } else {
-      section.set(key, value);
-    }
-  }
+        mapChildrenKeys(result, this, deep);
 
-  @Override
-  public Object get(String path) {
-    return getOrDefault(path, getDefault(path));
-  }
-
-  @Override
-  public Object getOrDefault(@Nonnull String path, Object defaultValue) {
-    if (path.isEmpty()) {
-      return this;
-    }
-
-    Configuration root = getRoot();
-    if (root == null) {
-      throw new IllegalStateException("Cannot access section without a root");
-    }
-
-    char separator = root.options().pathSeparator();
-    // i1 is the leading (higher) index
-    // i2 is the trailing (lower) index
-    int i1 = -1;
-    int i2;
-    ConfigurationSection section = this;
-    while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-      section = section.getConfigurationSection(path.substring(i2, i1));
-      if (section == null) {
-        return defaultValue;
-      }
-    }
-
-    String key = path.substring(i2);
-    if (section == this) {
-      Object result = this.map.get(key);
-      if (result == null) {
-        return defaultValue;
-      } else {
         return result;
-      }
-    }
-    return section.getOrDefault(key, defaultValue);
-  }
-
-  @Override
-  public ConfigurationSection createSection(String path) {
-    Configuration root = getRoot();
-    if (root == null) {
-      throw new IllegalStateException("Cannot create section without a root");
     }
 
-    char separator = root.options().pathSeparator();
-    // i1 is the leading (higher) index
-    // i2 is the trailing (lower) index
-    int i1 = -1;
-    int i2;
-    ConfigurationSection section = this;
-    while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-      String node = path.substring(i2, i1);
-      ConfigurationSection subSection = section.getConfigurationSection(node);
-      if (subSection == null) {
-        section = section.createSection(node);
-      } else {
-        section = subSection;
-      }
-    }
+    @Override public Map<String, Object> getValues(boolean deep) {
+        Map<String, Object> result = new LinkedHashMap<>();
 
-    String key = path.substring(i2);
-    if (section == this) {
-      ConfigurationSection result = new MemorySection(this, key);
-      this.map.put(key, result);
-      return result;
-    }
-    return section.createSection(key);
-  }
+        Configuration root = getRoot();
+        if ((root != null) && root.options().copyDefaults()) {
+            ConfigurationSection defaults = getDefaultSection();
 
-  @Override
-  public ConfigurationSection createSection(String path, Map<?, ?> map) {
-    ConfigurationSection section = createSection(path);
-
-    for (Map.Entry<?, ?> entry : map.entrySet()) {
-      if (entry.getValue() instanceof Map) {
-        section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
-      } else {
-        section.set(entry.getKey().toString(), entry.getValue());
-      }
-    }
-
-    return section;
-  }
-
-  // Primitives
-  @Override
-  public String getString(String path) {
-    Object def = getDefault(path);
-    return getString(path, def != null ? def.toString() : null);
-  }
-
-  @Override
-  public String getString(String path, String def) {
-    Object val = getOrDefault(path, def);
-    if (val != null) {
-      return val.toString();
-    } else {
-      return def;
-    }
-  }
-
-  @Override
-  public boolean isString(String path) {
-    Object val = get(path);
-    return val instanceof String;
-  }
-
-  @Override
-  public int getInt(String path) {
-    Object def = getDefault(path);
-    return getInt(path, toInt(def, 0));
-  }
-
-  @Override
-  public int getInt(String path, int def) {
-    Object val = getOrDefault(path, def);
-    return toInt(val, def);
-  }
-
-  @Override
-  public boolean isInt(String path) {
-    Object val = get(path);
-    return val instanceof Integer;
-  }
-
-  @Override
-  public boolean getBoolean(String path) {
-    Object def = getDefault(path);
-    if (def instanceof Boolean) {
-      return getBoolean(path, (Boolean) def);
-    } else {
-      return getBoolean(path, false);
-    }
-  }
-
-  @Override
-  public boolean getBoolean(String path, boolean defaultValue) {
-    Object val = getOrDefault(path, defaultValue);
-    if (val instanceof Boolean) {
-      return (Boolean) val;
-    } else {
-      return defaultValue;
-    }
-  }
-
-  @Override
-  public boolean isBoolean(String path) {
-    Object val = get(path);
-    return val instanceof Boolean;
-  }
-
-  @Override
-  public double getDouble(String path) {
-    Object def = getDefault(path);
-    return getDouble(path, toDouble(def, 0));
-  }
-
-  @Override
-  public double getDouble(String path, double defaultValue) {
-    Object val = getOrDefault(path, defaultValue);
-    return toDouble(val, defaultValue);
-  }
-
-  @Override
-  public boolean isDouble(String path) {
-    Object val = get(path);
-    return val instanceof Double;
-  }
-
-  @Override
-  public long getLong(String path) {
-    Object def = getDefault(path);
-    return getLong(path, toLong(def, 0));
-  }
-
-  @Override
-  public long getLong(String path, long def) {
-    Object val = getOrDefault(path, def);
-    return toLong(val, def);
-  }
-
-  @Override
-  public boolean isLong(String path) {
-    Object val = get(path);
-    return val instanceof Long;
-  }
-
-  // Java
-  @Override
-  public List<?> getList(String path) {
-    Object def = getDefault(path);
-    return getList(path, def instanceof List ? (List<?>) def : null);
-  }
-
-  @Override
-  public List<?> getList(String path, List<?> def) {
-    Object val = getOrDefault(path, def);
-    return (List<?>) ((val instanceof List) ? val : def);
-  }
-
-  @Override
-  public boolean isList(String path) {
-    Object val = get(path);
-    return val instanceof List;
-  }
-
-  @Override
-  public List<String> getStringList(String path) {
-    List<?> list = getList(path);
-
-    if (list == null) {
-      return new ArrayList<>(0);
-    }
-
-    List<String> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if ((object instanceof String) || isPrimitiveWrapper(object)) {
-        result.add(String.valueOf(object));
-      }
-    }
-
-    return result;
-  }
-
-  @Override
-  public List<Integer> getIntegerList(String path) {
-    List<?> list = getList(path);
-
-    List<Integer> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Integer) {
-        result.add((Integer) object);
-      } else if (object instanceof String) {
-        try {
-          result.add(Integer.valueOf((String) object));
-        } catch (NumberFormatException ignored) {
+            if (defaults != null) {
+                result.putAll(defaults.getValues(deep));
+            }
         }
-      } else if (object instanceof Character) {
-        result.add((int) (Character) object);
-      } else if (object instanceof Number) {
-        result.add(((Number) object).intValue());
-      }
+
+        mapChildrenValues(result, this, deep);
+
+        return result;
     }
 
-    return result;
-  }
+    @Override public boolean contains(@Nonnull String path) {
+        return get(path) != null;
+    }
 
-  @Override
-  public List<Boolean> getBooleanList(String path) {
-    List<?> list = getList(path);
-
-    List<Boolean> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Boolean) {
-        result.add((Boolean) object);
-      } else if (object instanceof String) {
-        if (Boolean.TRUE.toString().equals(object)) {
-          result.add(true);
-        } else if (Boolean.FALSE.toString().equals(object)) {
-          result.add(false);
+    @Override public boolean isSet(@Nonnull String path) {
+        Configuration root = getRoot();
+        if (root == null) {
+            return false;
         }
-      }
-    }
-
-    return result;
-  }
-
-  @Override
-  public List<Double> getDoubleList(String path) {
-    List<?> list = getList(path);
-
-    List<Double> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Double) {
-        result.add((Double) object);
-      } else if (object instanceof String) {
-        try {
-          result.add(Double.valueOf((String) object));
-        } catch (NumberFormatException ignored) {
+        if (root.options().copyDefaults()) {
+            return contains(path);
         }
-      } else if (object instanceof Character) {
-        result.add((double) (Character) object);
-      } else if (object instanceof Number) {
-        result.add(((Number) object).doubleValue());
-      }
+        return getOrDefault(path, null) != null;
     }
 
-    return result;
-  }
+    @Override public String getCurrentPath() {
+        return this.fullPath;
+    }
 
-  @Override
-  public List<Float> getFloatList(String path) {
-    List<?> list = getList(path);
+    @Override public String getName() {
+        return this.path;
+    }
 
-    List<Float> result = new ArrayList<>();
+    @Override public Configuration getRoot() {
+        return this.root;
+    }
 
-    for (Object object : list) {
-      if (object instanceof Float) {
-        result.add((Float) object);
-      } else if (object instanceof String) {
-        try {
-          result.add(Float.valueOf((String) object));
-        } catch (NumberFormatException ignored) {
+    @Override public ConfigurationSection getParent() {
+        return this.parent;
+    }
+
+    @Override public void addDefault(@Nonnull String path, Object value) {
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot add default without root");
         }
-      } else if (object instanceof Character) {
-        result.add((float) (Character) object);
-      } else if (object instanceof Number) {
-        result.add(((Number) object).floatValue());
-      }
-    }
-
-    return result;
-  }
-
-  @Override
-  public List<Long> getLongList(String path) {
-    List<?> list = getList(path);
-
-    List<Long> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Long) {
-        result.add((Long) object);
-      } else if (object instanceof String) {
-        try {
-          result.add(Long.valueOf((String) object));
-        } catch (NumberFormatException ignored) {
+        if (root == this) {
+            throw new UnsupportedOperationException(
+                "Unsupported addDefault(String, Object) implementation");
         }
-      } else if (object instanceof Character) {
-        result.add((long) (Character) object);
-      } else if (object instanceof Number) {
-        result.add(((Number) object).longValue());
-      }
+        root.addDefault(createPath(this, path), value);
     }
 
-    return result;
-  }
+    @Override public ConfigurationSection getDefaultSection() {
+        Configuration root = getRoot();
+        Configuration defaults = root == null ? null : root.getDefaults();
 
-  @Override
-  public List<Byte> getByteList(String path) {
-    List<?> list = getList(path);
-
-    List<Byte> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Byte) {
-        result.add((Byte) object);
-      } else if (object instanceof String) {
-        try {
-          result.add(Byte.valueOf((String) object));
-        } catch (NumberFormatException ignored) {
+        if (defaults != null) {
+            if (defaults.isConfigurationSection(getCurrentPath())) {
+                return defaults.getConfigurationSection(getCurrentPath());
+            }
         }
-      } else if (object instanceof Character) {
-        result.add((byte) ((Character) object).charValue());
-      } else if (object instanceof Number) {
-        result.add(((Number) object).byteValue());
-      }
+
+        return null;
     }
 
-    return result;
-  }
-
-  @Override
-  public List<Character> getCharacterList(String path) {
-    List<?> list = getList(path);
-
-    List<Character> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Character) {
-        result.add((Character) object);
-      } else if (object instanceof String) {
-        String str = (String) object;
-
-        if (str.length() == 1) {
-          result.add(str.charAt(0));
+    @Override public void set(String path, Object value) {
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot use section without a root");
         }
-      } else if (object instanceof Number) {
-        result.add((char) ((Number) object).intValue());
-      }
-    }
 
-    return result;
-  }
-
-  @Override
-  public List<Short> getShortList(String path) {
-    List<?> list = getList(path);
-
-    List<Short> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Short) {
-        result.add((Short) object);
-      } else if (object instanceof String) {
-        try {
-          result.add(Short.valueOf((String) object));
-        } catch (NumberFormatException ignored) {
+        char separator = root.options().pathSeparator();
+        // i1 is the leading (higher) index
+        // i2 is the trailing (lower) index
+        int i1 = -1;
+        int i2;
+        ConfigurationSection section = this;
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+            String node = path.substring(i2, i1);
+            ConfigurationSection subSection = section.getConfigurationSection(node);
+            if (subSection == null) {
+                section = section.createSection(node);
+            } else {
+                section = subSection;
+            }
         }
-      } else if (object instanceof Character) {
-        result.add((short) ((Character) object).charValue());
-      } else if (object instanceof Number) {
-        result.add(((Number) object).shortValue());
-      }
-    }
 
-    return result;
-  }
-
-  @Override
-  public List<Map<?, ?>> getMapList(String path) {
-    List<?> list = getList(path);
-    List<Map<?, ?>> result = new ArrayList<>();
-
-    for (Object object : list) {
-      if (object instanceof Map) {
-        result.add((Map<?, ?>) object);
-      }
-    }
-
-    return result;
-  }
-
-  @Override
-  public ConfigurationSection getConfigurationSection(String path) {
-    Object val = getOrDefault(path, null);
-    if (val != null) {
-      return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
-    }
-
-    val = getOrDefault(path, getDefault(path));
-    return (val instanceof ConfigurationSection) ? createSection(path) : null;
-  }
-
-  @Override
-  public boolean isConfigurationSection(String path) {
-    Object val = get(path);
-    return val instanceof ConfigurationSection;
-  }
-
-  protected boolean isPrimitiveWrapper(Object input) {
-    return (input instanceof Integer) || (input instanceof Boolean)
-        || (input instanceof Character) || (input instanceof Byte) || (input instanceof Short)
-        || (input instanceof Double) || (input instanceof Long) || (input instanceof Float);
-  }
-
-  protected Object getDefault(String path) {
-    Configuration root = getRoot();
-    Configuration defaults = root == null ? null : root.getDefaults();
-    return (defaults == null) ? null : defaults.get(createPath(this, path));
-  }
-
-  protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
-    if (section instanceof MemorySection) {
-      MemorySection sec = (MemorySection) section;
-
-      for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
-        output.add(createPath(section, entry.getKey(), this));
-
-        if (deep && (entry.getValue() instanceof ConfigurationSection)) {
-          ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
-          mapChildrenKeys(output, subsection, deep);
+        String key = path.substring(i2);
+        if (section == this) {
+            if (value == null) {
+                this.map.remove(key);
+            } else {
+                this.map.put(key, value);
+            }
+        } else {
+            section.set(key, value);
         }
-      }
-    } else {
-      Set<String> keys = section.getKeys(deep);
-
-      for (String key : keys) {
-        output.add(createPath(section, key, this));
-      }
     }
-  }
 
-  protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section,
-      boolean deep) {
-    if (section instanceof MemorySection) {
-      MemorySection sec = (MemorySection) section;
+    @Override public Object get(String path) {
+        return getOrDefault(path, getDefault(path));
+    }
 
-      for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
-        output.put(createPath(section, entry.getKey(), this), entry.getValue());
-
-        if (entry.getValue() instanceof ConfigurationSection) {
-          if (deep) {
-            mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
-          }
+    @Override public Object getOrDefault(@Nonnull String path, Object defaultValue) {
+        if (path.isEmpty()) {
+            return this;
         }
-      }
-    } else {
-      Map<String, Object> values = section.getValues(deep);
 
-      for (Map.Entry<String, Object> entry : values.entrySet()) {
-        output.put(createPath(section, entry.getKey(), this), entry.getValue());
-      }
-    }
-  }
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot access section without a root");
+        }
 
-  @Override
-  public String toString() {
-    Configuration root = getRoot();
-    if (root == null) {
-      return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + null
-          + "']";
-    } else {
-      return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + root
-          .getClass().getSimpleName() + "']";
+        char separator = root.options().pathSeparator();
+        // i1 is the leading (higher) index
+        // i2 is the trailing (lower) index
+        int i1 = -1;
+        int i2;
+        ConfigurationSection section = this;
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+            section = section.getConfigurationSection(path.substring(i2, i1));
+            if (section == null) {
+                return defaultValue;
+            }
+        }
+
+        String key = path.substring(i2);
+        if (section == this) {
+            Object result = this.map.get(key);
+            if (result == null) {
+                return defaultValue;
+            } else {
+                return result;
+            }
+        }
+        return section.getOrDefault(key, defaultValue);
+    }
+
+    @Override public ConfigurationSection createSection(String path) {
+        Configuration root = getRoot();
+        if (root == null) {
+            throw new IllegalStateException("Cannot create section without a root");
+        }
+
+        char separator = root.options().pathSeparator();
+        // i1 is the leading (higher) index
+        // i2 is the trailing (lower) index
+        int i1 = -1;
+        int i2;
+        ConfigurationSection section = this;
+        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
+            String node = path.substring(i2, i1);
+            ConfigurationSection subSection = section.getConfigurationSection(node);
+            if (subSection == null) {
+                section = section.createSection(node);
+            } else {
+                section = subSection;
+            }
+        }
+
+        String key = path.substring(i2);
+        if (section == this) {
+            ConfigurationSection result = new MemorySection(this, key);
+            this.map.put(key, result);
+            return result;
+        }
+        return section.createSection(key);
+    }
+
+    @Override public ConfigurationSection createSection(String path, Map<?, ?> map) {
+        ConfigurationSection section = createSection(path);
+
+        for (Map.Entry<?, ?> entry : map.entrySet()) {
+            if (entry.getValue() instanceof Map) {
+                section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
+            } else {
+                section.set(entry.getKey().toString(), entry.getValue());
+            }
+        }
+
+        return section;
+    }
+
+    // Primitives
+    @Override public String getString(String path) {
+        Object def = getDefault(path);
+        return getString(path, def != null ? def.toString() : null);
+    }
+
+    @Override public String getString(String path, String def) {
+        Object val = getOrDefault(path, def);
+        if (val != null) {
+            return val.toString();
+        } else {
+            return def;
+        }
+    }
+
+    @Override public boolean isString(String path) {
+        Object val = get(path);
+        return val instanceof String;
+    }
+
+    @Override public int getInt(String path) {
+        Object def = getDefault(path);
+        return getInt(path, toInt(def, 0));
+    }
+
+    @Override public int getInt(String path, int def) {
+        Object val = getOrDefault(path, def);
+        return toInt(val, def);
+    }
+
+    @Override public boolean isInt(String path) {
+        Object val = get(path);
+        return val instanceof Integer;
+    }
+
+    @Override public boolean getBoolean(String path) {
+        Object def = getDefault(path);
+        if (def instanceof Boolean) {
+            return getBoolean(path, (Boolean) def);
+        } else {
+            return getBoolean(path, false);
+        }
+    }
+
+    @Override public boolean getBoolean(String path, boolean defaultValue) {
+        Object val = getOrDefault(path, defaultValue);
+        if (val instanceof Boolean) {
+            return (Boolean) val;
+        } else {
+            return defaultValue;
+        }
+    }
+
+    @Override public boolean isBoolean(String path) {
+        Object val = get(path);
+        return val instanceof Boolean;
+    }
+
+    @Override public double getDouble(String path) {
+        Object def = getDefault(path);
+        return getDouble(path, toDouble(def, 0));
+    }
+
+    @Override public double getDouble(String path, double defaultValue) {
+        Object val = getOrDefault(path, defaultValue);
+        return toDouble(val, defaultValue);
+    }
+
+    @Override public boolean isDouble(String path) {
+        Object val = get(path);
+        return val instanceof Double;
+    }
+
+    @Override public long getLong(String path) {
+        Object def = getDefault(path);
+        return getLong(path, toLong(def, 0));
+    }
+
+    @Override public long getLong(String path, long def) {
+        Object val = getOrDefault(path, def);
+        return toLong(val, def);
+    }
+
+    @Override public boolean isLong(String path) {
+        Object val = get(path);
+        return val instanceof Long;
+    }
+
+    // Java
+    @Override public List<?> getList(String path) {
+        Object def = getDefault(path);
+        return getList(path, def instanceof List ? (List<?>) def : null);
+    }
+
+    @Override public List<?> getList(String path, List<?> def) {
+        Object val = getOrDefault(path, def);
+        return (List<?>) ((val instanceof List) ? val : def);
+    }
+
+    @Override public boolean isList(String path) {
+        Object val = get(path);
+        return val instanceof List;
+    }
+
+    @Override public List<String> getStringList(String path) {
+        List<?> list = getList(path);
+
+        if (list == null) {
+            return new ArrayList<>(0);
+        }
+
+        List<String> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if ((object instanceof String) || isPrimitiveWrapper(object)) {
+                result.add(String.valueOf(object));
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Integer> getIntegerList(String path) {
+        List<?> list = getList(path);
+
+        List<Integer> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Integer) {
+                result.add((Integer) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Integer.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((int) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).intValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Boolean> getBooleanList(String path) {
+        List<?> list = getList(path);
+
+        List<Boolean> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Boolean) {
+                result.add((Boolean) object);
+            } else if (object instanceof String) {
+                if (Boolean.TRUE.toString().equals(object)) {
+                    result.add(true);
+                } else if (Boolean.FALSE.toString().equals(object)) {
+                    result.add(false);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Double> getDoubleList(String path) {
+        List<?> list = getList(path);
+
+        List<Double> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Double) {
+                result.add((Double) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Double.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((double) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).doubleValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Float> getFloatList(String path) {
+        List<?> list = getList(path);
+
+        List<Float> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Float) {
+                result.add((Float) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Float.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((float) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).floatValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Long> getLongList(String path) {
+        List<?> list = getList(path);
+
+        List<Long> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Long) {
+                result.add((Long) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Long.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((long) (Character) object);
+            } else if (object instanceof Number) {
+                result.add(((Number) object).longValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Byte> getByteList(String path) {
+        List<?> list = getList(path);
+
+        List<Byte> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Byte) {
+                result.add((Byte) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Byte.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((byte) ((Character) object).charValue());
+            } else if (object instanceof Number) {
+                result.add(((Number) object).byteValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Character> getCharacterList(String path) {
+        List<?> list = getList(path);
+
+        List<Character> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Character) {
+                result.add((Character) object);
+            } else if (object instanceof String) {
+                String str = (String) object;
+
+                if (str.length() == 1) {
+                    result.add(str.charAt(0));
+                }
+            } else if (object instanceof Number) {
+                result.add((char) ((Number) object).intValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Short> getShortList(String path) {
+        List<?> list = getList(path);
+
+        List<Short> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Short) {
+                result.add((Short) object);
+            } else if (object instanceof String) {
+                try {
+                    result.add(Short.valueOf((String) object));
+                } catch (NumberFormatException ignored) {
+                }
+            } else if (object instanceof Character) {
+                result.add((short) ((Character) object).charValue());
+            } else if (object instanceof Number) {
+                result.add(((Number) object).shortValue());
+            }
+        }
+
+        return result;
+    }
+
+    @Override public List<Map<?, ?>> getMapList(String path) {
+        List<?> list = getList(path);
+        List<Map<?, ?>> result = new ArrayList<>();
+
+        for (Object object : list) {
+            if (object instanceof Map) {
+                result.add((Map<?, ?>) object);
+            }
+        }
+
+        return result;
+    }
+
+    @Override public ConfigurationSection getConfigurationSection(String path) {
+        Object val = getOrDefault(path, null);
+        if (val != null) {
+            return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
+        }
+
+        val = getOrDefault(path, getDefault(path));
+        return (val instanceof ConfigurationSection) ? createSection(path) : null;
+    }
+
+    @Override public boolean isConfigurationSection(String path) {
+        Object val = get(path);
+        return val instanceof ConfigurationSection;
+    }
+
+    protected boolean isPrimitiveWrapper(Object input) {
+        return (input instanceof Integer) || (input instanceof Boolean)
+            || (input instanceof Character) || (input instanceof Byte) || (input instanceof Short)
+            || (input instanceof Double) || (input instanceof Long) || (input instanceof Float);
+    }
+
+    protected Object getDefault(String path) {
+        Configuration root = getRoot();
+        Configuration defaults = root == null ? null : root.getDefaults();
+        return (defaults == null) ? null : defaults.get(createPath(this, path));
+    }
+
+    protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
+        if (section instanceof MemorySection) {
+            MemorySection sec = (MemorySection) section;
+
+            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+                output.add(createPath(section, entry.getKey(), this));
+
+                if (deep && (entry.getValue() instanceof ConfigurationSection)) {
+                    ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
+                    mapChildrenKeys(output, subsection, deep);
+                }
+            }
+        } else {
+            Set<String> keys = section.getKeys(deep);
+
+            for (String key : keys) {
+                output.add(createPath(section, key, this));
+            }
+        }
+    }
+
+    protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section,
+        boolean deep) {
+        if (section instanceof MemorySection) {
+            MemorySection sec = (MemorySection) section;
+
+            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
+                output.put(createPath(section, entry.getKey(), this), entry.getValue());
+
+                if (entry.getValue() instanceof ConfigurationSection) {
+                    if (deep) {
+                        mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
+                    }
+                }
+            }
+        } else {
+            Map<String, Object> values = section.getValues(deep);
+
+            for (Map.Entry<String, Object> entry : values.entrySet()) {
+                output.put(createPath(section, entry.getKey(), this), entry.getValue());
+            }
+        }
+    }
+
+    @Override public String toString() {
+        Configuration root = getRoot();
+        if (root == null) {
+            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + null
+                + "']";
+        } else {
+            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + root
+                .getClass().getSimpleName() + "']";
+        }
     }
-  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
index 97643f7ee..bc0b375e9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
@@ -4,9 +4,9 @@ import com.github.intellectualsites.plotsquared.configuration.Configuration;
 import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
 import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration;
 
+import javax.annotation.Nonnull;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
-import javax.annotation.Nonnull;
 
 /**
  * This is a base class for all File based implementations of {@link
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
index 7fa0ec41a..2f6559a4e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -77,7 +77,7 @@ public interface IPlotMain extends ILogger {
      * @return
      */
     default String getPluginName() {
-      return "PlotSquared";
+        return "PlotSquared";
     }
 
     /**
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 84991d2b4..63bbf8142 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -47,182 +47,176 @@ import java.util.zip.ZipInputStream;
 /**
  * An implementation of the core, with a static getter for easy access.
  */
-@SuppressWarnings({"unused", "WeakerAccess"})
-public class PlotSquared {
+@SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
 
-  private static final Set<Plot> EMPTY_SET =
-      Collections.unmodifiableSet(Collections.emptySet());
-  private static PlotSquared instance;
-  // Implementation
-  public final IPlotMain IMP;
-  // Current thread
-  private final Thread thread;
-  // WorldEdit instance
-  public WorldEdit worldedit;
-  public File styleFile;
-  public File configFile;
-  public File worldsFile;
-  public File commandsFile;
-  public File translationFile;
-  public YamlConfiguration style;
-  public YamlConfiguration config;
-  public YamlConfiguration worlds;
-  public YamlConfiguration storage;
-  public YamlConfiguration commands;
-  // Temporary hold the plots/clusters before the worlds load
-  public HashMap<String, Set<PlotCluster>> clusters_tmp;
-  public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
-  // Implementation logger
-  @Setter
-  @Getter
-  private ILogger logger;
-  // Platform / Version / Update URL
-  private PlotVersion version;
-  // Files and configuration
-  @Getter
-  private File jarFile = null; // This file
-  private File storageFile;
-  @Getter
-  private PlotAreaManager plotAreaManager;
+    private static final Set<Plot> EMPTY_SET = Collections.unmodifiableSet(Collections.emptySet());
+    private static PlotSquared instance;
+    // Implementation
+    public final IPlotMain IMP;
+    // Current thread
+    private final Thread thread;
+    // WorldEdit instance
+    public WorldEdit worldedit;
+    public File styleFile;
+    public File configFile;
+    public File worldsFile;
+    public File commandsFile;
+    public File translationFile;
+    public YamlConfiguration style;
+    public YamlConfiguration config;
+    public YamlConfiguration worlds;
+    public YamlConfiguration storage;
+    public YamlConfiguration commands;
+    // Temporary hold the plots/clusters before the worlds load
+    public HashMap<String, Set<PlotCluster>> clusters_tmp;
+    public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
+    // Implementation logger
+    @Setter @Getter private ILogger logger;
+    // Platform / Version / Update URL
+    private PlotVersion version;
+    // Files and configuration
+    @Getter private File jarFile = null; // This file
+    private File storageFile;
+    @Getter private PlotAreaManager plotAreaManager;
 
-  /**
-   * Initialize PlotSquared with the desired Implementation class.
-   *
-   * @param iPlotMain Implementation of {@link IPlotMain} used
-   * @param platform The platform being used
-   */
-  public PlotSquared(final IPlotMain iPlotMain, final String platform) {
-    if (instance != null) {
-      throw new IllegalStateException("Cannot re-initialize the PlotSquared singleton");
-    }
-    instance = this;
-
-    this.thread = Thread.currentThread();
-    this.IMP = iPlotMain;
-    this.logger = iPlotMain;
-    Settings.PLATFORM = platform;
-
-    //
-    // Register configuration serializable classes
-    //
-    ConfigurationSerialization.registerClass(PlotBlock.class, "PlotBlock");
-    ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
-
-    try {
-      new ReflectionUtils(this.IMP.getNMSPackage());
-      try {
-        URL url = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
-        this.jarFile = new File(
-            new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
-                .toURI().getPath());
-      } catch (MalformedURLException | URISyntaxException | SecurityException e) {
-        e.printStackTrace();
-        this.jarFile = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar");
-        if (!this.jarFile.exists()) {
-          this.jarFile = new File(this.IMP.getDirectory().getParentFile(),
-              "PlotSquared-" + platform + ".jar");
+    /**
+     * Initialize PlotSquared with the desired Implementation class.
+     *
+     * @param iPlotMain Implementation of {@link IPlotMain} used
+     * @param platform  The platform being used
+     */
+    public PlotSquared(final IPlotMain iPlotMain, final String platform) {
+        if (instance != null) {
+            throw new IllegalStateException("Cannot re-initialize the PlotSquared singleton");
         }
-      }
-      TaskManager.IMP = this.IMP.getTaskManager();
+        instance = this;
 
-      // World Util. Has to be done before config files are loaded
-      WorldUtil.IMP = this.IMP.initWorldUtil();
+        this.thread = Thread.currentThread();
+        this.IMP = iPlotMain;
+        this.logger = iPlotMain;
+        Settings.PLATFORM = platform;
 
-      if (!setupConfigs()) {
-        return;
-      }
-      this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
-          Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
-              + ".use_THIS.yml");
-      C.load(this.translationFile);
+        //
+        // Register configuration serializable classes
+        //
+        ConfigurationSerialization.registerClass(PlotBlock.class, "PlotBlock");
+        ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
 
-      // Setup plotAreaManager
-      if (Settings.Enabled_Components.WORLDS) {
-        this.plotAreaManager = new SinglePlotAreaManager();
-      } else {
-        this.plotAreaManager = new DefaultPlotAreaManager();
-      }
-
-      // Database
-      if (Settings.Enabled_Components.DATABASE) {
-        setupDatabase();
-      }
-      // Comments
-      CommentManager.registerDefaultInboxes();
-      // Kill entities
-      if (Settings.Enabled_Components.KILL_ROAD_MOBS
-          || Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-        this.IMP.runEntityTask();
-      }
-      if (Settings.Enabled_Components.EVENTS) {
-        this.IMP.registerPlayerEvents();
-        this.IMP.registerInventoryEvents();
-        this.IMP.registerPlotPlusEvents();
-      }
-      // Required
-      this.IMP.registerWorldEvents();
-      if (Settings.Enabled_Components.METRICS) {
-        this.IMP.startMetrics();
-      } else {
-        PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
-      }
-      if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
-        this.IMP.registerChunkProcessor();
-      }
-      // create UUIDWrapper
-      UUIDHandler.implementation = this.IMP.initUUIDHandler();
-      if (Settings.Enabled_Components.UUID_CACHE) {
-        startUuidCatching();
-      } else {
-        // Start these separately
-        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-        startExpiryTasks();
-      }
-      // create event util class
-      EventUtil.manager = this.IMP.initEventUtil();
-      // create Hybrid utility class
-      HybridUtils.manager = this.IMP.initHybridUtils();
-      // Inventory utility class
-      InventoryUtil.manager = this.IMP.initInventoryUtil();
-      // create setup util class
-      SetupUtils.manager = this.IMP.initSetupUtils();
-      // Set block
-      GlobalBlockQueue.IMP = new GlobalBlockQueue(IMP.initBlockQueue(), 1);
-      GlobalBlockQueue.IMP.runTask();
-      // Set chunk
-      ChunkManager.manager = this.IMP.initChunkManager();
-      // Schematic handler
-      SchematicHandler.manager = this.IMP.initSchematicHandler();
-      // Titles
-      AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
-      // Chat
-      ChatManager.manager = this.IMP.initChatManager();
-      // Commands
-      if (Settings.Enabled_Components.COMMANDS) {
-        this.IMP.registerCommands();
-      }
-      // WorldEdit
-      if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
         try {
-          if (this.IMP.initWorldEdit()) {
-            PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
-            this.worldedit = WorldEdit.getInstance();
-            WorldEdit.getInstance().getEventBus().register(new WESubscriber());
-            if (Settings.Enabled_Components.COMMANDS) {
-              new WE_Anywhere();
+            new ReflectionUtils(this.IMP.getNMSPackage());
+            try {
+                URL url = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
+                this.jarFile = new File(
+                    new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
+                        .toURI().getPath());
+            } catch (MalformedURLException | URISyntaxException | SecurityException e) {
+                e.printStackTrace();
+                this.jarFile = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar");
+                if (!this.jarFile.exists()) {
+                    this.jarFile = new File(this.IMP.getDirectory().getParentFile(),
+                        "PlotSquared-" + platform + ".jar");
+                }
+            }
+            TaskManager.IMP = this.IMP.getTaskManager();
+
+            // World Util. Has to be done before config files are loaded
+            WorldUtil.IMP = this.IMP.initWorldUtil();
+
+            if (!setupConfigs()) {
+                return;
+            }
+            this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
+                Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
+                    + ".use_THIS.yml");
+            C.load(this.translationFile);
+
+            // Setup plotAreaManager
+            if (Settings.Enabled_Components.WORLDS) {
+                this.plotAreaManager = new SinglePlotAreaManager();
+            } else {
+                this.plotAreaManager = new DefaultPlotAreaManager();
             }
 
-          }
-        } catch (Throwable e) {
-          PlotSquared.debug(
-              "Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
-        }
-      }
-      // Economy
-      if (Settings.Enabled_Components.ECONOMY) {
-        TaskManager.runTask(
-            () -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
-      }
+            // Database
+            if (Settings.Enabled_Components.DATABASE) {
+                setupDatabase();
+            }
+            // Comments
+            CommentManager.registerDefaultInboxes();
+            // Kill entities
+            if (Settings.Enabled_Components.KILL_ROAD_MOBS
+                || Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+                this.IMP.runEntityTask();
+            }
+            if (Settings.Enabled_Components.EVENTS) {
+                this.IMP.registerPlayerEvents();
+                this.IMP.registerInventoryEvents();
+                this.IMP.registerPlotPlusEvents();
+            }
+            // Required
+            this.IMP.registerWorldEvents();
+            if (Settings.Enabled_Components.METRICS) {
+                this.IMP.startMetrics();
+            } else {
+                PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
+            }
+            if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
+                this.IMP.registerChunkProcessor();
+            }
+            // create UUIDWrapper
+            UUIDHandler.implementation = this.IMP.initUUIDHandler();
+            if (Settings.Enabled_Components.UUID_CACHE) {
+                startUuidCatching();
+            } else {
+                // Start these separately
+                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+                startExpiryTasks();
+            }
+            // create event util class
+            EventUtil.manager = this.IMP.initEventUtil();
+            // create Hybrid utility class
+            HybridUtils.manager = this.IMP.initHybridUtils();
+            // Inventory utility class
+            InventoryUtil.manager = this.IMP.initInventoryUtil();
+            // create setup util class
+            SetupUtils.manager = this.IMP.initSetupUtils();
+            // Set block
+            GlobalBlockQueue.IMP = new GlobalBlockQueue(IMP.initBlockQueue(), 1);
+            GlobalBlockQueue.IMP.runTask();
+            // Set chunk
+            ChunkManager.manager = this.IMP.initChunkManager();
+            // Schematic handler
+            SchematicHandler.manager = this.IMP.initSchematicHandler();
+            // Titles
+            AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
+            // Chat
+            ChatManager.manager = this.IMP.initChatManager();
+            // Commands
+            if (Settings.Enabled_Components.COMMANDS) {
+                this.IMP.registerCommands();
+            }
+            // WorldEdit
+            if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
+                try {
+                    if (this.IMP.initWorldEdit()) {
+                        PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
+                        this.worldedit = WorldEdit.getInstance();
+                        WorldEdit.getInstance().getEventBus().register(new WESubscriber());
+                        if (Settings.Enabled_Components.COMMANDS) {
+                            new WE_Anywhere();
+                        }
+
+                    }
+                } catch (Throwable e) {
+                    PlotSquared.debug(
+                        "Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
+                }
+            }
+            // Economy
+            if (Settings.Enabled_Components.ECONOMY) {
+                TaskManager
+                    .runTask(() -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
+            }
 
 /*            // Check for updates
             if (Settings.Enabled_Components.UPDATER) {
@@ -239,591 +233,588 @@ public class PlotSquared {
                 }, 36000);
             }*/
 
-      // World generators:
-      final ConfigurationSection section = this.worlds.getConfigurationSection("worlds");
-      if (section != null) {
-        for (String world : section.getKeys(false)) {
-          if (world.equals("CheckingPlotSquaredGenerator")) {
-            continue;
-          }
-          if (WorldUtil.IMP.isWorld(world)) {
-            this.IMP.setGenerator(world);
-          }
-        }
-        TaskManager.runTaskLater(() -> {
-          for (String world : section.getKeys(false)) {
-            if (world.equals("CheckingPlotSquaredGenerator")) {
-              continue;
+            // World generators:
+            final ConfigurationSection section = this.worlds.getConfigurationSection("worlds");
+            if (section != null) {
+                for (String world : section.getKeys(false)) {
+                    if (world.equals("CheckingPlotSquaredGenerator")) {
+                        continue;
+                    }
+                    if (WorldUtil.IMP.isWorld(world)) {
+                        this.IMP.setGenerator(world);
+                    }
+                }
+                TaskManager.runTaskLater(() -> {
+                    for (String world : section.getKeys(false)) {
+                        if (world.equals("CheckingPlotSquaredGenerator")) {
+                            continue;
+                        }
+                        if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
+                            debug(
+                                "&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
+                                    + " will now try to load it properly: ");
+                            debug(
+                                "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
+                            debug(
+                                "&8 - &7Your world management plugin may be faulty (or non existent)");
+                            PlotSquared.this.IMP.setGenerator(world);
+                        }
+                    }
+                }, 1);
             }
-            if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
-              debug("&c`" + world + "` was not properly loaded - " + IMP
-                  .getPluginName() + " will now try to load it properly: ");
-              debug(
-                  "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
-              debug(
-                  "&8 - &7Your world management plugin may be faulty (or non existent)");
-              PlotSquared.this.IMP.setGenerator(world);
-            }
-          }
-        }, 1);
-      }
 
-      // Copy files
-      copyFile("addplots.js", Settings.Paths.SCRIPTS);
-      copyFile("addsigns.js", Settings.Paths.SCRIPTS);
-      copyFile("automerge.js", Settings.Paths.SCRIPTS);
-      copyFile("furthest.js", Settings.Paths.SCRIPTS);
-      copyFile("mycommand.js", Settings.Paths.SCRIPTS);
-      copyFile("setbiomes.js", Settings.Paths.SCRIPTS);
-      copyFile("start.js", Settings.Paths.SCRIPTS);
-      copyFile("town.template", Settings.Paths.TEMPLATES);
-      copyFile("skyblock.template", Settings.Paths.TEMPLATES);
-      copyFile("bridge.template", Settings.Paths.TEMPLATES);
-      copyFile("de-DE.yml", Settings.Paths.TRANSLATIONS);
-      copyFile("es-ES.yml", Settings.Paths.TRANSLATIONS);
-      copyFile("zh-CN.yml", Settings.Paths.TRANSLATIONS);
-      copyFile("it-IT.yml", Settings.Paths.TRANSLATIONS);
-      copyFile("ko-KR.yml", Settings.Paths.TRANSLATIONS);
-      copyFile("fr-FR.yml", Settings.Paths.TRANSLATIONS);
-      showDebug();
-    } catch (Throwable e) {
-      e.printStackTrace();
-    }
-
-    PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
-  }
-
-  /**
-   * Get an instance of PlotSquared.
-   *
-   * @return instance of PlotSquared
-   */
-  public static PlotSquared get() {
-    return PlotSquared.instance;
-  }
-
-  public static IPlotMain imp() {
-    if (instance != null) {
-      return instance.IMP;
-    }
-    return null;
-  }
-
-  /**
-   * Log a message to the IPlotMain logger.
-   *
-   * @param message Message to log
-   * @see IPlotMain#log(String)
-   */
-  public static void log(Object message) {
-    if (message == null || message.toString().isEmpty()) {
-      return;
-    }
-    if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
-      System.out.printf("[P2][Info] %s\n", StringMan.getString(message));
-    } else {
-      PlotSquared.get().getLogger().log(StringMan.getString(message));
-    }
-  }
-
-  /**
-   * Log a message to the IPlotMain logger.
-   *
-   * @param message Message to log
-   * @see IPlotMain#log(String)
-   */
-  public static void debug(@Nullable Object message) {
-    if (Settings.DEBUG) {
-      if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
-        System.out.printf("[P2][Debug] %s\n", StringMan.getString(message));
-      } else {
-        PlotSquared.get().getLogger().log(StringMan.getString(message));
-      }
-    }
-  }
-
-  private void startUuidCatching() {
-    TaskManager.runTaskLater(() -> {
-      debug("Starting UUID caching");
-      UUIDHandler.startCaching(() -> {
-        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-        foreachPlotRaw(new RunnableVal<Plot>() {
-          @Override
-          public void run(Plot plot) {
-            if (plot.hasOwner() && plot.temp != -1) {
-              if (UUIDHandler.getName(plot.owner) == null) {
-                UUIDHandler.implementation.unknown.add(plot.owner);
-              }
-            }
-          }
-        });
-        startExpiryTasks();
-      });
-    }, 20);
-  }
-
-  private void startExpiryTasks() {
-    if (Settings.Enabled_Components.PLOT_EXPIRY) {
-      ExpireManager.IMP = new ExpireManager();
-      ExpireManager.IMP.runAutomatedTask();
-      for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
-        ExpiryTask task = new ExpiryTask(settings);
-        ExpireManager.IMP.addTask(task);
-      }
-    }
-  }
-
-  public boolean isMainThread(Thread thread) {
-    return this.thread == thread;
-  }
-
-  /**
-   * Check if `version` is >= `version2`.
-   *
-   * @param version First version
-   * @param version2 Second version
-   * @return true if `version` is >= `version2`
-   */
-  public boolean checkVersion(int[] version, int... version2) {
-    return version[0] > version2[0] || version[0] == version2[0] && version[1] > version2[1]
-        || version[0] == version2[0] && version[1] == version2[1] && version[2] >= version2[2];
-  }
-
-  /**
-   * Get the current PlotSquared version.
-   *
-   * @return current version in config or null
-   */
-  public PlotVersion getVersion() {
-    return this.version;
-  }
-
-  /**
-   * Get the server platform this plugin is running on this is running on.
-   * <p>
-   * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
-   *
-   * @return the server implementation
-   */
-  public String getPlatform() {
-    return Settings.PLATFORM;
-  }
-
-  public PlotManager getPlotManager(Plot plot) {
-    return plot.getArea().manager;
-  }
-
-  public PlotManager getPlotManager(Location location) {
-    PlotArea pa = getPlotAreaAbs(location);
-    return pa != null ? pa.manager : null;
-  }
-
-  /**
-   * Add a global reference to a plot world.
-   *
-   * @param plotArea the {@code PlotArea} to add.
-   * @see #removePlotArea(PlotArea) To remove the reference
-   */
-  public void addPlotArea(PlotArea plotArea) {
-    HashMap<PlotId, Plot> plots;
-    if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
-      if (plotArea.TYPE == 2) {
-        plots = this.plots_tmp != null ? this.plots_tmp.get(plotArea.worldname) : null;
-        if (plots != null) {
-          Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
-          while (iterator.hasNext()) {
-            Entry<PlotId, Plot> next = iterator.next();
-            PlotId id = next.getKey();
-            if (plotArea.contains(id)) {
-              next.getValue().setArea(plotArea);
-              iterator.remove();
-            }
-          }
+            // Copy files
+            copyFile("addplots.js", Settings.Paths.SCRIPTS);
+            copyFile("addsigns.js", Settings.Paths.SCRIPTS);
+            copyFile("automerge.js", Settings.Paths.SCRIPTS);
+            copyFile("furthest.js", Settings.Paths.SCRIPTS);
+            copyFile("mycommand.js", Settings.Paths.SCRIPTS);
+            copyFile("setbiomes.js", Settings.Paths.SCRIPTS);
+            copyFile("start.js", Settings.Paths.SCRIPTS);
+            copyFile("town.template", Settings.Paths.TEMPLATES);
+            copyFile("skyblock.template", Settings.Paths.TEMPLATES);
+            copyFile("bridge.template", Settings.Paths.TEMPLATES);
+            copyFile("de-DE.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("es-ES.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("zh-CN.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("it-IT.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("ko-KR.yml", Settings.Paths.TRANSLATIONS);
+            copyFile("fr-FR.yml", Settings.Paths.TRANSLATIONS);
+            showDebug();
+        } catch (Throwable e) {
+            e.printStackTrace();
         }
-      }
-    } else {
-      for (Plot entry : plots.values()) {
-        entry.setArea(plotArea);
-      }
+
+        PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
     }
-    Set<PlotCluster> clusters;
-    if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
-      if (plotArea.TYPE == 2) {
-        clusters =
-            this.clusters_tmp != null ? this.clusters_tmp.get(plotArea.worldname) : null;
-        if (clusters != null) {
-          Iterator<PlotCluster> iterator = clusters.iterator();
-          while (iterator.hasNext()) {
-            PlotCluster next = iterator.next();
-            if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
-              next.setArea(plotArea);
-              iterator.remove();
-            }
-          }
+
+    /**
+     * Get an instance of PlotSquared.
+     *
+     * @return instance of PlotSquared
+     */
+    public static PlotSquared get() {
+        return PlotSquared.instance;
+    }
+
+    public static IPlotMain imp() {
+        if (instance != null) {
+            return instance.IMP;
         }
-      }
-    } else {
-      for (PlotCluster cluster : clusters) {
-        cluster.setArea(plotArea);
-      }
+        return null;
     }
-    plotAreaManager.addPlotArea(plotArea);
-    plotArea.setupBorder();
-  }
 
-  /**
-   * Remove a plot world reference.
-   *
-   * @param area the {@code PlotArea} to remove
-   */
-  public void removePlotArea(PlotArea area) {
-    plotAreaManager.removePlotArea(area);
-    setPlotsTmp(area);
-  }
-
-  public void removePlotAreas(String world) {
-    for (PlotArea area : getPlotAreas(world)) {
-      if (area.worldname.equals(world)) {
-        removePlotArea(area);
-      }
-    }
-  }
-
-  private void setPlotsTmp(PlotArea area) {
-    if (this.plots_tmp == null) {
-      this.plots_tmp = new HashMap<>();
-    }
-    HashMap<PlotId, Plot> map = this.plots_tmp
-        .computeIfAbsent(area.toString(), k -> new HashMap<>());
-    for (Plot plot : area.getPlots()) {
-      map.put(plot.getId(), plot);
-    }
-    if (this.clusters_tmp == null) {
-      this.clusters_tmp = new HashMap<>();
-    }
-    this.clusters_tmp.put(area.toString(), area.getClusters());
-  }
-
-  public Set<PlotCluster> getClusters(String world) {
-    Set<PlotCluster> set = new HashSet<>();
-    for (PlotArea area : getPlotAreas(world)) {
-      set.addAll(area.getClusters());
-    }
-    return Collections.unmodifiableSet(set);
-
-  }
-
-  /**
-   * Get all the base plots in a single set (for merged plots it just returns the bottom plot).
-   *
-   * @return Set of base Plots
-   */
-  public Set<Plot> getBasePlots() {
-    int size = getPlotCount();
-    final Set<Plot> result = new HashSet<>(size);
-    foreachPlotArea(new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        for (Plot plot : value.getPlots()) {
-          if (!plot.isBasePlot()) {
-            continue;
-          }
-          result.add(plot);
-        }
-      }
-    });
-    return Collections.unmodifiableSet(result);
-  }
-
-  public List<Plot> sortPlotsByTemp(Collection<Plot> plots) {
-    int max = 0;
-    int overflowCount = 0;
-    for (Plot plot : plots) {
-      if (plot.temp > 0) {
-        if (plot.temp > max) {
-          max = plot.temp;
-        }
-      } else {
-        overflowCount++;
-      }
-    }
-    Plot[] array = new Plot[max + 1];
-    List<Plot> overflow = new ArrayList<>(overflowCount);
-    for (Plot plot : plots) {
-      if (plot.temp <= 0) {
-        overflow.add(plot);
-      } else {
-        array[plot.temp] = plot;
-      }
-    }
-    ArrayList<Plot> result = new ArrayList<>(plots.size());
-    for (Plot plot : array) {
-      if (plot != null) {
-        result.add(plot);
-      }
-    }
-    overflow.sort(Comparator.comparingInt(Plot::hashCode));
-    result.addAll(overflow);
-    return result;
-  }
-
-  /**
-   * Sort plots by hashcode.
-   *
-   * @param plots the collection of plots to sort
-   * @return the sorted collection {@link #sortPlots(Collection, SortType, PlotArea)} which has
-   * additional checks before calling this
-   */
-  // TODO: Re-evaluate this (previously public and deprecated), as it's being used internally
-  private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
-    int hardmax = 256000;
-    int max = 0;
-    int overflowSize = 0;
-    for (Plot plot : plots) {
-      int hash = MathMan.getPositiveId(plot.hashCode());
-      if (hash > max) {
-        if (hash >= hardmax) {
-          overflowSize++;
-        } else {
-          max = hash;
-        }
-      }
-    }
-    hardmax = Math.min(hardmax, max);
-    Plot[] cache = new Plot[hardmax + 1];
-    List<Plot> overflow = new ArrayList<>(overflowSize);
-    ArrayList<Plot> extra = new ArrayList<>();
-    for (Plot plot : plots) {
-      int hash = MathMan.getPositiveId(plot.hashCode());
-      if (hash < hardmax) {
-        if (hash >= 0) {
-          cache[hash] = plot;
-        } else {
-          extra.add(plot);
-        }
-      } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
-        extra.add(plot);
-      } else {
-        overflow.add(plot);
-      }
-    }
-    Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
-    sortPlotsByHash(overflowArray);
-    ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
-    for (Plot plot : cache) {
-      if (plot != null) {
-        result.add(plot);
-      }
-    }
-    Collections.addAll(result, overflowArray);
-    result.addAll(extra);
-    return result;
-  }
-
-  private void sortPlotsByHash(Plot[] input) {
-    List<Plot>[] bucket = new ArrayList[32];
-    for (int i = 0; i < bucket.length; i++) {
-      bucket[i] = new ArrayList<>();
-    }
-    boolean maxLength = false;
-    int placement = 1;
-    while (!maxLength) {
-      maxLength = true;
-      for (Plot i : input) {
-        int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
-        bucket[tmp & 31].add(i);
-        if (maxLength && tmp > 0) {
-          maxLength = false;
-        }
-      }
-      int a = 0;
-      for (int b = 0; b < 32; b++) {
-        for (Plot i : bucket[b]) {
-          input[a++] = i;
-        }
-        bucket[b].clear();
-      }
-      placement *= 32;
-    }
-  }
-
-  private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
-    int hardMax = 256000;
-    int max = 0;
-    int overflowSize = 0;
-    for (Plot plot : plots) {
-      int hash = MathMan.getPositiveId(plot.hashCode());
-      if (hash > max) {
-        if (hash >= hardMax) {
-          overflowSize++;
-        } else {
-          max = hash;
-        }
-      }
-    }
-    hardMax = Math.min(hardMax, max);
-    Plot[] cache = new Plot[hardMax + 1];
-    List<Plot> overflow = new ArrayList<>(overflowSize);
-    ArrayList<Plot> extra = new ArrayList<>();
-    for (Plot plot : plots) {
-      int hash = MathMan.getPositiveId(plot.hashCode());
-      if (hash < hardMax) {
-        if (hash >= 0) {
-          cache[hash] = plot;
-        } else {
-          extra.add(plot);
-        }
-      } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
-        extra.add(plot);
-      } else {
-        overflow.add(plot);
-      }
-    }
-    Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
-    sortPlotsByHash(overflowArray);
-    ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
-    for (Plot plot : cache) {
-      if (plot != null) {
-        result.add(plot);
-      }
-    }
-    Collections.addAll(result, overflowArray);
-    result.addAll(extra);
-    return result;
-  }
-
-  /**
-   * Sort plots by creation timestamp.
-   */
-
-  private List<Plot> sortPlotsByModified(Collection<Plot> input) {
-    List<Plot> list;
-    if (input instanceof List) {
-      list = (List<Plot>) input;
-    } else {
-      list = new ArrayList<>(input);
-    }
-    list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
-    return list;
-  }
-
-  /**
-   * Sort a collection of plots by world (with a priority world), then by hashcode.
-   *
-   * @param plots the plots to sort
-   * @param type The sorting method to use for each world (timestamp, or hash)
-   * @param priorityArea Use null, "world", or "gibberish" if you want default world order
-   * @return ArrayList of plot
-   */
-  public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
-      final PlotArea priorityArea) {
-    // group by world
-    // sort each
-    HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
-    int totalSize = getPlotCount();
-    if (plots.size() == totalSize) {
-      for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-        map.put(area, area.getPlots());
-      }
-    } else {
-      for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-        map.put(area, new ArrayList<>(0));
-      }
-      Collection<Plot> lastList = null;
-      PlotArea lastWorld = null;
-      for (Plot plot : plots) {
-        if (lastWorld == plot.getArea()) {
-          lastList.add(plot);
-        } else {
-          lastWorld = plot.getArea();
-          lastList = map.get(lastWorld);
-          lastList.add(plot);
-        }
-      }
-    }
-    List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
-    areas.sort((a, b) -> {
-      if (priorityArea != null) {
-        if (a.equals(priorityArea)) {
-          return -1;
-        } else if (b.equals(priorityArea)) {
-          return 1;
-        }
-      }
-      return a.hashCode() - b.hashCode();
-    });
-    ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
-    for (PlotArea area : areas) {
-      switch (type) {
-        case CREATION_DATE:
-          toReturn.addAll(sortPlotsByTemp(map.get(area)));
-          break;
-        case CREATION_DATE_TIMESTAMP:
-          toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
-          break;
-        case DISTANCE_FROM_ORIGIN:
-          toReturn.addAll(sortPlotsByHash(map.get(area)));
-          break;
-        case LAST_MODIFIED:
-          toReturn.addAll(sortPlotsByModified(map.get(area)));
-          break;
-        default:
-          break;
-      }
-    }
-    return toReturn;
-  }
-
-  /**
-   * A more generic way to filter plots - make your own method if you need complex filters.
-   *
-   * @param filters the filter
-   * @return a filtered set of plots
-   */
-  public Set<Plot> getPlots(final PlotFilter... filters) {
-    final HashSet<Plot> set = new HashSet<>();
-    foreachPlotArea(new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        for (PlotFilter filter : filters) {
-          if (!filter.allowsArea(value)) {
+    /**
+     * Log a message to the IPlotMain logger.
+     *
+     * @param message Message to log
+     * @see IPlotMain#log(String)
+     */
+    public static void log(Object message) {
+        if (message == null || message.toString().isEmpty()) {
             return;
-          }
         }
-        loop:
-        for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
-          Plot plot = entry2.getValue();
-          for (PlotFilter filter : filters) {
-            if (!filter.allowsPlot(plot)) {
-              continue loop;
+        if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
+            System.out.printf("[P2][Info] %s\n", StringMan.getString(message));
+        } else {
+            PlotSquared.get().getLogger().log(StringMan.getString(message));
+        }
+    }
+
+    /**
+     * Log a message to the IPlotMain logger.
+     *
+     * @param message Message to log
+     * @see IPlotMain#log(String)
+     */
+    public static void debug(@Nullable Object message) {
+        if (Settings.DEBUG) {
+            if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
+                System.out.printf("[P2][Debug] %s\n", StringMan.getString(message));
+            } else {
+                PlotSquared.get().getLogger().log(StringMan.getString(message));
             }
-          }
-          set.add(plot);
         }
-      }
-    });
-    return set;
-  }
+    }
 
-  /**
-   * Get all the plots in a single set.
-   *
-   * @return Set of Plots
-   */
-  public Set<Plot> getPlots() {
-    int size = getPlotCount();
-    final Set<Plot> result = new HashSet<>(size);
-    foreachPlotArea(new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        result.addAll(value.getPlots());
-      }
-    });
-    return result;
-  }
+    private void startUuidCatching() {
+        TaskManager.runTaskLater(() -> {
+            debug("Starting UUID caching");
+            UUIDHandler.startCaching(() -> {
+                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+                foreachPlotRaw(new RunnableVal<Plot>() {
+                    @Override public void run(Plot plot) {
+                        if (plot.hasOwner() && plot.temp != -1) {
+                            if (UUIDHandler.getName(plot.owner) == null) {
+                                UUIDHandler.implementation.unknown.add(plot.owner);
+                            }
+                        }
+                    }
+                });
+                startExpiryTasks();
+            });
+        }, 20);
+    }
 
-  //TODO look at uncommenting or deleting tis. Is it useful and will it work?
-  //If it is readded make sure there is proper javadoc documentation for it.
+    private void startExpiryTasks() {
+        if (Settings.Enabled_Components.PLOT_EXPIRY) {
+            ExpireManager.IMP = new ExpireManager();
+            ExpireManager.IMP.runAutomatedTask();
+            for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
+                ExpiryTask task = new ExpiryTask(settings);
+                ExpireManager.IMP.addTask(task);
+            }
+        }
+    }
+
+    public boolean isMainThread(Thread thread) {
+        return this.thread == thread;
+    }
+
+    /**
+     * Check if `version` is >= `version2`.
+     *
+     * @param version  First version
+     * @param version2 Second version
+     * @return true if `version` is >= `version2`
+     */
+    public boolean checkVersion(int[] version, int... version2) {
+        return version[0] > version2[0] || version[0] == version2[0] && version[1] > version2[1]
+            || version[0] == version2[0] && version[1] == version2[1] && version[2] >= version2[2];
+    }
+
+    /**
+     * Get the current PlotSquared version.
+     *
+     * @return current version in config or null
+     */
+    public PlotVersion getVersion() {
+        return this.version;
+    }
+
+    /**
+     * Get the server platform this plugin is running on this is running on.
+     * <p>
+     * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
+     *
+     * @return the server implementation
+     */
+    public String getPlatform() {
+        return Settings.PLATFORM;
+    }
+
+    public PlotManager getPlotManager(Plot plot) {
+        return plot.getArea().manager;
+    }
+
+    public PlotManager getPlotManager(Location location) {
+        PlotArea pa = getPlotAreaAbs(location);
+        return pa != null ? pa.manager : null;
+    }
+
+    /**
+     * Add a global reference to a plot world.
+     *
+     * @param plotArea the {@code PlotArea} to add.
+     * @see #removePlotArea(PlotArea) To remove the reference
+     */
+    public void addPlotArea(PlotArea plotArea) {
+        HashMap<PlotId, Plot> plots;
+        if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
+            if (plotArea.TYPE == 2) {
+                plots = this.plots_tmp != null ? this.plots_tmp.get(plotArea.worldname) : null;
+                if (plots != null) {
+                    Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
+                    while (iterator.hasNext()) {
+                        Entry<PlotId, Plot> next = iterator.next();
+                        PlotId id = next.getKey();
+                        if (plotArea.contains(id)) {
+                            next.getValue().setArea(plotArea);
+                            iterator.remove();
+                        }
+                    }
+                }
+            }
+        } else {
+            for (Plot entry : plots.values()) {
+                entry.setArea(plotArea);
+            }
+        }
+        Set<PlotCluster> clusters;
+        if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
+            if (plotArea.TYPE == 2) {
+                clusters =
+                    this.clusters_tmp != null ? this.clusters_tmp.get(plotArea.worldname) : null;
+                if (clusters != null) {
+                    Iterator<PlotCluster> iterator = clusters.iterator();
+                    while (iterator.hasNext()) {
+                        PlotCluster next = iterator.next();
+                        if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
+                            next.setArea(plotArea);
+                            iterator.remove();
+                        }
+                    }
+                }
+            }
+        } else {
+            for (PlotCluster cluster : clusters) {
+                cluster.setArea(plotArea);
+            }
+        }
+        plotAreaManager.addPlotArea(plotArea);
+        plotArea.setupBorder();
+    }
+
+    /**
+     * Remove a plot world reference.
+     *
+     * @param area the {@code PlotArea} to remove
+     */
+    public void removePlotArea(PlotArea area) {
+        plotAreaManager.removePlotArea(area);
+        setPlotsTmp(area);
+    }
+
+    public void removePlotAreas(String world) {
+        for (PlotArea area : getPlotAreas(world)) {
+            if (area.worldname.equals(world)) {
+                removePlotArea(area);
+            }
+        }
+    }
+
+    private void setPlotsTmp(PlotArea area) {
+        if (this.plots_tmp == null) {
+            this.plots_tmp = new HashMap<>();
+        }
+        HashMap<PlotId, Plot> map =
+            this.plots_tmp.computeIfAbsent(area.toString(), k -> new HashMap<>());
+        for (Plot plot : area.getPlots()) {
+            map.put(plot.getId(), plot);
+        }
+        if (this.clusters_tmp == null) {
+            this.clusters_tmp = new HashMap<>();
+        }
+        this.clusters_tmp.put(area.toString(), area.getClusters());
+    }
+
+    public Set<PlotCluster> getClusters(String world) {
+        Set<PlotCluster> set = new HashSet<>();
+        for (PlotArea area : getPlotAreas(world)) {
+            set.addAll(area.getClusters());
+        }
+        return Collections.unmodifiableSet(set);
+
+    }
+
+    /**
+     * Get all the base plots in a single set (for merged plots it just returns the bottom plot).
+     *
+     * @return Set of base Plots
+     */
+    public Set<Plot> getBasePlots() {
+        int size = getPlotCount();
+        final Set<Plot> result = new HashSet<>(size);
+        foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                for (Plot plot : value.getPlots()) {
+                    if (!plot.isBasePlot()) {
+                        continue;
+                    }
+                    result.add(plot);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(result);
+    }
+
+    public List<Plot> sortPlotsByTemp(Collection<Plot> plots) {
+        int max = 0;
+        int overflowCount = 0;
+        for (Plot plot : plots) {
+            if (plot.temp > 0) {
+                if (plot.temp > max) {
+                    max = plot.temp;
+                }
+            } else {
+                overflowCount++;
+            }
+        }
+        Plot[] array = new Plot[max + 1];
+        List<Plot> overflow = new ArrayList<>(overflowCount);
+        for (Plot plot : plots) {
+            if (plot.temp <= 0) {
+                overflow.add(plot);
+            } else {
+                array[plot.temp] = plot;
+            }
+        }
+        ArrayList<Plot> result = new ArrayList<>(plots.size());
+        for (Plot plot : array) {
+            if (plot != null) {
+                result.add(plot);
+            }
+        }
+        overflow.sort(Comparator.comparingInt(Plot::hashCode));
+        result.addAll(overflow);
+        return result;
+    }
+
+    /**
+     * Sort plots by hashcode.
+     *
+     * @param plots the collection of plots to sort
+     * @return the sorted collection {@link #sortPlots(Collection, SortType, PlotArea)} which has
+     * additional checks before calling this
+     */
+    // TODO: Re-evaluate this (previously public and deprecated), as it's being used internally
+    private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
+        int hardmax = 256000;
+        int max = 0;
+        int overflowSize = 0;
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash > max) {
+                if (hash >= hardmax) {
+                    overflowSize++;
+                } else {
+                    max = hash;
+                }
+            }
+        }
+        hardmax = Math.min(hardmax, max);
+        Plot[] cache = new Plot[hardmax + 1];
+        List<Plot> overflow = new ArrayList<>(overflowSize);
+        ArrayList<Plot> extra = new ArrayList<>();
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash < hardmax) {
+                if (hash >= 0) {
+                    cache[hash] = plot;
+                } else {
+                    extra.add(plot);
+                }
+            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
+                extra.add(plot);
+            } else {
+                overflow.add(plot);
+            }
+        }
+        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        sortPlotsByHash(overflowArray);
+        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
+        for (Plot plot : cache) {
+            if (plot != null) {
+                result.add(plot);
+            }
+        }
+        Collections.addAll(result, overflowArray);
+        result.addAll(extra);
+        return result;
+    }
+
+    private void sortPlotsByHash(Plot[] input) {
+        List<Plot>[] bucket = new ArrayList[32];
+        for (int i = 0; i < bucket.length; i++) {
+            bucket[i] = new ArrayList<>();
+        }
+        boolean maxLength = false;
+        int placement = 1;
+        while (!maxLength) {
+            maxLength = true;
+            for (Plot i : input) {
+                int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
+                bucket[tmp & 31].add(i);
+                if (maxLength && tmp > 0) {
+                    maxLength = false;
+                }
+            }
+            int a = 0;
+            for (int b = 0; b < 32; b++) {
+                for (Plot i : bucket[b]) {
+                    input[a++] = i;
+                }
+                bucket[b].clear();
+            }
+            placement *= 32;
+        }
+    }
+
+    private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
+        int hardMax = 256000;
+        int max = 0;
+        int overflowSize = 0;
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash > max) {
+                if (hash >= hardMax) {
+                    overflowSize++;
+                } else {
+                    max = hash;
+                }
+            }
+        }
+        hardMax = Math.min(hardMax, max);
+        Plot[] cache = new Plot[hardMax + 1];
+        List<Plot> overflow = new ArrayList<>(overflowSize);
+        ArrayList<Plot> extra = new ArrayList<>();
+        for (Plot plot : plots) {
+            int hash = MathMan.getPositiveId(plot.hashCode());
+            if (hash < hardMax) {
+                if (hash >= 0) {
+                    cache[hash] = plot;
+                } else {
+                    extra.add(plot);
+                }
+            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
+                extra.add(plot);
+            } else {
+                overflow.add(plot);
+            }
+        }
+        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        sortPlotsByHash(overflowArray);
+        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
+        for (Plot plot : cache) {
+            if (plot != null) {
+                result.add(plot);
+            }
+        }
+        Collections.addAll(result, overflowArray);
+        result.addAll(extra);
+        return result;
+    }
+
+    /**
+     * Sort plots by creation timestamp.
+     */
+
+    private List<Plot> sortPlotsByModified(Collection<Plot> input) {
+        List<Plot> list;
+        if (input instanceof List) {
+            list = (List<Plot>) input;
+        } else {
+            list = new ArrayList<>(input);
+        }
+        list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
+        return list;
+    }
+
+    /**
+     * Sort a collection of plots by world (with a priority world), then by hashcode.
+     *
+     * @param plots        the plots to sort
+     * @param type         The sorting method to use for each world (timestamp, or hash)
+     * @param priorityArea Use null, "world", or "gibberish" if you want default world order
+     * @return ArrayList of plot
+     */
+    public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
+        final PlotArea priorityArea) {
+        // group by world
+        // sort each
+        HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
+        int totalSize = getPlotCount();
+        if (plots.size() == totalSize) {
+            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+                map.put(area, area.getPlots());
+            }
+        } else {
+            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+                map.put(area, new ArrayList<>(0));
+            }
+            Collection<Plot> lastList = null;
+            PlotArea lastWorld = null;
+            for (Plot plot : plots) {
+                if (lastWorld == plot.getArea()) {
+                    lastList.add(plot);
+                } else {
+                    lastWorld = plot.getArea();
+                    lastList = map.get(lastWorld);
+                    lastList.add(plot);
+                }
+            }
+        }
+        List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
+        areas.sort((a, b) -> {
+            if (priorityArea != null) {
+                if (a.equals(priorityArea)) {
+                    return -1;
+                } else if (b.equals(priorityArea)) {
+                    return 1;
+                }
+            }
+            return a.hashCode() - b.hashCode();
+        });
+        ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
+        for (PlotArea area : areas) {
+            switch (type) {
+                case CREATION_DATE:
+                    toReturn.addAll(sortPlotsByTemp(map.get(area)));
+                    break;
+                case CREATION_DATE_TIMESTAMP:
+                    toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
+                    break;
+                case DISTANCE_FROM_ORIGIN:
+                    toReturn.addAll(sortPlotsByHash(map.get(area)));
+                    break;
+                case LAST_MODIFIED:
+                    toReturn.addAll(sortPlotsByModified(map.get(area)));
+                    break;
+                default:
+                    break;
+            }
+        }
+        return toReturn;
+    }
+
+    /**
+     * A more generic way to filter plots - make your own method if you need complex filters.
+     *
+     * @param filters the filter
+     * @return a filtered set of plots
+     */
+    public Set<Plot> getPlots(final PlotFilter... filters) {
+        final HashSet<Plot> set = new HashSet<>();
+        foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                for (PlotFilter filter : filters) {
+                    if (!filter.allowsArea(value)) {
+                        return;
+                    }
+                }
+                loop:
+                for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
+                    Plot plot = entry2.getValue();
+                    for (PlotFilter filter : filters) {
+                        if (!filter.allowsPlot(plot)) {
+                            continue loop;
+                        }
+                    }
+                    set.add(plot);
+                }
+            }
+        });
+        return set;
+    }
+
+    /**
+     * Get all the plots in a single set.
+     *
+     * @return Set of Plots
+     */
+    public Set<Plot> getPlots() {
+        int size = getPlotCount();
+        final Set<Plot> result = new HashSet<>(size);
+        foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                result.addAll(value.getPlots());
+            }
+        });
+        return result;
+    }
+
+    //TODO look at uncommenting or deleting tis. Is it useful and will it work?
+    //If it is readded make sure there is proper javadoc documentation for it.
 /*
   public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
     if (this.plots_tmp == null) {
@@ -846,1257 +837,1230 @@ public class PlotSquared {
   }
 */
 
-  /**
-   * Get all the plots owned by a player name.
-   *
-   * @param world the world
-   * @param player the plot owner
-   * @return Set of Plot
-   */
-  public Set<Plot> getPlots(String world, String player) {
-    final UUID uuid = UUIDHandler.getUUID(player, null);
-    return getPlots(world, uuid);
-  }
-
-  /**
-   * Get all the plots owned by a player name.
-   *
-   * @param area the PlotArea
-   * @param player the plot owner
-   * @return Set of Plot
-   */
-  public Set<Plot> getPlots(PlotArea area, String player) {
-    UUID uuid = UUIDHandler.getUUID(player, null);
-    return getPlots(area, uuid);
-  }
-
-  /**
-   * Get all plots by a PlotPlayer.
-   *
-   * @param world the world
-   * @param player the plot owner
-   * @return Set of plot
-   */
-  public Set<Plot> getPlots(String world, PlotPlayer player) {
-    return getPlots(world, player.getUUID());
-  }
-
-  /**
-   * Get all plots by a PlotPlayer.
-   *
-   * @param area the PlotArea
-   * @param player the plot owner
-   * @return Set of plot
-   */
-  public Set<Plot> getPlots(PlotArea area, PlotPlayer player) {
-    return getPlots(area, player.getUUID());
-  }
-
-  /**
-   * Get all plots by a UUID in a world.
-   *
-   * @param world the world
-   * @param uuid the plot owner
-   * @return Set of plot
-   */
-  public Set<Plot> getPlots(String world, UUID uuid) {
-    final Set<Plot> plots = new HashSet<>();
-    for (final Plot plot : getPlots(world)) {
-      if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-        plots.add(plot);
-      }
+    /**
+     * Get all the plots owned by a player name.
+     *
+     * @param world  the world
+     * @param player the plot owner
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlots(String world, String player) {
+        final UUID uuid = UUIDHandler.getUUID(player, null);
+        return getPlots(world, uuid);
     }
-    return Collections.unmodifiableSet(plots);
-  }
 
-  /**
-   * Get all plots by a UUID in an area.
-   *
-   * @param area the {@code PlotArea}
-   * @param uuid the plot owner
-   * @return Set of plots
-   */
-  public Set<Plot> getPlots(PlotArea area, UUID uuid) {
-    final Set<Plot> plots = new HashSet<>();
-    for (Plot plot : getPlots(area)) {
-      if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-        plots.add(plot);
-      }
+    /**
+     * Get all the plots owned by a player name.
+     *
+     * @param area   the PlotArea
+     * @param player the plot owner
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlots(PlotArea area, String player) {
+        UUID uuid = UUIDHandler.getUUID(player, null);
+        return getPlots(area, uuid);
     }
-    return Collections.unmodifiableSet(plots);
-  }
 
-  /**
-   * Check if a plot world.
-   *
-   * @param world the world
-   * @return if a plot world is registered
-   * @see #getPlotAreaByString(String) to get the PlotArea object
-   */
-  public boolean hasPlotArea(String world) {
-    return plotAreaManager.getPlotAreas(world, null).length != 0;
-  }
-
-  public Collection<Plot> getPlots(String world) {
-    final Set<Plot> set = new HashSet<>();
-    foreachPlotArea(world, new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        set.addAll(value.getPlots());
-      }
-    });
-    return set;
-  }
-
-  /**
-   * Get the plots for a PlotPlayer.
-   *
-   * @param player the player to retrieve the plots for
-   * @return Set of Plot
-   */
-  public Set<Plot> getPlots(PlotPlayer player) {
-    return getPlots(player.getUUID());
-  }
-
-  public Collection<Plot> getPlots(PlotArea area) {
-    return area == null ? EMPTY_SET : area.getPlots();
-  }
-
-  public Plot getPlot(PlotArea area, PlotId id) {
-    return area == null ? null : id == null ? null : area.getPlot(id);
-  }
-
-  public Set<Plot> getBasePlots(PlotPlayer player) {
-    return getBasePlots(player.getUUID());
-  }
-
-  /**
-   * Get the plots for a UUID.
-   *
-   * @param uuid the plot owner
-   * @return Set of Plot's owned by the player
-   */
-  public Set<Plot> getPlots(final UUID uuid) {
-    final Set<Plot> plots = new HashSet<>();
-    foreachPlot(new RunnableVal<Plot>() {
-      @Override
-      public void run(Plot value) {
-        if (value.isOwnerAbs(uuid)) {
-          plots.add(value);
-        }
-      }
-    });
-    return Collections.unmodifiableSet(plots);
-  }
-
-  public boolean hasPlot(final UUID uuid) {
-    for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
-      if (area.hasPlot(uuid)) {
-        return true;
-      }
+    /**
+     * Get all plots by a PlotPlayer.
+     *
+     * @param world  the world
+     * @param player the plot owner
+     * @return Set of plot
+     */
+    public Set<Plot> getPlots(String world, PlotPlayer player) {
+        return getPlots(world, player.getUUID());
     }
-    return false;
-  }
 
-  public Set<Plot> getBasePlots(final UUID uuid) {
-    final Set<Plot> plots = new HashSet<>();
-    foreachBasePlot(new RunnableVal<Plot>() {
-      @Override
-      public void run(Plot value) {
-        if (value.isOwner(uuid)) {
-          plots.add(value);
-        }
-      }
-    });
-    return Collections.unmodifiableSet(plots);
-  }
+    /**
+     * Get all plots by a PlotPlayer.
+     *
+     * @param area   the PlotArea
+     * @param player the plot owner
+     * @return Set of plot
+     */
+    public Set<Plot> getPlots(PlotArea area, PlotPlayer player) {
+        return getPlots(area, player.getUUID());
+    }
 
-  /**
-   * Get the plots for a UUID.
-   *
-   * @param uuid the UUID of the owner
-   * @return Set of Plot
-   */
-  public Set<Plot> getPlotsAbs(final UUID uuid) {
-    final Set<Plot> plots = new HashSet<>();
-    foreachPlot(new RunnableVal<Plot>() {
-      @Override
-      public void run(Plot value) {
-        if (value.isOwnerAbs(uuid)) {
-          plots.add(value);
-        }
-      }
-    });
-    return Collections.unmodifiableSet(plots);
-  }
-
-  /**
-   * Unregister a plot from local memory (does not call DB).
-   *
-   * @param plot the plot to remove
-   * @param callEvent If to call an event about the plot being removed
-   * @return true if plot existed | false if it didn't
-   */
-  public boolean removePlot(Plot plot, boolean callEvent) {
-    if (plot == null) {
-      return false;
-    }
-    if (callEvent) {
-      EventUtil.manager.callDelete(plot);
-    }
-    if (plot.getArea().removePlot(plot.getId())) {
-      PlotId last = (PlotId) plot.getArea().getMeta("lastPlot");
-      int last_max = Math.max(Math.abs(last.x), Math.abs(last.y));
-      int this_max = Math.max(Math.abs(plot.getId().x), Math.abs(plot.getId().y));
-      if (this_max < last_max) {
-        plot.getArea().setMeta("lastPlot", plot.getId());
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * This method is called by the PlotGenerator class normally.
-   * <ul>
-   * <li>Initializes the PlotArea and PlotManager classes
-   * <li>Registers the PlotArea and PlotManager classes
-   * <li>Loads (and/or generates) the PlotArea configuration
-   * <li>Sets up the world border if configured
-   * </ul>
-   *
-   * <p>If loading an augmented plot world:
-   * <ul>
-   * <li>Creates the AugmentedPopulator classes
-   * <li>Injects the AugmentedPopulator classes if required
-   * </ul>
-   *
-   * @param world the world to load
-   * @param baseGenerator The generator for that world, or null
-   */
-  public void loadWorld(String world, GeneratorWrapper<?> baseGenerator) {
-    if (world.equals("CheckingPlotSquaredGenerator")) {
-      return;
-    }
-    this.plotAreaManager.addWorld(world);
-    Set<String> worlds;
-    if (this.worlds.contains("worlds")) {
-      worlds = this.worlds.getConfigurationSection("worlds").getKeys(false);
-    } else {
-      worlds = new HashSet<>();
-    }
-    String path = "worlds." + world;
-    ConfigurationSection worldSection = this.worlds.getConfigurationSection(path);
-    int type;
-    if (worldSection != null) {
-      type = worldSection.getInt("generator.type", 0);
-    } else {
-      type = 0;
-    }
-    if (type == 0) {
-      if (plotAreaManager.getPlotAreas(world, null).length != 0) {
-        debug("World possibly already loaded: " + world);
-        return;
-      }
-      IndependentPlotGenerator plotGenerator;
-      if (baseGenerator != null && baseGenerator.isFull()) {
-        plotGenerator = baseGenerator.getPlotGenerator();
-      } else if (worldSection != null) {
-        String secondaryGeneratorName = worldSection.getString("generator.plugin");
-        GeneratorWrapper<?> secondaryGenerator =
-            this.IMP.getGenerator(world, secondaryGeneratorName);
-        if (secondaryGenerator != null && secondaryGenerator.isFull()) {
-          plotGenerator = secondaryGenerator.getPlotGenerator();
-        } else {
-          String primaryGeneratorName = worldSection.getString("generator.init");
-          GeneratorWrapper<?> primaryGenerator =
-              this.IMP.getGenerator(world, primaryGeneratorName);
-          if (primaryGenerator != null && primaryGenerator.isFull()) {
-            plotGenerator = primaryGenerator.getPlotGenerator();
-          } else {
-            return;
-          }
-        }
-      } else {
-        return;
-      }
-      // Conventional plot generator
-      PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
-      PlotManager plotManager = plotGenerator.getNewPlotManager();
-      PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-      PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
-      PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
-      PlotSquared
-          .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
-      if (!this.worlds.contains(path)) {
-        this.worlds.createSection(path);
-        worldSection = this.worlds.getConfigurationSection(path);
-      }
-      plotArea.saveConfiguration(worldSection);
-      plotArea.loadDefaultConfiguration(worldSection);
-      try {
-        this.worlds.save(this.worldsFile);
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-      // Now add it
-      addPlotArea(plotArea);
-      plotGenerator.initialize(plotArea);
-    } else {
-      if (!worlds.contains(world)) {
-        return;
-      }
-      ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
-      if (areasSection == null) {
-        if (plotAreaManager.getPlotAreas(world, null).length != 0) {
-          debug("World possibly already loaded: " + world);
-          return;
-        }
-        PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-        String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
-        if (type == 2) {
-          Set<PlotCluster> clusters = this.clusters_tmp != null ?
-              this.clusters_tmp.get(world) :
-              new HashSet<>();
-          if (clusters == null) {
-            throw new IllegalArgumentException("No cluster exists for world: " + world);
-          }
-          ArrayDeque<PlotArea> toLoad = new ArrayDeque<>();
-          for (PlotCluster cluster : clusters) {
-            PlotId pos1 = cluster.getP1(); // Cluster pos1
-            PlotId pos2 = cluster.getP2(); // Cluster pos2
-            String name = cluster.getName(); // Cluster name
-            String fullId = name + "-" + pos1 + "-" + pos2;
-            worldSection.createSection("areas." + fullId);
-            DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
-
-            PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
-            GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-            if (areaGen == null) {
-              throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+    /**
+     * Get all plots by a UUID in a world.
+     *
+     * @param world the world
+     * @param uuid  the plot owner
+     * @return Set of plot
+     */
+    public Set<Plot> getPlots(String world, UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        for (final Plot plot : getPlots(world)) {
+            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
+                plots.add(plot);
             }
-            PlotArea pa =
-                areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
-            pa.saveConfiguration(worldSection);
-            pa.loadDefaultConfiguration(worldSection);
-            try {
-              this.worlds.save(this.worldsFile);
-            } catch (IOException e) {
-              e.printStackTrace();
+        }
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Get all plots by a UUID in an area.
+     *
+     * @param area the {@code PlotArea}
+     * @param uuid the plot owner
+     * @return Set of plots
+     */
+    public Set<Plot> getPlots(PlotArea area, UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        for (Plot plot : getPlots(area)) {
+            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
+                plots.add(plot);
             }
-            PlotSquared
-                .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-            PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-            PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
-            PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
-                + " (invalid or old configuration?)");
-            areaGen.getPlotGenerator().initialize(pa);
-            areaGen.augment(pa);
-            toLoad.add(pa);
-          }
-          for (PlotArea area : toLoad) {
-            addPlotArea(area);
-          }
-          return;
         }
-        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-        if (areaGen == null) {
-          throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-        }
-        PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
-        pa.saveConfiguration(worldSection);
-        pa.loadDefaultConfiguration(worldSection);
-        try {
-          this.worlds.save(this.worldsFile);
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-        PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
-        PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
-        PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
-        areaGen.getPlotGenerator().initialize(pa);
-        areaGen.augment(pa);
-        addPlotArea(pa);
-        return;
-      }
-      if (type == 1) {
-        throw new IllegalArgumentException(
-            "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
-      }
-      for (String areaId : areasSection.getKeys(false)) {
-        PlotSquared.log(C.PREFIX + "&3 - " + areaId);
-        String[] split = areaId.split("(?<=[^;-])-");
-        if (split.length != 3) {
-          throw new IllegalArgumentException("Invalid Area identifier: " + areaId
-              + ". Expected form `<name>-<pos1>-<pos2>`");
-        }
-        String name = split[0];
-        PlotId pos1 = PlotId.fromString(split[1]);
-        PlotId pos2 = PlotId.fromString(split[2]);
-        if (pos1 == null || pos2 == null || name.isEmpty()) {
-          throw new IllegalArgumentException("Invalid Area identifier: " + areaId
-              + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
-        }
-        PlotArea existing = getPlotArea(world, name);
-        if (existing != null && name.equals(existing.id)) {
-          continue;
-        }
-        ConfigurationSection section = areasSection.getConfigurationSection(areaId);
-        YamlConfiguration clone = new YamlConfiguration();
-        for (String key : section.getKeys(true)) {
-          if (section.get(key) instanceof MemorySection) {
-            continue;
-          }
-          if (!clone.contains(key)) {
-            clone.set(key, section.get(key));
-          }
-        }
-        for (String key : worldSection.getKeys(true)) {
-          if (worldSection.get(key) instanceof MemorySection) {
-            continue;
-          }
-          if (!key.startsWith("areas") && !clone.contains(key)) {
-            clone.set(key, worldSection.get(key));
-          }
-        }
-        String gen_string = clone.getString("generator.plugin", IMP.getPluginName());
-        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-        if (areaGen == null) {
-          throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-        }
-        PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
-        pa.saveConfiguration(clone);
-        // netSections is the combination of
-        for (String key : clone.getKeys(true)) {
-          if (clone.get(key) instanceof MemorySection) {
-            continue;
-          }
-          if (!worldSection.contains(key)) {
-            worldSection.set(key, clone.get(key));
-          } else {
-            Object value = worldSection.get(key);
-            if (!Objects.equals(value, clone.get(key))) {
-              section.set(key, clone.get(key));
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Check if a plot world.
+     *
+     * @param world the world
+     * @return if a plot world is registered
+     * @see #getPlotAreaByString(String) to get the PlotArea object
+     */
+    public boolean hasPlotArea(String world) {
+        return plotAreaManager.getPlotAreas(world, null).length != 0;
+    }
+
+    public Collection<Plot> getPlots(String world) {
+        final Set<Plot> set = new HashSet<>();
+        foreachPlotArea(world, new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                set.addAll(value.getPlots());
             }
-          }
-        }
-        pa.loadDefaultConfiguration(clone);
-        try {
-          this.worlds.save(this.worldsFile);
-        } catch (IOException e) {
-          e.printStackTrace();
-        }
-        PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
-        PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
-        areaGen.getPlotGenerator().initialize(pa);
-        areaGen.augment(pa);
-        addPlotArea(pa);
-      }
-    }
-  }
-
-  /**
-   * Setup the configuration for a plot world based on world arguments.
-   *
-   *
-   * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
-   *
-   * @param world The name of the world
-   * @param args The arguments
-   * @param generator the plot generator
-   * @return boolean | if valid arguments were provided
-   */
-  public boolean setupPlotWorld(String world, String args, IndependentPlotGenerator generator) {
-    if (args != null && !args.isEmpty()) {
-      // save configuration
-
-      final List<String> validArguments = Arrays
-          .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
-              "w=", "wall=", "b=", "border=");
-
-      // Calculate the number of expected arguments
-      int expected = 0;
-      for (final String validArgument : validArguments) {
-        if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
-          expected += 1;
-        }
-      }
-
-      String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
-
-      if (split.length > expected) {
-        // This means we have multi-block block buckets
-        String[] combinedArgs = new String[expected];
-        int index = 0;
-
-        StringBuilder argBuilder = new StringBuilder();
-        outer:
-        for (final String string : split) {
-          for (final String validArgument : validArguments) {
-            if (string.contains(validArgument)) {
-              if (!argBuilder.toString().isEmpty()) {
-                combinedArgs[index++] = argBuilder.toString();
-                argBuilder = new StringBuilder();
-              }
-              argBuilder.append(string);
-              continue outer;
-            }
-          }
-          if (argBuilder.toString().charAt(argBuilder.length() - 1) != '=') {
-            argBuilder.append(",");
-          }
-          argBuilder.append(string);
-        }
-
-        if (!argBuilder.toString().isEmpty()) {
-          combinedArgs[index] = argBuilder.toString();
-        }
-
-        split = combinedArgs;
-      }
-
-      HybridPlotWorld plotworld = new HybridPlotWorld(world, null, generator, null, null);
-      for (String element : split) {
-        String[] pair = element.split("=");
-        if (pair.length != 2) {
-          PlotSquared.log("&cNo value provided for: &7" + element);
-          return false;
-        }
-        String key = pair[0].toLowerCase();
-        String value = pair[1];
-        String base = "worlds." + world + ".";
-        try {
-          switch (key) {
-            case "s":
-            case "size":
-              this.worlds.set(base + "plot.size",
-                  Configuration.INTEGER.parseString(value).shortValue());
-              break;
-            case "g":
-            case "gap":
-              this.worlds.set(base + "road.width",
-                  Configuration.INTEGER.parseString(value).shortValue());
-              break;
-            case "h":
-            case "height":
-              this.worlds.set(base + "road.height",
-                  Configuration.INTEGER.parseString(value).shortValue());
-              this.worlds.set(base + "plot.height",
-                  Configuration.INTEGER.parseString(value).shortValue());
-              this.worlds.set(base + "wall.height",
-                  Configuration.INTEGER.parseString(value).shortValue());
-              break;
-            case "f":
-            case "floor":
-              this.worlds.set(base + "plot.floor",
-                  Configuration.BLOCK_BUCKET.parseString(value).toString());
-              break;
-            case "m":
-            case "main":
-              this.worlds.set(base + "plot.filling",
-                  Configuration.BLOCK_BUCKET.parseString(value).toString());
-              break;
-            case "w":
-            case "wall":
-              this.worlds.set(base + "wall.filling",
-                  Configuration.BLOCK_BUCKET.parseString(value).toString());
-              break;
-            case "b":
-            case "border":
-              this.worlds.set(base + "wall.block",
-                  Configuration.BLOCK_BUCKET.parseString(value).toString());
-              break;
-            default:
-              PlotSquared.log("&cKey not found: &7" + element);
-              return false;
-          }
-        } catch (Exception e) {
-          e.printStackTrace();
-          PlotSquared.log("&cInvalid value: &7" + value + " in arg " + element);
-          return false;
-        }
-      }
-      try {
-        ConfigurationSection section =
-            this.worlds.getConfigurationSection("worlds." + world);
-        plotworld.saveConfiguration(section);
-        plotworld.loadConfiguration(section);
-        this.worlds.save(this.worldsFile);
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-    return true;
-  }
-
-  public boolean canUpdate(@NonNull final String current, @NonNull final String other) {
-    final String s1 = normalisedVersion(current);
-    final String s2 = normalisedVersion(other);
-    return s1.compareTo(s2) < 0;
-  }
-
-  public String normalisedVersion(@NonNull final String version) {
-    final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
-    final StringBuilder sb = new StringBuilder();
-    for (final String s : split) {
-      sb.append(String.format("%" + 4 + 's', s));
-    }
-    return sb.toString();
-  }
-
-  public boolean update(PlotPlayer sender, URL url) {
-    try {
-      String name = this.jarFile.getName();
-      File newJar = new File("plugins/update/" + name);
-      MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
-      URLConnection con = url.openConnection();
-      try (InputStream stream = con.getInputStream()) {
-        File parent = newJar.getParentFile();
-        if (!parent.exists()) {
-          parent.mkdirs();
-        }
-        MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
-        if (!newJar.delete()) {
-          MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
-          MainUtil.sendMessage(sender, "Jar file failed to delete.");
-          MainUtil.sendMessage(sender, " - Please update manually");
-        }
-        Files.copy(stream, newJar.toPath());
-      }
-      MainUtil.sendMessage(sender,
-          "$1The update will take effect when the server is restarted next");
-      return true;
-    } catch (IOException e) {
-      MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
-      MainUtil.sendMessage(sender, " - Please update manually");
-      PlotSquared.log("============ Stacktrace ============");
-      e.printStackTrace();
-      PlotSquared.log("====================================");
-    }
-    return false;
-  }
-
-  /**
-   * Copy a file from inside the jar to a location
-   *
-   * @param file Name of the file inside PlotSquared.jar
-   * @param folder The output location relative to /plugins/PlotSquared/
-   */
-  public void copyFile(String file, String folder) {
-    try {
-      File output = this.IMP.getDirectory();
-      if (!output.exists()) {
-        output.mkdirs();
-      }
-      File newFile = MainUtil.getFile(output, folder + File.separator + file);
-      if (newFile.exists()) {
-        return;
-      }
-      try (InputStream stream = this.IMP.getClass().getResourceAsStream(file)) {
-        byte[] buffer = new byte[2048];
-        if (stream == null) {
-          try (ZipInputStream zis = new ZipInputStream(
-              new FileInputStream(this.jarFile))) {
-            ZipEntry ze = zis.getNextEntry();
-            while (ze != null) {
-              String name = ze.getName();
-              if (name.equals(file)) {
-                new File(newFile.getParent()).mkdirs();
-                try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                  int len;
-                  while ((len = zis.read(buffer)) > 0) {
-                    fos.write(buffer, 0, len);
-                  }
-                }
-                ze = null;
-              } else {
-                ze = zis.getNextEntry();
-              }
-            }
-            zis.closeEntry();
-          }
-          return;
-        }
-        newFile.createNewFile();
-        try (FileOutputStream fos = new FileOutputStream(newFile)) {
-          int len;
-          while ((len = stream.read(buffer)) > 0) {
-            fos.write(buffer, 0, len);
-          }
-        }
-      }
-    } catch (IOException e) {
-      e.printStackTrace();
-      PlotSquared.log("&cCould not save " + file);
-    }
-  }
-
-  private Map<String, Map<PlotId, Plot>> getPlotsRaw() {
-    HashMap<String, Map<PlotId, Plot>> map = new HashMap<>();
-    for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-      Map<PlotId, Plot> map2 = map.get(area.toString());
-      if (map2 == null) {
-        map.put(area.toString(), area.getPlotsRaw());
-      } else {
-        map2.putAll(area.getPlotsRaw());
-      }
-    }
-    return map;
-  }
-
-  /**
-   * Close the database connection.
-   */
-  public void disable() {
-    try {
-      // Validate that all data in the db is correct
-      final HashSet<Plot> plots = new HashSet<>();
-      try {
-        foreachPlotRaw(new RunnableVal<Plot>() {
-          @Override
-          public void run(Plot value) {
-            plots.add(value);
-          }
         });
-      } catch (final Exception ignored) {
-      }
-      DBFunc.validatePlots(plots);
-
-      // Close the connection
-      DBFunc.close();
-      UUIDHandler.handleShutdown();
-    } catch (NullPointerException exception) {
-      exception.printStackTrace();
-      PlotSquared.log("&cCould not close database connection!");
+        return set;
     }
-  }
 
-  /**
-   * Setup the database connection.
-   */
-  public void setupDatabase() {
-    try {
-      if (DBFunc.dbManager != null) {
-        DBFunc.dbManager.close();
-      }
-      Database database;
-      if (Storage.MySQL.USE) {
-        database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
-            Storage.MySQL.USER, Storage.MySQL.PASSWORD);
-      } else if (Storage.SQLite.USE) {
-        File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
-        database = new SQLite(file);
-      } else {
-        PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
-        this.IMP.disable();
-        return;
-      }
-      DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
-      PlotSquared.log("GETTING PLOTS NOW AND STORING TO PLOTS_TMP");
-      for (PlotArea allPlotArea : plotAreaManager.getAllPlotAreas()) {
-        PlotSquared.log(allPlotArea.toString());
-      }
+    /**
+     * Get the plots for a PlotPlayer.
+     *
+     * @param player the player to retrieve the plots for
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlots(PlotPlayer player) {
+        return getPlots(player.getUUID());
+    }
 
-      this.plots_tmp = DBFunc.getPlots();
-      if (plotAreaManager instanceof SinglePlotAreaManager) {
-        SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
-        addPlotArea(area);
-        ConfigurationSection section = worlds.getConfigurationSection("worlds.*");
-        if (section == null) {
-          section = worlds.createSection("worlds.*");
+    public Collection<Plot> getPlots(PlotArea area) {
+        return area == null ? EMPTY_SET : area.getPlots();
+    }
+
+    public Plot getPlot(PlotArea area, PlotId id) {
+        return area == null ? null : id == null ? null : area.getPlot(id);
+    }
+
+    public Set<Plot> getBasePlots(PlotPlayer player) {
+        return getBasePlots(player.getUUID());
+    }
+
+    /**
+     * Get the plots for a UUID.
+     *
+     * @param uuid the plot owner
+     * @return Set of Plot's owned by the player
+     */
+    public Set<Plot> getPlots(final UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        foreachPlot(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (value.isOwnerAbs(uuid)) {
+                    plots.add(value);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(plots);
+    }
+
+    public boolean hasPlot(final UUID uuid) {
+        for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
+            if (area.hasPlot(uuid)) {
+                return true;
+            }
         }
-        area.saveConfiguration(section);
-        area.loadDefaultConfiguration(section);
-      }
-      this.clusters_tmp = DBFunc.getClusters();
-    } catch (ClassNotFoundException | SQLException e) {
-      PlotSquared.log(
-          C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
-      if (Storage.MySQL.USE) {
-        PlotSquared.log("$4MYSQL");
-      } else if (Storage.SQLite.USE) {
-        PlotSquared.log("$4SQLITE");
-      }
-      PlotSquared.log(
-          "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-      e.printStackTrace();
-      PlotSquared.log("&d==== End of stacktrace ====");
-      PlotSquared.log("&6Please go to the " + IMP.getPluginName()
-          + " 'storage.yml' and configure the database correctly.");
-      this.IMP.disable();
+        return false;
     }
-  }
 
-  /**
-   * Setup the default configuration.
-   *
-   * @throws IOException if the config failed to save
-   */
-  public void setupConfig() throws IOException {
-    String lastVersionString = this.config.getString("version");
-    if (lastVersionString != null) {
-      String[] split = lastVersionString.split("\\.");
-      int[] lastVersion = new int[]{Integer.parseInt(split[0]), Integer.parseInt(split[1]),
-          Integer.parseInt(split[2])};
-      if (checkVersion(new int[]{3, 4, 0}, lastVersion)) {
-        Settings.convertLegacy(configFile);
-        if (config.contains("worlds")) {
-          ConfigurationSection worldSection = config.getConfigurationSection("worlds");
-          worlds.set("worlds", worldSection);
-          try {
-            worlds.save(worldsFile);
-          } catch (IOException e) {
-            PlotSquared.debug("Failed to save " + IMP.getPluginName() + " worlds.yml");
+    public Set<Plot> getBasePlots(final UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        foreachBasePlot(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (value.isOwner(uuid)) {
+                    plots.add(value);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Get the plots for a UUID.
+     *
+     * @param uuid the UUID of the owner
+     * @return Set of Plot
+     */
+    public Set<Plot> getPlotsAbs(final UUID uuid) {
+        final Set<Plot> plots = new HashSet<>();
+        foreachPlot(new RunnableVal<Plot>() {
+            @Override public void run(Plot value) {
+                if (value.isOwnerAbs(uuid)) {
+                    plots.add(value);
+                }
+            }
+        });
+        return Collections.unmodifiableSet(plots);
+    }
+
+    /**
+     * Unregister a plot from local memory (does not call DB).
+     *
+     * @param plot      the plot to remove
+     * @param callEvent If to call an event about the plot being removed
+     * @return true if plot existed | false if it didn't
+     */
+    public boolean removePlot(Plot plot, boolean callEvent) {
+        if (plot == null) {
+            return false;
+        }
+        if (callEvent) {
+            EventUtil.manager.callDelete(plot);
+        }
+        if (plot.getArea().removePlot(plot.getId())) {
+            PlotId last = (PlotId) plot.getArea().getMeta("lastPlot");
+            int last_max = Math.max(Math.abs(last.x), Math.abs(last.y));
+            int this_max = Math.max(Math.abs(plot.getId().x), Math.abs(plot.getId().y));
+            if (this_max < last_max) {
+                plot.getArea().setMeta("lastPlot", plot.getId());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * This method is called by the PlotGenerator class normally.
+     * <ul>
+     * <li>Initializes the PlotArea and PlotManager classes
+     * <li>Registers the PlotArea and PlotManager classes
+     * <li>Loads (and/or generates) the PlotArea configuration
+     * <li>Sets up the world border if configured
+     * </ul>
+     *
+     * <p>If loading an augmented plot world:
+     * <ul>
+     * <li>Creates the AugmentedPopulator classes
+     * <li>Injects the AugmentedPopulator classes if required
+     * </ul>
+     *
+     * @param world         the world to load
+     * @param baseGenerator The generator for that world, or null
+     */
+    public void loadWorld(String world, GeneratorWrapper<?> baseGenerator) {
+        if (world.equals("CheckingPlotSquaredGenerator")) {
+            return;
+        }
+        this.plotAreaManager.addWorld(world);
+        Set<String> worlds;
+        if (this.worlds.contains("worlds")) {
+            worlds = this.worlds.getConfigurationSection("worlds").getKeys(false);
+        } else {
+            worlds = new HashSet<>();
+        }
+        String path = "worlds." + world;
+        ConfigurationSection worldSection = this.worlds.getConfigurationSection(path);
+        int type;
+        if (worldSection != null) {
+            type = worldSection.getInt("generator.type", 0);
+        } else {
+            type = 0;
+        }
+        if (type == 0) {
+            if (plotAreaManager.getPlotAreas(world, null).length != 0) {
+                debug("World possibly already loaded: " + world);
+                return;
+            }
+            IndependentPlotGenerator plotGenerator;
+            if (baseGenerator != null && baseGenerator.isFull()) {
+                plotGenerator = baseGenerator.getPlotGenerator();
+            } else if (worldSection != null) {
+                String secondaryGeneratorName = worldSection.getString("generator.plugin");
+                GeneratorWrapper<?> secondaryGenerator =
+                    this.IMP.getGenerator(world, secondaryGeneratorName);
+                if (secondaryGenerator != null && secondaryGenerator.isFull()) {
+                    plotGenerator = secondaryGenerator.getPlotGenerator();
+                } else {
+                    String primaryGeneratorName = worldSection.getString("generator.init");
+                    GeneratorWrapper<?> primaryGenerator =
+                        this.IMP.getGenerator(world, primaryGeneratorName);
+                    if (primaryGenerator != null && primaryGenerator.isFull()) {
+                        plotGenerator = primaryGenerator.getPlotGenerator();
+                    } else {
+                        return;
+                    }
+                }
+            } else {
+                return;
+            }
+            // Conventional plot generator
+            PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
+            PlotManager plotManager = plotGenerator.getNewPlotManager();
+            PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+            PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
+            PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
+            PlotSquared
+                .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
+            if (!this.worlds.contains(path)) {
+                this.worlds.createSection(path);
+                worldSection = this.worlds.getConfigurationSection(path);
+            }
+            plotArea.saveConfiguration(worldSection);
+            plotArea.loadDefaultConfiguration(worldSection);
+            try {
+                this.worlds.save(this.worldsFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            // Now add it
+            addPlotArea(plotArea);
+            plotGenerator.initialize(plotArea);
+        } else {
+            if (!worlds.contains(world)) {
+                return;
+            }
+            ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
+            if (areasSection == null) {
+                if (plotAreaManager.getPlotAreas(world, null).length != 0) {
+                    debug("World possibly already loaded: " + world);
+                    return;
+                }
+                PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+                String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
+                if (type == 2) {
+                    Set<PlotCluster> clusters =
+                        this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<>();
+                    if (clusters == null) {
+                        throw new IllegalArgumentException("No cluster exists for world: " + world);
+                    }
+                    ArrayDeque<PlotArea> toLoad = new ArrayDeque<>();
+                    for (PlotCluster cluster : clusters) {
+                        PlotId pos1 = cluster.getP1(); // Cluster pos1
+                        PlotId pos2 = cluster.getP2(); // Cluster pos2
+                        String name = cluster.getName(); // Cluster name
+                        String fullId = name + "-" + pos1 + "-" + pos2;
+                        worldSection.createSection("areas." + fullId);
+                        DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
+
+                        PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
+                        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+                        if (areaGen == null) {
+                            throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+                        }
+                        PlotArea pa =
+                            areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
+                        pa.saveConfiguration(worldSection);
+                        pa.loadDefaultConfiguration(worldSection);
+                        try {
+                            this.worlds.save(this.worldsFile);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        PlotSquared
+                            .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+                        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
+                        PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
+                            + " (invalid or old configuration?)");
+                        areaGen.getPlotGenerator().initialize(pa);
+                        areaGen.augment(pa);
+                        toLoad.add(pa);
+                    }
+                    for (PlotArea area : toLoad) {
+                        addPlotArea(area);
+                    }
+                    return;
+                }
+                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+                if (areaGen == null) {
+                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+                }
+                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
+                pa.saveConfiguration(worldSection);
+                pa.loadDefaultConfiguration(worldSection);
+                try {
+                    this.worlds.save(this.worldsFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
+                PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
+                PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
+                areaGen.getPlotGenerator().initialize(pa);
+                areaGen.augment(pa);
+                addPlotArea(pa);
+                return;
+            }
+            if (type == 1) {
+                throw new IllegalArgumentException(
+                    "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
+            }
+            for (String areaId : areasSection.getKeys(false)) {
+                PlotSquared.log(C.PREFIX + "&3 - " + areaId);
+                String[] split = areaId.split("(?<=[^;-])-");
+                if (split.length != 3) {
+                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
+                        + ". Expected form `<name>-<pos1>-<pos2>`");
+                }
+                String name = split[0];
+                PlotId pos1 = PlotId.fromString(split[1]);
+                PlotId pos2 = PlotId.fromString(split[2]);
+                if (pos1 == null || pos2 == null || name.isEmpty()) {
+                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
+                        + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
+                }
+                PlotArea existing = getPlotArea(world, name);
+                if (existing != null && name.equals(existing.id)) {
+                    continue;
+                }
+                ConfigurationSection section = areasSection.getConfigurationSection(areaId);
+                YamlConfiguration clone = new YamlConfiguration();
+                for (String key : section.getKeys(true)) {
+                    if (section.get(key) instanceof MemorySection) {
+                        continue;
+                    }
+                    if (!clone.contains(key)) {
+                        clone.set(key, section.get(key));
+                    }
+                }
+                for (String key : worldSection.getKeys(true)) {
+                    if (worldSection.get(key) instanceof MemorySection) {
+                        continue;
+                    }
+                    if (!key.startsWith("areas") && !clone.contains(key)) {
+                        clone.set(key, worldSection.get(key));
+                    }
+                }
+                String gen_string = clone.getString("generator.plugin", IMP.getPluginName());
+                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
+                if (areaGen == null) {
+                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
+                }
+                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
+                pa.saveConfiguration(clone);
+                // netSections is the combination of
+                for (String key : clone.getKeys(true)) {
+                    if (clone.get(key) instanceof MemorySection) {
+                        continue;
+                    }
+                    if (!worldSection.contains(key)) {
+                        worldSection.set(key, clone.get(key));
+                    } else {
+                        Object value = worldSection.get(key);
+                        if (!Objects.equals(value, clone.get(key))) {
+                            section.set(key, clone.get(key));
+                        }
+                    }
+                }
+                pa.loadDefaultConfiguration(clone);
+                try {
+                    this.worlds.save(this.worldsFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
+                PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
+                PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
+                areaGen.getPlotGenerator().initialize(pa);
+                areaGen.augment(pa);
+                addPlotArea(pa);
+            }
+        }
+    }
+
+    /**
+     * Setup the configuration for a plot world based on world arguments.
+     *
+     *
+     * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
+     *
+     * @param world     The name of the world
+     * @param args      The arguments
+     * @param generator the plot generator
+     * @return boolean | if valid arguments were provided
+     */
+    public boolean setupPlotWorld(String world, String args, IndependentPlotGenerator generator) {
+        if (args != null && !args.isEmpty()) {
+            // save configuration
+
+            final List<String> validArguments = Arrays
+                .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
+                    "w=", "wall=", "b=", "border=");
+
+            // Calculate the number of expected arguments
+            int expected = 0;
+            for (final String validArgument : validArguments) {
+                if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
+                    expected += 1;
+                }
+            }
+
+            String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
+
+            if (split.length > expected) {
+                // This means we have multi-block block buckets
+                String[] combinedArgs = new String[expected];
+                int index = 0;
+
+                StringBuilder argBuilder = new StringBuilder();
+                outer:
+                for (final String string : split) {
+                    for (final String validArgument : validArguments) {
+                        if (string.contains(validArgument)) {
+                            if (!argBuilder.toString().isEmpty()) {
+                                combinedArgs[index++] = argBuilder.toString();
+                                argBuilder = new StringBuilder();
+                            }
+                            argBuilder.append(string);
+                            continue outer;
+                        }
+                    }
+                    if (argBuilder.toString().charAt(argBuilder.length() - 1) != '=') {
+                        argBuilder.append(",");
+                    }
+                    argBuilder.append(string);
+                }
+
+                if (!argBuilder.toString().isEmpty()) {
+                    combinedArgs[index] = argBuilder.toString();
+                }
+
+                split = combinedArgs;
+            }
+
+            HybridPlotWorld plotworld = new HybridPlotWorld(world, null, generator, null, null);
+            for (String element : split) {
+                String[] pair = element.split("=");
+                if (pair.length != 2) {
+                    PlotSquared.log("&cNo value provided for: &7" + element);
+                    return false;
+                }
+                String key = pair[0].toLowerCase();
+                String value = pair[1];
+                String base = "worlds." + world + ".";
+                try {
+                    switch (key) {
+                        case "s":
+                        case "size":
+                            this.worlds.set(base + "plot.size",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            break;
+                        case "g":
+                        case "gap":
+                            this.worlds.set(base + "road.width",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            break;
+                        case "h":
+                        case "height":
+                            this.worlds.set(base + "road.height",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            this.worlds.set(base + "plot.height",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            this.worlds.set(base + "wall.height",
+                                Configuration.INTEGER.parseString(value).shortValue());
+                            break;
+                        case "f":
+                        case "floor":
+                            this.worlds.set(base + "plot.floor",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        case "m":
+                        case "main":
+                            this.worlds.set(base + "plot.filling",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        case "w":
+                        case "wall":
+                            this.worlds.set(base + "wall.filling",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        case "b":
+                        case "border":
+                            this.worlds.set(base + "wall.block",
+                                Configuration.BLOCK_BUCKET.parseString(value).toString());
+                            break;
+                        default:
+                            PlotSquared.log("&cKey not found: &7" + element);
+                            return false;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    PlotSquared.log("&cInvalid value: &7" + value + " in arg " + element);
+                    return false;
+                }
+            }
+            try {
+                ConfigurationSection section =
+                    this.worlds.getConfigurationSection("worlds." + world);
+                plotworld.saveConfiguration(section);
+                plotworld.loadConfiguration(section);
+                this.worlds.save(this.worldsFile);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    public boolean canUpdate(@NonNull final String current, @NonNull final String other) {
+        final String s1 = normalisedVersion(current);
+        final String s2 = normalisedVersion(other);
+        return s1.compareTo(s2) < 0;
+    }
+
+    public String normalisedVersion(@NonNull final String version) {
+        final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
+        final StringBuilder sb = new StringBuilder();
+        for (final String s : split) {
+            sb.append(String.format("%" + 4 + 's', s));
+        }
+        return sb.toString();
+    }
+
+    public boolean update(PlotPlayer sender, URL url) {
+        try {
+            String name = this.jarFile.getName();
+            File newJar = new File("plugins/update/" + name);
+            MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
+            URLConnection con = url.openConnection();
+            try (InputStream stream = con.getInputStream()) {
+                File parent = newJar.getParentFile();
+                if (!parent.exists()) {
+                    parent.mkdirs();
+                }
+                MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
+                if (!newJar.delete()) {
+                    MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
+                    MainUtil.sendMessage(sender, "Jar file failed to delete.");
+                    MainUtil.sendMessage(sender, " - Please update manually");
+                }
+                Files.copy(stream, newJar.toPath());
+            }
+            MainUtil.sendMessage(sender,
+                "$1The update will take effect when the server is restarted next");
+            return true;
+        } catch (IOException e) {
+            MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
+            MainUtil.sendMessage(sender, " - Please update manually");
+            PlotSquared.log("============ Stacktrace ============");
             e.printStackTrace();
-          }
+            PlotSquared.log("====================================");
+        }
+        return false;
+    }
+
+    /**
+     * Copy a file from inside the jar to a location
+     *
+     * @param file   Name of the file inside PlotSquared.jar
+     * @param folder The output location relative to /plugins/PlotSquared/
+     */
+    public void copyFile(String file, String folder) {
+        try {
+            File output = this.IMP.getDirectory();
+            if (!output.exists()) {
+                output.mkdirs();
+            }
+            File newFile = MainUtil.getFile(output, folder + File.separator + file);
+            if (newFile.exists()) {
+                return;
+            }
+            try (InputStream stream = this.IMP.getClass().getResourceAsStream(file)) {
+                byte[] buffer = new byte[2048];
+                if (stream == null) {
+                    try (ZipInputStream zis = new ZipInputStream(
+                        new FileInputStream(this.jarFile))) {
+                        ZipEntry ze = zis.getNextEntry();
+                        while (ze != null) {
+                            String name = ze.getName();
+                            if (name.equals(file)) {
+                                new File(newFile.getParent()).mkdirs();
+                                try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                                    int len;
+                                    while ((len = zis.read(buffer)) > 0) {
+                                        fos.write(buffer, 0, len);
+                                    }
+                                }
+                                ze = null;
+                            } else {
+                                ze = zis.getNextEntry();
+                            }
+                        }
+                        zis.closeEntry();
+                    }
+                    return;
+                }
+                newFile.createNewFile();
+                try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                    int len;
+                    while ((len = stream.read(buffer)) > 0) {
+                        fos.write(buffer, 0, len);
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            PlotSquared.log("&cCould not save " + file);
+        }
+    }
+
+    private Map<String, Map<PlotId, Plot>> getPlotsRaw() {
+        HashMap<String, Map<PlotId, Plot>> map = new HashMap<>();
+        for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            Map<PlotId, Plot> map2 = map.get(area.toString());
+            if (map2 == null) {
+                map.put(area.toString(), area.getPlotsRaw());
+            } else {
+                map2.putAll(area.getPlotsRaw());
+            }
+        }
+        return map;
+    }
+
+    /**
+     * Close the database connection.
+     */
+    public void disable() {
+        try {
+            // Validate that all data in the db is correct
+            final HashSet<Plot> plots = new HashSet<>();
+            try {
+                foreachPlotRaw(new RunnableVal<Plot>() {
+                    @Override public void run(Plot value) {
+                        plots.add(value);
+                    }
+                });
+            } catch (final Exception ignored) {
+            }
+            DBFunc.validatePlots(plots);
+
+            // Close the connection
+            DBFunc.close();
+            UUIDHandler.handleShutdown();
+        } catch (NullPointerException exception) {
+            exception.printStackTrace();
+            PlotSquared.log("&cCould not close database connection!");
+        }
+    }
+
+    /**
+     * Setup the database connection.
+     */
+    public void setupDatabase() {
+        try {
+            if (DBFunc.dbManager != null) {
+                DBFunc.dbManager.close();
+            }
+            Database database;
+            if (Storage.MySQL.USE) {
+                database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
+                    Storage.MySQL.USER, Storage.MySQL.PASSWORD);
+            } else if (Storage.SQLite.USE) {
+                File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
+                database = new SQLite(file);
+            } else {
+                PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
+                this.IMP.disable();
+                return;
+            }
+            DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
+            PlotSquared.log("GETTING PLOTS NOW AND STORING TO PLOTS_TMP");
+            for (PlotArea allPlotArea : plotAreaManager.getAllPlotAreas()) {
+                PlotSquared.log(allPlotArea.toString());
+            }
+
+            this.plots_tmp = DBFunc.getPlots();
+            if (plotAreaManager instanceof SinglePlotAreaManager) {
+                SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
+                addPlotArea(area);
+                ConfigurationSection section = worlds.getConfigurationSection("worlds.*");
+                if (section == null) {
+                    section = worlds.createSection("worlds.*");
+                }
+                area.saveConfiguration(section);
+                area.loadDefaultConfiguration(section);
+            }
+            this.clusters_tmp = DBFunc.getClusters();
+        } catch (ClassNotFoundException | SQLException e) {
+            PlotSquared.log(
+                C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
+            if (Storage.MySQL.USE) {
+                PlotSquared.log("$4MYSQL");
+            } else if (Storage.SQLite.USE) {
+                PlotSquared.log("$4SQLITE");
+            }
+            PlotSquared.log(
+                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+            e.printStackTrace();
+            PlotSquared.log("&d==== End of stacktrace ====");
+            PlotSquared.log("&6Please go to the " + IMP.getPluginName()
+                + " 'storage.yml' and configure the database correctly.");
+            this.IMP.disable();
+        }
+    }
+
+    /**
+     * Setup the default configuration.
+     *
+     * @throws IOException if the config failed to save
+     */
+    public void setupConfig() throws IOException {
+        String lastVersionString = this.config.getString("version");
+        if (lastVersionString != null) {
+            String[] split = lastVersionString.split("\\.");
+            int[] lastVersion = new int[] {Integer.parseInt(split[0]), Integer.parseInt(split[1]),
+                Integer.parseInt(split[2])};
+            if (checkVersion(new int[] {3, 4, 0}, lastVersion)) {
+                Settings.convertLegacy(configFile);
+                if (config.contains("worlds")) {
+                    ConfigurationSection worldSection = config.getConfigurationSection("worlds");
+                    worlds.set("worlds", worldSection);
+                    try {
+                        worlds.save(worldsFile);
+                    } catch (IOException e) {
+                        PlotSquared.debug("Failed to save " + IMP.getPluginName() + " worlds.yml");
+                        e.printStackTrace();
+                    }
+                }
+                Settings.save(configFile);
+            }
+        }
+        Settings.load(configFile);
+        try {
+            InputStream stream = getClass().getResourceAsStream("/plugin.properties");
+            BufferedReader br = new BufferedReader(new InputStreamReader(stream));
+            //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
+            String versionString = br.readLine();
+            String commitString = br.readLine();
+            String dateString = br.readLine();
+            //scanner.close();
+            br.close();
+            this.version = PlotVersion.tryParse(versionString, commitString, dateString);
+            Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
+            Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
+            Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
+                .toHexString(version.hash);
+            System.out.println("Version is " + this.version);
+        } catch (IOException exception) {
+            exception.printStackTrace();
         }
         Settings.save(configFile);
-      }
+        config = YamlConfiguration.loadConfiguration(configFile);
     }
-    Settings.load(configFile);
-    try {
-      InputStream stream = getClass().getResourceAsStream("/plugin.properties");
-      BufferedReader br = new BufferedReader(new InputStreamReader(stream));
-      //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
-      String versionString = br.readLine();
-      String commitString = br.readLine();
-      String dateString = br.readLine();
-      //scanner.close();
-      br.close();
-      this.version = PlotVersion.tryParse(versionString, commitString, dateString);
-      Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
-      Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
-      Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
-          .toHexString(version.hash);
-      System.out.println("Version is " + this.version);
-    } catch (IOException exception) {
-      exception.printStackTrace();
-    }
-    Settings.save(configFile);
-    config = YamlConfiguration.loadConfiguration(configFile);
-  }
 
-  /**
-   * Setup all configuration files<br> - Config: settings.yml<br> - Storage: storage.yml<br> -
-   * Translation: PlotSquared.use_THIS.yml, style.yml<br>
-   */
-  public boolean setupConfigs() {
-    File folder = new File(this.IMP.getDirectory(), "config");
-    if (!folder.exists() && !folder.mkdirs()) {
-      PlotSquared.log(C.PREFIX
-          + "&cFailed to create the /plugins/config folder. Please create it manually.");
-    }
-    try {
-      this.worldsFile = new File(folder, "worlds.yml");
-      if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
-        PlotSquared.log(
-            "Could not create the worlds file, please create \"worlds.yml\" manually.");
-      }
-      this.worlds = YamlConfiguration.loadConfiguration(this.worldsFile);
+    /**
+     * Setup all configuration files<br> - Config: settings.yml<br> - Storage: storage.yml<br> -
+     * Translation: PlotSquared.use_THIS.yml, style.yml<br>
+     */
+    public boolean setupConfigs() {
+        File folder = new File(this.IMP.getDirectory(), "config");
+        if (!folder.exists() && !folder.mkdirs()) {
+            PlotSquared.log(C.PREFIX
+                + "&cFailed to create the /plugins/config folder. Please create it manually.");
+        }
+        try {
+            this.worldsFile = new File(folder, "worlds.yml");
+            if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not create the worlds file, please create \"worlds.yml\" manually.");
+            }
+            this.worlds = YamlConfiguration.loadConfiguration(this.worldsFile);
 
-      if (this.worlds.contains("worlds")) {
-        if (!this.worlds.contains("configuration_version") || !this.worlds
-            .getString("configuration_version")
-            .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
-          // Conversion needed
-          log(C.LEGACY_CONFIG_FOUND.s());
-          try {
-            com.google.common.io.Files
-                .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
-            log(C.LEGACY_CONFIG_BACKUP.s());
-            final ConfigurationSection worlds =
-                this.worlds.getConfigurationSection("worlds");
-            final LegacyConverter converter = new LegacyConverter(worlds);
-            converter.convert();
-            this.worlds
-                .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
-            this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
-            this.worlds.save(this.worldsFile);
-            log(C.LEGACY_CONFIG_DONE.s());
-          } catch (final Exception e) {
-            log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
+            if (this.worlds.contains("worlds")) {
+                if (!this.worlds.contains("configuration_version") || !this.worlds
+                    .getString("configuration_version")
+                    .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
+                    // Conversion needed
+                    log(C.LEGACY_CONFIG_FOUND.s());
+                    try {
+                        com.google.common.io.Files
+                            .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
+                        log(C.LEGACY_CONFIG_BACKUP.s());
+                        final ConfigurationSection worlds =
+                            this.worlds.getConfigurationSection("worlds");
+                        final LegacyConverter converter = new LegacyConverter(worlds);
+                        converter.convert();
+                        this.worlds
+                            .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
+                        this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
+                        this.worlds.save(this.worldsFile);
+                        log(C.LEGACY_CONFIG_DONE.s());
+                    } catch (final Exception e) {
+                        log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
+                        e.printStackTrace();
+                    }
+                    // Disable plugin
+                    this.IMP.shutdown();
+                    return false;
+                }
+            } else {
+                this.worlds.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
+            }
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save settings.yml");
+        }
+        try {
+            this.configFile = new File(folder, "settings.yml");
+            if (!this.configFile.exists() && !this.configFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not create the settings file, please create \"settings.yml\" manually.");
+            }
+            this.config = YamlConfiguration.loadConfiguration(this.configFile);
+            setupConfig();
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save settings.yml");
+        }
+        try {
+            this.styleFile = MainUtil.getFile(IMP.getDirectory(),
+                Settings.Paths.TRANSLATIONS + File.separator + "style.yml");
+            if (!this.styleFile.exists()) {
+                if (!this.styleFile.getParentFile().exists()) {
+                    this.styleFile.getParentFile().mkdirs();
+                }
+                if (!this.styleFile.createNewFile()) {
+                    PlotSquared.log(
+                        "Could not create the style file, please create \"translations/style.yml\" manually");
+                }
+            }
+            this.style = YamlConfiguration.loadConfiguration(this.styleFile);
+            setupStyle();
+        } catch (IOException err) {
+            err.printStackTrace();
+            PlotSquared.log("failed to save style.yml");
+        }
+        try {
+            this.storageFile = new File(folder, "storage.yml");
+            if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not the storage settings file, please create \"storage.yml\" manually.");
+            }
+            this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
+            setupStorage();
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save storage.yml");
+        }
+        try {
+            this.commandsFile = new File(folder, "commands.yml");
+            if (!this.commandsFile.exists() && !this.commandsFile.createNewFile()) {
+                PlotSquared.log(
+                    "Could not the storage settings file, please create \"commands.yml\" manually.");
+            }
+            this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
+        } catch (IOException ignored) {
+            PlotSquared.log("Failed to save commands.yml");
+        }
+        try {
+            this.style.save(this.styleFile);
+            this.commands.save(this.commandsFile);
+        } catch (IOException e) {
+            PlotSquared.log("Configuration file saving failed");
             e.printStackTrace();
-          }
-          // Disable plugin
-          this.IMP.shutdown();
-          return false;
         }
-      } else {
-        this.worlds.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
-      }
-    } catch (IOException ignored) {
-      PlotSquared.log("Failed to save settings.yml");
+        return true;
     }
-    try {
-      this.configFile = new File(folder, "settings.yml");
-      if (!this.configFile.exists() && !this.configFile.createNewFile()) {
-        PlotSquared.log(
-            "Could not create the settings file, please create \"settings.yml\" manually.");
-      }
-      this.config = YamlConfiguration.loadConfiguration(this.configFile);
-      setupConfig();
-    } catch (IOException ignored) {
-      PlotSquared.log("Failed to save settings.yml");
+
+    /**
+     * Setup the storage file (load + save missing nodes).
+     */
+    private void setupStorage() {
+        Storage.load(storageFile);
+        Storage.save(storageFile);
+        storage = YamlConfiguration.loadConfiguration(storageFile);
     }
-    try {
-      this.styleFile = MainUtil.getFile(IMP.getDirectory(),
-          Settings.Paths.TRANSLATIONS + File.separator + "style.yml");
-      if (!this.styleFile.exists()) {
-        if (!this.styleFile.getParentFile().exists()) {
-          this.styleFile.getParentFile().mkdirs();
+
+    /**
+     * Show startup debug information.
+     */
+    private void showDebug() {
+        if (Settings.DEBUG) {
+            Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
+            for (Entry<String, Object> component : components.entrySet()) {
+                PlotSquared.log(C.PREFIX + String
+                    .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
+                        component.getValue()));
+            }
         }
-        if (!this.styleFile.createNewFile()) {
-          PlotSquared.log(
-              "Could not create the style file, please create \"translations/style.yml\" manually");
+    }
+
+    /**
+     * Setup the style.yml file
+     */
+    private void setupStyle() {
+        if (this.version != null) {
+            this.style.set("version", this.version.toString());
         }
-      }
-      this.style = YamlConfiguration.loadConfiguration(this.styleFile);
-      setupStyle();
-    } catch (IOException err) {
-      err.printStackTrace();
-      PlotSquared.log("failed to save style.yml");
-    }
-    try {
-      this.storageFile = new File(folder, "storage.yml");
-      if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
-        PlotSquared.log(
-            "Could not the storage settings file, please create \"storage.yml\" manually.");
-      }
-      this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
-      setupStorage();
-    } catch (IOException ignored) {
-      PlotSquared.log("Failed to save storage.yml");
-    }
-    try {
-      this.commandsFile = new File(folder, "commands.yml");
-      if (!this.commandsFile.exists() && !this.commandsFile.createNewFile()) {
-        PlotSquared.log(
-            "Could not the storage settings file, please create \"commands.yml\" manually.");
-      }
-      this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
-    } catch (IOException ignored) {
-      PlotSquared.log("Failed to save commands.yml");
-    }
-    try {
-      this.style.save(this.styleFile);
-      this.commands.save(this.commandsFile);
-    } catch (IOException e) {
-      PlotSquared.log("Configuration file saving failed");
-      e.printStackTrace();
-    }
-    return true;
-  }
-
-  /**
-   * Setup the storage file (load + save missing nodes).
-   */
-  private void setupStorage() {
-    Storage.load(storageFile);
-    Storage.save(storageFile);
-    storage = YamlConfiguration.loadConfiguration(storageFile);
-  }
-
-  /**
-   * Show startup debug information.
-   */
-  private void showDebug() {
-    if (Settings.DEBUG) {
-      Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
-      for (Entry<String, Object> component : components.entrySet()) {
-        PlotSquared.log(C.PREFIX + String
-            .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
-                component.getValue()));
-      }
-    }
-  }
-
-  /**
-   * Setup the style.yml file
-   */
-  private void setupStyle() {
-    if (this.version != null) {
-      this.style.set("version", this.version.toString());
-    }
-    Map<String, Object> o = new HashMap<>(4);
-    o.put("color.1", "6");
-    o.put("color.2", "7");
-    o.put("color.3", "8");
-    o.put("color.4", "3");
-    if (!this.style.contains("color")) {
-      for (Entry<String, Object> node : o.entrySet()) {
-        this.style.set(node.getKey(), node.getValue());
-      }
-    }
-  }
-
-  /**
-   * Get the Java version.
-   *
-   * @return the java version
-   */
-  public double getJavaVersion() {
-    return Double.parseDouble(System.getProperty("java.specification.version"));
-  }
-
-  public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
-    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-      runnable.run(area);
-    }
-  }
-
-  public void foreachPlotArea(@NonNull final String world,
-      @NonNull final RunnableVal<PlotArea> runnable) {
-    final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
-    if (array == null) {
-      return;
-    }
-    for (final PlotArea area : array) {
-      runnable.run(area);
-    }
-  }
-
-  public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
-    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-      area.getPlots().forEach(runnable::run);
-    }
-  }
-
-  public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
-    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-      area.getPlots().forEach(runnable::run);
-    }
-    if (this.plots_tmp != null) {
-      for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
-        entry.values().forEach(runnable::run);
-      }
-    }
-  }
-
-  public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
-    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-      area.foreachBasePlot(run);
-    }
-  }
-
-  public PlotArea getFirstPlotArea() {
-    PlotArea[] areas = plotAreaManager.getAllPlotAreas();
-    return areas.length > 0 ? areas[0] : null;
-  }
-
-  public int getPlotAreaCount() {
-    return this.plotAreaManager.getAllPlotAreas().length;
-  }
-
-  public int getPlotCount() {
-    int count = 0;
-    for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-      count += area.getPlotCount();
-    }
-    return count;
-  }
-
-  public Set<PlotArea> getPlotAreas() {
-    final Set<PlotArea> set = new HashSet<>();
-    Collections.addAll(set, plotAreaManager.getAllPlotAreas());
-    return Collections.unmodifiableSet(set);
-  }
-
-  public boolean isAugmented(@NonNull final String world) {
-    final PlotArea[] areas = plotAreaManager.getPlotAreas(world, null);
-    return areas != null && (areas.length > 1 || areas[0].TYPE != 0);
-  }
-
-  /**
-   * Get a list of PlotArea objects.
-   *
-   * @param world the world
-   * @return Collection of PlotArea objects
-   */
-  public Set<PlotArea> getPlotAreas(@NonNull final String world) {
-    final Set<PlotArea> set = new HashSet<>();
-    Collections.addAll(set, plotAreaManager.getPlotAreas(world, null));
-    return set;
-  }
-
-  /**
-   * Get the relevant plot area for a specified location.
-   * <ul>
-   * <li>If there is only one plot area globally that will be returned.
-   * <li>If there is only one plot area in the world, it will return that.
-   * <li>If the plot area for a location cannot be unambiguously
-   * resolved, null will be returned.
-   * </ul>
-   * Note: An applicable plot area may not include the location i.e. clusters
-   *
-   * @param location the location
-   */
-  public PlotArea getApplicablePlotArea(@NonNull final Location location) {
-    return plotAreaManager.getApplicablePlotArea(location);
-  }
-
-  public PlotArea getPlotArea(@NonNull final String world, final String id) {
-    return plotAreaManager.getPlotArea(world, id);
-  }
-
-  /**
-   * Get the {@code PlotArea} which contains a location.
-   * <ul>
-   * <li>If the plot area does not contain a location, null
-   * will be returned.
-   * </ul>
-   *
-   * @param location the location
-   * @return the {@link PlotArea} in the location, null if non existent
-   */
-  public PlotArea getPlotAreaAbs(@NonNull final Location location) {
-    return plotAreaManager.getPlotArea(location);
-  }
-
-  public PlotArea getPlotAreaByString(@NonNull final String search) {
-    String[] split = search.split("[;,]");
-    PlotArea[] areas = plotAreaManager.getPlotAreas(split[0], null);
-    if (areas == null) {
-      for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-        if (area.worldname.equalsIgnoreCase(split[0])) {
-          if (area.id == null || split.length == 2 && area.id
-              .equalsIgnoreCase(split[1])) {
-            return area;
-          }
+        Map<String, Object> o = new HashMap<>(4);
+        o.put("color.1", "6");
+        o.put("color.2", "7");
+        o.put("color.3", "8");
+        o.put("color.4", "3");
+        if (!this.style.contains("color")) {
+            for (Entry<String, Object> node : o.entrySet()) {
+                this.style.set(node.getKey(), node.getValue());
+            }
         }
-      }
-      return null;
     }
-    if (areas.length == 1) {
-      return areas[0];
-    } else if (split.length == 1) {
-      return null;
-    } else {
-      for (PlotArea area : areas) {
-        if (StringMan.isEqual(split[1], area.id)) {
-          return area;
+
+    /**
+     * Get the Java version.
+     *
+     * @return the java version
+     */
+    public double getJavaVersion() {
+        return Double.parseDouble(System.getProperty("java.specification.version"));
+    }
+
+    public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            runnable.run(area);
         }
-      }
-      return null;
     }
-  }
 
-  /**
-   * Get Plots based on alias
-   *
-   * @param alias to search plots
-   * @param worldname to filter alias to a specific world [optional] null means all worlds
-   * @return Set<{
-               *       @
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *                                                                                                                                       link
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *                   Plot
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *
-               *       }> empty if nothing found
-   */
-  public Set<Plot> getPlotsByAlias(@Nullable final String alias,
-      @NonNull final String worldname) {
-    final Set<Plot> result = new HashSet<>();
-    if (alias != null) {
-      for (final Plot plot : getPlots()) {
-        if (alias.equals(plot.getAlias()) && (worldname == null || worldname
-            .equals(plot.getWorldName()))) {
-          result.add(plot);
+    public void foreachPlotArea(@NonNull final String world,
+        @NonNull final RunnableVal<PlotArea> runnable) {
+        final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
+        if (array == null) {
+            return;
+        }
+        for (final PlotArea area : array) {
+            runnable.run(area);
         }
-      }
     }
-    return Collections.unmodifiableSet(result);
-  }
 
-  public Set<PlotArea> getPlotAreas(final String world, final RegionWrapper region) {
-    final PlotArea[] areas = plotAreaManager.getPlotAreas(world, region);
-    final Set<PlotArea> set = new HashSet<>();
-    Collections.addAll(set, areas);
-    return Collections.unmodifiableSet(set);
-  }
+    public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            area.getPlots().forEach(runnable::run);
+        }
+    }
 
-  public enum SortType {
-    CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
-  }
+    public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            area.getPlots().forEach(runnable::run);
+        }
+        if (this.plots_tmp != null) {
+            for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
+                entry.values().forEach(runnable::run);
+            }
+        }
+    }
+
+    public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            area.foreachBasePlot(run);
+        }
+    }
+
+    public PlotArea getFirstPlotArea() {
+        PlotArea[] areas = plotAreaManager.getAllPlotAreas();
+        return areas.length > 0 ? areas[0] : null;
+    }
+
+    public int getPlotAreaCount() {
+        return this.plotAreaManager.getAllPlotAreas().length;
+    }
+
+    public int getPlotCount() {
+        int count = 0;
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            count += area.getPlotCount();
+        }
+        return count;
+    }
+
+    public Set<PlotArea> getPlotAreas() {
+        final Set<PlotArea> set = new HashSet<>();
+        Collections.addAll(set, plotAreaManager.getAllPlotAreas());
+        return Collections.unmodifiableSet(set);
+    }
+
+    public boolean isAugmented(@NonNull final String world) {
+        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, null);
+        return areas != null && (areas.length > 1 || areas[0].TYPE != 0);
+    }
+
+    /**
+     * Get a list of PlotArea objects.
+     *
+     * @param world the world
+     * @return Collection of PlotArea objects
+     */
+    public Set<PlotArea> getPlotAreas(@NonNull final String world) {
+        final Set<PlotArea> set = new HashSet<>();
+        Collections.addAll(set, plotAreaManager.getPlotAreas(world, null));
+        return set;
+    }
+
+    /**
+     * Get the relevant plot area for a specified location.
+     * <ul>
+     * <li>If there is only one plot area globally that will be returned.
+     * <li>If there is only one plot area in the world, it will return that.
+     * <li>If the plot area for a location cannot be unambiguously
+     * resolved, null will be returned.
+     * </ul>
+     * Note: An applicable plot area may not include the location i.e. clusters
+     *
+     * @param location the location
+     */
+    public PlotArea getApplicablePlotArea(@NonNull final Location location) {
+        return plotAreaManager.getApplicablePlotArea(location);
+    }
+
+    public PlotArea getPlotArea(@NonNull final String world, final String id) {
+        return plotAreaManager.getPlotArea(world, id);
+    }
+
+    /**
+     * Get the {@code PlotArea} which contains a location.
+     * <ul>
+     * <li>If the plot area does not contain a location, null
+     * will be returned.
+     * </ul>
+     *
+     * @param location the location
+     * @return the {@link PlotArea} in the location, null if non existent
+     */
+    public PlotArea getPlotAreaAbs(@NonNull final Location location) {
+        return plotAreaManager.getPlotArea(location);
+    }
+
+    public PlotArea getPlotAreaByString(@NonNull final String search) {
+        String[] split = search.split("[;,]");
+        PlotArea[] areas = plotAreaManager.getPlotAreas(split[0], null);
+        if (areas == null) {
+            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
+                if (area.worldname.equalsIgnoreCase(split[0])) {
+                    if (area.id == null || split.length == 2 && area.id
+                        .equalsIgnoreCase(split[1])) {
+                        return area;
+                    }
+                }
+            }
+            return null;
+        }
+        if (areas.length == 1) {
+            return areas[0];
+        } else if (split.length == 1) {
+            return null;
+        } else {
+            for (PlotArea area : areas) {
+                if (StringMan.isEqual(split[1], area.id)) {
+                    return area;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Get Plots based on alias
+     *
+     * @param alias     to search plots
+     * @param worldname to filter alias to a specific world [optional] null means all worlds
+     * @return Set<{
+                       *       @       link
+                       *       <   p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * Plot
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * <p>
+     * }> empty if nothing found
+     */
+    public Set<Plot> getPlotsByAlias(@Nullable final String alias,
+        @NonNull final String worldname) {
+        final Set<Plot> result = new HashSet<>();
+        if (alias != null) {
+            for (final Plot plot : getPlots()) {
+                if (alias.equals(plot.getAlias()) && (worldname == null || worldname
+                    .equals(plot.getWorldName()))) {
+                    result.add(plot);
+                }
+            }
+        }
+        return Collections.unmodifiableSet(result);
+    }
+
+    public Set<PlotArea> getPlotAreas(final String world, final RegionWrapper region) {
+        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, region);
+        final Set<PlotArea> set = new HashSet<>();
+        Collections.addAll(set, areas);
+        return Collections.unmodifiableSet(set);
+    }
+
+    public enum SortType {
+        CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index 33048e0fd..5035c1480 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -243,8 +243,7 @@ public class Auto extends SubCommand {
                             plot.claim(player, teleport, null);
                         }
                     }
-                    if (!plotarea
-                        .mergePlots(MainUtil.getPlotSelectionIds(start, end), true)) {
+                    if (!plotarea.mergePlots(MainUtil.getPlotSelectionIds(start, end), true)) {
                         return false;
                     }
                     break;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index 2ead96b4f..b4b24021f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -244,8 +244,7 @@ import java.util.UUID;
                     MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, intersect.getName());
                     return false;
                 }
-                Set<Plot> existing =
-                    area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
+                Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
                 Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
                 // Set<Plot> removed = (HashSet<Plot>) existing.clone();
                 Set<Plot> removed = new HashSet<>(existing);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
index d945f122a..e94850121 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -25,163 +25,160 @@ import java.util.Map.Entry;
 @CommandDeclaration(command = "database", aliases = {"convert"},
     category = CommandCategory.ADMINISTRATION, permission = "plots.database",
     description = "Convert/Backup Storage", requiredType = RequiredType.CONSOLE,
-    usage = "/plot database [area] <sqlite|mysql|import>")
-public class Database
+    usage = "/plot database [area] <sqlite|mysql|import>") public class Database
     extends SubCommand {
 
-  public static void insertPlots(final SQLManager manager, final List<Plot> plots,
-      final PlotPlayer player) {
-    TaskManager.runTaskAsync(() -> {
-      try {
-        ArrayList<Plot> ps = new ArrayList<>(plots);
-        MainUtil.sendMessage(player, "&6Starting...");
-        manager.createPlotsAndData(ps, () -> {
-          MainUtil.sendMessage(player, "&6Database conversion finished!");
-          manager.close();
-        });
-      } catch (Exception e) {
-        MainUtil.sendMessage(player,
-            "Failed to insert plot objects, see stacktrace for info");
-        e.printStackTrace();
-      }
-    });
-  }
-
-  @Override
-  public boolean onCommand(final PlotPlayer player, String[] args) {
-    if (args.length < 1) {
-      MainUtil.sendMessage(player, "/plot database [area] <sqlite|mysql|import>");
-      return false;
-    }
-    List<Plot> plots;
-    PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-    if (area != null) {
-      plots = PlotSquared.get().sortPlotsByTemp(area.getPlots());
-      args = Arrays.copyOfRange(args, 1, args.length);
-    } else {
-      plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots());
-    }
-    if (args.length < 1) {
-      MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
-      MainUtil.sendMessage(player, "[arg] indicates an optional argument");
-      return false;
-    }
-    try {
-      com.github.intellectualsites.plotsquared.plot.database.Database implementation;
-      String prefix = "";
-      switch (args[0].toLowerCase()) {
-        case "import":
-          if (args.length < 2) {
-            MainUtil
-                .sendMessage(player, "/plot database import <sqlite file> [prefix]");
-            return false;
-          }
-          File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-              args[1].endsWith(".db") ? args[1] : args[1] + ".db");
-          if (!file.exists()) {
-            MainUtil.sendMessage(player, "&6Database does not exist: " + file);
-            return false;
-          }
-          MainUtil.sendMessage(player, "&6Starting...");
-          implementation = new SQLite(file);
-          SQLManager manager =
-              new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
-          HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
-          plots = new ArrayList<>();
-          for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
-            String areaname = entry.getKey();
-            PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
-            if (pa != null) {
-              for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                Plot plot = entry2.getValue();
-                if (pa.getOwnedPlotAbs(plot.getId()) != null) {
-                  if (pa instanceof SinglePlotArea) {
-                    Plot newPlot = pa.getNextFreePlot(null, plot.getId());
-                    if (newPlot != null) {
-                      PlotId newId = newPlot.getId();
-                      PlotId id = plot.getId();
-                      File worldFile =
-                          new File(PlotSquared.imp().getWorldContainer(),
-                              id.toCommaSeparatedString());
-                      if (worldFile.exists()) {
-                        File newFile =
-                            new File(PlotSquared.imp().getWorldContainer(),
-                                newId.toCommaSeparatedString());
-                        worldFile.renameTo(newFile);
-                      }
-                      id.x = newId.x;
-                      id.y = newId.y;
-                      id.recalculateHash();
-                      plot.setArea(pa);
-                      plots.add(plot);
-                      continue;
-                    }
-                  }
-                  MainUtil.sendMessage(player,
-                      "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
-                  continue;
-                }
-                plot.setArea(pa);
-                plots.add(plot);
-              }
-            } else {
-              HashMap<PlotId, Plot> plotmap =
-                  PlotSquared.get().plots_tmp
-                      .computeIfAbsent(areaname, k -> new HashMap<>());
-              plotmap.putAll(entry.getValue());
+    public static void insertPlots(final SQLManager manager, final List<Plot> plots,
+        final PlotPlayer player) {
+        TaskManager.runTaskAsync(() -> {
+            try {
+                ArrayList<Plot> ps = new ArrayList<>(plots);
+                MainUtil.sendMessage(player, "&6Starting...");
+                manager.createPlotsAndData(ps, () -> {
+                    MainUtil.sendMessage(player, "&6Database conversion finished!");
+                    manager.close();
+                });
+            } catch (Exception e) {
+                MainUtil
+                    .sendMessage(player, "Failed to insert plot objects, see stacktrace for info");
+                e.printStackTrace();
             }
-          }
-          DBFunc.createPlotsAndData(plots,
-              () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
-          return true;
-        case "mysql":
-          if (args.length < 6) {
-            return MainUtil.sendMessage(player,
-                "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
-          }
-          String host = args[1];
-          String port = args[2];
-          String username = args[3];
-          String password = args[4];
-          String database = args[5];
-          if (args.length > 6) {
-            prefix = args[6];
-          }
-          implementation = new MySQL(host, port, database, username, password);
-          break;
-        case "sqlite":
-          if (args.length < 2) {
-            return MainUtil.sendMessage(player, "/plot database sqlite [file]");
-          }
-          File sqliteFile =
-              MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), args[1] + ".db");
-          implementation = new SQLite(sqliteFile);
-          break;
-        default:
-          return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
-      }
-      try {
-        SQLManager manager = new SQLManager(implementation, prefix, true);
-        Database.insertPlots(manager, plots, player);
-        return true;
-      } catch (ClassNotFoundException | SQLException e) {
-        MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
-        MainUtil.sendMessage(player,
-            "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-        e.printStackTrace();
-        MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
-        MainUtil
-            .sendMessage(player, "$1Please make sure you are using the correct arguments!");
-        return false;
-      }
-    } catch (ClassNotFoundException | SQLException e) {
-      MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
-      MainUtil.sendMessage(player,
-          "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-      e.printStackTrace();
-      MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
-      MainUtil.sendMessage(player, "$1Please make sure you are using the correct arguments!");
-      return false;
+        });
+    }
+
+    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
+        if (args.length < 1) {
+            MainUtil.sendMessage(player, "/plot database [area] <sqlite|mysql|import>");
+            return false;
+        }
+        List<Plot> plots;
+        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
+        if (area != null) {
+            plots = PlotSquared.get().sortPlotsByTemp(area.getPlots());
+            args = Arrays.copyOfRange(args, 1, args.length);
+        } else {
+            plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots());
+        }
+        if (args.length < 1) {
+            MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
+            MainUtil.sendMessage(player, "[arg] indicates an optional argument");
+            return false;
+        }
+        try {
+            com.github.intellectualsites.plotsquared.plot.database.Database implementation;
+            String prefix = "";
+            switch (args[0].toLowerCase()) {
+                case "import":
+                    if (args.length < 2) {
+                        MainUtil
+                            .sendMessage(player, "/plot database import <sqlite file> [prefix]");
+                        return false;
+                    }
+                    File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+                        args[1].endsWith(".db") ? args[1] : args[1] + ".db");
+                    if (!file.exists()) {
+                        MainUtil.sendMessage(player, "&6Database does not exist: " + file);
+                        return false;
+                    }
+                    MainUtil.sendMessage(player, "&6Starting...");
+                    implementation = new SQLite(file);
+                    SQLManager manager =
+                        new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
+                    HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
+                    plots = new ArrayList<>();
+                    for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
+                        String areaname = entry.getKey();
+                        PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
+                        if (pa != null) {
+                            for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
+                                Plot plot = entry2.getValue();
+                                if (pa.getOwnedPlotAbs(plot.getId()) != null) {
+                                    if (pa instanceof SinglePlotArea) {
+                                        Plot newPlot = pa.getNextFreePlot(null, plot.getId());
+                                        if (newPlot != null) {
+                                            PlotId newId = newPlot.getId();
+                                            PlotId id = plot.getId();
+                                            File worldFile =
+                                                new File(PlotSquared.imp().getWorldContainer(),
+                                                    id.toCommaSeparatedString());
+                                            if (worldFile.exists()) {
+                                                File newFile =
+                                                    new File(PlotSquared.imp().getWorldContainer(),
+                                                        newId.toCommaSeparatedString());
+                                                worldFile.renameTo(newFile);
+                                            }
+                                            id.x = newId.x;
+                                            id.y = newId.y;
+                                            id.recalculateHash();
+                                            plot.setArea(pa);
+                                            plots.add(plot);
+                                            continue;
+                                        }
+                                    }
+                                    MainUtil.sendMessage(player,
+                                        "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
+                                    continue;
+                                }
+                                plot.setArea(pa);
+                                plots.add(plot);
+                            }
+                        } else {
+                            HashMap<PlotId, Plot> plotmap = PlotSquared.get().plots_tmp
+                                .computeIfAbsent(areaname, k -> new HashMap<>());
+                            plotmap.putAll(entry.getValue());
+                        }
+                    }
+                    DBFunc.createPlotsAndData(plots,
+                        () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
+                    return true;
+                case "mysql":
+                    if (args.length < 6) {
+                        return MainUtil.sendMessage(player,
+                            "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
+                    }
+                    String host = args[1];
+                    String port = args[2];
+                    String username = args[3];
+                    String password = args[4];
+                    String database = args[5];
+                    if (args.length > 6) {
+                        prefix = args[6];
+                    }
+                    implementation = new MySQL(host, port, database, username, password);
+                    break;
+                case "sqlite":
+                    if (args.length < 2) {
+                        return MainUtil.sendMessage(player, "/plot database sqlite [file]");
+                    }
+                    File sqliteFile =
+                        MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), args[1] + ".db");
+                    implementation = new SQLite(sqliteFile);
+                    break;
+                default:
+                    return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
+            }
+            try {
+                SQLManager manager = new SQLManager(implementation, prefix, true);
+                Database.insertPlots(manager, plots, player);
+                return true;
+            } catch (ClassNotFoundException | SQLException e) {
+                MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
+                MainUtil.sendMessage(player,
+                    "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+                e.printStackTrace();
+                MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
+                MainUtil
+                    .sendMessage(player, "$1Please make sure you are using the correct arguments!");
+                return false;
+            }
+        } catch (ClassNotFoundException | SQLException e) {
+            MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
+            MainUtil.sendMessage(player,
+                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
+            e.printStackTrace();
+            MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
+            MainUtil.sendMessage(player, "$1Please make sure you are using the correct arguments!");
+            return false;
+        }
     }
-  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
index dfcda68ae..01cd1fefc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
@@ -164,8 +164,8 @@ import java.util.*;
                             "$1<threshold> $2= $1The percentage of plots you want to clear as a number between 0 - 100");
                         return false;
                     }
-                    PlotAnalysis.calcOptimalModifiers(
-                        () -> MainUtil.sendMessage(player, "$1Thank you for calibrating plot expiry"), threshold);
+                    PlotAnalysis.calcOptimalModifiers(() -> MainUtil
+                        .sendMessage(player, "$1Thank you for calibrating plot expiry"), threshold);
                     return true;
                 case "stop-expire":
                     if (ExpireManager.IMP == null || !ExpireManager.IMP.cancelTask()) {
@@ -409,8 +409,8 @@ import java.util.*;
                         } catch (ScriptException e) {
                             e.printStackTrace();
                         }
-                        PlotSquared.log(
-                            "> " + (System.currentTimeMillis() - start) + "ms -> " + result);
+                        PlotSquared
+                            .log("> " + (System.currentTimeMillis() - start) + "ms -> " + result);
                     });
                 } else {
                     long start = System.currentTimeMillis();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
index 81275cac7..eedba15cf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
@@ -26,6 +26,21 @@ import java.util.List;
     permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste
     extends SubCommand {
 
+    private static String readFile(@NonNull final File file) throws IOException {
+        final StringBuilder content = new StringBuilder();
+        final List<String> lines = new ArrayList<>();
+        try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                lines.add(line);
+            }
+        }
+        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
+            content.append(lines.get(i)).append("\n");
+        }
+        return content.toString();
+    }
+
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         TaskManager.runTaskAsync(() -> {
             try {
@@ -36,7 +51,8 @@ import java.util.List;
                     "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
                         + "problem\n\n");
                 b.append("# Server Information\n");
-                b.append("server.version: ").append(PlotSquared.get().IMP.getServerImplementation()).append("\n");
+                b.append("server.version: ").append(PlotSquared.get().IMP.getServerImplementation())
+                    .append("\n");
                 b.append("online_mode: ").append(UUIDHandler.getUUIDWrapper()).append(';')
                     .append(!Settings.UUID.OFFLINE).append('\n');
                 b.append("plugins:");
@@ -55,14 +71,12 @@ import java.util.List;
                 b.append("memory.max: ").append(runtime.maxMemory()).append('\n');
                 b.append("java.specification.version: '")
                     .append(System.getProperty("java.specification.version")).append("'\n");
-                b.append("java.vendor: '").append(System.getProperty("java.vendor"))
-                    .append("'\n");
+                b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n");
                 b.append("java.version: '").append(System.getProperty("java.version"))
                     .append("'\n");
                 b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n");
                 b.append("os.name: '").append(System.getProperty("os.name")).append("'\n");
-                b.append("os.version: '").append(System.getProperty("os.version"))
-                    .append("'\n\n");
+                b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n");
                 b.append("# Okay :D Great. You are now ready to create your bug report!");
                 b.append(
                     "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
@@ -71,24 +85,27 @@ import java.util.List;
                 incendoPaster.addFile(new IncendoPaster.PasteFile("information", b.toString()));
 
                 try {
-                    final File logFile = new File(PlotSquared.get().IMP.getDirectory(),
-                        "../../logs/latest.log");
+                    final File logFile =
+                        new File(PlotSquared.get().IMP.getDirectory(), "../../logs/latest.log");
                     if (Files.size(logFile.toPath()) > 14_000_000) {
                         throw new IOException("Too big...");
                     }
-                    incendoPaster.addFile(new IncendoPaster.PasteFile("latest.log", readFile(logFile)));
+                    incendoPaster
+                        .addFile(new IncendoPaster.PasteFile("latest.log", readFile(logFile)));
                 } catch (IOException ignored) {
-                    MainUtil.sendMessage(player,
-                        "&clatest.log is too big to be pasted, will ignore");
+                    MainUtil
+                        .sendMessage(player, "&clatest.log is too big to be pasted, will ignore");
                 }
 
                 try {
-                    incendoPaster.addFile(new IncendoPaster.PasteFile("settings.yml", readFile(PlotSquared.get().configFile)));
+                    incendoPaster.addFile(new IncendoPaster.PasteFile("settings.yml",
+                        readFile(PlotSquared.get().configFile)));
                 } catch (final IllegalArgumentException ignored) {
                     MainUtil.sendMessage(player, "&cSkipping settings.yml because it's empty");
                 }
                 try {
-                    incendoPaster.addFile(new IncendoPaster.PasteFile("worlds.yml", readFile(PlotSquared.get().worldsFile)));
+                    incendoPaster.addFile(new IncendoPaster.PasteFile("worlds.yml",
+                        readFile(PlotSquared.get().worldsFile)));
                 } catch (final IllegalArgumentException ignored) {
                     MainUtil.sendMessage(player, "&cSkipping worlds.yml because it's empty");
                 }
@@ -96,25 +113,29 @@ import java.util.List;
                     incendoPaster.addFile(new IncendoPaster.PasteFile("PlotSquared.use_THIS.yml",
                         readFile(PlotSquared.get().translationFile)));
                 } catch (final IllegalArgumentException ignored) {
-                    MainUtil.sendMessage(player, "&cSkipping PlotSquared.use_THIS.yml because it's empty");
+                    MainUtil.sendMessage(player,
+                        "&cSkipping PlotSquared.use_THIS.yml because it's empty");
                 }
 
                 try {
                     final String rawResponse = incendoPaster.upload();
-                    final JsonObject jsonObject = new JsonParser().parse(rawResponse).getAsJsonObject();
+                    final JsonObject jsonObject =
+                        new JsonParser().parse(rawResponse).getAsJsonObject();
 
                     if (jsonObject.has("created")) {
                         final String pasteId = jsonObject.get("paste_id").getAsString();
-                        final String link = String.format("https://incendo.org/paste/view/%s", pasteId);
-                        player.sendMessage(
-                            C.DEBUG_REPORT_CREATED.s().replace("%url%", link));
+                        final String link =
+                            String.format("https://incendo.org/paste/view/%s", pasteId);
+                        player.sendMessage(C.DEBUG_REPORT_CREATED.s().replace("%url%", link));
                     } else {
                         final String responseMessage = jsonObject.get("response").getAsString();
-                        MainUtil.sendMessage(player, String.format("&cFailed to create the debug paste: %s", responseMessage));
+                        MainUtil.sendMessage(player, String
+                            .format("&cFailed to create the debug paste: %s", responseMessage));
                     }
                 } catch (final Throwable throwable) {
                     throwable.printStackTrace();
-                    MainUtil.sendMessage(player, "&cFailed to create the debug paste: " + throwable.getMessage());
+                    MainUtil.sendMessage(player,
+                        "&cFailed to create the debug paste: " + throwable.getMessage());
                 }
             } catch (IOException e) {
                 e.printStackTrace();
@@ -122,19 +143,4 @@ import java.util.List;
         });
         return true;
     }
-
-    private static String readFile(@NonNull final File file) throws IOException {
-        final StringBuilder content = new StringBuilder();
-        final List<String> lines = new ArrayList<>();
-        try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
-            content.append(lines.get(i)).append("\n");
-        }
-        return content.toString();
-    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
index c875f44b9..9d0435c07 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -33,8 +33,9 @@ import java.util.*;
                         Settings.Limit.MAX_PLOTS;
                     final boolean result = player.hasPermissionRange(perm, checkRange) >= numeric;
                     if (!result) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
-                            .f(key.toLowerCase(), value.toLowerCase()));
+                        MainUtil.sendMessage(player, C.NO_PERMISSION,
+                            C.PERMISSION_SET_FLAG_KEY_VALUE
+                                .f(key.toLowerCase(), value.toLowerCase()));
                     }
                     return result;
                 }
@@ -45,12 +46,12 @@ import java.util.*;
             final PlotBlockListFlag blockListFlag = (PlotBlockListFlag) flag;
             final HashSet<PlotBlock> parsedBlocks = blockListFlag.parseValue(value);
             for (final PlotBlock block : parsedBlocks) {
-                final String permission = C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(),
-                    block.getRawId().toString().toLowerCase());
+                final String permission = C.PERMISSION_SET_FLAG_KEY_VALUE
+                    .f(key.toLowerCase(), block.getRawId().toString().toLowerCase());
                 final boolean result = Permissions.hasPermission(player, permission);
                 if (!result) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
-                        .f(key.toLowerCase(), value.toLowerCase()));
+                    MainUtil.sendMessage(player, C.NO_PERMISSION,
+                        C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
                     return false;
                 }
             }
@@ -58,8 +59,8 @@ import java.util.*;
         }
         final boolean result = Permissions.hasPermission(player, perm);
         if (!result) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_KEY_VALUE
-                .f(key.toLowerCase(), value.toLowerCase()));
+            MainUtil.sendMessage(player, C.NO_PERMISSION,
+                C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
         }
         return result;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
index 39d368865..94152175e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
@@ -96,7 +96,7 @@ public class Merge extends SubCommand {
                 if (args.length == 2) {
                     terrain = "true".equalsIgnoreCase(args[1]);
                 }
-                if(!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
+                if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
                     MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
                     return true;
                 }
@@ -132,7 +132,7 @@ public class Merge extends SubCommand {
         } else {
             terrain = true;
         }
-        if(!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
+        if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
             MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
             return true;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
index 50b6f36d8..b2e5170e5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
@@ -14,9 +14,10 @@ import java.util.Locale;
     category = CommandCategory.APPEARANCE, requiredType = RequiredType.PLAYER) public class Music
     extends SubCommand {
 
-    private static final Collection<String> DISCS = Arrays.asList("music_disc_13", "music_disc_cat",
-        "music_disc_blocks", "music_disc_chirp", "music_disc_far", "music_disc_mall", "music_disc_mellohi",
-        "music_disc_stal", "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait");
+    private static final Collection<String> DISCS = Arrays
+        .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
+            "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
+            "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait");
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         Location loc = player.getLocation();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 33570b9b6..d8103e5b8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -10,8 +10,10 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.UUID;
 
 @CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
     usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
index ee620e1c1..19414ac90 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
@@ -8,9 +8,9 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
 @CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
-    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.NONE,
-    category = CommandCategory.SETTINGS, confirmation = true) public class Unlink
-    extends SubCommand {
+    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]",
+    requiredType = RequiredType.NONE, category = CommandCategory.SETTINGS, confirmation = true)
+public class Unlink extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
index b50de8ca6..3d636e0dd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
@@ -80,8 +80,8 @@ public class Configuration {
                         WorldUtil.IMP.getClosestBlock(block);
                     if (value == null) {
                         throw new UnknownBlockException(block);
-                    } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir() &&
-                        !WorldUtil.IMP.isBlockSolid(value.best)) {
+                    } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir()
+                        && !WorldUtil.IMP.isBlockSolid(value.best)) {
                         throw new UnsafeBlockException(value.best);
                     }
                     blockBucket.addBlock(value.best, chance);
@@ -114,7 +114,8 @@ public class Configuration {
                             WorldUtil.IMP.getClosestBlock(block);
                         if (value == null || value.match > 1) {
                             return false;
-                        } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir() && !WorldUtil.IMP.isBlockSolid(value.best)) {
+                        } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir()
+                            && !WorldUtil.IMP.isBlockSolid(value.best)) {
                             throw new UnsafeBlockException(value.best);
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 0d5b74671..1f7f6a88d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -221,13 +221,16 @@ public class Settings extends Config {
         @Ignore public static boolean NATIVE_UUID_PROVIDER = false;
     }
 
+
     @Comment("General settings") public static final class General {
         @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
     }
 
+
     @Comment("Schematic Settings") public static final class Schematics {
-        @Comment("Whether schematic based generation should paste schematic on top of plots, or from Y=1")
-            public static boolean PASTE_ON_TOP = true;
+        @Comment(
+            "Whether schematic based generation should paste schematic on top of plots, or from Y=1")
+        public static boolean PASTE_ON_TOP = true;
     }
 
 
@@ -276,6 +279,7 @@ public class Settings extends Config {
             MAX_PLOTS = 127;
     }
 
+
     public static final class Confirmation {
         @Comment("Teleport to your plot on death") public static int CONFIRMATION_TIMEOUT_SECONDS =
             20;
@@ -347,7 +351,7 @@ public class Settings extends Config {
         @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER =
             false;
         @Comment("Delete plots when a player is banned") public static boolean BAN_DELETER = false;
-        @Comment("Prevent possibly unsafe blocks from being used in plot components") public static
-            boolean PREVENT_UNSAFE = true;
+        @Comment("Prevent possibly unsafe blocks from being used in plot components")
+        public static boolean PREVENT_UNSAFE = true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
index 6571a328c..1127a6ed2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
@@ -13,8 +13,7 @@ import java.util.*;
  * Database Functions
  * - These functions do not update the local plot objects and only make changes to the DB
  */
-@SuppressWarnings("deprecation")
-public class DBFunc {
+@SuppressWarnings("deprecation") public class DBFunc {
     /**
      * The "global" uuid.
      */
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index ed460450d..3e197a16d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -7,3296 +7,3076 @@ import com.github.intellectualsites.plotsquared.plot.config.Storage;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.StringFlag;
-import com.github.intellectualsites.plotsquared.plot.object.BlockLoc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotCluster;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.google.common.base.Charsets;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
+
+import javax.annotation.Nonnull;
+import java.sql.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Queue;
-import java.util.Set;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
 
 
-@SuppressWarnings("SqlDialectInspection")
-public class SQLManager implements AbstractDB {
+@SuppressWarnings("SqlDialectInspection") public class SQLManager implements AbstractDB {
 
-  // Public final
-  public final String SET_OWNER;
-  public final String GET_ALL_PLOTS;
-  public final String CREATE_PLOTS;
-  public final String CREATE_SETTINGS;
-  public final String CREATE_TIERS;
-  public final String CREATE_PLOT;
-  public final String CREATE_PLOT_SAFE;
-  public final String CREATE_CLUSTER;
-  private final String prefix;
-  // Private Final
-  private final Database database;
-  private final boolean mySQL;
-  /**
-   * important tasks
-   */
-  public volatile Queue<Runnable> globalTasks;
-  /**
-   * Notify tasks
-   */
-  public volatile Queue<Runnable> notifyTasks;
-  /**
-   * plot plot_denied plot_helpers plot_trusted plot_comments plot_settings plot_rating
-   */
-  public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
-  /**
-   * player_meta
-   */
-  public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
-  /**
-   * cluster cluster_helpers cluster_invited cluster_settings
-   */
-  public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
-  // Private
-  private Connection connection;
-  private boolean closed = false;
+    // Public final
+    public final String SET_OWNER;
+    public final String GET_ALL_PLOTS;
+    public final String CREATE_PLOTS;
+    public final String CREATE_SETTINGS;
+    public final String CREATE_TIERS;
+    public final String CREATE_PLOT;
+    public final String CREATE_PLOT_SAFE;
+    public final String CREATE_CLUSTER;
+    private final String prefix;
+    // Private Final
+    private final Database database;
+    private final boolean mySQL;
+    /**
+     * important tasks
+     */
+    public volatile Queue<Runnable> globalTasks;
+    /**
+     * Notify tasks
+     */
+    public volatile Queue<Runnable> notifyTasks;
+    /**
+     * plot plot_denied plot_helpers plot_trusted plot_comments plot_settings plot_rating
+     */
+    public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
+    /**
+     * player_meta
+     */
+    public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
+    /**
+     * cluster cluster_helpers cluster_invited cluster_settings
+     */
+    public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
+    // Private
+    private Connection connection;
+    private boolean closed = false;
 
-  /**
-   * Constructor
-   *
-   * @param p prefix
-   */
-  public SQLManager(final Database database, String p, boolean debug)
-      throws SQLException, ClassNotFoundException {
-    // Private final
-    this.database = database;
-    this.connection = database.openConnection();
-    this.mySQL = database instanceof MySQL;
-    this.globalTasks = new ConcurrentLinkedQueue<>();
-    this.notifyTasks = new ConcurrentLinkedQueue<>();
-    this.plotTasks = new ConcurrentHashMap<>();
-    this.playerTasks = new ConcurrentHashMap<>();
-    this.clusterTasks = new ConcurrentHashMap<>();
-    this.prefix = p;
-    this.SET_OWNER = "UPDATE `" + this.prefix
-        + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
-    this.GET_ALL_PLOTS =
-        "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
-    this.CREATE_PLOTS = "INSERT INTO `" + this.prefix
-        + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
-    this.CREATE_SETTINGS =
-        "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
-    this.CREATE_TIERS =
-        "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
-    this.CREATE_PLOT = "INSERT INTO `" + this.prefix
-        + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
+    /**
+     * Constructor
+     *
+     * @param p prefix
+     */
+    public SQLManager(final Database database, String p, boolean debug)
+        throws SQLException, ClassNotFoundException {
+        // Private final
+        this.database = database;
+        this.connection = database.openConnection();
+        this.mySQL = database instanceof MySQL;
+        this.globalTasks = new ConcurrentLinkedQueue<>();
+        this.notifyTasks = new ConcurrentLinkedQueue<>();
+        this.plotTasks = new ConcurrentHashMap<>();
+        this.playerTasks = new ConcurrentHashMap<>();
+        this.clusterTasks = new ConcurrentHashMap<>();
+        this.prefix = p;
+        this.SET_OWNER = "UPDATE `" + this.prefix
+            + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
+        this.GET_ALL_PLOTS =
+            "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
+        this.CREATE_PLOTS = "INSERT INTO `" + this.prefix
+            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
+        this.CREATE_SETTINGS =
+            "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
+        this.CREATE_TIERS =
+            "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
+        this.CREATE_PLOT = "INSERT INTO `" + this.prefix
+            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
 
-    if (mySQL) {
-      this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
-          + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
-          + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
-    } else {
-      this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
-          + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
-          + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
-    }
-    this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
-        + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
-    try {
-      createTables();
-    } catch (SQLException e) {
-      e.printStackTrace();
-    }
-    TaskManager.runTaskAsync(() -> {
-      long last = System.currentTimeMillis();
-      while (true) {
-        if (SQLManager.this.closed) {
-          break;
-        }
-        boolean hasTask =
-            !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
-                || !clusterTasks.isEmpty();
-        if (hasTask) {
-          if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
-              || !isValid()) {
-            last = System.currentTimeMillis();
-            reconnect();
-          }
-          if (!sendBatch()) {
-            try {
-              if (!getNotifyTasks().isEmpty()) {
-                for (Runnable task : getNotifyTasks()) {
-                  TaskManager.runTask(task);
-                }
-                getNotifyTasks().clear();
-              }
-              Thread.sleep(50);
-            } catch (InterruptedException e) {
-              e.printStackTrace();
-            }
-          }
+        if (mySQL) {
+            this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
+                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
+                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
         } else {
-          try {
-            Thread.sleep(1000);
-          } catch (InterruptedException e) {
+            this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
+                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
+                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+        }
+        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
+            + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
+        try {
+            createTables();
+        } catch (SQLException e) {
             e.printStackTrace();
-          }
         }
-      }
-    });
-  }
-
-  public boolean isValid() {
-    try {
-      if (connection.isClosed()) {
-        return false;
-      }
-    } catch (SQLException e) {
-      return false;
-    }
-    try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
-      stmt.executeQuery();
-      return true;
-    } catch (Throwable e) {
-      return false;
-    }
-  }
-
-  public void reconnect() {
-    try {
-      close();
-      SQLManager.this.closed = false;
-      SQLManager.this.connection = database.forceConnection();
-    } catch (SQLException | ClassNotFoundException e) {
-      e.printStackTrace();
-    }
-  }
-
-  public synchronized Queue<Runnable> getGlobalTasks() {
-    return this.globalTasks;
-  }
-
-  public synchronized Queue<Runnable> getNotifyTasks() {
-    return this.notifyTasks;
-  }
-
-  public synchronized void addPlotTask(@Nonnull Plot plot, UniqueStatement task) {
-    Queue<UniqueStatement> tasks = this.plotTasks.computeIfAbsent(plot, plot1 -> new ConcurrentLinkedQueue<>());
-    if (task == null) {
-      task = new UniqueStatement(String.valueOf(plot.hashCode())) {
-
-        @Override
-        public PreparedStatement get() {
-          return null;
-        }
-
-        @Override
-        public void set(PreparedStatement stmt) {
-        }
-
-        @Override
-        public void addBatch(PreparedStatement statement) {
-        }
-
-        @Override
-        public void execute(PreparedStatement statement) {
-        }
-
-      };
-    }
-    tasks.add(task);
-  }
-
-  public synchronized void addPlayerTask(UUID uuid, UniqueStatement task) {
-    if (uuid == null) {
-      return;
-    }
-    Queue<UniqueStatement> tasks = this.playerTasks.computeIfAbsent(uuid, uuid1 -> new ConcurrentLinkedQueue<>());
-    if (task == null) {
-      task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
-
-        @Override
-        public PreparedStatement get() {
-          return null;
-        }
-
-        @Override
-        public void set(PreparedStatement stmt) {
-        }
-
-        @Override
-        public void addBatch(PreparedStatement statement) {
-        }
-
-        @Override
-        public void execute(PreparedStatement statement) {
-        }
-
-      };
-    }
-    tasks.add(task);
-  }
-
-  public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
-    Queue<UniqueStatement> tasks = this.clusterTasks.computeIfAbsent(cluster, plotCluster -> new ConcurrentLinkedQueue<>());
-    if (task == null) {
-      task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
-
-        @Override
-        public PreparedStatement get() {
-          return null;
-        }
-
-        @Override
-        public void set(PreparedStatement stmt) {
-        }
-
-        @Override
-        public void addBatch(PreparedStatement statement) {
-        }
-
-        @Override
-        public void execute(PreparedStatement statement) {
-        }
-
-      };
-    }
-    tasks.add(task);
-  }
-
-  public synchronized void addGlobalTask(Runnable task) {
-    getGlobalTasks().add(task);
-  }
-
-  public synchronized void addNotifyTask(Runnable task) {
-    if (task != null) {
-      getNotifyTasks().add(task);
-    }
-  }
-
-  public boolean sendBatch() {
-    try {
-      if (!getGlobalTasks().isEmpty()) {
-        if (this.connection.getAutoCommit()) {
-          this.connection.setAutoCommit(false);
-        }
-        Runnable task = getGlobalTasks().remove();
-        if (task != null) {
-          try {
-            task.run();
-          } catch (Throwable e) {
-            PlotSquared.debug("============ DATABASE ERROR ============");
-            PlotSquared.debug("There was an error updating the database.");
-            PlotSquared.debug(" - It will be corrected on shutdown");
-            PlotSquared.debug("========================================");
-            e.printStackTrace();
-            PlotSquared.debug("========================================");
-          }
-        }
-        commit();
-        return true;
-      }
-      int count = -1;
-      if (!this.plotTasks.isEmpty()) {
-        count = 0;
-        if (this.connection.getAutoCommit()) {
-          this.connection.setAutoCommit(false);
-        }
-        String method = null;
-        PreparedStatement statement = null;
-        UniqueStatement task = null;
-        UniqueStatement lastTask = null;
-        Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
-            this.plotTasks.entrySet().iterator();
-        while (iter.hasNext()) {
-          try {
-            Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
-            Plot plot = entry.getKey();
-            Queue<UniqueStatement> tasks = entry.getValue();
-            if (tasks.isEmpty()) {
-              iter.remove();
-              continue;
-            }
-            task = tasks.remove();
-            count++;
-            if (task != null) {
-              if (task.method == null || !task.method.equals(method) || statement == null) {
-                if (statement != null) {
-                  lastTask.execute(statement);
-                  statement.close();
+        TaskManager.runTaskAsync(() -> {
+            long last = System.currentTimeMillis();
+            while (true) {
+                if (SQLManager.this.closed) {
+                    break;
                 }
-                method = task.method;
-                statement = task.get();
-              }
-              task.set(statement);
-              task.addBatch(statement);
-              try {
-                if (statement.isClosed()) {
-                  statement = null;
-                }
-              } catch (AbstractMethodError ignore) {
-              }
-            }
-            lastTask = task;
-          } catch (Throwable e) {
-            PlotSquared.debug("============ DATABASE ERROR ============");
-            PlotSquared.debug("There was an error updating the database.");
-            PlotSquared.debug(" - It will be corrected on shutdown");
-            PlotSquared.debug("========================================");
-            e.printStackTrace();
-            PlotSquared.debug("========================================");
-          }
-        }
-        if (statement != null && task != null) {
-          task.execute(statement);
-          statement.close();
-        }
-      }
-      if (!this.playerTasks.isEmpty()) {
-        count = 0;
-        if (this.connection.getAutoCommit()) {
-          this.connection.setAutoCommit(false);
-        }
-        String method = null;
-        PreparedStatement statement = null;
-        UniqueStatement task = null;
-        UniqueStatement lastTask = null;
-        for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
-          try {
-            UUID uuid = entry.getKey();
-            if (this.playerTasks.get(uuid).isEmpty()) {
-              this.playerTasks.remove(uuid);
-              continue;
-            }
-            task = this.playerTasks.get(uuid).remove();
-            count++;
-            if (task != null) {
-              if (task.method == null || !task.method.equals(method)) {
-                if (statement != null) {
-                  lastTask.execute(statement);
-                  statement.close();
-                }
-                method = task.method;
-                statement = task.get();
-              }
-              task.set(statement);
-              task.addBatch(statement);
-            }
-            lastTask = task;
-          } catch (Throwable e) {
-            PlotSquared.debug("============ DATABASE ERROR ============");
-            PlotSquared.debug("There was an error updating the database.");
-            PlotSquared.debug(" - It will be corrected on shutdown");
-            PlotSquared.debug("========================================");
-            e.printStackTrace();
-            PlotSquared.debug("========================================");
-          }
-        }
-        if (statement != null && task != null) {
-          task.execute(statement);
-          statement.close();
-        }
-      }
-      if (!this.clusterTasks.isEmpty()) {
-        count = 0;
-        if (this.connection.getAutoCommit()) {
-          this.connection.setAutoCommit(false);
-        }
-        String method = null;
-        PreparedStatement statement = null;
-        UniqueStatement task = null;
-        UniqueStatement lastTask = null;
-        for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks
-            .entrySet()) {
-          try {
-            PlotCluster cluster = entry.getKey();
-            if (this.clusterTasks.get(cluster).isEmpty()) {
-              this.clusterTasks.remove(cluster);
-              continue;
-            }
-            task = this.clusterTasks.get(cluster).remove();
-            count++;
-            if (task != null) {
-              if (task.method == null || !task.method.equals(method)) {
-                if (statement != null) {
-                  lastTask.execute(statement);
-                  statement.close();
-                }
-                method = task.method;
-                statement = task.get();
-              }
-              task.set(statement);
-              task.addBatch(statement);
-            }
-            lastTask = task;
-          } catch (Throwable e) {
-            PlotSquared.debug("============ DATABASE ERROR ============");
-            PlotSquared.debug("There was an error updating the database.");
-            PlotSquared.debug(" - It will be corrected on shutdown");
-            PlotSquared.debug("========================================");
-            e.printStackTrace();
-            PlotSquared.debug("========================================");
-          }
-        }
-        if (statement != null && task != null) {
-          task.execute(statement);
-          statement.close();
-        }
-      }
-      if (count > 0) {
-        commit();
-        return true;
-      }
-      if (count != -1) {
-        if (!this.connection.getAutoCommit()) {
-          this.connection.setAutoCommit(true);
-        }
-      }
-      if (!this.clusterTasks.isEmpty()) {
-        this.clusterTasks.clear();
-      }
-      if (!this.plotTasks.isEmpty()) {
-        this.plotTasks.clear();
-      }
-    } catch (Throwable e) {
-      PlotSquared.debug("============ DATABASE ERROR ============");
-      PlotSquared.debug("There was an error updating the database.");
-      PlotSquared.debug(" - It will be corrected on shutdown");
-      PlotSquared.debug("========================================");
-      e.printStackTrace();
-      PlotSquared.debug("========================================");
-    }
-    return false;
-  }
-
-  public Connection getConnection() {
-    return this.connection;
-  }
-
-  /**
-   * Set Plot owner
-   *
-   * @param plot Plot Object
-   * @param uuid Owner UUID
-   */
-  @Override
-  public void setOwner(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("setOwner") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setString(1, uuid.toString());
-        statement.setInt(2, plot.getId().x);
-        statement.setInt(3, plot.getId().y);
-        statement.setString(4, plot.getArea().toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
-      }
-    });
-  }
-
-  @Override
-  public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
-    addGlobalTask(() -> {
-      try {
-        // Create the plots
-        createPlots(myList, () -> {
-          try {
-            // Creating datastructures
-            HashMap<PlotId, Plot> plotMap = new HashMap<>();
-            for (Plot plot : myList) {
-              plotMap.put(plot.getId(), plot);
-            }
-            ArrayList<SettingsPair> settings = new ArrayList<>();
-            final ArrayList<UUIDPair> helpers = new ArrayList<>();
-            final ArrayList<UUIDPair> trusted = new ArrayList<>();
-            final ArrayList<UUIDPair> denied = new ArrayList<>();
-
-            // Populating structures
-            try (PreparedStatement stmt = SQLManager.this.connection
-                .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
-                ResultSet result = stmt.executeQuery()) {
-              while (result.next()) {
-                int id = result.getInt("id");
-                int x = result.getInt("plot_id_x");
-                int y = result.getInt("plot_id_z");
-                PlotId plotId = new PlotId(x, y);
-                Plot plot = plotMap.get(plotId);
-                if (plot != null) {
-                  settings.add(new SettingsPair(id, plot.getSettings()));
-                  for (UUID uuid : plot.getDenied()) {
-                    denied.add(new UUIDPair(id, uuid));
-                  }
-                  for (UUID uuid : plot.getMembers()) {
-                    trusted.add(new UUIDPair(id, uuid));
-                  }
-                  for (UUID uuid : plot.getTrusted()) {
-                    helpers.add(new UUIDPair(id, uuid));
-                  }
-                }
-              }
-            }
-            createSettings(settings, () -> createTiers(helpers, "helpers",
-                () -> createTiers(trusted, "trusted",
-                    () -> createTiers(denied, "denied",
-                        () -> {
-                          try {
-                            SQLManager.this.connection.commit();
-                          } catch (SQLException e) {
+                boolean hasTask =
+                    !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
+                        || !clusterTasks.isEmpty();
+                if (hasTask) {
+                    if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
+                        || !isValid()) {
+                        last = System.currentTimeMillis();
+                        reconnect();
+                    }
+                    if (!sendBatch()) {
+                        try {
+                            if (!getNotifyTasks().isEmpty()) {
+                                for (Runnable task : getNotifyTasks()) {
+                                    TaskManager.runTask(task);
+                                }
+                                getNotifyTasks().clear();
+                            }
+                            Thread.sleep(50);
+                        } catch (InterruptedException e) {
                             e.printStackTrace();
-                          }
-                          if (whenDone != null) {
-                            whenDone.run();
-                          }
-                        }))));
-          } catch (SQLException e) {
-            e.printStackTrace();
-            PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-            try {
-              SQLManager.this.connection.commit();
-            } catch (SQLException e1) {
-              e1.printStackTrace();
-            }
-          }
-        });
-      } catch (Exception e) {
-        e.printStackTrace();
-        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-        try {
-          SQLManager.this.connection.commit();
-        } catch (SQLException e1) {
-          e1.printStackTrace();
-        }
-      }
-    });
-  }
-
-  /**
-   * Create a plot
-   *
-   * @param myList list of plots to be created
-   */
-  public void createTiers(ArrayList<UUIDPair> myList, final String tier, Runnable whenDone) {
-    StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
-      @Override
-      public String getCreateMySQL(int size) {
-        return getCreateMySQL(size, SQLManager.this.CREATE_TIERS.replaceAll("%tier%", tier),
-            2);
-      }
-
-      @Override
-      public String getCreateSQLite(int size) {
-        return getCreateSQLite(size,
-            "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
-                + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
-      }
-
-      @Override
-      public String getCreateSQL() {
-        return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
-            + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
-      }
-
-      @Override
-      public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair)
-          throws SQLException {
-        stmt.setInt(i * 2 + 1, pair.id);
-        stmt.setString(i * 2 + 2, pair.uuid.toString());
-      }
-
-      @Override
-      public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair)
-          throws SQLException {
-        stmt.setInt(i * 2 + 1, pair.id);
-        stmt.setString(i * 2 + 2, pair.uuid.toString());
-      }
-
-      @Override
-      public void setSQL(PreparedStatement stmt, UUIDPair pair)
-          throws SQLException {
-        stmt.setInt(1, pair.id);
-        stmt.setString(2, pair.uuid.toString());
-      }
-    };
-    setBulk(myList, mod, whenDone);
-  }
-
-  /**
-   * Create a plot
-   *
-   * @param myList list of plots to be created
-   */
-  public void createPlots(List<Plot> myList, Runnable whenDone) {
-    StmtMod<Plot> mod = new StmtMod<Plot>() {
-      @Override
-      public String getCreateMySQL(int size) {
-        return getCreateMySQL(size, SQLManager.this.CREATE_PLOTS, 5);
-      }
-
-      @Override
-      public String getCreateSQLite(int size) {
-        return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ",
-            6);
-      }
-
-      @Override
-      public String getCreateSQL() {
-        return SQLManager.this.CREATE_PLOT;
-      }
-
-      @Override
-      public void setMySQL(PreparedStatement stmt, int i, Plot plot)
-          throws SQLException {
-        stmt.setInt(i * 5 + 1, plot.getId().x);
-        stmt.setInt(i * 5 + 2, plot.getId().y);
-        try {
-          stmt.setString(i * 5 + 3, plot.owner.toString());
-        } catch (SQLException ignored) {
-          stmt.setString(i * 5 + 3, everyone.toString());
-        }
-        stmt.setString(i * 5 + 4, plot.getArea().toString());
-        stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
-      }
-
-      @Override
-      public void setSQLite(PreparedStatement stmt, int i, Plot plot)
-          throws SQLException {
-        stmt.setNull(i * 6 + 1, 4);
-        stmt.setInt(i * 6 + 2, plot.getId().x);
-        stmt.setInt(i * 6 + 3, plot.getId().y);
-        try {
-          stmt.setString(i * 6 + 4, plot.owner.toString());
-        } catch (SQLException ignored) {
-          stmt.setString(i * 6 + 4, everyone.toString());
-        }
-        stmt.setString(i * 6 + 5, plot.getArea().toString());
-        stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
-      }
-
-      @Override
-      public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
-        stmt.setInt(1, plot.getId().x);
-        stmt.setInt(2, plot.getId().y);
-        stmt.setString(3, plot.owner.toString());
-        stmt.setString(4, plot.getArea().toString());
-        stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-
-      }
-    };
-    setBulk(myList, mod, whenDone);
-  }
-
-  public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
-    int size = objList.size();
-    if (size == 0) {
-      if (whenDone != null) {
-        whenDone.run();
-      }
-      return;
-    }
-    int packet;
-    if (this.mySQL) {
-      packet = Math.min(size, 5000);
-    } else {
-      packet = Math.min(size, 50);
-    }
-    int amount = size / packet;
-    try {
-      int count = 0;
-      PreparedStatement preparedStmt = null;
-      int last = -1;
-      for (int j = 0; j <= amount; j++) {
-        List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-        if (subList.isEmpty()) {
-          break;
-        }
-        String statement;
-        if (last == -1) {
-          last = subList.size();
-          statement = mod.getCreateMySQL(subList.size());
-          preparedStmt = this.connection.prepareStatement(statement);
-        }
-        if (subList.size() != last || count % 5000 == 0 && count > 0) {
-          preparedStmt.executeBatch();
-          preparedStmt.close();
-          statement = mod.getCreateMySQL(subList.size());
-          preparedStmt = this.connection.prepareStatement(statement);
-        }
-        for (int i = 0; i < subList.size(); i++) {
-          count++;
-          T obj = subList.get(i);
-          mod.setMySQL(preparedStmt, i, obj);
-        }
-        last = subList.size();
-        preparedStmt.addBatch();
-      }
-      PlotSquared.debug(
-          "&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-      preparedStmt.executeBatch();
-      preparedStmt.clearParameters();
-      preparedStmt.close();
-      if (whenDone != null) {
-        whenDone.run();
-      }
-      return;
-    } catch (SQLException e) {
-      if (this.mySQL) {
-        e.printStackTrace();
-        PlotSquared.debug("&cERROR 1:  | " + objList.get(0).getClass().getCanonicalName());
-      }
-    }
-    try {
-      int count = 0;
-      PreparedStatement preparedStmt = null;
-      int last = -1;
-      for (int j = 0; j <= amount; j++) {
-        List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-        if (subList.isEmpty()) {
-          break;
-        }
-        String statement;
-        if (last == -1) {
-          last = subList.size();
-          statement = mod.getCreateSQLite(subList.size());
-          preparedStmt = this.connection.prepareStatement(statement);
-        }
-        if (subList.size() != last || count % 5000 == 0 && count > 0) {
-          preparedStmt.executeBatch();
-          preparedStmt.clearParameters();
-          statement = mod.getCreateSQLite(subList.size());
-          preparedStmt = this.connection.prepareStatement(statement);
-        }
-        for (int i = 0; i < subList.size(); i++) {
-          count++;
-          T obj = subList.get(i);
-          mod.setSQLite(preparedStmt, i, obj);
-        }
-        last = subList.size();
-        preparedStmt.addBatch();
-      }
-      PlotSquared.debug(
-          "&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-      preparedStmt.executeBatch();
-      preparedStmt.clearParameters();
-      preparedStmt.close();
-    } catch (SQLException e) {
-      e.printStackTrace();
-      PlotSquared.debug("&cERROR 2:  | " + objList.get(0).getClass().getCanonicalName());
-      PlotSquared.debug("&6[WARN] Could not bulk save!");
-      try (PreparedStatement preparedStmt = this.connection
-          .prepareStatement(mod.getCreateSQL())) {
-        for (T obj : objList) {
-          mod.setSQL(preparedStmt, obj);
-          preparedStmt.addBatch();
-        }
-        PlotSquared.debug("&aBatch 3");
-        preparedStmt.executeBatch();
-      } catch (SQLException e3) {
-        e3.printStackTrace();
-        PlotSquared.debug("&c[ERROR] Failed to save all!");
-      }
-    }
-    if (whenDone != null) {
-      whenDone.run();
-    }
-  }
-
-  public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
-    final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
-      @Override
-      public String getCreateMySQL(int size) {
-        return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
-            + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
-            + "`position`) VALUES ", 10);
-      }
-
-      @Override
-      public String getCreateSQLite(int size) {
-        return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
-                + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
-            10);
-      }
-
-      @Override
-      public String getCreateSQL() {
-        return "INSERT INTO `" + SQLManager.this.prefix
-            + "plot_settings`(`plot_plot_id`) VALUES(?)";
-      }
-
-      @Override
-      public void setMySQL(PreparedStatement statement, int i, SettingsPair pair)
-          throws SQLException {
-        statement.setInt(i * 10 + 1, pair.id); // id
-        statement.setNull(i * 10 + 2, 4); // biome
-        statement.setNull(i * 10 + 3, 4); // rain
-        statement.setNull(i * 10 + 4, 4); // custom_time
-        statement.setNull(i * 10 + 5, 4); // time
-        statement.setNull(i * 10 + 6, 4); // deny_entry
-        if (pair.settings.getAlias().isEmpty()) {
-          statement.setNull(i * 10 + 7, 4);
-        } else {
-          statement.setString(i * 10 + 7, pair.settings.getAlias());
-        }
-        StringBuilder flag_string = new StringBuilder();
-        int k = 0;
-        for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
-          if (k != 0) {
-            flag_string.append(',');
-          }
-          flag_string.append(flag.getKey().getName()).append(':').append(
-              flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
-                  .replaceAll(",", "´"));
-          k++;
-        }
-        statement.setString(i * 10 + 8, flag_string.toString());
-        boolean[] merged = pair.settings.getMerged();
-        int hash = MainUtil.hash(merged);
-        statement.setInt(i * 10 + 9, hash);
-        BlockLoc loc = pair.settings.getPosition();
-        String position;
-        if (loc.y == 0) {
-          position = "DEFAULT";
-        } else {
-          position = loc.x + "," + loc.y + ',' + loc.z;
-        }
-        statement.setString(i * 10 + 10, position);
-      }
-
-      @Override
-      public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair)
-          throws SQLException {
-        stmt.setInt(i * 10 + 1, pair.id); // id
-        stmt.setNull(i * 10 + 2, 4); // biome
-        stmt.setNull(i * 10 + 3, 4); // rain
-        stmt.setNull(i * 10 + 4, 4); // custom_time
-        stmt.setNull(i * 10 + 5, 4); // time
-        stmt.setNull(i * 10 + 6, 4); // deny_entry
-        if (pair.settings.getAlias().isEmpty()) {
-          stmt.setNull(i * 10 + 7, 4);
-        } else {
-          stmt.setString(i * 10 + 7, pair.settings.getAlias());
-        }
-        StringBuilder flag_string = new StringBuilder();
-        int k = 0;
-        for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
-          if (k != 0) {
-            flag_string.append(',');
-          }
-          flag_string.append(flag.getKey().getName()).append(':').append(
-              flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
-                  .replaceAll(",", "´"));
-          k++;
-        }
-        stmt.setString(i * 10 + 8, flag_string.toString());
-        boolean[] merged = pair.settings.getMerged();
-        int n = 0;
-        for (int j = 0; j < 4; ++j) {
-          n = (n << 1) + (merged[j] ? 1 : 0);
-        }
-        stmt.setInt(i * 10 + 9, n);
-        BlockLoc loc = pair.settings.getPosition();
-        String position;
-        if (loc.y == 0) {
-          position = "DEFAULT";
-        } else {
-          position = loc.x + "," + loc.y + ',' + loc.z;
-        }
-        stmt.setString(i * 10 + 10, position);
-      }
-
-      @Override
-      public void setSQL(PreparedStatement stmt, SettingsPair pair)
-          throws SQLException {
-        stmt.setInt(1, pair.id);
-      }
-    };
-    addGlobalTask(() -> setBulk(myList, mod, whenDone));
-  }
-
-  public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
-    final StmtMod<Integer> mod = new StmtMod<Integer>() {
-      @Override
-      public String getCreateMySQL(int size) {
-        return getCreateMySQL(size, SQLManager.this.CREATE_SETTINGS, 1);
-      }
-
-      @Override
-      public String getCreateSQLite(int size) {
-        return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
-                + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
-            10);
-      }
-
-      @Override
-      public String getCreateSQL() {
-        return "INSERT INTO `" + SQLManager.this.prefix
-            + "plot_settings`(`plot_plot_id`) VALUES(?)";
-      }
-
-      @Override
-      public void setMySQL(PreparedStatement stmt, int i, Integer id)
-          throws SQLException {
-        stmt.setInt(i + 1, id);
-      }
-
-      @Override
-      public void setSQLite(PreparedStatement stmt, int i, Integer id)
-          throws SQLException {
-        stmt.setInt(i * 10 + 1, id);
-        stmt.setNull(i * 10 + 2, 4);
-        stmt.setNull(i * 10 + 3, 4);
-        stmt.setNull(i * 10 + 4, 4);
-        stmt.setNull(i * 10 + 5, 4);
-        stmt.setNull(i * 10 + 6, 4);
-        stmt.setNull(i * 10 + 7, 4);
-        stmt.setNull(i * 10 + 8, 4);
-        stmt.setNull(i * 10 + 9, 4);
-        stmt.setString(i * 10 + 10, "DEFAULT");
-      }
-
-      @Override
-      public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
-        stmt.setInt(1, id);
-      }
-    };
-    addGlobalTask(() -> setBulk(myList, mod, whenDone));
-  }
-
-  public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
-    final long timestamp = plot.getTimestamp();
-    addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, plot.getId().x);
-        stmt.setInt(2, plot.getId().y);
-        stmt.setString(3, plot.owner.toString());
-        stmt.setString(4, plot.getArea().toString());
-        stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-        stmt.setString(6, plot.getArea().toString());
-        stmt.setInt(7, plot.getId().x);
-        stmt.setInt(8, plot.getId().y);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT_SAFE,
-            Statement.RETURN_GENERATED_KEYS);
-      }
-
-      @Override
-      public void execute(PreparedStatement statement) {
-
-      }
-
-      @Override
-      public void addBatch(PreparedStatement statement) throws SQLException {
-        int inserted = statement.executeUpdate();
-        if (inserted > 0) {
-          try (ResultSet keys = statement.getGeneratedKeys()) {
-            if (keys.next()) {
-              plot.temp = keys.getInt(1);
-              addPlotTask(plot, new UniqueStatement(
-                  "createPlotAndSettings_settings_" + plot.hashCode()) {
-                @Override
-                public void set(PreparedStatement stmt)
-                    throws SQLException {
-                  stmt.setInt(1, getId(plot));
-                }
-
-                @Override
-                public PreparedStatement get() throws SQLException {
-                  return SQLManager.this.connection.prepareStatement(
-                      "INSERT INTO `" + SQLManager.this.prefix
-                          + "plot_settings`(`plot_plot_id`) VALUES(?)");
-                }
-              });
-              if (success != null) {
-                addNotifyTask(success);
-              }
-              return;
-            }
-          }
-        }
-        if (failure != null) {
-          failure.run();
-        }
-      }
-    });
-  }
-
-  public void commit() {
-    if (this.closed) {
-      return;
-    }
-    try {
-      if (!this.connection.getAutoCommit()) {
-        this.connection.commit();
-        this.connection.setAutoCommit(true);
-      }
-    } catch (SQLException e) {
-      e.printStackTrace();
-    }
-  }
-
-  @Override
-  public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
-    addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, plot.getId().x);
-        stmt.setInt(2, plot.getId().y);
-        stmt.setString(3, plot.owner.toString());
-        stmt.setString(4, plot.getArea().toString());
-        stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection
-            .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
-      }
-
-      @Override
-      public void execute(PreparedStatement statement) {
-      }
-
-      @Override
-      public void addBatch(PreparedStatement statement) throws SQLException {
-        statement.executeUpdate();
-        try (ResultSet keys = statement.getGeneratedKeys()) {
-          if (keys.next()) {
-            plot.temp = keys.getInt(1);
-          }
-        }
-      }
-    });
-    addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_settings`(`plot_plot_id`) VALUES(?)");
-      }
-    });
-    addNotifyTask(whenDone);
-  }
-
-  /**
-   * Create tables.
-   */
-  @Override
-  public void createTables() throws SQLException {
-    String[] tables =
-        new String[]{"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
-            "plot_rating", "plot_settings", "cluster", "player_meta"};
-    DatabaseMetaData meta = this.connection.getMetaData();
-    int create = 0;
-    for (String s : tables) {
-      ResultSet set = meta.getTables(null, null, this.prefix + s, new String[]{"TABLE"});
-      //            ResultSet set = meta.getTables(null, null, prefix + s, null);
-      if (!set.next()) {
-        create++;
-      }
-      set.close();
-    }
-    if (create == 0) {
-      return;
-    }
-    boolean addConstraint = create == tables.length;
-    PlotSquared.debug("Creating tables");
-    try (Statement stmt = this.connection.createStatement()) {
-      if (this.mySQL) {
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
-            + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
-            + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-            + "`world` VARCHAR(45) NOT NULL,"
-            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
-            + "PRIMARY KEY (`id`)"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
-            + "`user_uuid` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` ("
-            + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-            + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL,"
-            + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` ("
-            + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
-            + "  `plot_plot_id` INT(11) NOT NULL,"
-            + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
-            + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
-            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-            + "  `merged` INT(11) DEFAULT NULL,"
-            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-            + "  PRIMARY KEY (`plot_plot_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB "
-            + "DEFAULT CHARSET=utf8");
-        if (addConstraint) {
-          stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `"
-              + this.prefix
-              + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
-              + this.prefix + "plot` (`id`) ON DELETE CASCADE");
-        }
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
-            + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL,"
-            + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
-            + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-            + "`world` VARCHAR(45) NOT NULL,"
-            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
-            + "PRIMARY KEY (`id`)"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` ("
-            + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` ("
-            + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
-            + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
-            + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
-            + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-            + "  `merged` INT(11) DEFAULT NULL,"
-            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-            + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
-            + " `meta_id` INT(11) NOT NULL AUTO_INCREMENT,"
-            + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
-            + " `value` blob NOT NULL," + " PRIMARY KEY (`meta_id`)"
-            + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-      } else {
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
-            + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
-            + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL,"
-            + "`world` VARCHAR(45) NOT NULL,"
-            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
-            + "`user_uuid` VARCHAR(40) NOT NULL)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "plot_helpers` (`plot_plot_id` INT(11) NOT NULL,"
-            + "`user_uuid` VARCHAR(40) NOT NULL)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "plot_trusted` (`plot_plot_id` INT(11) NOT NULL,"
-            + "`user_uuid` VARCHAR(40) NOT NULL)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-            + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-            + "`comment` VARCHAR(40) NOT NULL,"
-            + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
-            + "`sender` VARCHAR(40) NOT NULL" + ')');
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
-            + "  `plot_plot_id` INT(11) NOT NULL,"
-            + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
-            + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
-            + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-            + "  `merged` INT(11) DEFAULT NULL,"
-            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-            + "  PRIMARY KEY (`plot_plot_id`)" + ')');
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
-            + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL,"
-            + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
-            + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-            + "`world` VARCHAR(45) NOT NULL,"
-            + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ')');
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "cluster_helpers` (`cluster_id` INT(11) NOT NULL,"
-            + "`user_uuid` VARCHAR(40) NOT NULL)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-            + "cluster_invited` (`cluster_id` INT(11) NOT NULL,"
-            + "`user_uuid` VARCHAR(40) NOT NULL)");
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
-            + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
-            + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
-            + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-            + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-            + "  `merged` INT(11) DEFAULT NULL,"
-            + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-            + "  PRIMARY KEY (`cluster_id`)" + ')');
-        stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
-            + " `meta_id` INTEGER PRIMARY KEY AUTOINCREMENT,"
-            + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
-            + " `value` blob NOT NULL" + ')');
-      }
-      stmt.executeBatch();
-      stmt.clearBatch();
-    }
-  }
-
-  @Override
-  public void deleteSettings(final Plot plot) {
-    addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_settings` WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void deleteHelpers(final Plot plot) {
-    if (plot.getTrusted().isEmpty()) {
-      return;
-    }
-    addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_helpers` WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void deleteTrusted(final Plot plot) {
-    if (plot.getMembers().isEmpty()) {
-      return;
-    }
-    addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_trusted` WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void deleteDenied(final Plot plot) {
-    if (plot.getDenied().isEmpty()) {
-      return;
-    }
-    addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_denied` WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void deleteComments(final Plot plot) {
-    addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, plot.getArea().toString());
-        stmt.setInt(2, plot.hashCode());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void deleteRatings(final Plot plot) {
-    if (Settings.Enabled_Components.RATING_CACHE && plot.getSettings().getRatings().isEmpty()) {
-      return;
-    }
-    addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_rating` WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  /**
-   * Delete a plot.
-   */
-  @Override
-  public void delete(final Plot plot) {
-    PlotSquared.debug(
-        "Deleting plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
-            + plot.owner + " Index: " + plot.temp);
-    deleteSettings(plot);
-    deleteDenied(plot);
-    deleteHelpers(plot);
-    deleteTrusted(plot);
-    deleteComments(plot);
-    deleteRatings(plot);
-    addPlotTask(plot, new UniqueStatement("delete_plot") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
-      }
-    });
-  }
-
-  /**
-   * Create plot settings
-   */
-  @Override
-  public void createPlotSettings(final int id, Plot plot) {
-    PlotSquared.debug(
-        "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
-            + plot.owner + " Index: " + id);
-    addPlotTask(plot, new UniqueStatement("createPlotSettings") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, id);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_settings`(`plot_plot_id`) VALUES(?)");
-      }
-    });
-  }
-
-  @Override
-  public int getClusterId(PlotCluster cluster) {
-    if (cluster.temp > 0) {
-      return cluster.temp;
-    }
-    try {
-      commit();
-      if (cluster.temp > 0) {
-        return cluster.temp;
-      }
-      int c_id;
-      try (PreparedStatement stmt = this.connection.prepareStatement(
-          "SELECT `id` FROM `" + this.prefix
-              + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
-        stmt.setInt(1, cluster.getP1().x);
-        stmt.setInt(2, cluster.getP1().y);
-        stmt.setInt(3, cluster.getP2().x);
-        stmt.setInt(4, cluster.getP2().y);
-        stmt.setString(5, cluster.area.toString());
-        try (ResultSet resultSet = stmt.executeQuery()) {
-          c_id = Integer.MAX_VALUE;
-          while (resultSet.next()) {
-            c_id = resultSet.getInt("id");
-          }
-        }
-      }
-      if (c_id == Integer.MAX_VALUE || c_id == 0) {
-        if (cluster.temp > 0) {
-          return cluster.temp;
-        }
-        throw new SQLException("Cluster does not exist in database");
-      }
-      cluster.temp = c_id;
-      return c_id;
-    } catch (SQLException e) {
-      e.printStackTrace();
-    }
-    return Integer.MAX_VALUE;
-  }
-
-  @Override
-  public int getId(Plot plot) {
-    if (plot.temp > 0) {
-      return plot.temp;
-    }
-    try {
-      commit();
-      if (plot.temp > 0) {
-        return plot.temp;
-      }
-      int id;
-      try (PreparedStatement statement = this.connection.prepareStatement(
-          "SELECT `id` FROM `" + this.prefix
-              + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
-        statement.setInt(1, plot.getId().x);
-        statement.setInt(2, plot.getId().y);
-        statement.setString(3, plot.getArea().toString());
-        try (ResultSet resultSet = statement.executeQuery()) {
-          id = Integer.MAX_VALUE;
-          while (resultSet.next()) {
-            id = resultSet.getInt("id");
-          }
-        }
-      }
-      if (id == Integer.MAX_VALUE || id == 0) {
-        if (plot.temp > 0) {
-          return plot.temp;
-        }
-        throw new SQLException("Plot does not exist in database");
-      }
-      plot.temp = id;
-      return id;
-    } catch (SQLException e) {
-      e.printStackTrace();
-    }
-    return Integer.MAX_VALUE;
-  }
-
-  @Override
-  public void updateTables(int[] oldVersion) {
-    try {
-      if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
-        try (Statement stmt = this.connection.createStatement()) {
-          stmt.executeUpdate(
-              "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
-        } catch (SQLException ignored) {
-        }
-      }
-      DatabaseMetaData data = this.connection.getMetaData();
-      ResultSet rs =
-          data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
-      if (rs.next()) {
-        rs.close();
-        rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
-        if (!rs.next()) {
-          rs.close();
-          try (Statement statement = this.connection.createStatement()) {
-            statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-            if (Storage.MySQL.USE) {
-              statement.addBatch(
-                  "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                      + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                      + "`comment` VARCHAR(40) NOT NULL,"
-                      + "`inbox` VARCHAR(40) NOT NULL,"
-                      + "`timestamp` INT(11) NOT NULL,"
-                      + "`sender` VARCHAR(40) NOT NULL"
-                      + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            } else {
-              statement.addBatch(
-                  "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                      + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                      + "`comment` VARCHAR(40) NOT NULL,"
-                      + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
-                      + "`sender` VARCHAR(40) NOT NULL" + ')');
-            }
-            statement.executeBatch();
-          } catch (SQLException ignored) {
-            try (Statement statement = this.connection.createStatement()) {
-              statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
-                  + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
-              statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
-                  + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
-              statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
-              statement.executeBatch();
-            }
-          }
-        }
-      }
-      rs.close();
-      rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
-      if (rs.next()) {
-        try (Statement statement = this.connection.createStatement()) {
-          statement.executeUpdate("DELETE FROM `" + this.prefix
-              + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
-              + this.prefix + "plot`)");
-        } catch (SQLException e) {
-          e.printStackTrace();
-        }
-
-        rs.close();
-        try (Statement statement = this.connection.createStatement()) {
-          for (String table : new String[]{"plot_denied", "plot_helpers",
-              "plot_trusted"}) {
-            ResultSet result = statement.executeQuery(
-                "SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table
-                    + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
-            if (result.next()) {
-              PlotSquared.debug("BACKING UP: " + this.prefix + table);
-              result.close();
-              statement.executeUpdate(
-                  "CREATE TABLE " + this.prefix + table + "_tmp AS SELECT * FROM "
-                      + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
-              statement.executeUpdate("DROP TABLE " + this.prefix + table);
-              statement.executeUpdate(
-                  "CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "
-                      + this.prefix + table + "_tmp");
-              statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
-              PlotSquared.debug("RESTORING: " + this.prefix + table);
-            }
-          }
-        } catch (SQLException e2) {
-          e2.printStackTrace();
-        }
-      }
-    } catch (SQLException e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  public void deleteRows(ArrayList<Integer> rowIds, final String table, final String column) {
-    setBulk(rowIds, new StmtMod<Integer>() {
-
-      @Override
-      public String getCreateMySQL(int size) {
-        return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
-            size);
-      }
-
-      @Override
-      public String getCreateSQLite(int size) {
-        return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
-            size);
-      }
-
-      @Override
-      public String getCreateSQL() {
-        return "DELETE FROM `" + table + "` WHERE `" + column + "` = ?";
-      }
-
-      @Override
-      public void setMySQL(PreparedStatement stmt, int i, Integer obj)
-          throws SQLException {
-        stmt.setInt(i + 1, obj);
-      }
-
-      @Override
-      public void setSQLite(PreparedStatement stmt, int i, Integer obj)
-          throws SQLException {
-        stmt.setInt(i + 1, obj);
-      }
-
-      @Override
-      public void setSQL(PreparedStatement stmt, Integer obj) throws SQLException {
-        stmt.setInt(1, obj);
-      }
-    }, null);
-  }
-
-  /**
-   * Load all plots, helpers, denied, trusted, and every setting from DB into a {@link HashMap}.
-   */
-  @Override
-  public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
-    HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
-    HashMap<Integer, Plot> plots = new HashMap<>();
-    try {
-      HashSet<String> areas = new HashSet<>();
-      if (PlotSquared.get().worlds.contains("worlds")) {
-        ConfigurationSection worldSection =
-            PlotSquared.get().worlds.getConfigurationSection("worlds");
-        if (worldSection != null) {
-          for (String worldKey : worldSection.getKeys(false)) {
-            areas.add(worldKey);
-            ConfigurationSection areaSection =
-                worldSection.getConfigurationSection(worldKey + ".areas");
-            if (areaSection != null) {
-              areaSection.getKeys(false).forEach(s -> {
-                String[] split = s.split("(?<![;])-");
-                if (split.length == 3) {
-                  areas.add(worldKey + ';' + split[0]);
-                }
-              });
-            }
-          }
-        }
-      }
-      HashMap<String, UUID> uuids = new HashMap<>();
-      HashMap<String, AtomicInteger> noExist = new HashMap<>();
-
-      /*
-       * Getting plots
-       */
-      try (Statement statement = this.connection.createStatement()) {
-        int id;
-        String owner;
-        UUID user;
-        try (ResultSet resultSet = statement.executeQuery(
-            "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
-                + this.prefix + "plot`")) {
-          ArrayList<Integer> toDelete = new ArrayList<>();
-          while (resultSet.next()) {
-            PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
-                resultSet.getInt("plot_id_z"));
-            id = resultSet.getInt("id");
-            String areaid = resultSet.getString("world");
-            if (!areas.contains(areaid)) {
-              if (Settings.Enabled_Components.DATABASE_PURGER) {
-                toDelete.add(id);
-                continue;
-              } else {
-                AtomicInteger value = noExist.get(areaid);
-                if (value != null) {
-                  value.incrementAndGet();
-                } else {
-                  noExist.put(areaid, new AtomicInteger(1));
-                }
-              }
-            }
-            owner = resultSet.getString("owner");
-            user = uuids.computeIfAbsent(owner, s -> {
-              try {
-                return UUID.fromString(s);
-              } catch (IllegalArgumentException ignored) {
-                if (Settings.UUID.FORCE_LOWERCASE) {
-                  return UUID.nameUUIDFromBytes(
-                      ("OfflinePlayer:" + s.toLowerCase())
-                          .getBytes(Charsets.UTF_8));
-                } else {
-                  return UUID.nameUUIDFromBytes(
-                      ("OfflinePlayer:" + s).getBytes(Charsets.UTF_8));
-                }
-              }
-            });
-            long time;
-            try {
-              Timestamp timestamp = resultSet.getTimestamp("timestamp");
-              time = timestamp.getTime();
-            } catch (SQLException exception) {
-              String parsable = resultSet.getString("timestamp");
-              try {
-                time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
-                    .getTime();
-              } catch (ParseException e) {
-                PlotSquared.debug(
-                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
-                        + plot_id + ") (" + parsable + ")");
-                time = System.currentTimeMillis() + id;
-              }
-            }
-            Plot plot = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
-                new HashSet<>(), "", null, null, null,
-                new boolean[]{false, false, false, false}, time, id);
-            HashMap<PlotId, Plot> map = newPlots.get(areaid);
-            if (map != null) {
-              Plot last = map.put(plot.getId(), plot);
-              if (last != null) {
-                if (Settings.Enabled_Components.DATABASE_PURGER) {
-                  toDelete.add(last.temp);
-                } else {
-                  PlotSquared.debug(
-                      "&cPLOT #" + id + "(" + last + ") in `" + this.prefix
-                          + "plot` is a duplicate. Delete this plot or set `database-purger: true` in the settings.yml.");
-                }
-              }
-            } else {
-              map = new HashMap<>();
-              newPlots.put(areaid, map);
-              map.put(plot.getId(), plot);
-            }
-            plots.put(id, plot);
-          }
-          deleteRows(toDelete, this.prefix + "plot", "id");
-        }
-        if (Settings.Enabled_Components.RATING_CACHE) {
-          try (ResultSet r = statement.executeQuery(
-              "SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix
-                  + "plot_rating`")) {
-            ArrayList<Integer> toDelete = new ArrayList<>();
-            while (r.next()) {
-              id = r.getInt("plot_plot_id");
-              owner = r.getString("player");
-              user = uuids.computeIfAbsent(owner, UUID::fromString);
-              Plot plot = plots.get(id);
-              if (plot != null) {
-                plot.getSettings().getRatings().put(user, r.getInt("rating"));
-              } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                toDelete.add(id);
-              } else {
-                PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                    + ") in `plot_rating` does not exist. Create this plot or set `database-purger: true` in the "
-                    + "settings.yml.");
-              }
-            }
-            deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id");
-          }
-        }
-
-        /*
-         * Getting helpers
-         */
-        try (ResultSet r = statement.executeQuery(
-            "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
-          ArrayList<Integer> toDelete = new ArrayList<>();
-          while (r.next()) {
-            id = r.getInt("plot_plot_id");
-            owner = r.getString("user_uuid");
-            user = uuids.computeIfAbsent(owner, UUID::fromString);
-            Plot plot = plots.get(id);
-            if (plot != null) {
-              plot.getTrusted().add(user);
-            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-              toDelete.add(id);
-            } else {
-              PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                  + ") in `plot_helpers` does not exist. Create this plot or set `database-purger: true` in the settings"
-                  + ".yml.");
-            }
-          }
-          deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id");
-        }
-
-        /*
-         * Getting trusted
-         */
-        try (ResultSet r = statement.executeQuery(
-            "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
-          ArrayList<Integer> toDelete = new ArrayList<>();
-          while (r.next()) {
-            id = r.getInt("plot_plot_id");
-            owner = r.getString("user_uuid");
-            user = uuids.computeIfAbsent(owner,UUID::fromString);
-            Plot plot = plots.get(id);
-            if (plot != null) {
-              plot.getMembers().add(user);
-            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-              toDelete.add(id);
-            } else {
-              PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                  + ") in `plot_trusted` does not exist. Create this plot or set `database-purger: true` in the settings"
-                  + ".yml.");
-            }
-          }
-          deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id");
-        }
-
-        /*
-         * Getting denied
-         */
-        try (ResultSet r = statement.executeQuery(
-            "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
-          ArrayList<Integer> toDelete = new ArrayList<>();
-          while (r.next()) {
-            id = r.getInt("plot_plot_id");
-            owner = r.getString("user_uuid");
-            user = uuids.computeIfAbsent(owner, UUID::fromString);
-            Plot plot = plots.get(id);
-            if (plot != null) {
-              plot.getDenied().add(user);
-            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-              toDelete.add(id);
-            } else {
-              PlotSquared.debug("&cENTRY " + id
-                  + " in `plot_denied` does not exist. Create this plot or set `database-purger: true` in the settings.yml.");
-            }
-          }
-          deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id");
-        }
-
-        try (ResultSet resultSet = statement
-            .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
-          ArrayList<Integer> toDelete = new ArrayList<>();
-          while (resultSet.next()) {
-            id = resultSet.getInt("plot_plot_id");
-            Plot plot = plots.get(id);
-            if (plot != null) {
-              plots.remove(id);
-              String alias = resultSet.getString("alias");
-              if (alias != null) {
-                plot.getSettings().setAlias(alias);
-              }
-              String pos = resultSet.getString("position");
-              switch (pos.toLowerCase()) {
-                case "":
-                case "default":
-                case "0,0,0":
-                case "center":
-                  break;
-                default:
-                  try {
-                    plot.getSettings().setPosition(BlockLoc.fromString(pos));
-                  } catch (Exception ignored) {
-                  }
-              }
-              int m = resultSet.getInt("merged");
-              boolean[] merged = new boolean[4];
-              for (int i = 0; i < 4; i++) {
-                merged[3 - i] = (m & 1 << i) != 0;
-              }
-              plot.getSettings().setMerged(merged);
-              String[] flags_string;
-              String myflags = resultSet.getString("flags");
-              if (myflags == null || myflags.isEmpty()) {
-                flags_string = new String[]{};
-              } else {
-                flags_string = myflags.split(",");
-              }
-              HashMap<Flag<?>, Object> flags = new HashMap<>();
-              boolean exception = false;
-              for (String element : flags_string) {
-                if (element.contains(":")) {
-                  String[] split = element.split(":");
-                  try {
-                    String flag_str =
-                        split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
-                    Flag<?> flag = FlagManager.getOrCreateFlag(split[0]);
-                    flags.put(flag, flag.parseValue(flag_str));
-                  } catch (Exception e) {
-                    e.printStackTrace();
-                    exception = true;
-                  }
-                } else {
-                  element =
-                      element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
-                  if (StringMan
-                      .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
-                    Flag flag = FlagManager.getOrCreateFlag(element);
-                    if (flag == null) {
-                      flag = new StringFlag(element) {
-                        @Override
-                        public String getValueDescription() {
-                          return "Generic Filler Flag";
                         }
-                      };
                     }
-                    flags.put(flag, flag.parseValue(""));
-                  } else {
-                    PlotSquared.debug("INVALID FLAG: " + element);
-                  }
-                }
-              }
-              if (exception) {
-                PlotSquared.debug("&cPlot #" + id + "(" + plot + ") | " + plot
-                    + " had an invalid flag. A fix has been attempted.");
-                PlotSquared.debug("&c" + myflags);
-                this.setFlags(plot, flags);
-              }
-              plot.getSettings().flags = flags;
-            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-              toDelete.add(id);
-            } else {
-              PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                  + ") in `plot_settings` does not exist. Create this plot or set `database-purger: true` in the settings"
-                  + ".yml.");
-            }
-          }
-          deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id");
-        }
-      }
-      if (!plots.entrySet().isEmpty()) {
-        createEmptySettings(new ArrayList<>(plots.keySet()), null);
-        for (Entry<Integer, Plot> entry : plots.entrySet()) {
-          entry.getValue().getSettings();
-        }
-      }
-      boolean invalidPlot = false;
-      for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
-        String worldName = entry.getKey();
-        invalidPlot = true;
-        PlotSquared.debug("&c[WARNING] Found " + entry.getValue().intValue()
-            + " plots in DB for non existent world; '" + worldName + "'.");
-      }
-      if (invalidPlot) {
-        PlotSquared.debug(
-            "&c[WARNING] - Please create the world/s or remove the plots using the purge command");
-      }
-    } catch (SQLException e) {
-      PlotSquared.debug("&7[WARN] Failed to load plots.");
-      e.printStackTrace();
-    }
-    return newPlots;
-  }
-
-  @Override
-  public void setMerged(final Plot plot, final boolean[] merged) {
-    plot.getSettings().setMerged(merged);
-    addPlotTask(plot, new UniqueStatement("setMerged") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        int hash = MainUtil.hash(merged);
-        stmt.setInt(1, hash);
-        stmt.setInt(2, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void swapPlots(Plot plot1, Plot plot2) {
-    final int id1 = getId(plot1);
-    final int id2 = getId(plot2);
-    final PlotId pos1 = plot1.getId();
-    final PlotId pos2 = plot2.getId();
-    addPlotTask(plot1, new UniqueStatement("swapPlots") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, pos2.x);
-        stmt.setInt(2, pos2.y);
-        stmt.setInt(3, id1);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-      }
-    });
-    addPlotTask(plot2, new UniqueStatement("swapPlots") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, pos1.x);
-        stmt.setInt(2, pos1.y);
-        stmt.setInt(3, id2);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void movePlot(final Plot original, final Plot newPlot) {
-    addPlotTask(original, new UniqueStatement("movePlot") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, newPlot.getId().x);
-        stmt.setInt(2, newPlot.getId().y);
-        stmt.setString(3, newPlot.getArea().toString());
-        stmt.setInt(4, getId(original));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot` SET `plot_id_x` = ?, `plot_id_z` = ?, `world` = ? WHERE `id` = ?");
-      }
-    });
-    addPlotTask(newPlot, null);
-  }
-
-  @Override
-  public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
-    final String flag_string = FlagManager.toString(flags);
-    addPlotTask(plot, new UniqueStatement("setFlags") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, flag_string);
-        stmt.setInt(2, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void setAlias(final Plot plot, final String alias) {
-    addPlotTask(plot, new UniqueStatement("setAlias") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, alias);
-        stmt.setInt(2, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  /**
-   * Purge all plots with the following database IDs
-   */
-  @Override
-  public void purgeIds(final Set<Integer> uniqueIds) {
-    addGlobalTask(() -> {
-      if (!uniqueIds.isEmpty()) {
-        try {
-          ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
-          String stmt_prefix = "";
-          int size = uniqueIdsList.size();
-          int packet = 990;
-          int amount = size / packet;
-          int count = 0;
-          int last = -1;
-          for (int j = 0; j <= amount; j++) {
-            PlotSquared.debug("Purging " + (j * packet) + " / " + size);
-            List<Integer> subList =
-                uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
-            if (subList.isEmpty()) {
-              break;
-            }
-            StringBuilder idstr2 = new StringBuilder();
-            stmt_prefix = "";
-            for (Integer id : subList) {
-              idstr2.append(stmt_prefix).append(id);
-              stmt_prefix = " OR `id` = ";
-            }
-            stmt_prefix = "";
-            StringBuilder idstr = new StringBuilder();
-            for (Integer id : subList) {
-              idstr.append(stmt_prefix).append(id);
-              stmt_prefix = " OR `plot_plot_id` = ";
-            }
-            PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                "DELETE FROM `" + SQLManager.this.prefix
-                    + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
-            stmt.executeUpdate();
-            stmt.close();
-            stmt = SQLManager.this.connection.prepareStatement(
-                "DELETE FROM `" + SQLManager.this.prefix
-                    + "plot_denied` WHERE `plot_plot_id` = " + idstr);
-            stmt.executeUpdate();
-            stmt.close();
-            stmt = SQLManager.this.connection.prepareStatement(
-                "DELETE FROM `" + SQLManager.this.prefix
-                    + "plot_settings` WHERE `plot_plot_id` = " + idstr);
-            stmt.executeUpdate();
-            stmt.close();
-            stmt = SQLManager.this.connection.prepareStatement(
-                "DELETE FROM `" + SQLManager.this.prefix
-                    + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
-            stmt.executeUpdate();
-            stmt.close();
-            stmt = SQLManager.this.connection.prepareStatement(
-                "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
-                    + idstr2);
-            stmt.executeUpdate();
-            stmt.close();
-            commit();
-          }
-        } catch (SQLException e) {
-          e.printStackTrace();
-          PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
-          return;
-        }
-      }
-      PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
-    });
-  }
-
-  @Override
-  public void purge(final PlotArea area, final Set<PlotId> plots) {
-    addGlobalTask(() -> {
-      try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-          "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
-              + "plot` WHERE `world` = ?")) {
-        stmt.setString(1, area.toString());
-        Set<Integer> ids;
-        try (ResultSet r = stmt.executeQuery()) {
-          ids = new HashSet<>();
-          while (r.next()) {
-            PlotId plot_id =
-                new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-            if (plots.contains(plot_id)) {
-              ids.add(r.getInt("id"));
-            }
-          }
-        }
-        purgeIds(ids);
-      } catch (SQLException e) {
-        e.printStackTrace();
-        PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
-      }
-      for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
-        PlotId plotId = iterator.next();
-        iterator.remove();
-        PlotId id = new PlotId(plotId.x, plotId.y);
-        area.removePlot(id);
-      }
-    });
-  }
-
-  @Override
-  public void setPosition(final Plot plot, final String position) {
-    addPlotTask(plot, new UniqueStatement("setPosition") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, position == null ? "" : position);
-        stmt.setInt(2, getId(plot));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void removeComment(final Plot plot, final PlotComment comment) {
-    addPlotTask(plot, new UniqueStatement("removeComment") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        if (plot != null) {
-          statement.setString(1, plot.getArea().toString());
-          statement.setInt(2, plot.getId().hashCode());
-          statement.setString(3, comment.comment);
-          statement.setString(4, comment.inbox);
-          statement.setString(5, comment.senderName);
-        } else {
-          statement.setString(1, comment.comment);
-          statement.setString(2, comment.inbox);
-          statement.setString(3, comment.senderName);
-        }
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        if (plot != null) {
-          return SQLManager.this.connection.prepareStatement(
-              "DELETE FROM `" + SQLManager.this.prefix
-                  + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
-        }
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void clearInbox(final Plot plot, final String inbox) {
-    addPlotTask(plot, new UniqueStatement("clearInbox") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        if (plot != null) {
-          statement.setString(1, plot.getArea().toString());
-          statement.setInt(2, plot.getId().hashCode());
-          statement.setString(3, inbox);
-        } else {
-          statement.setString(1, inbox);
-        }
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        if (plot != null) {
-          return SQLManager.this.connection.prepareStatement(
-              "DELETE FROM `" + SQLManager.this.prefix
-                  + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-        }
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void getComments(final Plot plot, final String inbox,
-      final RunnableVal<List<PlotComment>> whenDone) {
-    addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        if (plot != null) {
-          statement.setString(1, plot.getArea().toString());
-          statement.setInt(2, plot.getId().hashCode());
-          statement.setString(3, inbox);
-        } else {
-          statement.setString(1, inbox);
-        }
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        if (plot != null) {
-          return SQLManager.this.connection.prepareStatement(
-              "SELECT * FROM `" + SQLManager.this.prefix
-                  + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-        }
-        return SQLManager.this.connection.prepareStatement(
-            "SELECT * FROM `" + SQLManager.this.prefix
-                + "plot_comments` WHERE `inbox` = ?");
-      }
-
-      @Override
-      public void execute(PreparedStatement statement) {
-      }
-
-      @Override
-      public void addBatch(PreparedStatement statement) throws SQLException {
-        ArrayList<PlotComment> comments = new ArrayList<>();
-        try (ResultSet set = statement.executeQuery()) {
-          while (set.next()) {
-            String sender = set.getString("sender");
-            String world = set.getString("world");
-            int hash = set.getInt("hashcode");
-            PlotId id;
-            if (hash != 0) {
-              id = PlotId.unpair(hash);
-            } else {
-              id = null;
-            }
-            String msg = set.getString("comment");
-            long timestamp = set.getInt("timestamp") * 1000;
-            PlotComment comment =
-                new PlotComment(world, id, msg, sender, inbox, timestamp);
-            comments.add(comment);
-            whenDone.value = comments;
-          }
-        }
-        TaskManager.runTask(whenDone);
-      }
-    });
-  }
-
-  @Override
-  public void setComment(final Plot plot, final PlotComment comment) {
-    addPlotTask(plot, new UniqueStatement("setComment") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setString(1, plot.getArea().toString());
-        statement.setInt(2, plot.getId().hashCode());
-        statement.setString(3, comment.comment);
-        statement.setString(4, comment.inbox);
-        statement.setInt(5, (int) (comment.timestamp / 1000));
-        statement.setString(6, comment.senderName);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
-      }
-    });
-  }
-
-  @Override
-  public void removeTrusted(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("removeTrusted") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void removeMember(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("removeMember") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void setTrusted(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("setTrusted") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-      }
-    });
-  }
-
-  @Override
-  public void setMember(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("setMember") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-      }
-    });
-  }
-
-  @Override
-  public void removeDenied(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("removeDenied") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void setDenied(final Plot plot, final UUID uuid) {
-    addPlotTask(plot, new UniqueStatement("setDenied") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-      }
-    });
-  }
-
-  @Override
-  public HashMap<UUID, Integer> getRatings(Plot plot) {
-    HashMap<UUID, Integer> map = new HashMap<>();
-    try (PreparedStatement statement = this.connection.prepareStatement(
-        "SELECT `rating`, `player` FROM `" + this.prefix
-            + "plot_rating` WHERE `plot_plot_id` = ? ")) {
-      statement.setInt(1, getId(plot));
-      try (ResultSet resultSet = statement.executeQuery()) {
-        while (resultSet.next()) {
-          UUID uuid = UUID.fromString(resultSet.getString("player"));
-          int rating = resultSet.getInt("rating");
-          map.put(uuid, rating);
-        }
-      }
-    } catch (SQLException e) {
-      PlotSquared
-          .debug("&7[WARN] Failed to fetch rating for plot " + plot.getId().toString());
-      e.printStackTrace();
-    }
-    return map;
-  }
-
-  @Override
-  public void setRating(final Plot plot, final UUID rater, final int value) {
-    addPlotTask(plot, new UniqueStatement("setRating") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getId(plot));
-        statement.setInt(2, value);
-        statement.setString(3, rater.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
-      }
-    });
-  }
-
-  @Override
-  public void delete(PlotCluster cluster) {
-    final int id = getClusterId(cluster);
-    addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, id);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "cluster_settings` WHERE `cluster_id` = ?");
-      }
-    });
-    addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, id);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "cluster_helpers` WHERE `cluster_id` = ?");
-      }
-    });
-    addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, id);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "cluster_invited` WHERE `cluster_id` = ?");
-      }
-    });
-    addClusterTask(cluster, new UniqueStatement("delete_cluster") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, id);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
-      final boolean replace) {
-    addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        if (replace) {
-          stmt.setBytes(1, meta);
-          stmt.setString(2, uuid.toString());
-          stmt.setString(3, key);
-        } else {
-          stmt.setString(1, uuid.toString());
-          stmt.setString(2, key);
-          stmt.setBytes(3, meta);
-        }
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        if (replace) {
-          return SQLManager.this.connection.prepareStatement(
-              "UPDATE `" + SQLManager.this.prefix
-                  + "player_meta` SET `value` = ? WHERE `uuid` = ? AND `key` = ?");
-        } else {
-          return SQLManager.this.connection.prepareStatement(
-              "INSERT INTO `" + SQLManager.this.prefix
-                  + "player_meta`(`uuid`, `key`, `value`) VALUES(?, ? ,?)");
-        }
-      }
-    });
-  }
-
-  @Override
-  public void removePersistentMeta(final UUID uuid, final String key) {
-    addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, uuid.toString());
-        stmt.setString(2, key);
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "player_meta` WHERE `uuid` = ? AND `key` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
-    addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "SELECT * FROM `" + SQLManager.this.prefix
-                + "player_meta` WHERE `uuid` = ? ORDER BY `meta_id` ASC");
-      }
-
-      @Override
-      public void execute(PreparedStatement statement) {
-      }
-
-      @Override
-      public void addBatch(PreparedStatement statement) throws SQLException {
-        ResultSet resultSet = statement.executeQuery();
-
-        final Map<String, byte[]> metaMap = new HashMap<>();
-
-        while (resultSet.next()) {
-          String key = resultSet.getString("key");
-          byte[] bytes = resultSet.getBytes("value");
-          metaMap.put(key, bytes);
-        }
-
-        resultSet.close();
-        TaskManager.runTaskAsync(() -> result.run(metaMap));
-      }
-
-    });
-  }
-
-  @Override
-  public HashMap<String, Set<PlotCluster>> getClusters() {
-    LinkedHashMap<String, Set<PlotCluster>> newClusters = new LinkedHashMap<>();
-    HashMap<Integer, PlotCluster> clusters = new HashMap<>();
-    try {
-      HashSet<String> areas = new HashSet<>();
-      if (PlotSquared.get().worlds.contains("worlds")) {
-        ConfigurationSection worldSection =
-            PlotSquared.get().worlds.getConfigurationSection("worlds");
-        if (worldSection != null) {
-          for (String worldKey : worldSection.getKeys(false)) {
-            areas.add(worldKey);
-            ConfigurationSection areaSection =
-                worldSection.getConfigurationSection(worldKey + ".areas");
-            if (areaSection != null) {
-              for (String areaKey : areaSection.getKeys(false)) {
-                String[] split = areaKey.split("(?<![;])-");
-                if (split.length == 3) {
-                  areas.add(worldKey + ';' + split[0]);
-                }
-              }
-            }
-          }
-        }
-      }
-      HashMap<String, UUID> uuids = new HashMap<>();
-      HashMap<String, Integer> noExist = new HashMap<>();
-      /*
-       * Getting clusters
-       */
-      try (Statement stmt = this.connection.createStatement()) {
-        ResultSet resultSet =
-            stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
-        PlotCluster cluster;
-        String owner;
-        UUID user;
-        int id;
-        while (resultSet.next()) {
-          PlotId pos1 =
-              new PlotId(resultSet.getInt("pos1_x"), resultSet.getInt("pos1_z"));
-          PlotId pos2 =
-              new PlotId(resultSet.getInt("pos2_x"), resultSet.getInt("pos2_z"));
-          id = resultSet.getInt("id");
-          String areaid = resultSet.getString("world");
-          if (!areas.contains(areaid)) {
-            if (noExist.containsKey(areaid)) {
-              noExist.put(areaid, noExist.get(areaid) + 1);
-            } else {
-              noExist.put(areaid, 1);
-            }
-          }
-          owner = resultSet.getString("owner");
-          user = uuids.computeIfAbsent(owner, UUID::fromString);
-          cluster = new PlotCluster(null, pos1, pos2, user, id);
-          clusters.put(id, cluster);
-          Set<PlotCluster> set = newClusters
-              .computeIfAbsent(areaid, k -> new HashSet<>());
-          set.add(cluster);
-        }
-        //Getting helpers
-        resultSet = stmt.executeQuery(
-            "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
-        while (resultSet.next()) {
-          id = resultSet.getInt("cluster_id");
-          owner = resultSet.getString("user_uuid");
-          user = uuids.computeIfAbsent(owner,UUID::fromString);
-          cluster = clusters.get(id);
-          if (cluster != null) {
-            cluster.helpers.add(user);
-          } else {
-            PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                + ") in cluster_helpers does not exist. Please create the cluster or remove this entry.");
-          }
-        }
-        // Getting invited
-        resultSet = stmt.executeQuery(
-            "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
-        while (resultSet.next()) {
-          id = resultSet.getInt("cluster_id");
-          owner = resultSet.getString("user_uuid");
-          user = uuids.computeIfAbsent(owner,UUID::fromString);
-          cluster = clusters.get(id);
-          if (cluster != null) {
-            cluster.invited.add(user);
-          } else {
-            PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                + ") in cluster_invited does not exist. Please create the cluster or remove this entry.");
-          }
-        }
-        resultSet =
-            stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
-        while (resultSet.next()) {
-          id = resultSet.getInt("cluster_id");
-          cluster = clusters.get(id);
-          if (cluster != null) {
-            String alias = resultSet.getString("alias");
-            if (alias != null) {
-              cluster.settings.setAlias(alias);
-            }
-            String pos = resultSet.getString("position");
-            switch (pos.toLowerCase()) {
-              case "":
-              case "default":
-              case "0,0,0":
-              case "center":
-                break;
-              default:
-                try {
-                  BlockLoc loc = BlockLoc.fromString(pos);
-                  cluster.settings.setPosition(loc);
-                } catch (Exception ignored) {
-                }
-            }
-            int m = resultSet.getInt("merged");
-            boolean[] merged = new boolean[4];
-            for (int i = 0; i < 4; i++) {
-              merged[3 - i] = (m & 1 << i) != 0;
-            }
-            cluster.settings.setMerged(merged);
-            String[] flags_string;
-            String myflags = resultSet.getString("flags");
-            if (myflags == null || myflags.isEmpty()) {
-              flags_string = new String[]{};
-            } else {
-              flags_string = myflags.split(",");
-            }
-            HashMap<Flag<?>, Object> flags = new HashMap<>();
-            for (String element : flags_string) {
-              if (element.contains(":")) {
-                String[] split = element.split(":");
-                String flag_str =
-                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
-                Flag flag = FlagManager.getOrCreateFlag(split[0]);
-                if (flag == null) {
-                  flag = new StringFlag(split[0]) {
-                    @Override
-                    public String getValueDescription() {
-                      return "Generic Filler Flag";
+                } else {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
                     }
-                  };
                 }
-                flags.put(flag, flag.parseValue(flag_str));
-              } else {
-                Flag flag = FlagManager.getOrCreateFlag(element);
-                if (flag == null) {
-                  flag = new StringFlag(element) {
-                    @Override
-                    public String getValueDescription() {
-                      return "Generic Filler Flag";
-                    }
-                  };
-                }
-                flags.put(flag, flag.parseValue(""));
-              }
             }
-            cluster.settings.flags = flags;
-          } else {
-            PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
-          }
-        }
-        resultSet.close();
-      }
-      boolean invalidPlot = false;
-      for (Entry<String, Integer> entry : noExist.entrySet()) {
-        String a = entry.getKey();
-        invalidPlot = true;
-        PlotSquared.debug("&c[WARNING] Found " + noExist.get(a)
-            + " clusters in DB for non existent area; '" + a + "'.");
-      }
-      if (invalidPlot) {
-        PlotSquared.debug(
-            "&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
-      }
-    } catch (SQLException e) {
-      PlotSquared.debug("&7[WARN] Failed to load clusters.");
-      e.printStackTrace();
-    }
-    return newClusters;
-  }
-
-  @Override
-  public void setClusterName(final PlotCluster cluster, final String name) {
-    addClusterTask(cluster, new UniqueStatement("setClusterName") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, name);
-        stmt.setInt(2, getClusterId(cluster));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
-      }
-    });
-    cluster.settings.setAlias(name);
-  }
-
-  @Override
-  public void removeHelper(final PlotCluster cluster, final UUID uuid) {
-    addClusterTask(cluster, new UniqueStatement("removeHelper") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getClusterId(cluster));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void setHelper(final PlotCluster cluster, final UUID uuid) {
-    addClusterTask(cluster, new UniqueStatement("setHelper") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getClusterId(cluster));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-      }
-    });
-  }
-
-  @Override
-  public void createCluster(final PlotCluster cluster) {
-    addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, cluster.getP1().x);
-        stmt.setInt(2, cluster.getP1().y);
-        stmt.setInt(3, cluster.getP2().x);
-        stmt.setInt(4, cluster.getP2().y);
-        stmt.setString(5, cluster.owner.toString());
-        stmt.setString(6, cluster.area.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER,
-            Statement.RETURN_GENERATED_KEYS);
-      }
-
-      @Override
-      public void execute(PreparedStatement statement) {
-      }
-
-      @Override
-      public void addBatch(PreparedStatement statement) throws SQLException {
-        statement.executeUpdate();
-        try (ResultSet keys = statement.getGeneratedKeys()) {
-          if (keys.next()) {
-            cluster.temp = keys.getInt(1);
-          }
-        }
-      }
-    });
-    addClusterTask(cluster,
-        new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
-          @Override
-          public void set(PreparedStatement stmt) throws SQLException {
-            stmt.setInt(1, getClusterId(cluster));
-            stmt.setString(2, cluster.getAlias());
-          }
-
-          @Override
-          public PreparedStatement get() throws SQLException {
-            return SQLManager.this.connection.prepareStatement(
-                "INSERT INTO `" + SQLManager.this.prefix
-                    + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?)");
-          }
         });
-  }
-
-  @Override
-  public void resizeCluster(final PlotCluster current, PlotId min, PlotId max) {
-    final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
-    final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
-    current.setP1(min);
-    current.setP2(max);
-
-    addClusterTask(current, new UniqueStatement("resizeCluster") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setInt(1, pos1.x);
-        stmt.setInt(2, pos1.y);
-        stmt.setInt(3, pos2.x);
-        stmt.setInt(4, pos2.y);
-        stmt.setInt(5, getClusterId(current));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void setPosition(final PlotCluster cluster, final String position) {
-    addClusterTask(cluster, new UniqueStatement("setPosition") {
-      @Override
-      public void set(PreparedStatement stmt) throws SQLException {
-        stmt.setString(1, position);
-        stmt.setInt(2, getClusterId(cluster));
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void removeInvited(final PlotCluster cluster, final UUID uuid) {
-    addClusterTask(cluster, new UniqueStatement("removeInvited") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getClusterId(cluster));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "DELETE FROM `" + SQLManager.this.prefix
-                + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-      }
-    });
-  }
-
-  @Override
-  public void setInvited(final PlotCluster cluster, final UUID uuid) {
-    addClusterTask(cluster, new UniqueStatement("setInvited") {
-      @Override
-      public void set(PreparedStatement statement) throws SQLException {
-        statement.setInt(1, getClusterId(cluster));
-        statement.setString(2, uuid.toString());
-      }
-
-      @Override
-      public PreparedStatement get() throws SQLException {
-        return SQLManager.this.connection.prepareStatement(
-            "INSERT INTO `" + SQLManager.this.prefix
-                + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-      }
-    });
-  }
-
-  @Override
-  public boolean deleteTables() {
-    try (Statement stmt = this.connection.createStatement();
-        PreparedStatement statement = this.connection
-            .prepareStatement("DROP TABLE `" + this.prefix + "plot`")) {
-      close();
-      this.closed = false;
-      SQLManager.this.connection = this.database.forceConnection();
-      stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_invited`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_helpers`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "cluster`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_rating`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_settings`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_trusted`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_helpers`");
-      stmt.addBatch("DROP TABLE `" + this.prefix + "plot_denied`");
-      stmt.executeBatch();
-      stmt.clearBatch();
-      statement.executeUpdate();
-    } catch (ClassNotFoundException | SQLException e) {
-      e.printStackTrace();
-
     }
-    return true;
-  }
 
-  @Override
-  public void validateAllPlots(Set<Plot> toValidate) {
-    if (!isValid()) {
-      reconnect();
+    public boolean isValid() {
+        try {
+            if (connection.isClosed()) {
+                return false;
+            }
+        } catch (SQLException e) {
+            return false;
+        }
+        try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
+            stmt.executeQuery();
+            return true;
+        } catch (Throwable e) {
+            return false;
+        }
     }
-    PlotSquared.debug(
-        "$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
-    commit();
-    while (true) {
-      if (!sendBatch()) {
-        break;
-      }
+
+    public void reconnect() {
+        try {
+            close();
+            SQLManager.this.closed = false;
+            SQLManager.this.connection = database.forceConnection();
+        } catch (SQLException | ClassNotFoundException e) {
+            e.printStackTrace();
+        }
     }
-    try {
-      if (this.connection.getAutoCommit()) {
-        this.connection.setAutoCommit(false);
-      }
-    } catch (SQLException e) {
-      e.printStackTrace();
+
+    public synchronized Queue<Runnable> getGlobalTasks() {
+        return this.globalTasks;
     }
-    HashMap<String, HashMap<PlotId, Plot>> database = getPlots();
-    ArrayList<Plot> toCreate = new ArrayList<>();
-    for (Plot plot : toValidate) {
-      if (plot.temp == -1) {
-        continue;
-      }
-      HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
-      if (worldPlots == null) {
-        PlotSquared.debug("&8 - &7Creating plot (1): " + plot);
-        toCreate.add(plot);
-        continue;
-      }
-      Plot dataPlot = worldPlots.remove(plot.getId());
-      if (dataPlot == null) {
-        PlotSquared.debug("&8 - &7Creating plot (2): " + plot);
-        toCreate.add(plot);
-        continue;
-      }
-      // owner
-      if (!plot.owner.equals(dataPlot.owner)) {
-        PlotSquared
-            .debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
-        setOwner(plot, plot.owner);
-      }
-      // trusted
-      if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
-        HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
-        HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
-        toRemove.removeAll(plot.getTrusted());
-        toAdd.removeAll(dataPlot.getTrusted());
+
+    public synchronized Queue<Runnable> getNotifyTasks() {
+        return this.notifyTasks;
+    }
+
+    public synchronized void addPlotTask(@Nonnull Plot plot, UniqueStatement task) {
+        Queue<UniqueStatement> tasks =
+            this.plotTasks.computeIfAbsent(plot, plot1 -> new ConcurrentLinkedQueue<>());
+        if (task == null) {
+            task = new UniqueStatement(String.valueOf(plot.hashCode())) {
+
+                @Override public PreparedStatement get() {
+                    return null;
+                }
+
+                @Override public void set(PreparedStatement stmt) {
+                }
+
+                @Override public void addBatch(PreparedStatement statement) {
+                }
+
+                @Override public void execute(PreparedStatement statement) {
+                }
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addPlayerTask(UUID uuid, UniqueStatement task) {
+        if (uuid == null) {
+            return;
+        }
+        Queue<UniqueStatement> tasks =
+            this.playerTasks.computeIfAbsent(uuid, uuid1 -> new ConcurrentLinkedQueue<>());
+        if (task == null) {
+            task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
+
+                @Override public PreparedStatement get() {
+                    return null;
+                }
+
+                @Override public void set(PreparedStatement stmt) {
+                }
+
+                @Override public void addBatch(PreparedStatement statement) {
+                }
+
+                @Override public void execute(PreparedStatement statement) {
+                }
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
+        Queue<UniqueStatement> tasks = this.clusterTasks
+            .computeIfAbsent(cluster, plotCluster -> new ConcurrentLinkedQueue<>());
+        if (task == null) {
+            task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
+
+                @Override public PreparedStatement get() {
+                    return null;
+                }
+
+                @Override public void set(PreparedStatement stmt) {
+                }
+
+                @Override public void addBatch(PreparedStatement statement) {
+                }
+
+                @Override public void execute(PreparedStatement statement) {
+                }
+
+            };
+        }
+        tasks.add(task);
+    }
+
+    public synchronized void addGlobalTask(Runnable task) {
+        getGlobalTasks().add(task);
+    }
+
+    public synchronized void addNotifyTask(Runnable task) {
+        if (task != null) {
+            getNotifyTasks().add(task);
+        }
+    }
+
+    public boolean sendBatch() {
+        try {
+            if (!getGlobalTasks().isEmpty()) {
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                Runnable task = getGlobalTasks().remove();
+                if (task != null) {
+                    try {
+                        task.run();
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                commit();
+                return true;
+            }
+            int count = -1;
+            if (!this.plotTasks.isEmpty()) {
+                count = 0;
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement statement = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
+                    this.plotTasks.entrySet().iterator();
+                while (iter.hasNext()) {
+                    try {
+                        Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
+                        Plot plot = entry.getKey();
+                        Queue<UniqueStatement> tasks = entry.getValue();
+                        if (tasks.isEmpty()) {
+                            iter.remove();
+                            continue;
+                        }
+                        task = tasks.remove();
+                        count++;
+                        if (task != null) {
+                            if (task.method == null || !task.method.equals(method)
+                                || statement == null) {
+                                if (statement != null) {
+                                    lastTask.execute(statement);
+                                    statement.close();
+                                }
+                                method = task.method;
+                                statement = task.get();
+                            }
+                            task.set(statement);
+                            task.addBatch(statement);
+                            try {
+                                if (statement.isClosed()) {
+                                    statement = null;
+                                }
+                            } catch (AbstractMethodError ignore) {
+                            }
+                        }
+                        lastTask = task;
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
+                }
+            }
+            if (!this.playerTasks.isEmpty()) {
+                count = 0;
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement statement = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
+                    try {
+                        UUID uuid = entry.getKey();
+                        if (this.playerTasks.get(uuid).isEmpty()) {
+                            this.playerTasks.remove(uuid);
+                            continue;
+                        }
+                        task = this.playerTasks.get(uuid).remove();
+                        count++;
+                        if (task != null) {
+                            if (task.method == null || !task.method.equals(method)) {
+                                if (statement != null) {
+                                    lastTask.execute(statement);
+                                    statement.close();
+                                }
+                                method = task.method;
+                                statement = task.get();
+                            }
+                            task.set(statement);
+                            task.addBatch(statement);
+                        }
+                        lastTask = task;
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
+                }
+            }
+            if (!this.clusterTasks.isEmpty()) {
+                count = 0;
+                if (this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(false);
+                }
+                String method = null;
+                PreparedStatement statement = null;
+                UniqueStatement task = null;
+                UniqueStatement lastTask = null;
+                for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks
+                    .entrySet()) {
+                    try {
+                        PlotCluster cluster = entry.getKey();
+                        if (this.clusterTasks.get(cluster).isEmpty()) {
+                            this.clusterTasks.remove(cluster);
+                            continue;
+                        }
+                        task = this.clusterTasks.get(cluster).remove();
+                        count++;
+                        if (task != null) {
+                            if (task.method == null || !task.method.equals(method)) {
+                                if (statement != null) {
+                                    lastTask.execute(statement);
+                                    statement.close();
+                                }
+                                method = task.method;
+                                statement = task.get();
+                            }
+                            task.set(statement);
+                            task.addBatch(statement);
+                        }
+                        lastTask = task;
+                    } catch (Throwable e) {
+                        PlotSquared.debug("============ DATABASE ERROR ============");
+                        PlotSquared.debug("There was an error updating the database.");
+                        PlotSquared.debug(" - It will be corrected on shutdown");
+                        PlotSquared.debug("========================================");
+                        e.printStackTrace();
+                        PlotSquared.debug("========================================");
+                    }
+                }
+                if (statement != null && task != null) {
+                    task.execute(statement);
+                    statement.close();
+                }
+            }
+            if (count > 0) {
+                commit();
+                return true;
+            }
+            if (count != -1) {
+                if (!this.connection.getAutoCommit()) {
+                    this.connection.setAutoCommit(true);
+                }
+            }
+            if (!this.clusterTasks.isEmpty()) {
+                this.clusterTasks.clear();
+            }
+            if (!this.plotTasks.isEmpty()) {
+                this.plotTasks.clear();
+            }
+        } catch (Throwable e) {
+            PlotSquared.debug("============ DATABASE ERROR ============");
+            PlotSquared.debug("There was an error updating the database.");
+            PlotSquared.debug(" - It will be corrected on shutdown");
+            PlotSquared.debug("========================================");
+            e.printStackTrace();
+            PlotSquared.debug("========================================");
+        }
+        return false;
+    }
+
+    public Connection getConnection() {
+        return this.connection;
+    }
+
+    /**
+     * Set Plot owner
+     *
+     * @param plot Plot Object
+     * @param uuid Owner UUID
+     */
+    @Override public void setOwner(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setOwner") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, uuid.toString());
+                statement.setInt(2, plot.getId().x);
+                statement.setInt(3, plot.getId().y);
+                statement.setString(4, plot.getArea().toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
+            }
+        });
+    }
+
+    @Override public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
+        addGlobalTask(() -> {
+            try {
+                // Create the plots
+                createPlots(myList, () -> {
+                    try {
+                        // Creating datastructures
+                        HashMap<PlotId, Plot> plotMap = new HashMap<>();
+                        for (Plot plot : myList) {
+                            plotMap.put(plot.getId(), plot);
+                        }
+                        ArrayList<SettingsPair> settings = new ArrayList<>();
+                        final ArrayList<UUIDPair> helpers = new ArrayList<>();
+                        final ArrayList<UUIDPair> trusted = new ArrayList<>();
+                        final ArrayList<UUIDPair> denied = new ArrayList<>();
+
+                        // Populating structures
+                        try (PreparedStatement stmt = SQLManager.this.connection
+                            .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
+                            ResultSet result = stmt.executeQuery()) {
+                            while (result.next()) {
+                                int id = result.getInt("id");
+                                int x = result.getInt("plot_id_x");
+                                int y = result.getInt("plot_id_z");
+                                PlotId plotId = new PlotId(x, y);
+                                Plot plot = plotMap.get(plotId);
+                                if (plot != null) {
+                                    settings.add(new SettingsPair(id, plot.getSettings()));
+                                    for (UUID uuid : plot.getDenied()) {
+                                        denied.add(new UUIDPair(id, uuid));
+                                    }
+                                    for (UUID uuid : plot.getMembers()) {
+                                        trusted.add(new UUIDPair(id, uuid));
+                                    }
+                                    for (UUID uuid : plot.getTrusted()) {
+                                        helpers.add(new UUIDPair(id, uuid));
+                                    }
+                                }
+                            }
+                        }
+                        createSettings(settings, () -> createTiers(helpers, "helpers",
+                            () -> createTiers(trusted, "trusted",
+                                () -> createTiers(denied, "denied", () -> {
+                                    try {
+                                        SQLManager.this.connection.commit();
+                                    } catch (SQLException e) {
+                                        e.printStackTrace();
+                                    }
+                                    if (whenDone != null) {
+                                        whenDone.run();
+                                    }
+                                }))));
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                        try {
+                            SQLManager.this.connection.commit();
+                        } catch (SQLException e1) {
+                            e1.printStackTrace();
+                        }
+                    }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                try {
+                    SQLManager.this.connection.commit();
+                } catch (SQLException e1) {
+                    e1.printStackTrace();
+                }
+            }
+        });
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param myList list of plots to be created
+     */
+    public void createTiers(ArrayList<UUIDPair> myList, final String tier, Runnable whenDone) {
+        StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, SQLManager.this.CREATE_TIERS.replaceAll("%tier%", tier),
+                    2);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size,
+                    "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
+                        + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
+            }
+
+            @Override public String getCreateSQL() {
+                return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
+                    + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair)
+                throws SQLException {
+                stmt.setInt(i * 2 + 1, pair.id);
+                stmt.setString(i * 2 + 2, pair.uuid.toString());
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair)
+                throws SQLException {
+                stmt.setInt(i * 2 + 1, pair.id);
+                stmt.setString(i * 2 + 2, pair.uuid.toString());
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, UUIDPair pair)
+                throws SQLException {
+                stmt.setInt(1, pair.id);
+                stmt.setString(2, pair.uuid.toString());
+            }
+        };
+        setBulk(myList, mod, whenDone);
+    }
+
+    /**
+     * Create a plot
+     *
+     * @param myList list of plots to be created
+     */
+    public void createPlots(List<Plot> myList, Runnable whenDone) {
+        StmtMod<Plot> mod = new StmtMod<Plot>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, SQLManager.this.CREATE_PLOTS, 5);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ",
+                    6);
+            }
+
+            @Override public String getCreateSQL() {
+                return SQLManager.this.CREATE_PLOT;
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, Plot plot)
+                throws SQLException {
+                stmt.setInt(i * 5 + 1, plot.getId().x);
+                stmt.setInt(i * 5 + 2, plot.getId().y);
+                try {
+                    stmt.setString(i * 5 + 3, plot.owner.toString());
+                } catch (SQLException ignored) {
+                    stmt.setString(i * 5 + 3, everyone.toString());
+                }
+                stmt.setString(i * 5 + 4, plot.getArea().toString());
+                stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, Plot plot)
+                throws SQLException {
+                stmt.setNull(i * 6 + 1, 4);
+                stmt.setInt(i * 6 + 2, plot.getId().x);
+                stmt.setInt(i * 6 + 3, plot.getId().y);
+                try {
+                    stmt.setString(i * 6 + 4, plot.owner.toString());
+                } catch (SQLException ignored) {
+                    stmt.setString(i * 6 + 4, everyone.toString());
+                }
+                stmt.setString(i * 6 + 5, plot.getArea().toString());
+                stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
+                stmt.setInt(1, plot.getId().x);
+                stmt.setInt(2, plot.getId().y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.getArea().toString());
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+
+            }
+        };
+        setBulk(myList, mod, whenDone);
+    }
+
+    public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
+        int size = objList.size();
+        if (size == 0) {
+            if (whenDone != null) {
+                whenDone.run();
+            }
+            return;
+        }
+        int packet;
+        if (this.mySQL) {
+            packet = Math.min(size, 5000);
+        } else {
+            packet = Math.min(size, 50);
+        }
+        int amount = size / packet;
+        try {
+            int count = 0;
+            PreparedStatement preparedStmt = null;
+            int last = -1;
+            for (int j = 0; j <= amount; j++) {
+                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                if (subList.isEmpty()) {
+                    break;
+                }
+                String statement;
+                if (last == -1) {
+                    last = subList.size();
+                    statement = mod.getCreateMySQL(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                if (subList.size() != last || count % 5000 == 0 && count > 0) {
+                    preparedStmt.executeBatch();
+                    preparedStmt.close();
+                    statement = mod.getCreateMySQL(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                for (int i = 0; i < subList.size(); i++) {
+                    count++;
+                    T obj = subList.get(i);
+                    mod.setMySQL(preparedStmt, i, obj);
+                }
+                last = subList.size();
+                preparedStmt.addBatch();
+            }
+            PlotSquared.debug(
+                "&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+            preparedStmt.executeBatch();
+            preparedStmt.clearParameters();
+            preparedStmt.close();
+            if (whenDone != null) {
+                whenDone.run();
+            }
+            return;
+        } catch (SQLException e) {
+            if (this.mySQL) {
+                e.printStackTrace();
+                PlotSquared.debug("&cERROR 1:  | " + objList.get(0).getClass().getCanonicalName());
+            }
+        }
+        try {
+            int count = 0;
+            PreparedStatement preparedStmt = null;
+            int last = -1;
+            for (int j = 0; j <= amount; j++) {
+                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                if (subList.isEmpty()) {
+                    break;
+                }
+                String statement;
+                if (last == -1) {
+                    last = subList.size();
+                    statement = mod.getCreateSQLite(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                if (subList.size() != last || count % 5000 == 0 && count > 0) {
+                    preparedStmt.executeBatch();
+                    preparedStmt.clearParameters();
+                    statement = mod.getCreateSQLite(subList.size());
+                    preparedStmt = this.connection.prepareStatement(statement);
+                }
+                for (int i = 0; i < subList.size(); i++) {
+                    count++;
+                    T obj = subList.get(i);
+                    mod.setSQLite(preparedStmt, i, obj);
+                }
+                last = subList.size();
+                preparedStmt.addBatch();
+            }
+            PlotSquared.debug(
+                "&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
+            preparedStmt.executeBatch();
+            preparedStmt.clearParameters();
+            preparedStmt.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+            PlotSquared.debug("&cERROR 2:  | " + objList.get(0).getClass().getCanonicalName());
+            PlotSquared.debug("&6[WARN] Could not bulk save!");
+            try (PreparedStatement preparedStmt = this.connection
+                .prepareStatement(mod.getCreateSQL())) {
+                for (T obj : objList) {
+                    mod.setSQL(preparedStmt, obj);
+                    preparedStmt.addBatch();
+                }
+                PlotSquared.debug("&aBatch 3");
+                preparedStmt.executeBatch();
+            } catch (SQLException e3) {
+                e3.printStackTrace();
+                PlotSquared.debug("&c[ERROR] Failed to save all!");
+            }
+        }
+        if (whenDone != null) {
+            whenDone.run();
+        }
+    }
+
+    public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
+        final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
+                    + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
+                    + "`position`) VALUES ", 10);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
+                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
+                    10);
+            }
+
+            @Override public String getCreateSQL() {
+                return "INSERT INTO `" + SQLManager.this.prefix
+                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
+            }
+
+            @Override public void setMySQL(PreparedStatement statement, int i, SettingsPair pair)
+                throws SQLException {
+                statement.setInt(i * 10 + 1, pair.id); // id
+                statement.setNull(i * 10 + 2, 4); // biome
+                statement.setNull(i * 10 + 3, 4); // rain
+                statement.setNull(i * 10 + 4, 4); // custom_time
+                statement.setNull(i * 10 + 5, 4); // time
+                statement.setNull(i * 10 + 6, 4); // deny_entry
+                if (pair.settings.getAlias().isEmpty()) {
+                    statement.setNull(i * 10 + 7, 4);
+                } else {
+                    statement.setString(i * 10 + 7, pair.settings.getAlias());
+                }
+                StringBuilder flag_string = new StringBuilder();
+                int k = 0;
+                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
+                    if (k != 0) {
+                        flag_string.append(',');
+                    }
+                    flag_string.append(flag.getKey().getName()).append(':').append(
+                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
+                            .replaceAll(",", "´"));
+                    k++;
+                }
+                statement.setString(i * 10 + 8, flag_string.toString());
+                boolean[] merged = pair.settings.getMerged();
+                int hash = MainUtil.hash(merged);
+                statement.setInt(i * 10 + 9, hash);
+                BlockLoc loc = pair.settings.getPosition();
+                String position;
+                if (loc.y == 0) {
+                    position = "DEFAULT";
+                } else {
+                    position = loc.x + "," + loc.y + ',' + loc.z;
+                }
+                statement.setString(i * 10 + 10, position);
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair)
+                throws SQLException {
+                stmt.setInt(i * 10 + 1, pair.id); // id
+                stmt.setNull(i * 10 + 2, 4); // biome
+                stmt.setNull(i * 10 + 3, 4); // rain
+                stmt.setNull(i * 10 + 4, 4); // custom_time
+                stmt.setNull(i * 10 + 5, 4); // time
+                stmt.setNull(i * 10 + 6, 4); // deny_entry
+                if (pair.settings.getAlias().isEmpty()) {
+                    stmt.setNull(i * 10 + 7, 4);
+                } else {
+                    stmt.setString(i * 10 + 7, pair.settings.getAlias());
+                }
+                StringBuilder flag_string = new StringBuilder();
+                int k = 0;
+                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
+                    if (k != 0) {
+                        flag_string.append(',');
+                    }
+                    flag_string.append(flag.getKey().getName()).append(':').append(
+                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
+                            .replaceAll(",", "´"));
+                    k++;
+                }
+                stmt.setString(i * 10 + 8, flag_string.toString());
+                boolean[] merged = pair.settings.getMerged();
+                int n = 0;
+                for (int j = 0; j < 4; ++j) {
+                    n = (n << 1) + (merged[j] ? 1 : 0);
+                }
+                stmt.setInt(i * 10 + 9, n);
+                BlockLoc loc = pair.settings.getPosition();
+                String position;
+                if (loc.y == 0) {
+                    position = "DEFAULT";
+                } else {
+                    position = loc.x + "," + loc.y + ',' + loc.z;
+                }
+                stmt.setString(i * 10 + 10, position);
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, SettingsPair pair)
+                throws SQLException {
+                stmt.setInt(1, pair.id);
+            }
+        };
+        addGlobalTask(() -> setBulk(myList, mod, whenDone));
+    }
+
+    public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
+        final StmtMod<Integer> mod = new StmtMod<Integer>() {
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(size, SQLManager.this.CREATE_SETTINGS, 1);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
+                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
+                    10);
+            }
+
+            @Override public String getCreateSQL() {
+                return "INSERT INTO `" + SQLManager.this.prefix
+                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, Integer id)
+                throws SQLException {
+                stmt.setInt(i + 1, id);
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, Integer id)
+                throws SQLException {
+                stmt.setInt(i * 10 + 1, id);
+                stmt.setNull(i * 10 + 2, 4);
+                stmt.setNull(i * 10 + 3, 4);
+                stmt.setNull(i * 10 + 4, 4);
+                stmt.setNull(i * 10 + 5, 4);
+                stmt.setNull(i * 10 + 6, 4);
+                stmt.setNull(i * 10 + 7, 4);
+                stmt.setNull(i * 10 + 8, 4);
+                stmt.setNull(i * 10 + 9, 4);
+                stmt.setString(i * 10 + 10, "DEFAULT");
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
+                stmt.setInt(1, id);
+            }
+        };
+        addGlobalTask(() -> setBulk(myList, mod, whenDone));
+    }
+
+    public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
+        final long timestamp = plot.getTimestamp();
+        addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, plot.getId().x);
+                stmt.setInt(2, plot.getId().y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.getArea().toString());
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+                stmt.setString(6, plot.getArea().toString());
+                stmt.setInt(7, plot.getId().x);
+                stmt.setInt(8, plot.getId().y);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT_SAFE,
+                    Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                int inserted = statement.executeUpdate();
+                if (inserted > 0) {
+                    try (ResultSet keys = statement.getGeneratedKeys()) {
+                        if (keys.next()) {
+                            plot.temp = keys.getInt(1);
+                            addPlotTask(plot, new UniqueStatement(
+                                "createPlotAndSettings_settings_" + plot.hashCode()) {
+                                @Override public void set(PreparedStatement stmt)
+                                    throws SQLException {
+                                    stmt.setInt(1, getId(plot));
+                                }
+
+                                @Override public PreparedStatement get() throws SQLException {
+                                    return SQLManager.this.connection.prepareStatement(
+                                        "INSERT INTO `" + SQLManager.this.prefix
+                                            + "plot_settings`(`plot_plot_id`) VALUES(?)");
+                                }
+                            });
+                            if (success != null) {
+                                addNotifyTask(success);
+                            }
+                            return;
+                        }
+                    }
+                }
+                if (failure != null) {
+                    failure.run();
+                }
+            }
+        });
+    }
+
+    public void commit() {
+        if (this.closed) {
+            return;
+        }
+        try {
+            if (!this.connection.getAutoCommit()) {
+                this.connection.commit();
+                this.connection.setAutoCommit(true);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
+        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, plot.getId().x);
+                stmt.setInt(2, plot.getId().y);
+                stmt.setString(3, plot.owner.toString());
+                stmt.setString(4, plot.getArea().toString());
+                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection
+                    .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                statement.executeUpdate();
+                try (ResultSet keys = statement.getGeneratedKeys()) {
+                    if (keys.next()) {
+                        plot.temp = keys.getInt(1);
+                    }
+                }
+            }
+        });
+        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
+            }
+        });
+        addNotifyTask(whenDone);
+    }
+
+    /**
+     * Create tables.
+     */
+    @Override public void createTables() throws SQLException {
+        String[] tables =
+            new String[] {"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
+                "plot_rating", "plot_settings", "cluster", "player_meta"};
+        DatabaseMetaData meta = this.connection.getMetaData();
+        int create = 0;
+        for (String s : tables) {
+            ResultSet set = meta.getTables(null, null, this.prefix + s, new String[] {"TABLE"});
+            //            ResultSet set = meta.getTables(null, null, prefix + s, null);
+            if (!set.next()) {
+                create++;
+            }
+            set.close();
+        }
+        if (create == 0) {
+            return;
+        }
+        boolean addConstraint = create == tables.length;
+        PlotSquared.debug("Creating tables");
+        try (Statement stmt = this.connection.createStatement()) {
+            if (this.mySQL) {
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
+                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
+                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+                    + "PRIMARY KEY (`id`)"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` ("
+                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                    + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL,"
+                    + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` ("
+                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
+                    + "  `plot_plot_id` INT(11) NOT NULL,"
+                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
+                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
+                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`plot_plot_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB "
+                    + "DEFAULT CHARSET=utf8");
+                if (addConstraint) {
+                    stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `"
+                        + this.prefix
+                        + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
+                        + this.prefix + "plot` (`id`) ON DELETE CASCADE");
+                }
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
+                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL,"
+                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
+                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
+                    + "PRIMARY KEY (`id`)"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` ("
+                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` ("
+                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
+                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
+                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
+                    + " `meta_id` INT(11) NOT NULL AUTO_INCREMENT,"
+                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
+                    + " `value` blob NOT NULL," + " PRIMARY KEY (`meta_id`)"
+                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            } else {
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
+                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
+                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_helpers` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_trusted` (`plot_plot_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                    + "`comment` VARCHAR(40) NOT NULL,"
+                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+                    + "`sender` VARCHAR(40) NOT NULL" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
+                    + "  `plot_plot_id` INT(11) NOT NULL,"
+                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
+                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
+                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`plot_plot_id`)" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
+                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL,"
+                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
+                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
+                    + "`world` VARCHAR(45) NOT NULL,"
+                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "cluster_helpers` (`cluster_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
+                    + "cluster_invited` (`cluster_id` INT(11) NOT NULL,"
+                    + "`user_uuid` VARCHAR(40) NOT NULL)");
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
+                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
+                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
+                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
+                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
+                    + "  `merged` INT(11) DEFAULT NULL,"
+                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
+                    + "  PRIMARY KEY (`cluster_id`)" + ')');
+                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
+                    + " `meta_id` INTEGER PRIMARY KEY AUTOINCREMENT,"
+                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
+                    + " `value` blob NOT NULL" + ')');
+            }
+            stmt.executeBatch();
+            stmt.clearBatch();
+        }
+    }
+
+    @Override public void deleteSettings(final Plot plot) {
+        addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_settings` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteHelpers(final Plot plot) {
+        if (plot.getTrusted().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_helpers` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteTrusted(final Plot plot) {
+        if (plot.getMembers().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_trusted` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteDenied(final Plot plot) {
+        if (plot.getDenied().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_denied` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteComments(final Plot plot) {
+        addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, plot.getArea().toString());
+                stmt.setInt(2, plot.hashCode());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
+            }
+        });
+    }
+
+    @Override public void deleteRatings(final Plot plot) {
+        if (Settings.Enabled_Components.RATING_CACHE && plot.getSettings().getRatings().isEmpty()) {
+            return;
+        }
+        addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_rating` WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Delete a plot.
+     */
+    @Override public void delete(final Plot plot) {
         PlotSquared.debug(
-            "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: "
-                + plot);
-        if (!toRemove.isEmpty()) {
-          for (UUID uuid : toRemove) {
-            removeTrusted(plot, uuid);
-          }
-        }
-        if (!toAdd.isEmpty()) {
-          for (UUID uuid : toAdd) {
-            setTrusted(plot, uuid);
-          }
-        }
-      }
-      if (!plot.getMembers().equals(dataPlot.getMembers())) {
-        HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
-        HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
-        toRemove.removeAll(plot.getMembers());
-        toAdd.removeAll(dataPlot.getMembers());
+            "Deleting plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
+                + plot.owner + " Index: " + plot.temp);
+        deleteSettings(plot);
+        deleteDenied(plot);
+        deleteHelpers(plot);
+        deleteTrusted(plot);
+        deleteComments(plot);
+        deleteRatings(plot);
+        addPlotTask(plot, new UniqueStatement("delete_plot") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Create plot settings
+     */
+    @Override public void createPlotSettings(final int id, Plot plot) {
         PlotSquared.debug(
-            "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: "
-                + plot);
-        if (!toRemove.isEmpty()) {
-          for (UUID uuid : toRemove) {
-            removeMember(plot, uuid);
-          }
+            "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
+                + plot.owner + " Index: " + id);
+        addPlotTask(plot, new UniqueStatement("createPlotSettings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
+            }
+        });
+    }
+
+    @Override public int getClusterId(PlotCluster cluster) {
+        if (cluster.temp > 0) {
+            return cluster.temp;
         }
-        if (!toAdd.isEmpty()) {
-          for (UUID uuid : toAdd) {
-            setMember(plot, uuid);
-          }
+        try {
+            commit();
+            if (cluster.temp > 0) {
+                return cluster.temp;
+            }
+            int c_id;
+            try (PreparedStatement stmt = this.connection.prepareStatement(
+                "SELECT `id` FROM `" + this.prefix
+                    + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
+                stmt.setInt(1, cluster.getP1().x);
+                stmt.setInt(2, cluster.getP1().y);
+                stmt.setInt(3, cluster.getP2().x);
+                stmt.setInt(4, cluster.getP2().y);
+                stmt.setString(5, cluster.area.toString());
+                try (ResultSet resultSet = stmt.executeQuery()) {
+                    c_id = Integer.MAX_VALUE;
+                    while (resultSet.next()) {
+                        c_id = resultSet.getInt("id");
+                    }
+                }
+            }
+            if (c_id == Integer.MAX_VALUE || c_id == 0) {
+                if (cluster.temp > 0) {
+                    return cluster.temp;
+                }
+                throw new SQLException("Cluster does not exist in database");
+            }
+            cluster.temp = c_id;
+            return c_id;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    @Override public int getId(Plot plot) {
+        if (plot.temp > 0) {
+            return plot.temp;
+        }
+        try {
+            commit();
+            if (plot.temp > 0) {
+                return plot.temp;
+            }
+            int id;
+            try (PreparedStatement statement = this.connection.prepareStatement(
+                "SELECT `id` FROM `" + this.prefix
+                    + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
+                statement.setInt(1, plot.getId().x);
+                statement.setInt(2, plot.getId().y);
+                statement.setString(3, plot.getArea().toString());
+                try (ResultSet resultSet = statement.executeQuery()) {
+                    id = Integer.MAX_VALUE;
+                    while (resultSet.next()) {
+                        id = resultSet.getInt("id");
+                    }
+                }
+            }
+            if (id == Integer.MAX_VALUE || id == 0) {
+                if (plot.temp > 0) {
+                    return plot.temp;
+                }
+                throw new SQLException("Plot does not exist in database");
+            }
+            plot.temp = id;
+            return id;
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return Integer.MAX_VALUE;
+    }
+
+    @Override public void updateTables(int[] oldVersion) {
+        try {
+            if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
+                try (Statement stmt = this.connection.createStatement()) {
+                    stmt.executeUpdate(
+                        "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
+                } catch (SQLException ignored) {
+                }
+            }
+            DatabaseMetaData data = this.connection.getMetaData();
+            ResultSet rs =
+                data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
+            if (rs.next()) {
+                rs.close();
+                rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
+                if (!rs.next()) {
+                    rs.close();
+                    try (Statement statement = this.connection.createStatement()) {
+                        statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
+                        if (Storage.MySQL.USE) {
+                            statement.addBatch(
+                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                                    + "`comment` VARCHAR(40) NOT NULL,"
+                                    + "`inbox` VARCHAR(40) NOT NULL,"
+                                    + "`timestamp` INT(11) NOT NULL,"
+                                    + "`sender` VARCHAR(40) NOT NULL"
+                                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+                        } else {
+                            statement.addBatch(
+                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
+                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
+                                    + "`comment` VARCHAR(40) NOT NULL,"
+                                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
+                                    + "`sender` VARCHAR(40) NOT NULL" + ')');
+                        }
+                        statement.executeBatch();
+                    } catch (SQLException ignored) {
+                        try (Statement statement = this.connection.createStatement()) {
+                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
+                                + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
+                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
+                                + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
+                            statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
+                            statement.executeBatch();
+                        }
+                    }
+                }
+            }
+            rs.close();
+            rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
+            if (rs.next()) {
+                try (Statement statement = this.connection.createStatement()) {
+                    statement.executeUpdate("DELETE FROM `" + this.prefix
+                        + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
+                        + this.prefix + "plot`)");
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+
+                rs.close();
+                try (Statement statement = this.connection.createStatement()) {
+                    for (String table : new String[] {"plot_denied", "plot_helpers",
+                        "plot_trusted"}) {
+                        ResultSet result = statement.executeQuery(
+                            "SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table
+                                + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
+                        if (result.next()) {
+                            PlotSquared.debug("BACKING UP: " + this.prefix + table);
+                            result.close();
+                            statement.executeUpdate(
+                                "CREATE TABLE " + this.prefix + table + "_tmp AS SELECT * FROM "
+                                    + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
+                            statement.executeUpdate("DROP TABLE " + this.prefix + table);
+                            statement.executeUpdate(
+                                "CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "
+                                    + this.prefix + table + "_tmp");
+                            statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
+                            PlotSquared.debug("RESTORING: " + this.prefix + table);
+                        }
+                    }
+                } catch (SQLException e2) {
+                    e2.printStackTrace();
+                }
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    public void deleteRows(ArrayList<Integer> rowIds, final String table, final String column) {
+        setBulk(rowIds, new StmtMod<Integer>() {
+
+            @Override public String getCreateMySQL(int size) {
+                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
+                    size);
+            }
+
+            @Override public String getCreateSQLite(int size) {
+                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
+                    size);
+            }
+
+            @Override public String getCreateSQL() {
+                return "DELETE FROM `" + table + "` WHERE `" + column + "` = ?";
+            }
+
+            @Override public void setMySQL(PreparedStatement stmt, int i, Integer obj)
+                throws SQLException {
+                stmt.setInt(i + 1, obj);
+            }
+
+            @Override public void setSQLite(PreparedStatement stmt, int i, Integer obj)
+                throws SQLException {
+                stmt.setInt(i + 1, obj);
+            }
+
+            @Override public void setSQL(PreparedStatement stmt, Integer obj) throws SQLException {
+                stmt.setInt(1, obj);
+            }
+        }, null);
+    }
+
+    /**
+     * Load all plots, helpers, denied, trusted, and every setting from DB into a {@link HashMap}.
+     */
+    @Override public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
+        HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
+        HashMap<Integer, Plot> plots = new HashMap<>();
+        try {
+            HashSet<String> areas = new HashSet<>();
+            if (PlotSquared.get().worlds.contains("worlds")) {
+                ConfigurationSection worldSection =
+                    PlotSquared.get().worlds.getConfigurationSection("worlds");
+                if (worldSection != null) {
+                    for (String worldKey : worldSection.getKeys(false)) {
+                        areas.add(worldKey);
+                        ConfigurationSection areaSection =
+                            worldSection.getConfigurationSection(worldKey + ".areas");
+                        if (areaSection != null) {
+                            areaSection.getKeys(false).forEach(s -> {
+                                String[] split = s.split("(?<![;])-");
+                                if (split.length == 3) {
+                                    areas.add(worldKey + ';' + split[0]);
+                                }
+                            });
+                        }
+                    }
+                }
+            }
+            HashMap<String, UUID> uuids = new HashMap<>();
+            HashMap<String, AtomicInteger> noExist = new HashMap<>();
+
+            /*
+             * Getting plots
+             */
+            try (Statement statement = this.connection.createStatement()) {
+                int id;
+                String owner;
+                UUID user;
+                try (ResultSet resultSet = statement.executeQuery(
+                    "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
+                        + this.prefix + "plot`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (resultSet.next()) {
+                        PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
+                            resultSet.getInt("plot_id_z"));
+                        id = resultSet.getInt("id");
+                        String areaid = resultSet.getString("world");
+                        if (!areas.contains(areaid)) {
+                            if (Settings.Enabled_Components.DATABASE_PURGER) {
+                                toDelete.add(id);
+                                continue;
+                            } else {
+                                AtomicInteger value = noExist.get(areaid);
+                                if (value != null) {
+                                    value.incrementAndGet();
+                                } else {
+                                    noExist.put(areaid, new AtomicInteger(1));
+                                }
+                            }
+                        }
+                        owner = resultSet.getString("owner");
+                        user = uuids.computeIfAbsent(owner, s -> {
+                            try {
+                                return UUID.fromString(s);
+                            } catch (IllegalArgumentException ignored) {
+                                if (Settings.UUID.FORCE_LOWERCASE) {
+                                    return UUID.nameUUIDFromBytes(
+                                        ("OfflinePlayer:" + s.toLowerCase())
+                                            .getBytes(Charsets.UTF_8));
+                                } else {
+                                    return UUID.nameUUIDFromBytes(
+                                        ("OfflinePlayer:" + s).getBytes(Charsets.UTF_8));
+                                }
+                            }
+                        });
+                        long time;
+                        try {
+                            Timestamp timestamp = resultSet.getTimestamp("timestamp");
+                            time = timestamp.getTime();
+                        } catch (SQLException exception) {
+                            String parsable = resultSet.getString("timestamp");
+                            try {
+                                time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
+                                    .getTime();
+                            } catch (ParseException e) {
+                                PlotSquared.debug(
+                                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
+                                        + plot_id + ") (" + parsable + ")");
+                                time = System.currentTimeMillis() + id;
+                            }
+                        }
+                        Plot plot = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
+                            new HashSet<>(), "", null, null, null,
+                            new boolean[] {false, false, false, false}, time, id);
+                        HashMap<PlotId, Plot> map = newPlots.get(areaid);
+                        if (map != null) {
+                            Plot last = map.put(plot.getId(), plot);
+                            if (last != null) {
+                                if (Settings.Enabled_Components.DATABASE_PURGER) {
+                                    toDelete.add(last.temp);
+                                } else {
+                                    PlotSquared.debug(
+                                        "&cPLOT #" + id + "(" + last + ") in `" + this.prefix
+                                            + "plot` is a duplicate. Delete this plot or set `database-purger: true` in the settings.yml.");
+                                }
+                            }
+                        } else {
+                            map = new HashMap<>();
+                            newPlots.put(areaid, map);
+                            map.put(plot.getId(), plot);
+                        }
+                        plots.put(id, plot);
+                    }
+                    deleteRows(toDelete, this.prefix + "plot", "id");
+                }
+                if (Settings.Enabled_Components.RATING_CACHE) {
+                    try (ResultSet r = statement.executeQuery(
+                        "SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix
+                            + "plot_rating`")) {
+                        ArrayList<Integer> toDelete = new ArrayList<>();
+                        while (r.next()) {
+                            id = r.getInt("plot_plot_id");
+                            owner = r.getString("player");
+                            user = uuids.computeIfAbsent(owner, UUID::fromString);
+                            Plot plot = plots.get(id);
+                            if (plot != null) {
+                                plot.getSettings().getRatings().put(user, r.getInt("rating"));
+                            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                                toDelete.add(id);
+                            } else {
+                                PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                    + ") in `plot_rating` does not exist. Create this plot or set `database-purger: true` in the "
+                                    + "settings.yml.");
+                            }
+                        }
+                        deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id");
+                    }
+                }
+
+                /*
+                 * Getting helpers
+                 */
+                try (ResultSet r = statement.executeQuery(
+                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (r.next()) {
+                        id = r.getInt("plot_plot_id");
+                        owner = r.getString("user_uuid");
+                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plot.getTrusted().add(user);
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                + ") in `plot_helpers` does not exist. Create this plot or set `database-purger: true` in the settings"
+                                + ".yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id");
+                }
+
+                /*
+                 * Getting trusted
+                 */
+                try (ResultSet r = statement.executeQuery(
+                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (r.next()) {
+                        id = r.getInt("plot_plot_id");
+                        owner = r.getString("user_uuid");
+                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plot.getMembers().add(user);
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                + ") in `plot_trusted` does not exist. Create this plot or set `database-purger: true` in the settings"
+                                + ".yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id");
+                }
+
+                /*
+                 * Getting denied
+                 */
+                try (ResultSet r = statement.executeQuery(
+                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (r.next()) {
+                        id = r.getInt("plot_plot_id");
+                        owner = r.getString("user_uuid");
+                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plot.getDenied().add(user);
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY " + id
+                                + " in `plot_denied` does not exist. Create this plot or set `database-purger: true` in the settings.yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id");
+                }
+
+                try (ResultSet resultSet = statement
+                    .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
+                    ArrayList<Integer> toDelete = new ArrayList<>();
+                    while (resultSet.next()) {
+                        id = resultSet.getInt("plot_plot_id");
+                        Plot plot = plots.get(id);
+                        if (plot != null) {
+                            plots.remove(id);
+                            String alias = resultSet.getString("alias");
+                            if (alias != null) {
+                                plot.getSettings().setAlias(alias);
+                            }
+                            String pos = resultSet.getString("position");
+                            switch (pos.toLowerCase()) {
+                                case "":
+                                case "default":
+                                case "0,0,0":
+                                case "center":
+                                    break;
+                                default:
+                                    try {
+                                        plot.getSettings().setPosition(BlockLoc.fromString(pos));
+                                    } catch (Exception ignored) {
+                                    }
+                            }
+                            int m = resultSet.getInt("merged");
+                            boolean[] merged = new boolean[4];
+                            for (int i = 0; i < 4; i++) {
+                                merged[3 - i] = (m & 1 << i) != 0;
+                            }
+                            plot.getSettings().setMerged(merged);
+                            String[] flags_string;
+                            String myflags = resultSet.getString("flags");
+                            if (myflags == null || myflags.isEmpty()) {
+                                flags_string = new String[] {};
+                            } else {
+                                flags_string = myflags.split(",");
+                            }
+                            HashMap<Flag<?>, Object> flags = new HashMap<>();
+                            boolean exception = false;
+                            for (String element : flags_string) {
+                                if (element.contains(":")) {
+                                    String[] split = element.split(":");
+                                    try {
+                                        String flag_str =
+                                            split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
+                                        Flag<?> flag = FlagManager.getOrCreateFlag(split[0]);
+                                        flags.put(flag, flag.parseValue(flag_str));
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                        exception = true;
+                                    }
+                                } else {
+                                    element =
+                                        element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
+                                    if (StringMan
+                                        .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
+                                        Flag flag = FlagManager.getOrCreateFlag(element);
+                                        if (flag == null) {
+                                            flag = new StringFlag(element) {
+                                                @Override public String getValueDescription() {
+                                                    return "Generic Filler Flag";
+                                                }
+                                            };
+                                        }
+                                        flags.put(flag, flag.parseValue(""));
+                                    } else {
+                                        PlotSquared.debug("INVALID FLAG: " + element);
+                                    }
+                                }
+                            }
+                            if (exception) {
+                                PlotSquared.debug("&cPlot #" + id + "(" + plot + ") | " + plot
+                                    + " had an invalid flag. A fix has been attempted.");
+                                PlotSquared.debug("&c" + myflags);
+                                this.setFlags(plot, flags);
+                            }
+                            plot.getSettings().flags = flags;
+                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
+                            toDelete.add(id);
+                        } else {
+                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
+                                + ") in `plot_settings` does not exist. Create this plot or set `database-purger: true` in the settings"
+                                + ".yml.");
+                        }
+                    }
+                    deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id");
+                }
+            }
+            if (!plots.entrySet().isEmpty()) {
+                createEmptySettings(new ArrayList<>(plots.keySet()), null);
+                for (Entry<Integer, Plot> entry : plots.entrySet()) {
+                    entry.getValue().getSettings();
+                }
+            }
+            boolean invalidPlot = false;
+            for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
+                String worldName = entry.getKey();
+                invalidPlot = true;
+                PlotSquared.debug("&c[WARNING] Found " + entry.getValue().intValue()
+                    + " plots in DB for non existent world; '" + worldName + "'.");
+            }
+            if (invalidPlot) {
+                PlotSquared.debug(
+                    "&c[WARNING] - Please create the world/s or remove the plots using the purge command");
+            }
+        } catch (SQLException e) {
+            PlotSquared.debug("&7[WARN] Failed to load plots.");
+            e.printStackTrace();
+        }
+        return newPlots;
+    }
+
+    @Override public void setMerged(final Plot plot, final boolean[] merged) {
+        plot.getSettings().setMerged(merged);
+        addPlotTask(plot, new UniqueStatement("setMerged") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                int hash = MainUtil.hash(merged);
+                stmt.setInt(1, hash);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void swapPlots(Plot plot1, Plot plot2) {
+        final int id1 = getId(plot1);
+        final int id2 = getId(plot2);
+        final PlotId pos1 = plot1.getId();
+        final PlotId pos2 = plot2.getId();
+        addPlotTask(plot1, new UniqueStatement("swapPlots") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, pos2.x);
+                stmt.setInt(2, pos2.y);
+                stmt.setInt(3, id1);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+        addPlotTask(plot2, new UniqueStatement("swapPlots") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, pos1.x);
+                stmt.setInt(2, pos1.y);
+                stmt.setInt(3, id2);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override public void movePlot(final Plot original, final Plot newPlot) {
+        addPlotTask(original, new UniqueStatement("movePlot") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, newPlot.getId().x);
+                stmt.setInt(2, newPlot.getId().y);
+                stmt.setString(3, newPlot.getArea().toString());
+                stmt.setInt(4, getId(original));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ?, `world` = ? WHERE `id` = ?");
+            }
+        });
+        addPlotTask(newPlot, null);
+    }
+
+    @Override public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
+        final String flag_string = FlagManager.toString(flags);
+        addPlotTask(plot, new UniqueStatement("setFlags") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, flag_string);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void setAlias(final Plot plot, final String alias) {
+        addPlotTask(plot, new UniqueStatement("setAlias") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, alias);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    /**
+     * Purge all plots with the following database IDs
+     */
+    @Override public void purgeIds(final Set<Integer> uniqueIds) {
+        addGlobalTask(() -> {
+            if (!uniqueIds.isEmpty()) {
+                try {
+                    ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
+                    String stmt_prefix = "";
+                    int size = uniqueIdsList.size();
+                    int packet = 990;
+                    int amount = size / packet;
+                    int count = 0;
+                    int last = -1;
+                    for (int j = 0; j <= amount; j++) {
+                        PlotSquared.debug("Purging " + (j * packet) + " / " + size);
+                        List<Integer> subList =
+                            uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                        if (subList.isEmpty()) {
+                            break;
+                        }
+                        StringBuilder idstr2 = new StringBuilder();
+                        stmt_prefix = "";
+                        for (Integer id : subList) {
+                            idstr2.append(stmt_prefix).append(id);
+                            stmt_prefix = " OR `id` = ";
+                        }
+                        stmt_prefix = "";
+                        StringBuilder idstr = new StringBuilder();
+                        for (Integer id : subList) {
+                            idstr.append(stmt_prefix).append(id);
+                            stmt_prefix = " OR `plot_plot_id` = ";
+                        }
+                        PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_denied` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_settings` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix
+                                + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        stmt = SQLManager.this.connection.prepareStatement(
+                            "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
+                                + idstr2);
+                        stmt.executeUpdate();
+                        stmt.close();
+                        commit();
+                    }
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
+                    return;
+                }
+            }
+            PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
+        });
+    }
+
+    @Override public void purge(final PlotArea area, final Set<PlotId> plots) {
+        addGlobalTask(() -> {
+            try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
+                    + "plot` WHERE `world` = ?")) {
+                stmt.setString(1, area.toString());
+                Set<Integer> ids;
+                try (ResultSet r = stmt.executeQuery()) {
+                    ids = new HashSet<>();
+                    while (r.next()) {
+                        PlotId plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                        if (plots.contains(plot_id)) {
+                            ids.add(r.getInt("id"));
+                        }
+                    }
+                }
+                purgeIds(ids);
+            } catch (SQLException e) {
+                e.printStackTrace();
+                PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
+            }
+            for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
+                PlotId plotId = iterator.next();
+                iterator.remove();
+                PlotId id = new PlotId(plotId.x, plotId.y);
+                area.removePlot(id);
+            }
+        });
+    }
+
+    @Override public void setPosition(final Plot plot, final String position) {
+        addPlotTask(plot, new UniqueStatement("setPosition") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, position == null ? "" : position);
+                stmt.setInt(2, getId(plot));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
+            }
+        });
+    }
+
+    @Override public void removeComment(final Plot plot, final PlotComment comment) {
+        addPlotTask(plot, new UniqueStatement("removeComment") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                if (plot != null) {
+                    statement.setString(1, plot.getArea().toString());
+                    statement.setInt(2, plot.getId().hashCode());
+                    statement.setString(3, comment.comment);
+                    statement.setString(4, comment.inbox);
+                    statement.setString(5, comment.senderName);
+                } else {
+                    statement.setString(1, comment.comment);
+                    statement.setString(2, comment.inbox);
+                    statement.setString(3, comment.senderName);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (plot != null) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "DELETE FROM `" + SQLManager.this.prefix
+                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
+                }
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
+            }
+        });
+    }
+
+    @Override public void clearInbox(final Plot plot, final String inbox) {
+        addPlotTask(plot, new UniqueStatement("clearInbox") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                if (plot != null) {
+                    statement.setString(1, plot.getArea().toString());
+                    statement.setInt(2, plot.getId().hashCode());
+                    statement.setString(3, inbox);
+                } else {
+                    statement.setString(1, inbox);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (plot != null) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "DELETE FROM `" + SQLManager.this.prefix
+                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+                }
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
+            }
+        });
+    }
+
+    @Override public void getComments(final Plot plot, final String inbox,
+        final RunnableVal<List<PlotComment>> whenDone) {
+        addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                if (plot != null) {
+                    statement.setString(1, plot.getArea().toString());
+                    statement.setInt(2, plot.getId().hashCode());
+                    statement.setString(3, inbox);
+                } else {
+                    statement.setString(1, inbox);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (plot != null) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "SELECT * FROM `" + SQLManager.this.prefix
+                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
+                }
+                return SQLManager.this.connection.prepareStatement(
+                    "SELECT * FROM `" + SQLManager.this.prefix
+                        + "plot_comments` WHERE `inbox` = ?");
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                ArrayList<PlotComment> comments = new ArrayList<>();
+                try (ResultSet set = statement.executeQuery()) {
+                    while (set.next()) {
+                        String sender = set.getString("sender");
+                        String world = set.getString("world");
+                        int hash = set.getInt("hashcode");
+                        PlotId id;
+                        if (hash != 0) {
+                            id = PlotId.unpair(hash);
+                        } else {
+                            id = null;
+                        }
+                        String msg = set.getString("comment");
+                        long timestamp = set.getInt("timestamp") * 1000;
+                        PlotComment comment =
+                            new PlotComment(world, id, msg, sender, inbox, timestamp);
+                        comments.add(comment);
+                        whenDone.value = comments;
+                    }
+                }
+                TaskManager.runTask(whenDone);
+            }
+        });
+    }
+
+    @Override public void setComment(final Plot plot, final PlotComment comment) {
+        addPlotTask(plot, new UniqueStatement("setComment") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, plot.getArea().toString());
+                statement.setInt(2, plot.getId().hashCode());
+                statement.setString(3, comment.comment);
+                statement.setString(4, comment.inbox);
+                statement.setInt(5, (int) (comment.timestamp / 1000));
+                statement.setString(6, comment.senderName);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
+            }
+        });
+    }
+
+    @Override public void removeTrusted(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("removeTrusted") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void removeMember(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("removeMember") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setTrusted(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setTrusted") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public void setMember(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setMember") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public void removeDenied(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("removeDenied") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setDenied(final Plot plot, final UUID uuid) {
+        addPlotTask(plot, new UniqueStatement("setDenied") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public HashMap<UUID, Integer> getRatings(Plot plot) {
+        HashMap<UUID, Integer> map = new HashMap<>();
+        try (PreparedStatement statement = this.connection.prepareStatement(
+            "SELECT `rating`, `player` FROM `" + this.prefix
+                + "plot_rating` WHERE `plot_plot_id` = ? ")) {
+            statement.setInt(1, getId(plot));
+            try (ResultSet resultSet = statement.executeQuery()) {
+                while (resultSet.next()) {
+                    UUID uuid = UUID.fromString(resultSet.getString("player"));
+                    int rating = resultSet.getInt("rating");
+                    map.put(uuid, rating);
+                }
+            }
+        } catch (SQLException e) {
+            PlotSquared
+                .debug("&7[WARN] Failed to fetch rating for plot " + plot.getId().toString());
+            e.printStackTrace();
+        }
+        return map;
+    }
+
+    @Override public void setRating(final Plot plot, final UUID rater, final int value) {
+        addPlotTask(plot, new UniqueStatement("setRating") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
+                statement.setInt(2, value);
+                statement.setString(3, rater.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
+            }
+        });
+    }
+
+    @Override public void delete(PlotCluster cluster) {
+        final int id = getClusterId(cluster);
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_settings` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_helpers` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_invited` WHERE `cluster_id` = ?");
+            }
+        });
+        addClusterTask(cluster, new UniqueStatement("delete_cluster") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, id);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
+        final boolean replace) {
+        addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                if (replace) {
+                    stmt.setBytes(1, meta);
+                    stmt.setString(2, uuid.toString());
+                    stmt.setString(3, key);
+                } else {
+                    stmt.setString(1, uuid.toString());
+                    stmt.setString(2, key);
+                    stmt.setBytes(3, meta);
+                }
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                if (replace) {
+                    return SQLManager.this.connection.prepareStatement(
+                        "UPDATE `" + SQLManager.this.prefix
+                            + "player_meta` SET `value` = ? WHERE `uuid` = ? AND `key` = ?");
+                } else {
+                    return SQLManager.this.connection.prepareStatement(
+                        "INSERT INTO `" + SQLManager.this.prefix
+                            + "player_meta`(`uuid`, `key`, `value`) VALUES(?, ? ,?)");
+                }
+            }
+        });
+    }
+
+    @Override public void removePersistentMeta(final UUID uuid, final String key) {
+        addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, uuid.toString());
+                stmt.setString(2, key);
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "player_meta` WHERE `uuid` = ? AND `key` = ?");
+            }
+        });
+    }
+
+    @Override
+    public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
+        addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "SELECT * FROM `" + SQLManager.this.prefix
+                        + "player_meta` WHERE `uuid` = ? ORDER BY `meta_id` ASC");
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                ResultSet resultSet = statement.executeQuery();
+
+                final Map<String, byte[]> metaMap = new HashMap<>();
+
+                while (resultSet.next()) {
+                    String key = resultSet.getString("key");
+                    byte[] bytes = resultSet.getBytes("value");
+                    metaMap.put(key, bytes);
+                }
+
+                resultSet.close();
+                TaskManager.runTaskAsync(() -> result.run(metaMap));
+            }
+
+        });
+    }
+
+    @Override public HashMap<String, Set<PlotCluster>> getClusters() {
+        LinkedHashMap<String, Set<PlotCluster>> newClusters = new LinkedHashMap<>();
+        HashMap<Integer, PlotCluster> clusters = new HashMap<>();
+        try {
+            HashSet<String> areas = new HashSet<>();
+            if (PlotSquared.get().worlds.contains("worlds")) {
+                ConfigurationSection worldSection =
+                    PlotSquared.get().worlds.getConfigurationSection("worlds");
+                if (worldSection != null) {
+                    for (String worldKey : worldSection.getKeys(false)) {
+                        areas.add(worldKey);
+                        ConfigurationSection areaSection =
+                            worldSection.getConfigurationSection(worldKey + ".areas");
+                        if (areaSection != null) {
+                            for (String areaKey : areaSection.getKeys(false)) {
+                                String[] split = areaKey.split("(?<![;])-");
+                                if (split.length == 3) {
+                                    areas.add(worldKey + ';' + split[0]);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            HashMap<String, UUID> uuids = new HashMap<>();
+            HashMap<String, Integer> noExist = new HashMap<>();
+            /*
+             * Getting clusters
+             */
+            try (Statement stmt = this.connection.createStatement()) {
+                ResultSet resultSet =
+                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
+                PlotCluster cluster;
+                String owner;
+                UUID user;
+                int id;
+                while (resultSet.next()) {
+                    PlotId pos1 =
+                        new PlotId(resultSet.getInt("pos1_x"), resultSet.getInt("pos1_z"));
+                    PlotId pos2 =
+                        new PlotId(resultSet.getInt("pos2_x"), resultSet.getInt("pos2_z"));
+                    id = resultSet.getInt("id");
+                    String areaid = resultSet.getString("world");
+                    if (!areas.contains(areaid)) {
+                        if (noExist.containsKey(areaid)) {
+                            noExist.put(areaid, noExist.get(areaid) + 1);
+                        } else {
+                            noExist.put(areaid, 1);
+                        }
+                    }
+                    owner = resultSet.getString("owner");
+                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    cluster = new PlotCluster(null, pos1, pos2, user, id);
+                    clusters.put(id, cluster);
+                    Set<PlotCluster> set =
+                        newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
+                    set.add(cluster);
+                }
+                //Getting helpers
+                resultSet = stmt.executeQuery(
+                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
+                while (resultSet.next()) {
+                    id = resultSet.getInt("cluster_id");
+                    owner = resultSet.getString("user_uuid");
+                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    cluster = clusters.get(id);
+                    if (cluster != null) {
+                        cluster.helpers.add(user);
+                    } else {
+                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                            + ") in cluster_helpers does not exist. Please create the cluster or remove this entry.");
+                    }
+                }
+                // Getting invited
+                resultSet = stmt.executeQuery(
+                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
+                while (resultSet.next()) {
+                    id = resultSet.getInt("cluster_id");
+                    owner = resultSet.getString("user_uuid");
+                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    cluster = clusters.get(id);
+                    if (cluster != null) {
+                        cluster.invited.add(user);
+                    } else {
+                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                            + ") in cluster_invited does not exist. Please create the cluster or remove this entry.");
+                    }
+                }
+                resultSet =
+                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
+                while (resultSet.next()) {
+                    id = resultSet.getInt("cluster_id");
+                    cluster = clusters.get(id);
+                    if (cluster != null) {
+                        String alias = resultSet.getString("alias");
+                        if (alias != null) {
+                            cluster.settings.setAlias(alias);
+                        }
+                        String pos = resultSet.getString("position");
+                        switch (pos.toLowerCase()) {
+                            case "":
+                            case "default":
+                            case "0,0,0":
+                            case "center":
+                                break;
+                            default:
+                                try {
+                                    BlockLoc loc = BlockLoc.fromString(pos);
+                                    cluster.settings.setPosition(loc);
+                                } catch (Exception ignored) {
+                                }
+                        }
+                        int m = resultSet.getInt("merged");
+                        boolean[] merged = new boolean[4];
+                        for (int i = 0; i < 4; i++) {
+                            merged[3 - i] = (m & 1 << i) != 0;
+                        }
+                        cluster.settings.setMerged(merged);
+                        String[] flags_string;
+                        String myflags = resultSet.getString("flags");
+                        if (myflags == null || myflags.isEmpty()) {
+                            flags_string = new String[] {};
+                        } else {
+                            flags_string = myflags.split(",");
+                        }
+                        HashMap<Flag<?>, Object> flags = new HashMap<>();
+                        for (String element : flags_string) {
+                            if (element.contains(":")) {
+                                String[] split = element.split(":");
+                                String flag_str =
+                                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
+                                Flag flag = FlagManager.getOrCreateFlag(split[0]);
+                                if (flag == null) {
+                                    flag = new StringFlag(split[0]) {
+                                        @Override public String getValueDescription() {
+                                            return "Generic Filler Flag";
+                                        }
+                                    };
+                                }
+                                flags.put(flag, flag.parseValue(flag_str));
+                            } else {
+                                Flag flag = FlagManager.getOrCreateFlag(element);
+                                if (flag == null) {
+                                    flag = new StringFlag(element) {
+                                        @Override public String getValueDescription() {
+                                            return "Generic Filler Flag";
+                                        }
+                                    };
+                                }
+                                flags.put(flag, flag.parseValue(""));
+                            }
+                        }
+                        cluster.settings.flags = flags;
+                    } else {
+                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
+                            + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
+                    }
+                }
+                resultSet.close();
+            }
+            boolean invalidPlot = false;
+            for (Entry<String, Integer> entry : noExist.entrySet()) {
+                String a = entry.getKey();
+                invalidPlot = true;
+                PlotSquared.debug("&c[WARNING] Found " + noExist.get(a)
+                    + " clusters in DB for non existent area; '" + a + "'.");
+            }
+            if (invalidPlot) {
+                PlotSquared.debug(
+                    "&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
+            }
+        } catch (SQLException e) {
+            PlotSquared.debug("&7[WARN] Failed to load clusters.");
+            e.printStackTrace();
+        }
+        return newClusters;
+    }
+
+    @Override public void setClusterName(final PlotCluster cluster, final String name) {
+        addClusterTask(cluster, new UniqueStatement("setClusterName") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, name);
+                stmt.setInt(2, getClusterId(cluster));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
+            }
+        });
+        cluster.settings.setAlias(name);
+    }
+
+    @Override public void removeHelper(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("removeHelper") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setHelper(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("setHelper") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public void createCluster(final PlotCluster cluster) {
+        addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, cluster.getP1().x);
+                stmt.setInt(2, cluster.getP1().y);
+                stmt.setInt(3, cluster.getP2().x);
+                stmt.setInt(4, cluster.getP2().y);
+                stmt.setString(5, cluster.owner.toString());
+                stmt.setString(6, cluster.area.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER,
+                    Statement.RETURN_GENERATED_KEYS);
+            }
+
+            @Override public void execute(PreparedStatement statement) {
+            }
+
+            @Override public void addBatch(PreparedStatement statement) throws SQLException {
+                statement.executeUpdate();
+                try (ResultSet keys = statement.getGeneratedKeys()) {
+                    if (keys.next()) {
+                        cluster.temp = keys.getInt(1);
+                    }
+                }
+            }
+        });
+        addClusterTask(cluster,
+            new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
+                @Override public void set(PreparedStatement stmt) throws SQLException {
+                    stmt.setInt(1, getClusterId(cluster));
+                    stmt.setString(2, cluster.getAlias());
+                }
+
+                @Override public PreparedStatement get() throws SQLException {
+                    return SQLManager.this.connection.prepareStatement(
+                        "INSERT INTO `" + SQLManager.this.prefix
+                            + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?)");
+                }
+            });
+    }
+
+    @Override public void resizeCluster(final PlotCluster current, PlotId min, PlotId max) {
+        final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
+        final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
+        current.setP1(min);
+        current.setP2(max);
+
+        addClusterTask(current, new UniqueStatement("resizeCluster") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setInt(1, pos1.x);
+                stmt.setInt(2, pos1.y);
+                stmt.setInt(3, pos2.x);
+                stmt.setInt(4, pos2.y);
+                stmt.setInt(5, getClusterId(current));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
+            }
+        });
+    }
+
+    @Override public void setPosition(final PlotCluster cluster, final String position) {
+        addClusterTask(cluster, new UniqueStatement("setPosition") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, position);
+                stmt.setInt(2, getClusterId(cluster));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
+            }
+        });
+    }
+
+    @Override public void removeInvited(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("removeInvited") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "DELETE FROM `" + SQLManager.this.prefix
+                        + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
+            }
+        });
+    }
+
+    @Override public void setInvited(final PlotCluster cluster, final UUID uuid) {
+        addClusterTask(cluster, new UniqueStatement("setInvited") {
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getClusterId(cluster));
+                statement.setString(2, uuid.toString());
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "INSERT INTO `" + SQLManager.this.prefix
+                        + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
+            }
+        });
+    }
+
+    @Override public boolean deleteTables() {
+        try (Statement stmt = this.connection.createStatement();
+            PreparedStatement statement = this.connection
+                .prepareStatement("DROP TABLE `" + this.prefix + "plot`")) {
+            close();
+            this.closed = false;
+            SQLManager.this.connection = this.database.forceConnection();
+            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_invited`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_helpers`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_rating`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_settings`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_trusted`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_helpers`");
+            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_denied`");
+            stmt.executeBatch();
+            stmt.clearBatch();
+            statement.executeUpdate();
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+
+        }
+        return true;
+    }
+
+    @Override public void validateAllPlots(Set<Plot> toValidate) {
+        if (!isValid()) {
+            reconnect();
         }
-      }
-      if (!plot.getDenied().equals(dataPlot.getDenied())) {
-        HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
-        HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
-        toRemove.removeAll(plot.getDenied());
-        toAdd.removeAll(dataPlot.getDenied());
         PlotSquared.debug(
-            "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: "
-                + plot);
-        if (!toRemove.isEmpty()) {
-          for (UUID uuid : toRemove) {
-            removeDenied(plot, uuid);
-          }
+            "$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
+        commit();
+        while (true) {
+            if (!sendBatch()) {
+                break;
+            }
         }
-        if (!toAdd.isEmpty()) {
-          for (UUID uuid : toAdd) {
-            setDenied(plot, uuid);
-          }
-        }
-      }
-      boolean[] pm = plot.getMerged();
-      boolean[] dm = dataPlot.getMerged();
-      if (pm[0] != dm[0] || pm[1] != dm[1]) {
-        PlotSquared.debug("&8 - &7Correcting merge for: " + plot);
-        setMerged(dataPlot, plot.getMerged());
-      }
-      HashMap<Flag<?>, Object> pf = plot.getFlags();
-      HashMap<Flag<?>, Object> df = dataPlot.getFlags();
-      if (!pf.isEmpty() && !df.isEmpty()) {
-        if (pf.size() != df.size() || !StringMan
-            .isEqual(StringMan.joinOrdered(pf.values(), ","),
-                StringMan.joinOrdered(df.values(), ","))) {
-          PlotSquared.debug("&8 - &7Correcting flags for: " + plot);
-          setFlags(plot, pf);
-        }
-      }
-    }
-
-    for (Entry<String, HashMap<PlotId, Plot>> entry : database.entrySet()) {
-      HashMap<PlotId, Plot> map = entry.getValue();
-      if (!map.isEmpty()) {
-        for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
-          PlotSquared.debug("$1Plot was deleted: " + entry2.getValue().toString()
-              + "// TODO implement this when sure safe");
-        }
-      }
-    }
-    commit();
-  }
-
-  @Override
-  public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
-      final PlotId max) {
-    addGlobalTask(() -> {
-      if (min == null) {
-        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot` SET `world` = ? WHERE `world` = ?")) {
-          stmt.setString(1, newWorld);
-          stmt.setString(2, oldWorld);
-          stmt.executeUpdate();
+        try {
+            if (this.connection.getAutoCommit()) {
+                this.connection.setAutoCommit(false);
+            }
         } catch (SQLException e) {
-          e.printStackTrace();
+            e.printStackTrace();
         }
-        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "cluster` SET `world` = ? WHERE `world` = ?")) {
-          stmt.setString(1, newWorld);
-          stmt.setString(2, oldWorld);
-          stmt.executeUpdate();
+        HashMap<String, HashMap<PlotId, Plot>> database = getPlots();
+        ArrayList<Plot> toCreate = new ArrayList<>();
+        for (Plot plot : toValidate) {
+            if (plot.temp == -1) {
+                continue;
+            }
+            HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
+            if (worldPlots == null) {
+                PlotSquared.debug("&8 - &7Creating plot (1): " + plot);
+                toCreate.add(plot);
+                continue;
+            }
+            Plot dataPlot = worldPlots.remove(plot.getId());
+            if (dataPlot == null) {
+                PlotSquared.debug("&8 - &7Creating plot (2): " + plot);
+                toCreate.add(plot);
+                continue;
+            }
+            // owner
+            if (!plot.owner.equals(dataPlot.owner)) {
+                PlotSquared
+                    .debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
+                setOwner(plot, plot.owner);
+            }
+            // trusted
+            if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
+                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
+                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
+                toRemove.removeAll(plot.getTrusted());
+                toAdd.removeAll(dataPlot.getTrusted());
+                PlotSquared.debug(
+                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: "
+                        + plot);
+                if (!toRemove.isEmpty()) {
+                    for (UUID uuid : toRemove) {
+                        removeTrusted(plot, uuid);
+                    }
+                }
+                if (!toAdd.isEmpty()) {
+                    for (UUID uuid : toAdd) {
+                        setTrusted(plot, uuid);
+                    }
+                }
+            }
+            if (!plot.getMembers().equals(dataPlot.getMembers())) {
+                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
+                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
+                toRemove.removeAll(plot.getMembers());
+                toAdd.removeAll(dataPlot.getMembers());
+                PlotSquared.debug(
+                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: "
+                        + plot);
+                if (!toRemove.isEmpty()) {
+                    for (UUID uuid : toRemove) {
+                        removeMember(plot, uuid);
+                    }
+                }
+                if (!toAdd.isEmpty()) {
+                    for (UUID uuid : toAdd) {
+                        setMember(plot, uuid);
+                    }
+                }
+            }
+            if (!plot.getDenied().equals(dataPlot.getDenied())) {
+                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
+                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
+                toRemove.removeAll(plot.getDenied());
+                toAdd.removeAll(dataPlot.getDenied());
+                PlotSquared.debug(
+                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: "
+                        + plot);
+                if (!toRemove.isEmpty()) {
+                    for (UUID uuid : toRemove) {
+                        removeDenied(plot, uuid);
+                    }
+                }
+                if (!toAdd.isEmpty()) {
+                    for (UUID uuid : toAdd) {
+                        setDenied(plot, uuid);
+                    }
+                }
+            }
+            boolean[] pm = plot.getMerged();
+            boolean[] dm = dataPlot.getMerged();
+            if (pm[0] != dm[0] || pm[1] != dm[1]) {
+                PlotSquared.debug("&8 - &7Correcting merge for: " + plot);
+                setMerged(dataPlot, plot.getMerged());
+            }
+            HashMap<Flag<?>, Object> pf = plot.getFlags();
+            HashMap<Flag<?>, Object> df = dataPlot.getFlags();
+            if (!pf.isEmpty() && !df.isEmpty()) {
+                if (pf.size() != df.size() || !StringMan
+                    .isEqual(StringMan.joinOrdered(pf.values(), ","),
+                        StringMan.joinOrdered(df.values(), ","))) {
+                    PlotSquared.debug("&8 - &7Correcting flags for: " + plot);
+                    setFlags(plot, pf);
+                }
+            }
+        }
+
+        for (Entry<String, HashMap<PlotId, Plot>> entry : database.entrySet()) {
+            HashMap<PlotId, Plot> map = entry.getValue();
+            if (!map.isEmpty()) {
+                for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
+                    PlotSquared.debug("$1Plot was deleted: " + entry2.getValue().toString()
+                        + "// TODO implement this when sure safe");
+                }
+            }
+        }
+        commit();
+    }
+
+    @Override
+    public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
+        final PlotId max) {
+        addGlobalTask(() -> {
+            if (min == null) {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `world` = ? WHERE `world` = ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `world` = ? WHERE `world` = ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.setInt(3, min.x);
+                    stmt.setInt(4, max.x);
+                    stmt.setInt(5, min.y);
+                    stmt.setInt(6, max.y);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.setInt(3, max.x);
+                    stmt.setInt(4, max.y);
+                    stmt.setInt(5, min.x);
+                    stmt.setInt(6, min.y);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    @Override public void replaceUUID(final UUID old, final UUID now) {
+        addGlobalTask(() -> {
+            try (Statement stmt = SQLManager.this.connection.createStatement()) {
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
+                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now.toString()
+                        + "' WHERE `owner` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+            } catch (SQLException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @Override public void close() {
+        try {
+            this.closed = true;
+            this.connection.close();
         } catch (SQLException e) {
-          e.printStackTrace();
+            e.printStackTrace();
         }
-      } else {
-        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
-          stmt.setString(1, newWorld);
-          stmt.setString(2, oldWorld);
-          stmt.setInt(3, min.x);
-          stmt.setInt(4, max.x);
-          stmt.setInt(5, min.y);
-          stmt.setInt(6, max.y);
-          stmt.executeUpdate();
-        } catch (SQLException e) {
-          e.printStackTrace();
+    }
+
+    public abstract class UniqueStatement {
+
+        public final String method;
+
+        public UniqueStatement(String method) {
+            this.method = method;
         }
-        try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-            "UPDATE `" + SQLManager.this.prefix
-                + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
-          stmt.setString(1, newWorld);
-          stmt.setString(2, oldWorld);
-          stmt.setInt(3, max.x);
-          stmt.setInt(4, max.y);
-          stmt.setInt(5, min.x);
-          stmt.setInt(6, min.y);
-          stmt.executeUpdate();
-        } catch (SQLException e) {
-          e.printStackTrace();
+
+        public void addBatch(PreparedStatement statement) throws SQLException {
+            statement.addBatch();
         }
-      }
-    });
-  }
 
-  @Override
-  public void replaceUUID(final UUID old, final UUID now) {
-    addGlobalTask(() -> {
-      try (Statement stmt = SQLManager.this.connection.createStatement()) {
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
-                .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
-                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
-                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
-                .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
-                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
-                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-        stmt.executeUpdate(
-            "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
-                + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-      } catch (SQLException e) {
-        e.printStackTrace();
-      }
-    });
-  }
+        public void execute(PreparedStatement statement) throws SQLException {
+            statement.executeBatch();
+        }
 
-  @Override
-  public void close() {
-    try {
-      this.closed = true;
-      this.connection.close();
-    } catch (SQLException e) {
-      e.printStackTrace();
-    }
-  }
+        public abstract PreparedStatement get() throws SQLException;
 
-  public abstract class UniqueStatement {
-
-    public final String method;
-
-    public UniqueStatement(String method) {
-      this.method = method;
+        public abstract void set(PreparedStatement stmt) throws SQLException;
     }
 
-    public void addBatch(PreparedStatement statement) throws SQLException {
-      statement.addBatch();
+
+    private class UUIDPair {
+
+        public final int id;
+        public final UUID uuid;
+
+        public UUIDPair(int id, UUID uuid) {
+            this.id = id;
+            this.uuid = uuid;
+        }
     }
 
-    public void execute(PreparedStatement statement) throws SQLException {
-      statement.executeBatch();
+
+    private class SettingsPair {
+
+        public final int id;
+        public final PlotSettings settings;
+
+        public SettingsPair(int id, PlotSettings settings) {
+            this.id = id;
+            this.settings = settings;
+        }
     }
-
-    public abstract PreparedStatement get() throws SQLException;
-
-    public abstract void set(PreparedStatement stmt) throws SQLException;
-  }
-
-
-  private class UUIDPair {
-
-    public final int id;
-    public final UUID uuid;
-
-    public UUIDPair(int id, UUID uuid) {
-      this.id = id;
-      this.uuid = uuid;
-    }
-  }
-
-
-  private class SettingsPair {
-
-    public final int id;
-    public final PlotSettings settings;
-
-    public SettingsPair(int id, PlotSettings settings) {
-      this.id = id;
-      this.settings = settings;
-    }
-  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
index 2c0746d13..1bac3e526 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -2,7 +2,10 @@ package com.github.intellectualsites.plotsquared.plot.flag;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
 import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.google.common.collect.ImmutableSet;
@@ -114,8 +117,7 @@ public class FlagManager {
      * @param flag
      * @return
      */
-    @SuppressWarnings("deprecation")
-    public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
+    @SuppressWarnings("deprecation") public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
         if (plot.owner == null) {
             return null;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
index 89c39e36d..755f694d6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
@@ -13,8 +13,7 @@ import javax.annotation.Nonnull;
 import java.lang.reflect.Field;
 import java.util.Locale;
 
-@SuppressWarnings("WeakerAccess")
-public abstract class ClassicPlotWorld extends SquarePlotWorld {
+@SuppressWarnings("WeakerAccess") public abstract class ClassicPlotWorld extends SquarePlotWorld {
 
     public int ROAD_HEIGHT = 62;
     public int PLOT_HEIGHT = 62;
@@ -94,11 +93,12 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
 
         // Dump world settings
         if (Settings.DEBUG) {
-            PlotSquared.debug(String.format("- Dumping settings for ClassicPlotWorld with name %s", this.worldname));
+            PlotSquared.debug(String
+                .format("- Dumping settings for ClassicPlotWorld with name %s", this.worldname));
             final Field[] fields = this.getClass().getFields();
             for (final Field field : fields) {
                 final String name = field.getName().toLowerCase(Locale.ENGLISH);
-                if(name.equalsIgnoreCase("g_sch")) {
+                if (name.equalsIgnoreCase("g_sch")) {
                     continue;
                 }
                 Object value;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index 82b76f0c9..f2098036d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -58,8 +58,7 @@ public class HybridGen extends IndependentPlotGenerator {
                 if (blockBuckets[layer] == null) {
                     blockBuckets[layer] = new BlockBucket[4096];
                 }
-                blockBuckets[layer][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] =
-                    hpw.MAIN_BLOCK;
+                blockBuckets[layer][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
             }
         }
         return blockBuckets;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 5466df8bc..53a9d6891 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -36,7 +36,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     private Location SIGN_LOCATION;
 
     public HybridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
-                           PlotId min, PlotId max) {
+        PlotId min, PlotId max) {
         super(worldName, id, generator, min, max);
     }
 
@@ -69,10 +69,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
                 if (direction != null) {
                     Vector3 vector = transform.apply(direction.toVector())
-                            .subtract(transform.apply(Vector3.ZERO)).normalize();
+                        .subtract(transform.apply(Vector3.ZERO)).normalize();
                     Direction newDirection = Direction.findClosest(vector,
-                            Direction.Flag.CARDINAL | Direction.Flag.ORDINAL
-                                    | Direction.Flag.SECONDARY_ORDINAL);
+                        Direction.Flag.CARDINAL | Direction.Flag.ORDINAL
+                            | Direction.Flag.SECONDARY_ORDINAL);
 
                     if (newDirection != null) {
                         CompoundTagBuilder builder = tag.createBuilder();
@@ -96,7 +96,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         } else {
             bot.setY(0);
             Location loc =
-                    bot.add(SIGN_LOCATION.getX(), SIGN_LOCATION.getY(), SIGN_LOCATION.getZ());
+                bot.add(SIGN_LOCATION.getX(), SIGN_LOCATION.getY(), SIGN_LOCATION.getZ());
             return loc;
         }
     }
@@ -134,11 +134,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public void setupSchematics() throws SchematicHandler.UnsupportedFormatException {
         this.G_SCH = new HashMap<>();
         File schematic1File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-                "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
         File schematic2File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-                "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic");
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic");
         File schem3File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-                "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic");
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic");
         Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File);
         Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File);
         Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File);
@@ -177,8 +177,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                         BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x, y, z));
                         if (!id.getBlockType().getMaterial().isAir()) {
                             addOverlayBlock((short) (x + shift + oddshift + centerShiftX),
-                                    (short) (y + startY), (short) (z + shift + oddshift + centerShiftZ),
-                                    id, false, h3);
+                                (short) (y + startY), (short) (z + shift + oddshift + centerShiftZ),
+                                id, false, h3);
                         }
                     }
                 }
@@ -241,9 +241,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                     BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x, y, z));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + startY),
-                                (short) (z + shift + oddshift), id, false, h1);
+                            (short) (z + shift + oddshift), id, false, h1);
                         addOverlayBlock((short) (z + shift + oddshift), (short) (y + startY),
-                                (short) (shift - x + (oddshift - 1)), id, true, h1);
+                            (short) (shift - x + (oddshift - 1)), id, true, h1);
                     }
                 }
             }
@@ -254,7 +254,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                     BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x, y, z));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + startY),
-                                (short) (z - shift), id, false, h2);
+                            (short) (z - shift), id, false, h2);
                     }
                 }
             }
@@ -262,7 +262,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     }
 
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate,
-                                int height) {
+        int height) {
         if (z < 0) {
             z += this.SIZE;
         } else if (z >= this.SIZE) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
index dd9547b26..ed8b42f57 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
@@ -167,8 +167,8 @@ public class PlotListener {
                             replacements.put("%greeting%", greeting);
                             replacements.put("%alias", plot.toString());
                             replacements.put("%s", MainUtil.getName(plot.owner));
-                            String main = StringMan
-                                .replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
+                            String main =
+                                StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
                             String sub = StringMan
                                 .replaceFromMap(C.TITLE_ENTERED_PLOT_SUB.s(), replacements);
                             AbstractTitle.sendTitle(player, main, sub);
@@ -208,13 +208,12 @@ public class PlotListener {
                 }
             }
             Optional<String> farewell = plot.getFlag(Flags.FAREWELL);
-            farewell.ifPresent(s -> MainUtil.format(C.PREFIX_FAREWELL.s() + s, plot, player, false,
-                    new RunnableVal<String>() {
-                        @Override
-                        public void run(String value) {
-                            MainUtil.sendMessage(player, value);
-                        }
-                    }));
+            farewell.ifPresent(s -> MainUtil
+                .format(C.PREFIX_FAREWELL.s() + s, plot, player, false, new RunnableVal<String>() {
+                    @Override public void run(String value) {
+                        MainUtil.sendMessage(player, value);
+                    }
+                }));
             Optional<Boolean> leave = plot.getFlag(Flags.NOTIFY_LEAVE);
             if (leave.isPresent() && leave.get()) {
                 if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
index a85a78f34..ac0503886 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
@@ -10,16 +10,18 @@ import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.biome.BaseBiome;
-import com.sk89q.worldedit.world.block.*;
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.HashSet;
 
 public class WEExtent extends AbstractDelegateExtent {
 
-    private final HashSet<RegionWrapper> mask;
-
     public static BlockState AIRSTATE = BlockTypes.AIR.getDefaultState();
     public static BaseBlock AIRBASE = BlockTypes.AIR.getDefaultState().toBaseBlock();
+    private final HashSet<RegionWrapper> mask;
 
     public WEExtent(HashSet<RegionWrapper> mask, Extent extent) {
         super(extent);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
index c1e4d9eb9..0d80cab31 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
@@ -4,9 +4,6 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockType;
 
 import java.util.HashSet;
 import java.util.UUID;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
index 3a4645cac..29a45ac27 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
@@ -1,6 +1,5 @@
 package com.github.intellectualsites.plotsquared.plot.logger;
 
-@FunctionalInterface
-public interface ILogger {
+@FunctionalInterface public interface ILogger {
     void log(String message);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
index 1214a2769..da9c2c09d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
@@ -9,8 +9,7 @@ import javax.script.ScriptException;
 
 public abstract class Expression<T> {
 
-    @Nonnull
-    public static <U> Expression<U> constant(final U value) {
+    @Nonnull public static <U> Expression<U> constant(final U value) {
         return new Expression<U>() {
             @Override public U evaluate(U arg) {
                 return value;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 5a6f1c2ba..c31404cd5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -40,2873 +40,2849 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class Plot {
 
-  /**
-   * @deprecated raw access is deprecated
-   */
-  @Deprecated
-  private static HashSet<Plot> connected_cache;
-  private static HashSet<RegionWrapper> regions_cache;
-  /**
-   * The {@link PlotId}.
-   */
-  private final PlotId id;
-  /**
-   * plot owner (Merged plots can have multiple owners) Direct access is Deprecated: use
-   * getOwners()
-   */
-  @Deprecated
-  public UUID owner;
-  /**
-   * Has the plot changed since the last save cycle?
-   */
-  public boolean countsTowardsMax = true;
-  /**
-   * Represents whatever the database manager needs it to: <br> - A value of -1 usually indicates
-   * the plot will not be stored in the DB<br> - A value of 0 usually indicates that the DB manager
-   * hasn't set a value<br>
-   *
-   * @deprecated magical
-   */
-  @Deprecated
-  public int temp;
-  /**
-   * Plot creation timestamp (not accurate if the plot was created before this was implemented)<br>
-   * - Milliseconds since the epoch<br>
-   */
-  private long timestamp;
-  /**
-   * List of trusted (with plot permissions).
-   */
-  private HashSet<UUID> trusted;
-  /**
-   * List of members users (with plot permissions).
-   */
-  private HashSet<UUID> members;
-  /**
-   * List of denied players.
-   */
-  private HashSet<UUID> denied;
-  /**
-   * External settings class. - Please favor the methods over direct access to this class<br> - The
-   * methods are more likely to be left unchanged from version changes<br>
-   */
-  private PlotSettings settings;
-  /**
-   * The {@link PlotArea}.
-   */
-  @Nonnull
-  private PlotArea area;
-  /**
-   * Session only plot metadata (session is until the server stops)<br>
-   * <br>
-   * For persistent metadata use the flag system
-   *
-   * @see FlagManager
-   */
-  private ConcurrentHashMap<String, Object> meta;
-  /**
-   * The cached origin plot. - The origin plot is used for plot grouping and relational data
-   */
-  private Plot origin;
+    /**
+     * @deprecated raw access is deprecated
+     */
+    @Deprecated private static HashSet<Plot> connected_cache;
+    private static HashSet<RegionWrapper> regions_cache;
+    /**
+     * The {@link PlotId}.
+     */
+    private final PlotId id;
+    /**
+     * plot owner (Merged plots can have multiple owners) Direct access is Deprecated: use
+     * getOwners()
+     */
+    @Deprecated public UUID owner;
+    /**
+     * Has the plot changed since the last save cycle?
+     */
+    public boolean countsTowardsMax = true;
+    /**
+     * Represents whatever the database manager needs it to: <br> - A value of -1 usually indicates
+     * the plot will not be stored in the DB<br> - A value of 0 usually indicates that the DB manager
+     * hasn't set a value<br>
+     *
+     * @deprecated magical
+     */
+    @Deprecated public int temp;
+    /**
+     * Plot creation timestamp (not accurate if the plot was created before this was implemented)<br>
+     * - Milliseconds since the epoch<br>
+     */
+    private long timestamp;
+    /**
+     * List of trusted (with plot permissions).
+     */
+    private HashSet<UUID> trusted;
+    /**
+     * List of members users (with plot permissions).
+     */
+    private HashSet<UUID> members;
+    /**
+     * List of denied players.
+     */
+    private HashSet<UUID> denied;
+    /**
+     * External settings class. - Please favor the methods over direct access to this class<br> - The
+     * methods are more likely to be left unchanged from version changes<br>
+     */
+    private PlotSettings settings;
+    /**
+     * The {@link PlotArea}.
+     */
+    @Nonnull private PlotArea area;
+    /**
+     * Session only plot metadata (session is until the server stops)<br>
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @see FlagManager
+     */
+    private ConcurrentHashMap<String, Object> meta;
+    /**
+     * The cached origin plot. - The origin plot is used for plot grouping and relational data
+     */
+    private Plot origin;
 
-  /**
-   * Constructor for a new plot. (Only changes after plot.create() will be properly set in the
-   * database)
-   *
-   * @param area the PlotArea where the plot is located
-   * @param id the plot id
-   * @param owner the plot owner
-   * @see Plot#getPlot(Location) for existing plots
-   */
-  public Plot(@Nonnull PlotArea area, PlotId id, UUID owner) {
-    this.area = area;
-    this.id = id;
-    this.owner = owner;
-  }
-
-  /**
-   * Constructor for an unowned plot. (Only changes after plot.create() will be properly set in the
-   * database)
-   *
-   * @param area the PlotArea where the plot is located
-   * @param id the plot id
-   * @see Plot#getPlot(Location) for existing plots
-   */
-  public Plot(@Nonnull PlotArea area, PlotId id) {
-    this.area = area;
-    this.id = id;
-  }
-
-  /**
-   * Constructor for a temporary plot (use -1 for temp)<br> The database will ignore any queries
-   * regarding temporary plots. Please note that some bulk plot management functions may still
-   * affect temporary plots (TODO: fix this)
-   *
-   * @param area the PlotArea where the plot is located
-   * @param id the plot id
-   * @param owner the owner of the plot
-   * @param temp Represents whatever the database manager needs it to
-   * @see Plot#getPlot(Location) for existing plots
-   */
-  public Plot(@Nonnull PlotArea area, PlotId id, UUID owner, int temp) {
-    this.area = area;
-    this.id = id;
-    this.owner = owner;
-    this.temp = temp;
-  }
-
-  /**
-   * Constructor for a saved plots (Used by the database manager when plots are fetched)
-   *
-   * @param id the plot id
-   * @param owner the plot owner
-   * @param trusted the plot trusted players
-   * @param denied the plot denied players
-   * @param merged array giving merged plots
-   * @see Plot#getPlot(Location) for existing plots
-   */
-  public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
-      HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
-      @Nonnull PlotArea area, boolean[] merged, long timestamp, int temp) {
-    this.id = id;
-    this.area = area;
-    this.owner = owner;
-    this.settings = new PlotSettings();
-    this.members = members;
-    this.trusted = trusted;
-    this.denied = denied;
-    this.settings.setAlias(alias);
-    this.settings.setPosition(position);
-    this.settings.setMerged(merged);
-    if (flags != null) {
-      for (Flag flag : flags) {
-        this.settings.flags.put(flag, flag);
-      }
+    /**
+     * Constructor for a new plot. (Only changes after plot.create() will be properly set in the
+     * database)
+     *
+     * @param area  the PlotArea where the plot is located
+     * @param id    the plot id
+     * @param owner the plot owner
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner) {
+        this.area = area;
+        this.id = id;
+        this.owner = owner;
     }
-    this.timestamp = timestamp;
-    this.temp = temp;
-  }
 
-  /**
-   * Get a plot from a string e.g. [area];[id]
-   *
-   * @param defaultArea If no area is specified
-   * @param string plot id/area + id
-   * @return New or existing plot object
-   */
-  public static Plot fromString(PlotArea defaultArea, String string) {
-    String[] split = string.split(";|,");
-    if (split.length == 2) {
-      if (defaultArea != null) {
-        PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
-        return id != null ? defaultArea.getPlotAbs(id) : null;
-      }
-    } else if (split.length == 3) {
-      PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
-      if (pa != null) {
-        PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
-        return pa.getPlotAbs(id);
-      }
-    } else if (split.length == 4) {
-      PlotArea pa = PlotSquared.get().getPlotArea(split[0], split[1]);
-      if (pa != null) {
-        PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
-        return pa.getPlotAbs(id);
-      }
+    /**
+     * Constructor for an unowned plot. (Only changes after plot.create() will be properly set in the
+     * database)
+     *
+     * @param area the PlotArea where the plot is located
+     * @param id   the plot id
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(@Nonnull PlotArea area, PlotId id) {
+        this.area = area;
+        this.id = id;
     }
-    return null;
-  }
 
-  /**
-   * Return a new/cached plot object at a given location.
-   *
-   * @param location the location of the plot
-   * @return plot at location or null
-   * @see PlotPlayer#getCurrentPlot() if a player is expected here.
-   */
-  public static Plot getPlot(Location location) {
-    PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
-    if (pa != null) {
-      return pa.getPlot(location);
+    /**
+     * Constructor for a temporary plot (use -1 for temp)<br> The database will ignore any queries
+     * regarding temporary plots. Please note that some bulk plot management functions may still
+     * affect temporary plots (TODO: fix this)
+     *
+     * @param area  the PlotArea where the plot is located
+     * @param id    the plot id
+     * @param owner the owner of the plot
+     * @param temp  Represents whatever the database manager needs it to
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner, int temp) {
+        this.area = area;
+        this.id = id;
+        this.owner = owner;
+        this.temp = temp;
     }
-    return null;
-  }
 
-  public String getWorldName() {
-    return area.worldname;
-  }
-
-  /**
-   * Session only plot metadata (session is until the server stops)<br>
-   * <br>
-   * For persistent metadata use the flag system
-   *
-   * @param key metadata key
-   * @param value metadata value
-   * @see FlagManager
-   */
-  public void setMeta(String key, Object value) {
-    if (this.meta == null) {
-      this.meta = new ConcurrentHashMap<>();
-    }
-    this.meta.put(key, value);
-  }
-
-  /**
-   * Get the metadata for a key<br>
-   * <br>
-   * For persistent metadata use the flag system
-   *
-   * @param key metadata key to get value for
-   * @return Object value
-   */
-  public Object getMeta(String key) {
-    if (this.meta != null) {
-      return this.meta.get(key);
-    }
-    return null;
-  }
-
-  /**
-   * Delete the metadata for a key<br> - metadata is session only - deleting other plugin's metadata
-   * may cause issues
-   *
-   * @param key key to delete
-   */
-  public void deleteMeta(String key) {
-    if (this.meta != null) {
-      this.meta.remove(key);
-    }
-  }
-
-  /**
-   * Get the cluster this plot is associated with
-   *
-   * @return the PlotCluster object, or null
-   */
-  public PlotCluster getCluster() {
-    return this.getArea().getCluster(this.id);
-  }
-
-  /**
-   * Efficiently get the players currently inside this plot<br> - Will return an empty list if no
-   * players are in the plot<br> - Remember, you can cast a PlotPlayer to it's respective
-   * implementation (BukkitPlayer, SpongePlayer) to obtain the player object
-   *
-   * @return list of PlotPlayer(s) or an empty list
-   */
-  public List<PlotPlayer> getPlayersInPlot() {
-    ArrayList<PlotPlayer> players = new ArrayList<>();
-    for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-      PlotPlayer pp = entry.getValue();
-      if (this.equals(pp.getCurrentPlot())) {
-        players.add(pp);
-      }
-    }
-    return players;
-  }
-
-  /**
-   * Check if the plot has an owner.
-   *
-   * @return false if there is no owner
-   */
-  public boolean hasOwner() {
-    return this.owner != null;
-  }
-
-  /**
-   * Check if a UUID is a plot owner (merged plots may have multiple owners)
-   *
-   * @param uuid the player uuid
-   * @return if the provided uuid is the owner of the plot
-   */
-  public boolean isOwner(UUID uuid) {
-    if (uuid.equals(this.owner)) {
-      return true;
-    }
-    if (!isMerged()) {
-      return false;
-    }
-    Set<Plot> connected = getConnectedPlots();
-    for (Plot current : connected) {
-      if (uuid.equals(current.owner)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public boolean isOwnerAbs(UUID uuid) {
-    return uuid.equals(this.owner);
-  }
-
-  /**
-   * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
-   *
-   * @return the plot owners
-   */
-  public Set<UUID> getOwners() {
-    if (this.owner == null) {
-      return ImmutableSet.of();
-    }
-    if (isMerged()) {
-      Set<Plot> plots = getConnectedPlots();
-      Plot[] array = plots.toArray(new Plot[0]);
-      ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
-      UUID last = this.owner;
-      owners.add(this.owner);
-      for (Plot current : array) {
-        if (last == null || current.owner.getMostSignificantBits() != last
-            .getMostSignificantBits()) {
-          owners.add(current.owner);
-          last = current.owner;
+    /**
+     * Constructor for a saved plots (Used by the database manager when plots are fetched)
+     *
+     * @param id      the plot id
+     * @param owner   the plot owner
+     * @param trusted the plot trusted players
+     * @param denied  the plot denied players
+     * @param merged  array giving merged plots
+     * @see Plot#getPlot(Location) for existing plots
+     */
+    public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
+        HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
+        @Nonnull PlotArea area, boolean[] merged, long timestamp, int temp) {
+        this.id = id;
+        this.area = area;
+        this.owner = owner;
+        this.settings = new PlotSettings();
+        this.members = members;
+        this.trusted = trusted;
+        this.denied = denied;
+        this.settings.setAlias(alias);
+        this.settings.setPosition(position);
+        this.settings.setMerged(merged);
+        if (flags != null) {
+            for (Flag flag : flags) {
+                this.settings.flags.put(flag, flag);
+            }
         }
-      }
-      return owners.build();
+        this.timestamp = timestamp;
+        this.temp = temp;
     }
-    return ImmutableSet.of(this.owner);
-  }
 
-  /**
-   * Check if the player is either the owner or on the trusted/added list.
-   *
-   * @param uuid uuid to check
-   * @return true if the player is added/trusted or is the owner
-   */
-  public boolean isAdded(UUID uuid) {
-    if (this.owner == null || getDenied().contains(uuid)) {
-      return false;
+    /**
+     * Get a plot from a string e.g. [area];[id]
+     *
+     * @param defaultArea If no area is specified
+     * @param string      plot id/area + id
+     * @return New or existing plot object
+     */
+    public static Plot fromString(PlotArea defaultArea, String string) {
+        String[] split = string.split(";|,");
+        if (split.length == 2) {
+            if (defaultArea != null) {
+                PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
+                return id != null ? defaultArea.getPlotAbs(id) : null;
+            }
+        } else if (split.length == 3) {
+            PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
+            if (pa != null) {
+                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
+                return pa.getPlotAbs(id);
+            }
+        } else if (split.length == 4) {
+            PlotArea pa = PlotSquared.get().getPlotArea(split[0], split[1]);
+            if (pa != null) {
+                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
+                return pa.getPlotAbs(id);
+            }
+        }
+        return null;
     }
-    if (isOwner(uuid)) {
-      return true;
-    }
-    if (getMembers().contains(uuid)) {
-      return isOnline();
-    }
-    if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.EVERYONE)) {
-      return true;
-    }
-    if (getMembers().contains(DBFunc.EVERYONE)) {
-      return isOnline();
-    }
-    return false;
-  }
 
-  /**
-   * Should the player be denied from entering.
-   *
-   * @param uuid uuid to check
-   * @return boolean false if the player is allowed to enter
-   */
-  public boolean isDenied(UUID uuid) {
-    return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid)
-        || !this.isAdded(uuid) && this.denied.contains(uuid));
-  }
-
-  /**
-   * Get the {@link PlotId}.
-   */
-  @Nonnull
-  public PlotId getId() {
-    return this.id;
-  }
-
-  /**
-   * Get the plot world object for this plot<br> - The generic PlotArea object can be casted to its
-   * respective class for more control (e.g. HybridPlotWorld)
-   *
-   * @return PlotArea
-   */
-  @Nonnull
-  public PlotArea getArea() {
-    return this.area;
-  }
-
-  /**
-   * Assign this plot to a plot area.<br> (Mostly used during startup when worlds are being
-   * created)<br> Note: Using this when it doesn't make sense will result in strange behavior
-   *
-   * @param area area to assign to
-   */
-  public void setArea(@Nonnull PlotArea area) {
-    if (this.getArea() == area) {
-      return;
+    /**
+     * Return a new/cached plot object at a given location.
+     *
+     * @param location the location of the plot
+     * @return plot at location or null
+     * @see PlotPlayer#getCurrentPlot() if a player is expected here.
+     */
+    public static Plot getPlot(Location location) {
+        PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
+        if (pa != null) {
+            return pa.getPlot(location);
+        }
+        return null;
     }
-    this.area.removePlot(this.id);
-    this.area = area;
-    area.addPlot(this);
-  }
 
-  /**
-   * Get the plot manager object for this plot<br> - The generic PlotManager object can be casted to
-   * its respective class for more control (e.g. HybridPlotManager)
-   *
-   * @return PlotManager
-   */
-  public PlotManager getManager() {
-    return this.area.getPlotManager();
-  }
+    public String getWorldName() {
+        return area.worldname;
+    }
 
-  /**
-   * Get or create plot settings.
-   *
-   * @return PlotSettings
-   * @deprecated use equivalent plot method;
-   */
-  @Deprecated
-  @Nonnull
-  public PlotSettings getSettings() {
-    if (this.settings == null) {
-      this.settings = new PlotSettings();
+    /**
+     * Session only plot metadata (session is until the server stops)<br>
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @param key   metadata key
+     * @param value metadata value
+     * @see FlagManager
+     */
+    public void setMeta(String key, Object value) {
+        if (this.meta == null) {
+            this.meta = new ConcurrentHashMap<>();
+        }
+        this.meta.put(key, value);
     }
-    return this.settings;
-  }
 
-  /**
-   * Returns true if the plot is not merged, or it is the base plot of multiple merged plots.
-   *
-   * @return Boolean
-   */
-  public boolean isBasePlot() {
-    return !this.isMerged() || this.equals(this.getBasePlot(false));
-  }
+    /**
+     * Get the metadata for a key<br>
+     * <br>
+     * For persistent metadata use the flag system
+     *
+     * @param key metadata key to get value for
+     * @return Object value
+     */
+    public Object getMeta(String key) {
+        if (this.meta != null) {
+            return this.meta.get(key);
+        }
+        return null;
+    }
 
-  /**
-   * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
-   * - Merged plots need to be treated as a single plot for most purposes<br> - Some data such as
-   * home location needs to be associated with the group rather than each plot<br> - If the plot is
-   * not merged it will return itself.<br> - The result is cached locally
-   *
-   * @return base Plot
-   */
-  public Plot getBasePlot(boolean recalculate) {
-    if (this.origin != null && !recalculate) {
-      if (this.equals(this.origin)) {
-        return this;
-      }
-      return this.origin.getBasePlot(false);
+    /**
+     * Delete the metadata for a key<br> - metadata is session only - deleting other plugin's metadata
+     * may cause issues
+     *
+     * @param key key to delete
+     */
+    public void deleteMeta(String key) {
+        if (this.meta != null) {
+            this.meta.remove(key);
+        }
     }
-    if (!this.isMerged()) {
-      this.origin = this;
-      return this.origin;
-    }
-    this.origin = this;
-    PlotId min = this.id;
-    for (Plot plot : this.getConnectedPlots()) {
-      if (plot.id.y < min.y || plot.id.y == min.y && plot.id.x < min.x) {
-        this.origin = plot;
-        min = plot.id;
-      }
-    }
-    for (Plot plot : this.getConnectedPlots()) {
-      plot.origin = this.origin;
-    }
-    return this.origin;
-  }
 
-  /**
-   * Check if the plot is merged in any direction.
-   *
-   * @return is the plot merged or not
-   */
-  public boolean isMerged() {
-    return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
-        .getMerged(1) || getSettings().getMerged(3);
-  }
-
-  /**
-   * Get the timestamp of when the plot was created (unreliable)<br> - not accurate if the plot was
-   * created before this was implemented<br> - Milliseconds since the epoch<br>
-   *
-   * @return the creation date of the plot
-   */
-  public long getTimestamp() {
-    if (this.timestamp == 0) {
-      this.timestamp = System.currentTimeMillis();
+    /**
+     * Get the cluster this plot is associated with
+     *
+     * @return the PlotCluster object, or null
+     */
+    public PlotCluster getCluster() {
+        return this.getArea().getCluster(this.id);
     }
-    return this.timestamp;
-  }
 
-  /**
-   * Get if the plot is merged in a direction<br> ------- Actual -------<br> 0 = north<br> 1 =
-   * east<br> 2 = south<br> 3 = west<br> ----- Artificial -----<br> 4 = north-east<br> 5 =
-   * south-east<br> 6 = south-west<br> 7 = north-west<br> ----------<br> Note: A plot that is merged
-   * north and east will not be merged northeast if the northeast plot is not part of the same
-   * group<br>
-   *
-   * @param direction direction to check for merged plot
-   * @return true if merged in that direction
-   */
-  public boolean getMerged(int direction) {
-    if (this.settings == null) {
-      return false;
+    /**
+     * Efficiently get the players currently inside this plot<br> - Will return an empty list if no
+     * players are in the plot<br> - Remember, you can cast a PlotPlayer to it's respective
+     * implementation (BukkitPlayer, SpongePlayer) to obtain the player object
+     *
+     * @return list of PlotPlayer(s) or an empty list
+     */
+    public List<PlotPlayer> getPlayersInPlot() {
+        ArrayList<PlotPlayer> players = new ArrayList<>();
+        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+            PlotPlayer pp = entry.getValue();
+            if (this.equals(pp.getCurrentPlot())) {
+                players.add(pp);
+            }
+        }
+        return players;
     }
-    switch (direction) {
-      case 0:
-      case 1:
-      case 2:
-      case 3:
-        return this.getSettings().getMerged(direction);
-      case 7:
-        int i = direction - 4;
-        int i2 = 0;
-        if (this.getSettings().getMerged(i2)) {
-          if (this.getSettings().getMerged(i)) {
-            if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
-              if (this.area.getPlotAbs(this.id.getRelative(i2)).getMerged(i)) {
+
+    /**
+     * Check if the plot has an owner.
+     *
+     * @return false if there is no owner
+     */
+    public boolean hasOwner() {
+        return this.owner != null;
+    }
+
+    /**
+     * Check if a UUID is a plot owner (merged plots may have multiple owners)
+     *
+     * @param uuid the player uuid
+     * @return if the provided uuid is the owner of the plot
+     */
+    public boolean isOwner(UUID uuid) {
+        if (uuid.equals(this.owner)) {
+            return true;
+        }
+        if (!isMerged()) {
+            return false;
+        }
+        Set<Plot> connected = getConnectedPlots();
+        for (Plot current : connected) {
+            if (uuid.equals(current.owner)) {
                 return true;
-              }
             }
-          }
         }
         return false;
-      case 4:
-      case 5:
-      case 6:
-        i = direction - 4;
-        i2 = direction - 3;
-        return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
-            && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
-            .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
+    }
 
+    public boolean isOwnerAbs(UUID uuid) {
+        return uuid.equals(this.owner);
     }
-    return false;
-  }
 
-  /**
-   * Get the denied users.
-   *
-   * @return a set of denied users
-   */
-  public HashSet<UUID> getDenied() {
-    if (this.denied == null) {
-      this.denied = new HashSet<>();
+    /**
+     * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
+     *
+     * @return the plot owners
+     */
+    public Set<UUID> getOwners() {
+        if (this.owner == null) {
+            return ImmutableSet.of();
+        }
+        if (isMerged()) {
+            Set<Plot> plots = getConnectedPlots();
+            Plot[] array = plots.toArray(new Plot[0]);
+            ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
+            UUID last = this.owner;
+            owners.add(this.owner);
+            for (Plot current : array) {
+                if (last == null || current.owner.getMostSignificantBits() != last
+                    .getMostSignificantBits()) {
+                    owners.add(current.owner);
+                    last = current.owner;
+                }
+            }
+            return owners.build();
+        }
+        return ImmutableSet.of(this.owner);
     }
-    return this.denied;
-  }
 
-  /**
-   * Set the denied users for this plot.
-   *
-   * @param uuids uuids to deny
-   */
-  public void setDenied(Set<UUID> uuids) {
-    boolean larger = uuids.size() > getDenied().size();
-    HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
-    intersection.retainAll(larger ? uuids : getDenied());
-    uuids.removeAll(intersection);
-    HashSet<UUID> toRemove = new HashSet<>(getDenied());
-    toRemove.removeAll(intersection);
-    for (UUID uuid : toRemove) {
-      removeDenied(uuid);
-    }
-    for (UUID uuid : uuids) {
-      addDenied(uuid);
-    }
-  }
-
-  /**
-   * Get the trusted users.
-   *
-   * @return a set of trusted users
-   */
-  public HashSet<UUID> getTrusted() {
-    if (this.trusted == null) {
-      this.trusted = new HashSet<>();
-    }
-    return this.trusted;
-  }
-
-  /**
-   * Set the trusted users for this plot.
-   *
-   * @param uuids uuids to trust
-   */
-  public void setTrusted(Set<UUID> uuids) {
-    boolean larger = uuids.size() > getTrusted().size();
-    HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
-    intersection.retainAll(larger ? uuids : getTrusted());
-    uuids.removeAll(intersection);
-    HashSet<UUID> toRemove = new HashSet<>(getTrusted());
-    toRemove.removeAll(intersection);
-    for (UUID uuid : toRemove) {
-      removeTrusted(uuid);
-    }
-    for (UUID uuid : uuids) {
-      addTrusted(uuid);
-    }
-  }
-
-  /**
-   * Get the members
-   *
-   * @return a set of members
-   */
-  public HashSet<UUID> getMembers() {
-    if (this.members == null) {
-      this.members = new HashSet<>();
-    }
-    return this.members;
-  }
-
-  /**
-   * Set the members for this plot
-   *
-   * @param uuids uuids to set member status for
-   */
-  public void setMembers(Set<UUID> uuids) {
-    boolean larger = uuids.size() > getMembers().size();
-    HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
-    intersection.retainAll(larger ? uuids : getMembers());
-    uuids.removeAll(intersection);
-    HashSet<UUID> toRemove = new HashSet<>(getMembers());
-    toRemove.removeAll(intersection);
-    for (UUID uuid : toRemove) {
-      removeMember(uuid);
-    }
-    for (UUID uuid : uuids) {
-      addMember(uuid);
-    }
-  }
-
-  /**
-   * Deny someone (updates database as well)
-   *
-   * @param uuid the uuid of the player to deny.
-   */
-  public void addDenied(UUID uuid) {
-    for (Plot current : getConnectedPlots()) {
-      if (current.getDenied().add(uuid)) {
-        DBFunc.setDenied(current, uuid);
-      }
-    }
-  }
-
-  /**
-   * Add someone as a helper (updates database as well)
-   *
-   * @param uuid the uuid of the player to trust
-   */
-  public void addTrusted(UUID uuid) {
-    for (Plot current : getConnectedPlots()) {
-      if (current.getTrusted().add(uuid)) {
-        DBFunc.setTrusted(current, uuid);
-      }
-    }
-  }
-
-  /**
-   * Add someone as a trusted user (updates database as well)
-   *
-   * @param uuid the uuid of the player to add as a member
-   */
-  public void addMember(UUID uuid) {
-    for (Plot current : getConnectedPlots()) {
-      if (current.getMembers().add(uuid)) {
-        DBFunc.setMember(current, uuid);
-      }
-    }
-  }
-
-  /**
-   * Set the plot owner (and update the database)
-   *
-   * @param owner uuid to set as owner
-   */
-  public void setOwner(UUID owner) {
-    if (!hasOwner()) {
-      this.owner = owner;
-      create();
-      return;
-    }
-    if (!isMerged()) {
-      if (!this.owner.equals(owner)) {
-        this.owner = owner;
-        DBFunc.setOwner(this, owner);
-      }
-      return;
-    }
-    for (Plot current : getConnectedPlots()) {
-      if (!owner.equals(current.owner)) {
-        current.owner = owner;
-        DBFunc.setOwner(current, owner);
-      }
-    }
-  }
-
-  /**
-   * Set the plot owner (and update the database)
-   *
-   * @param owner uuid to set as owner
-   * @param initiator player initiating set owner
-   * @return boolean
-   */
-  public boolean setOwner(UUID owner, PlotPlayer initiator) {
-    boolean result = EventUtil.manager
-        .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
-    if (!result) {
-      return false;
-    }
-    if (!hasOwner()) {
-      this.owner = owner;
-      create();
-      return true;
-    }
-    if (!isMerged()) {
-      if (!this.owner.equals(owner)) {
-        this.owner = owner;
-        DBFunc.setOwner(this, owner);
-      }
-      return true;
-    }
-    for (Plot current : getConnectedPlots()) {
-      if (!owner.equals(current.owner)) {
-        current.owner = owner;
-        DBFunc.setOwner(current, owner);
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Clear a plot.
-   *
-   * @param whenDone A runnable to execute when clearing finishes, or null
-   * @see this#clear(boolean, boolean, Runnable)
-   * @see #deletePlot(Runnable) to clear and delete a plot
-   */
-  public void clear(Runnable whenDone) {
-    this.clear(false, false, whenDone);
-  }
-
-  public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
-    if (checkRunning && this.getRunning() != 0) {
-      return false;
-    }
-    if (isDelete) {
-      if (!EventUtil.manager.callDelete(this)) {
+    /**
+     * Check if the player is either the owner or on the trusted/added list.
+     *
+     * @param uuid uuid to check
+     * @return true if the player is added/trusted or is the owner
+     */
+    public boolean isAdded(UUID uuid) {
+        if (this.owner == null || getDenied().contains(uuid)) {
+            return false;
+        }
+        if (isOwner(uuid)) {
+            return true;
+        }
+        if (getMembers().contains(uuid)) {
+            return isOnline();
+        }
+        if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.EVERYONE)) {
+            return true;
+        }
+        if (getMembers().contains(DBFunc.EVERYONE)) {
+            return isOnline();
+        }
         return false;
-      }
-    } else {
-      if (!EventUtil.manager.callClear(this)) {
+    }
+
+    /**
+     * Should the player be denied from entering.
+     *
+     * @param uuid uuid to check
+     * @return boolean false if the player is allowed to enter
+     */
+    public boolean isDenied(UUID uuid) {
+        return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid)
+            || !this.isAdded(uuid) && this.denied.contains(uuid));
+    }
+
+    /**
+     * Get the {@link PlotId}.
+     */
+    @Nonnull public PlotId getId() {
+        return this.id;
+    }
+
+    /**
+     * Get the plot world object for this plot<br> - The generic PlotArea object can be casted to its
+     * respective class for more control (e.g. HybridPlotWorld)
+     *
+     * @return PlotArea
+     */
+    @Nonnull public PlotArea getArea() {
+        return this.area;
+    }
+
+    /**
+     * Assign this plot to a plot area.<br> (Mostly used during startup when worlds are being
+     * created)<br> Note: Using this when it doesn't make sense will result in strange behavior
+     *
+     * @param area area to assign to
+     */
+    public void setArea(@Nonnull PlotArea area) {
+        if (this.getArea() == area) {
+            return;
+        }
+        this.area.removePlot(this.id);
+        this.area = area;
+        area.addPlot(this);
+    }
+
+    /**
+     * Get the plot manager object for this plot<br> - The generic PlotManager object can be casted to
+     * its respective class for more control (e.g. HybridPlotManager)
+     *
+     * @return PlotManager
+     */
+    public PlotManager getManager() {
+        return this.area.getPlotManager();
+    }
+
+    /**
+     * Get or create plot settings.
+     *
+     * @return PlotSettings
+     * @deprecated use equivalent plot method;
+     */
+    @Deprecated @Nonnull public PlotSettings getSettings() {
+        if (this.settings == null) {
+            this.settings = new PlotSettings();
+        }
+        return this.settings;
+    }
+
+    /**
+     * Returns true if the plot is not merged, or it is the base plot of multiple merged plots.
+     *
+     * @return Boolean
+     */
+    public boolean isBasePlot() {
+        return !this.isMerged() || this.equals(this.getBasePlot(false));
+    }
+
+    /**
+     * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
+     * - Merged plots need to be treated as a single plot for most purposes<br> - Some data such as
+     * home location needs to be associated with the group rather than each plot<br> - If the plot is
+     * not merged it will return itself.<br> - The result is cached locally
+     *
+     * @return base Plot
+     */
+    public Plot getBasePlot(boolean recalculate) {
+        if (this.origin != null && !recalculate) {
+            if (this.equals(this.origin)) {
+                return this;
+            }
+            return this.origin.getBasePlot(false);
+        }
+        if (!this.isMerged()) {
+            this.origin = this;
+            return this.origin;
+        }
+        this.origin = this;
+        PlotId min = this.id;
+        for (Plot plot : this.getConnectedPlots()) {
+            if (plot.id.y < min.y || plot.id.y == min.y && plot.id.x < min.x) {
+                this.origin = plot;
+                min = plot.id;
+            }
+        }
+        for (Plot plot : this.getConnectedPlots()) {
+            plot.origin = this.origin;
+        }
+        return this.origin;
+    }
+
+    /**
+     * Check if the plot is merged in any direction.
+     *
+     * @return is the plot merged or not
+     */
+    public boolean isMerged() {
+        return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
+            .getMerged(1) || getSettings().getMerged(3);
+    }
+
+    /**
+     * Get the timestamp of when the plot was created (unreliable)<br> - not accurate if the plot was
+     * created before this was implemented<br> - Milliseconds since the epoch<br>
+     *
+     * @return the creation date of the plot
+     */
+    public long getTimestamp() {
+        if (this.timestamp == 0) {
+            this.timestamp = System.currentTimeMillis();
+        }
+        return this.timestamp;
+    }
+
+    /**
+     * Get if the plot is merged in a direction<br> ------- Actual -------<br> 0 = north<br> 1 =
+     * east<br> 2 = south<br> 3 = west<br> ----- Artificial -----<br> 4 = north-east<br> 5 =
+     * south-east<br> 6 = south-west<br> 7 = north-west<br> ----------<br> Note: A plot that is merged
+     * north and east will not be merged northeast if the northeast plot is not part of the same
+     * group<br>
+     *
+     * @param direction direction to check for merged plot
+     * @return true if merged in that direction
+     */
+    public boolean getMerged(int direction) {
+        if (this.settings == null) {
+            return false;
+        }
+        switch (direction) {
+            case 0:
+            case 1:
+            case 2:
+            case 3:
+                return this.getSettings().getMerged(direction);
+            case 7:
+                int i = direction - 4;
+                int i2 = 0;
+                if (this.getSettings().getMerged(i2)) {
+                    if (this.getSettings().getMerged(i)) {
+                        if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
+                            if (this.area.getPlotAbs(this.id.getRelative(i2)).getMerged(i)) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+                return false;
+            case 4:
+            case 5:
+            case 6:
+                i = direction - 4;
+                i2 = direction - 3;
+                return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
+                    && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
+                    .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
+
+        }
         return false;
-      }
     }
-    final HashSet<RegionWrapper> regions = this.getRegions();
-    final Set<Plot> plots = this.getConnectedPlots();
-    final ArrayDeque<Plot> queue = new ArrayDeque<>(plots);
-    if (isDelete) {
-      this.removeSign();
-    }
-    this.unlinkPlot(true, !isDelete);
-    final PlotManager manager = this.area.getPlotManager();
-    Runnable run = new Runnable() {
-      @Override
-      public void run() {
-        if (queue.isEmpty()) {
-          Runnable run = () -> {
-            for (RegionWrapper region : regions) {
-              Location[] corners = region.getCorners(getWorldName());
-              ChunkManager.manager.clearAllEntities(corners[0], corners[1]);
-            }
-            TaskManager.runTask(whenDone);
-          };
-          for (Plot current : plots) {
-            if (isDelete || current.owner == null) {
-              manager.unclaimPlot(Plot.this.area, current, null);
-            } else {
-              manager.claimPlot(Plot.this.area, current);
-            }
-          }
-          GlobalBlockQueue.IMP.addTask(run);
-          return;
-        }
-        Plot current = queue.poll();
-        if (Plot.this.area.TERRAIN != 0) {
-          ChunkManager.manager
-              .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
-          return;
-        }
-        manager.clearPlot(Plot.this.area, current, this);
-      }
-    };
-    run.run();
-    return true;
-  }
 
-  /**
-   * Set the biome for a plot asynchronously
-   *
-   * @param biome The biome e.g. "forest"
-   * @param whenDone The task to run when finished, or null
-   */
-  public void setBiome(final String biome, final Runnable whenDone) {
-    final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-    final int extendBiome;
-    if (area instanceof SquarePlotWorld) {
-      extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
-    } else {
-      extendBiome = 0;
-    }
-    Runnable run = new Runnable() {
-      @Override
-      public void run() {
-        if (regions.isEmpty()) {
-          Plot.this.refreshChunks();
-          TaskManager.runTask(whenDone);
-          return;
+    /**
+     * Get the denied users.
+     *
+     * @return a set of denied users
+     */
+    public HashSet<UUID> getDenied() {
+        if (this.denied == null) {
+            this.denied = new HashSet<>();
         }
-        RegionWrapper region = regions.poll();
-        Location pos1 = new Location(getWorldName(), region.minX - extendBiome, region.minY,
-            region.minZ - extendBiome);
-        Location pos2 = new Location(getWorldName(), region.maxX + extendBiome, region.maxY,
-            region.maxZ + extendBiome);
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-          @Override
-          public void run(int[] value) {
-            ChunkLoc loc = new ChunkLoc(value[0], value[1]);
-            ChunkManager.manager.loadChunk(getWorldName(), loc, false);
-            MainUtil.setBiome(getWorldName(), value[2], value[3], value[4], value[5],
-                biome);
-            ChunkManager.manager.unloadChunk(getWorldName(), loc, true, true);
-          }
-        }, this, 5);
+        return this.denied;
+    }
 
-      }
-    };
-    run.run();
-  }
+    /**
+     * Set the denied users for this plot.
+     *
+     * @param uuids uuids to deny
+     */
+    public void setDenied(Set<UUID> uuids) {
+        boolean larger = uuids.size() > getDenied().size();
+        HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
+        intersection.retainAll(larger ? uuids : getDenied());
+        uuids.removeAll(intersection);
+        HashSet<UUID> toRemove = new HashSet<>(getDenied());
+        toRemove.removeAll(intersection);
+        for (UUID uuid : toRemove) {
+            removeDenied(uuid);
+        }
+        for (UUID uuid : uuids) {
+            addDenied(uuid);
+        }
+    }
 
-  /**
-   * Unlink the plot and all connected plots.
-   *
-   * @param createSign whether to recreate signs
-   * @param createRoad whether to recreate road
-   * @return success/!cancelled
-   */
-  public boolean unlinkPlot(boolean createRoad, boolean createSign) {
-    if (!this.isMerged()) {
-      return false;
+    /**
+     * Get the trusted users.
+     *
+     * @return a set of trusted users
+     */
+    public HashSet<UUID> getTrusted() {
+        if (this.trusted == null) {
+            this.trusted = new HashSet<>();
+        }
+        return this.trusted;
     }
-    final Set<Plot> plots = this.getConnectedPlots();
-    ArrayList<PlotId> ids = new ArrayList<>(plots.size());
-    for (Plot current : plots) {
-      current.setHome(null);
-      ids.add(current.getId());
+
+    /**
+     * Set the trusted users for this plot.
+     *
+     * @param uuids uuids to trust
+     */
+    public void setTrusted(Set<UUID> uuids) {
+        boolean larger = uuids.size() > getTrusted().size();
+        HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
+        intersection.retainAll(larger ? uuids : getTrusted());
+        uuids.removeAll(intersection);
+        HashSet<UUID> toRemove = new HashSet<>(getTrusted());
+        toRemove.removeAll(intersection);
+        for (UUID uuid : toRemove) {
+            removeTrusted(uuid);
+        }
+        for (UUID uuid : uuids) {
+            addTrusted(uuid);
+        }
     }
-    boolean result = EventUtil.manager.callUnlink(this.area, ids);
-    if (!result) {
-      return false;
+
+    /**
+     * Get the members
+     *
+     * @return a set of members
+     */
+    public HashSet<UUID> getMembers() {
+        if (this.members == null) {
+            this.members = new HashSet<>();
+        }
+        return this.members;
     }
-    this.clearRatings();
-    if (createSign) {
-      this.removeSign();
+
+    /**
+     * Set the members for this plot
+     *
+     * @param uuids uuids to set member status for
+     */
+    public void setMembers(Set<UUID> uuids) {
+        boolean larger = uuids.size() > getMembers().size();
+        HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
+        intersection.retainAll(larger ? uuids : getMembers());
+        uuids.removeAll(intersection);
+        HashSet<UUID> toRemove = new HashSet<>(getMembers());
+        toRemove.removeAll(intersection);
+        for (UUID uuid : toRemove) {
+            removeMember(uuid);
+        }
+        for (UUID uuid : uuids) {
+            addMember(uuid);
+        }
     }
-    PlotManager manager = this.area.getPlotManager();
-    if (createRoad) {
-      manager.startPlotUnlink(this.area, ids);
-    }
-    if (this.area.TERRAIN != 3 && createRoad) {
-      for (Plot current : plots) {
-        if (current.getMerged(1)) {
-          manager.createRoadEast(current.area, current);
-          if (current.getMerged(2)) {
-            manager.createRoadSouth(current.area, current);
-            if (current.getMerged(5)) {
-              manager.createRoadSouthEast(current.area, current);
+
+    /**
+     * Deny someone (updates database as well)
+     *
+     * @param uuid the uuid of the player to deny.
+     */
+    public void addDenied(UUID uuid) {
+        for (Plot current : getConnectedPlots()) {
+            if (current.getDenied().add(uuid)) {
+                DBFunc.setDenied(current, uuid);
             }
-          }
-        } else if (current.getMerged(2)) {
-          manager.createRoadSouth(current.area, current);
         }
-      }
     }
-    for (Plot current : plots) {
-      boolean[] merged = new boolean[]{false, false, false, false};
-      current.setMerged(merged);
+
+    /**
+     * Add someone as a helper (updates database as well)
+     *
+     * @param uuid the uuid of the player to trust
+     */
+    public void addTrusted(UUID uuid) {
+        for (Plot current : getConnectedPlots()) {
+            if (current.getTrusted().add(uuid)) {
+                DBFunc.setTrusted(current, uuid);
+            }
+        }
     }
-    if (createSign) {
-      GlobalBlockQueue.IMP.addTask(() -> {
+
+    /**
+     * Add someone as a trusted user (updates database as well)
+     *
+     * @param uuid the uuid of the player to add as a member
+     */
+    public void addMember(UUID uuid) {
+        for (Plot current : getConnectedPlots()) {
+            if (current.getMembers().add(uuid)) {
+                DBFunc.setMember(current, uuid);
+            }
+        }
+    }
+
+    /**
+     * Set the plot owner (and update the database)
+     *
+     * @param owner uuid to set as owner
+     */
+    public void setOwner(UUID owner) {
+        if (!hasOwner()) {
+            this.owner = owner;
+            create();
+            return;
+        }
+        if (!isMerged()) {
+            if (!this.owner.equals(owner)) {
+                this.owner = owner;
+                DBFunc.setOwner(this, owner);
+            }
+            return;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (!owner.equals(current.owner)) {
+                current.owner = owner;
+                DBFunc.setOwner(current, owner);
+            }
+        }
+    }
+
+    /**
+     * Set the plot owner (and update the database)
+     *
+     * @param owner     uuid to set as owner
+     * @param initiator player initiating set owner
+     * @return boolean
+     */
+    public boolean setOwner(UUID owner, PlotPlayer initiator) {
+        boolean result = EventUtil.manager
+            .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
+        if (!result) {
+            return false;
+        }
+        if (!hasOwner()) {
+            this.owner = owner;
+            create();
+            return true;
+        }
+        if (!isMerged()) {
+            if (!this.owner.equals(owner)) {
+                this.owner = owner;
+                DBFunc.setOwner(this, owner);
+            }
+            return true;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (!owner.equals(current.owner)) {
+                current.owner = owner;
+                DBFunc.setOwner(current, owner);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Clear a plot.
+     *
+     * @param whenDone A runnable to execute when clearing finishes, or null
+     * @see this#clear(boolean, boolean, Runnable)
+     * @see #deletePlot(Runnable) to clear and delete a plot
+     */
+    public void clear(Runnable whenDone) {
+        this.clear(false, false, whenDone);
+    }
+
+    public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
+        if (checkRunning && this.getRunning() != 0) {
+            return false;
+        }
+        if (isDelete) {
+            if (!EventUtil.manager.callDelete(this)) {
+                return false;
+            }
+        } else {
+            if (!EventUtil.manager.callClear(this)) {
+                return false;
+            }
+        }
+        final HashSet<RegionWrapper> regions = this.getRegions();
+        final Set<Plot> plots = this.getConnectedPlots();
+        final ArrayDeque<Plot> queue = new ArrayDeque<>(plots);
+        if (isDelete) {
+            this.removeSign();
+        }
+        this.unlinkPlot(true, !isDelete);
+        final PlotManager manager = this.area.getPlotManager();
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (queue.isEmpty()) {
+                    Runnable run = () -> {
+                        for (RegionWrapper region : regions) {
+                            Location[] corners = region.getCorners(getWorldName());
+                            ChunkManager.manager.clearAllEntities(corners[0], corners[1]);
+                        }
+                        TaskManager.runTask(whenDone);
+                    };
+                    for (Plot current : plots) {
+                        if (isDelete || current.owner == null) {
+                            manager.unclaimPlot(Plot.this.area, current, null);
+                        } else {
+                            manager.claimPlot(Plot.this.area, current);
+                        }
+                    }
+                    GlobalBlockQueue.IMP.addTask(run);
+                    return;
+                }
+                Plot current = queue.poll();
+                if (Plot.this.area.TERRAIN != 0) {
+                    ChunkManager.manager
+                        .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
+                    return;
+                }
+                manager.clearPlot(Plot.this.area, current, this);
+            }
+        };
+        run.run();
+        return true;
+    }
+
+    /**
+     * Set the biome for a plot asynchronously
+     *
+     * @param biome    The biome e.g. "forest"
+     * @param whenDone The task to run when finished, or null
+     */
+    public void setBiome(final String biome, final Runnable whenDone) {
+        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+        final int extendBiome;
+        if (area instanceof SquarePlotWorld) {
+            extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
+        } else {
+            extendBiome = 0;
+        }
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    Plot.this.refreshChunks();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = regions.poll();
+                Location pos1 = new Location(getWorldName(), region.minX - extendBiome, region.minY,
+                    region.minZ - extendBiome);
+                Location pos2 = new Location(getWorldName(), region.maxX + extendBiome, region.maxY,
+                    region.maxZ + extendBiome);
+                ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
+                    @Override public void run(int[] value) {
+                        ChunkLoc loc = new ChunkLoc(value[0], value[1]);
+                        ChunkManager.manager.loadChunk(getWorldName(), loc, false);
+                        MainUtil.setBiome(getWorldName(), value[2], value[3], value[4], value[5],
+                            biome);
+                        ChunkManager.manager.unloadChunk(getWorldName(), loc, true, true);
+                    }
+                }, this, 5);
+
+            }
+        };
+        run.run();
+    }
+
+    /**
+     * Unlink the plot and all connected plots.
+     *
+     * @param createSign whether to recreate signs
+     * @param createRoad whether to recreate road
+     * @return success/!cancelled
+     */
+    public boolean unlinkPlot(boolean createRoad, boolean createSign) {
+        if (!this.isMerged()) {
+            return false;
+        }
+        final Set<Plot> plots = this.getConnectedPlots();
+        ArrayList<PlotId> ids = new ArrayList<>(plots.size());
         for (Plot current : plots) {
-          current.setSign(MainUtil.getName(current.owner));
+            current.setHome(null);
+            ids.add(current.getId());
         }
-      });
-    }
-    if (createRoad) {
-      manager.finishPlotUnlink(this.area, ids);
-    }
-    return true;
-  }
-
-  /**
-   * Set the sign for a plot to a specific name
-   *
-   * @param name name
-   */
-  public void setSign(final String name) {
-    if (!isLoaded()) {
-      return;
-    }
-    if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-      TaskManager.runTask(() -> Plot.this.setSign(name));
-      return;
-    }
-    if (name == null) {
-      PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
-      return;
-    }
-    PlotManager manager = this.area.getPlotManager();
-    if (this.area.ALLOW_SIGNS) {
-      Location loc = manager.getSignLoc(this.area, this);
-      String id = this.id.x + ";" + this.id.y;
-      String[] lines = new String[]{C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
-          C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-          C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-          C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
-      WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
-    }
-  }
-
-  protected boolean isLoaded() {
-    return WorldUtil.IMP.isWorld(getWorldName());
-  }
-
-  /**
-   * This will return null if the plot hasn't been analyzed
-   *
-   * @return analysis of plot
-   */
-  public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
-    return PlotAnalysis.getAnalysis(this, settings);
-  }
-
-  public void analyze(RunnableVal<PlotAnalysis> whenDone) {
-    PlotAnalysis.analyzePlot(this, whenDone);
-  }
-
-  /**
-   * Set a flag for this plot
-   *
-   * @param flag Flag to set
-   * @param value Flag value
-   */
-  public <V> boolean setFlag(Flag<V> flag, Object value) {
-    if (flag == Flags.KEEP && ExpireManager.IMP != null) {
-      ExpireManager.IMP.updateExpired(this);
-    }
-    return FlagManager.addPlotFlag(this, flag, value);
-  }
-
-  /**
-   * Remove a flag from this plot
-   *
-   * @param flag the flag to remove
-   * @return success
-   */
-  public boolean removeFlag(Flag<?> flag) {
-    return FlagManager.removePlotFlag(this, flag);
-  }
-
-  /**
-   * Get the flag for a given key
-   *
-   * @param key Flag to get value for
-   */
-  public <V> Optional<V> getFlag(Flag<V> key) {
-    return FlagManager.getPlotFlag(this, key);
-  }
-
-  /**
-   * Get the flag for a given key
-   *
-   * @param key the flag
-   * @param defaultValue if the key is null, the value to return
-   */
-  public <V> V getFlag(Flag<V> key, V defaultValue) {
-    V value = FlagManager.getPlotFlagRaw(this, key);
-    if (value == null) {
-      return defaultValue;
-    } else {
-      return value;
-    }
-  }
-
-  /**
-   * Delete a plot (use null for the runnable if you don't need to be notified on completion)
-   *
-   * @see PlotSquared#removePlot(Plot, boolean)
-   * @see #clear(Runnable) to simply clear a plot
-   */
-  public boolean deletePlot(final Runnable whenDone) {
-    if (!this.hasOwner()) {
-      return false;
-    }
-    final Set<Plot> plots = this.getConnectedPlots();
-    this.clear(false, true, () -> {
-      for (Plot current : plots) {
-        current.unclaim();
-      }
-      TaskManager.runTask(whenDone);
-    });
-    return true;
-  }
-
-  /**
-   * Count the entities in a plot
-   *
-   * @return array of entity counts
-   * @see ChunkManager#countEntities(Plot) 0 = Entity 1 = Animal 2 = Monster 3 = Mob 4 = Boat 5 =
-   * Misc
-   */
-  public int[] countEntities() {
-    int[] count = new int[6];
-    for (Plot current : this.getConnectedPlots()) {
-      int[] result = ChunkManager.manager.countEntities(current);
-      count[0] += result[0];
-      count[1] += result[1];
-      count[2] += result[2];
-      count[3] += result[3];
-      count[4] += result[4];
-      count[5] += result[5];
-    }
-    return count;
-  }
-
-  /**
-   * Returns true if a previous task was running
-   *
-   * @return true if a previous task is running
-   */
-  public int addRunning() {
-    int value = this.getRunning();
-    for (Plot plot : this.getConnectedPlots()) {
-      plot.setMeta("running", value + 1);
-    }
-    return value;
-  }
-
-  /**
-   * Decrement the number of tracked tasks this plot is running<br> - Used to track/limit the number
-   * of things a player can do on the plot at once
-   *
-   * @return previous number of tasks (int)
-   */
-  public int removeRunning() {
-    int value = this.getRunning();
-    if (value < 2) {
-      for (Plot plot : this.getConnectedPlots()) {
-        plot.deleteMeta("running");
-      }
-    } else {
-      for (Plot plot : this.getConnectedPlots()) {
-        plot.setMeta("running", value - 1);
-      }
-    }
-    return value;
-  }
-
-  /**
-   * Get the number of tracked running tasks for this plot<br> - Used to track/limit the number of
-   * things a player can do on the plot at once
-   *
-   * @return number of tasks (int)
-   */
-  public int getRunning() {
-    Integer value = (Integer) this.getMeta("running");
-    return value == null ? 0 : value;
-  }
-
-  /**
-   * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in
-   * unclaimed plot objects.
-   *
-   * @return false if the Plot has no owner, otherwise true.
-   */
-  public boolean unclaim() {
-    if (this.owner == null) {
-      return false;
-    }
-    for (Plot current : getConnectedPlots()) {
-      List<PlotPlayer> players = current.getPlayersInPlot();
-      for (PlotPlayer pp : players) {
-        PlotListener.plotExit(pp, current);
-      }
-      getArea().removePlot(getId());
-      DBFunc.delete(current);
-      current.owner = null;
-      current.settings = null;
-      for (PlotPlayer pp : players) {
-        PlotListener.plotEntry(pp, current);
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Unlink a plot and remove the roads
-   *
-   * @return true if plot was linked
-   * @see this#unlinkPlot(boolean, boolean)
-   */
-  public boolean unlink() {
-    return this.unlinkPlot(true, true);
-  }
-
-  public Location getCenter() {
-    Location[] corners = getCorners();
-    Location top = corners[0];
-    Location bot = corners[1];
-    Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
-        MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
-    if (!isLoaded()) {
-      return loc;
-    }
-    int y =
-        isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
-    if (area.ALLOW_SIGNS) {
-      y = Math.max(y, getManager().getSignLoc(area, this).getY());
-    }
-    loc.setY(1 + y);
-    return loc;
-  }
-
-  public Location getSide() {
-    RegionWrapper largest = getLargestRegion();
-    int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
-    int z = largest.minZ - 1;
-    PlotManager manager = getManager();
-    int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
-    if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
-      y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
-    }
-    return new Location(getWorldName(), x, y + 1, z);
-  }
-
-  /**
-   * Return the home location for the plot
-   *
-   * @return Home location
-   */
-  public Location getHome() {
-    BlockLoc home = this.getPosition();
-    if (home == null || home.x == 0 && home.z == 0) {
-      return this.getDefaultHome(true);
-    } else {
-      Location bot = this.getBottomAbs();
-      Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
-          bot.getZ() + home.z, home.yaw, home.pitch);
-      if (!isLoaded()) {
-        return loc;
-      }
-      if (!WorldUtil.IMP.getBlock(loc).isAir()) {
-        loc.setY(Math.max(
-            1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
-            bot.getY()));
-      }
-      return loc;
-    }
-  }
-
-  /**
-   * Set the home location
-   *
-   * @param location location to set as home
-   */
-  public void setHome(BlockLoc location) {
-    Plot plot = this.getBasePlot(false);
-    if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
-      return;
-    }
-    plot.getSettings().setPosition(location);
-    if (location != null) {
-      DBFunc.setPosition(plot, plot.getSettings().getPosition().toString());
-      return;
-    }
-    DBFunc.setPosition(plot, null);
-  }
-
-  /**
-   * Get the default home location for a plot<br> - Ignores any home location set for that specific
-   * plot
-   *
-   * @return Location
-   */
-  public Location getDefaultHome() {
-    return getDefaultHome(false);
-  }
-
-  public Location getDefaultHome(boolean member) {
-    Plot plot = this.getBasePlot(false);
-    PlotLoc loc = member ? area.DEFAULT_HOME : area.NONMEMBER_HOME;
-    if (loc != null) {
-      int x;
-      int z;
-      if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
-        // center
-        RegionWrapper largest = plot.getLargestRegion();
-        x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
-        z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
-      } else {
-        // specific
-        Location bot = plot.getBottomAbs();
-        x = bot.getX() + loc.x;
-        z = bot.getZ() + loc.z;
-      }
-      int y = loc.y < 1 ?
-          (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
-          loc.y;
-      PlotSquared.log("Getting home with Y " + y);
-      return new Location(plot.getWorldName(), x, y, z);
-    }
-    // Side
-    return plot.getSide();
-  }
-
-  public double getVolume() {
-    double count = 0;
-    for (RegionWrapper region : getRegions()) {
-      count +=
-          (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
-              * 256;
-    }
-    return count;
-  }
-
-  /**
-   * Get the average rating of the plot. This is the value displayed in /plot info
-   *
-   * @return average rating as double
-   */
-  public double getAverageRating() {
-    double sum = 0;
-    Collection<Rating> ratings = this.getRatings().values();
-    for (Rating rating : ratings) {
-      sum += rating.getAverageRating();
-    }
-    return sum / ratings.size();
-  }
-
-  /**
-   * Set a rating for a user<br> - If the user has already rated, the following will return false
-   *
-   * @param uuid uuid of rater
-   * @param rating rating
-   * @return success
-   */
-  public boolean addRating(UUID uuid, Rating rating) {
-    Plot base = this.getBasePlot(false);
-    PlotSettings baseSettings = base.getSettings();
-    if (baseSettings.getRatings().containsKey(uuid)) {
-      return false;
-    }
-    int aggregate = rating.getAggregate();
-    baseSettings.getRatings().put(uuid, aggregate);
-    DBFunc.setRating(base, uuid, aggregate);
-    return true;
-  }
-
-  /**
-   * Clear the ratings for this plot
-   */
-  public void clearRatings() {
-    Plot base = this.getBasePlot(false);
-    PlotSettings baseSettings = base.getSettings();
-    if (baseSettings.ratings != null && !baseSettings.getRatings().isEmpty()) {
-      DBFunc.deleteRatings(base);
-      baseSettings.ratings = null;
-    }
-  }
-
-  /**
-   * Get the ratings associated with a plot<br> - The rating object may contain multiple categories
-   *
-   * @return Map of user who rated to the rating
-   */
-  public HashMap<UUID, Rating> getRatings() {
-    Plot base = this.getBasePlot(false);
-    HashMap<UUID, Rating> map = new HashMap<>();
-    if (!base.hasRatings()) {
-      return map;
-    }
-    for (Entry<UUID, Integer> entry : base.getSettings().getRatings().entrySet()) {
-      map.put(entry.getKey(), new Rating(entry.getValue()));
-    }
-    return map;
-  }
-
-  public boolean hasRatings() {
-    Plot base = this.getBasePlot(false);
-    return base.settings != null && base.settings.ratings != null;
-  }
-
-  /**
-   * Resend all chunks inside the plot to nearby players<br> This should not need to be called
-   */
-  public void refreshChunks() {
-    LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
-    HashSet<ChunkLoc> chunks = new HashSet<>();
-    for (RegionWrapper region : Plot.this.getRegions()) {
-      for (int x = region.minX >> 4; x <= region.maxX >> 4; x++) {
-        for (int z = region.minZ >> 4; z <= region.maxZ >> 4; z++) {
-          if (chunks.add(new ChunkLoc(x, z))) {
-            queue.refreshChunk(x, z);
-          }
+        boolean result = EventUtil.manager.callUnlink(this.area, ids);
+        if (!result) {
+            return false;
         }
-      }
-    }
-  }
-
-  /**
-   * Remove the plot sign if it is set.
-   */
-  public void removeSign() {
-    PlotManager manager = this.area.getPlotManager();
-    if (!this.area.ALLOW_SIGNS) {
-      return;
-    }
-    Location loc = manager.getSignLoc(this.area, this);
-    LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
-    queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
-    queue.flush();
-  }
-
-  /**
-   * Set the plot sign if plot signs are enabled.
-   */
-  public void setSign() {
-    if (this.owner == null) {
-      this.setSign("unknown");
-      return;
-    }
-    this.setSign(UUIDHandler.getName(this.owner));
-  }
-
-  /**
-   * Register a plot and create it in the database<br> - The plot will not be created if the owner
-   * is null<br> - Any setting from before plot creation will not be saved until the server is
-   * stopped properly. i.e. Set any values/options after plot creation.
-   *
-   * @return true if plot was created successfully
-   */
-  public boolean create() {
-    return this.create(this.owner, true);
-  }
-
-  public boolean claim(final PlotPlayer player, boolean teleport, String schematic) {
-    if (!canClaim(player)) {
-      return false;
-    }
-    return claim(player, teleport, schematic, true);
-  }
-
-  public boolean claim(final PlotPlayer player, boolean teleport, String schematic,
-      boolean updateDB) {
-    boolean result = EventUtil.manager.callClaim(player, this, false);
-    if (updateDB) {
-      if (!result || (!create(player.getUUID(), true))) {
-        return false;
-      }
-    } else {
-      area.addPlot(this);
-    }
-    setSign(player.getName());
-    MainUtil.sendMessage(player, C.CLAIMED);
-    if (teleport) {
-      teleportPlayer(player);
-    }
-    PlotArea plotworld = getArea();
-    if (plotworld.SCHEMATIC_ON_CLAIM) {
-      Schematic sch;
-      try {
-        if (schematic == null || schematic.isEmpty()) {
-          sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-        } else {
-          sch = SchematicHandler.manager.getSchematic(schematic);
-          if (sch == null) {
-            sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-          }
+        this.clearRatings();
+        if (createSign) {
+            this.removeSign();
         }
-      } catch (SchematicHandler.UnsupportedFormatException e) {
-        e.printStackTrace();
-        return true;
-      }
-      SchematicHandler.manager
-          .paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP, new RunnableVal<Boolean>() {
-            @Override
-            public void run(Boolean value) {
-              if (value) {
-                MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
-              } else {
-                MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
-              }
+        PlotManager manager = this.area.getPlotManager();
+        if (createRoad) {
+            manager.startPlotUnlink(this.area, ids);
+        }
+        if (this.area.TERRAIN != 3 && createRoad) {
+            for (Plot current : plots) {
+                if (current.getMerged(1)) {
+                    manager.createRoadEast(current.area, current);
+                    if (current.getMerged(2)) {
+                        manager.createRoadSouth(current.area, current);
+                        if (current.getMerged(5)) {
+                            manager.createRoadSouthEast(current.area, current);
+                        }
+                    }
+                } else if (current.getMerged(2)) {
+                    manager.createRoadSouth(current.area, current);
+                }
             }
-          });
-    }
-    plotworld.getPlotManager().claimPlot(plotworld, this);
-    return true;
-  }
-
-  /**
-   * Register a plot and create it in the database<br> - The plot will not be created if the owner
-   * is null<br> - Any setting from before plot creation will not be saved until the server is
-   * stopped properly. i.e. Set any values/options after plot creation.
-   *
-   * @param uuid the uuid of the plot owner
-   * @param notify notify
-   * @return true if plot was created successfully
-   */
-  public boolean create(final UUID uuid, final boolean notify) {
-    if (uuid == null) {
-      throw new IllegalArgumentException("UUID cannot be null");
-    }
-    this.owner = uuid;
-    Plot existing = this.area.getOwnedPlotAbs(this.id);
-    if (existing != null) {
-      throw new IllegalStateException("Plot already exists!");
-    }
-    if (notify) {
-      Integer meta = (Integer) this.area.getMeta("worldBorder");
-      if (meta != null) {
-        this.updateWorldBorder();
-      }
-    }
-    connected_cache = null;
-    regions_cache = null;
-    this.getTrusted().clear();
-    this.getMembers().clear();
-    this.getDenied().clear();
-    this.settings = new PlotSettings();
-    if (this.area.addPlot(this)) {
-      DBFunc.createPlotAndSettings(this, () -> {
-        PlotArea plotworld = Plot.this.area;
-        if (notify && plotworld.AUTO_MERGE) {
-          Plot.this.autoMerge(-1, Integer.MAX_VALUE, uuid, true);
         }
-      });
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Set components such as border, wall, floor. (components are generator specific)
-   */
-  public boolean setComponent(String component, String blocks) {
-    BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
-    return !(parsed == null || parsed.isEmpty()) && this.setComponent(component, parsed);
-  }
-
-  /**
-   * Retrieve the biome of the plot.
-   *
-   * @return the name of the biome
-   */
-  public String getBiome() {
-    Location loc = this.getCenter();
-    return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
-  }
-
-  /**
-   * Return the top location for the plot.
-   */
-  public Location getTopAbs() {
-    Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
-    top.setWorld(getWorldName());
-    return top;
-  }
-
-  /**
-   * Return the bottom location for the plot.
-   */
-  public Location getBottomAbs() {
-    Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
-    loc.setWorld(getWorldName());
-    return loc;
-  }
-
-  /**
-   * Swap the settings for two plots.
-   *
-   * @param plot the plot to swap data with
-   * @param whenDone the task to run at the end of this method.
-   */
-  public boolean swapData(Plot plot, Runnable whenDone) {
-    if (this.owner == null) {
-      if (plot != null && plot.hasOwner()) {
-        plot.moveData(this, whenDone);
+        for (Plot current : plots) {
+            boolean[] merged = new boolean[] {false, false, false, false};
+            current.setMerged(merged);
+        }
+        if (createSign) {
+            GlobalBlockQueue.IMP.addTask(() -> {
+                for (Plot current : plots) {
+                    current.setSign(MainUtil.getName(current.owner));
+                }
+            });
+        }
+        if (createRoad) {
+            manager.finishPlotUnlink(this.area, ids);
+        }
         return true;
-      }
-      return false;
     }
-    if (plot == null || plot.owner == null) {
-      this.moveData(plot, whenDone);
-      return true;
-    }
-    // Swap cached
-    PlotId temp = new PlotId(this.getId().x, this.getId().y);
-    this.getId().x = plot.getId().x;
-    this.getId().y = plot.getId().y;
-    plot.getId().x = temp.x;
-    plot.getId().y = temp.y;
-    this.area.removePlot(this.getId());
-    plot.area.removePlot(plot.getId());
-    this.getId().recalculateHash();
-    plot.getId().recalculateHash();
-    this.area.addPlotAbs(this);
-    plot.area.addPlotAbs(plot);
-    // Swap database
-    DBFunc.swapPlots(plot, this);
-    TaskManager.runTaskLater(whenDone, 1);
-    return true;
-  }
 
-  /**
-   * Move the settings for a plot.
-   *
-   * @param plot the plot to move
-   */
-  public boolean moveData(Plot plot, Runnable whenDone) {
-    if (this.owner == null) {
-      PlotSquared.debug(plot + " is unowned (single)");
-      TaskManager.runTask(whenDone);
-      return false;
+    /**
+     * Set the sign for a plot to a specific name
+     *
+     * @param name name
+     */
+    public void setSign(final String name) {
+        if (!isLoaded()) {
+            return;
+        }
+        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+            TaskManager.runTask(() -> Plot.this.setSign(name));
+            return;
+        }
+        if (name == null) {
+            PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
+            return;
+        }
+        PlotManager manager = this.area.getPlotManager();
+        if (this.area.ALLOW_SIGNS) {
+            Location loc = manager.getSignLoc(this.area, this);
+            String id = this.id.x + ";" + this.id.y;
+            String[] lines = new String[] {C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
+                C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
+                C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
+                C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
+            WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
+        }
     }
-    if (plot.hasOwner()) {
-      PlotSquared.debug(plot + " is unowned (multi)");
-      TaskManager.runTask(whenDone);
-      return false;
-    }
-    this.area.removePlot(this.id);
-    this.getId().x = plot.getId().x;
-    this.getId().y = plot.getId().y;
-    this.getId().recalculateHash();
-    this.area.addPlotAbs(this);
-    DBFunc.movePlot(this, plot);
-    TaskManager.runTaskLater(whenDone, 1);
-    return true;
-  }
 
-  /**
-   * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like
-   * each plot treated as a small plot use getPlotTopLocAbs(...)
-   *
-   * @return Location top of mega plot
-   */
-  public Location getExtendedTopAbs() {
-    Location top = this.getTopAbs();
-    if (!this.isMerged()) {
-      return top;
+    protected boolean isLoaded() {
+        return WorldUtil.IMP.isWorld(getWorldName());
     }
-    if (this.getMerged(2)) {
-      top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
+
+    /**
+     * This will return null if the plot hasn't been analyzed
+     *
+     * @return analysis of plot
+     */
+    public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
+        return PlotAnalysis.getAnalysis(this, settings);
     }
-    if (this.getMerged(1)) {
-      top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
+
+    public void analyze(RunnableVal<PlotAnalysis> whenDone) {
+        PlotAnalysis.analyzePlot(this, whenDone);
     }
-    return top;
-  }
 
-  /**
-   * Gets the bottom location for a plot.<br> - Does not respect mega plots<br> - Merged plots, only
-   * the road will be considered part of the plot<br>
-   *
-   * @return Location bottom of mega plot
-   */
-  public Location getExtendedBottomAbs() {
-    Location bot = this.getBottomAbs();
-    if (!this.isMerged()) {
-      return bot;
+    /**
+     * Set a flag for this plot
+     *
+     * @param flag  Flag to set
+     * @param value Flag value
+     */
+    public <V> boolean setFlag(Flag<V> flag, Object value) {
+        if (flag == Flags.KEEP && ExpireManager.IMP != null) {
+            ExpireManager.IMP.updateExpired(this);
+        }
+        return FlagManager.addPlotFlag(this, flag, value);
     }
-    if (this.getMerged(0)) {
-      bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
+
+    /**
+     * Remove a flag from this plot
+     *
+     * @param flag the flag to remove
+     * @return success
+     */
+    public boolean removeFlag(Flag<?> flag) {
+        return FlagManager.removePlotFlag(this, flag);
     }
-    if (this.getMerged(3)) {
-      bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
+
+    /**
+     * Get the flag for a given key
+     *
+     * @param key Flag to get value for
+     */
+    public <V> Optional<V> getFlag(Flag<V> key) {
+        return FlagManager.getPlotFlag(this, key);
     }
-    return bot;
-  }
 
-  /**
-   * Returns the top and bottom location.<br> - If the plot is not connected, it will return its own
-   * corners<br> - the returned locations will not necessarily correspond to claimed plots if the
-   * connected plots do not form a rectangular shape
-   *
-   * @return new Location[] { bottom, top }
-   * @deprecated as merged plots no longer need to be rectangular
-   */
-  @Deprecated
-  public Location[] getCorners() {
-    if (!this.isMerged()) {
-      return new Location[]{this.getBottomAbs(), this.getTopAbs()};
-    }
-    return MainUtil.getCorners(this.getWorldName(), this.getRegions());
-  }
-
-  /**
-   * Remove the east road section of a plot<br> - Used when a plot is merged<br>
-   */
-  public void removeRoadEast() {
-    if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-      if (this.area.TERRAIN == 3) {
-        return;
-      }
-      Plot other = this.getRelative(1);
-      Location bot = other.getBottomAbs();
-      Location top = this.getTopAbs();
-      Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
-      Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
-      ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-    } else {
-      this.area.getPlotManager().removeRoadEast(this.area, this);
-    }
-  }
-
-  /**
-   * @deprecated in favor of getCorners()[0];<br>
-   */
-  // Won't remove as suggestion also points to deprecated method
-  @Deprecated
-  public Location getBottom() {
-    return this.getCorners()[0];
-  }
-
-  /**
-   * @return the top corner of the plot
-   * @deprecated in favor of getCorners()[1];
-   */
-  // Won't remove as suggestion also points to deprecated method
-  @Deprecated
-  public Location getTop() {
-    return this.getCorners()[1];
-  }
-
-  /**
-   * Swap the plot contents and settings with another location<br> - The destination must correspond
-   * to a valid plot of equal dimensions
-   *
-   * @param destination The other plot to swap with
-   * @param whenDone A task to run when finished, or null
-   * @return boolean if swap was successful
-   * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain
-   * @see this#swapData(Plot, Runnable) to swap plot settings
-   * @see this#swapData(Plot, Runnable)
-   */
-  public boolean swap(Plot destination, Runnable whenDone) {
-    return this.move(destination, whenDone, true);
-  }
-
-  /**
-   * Move the plot to an empty location<br> - The location must be empty
-   *
-   * @param destination Where to move the plot
-   * @param whenDone A task to run when done, or null
-   * @return if the move was successful
-   */
-  public boolean move(Plot destination, Runnable whenDone) {
-    return this.move(destination, whenDone, false);
-  }
-
-  /**
-   * Get plot display name.
-   *
-   * @return alias if set, else id
-   */
-  @Override
-  public String toString() {
-    if (this.settings != null && this.settings.getAlias().length() > 1) {
-      return this.settings.getAlias();
-    }
-    return this.area + ";" + this.id.x + ";" + this.id.y;
-  }
-
-
-  /**
-   * Remove a denied player (use DBFunc as well)<br> Using the * uuid will remove all users
-   */
-  public boolean removeDenied(UUID uuid) {
-    if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
-      boolean result = false;
-      for (UUID other : new HashSet<>(getDenied())) {
-        result = rmvDenied(other) || result;
-      }
-      return result;
-    }
-    return rmvDenied(uuid);
-  }
-
-  private boolean rmvDenied(UUID uuid) {
-    for (Plot current : this.getConnectedPlots()) {
-      if (current.getDenied().remove(uuid)) {
-        DBFunc.removeDenied(current, uuid);
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Remove a helper (use DBFunc as well)<br> Using the * uuid will remove all users
-   */
-  public boolean removeTrusted(UUID uuid) {
-    if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
-      boolean result = false;
-      for (UUID other : new HashSet<>(getTrusted())) {
-        result = rmvTrusted(other) || result;
-      }
-      return result;
-    }
-    return rmvTrusted(uuid);
-  }
-
-  private boolean rmvTrusted(UUID uuid) {
-    for (Plot plot : this.getConnectedPlots()) {
-      if (plot.getTrusted().remove(uuid)) {
-        DBFunc.removeTrusted(plot, uuid);
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Remove a trusted user (use DBFunc as well)<br> Using the * uuid will remove all users
-   */
-  public boolean removeMember(UUID uuid) {
-    if (this.members == null) {
-      return false;
-    }
-    if (uuid == DBFunc.EVERYONE && !members.contains(uuid)) {
-      boolean result = false;
-      for (UUID other : new HashSet<>(this.members)) {
-        result = rmvMember(other) || result;
-      }
-      return result;
-    }
-    return rmvMember(uuid);
-  }
-
-  private boolean rmvMember(UUID uuid) {
-    for (Plot current : this.getConnectedPlots()) {
-      if (current.getMembers().remove(uuid)) {
-        DBFunc.removeMember(current, uuid);
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Export the plot as a schematic to the configured output directory.
-   */
-  public void export(final RunnableVal<Boolean> whenDone) {
-    SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
-      @Override
-      public void run(final CompoundTag value) {
+    /**
+     * Get the flag for a given key
+     *
+     * @param key          the flag
+     * @param defaultValue if the key is null, the value to return
+     */
+    public <V> V getFlag(Flag<V> key, V defaultValue) {
+        V value = FlagManager.getPlotFlagRaw(this, key);
         if (value == null) {
-          if (whenDone != null) {
-            whenDone.value = false;
-            TaskManager.runTask(whenDone);
-          }
+            return defaultValue;
         } else {
-          TaskManager.runTaskAsync(() -> {
-            String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
-                .getName(Plot.this.owner);
-            boolean result = SchematicHandler.manager.save(value,
-                Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
-            if (whenDone != null) {
-              whenDone.value = result;
-              TaskManager.runTask(whenDone);
+            return value;
+        }
+    }
+
+    /**
+     * Delete a plot (use null for the runnable if you don't need to be notified on completion)
+     *
+     * @see PlotSquared#removePlot(Plot, boolean)
+     * @see #clear(Runnable) to simply clear a plot
+     */
+    public boolean deletePlot(final Runnable whenDone) {
+        if (!this.hasOwner()) {
+            return false;
+        }
+        final Set<Plot> plots = this.getConnectedPlots();
+        this.clear(false, true, () -> {
+            for (Plot current : plots) {
+                current.unclaim();
             }
-          });
+            TaskManager.runTask(whenDone);
+        });
+        return true;
+    }
+
+    /**
+     * Count the entities in a plot
+     *
+     * @return array of entity counts
+     * @see ChunkManager#countEntities(Plot) 0 = Entity 1 = Animal 2 = Monster 3 = Mob 4 = Boat 5 =
+     * Misc
+     */
+    public int[] countEntities() {
+        int[] count = new int[6];
+        for (Plot current : this.getConnectedPlots()) {
+            int[] result = ChunkManager.manager.countEntities(current);
+            count[0] += result[0];
+            count[1] += result[1];
+            count[2] += result[2];
+            count[3] += result[3];
+            count[4] += result[4];
+            count[5] += result[5];
         }
-      }
-    });
-  }
-
-  /**
-   * Upload the plot as a schematic to the configured web interface.
-   *
-   * @param whenDone value will be null if uploading fails
-   */
-  public void upload(final RunnableVal<URL> whenDone) {
-    SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
-      @Override
-      public void run(CompoundTag value) {
-        SchematicHandler.manager.upload(value, null, null, whenDone);
-      }
-    });
-  }
-
-  /**
-   * Upload this plot as a world file<br> - The mca files are each 512x512, so depending on the plot
-   * size it may also download adjacent plots<br> - Works best when (plot width + road width) % 512
-   * == 0<br>
-   *
-   * @see WorldUtil
-   */
-  public void uploadWorld(RunnableVal<URL> whenDone) {
-    WorldUtil.IMP.upload(this, null, null, whenDone);
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
+        return count;
     }
-    if (obj == null) {
-      return false;
-    }
-    if (this.getClass() != obj.getClass()) {
-      return false;
-    }
-    Plot other = (Plot) obj;
-    return this.hashCode() == other.hashCode() && this.id.equals(other.id)
-        && this.area == other.area;
-  }
 
-  /**
-   * Get the plot hashcode<br> Note: The hashcode is unique if:<br> - Plots are in the same
-   * world<br> - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
-   *
-   * @return integer.
-   */
-  @Override
-  public int hashCode() {
-    return this.id.hashCode();
-  }
-
-  /**
-   * Get the flags specific to this plot<br> - Does not take default flags into account<br>
-   */
-  public HashMap<Flag<?>, Object> getFlags() {
-    return this.getSettings().flags;
-  }
-
-  /**
-   * Set a flag for this plot.
-   */
-  public void setFlags(HashMap<Flag<?>, Object> flags) {
-    FlagManager.setPlotFlags(this, flags);
-  }
-
-  /**
-   * Get the plot alias. - Returns an empty string if no alias is set
-   *
-   * @return The plot alias
-   */
-  public String getAlias() {
-    if (this.settings == null) {
-      return "";
-    }
-    return this.settings.getAlias();
-  }
-
-  /**
-   * Set the plot alias.
-   *
-   * @param alias The alias
-   */
-  public void setAlias(String alias) {
-    for (Plot current : this.getConnectedPlots()) {
-      String name = this.getSettings().getAlias();
-      if (alias == null) {
-        alias = "";
-      }
-      if (name.equals(alias)) {
-        return;
-      }
-      current.getSettings().setAlias(alias);
-      DBFunc.setAlias(current, alias);
-    }
-  }
-
-  /**
-   * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> ----------<br> 0 =
-   * north<br> 1 = east<br> 2 = south<br> 3 = west<br> ----------<br>
-   */
-  private void setMerged(int direction, boolean value) {
-    if (this.getSettings().setMerged(direction, value)) {
-      if (value) {
-        Plot other = this.getRelative(direction).getBasePlot(false);
-        if (!other.equals(this.getBasePlot(false))) {
-          Plot base = other.id.y < this.id.y
-              || other.id.y == this.id.y && other.id.x < this.id.x ? other : this.origin;
-          this.origin.origin = base;
-          other.origin = base;
-          this.origin = base;
-          connected_cache = null;
+    /**
+     * Returns true if a previous task was running
+     *
+     * @return true if a previous task is running
+     */
+    public int addRunning() {
+        int value = this.getRunning();
+        for (Plot plot : this.getConnectedPlots()) {
+            plot.setMeta("running", value + 1);
         }
-      } else {
-        if (this.origin != null) {
-          this.origin.origin = null;
-          this.origin = null;
+        return value;
+    }
+
+    /**
+     * Decrement the number of tracked tasks this plot is running<br> - Used to track/limit the number
+     * of things a player can do on the plot at once
+     *
+     * @return previous number of tasks (int)
+     */
+    public int removeRunning() {
+        int value = this.getRunning();
+        if (value < 2) {
+            for (Plot plot : this.getConnectedPlots()) {
+                plot.deleteMeta("running");
+            }
+        } else {
+            for (Plot plot : this.getConnectedPlots()) {
+                plot.setMeta("running", value - 1);
+            }
+        }
+        return value;
+    }
+
+    /**
+     * Get the number of tracked running tasks for this plot<br> - Used to track/limit the number of
+     * things a player can do on the plot at once
+     *
+     * @return number of tasks (int)
+     */
+    public int getRunning() {
+        Integer value = (Integer) this.getMeta("running");
+        return value == null ? 0 : value;
+    }
+
+    /**
+     * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in
+     * unclaimed plot objects.
+     *
+     * @return false if the Plot has no owner, otherwise true.
+     */
+    public boolean unclaim() {
+        if (this.owner == null) {
+            return false;
+        }
+        for (Plot current : getConnectedPlots()) {
+            List<PlotPlayer> players = current.getPlayersInPlot();
+            for (PlotPlayer pp : players) {
+                PlotListener.plotExit(pp, current);
+            }
+            getArea().removePlot(getId());
+            DBFunc.delete(current);
+            current.owner = null;
+            current.settings = null;
+            for (PlotPlayer pp : players) {
+                PlotListener.plotEntry(pp, current);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Unlink a plot and remove the roads
+     *
+     * @return true if plot was linked
+     * @see this#unlinkPlot(boolean, boolean)
+     */
+    public boolean unlink() {
+        return this.unlinkPlot(true, true);
+    }
+
+    public Location getCenter() {
+        Location[] corners = getCorners();
+        Location top = corners[0];
+        Location bot = corners[1];
+        Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
+            MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
+        if (!isLoaded()) {
+            return loc;
+        }
+        int y =
+            isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
+        if (area.ALLOW_SIGNS) {
+            y = Math.max(y, getManager().getSignLoc(area, this).getY());
+        }
+        loc.setY(1 + y);
+        return loc;
+    }
+
+    public Location getSide() {
+        RegionWrapper largest = getLargestRegion();
+        int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
+        int z = largest.minZ - 1;
+        PlotManager manager = getManager();
+        int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
+        if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
+            y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
+        }
+        return new Location(getWorldName(), x, y + 1, z);
+    }
+
+    /**
+     * Return the home location for the plot
+     *
+     * @return Home location
+     */
+    public Location getHome() {
+        BlockLoc home = this.getPosition();
+        if (home == null || home.x == 0 && home.z == 0) {
+            return this.getDefaultHome(true);
+        } else {
+            Location bot = this.getBottomAbs();
+            Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
+                bot.getZ() + home.z, home.yaw, home.pitch);
+            if (!isLoaded()) {
+                return loc;
+            }
+            if (!WorldUtil.IMP.getBlock(loc).isAir()) {
+                loc.setY(Math.max(
+                    1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
+                    bot.getY()));
+            }
+            return loc;
+        }
+    }
+
+    /**
+     * Set the home location
+     *
+     * @param location location to set as home
+     */
+    public void setHome(BlockLoc location) {
+        Plot plot = this.getBasePlot(false);
+        if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
+            return;
+        }
+        plot.getSettings().setPosition(location);
+        if (location != null) {
+            DBFunc.setPosition(plot, plot.getSettings().getPosition().toString());
+            return;
+        }
+        DBFunc.setPosition(plot, null);
+    }
+
+    /**
+     * Get the default home location for a plot<br> - Ignores any home location set for that specific
+     * plot
+     *
+     * @return Location
+     */
+    public Location getDefaultHome() {
+        return getDefaultHome(false);
+    }
+
+    public Location getDefaultHome(boolean member) {
+        Plot plot = this.getBasePlot(false);
+        PlotLoc loc = member ? area.DEFAULT_HOME : area.NONMEMBER_HOME;
+        if (loc != null) {
+            int x;
+            int z;
+            if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
+                // center
+                RegionWrapper largest = plot.getLargestRegion();
+                x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
+                z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
+            } else {
+                // specific
+                Location bot = plot.getBottomAbs();
+                x = bot.getX() + loc.x;
+                z = bot.getZ() + loc.z;
+            }
+            int y = loc.y < 1 ?
+                (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
+                loc.y;
+            PlotSquared.log("Getting home with Y " + y);
+            return new Location(plot.getWorldName(), x, y, z);
+        }
+        // Side
+        return plot.getSide();
+    }
+
+    public double getVolume() {
+        double count = 0;
+        for (RegionWrapper region : getRegions()) {
+            count +=
+                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
+                    * 256;
+        }
+        return count;
+    }
+
+    /**
+     * Get the average rating of the plot. This is the value displayed in /plot info
+     *
+     * @return average rating as double
+     */
+    public double getAverageRating() {
+        double sum = 0;
+        Collection<Rating> ratings = this.getRatings().values();
+        for (Rating rating : ratings) {
+            sum += rating.getAverageRating();
+        }
+        return sum / ratings.size();
+    }
+
+    /**
+     * Set a rating for a user<br> - If the user has already rated, the following will return false
+     *
+     * @param uuid   uuid of rater
+     * @param rating rating
+     * @return success
+     */
+    public boolean addRating(UUID uuid, Rating rating) {
+        Plot base = this.getBasePlot(false);
+        PlotSettings baseSettings = base.getSettings();
+        if (baseSettings.getRatings().containsKey(uuid)) {
+            return false;
+        }
+        int aggregate = rating.getAggregate();
+        baseSettings.getRatings().put(uuid, aggregate);
+        DBFunc.setRating(base, uuid, aggregate);
+        return true;
+    }
+
+    /**
+     * Clear the ratings for this plot
+     */
+    public void clearRatings() {
+        Plot base = this.getBasePlot(false);
+        PlotSettings baseSettings = base.getSettings();
+        if (baseSettings.ratings != null && !baseSettings.getRatings().isEmpty()) {
+            DBFunc.deleteRatings(base);
+            baseSettings.ratings = null;
+        }
+    }
+
+    /**
+     * Get the ratings associated with a plot<br> - The rating object may contain multiple categories
+     *
+     * @return Map of user who rated to the rating
+     */
+    public HashMap<UUID, Rating> getRatings() {
+        Plot base = this.getBasePlot(false);
+        HashMap<UUID, Rating> map = new HashMap<>();
+        if (!base.hasRatings()) {
+            return map;
+        }
+        for (Entry<UUID, Integer> entry : base.getSettings().getRatings().entrySet()) {
+            map.put(entry.getKey(), new Rating(entry.getValue()));
+        }
+        return map;
+    }
+
+    public boolean hasRatings() {
+        Plot base = this.getBasePlot(false);
+        return base.settings != null && base.settings.ratings != null;
+    }
+
+    /**
+     * Resend all chunks inside the plot to nearby players<br> This should not need to be called
+     */
+    public void refreshChunks() {
+        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
+        HashSet<ChunkLoc> chunks = new HashSet<>();
+        for (RegionWrapper region : Plot.this.getRegions()) {
+            for (int x = region.minX >> 4; x <= region.maxX >> 4; x++) {
+                for (int z = region.minZ >> 4; z <= region.maxZ >> 4; z++) {
+                    if (chunks.add(new ChunkLoc(x, z))) {
+                        queue.refreshChunk(x, z);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Remove the plot sign if it is set.
+     */
+    public void removeSign() {
+        PlotManager manager = this.area.getPlotManager();
+        if (!this.area.ALLOW_SIGNS) {
+            return;
+        }
+        Location loc = manager.getSignLoc(this.area, this);
+        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
+        queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
+        queue.flush();
+    }
+
+    /**
+     * Set the plot sign if plot signs are enabled.
+     */
+    public void setSign() {
+        if (this.owner == null) {
+            this.setSign("unknown");
+            return;
+        }
+        this.setSign(UUIDHandler.getName(this.owner));
+    }
+
+    /**
+     * Register a plot and create it in the database<br> - The plot will not be created if the owner
+     * is null<br> - Any setting from before plot creation will not be saved until the server is
+     * stopped properly. i.e. Set any values/options after plot creation.
+     *
+     * @return true if plot was created successfully
+     */
+    public boolean create() {
+        return this.create(this.owner, true);
+    }
+
+    public boolean claim(final PlotPlayer player, boolean teleport, String schematic) {
+        if (!canClaim(player)) {
+            return false;
+        }
+        return claim(player, teleport, schematic, true);
+    }
+
+    public boolean claim(final PlotPlayer player, boolean teleport, String schematic,
+        boolean updateDB) {
+        boolean result = EventUtil.manager.callClaim(player, this, false);
+        if (updateDB) {
+            if (!result || (!create(player.getUUID(), true))) {
+                return false;
+            }
+        } else {
+            area.addPlot(this);
+        }
+        setSign(player.getName());
+        MainUtil.sendMessage(player, C.CLAIMED);
+        if (teleport) {
+            teleportPlayer(player);
+        }
+        PlotArea plotworld = getArea();
+        if (plotworld.SCHEMATIC_ON_CLAIM) {
+            Schematic sch;
+            try {
+                if (schematic == null || schematic.isEmpty()) {
+                    sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
+                } else {
+                    sch = SchematicHandler.manager.getSchematic(schematic);
+                    if (sch == null) {
+                        sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
+                    }
+                }
+            } catch (SchematicHandler.UnsupportedFormatException e) {
+                e.printStackTrace();
+                return true;
+            }
+            SchematicHandler.manager.paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP,
+                new RunnableVal<Boolean>() {
+                    @Override public void run(Boolean value) {
+                        if (value) {
+                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                        } else {
+                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                        }
+                    }
+                });
+        }
+        plotworld.getPlotManager().claimPlot(plotworld, this);
+        return true;
+    }
+
+    /**
+     * Register a plot and create it in the database<br> - The plot will not be created if the owner
+     * is null<br> - Any setting from before plot creation will not be saved until the server is
+     * stopped properly. i.e. Set any values/options after plot creation.
+     *
+     * @param uuid   the uuid of the plot owner
+     * @param notify notify
+     * @return true if plot was created successfully
+     */
+    public boolean create(final UUID uuid, final boolean notify) {
+        if (uuid == null) {
+            throw new IllegalArgumentException("UUID cannot be null");
+        }
+        this.owner = uuid;
+        Plot existing = this.area.getOwnedPlotAbs(this.id);
+        if (existing != null) {
+            throw new IllegalStateException("Plot already exists!");
+        }
+        if (notify) {
+            Integer meta = (Integer) this.area.getMeta("worldBorder");
+            if (meta != null) {
+                this.updateWorldBorder();
+            }
         }
         connected_cache = null;
-      }
-      DBFunc.setMerged(this, this.getSettings().getMerged());
-      regions_cache = null;
-    }
-  }
-
-  /**
-   * Get the merged array.
-   *
-   * @return boolean [ north, east, south, west ]
-   */
-  public boolean[] getMerged() {
-    return this.getSettings().getMerged();
-  }
-
-  /**
-   * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> Get if the plot is
-   * merged in a direction<br> ----------<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
-   * ----------<br> Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
-   */
-  public void setMerged(boolean[] merged) {
-    this.getSettings().setMerged(merged);
-    DBFunc.setMerged(this, merged);
-    clearCache();
-  }
-
-  private void clearCache() {
-    connected_cache = null;
-    regions_cache = null;
-    if (this.origin != null) {
-      this.origin.origin = null;
-      this.origin = null;
-    }
-  }
-
-  /**
-   * Get the set home location or 0,0,0 if no location is set<br> - Does not take the default home
-   * location into account
-   *
-   * @see #getHome()
-   */
-  public BlockLoc getPosition() {
-    return this.getSettings().getPosition();
-  }
-
-  /**
-   * Check if a plot can be claimed by the provided player.
-   *
-   * @param player the claiming player
-   */
-  public boolean canClaim(@Nullable PlotPlayer player) {
-    PlotCluster cluster = this.getCluster();
-    if (cluster != null && player != null) {
-      if (!cluster.isAdded(player.getUUID()) && !Permissions
-          .hasPermission(player, "plots.admin.command.claim")) {
+        regions_cache = null;
+        this.getTrusted().clear();
+        this.getMembers().clear();
+        this.getDenied().clear();
+        this.settings = new PlotSettings();
+        if (this.area.addPlot(this)) {
+            DBFunc.createPlotAndSettings(this, () -> {
+                PlotArea plotworld = Plot.this.area;
+                if (notify && plotworld.AUTO_MERGE) {
+                    Plot.this.autoMerge(-1, Integer.MAX_VALUE, uuid, true);
+                }
+            });
+            return true;
+        }
         return false;
-      }
     }
-    return this.guessOwner() == null && !isMerged();
-  }
 
-  /**
-   * Guess the owner of a plot either by the value in memory, or the sign data<br> Note: Recovering
-   * from sign information is useful if e.g. PlotMe conversion wasn't successful
-   *
-   * @return UUID
-   */
-  public UUID guessOwner() {
-    if (this.hasOwner()) {
-      return this.owner;
+    /**
+     * Set components such as border, wall, floor. (components are generator specific)
+     */
+    public boolean setComponent(String component, String blocks) {
+        BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
+        return !(parsed == null || parsed.isEmpty()) && this.setComponent(component, parsed);
     }
-    if (!this.area.ALLOW_SIGNS) {
-      return null;
+
+    /**
+     * Retrieve the biome of the plot.
+     *
+     * @return the name of the biome
+     */
+    public String getBiome() {
+        Location loc = this.getCenter();
+        return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
     }
-    try {
-      final Location loc = this.getManager().getSignLoc(this.area, this);
-      String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
-        @Override
-        public void run(String[] value) {
-          ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
-          this.value = WorldUtil.IMP.getSign(loc);
-        }
-      });
-      if (lines == null) {
-        return null;
-      }
-      loop:
-      for (int i = 4; i > 0; i--) {
-        String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
-        int index = caption.indexOf("%plr%");
-        if (index < 0) {
-          continue;
-        }
-        String line = lines[i - 1];
-        if (line.length() <= index) {
-          return null;
-        }
-        String name = line.substring(index);
-        if (name.isEmpty()) {
-          return null;
-        }
-        UUID owner = UUIDHandler.getUUID(name, null);
-        if (owner != null) {
-          this.owner = owner;
-          break;
-        }
-        if (lines[i - 1].length() == 15) {
-          BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
-          for (Entry<StringWrapper, UUID> entry : map.entrySet()) {
-            String key = entry.getKey().value;
-            if (key.length() > name.length() && key.startsWith(name)) {
-              this.owner = entry.getValue();
-              break loop;
+
+    /**
+     * Return the top location for the plot.
+     */
+    public Location getTopAbs() {
+        Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
+        top.setWorld(getWorldName());
+        return top;
+    }
+
+    /**
+     * Return the bottom location for the plot.
+     */
+    public Location getBottomAbs() {
+        Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
+        loc.setWorld(getWorldName());
+        return loc;
+    }
+
+    /**
+     * Swap the settings for two plots.
+     *
+     * @param plot     the plot to swap data with
+     * @param whenDone the task to run at the end of this method.
+     */
+    public boolean swapData(Plot plot, Runnable whenDone) {
+        if (this.owner == null) {
+            if (plot != null && plot.hasOwner()) {
+                plot.moveData(this, whenDone);
+                return true;
             }
-          }
+            return false;
         }
-        this.owner = UUID.nameUUIDFromBytes(
-            ("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
-        break;
-      }
-      if (this.hasOwner()) {
-        this.create();
-      }
-      return this.owner;
-    } catch (IllegalArgumentException ignored) {
-      return null;
-    }
-  }
-
-  /**
-   * Remove the south road section of a plot<br> - Used when a plot is merged<br>
-   */
-  public void removeRoadSouth() {
-    if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-      if (this.area.TERRAIN == 3) {
-        return;
-      }
-      Plot other = this.getRelative(2);
-      Location bot = other.getBottomAbs();
-      Location top = this.getTopAbs();
-      Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
-      Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
-      ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-    } else {
-      this.getManager().removeRoadSouth(this.area, this);
-    }
-  }
-
-  /**
-   * Auto merge a plot in a specific direction<br>
-   *
-   * @param dir The direction to merge<br> -1 = All directions<br> 0 = north<br> 1 = east<br> 2 =
-   * south<br> 3 = west<br>
-   * @param max The max number of merges to do
-   * @param uuid The UUID it is allowed to merge with
-   * @param removeRoads Whether to remove roads
-   * @return true if a merge takes place
-   */
-  public boolean autoMerge(int dir, int max, UUID uuid, boolean removeRoads) {
-    if (this.owner == null) {
-      return false;
-    }
-    if (!EventUtil.manager.callMerge(this, dir, max)) {
-      return false;
-    }
-    HashSet<Plot> visited = new HashSet<>();
-    HashSet<PlotId> merged = new HashSet<>();
-    Set<Plot> connected = this.getConnectedPlots();
-    for (Plot current : connected) {
-      merged.add(current.getId());
-    }
-    ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
-    Plot current;
-    boolean toReturn = false;
-    while ((current = frontier.poll()) != null && max >= 0) {
-      if (visited.contains(current)) {
-        continue;
-      }
-      visited.add(current);
-      Set<Plot> plots;
-      if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
-        Plot other = current.getRelative(0);
-        if (other != null && other.isOwner(uuid) && (
-            other.getBasePlot(false).equals(current.getBasePlot(false))
-                || (plots = other.getConnectedPlots()).size() <= max && frontier
-                .addAll(plots) && (max -= plots.size()) != -1)) {
-          current.mergePlot(other, removeRoads);
-          merged.add(current.getId());
-          merged.add(other.getId());
-          toReturn = true;
+        if (plot == null || plot.owner == null) {
+            this.moveData(plot, whenDone);
+            return true;
         }
-      }
-      if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
-        Plot other = current.getRelative(1);
-        if (other != null && other.isOwner(uuid) && (
-            other.getBasePlot(false).equals(current.getBasePlot(false))
-                || (plots = other.getConnectedPlots()).size() <= max && frontier
-                .addAll(plots) && (max -= plots.size()) != -1)) {
-          current.mergePlot(other, removeRoads);
-          merged.add(current.getId());
-          merged.add(other.getId());
-          toReturn = true;
-        }
-      }
-      if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
-        Plot other = current.getRelative(2);
-        if (other != null && other.isOwner(uuid) && (
-            other.getBasePlot(false).equals(current.getBasePlot(false))
-                || (plots = other.getConnectedPlots()).size() <= max && frontier
-                .addAll(plots) && (max -= plots.size()) != -1)) {
-          current.mergePlot(other, removeRoads);
-          merged.add(current.getId());
-          merged.add(other.getId());
-          toReturn = true;
-        }
-      }
-      if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
-        Plot other = current.getRelative(3);
-        if (other != null && other.isOwner(uuid) && (
-            other.getBasePlot(false).equals(current.getBasePlot(false))
-                || (plots = other.getConnectedPlots()).size() <= max && frontier
-                .addAll(plots) && (max -= plots.size()) != -1)) {
-          current.mergePlot(other, removeRoads);
-          merged.add(current.getId());
-          merged.add(other.getId());
-          toReturn = true;
-        }
-      }
-    }
-    if (removeRoads && toReturn) {
-      ArrayList<PlotId> ids = new ArrayList<>(merged);
-      this.getManager().finishPlotMerge(this.area, ids);
-    }
-    return toReturn;
-  }
-
-  /**
-   * Merge the plot settings<br> - Used when a plot is merged<br>
-   */
-  public void mergeData(Plot b) {
-    HashMap<Flag<?>, Object> flags1 = this.getFlags();
-    HashMap<Flag<?>, Object> flags2 = b.getFlags();
-    if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
-      boolean greater = flags1.size() > flags2.size();
-      if (greater) {
-        flags1.putAll(flags2);
-      } else {
-        flags2.putAll(flags1);
-      }
-      HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
-      this.setFlags(net);
-      b.setFlags(net);
-    }
-    if (!this.getAlias().isEmpty()) {
-      b.setAlias(this.getAlias());
-    } else if (!b.getAlias().isEmpty()) {
-      this.setAlias(b.getAlias());
-    }
-    for (UUID uuid : this.getTrusted()) {
-      b.addTrusted(uuid);
-    }
-    for (UUID uuid : b.getTrusted()) {
-      this.addTrusted(uuid);
-    }
-    for (UUID uuid : this.getMembers()) {
-      b.addMember(uuid);
-    }
-    for (UUID uuid : b.getMembers()) {
-      this.addMember(uuid);
-    }
-
-    for (UUID uuid : this.getDenied()) {
-      b.addDenied(uuid);
-    }
-    for (UUID uuid : b.getDenied()) {
-      this.addDenied(uuid);
-    }
-  }
-
-  /**
-   * Remove the SE road (only effects terrain)
-   */
-  public void removeRoadSouthEast() {
-    if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-      if (this.area.TERRAIN == 3) {
-        return;
-      }
-      Plot other = this.getRelative(1, 1);
-      Location pos1 = this.getTopAbs().add(1, 0, 1);
-      Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
-      pos1.setY(0);
-      pos2.setY(256);
-      ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-    } else {
-      this.area.getPlotManager().removeRoadSouthEast(this.area, this);
-    }
-  }
-
-  /**
-   * Get the plot in a relative location<br> Note: May be null if the partial plot area does not
-   * include the relative location
-   *
-   * @return Plot
-   */
-  public Plot getRelative(int x, int y) {
-    return this.area.getPlotAbs(this.id.getRelative(x, y));
-  }
-
-  public Plot getRelative(PlotArea area, int x, int y) {
-    return area.getPlotAbs(this.id.getRelative(x, y));
-  }
-
-  /**
-   * Get the plot in a relative direction<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
-   * Note: May be null if the partial plot area does not include the relative location
-   */
-  public Plot getRelative(int direction) {
-    return this.area.getPlotAbs(this.id.getRelative(direction));
-  }
-
-  /**
-   * Get a set of plots connected (and including) this plot<br> - This result is cached globally
-   */
-  public Set<Plot> getConnectedPlots() {
-    if (this.settings == null || !this.isMerged()) {
-      return Collections.singleton(this);
-    }
-    boolean[] merged = this.getMerged();
-    int hash = MainUtil.hash(merged);
-    if (hash == 0) {
-      return Collections.singleton(this);
-    }
-    if (connected_cache != null && connected_cache.contains(this)) {
-      return connected_cache;
-    }
-    regions_cache = null;
-
-    HashSet<Plot> tmpSet = new HashSet<>();
-    ArrayDeque<Plot> frontier = new ArrayDeque<>();
-    HashSet<Object> queuecache = new HashSet<>();
-    tmpSet.add(this);
-    Plot tmp;
-    if (merged[0]) {
-      tmp = this.area.getPlotAbs(this.id.getRelative(0));
-      if (!tmp.getMerged(2)) {
-        // invalid merge
-        PlotSquared.debug("Fixing invalid merge: " + this);
-        if (tmp.isOwnerAbs(this.owner)) {
-          tmp.getSettings().setMerged(2, true);
-          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-        } else {
-          this.getSettings().setMerged(0, false);
-          DBFunc.setMerged(this, this.getSettings().getMerged());
-        }
-      }
-      queuecache.add(tmp);
-      frontier.add(tmp);
-    }
-    if (merged[1]) {
-      tmp = this.area.getPlotAbs(this.id.getRelative(1));
-      if (!tmp.getMerged(3)) {
-        // invalid merge
-        PlotSquared.debug("Fixing invalid merge: " + this);
-        if (tmp.isOwnerAbs(this.owner)) {
-          tmp.getSettings().setMerged(3, true);
-          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-        } else {
-          this.getSettings().setMerged(1, false);
-          DBFunc.setMerged(this, this.getSettings().getMerged());
-        }
-      }
-      queuecache.add(tmp);
-      frontier.add(tmp);
-    }
-    if (merged[2]) {
-      tmp = this.area.getPlotAbs(this.id.getRelative(2));
-      if (!tmp.getMerged(0)) {
-        // invalid merge
-        PlotSquared.debug("Fixing invalid merge: " + this);
-        if (tmp.isOwnerAbs(this.owner)) {
-          tmp.getSettings().setMerged(0, true);
-          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-        } else {
-          this.getSettings().setMerged(2, false);
-          DBFunc.setMerged(this, this.getSettings().getMerged());
-        }
-      }
-      queuecache.add(tmp);
-      frontier.add(tmp);
-    }
-    if (merged[3]) {
-      tmp = this.area.getPlotAbs(this.id.getRelative(3));
-      if (!tmp.getMerged(1)) {
-        // invalid merge
-        PlotSquared.debug("Fixing invalid merge: " + this);
-        if (tmp.isOwnerAbs(this.owner)) {
-          tmp.getSettings().setMerged(1, true);
-          DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-        } else {
-          this.getSettings().setMerged(3, false);
-          DBFunc.setMerged(this, this.getSettings().getMerged());
-        }
-      }
-      queuecache.add(tmp);
-      frontier.add(tmp);
-    }
-    Plot current;
-    while ((current = frontier.poll()) != null) {
-      if (current.owner == null || current.settings == null) {
-        // Invalid plot
-        // merged onto unclaimed plot
-        PlotSquared
-            .debug("Ignoring invalid merged plot: " + current + " | " + current.owner);
-        continue;
-      }
-      tmpSet.add(current);
-      queuecache.remove(current);
-      merged = current.getMerged();
-      if (merged[0]) {
-        tmp = current.area.getPlotAbs(current.id.getRelative(0));
-        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-          queuecache.add(tmp);
-          frontier.add(tmp);
-        }
-      }
-      if (merged[1]) {
-        tmp = current.area.getPlotAbs(current.id.getRelative(1));
-        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-          queuecache.add(tmp);
-          frontier.add(tmp);
-        }
-      }
-      if (merged[2]) {
-        tmp = current.area.getPlotAbs(current.id.getRelative(2));
-        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-          queuecache.add(tmp);
-          frontier.add(tmp);
-        }
-      }
-      if (merged[3]) {
-        tmp = current.area.getPlotAbs(current.id.getRelative(3));
-        if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-          queuecache.add(tmp);
-          frontier.add(tmp);
-        }
-      }
-    }
-    connected_cache = tmpSet;
-    return tmpSet;
-  }
-
-  /**
-   * This will combine each plot into effective rectangular regions<br> - This result is cached
-   * globally<br> - Useful for handling non rectangular shapes
-   */
-  public HashSet<RegionWrapper> getRegions() {
-    if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
-      return regions_cache;
-    }
-    if (!this.isMerged()) {
-      Location pos1 = this.getBottomAbs();
-      Location pos2 = this.getTopAbs();
-      connected_cache = new HashSet<>(Collections.singletonList(this));
-      regions_cache = new HashSet<>(1);
-      regions_cache.add(
-          new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
-              pos2.getZ()));
-      return regions_cache;
-    }
-    Set<Plot> plots = this.getConnectedPlots();
-    HashSet<RegionWrapper> regions = regions_cache = new HashSet<>();
-    HashSet<PlotId> visited = new HashSet<>();
-    for (Plot current : plots) {
-      if (visited.contains(current.getId())) {
-        continue;
-      }
-      boolean merge = true;
-      PlotId bot = new PlotId(current.getId().x, current.getId().y);
-      PlotId top = new PlotId(current.getId().x, current.getId().y);
-      while (merge) {
-        merge = false;
-        ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, bot.y - 1),
-            new PlotId(top.x, bot.y - 1));
-        boolean tmp = true;
-        for (PlotId id : ids) {
-          Plot plot = this.area.getPlotAbs(id);
-          if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
-            tmp = false;
-          }
-        }
-        if (tmp) {
-          merge = true;
-          bot.y--;
-        }
-        ids = MainUtil.getPlotSelectionIds(new PlotId(top.x + 1, bot.y),
-            new PlotId(top.x + 1, top.y));
-        tmp = true;
-        for (PlotId id : ids) {
-          Plot plot = this.area.getPlotAbs(id);
-          if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
-            tmp = false;
-          }
-        }
-        if (tmp) {
-          merge = true;
-          top.x++;
-        }
-        ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, top.y + 1),
-            new PlotId(top.x, top.y + 1));
-        tmp = true;
-        for (PlotId id : ids) {
-          Plot plot = this.area.getPlotAbs(id);
-          if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
-            tmp = false;
-          }
-        }
-        if (tmp) {
-          merge = true;
-          top.y++;
-        }
-        ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x - 1, bot.y),
-            new PlotId(bot.x - 1, top.y));
-        tmp = true;
-        for (PlotId id : ids) {
-          Plot plot = this.area.getPlotAbs(id);
-          if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
-            tmp = false;
-          }
-        }
-        if (tmp) {
-          merge = true;
-          bot.x--;
-        }
-      }
-      Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
-      Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
-      visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
-      for (int x = bot.x; x <= top.x; x++) {
-        Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
-        if (plot.getMerged(2)) {
-          // south wedge
-          Location toploc = plot.getExtendedTopAbs();
-          Location botabs = plot.getBottomAbs();
-          Location topabs = plot.getTopAbs();
-          regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
-              toploc.getZ()));
-          if (plot.getMerged(5)) {
-            regions.add(
-                new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
-                    toploc.getZ()));
-            // intersection
-          }
-        }
-      }
-
-      for (int y = bot.y; y <= top.y; y++) {
-        Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
-        if (plot.getMerged(1)) {
-          // east wedge
-          Location toploc = plot.getExtendedTopAbs();
-          Location botabs = plot.getBottomAbs();
-          Location topabs = plot.getTopAbs();
-          regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
-              topabs.getZ()));
-          if (plot.getMerged(5)) {
-            regions.add(
-                new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
-                    toploc.getZ()));
-            // intersection
-          }
-        }
-      }
-      regions.add(
-          new RegionWrapper(gbotabs.getX(), gtopabs.getX(), gbotabs.getZ(), gtopabs.getZ()));
-    }
-    return regions;
-  }
-
-  /**
-   * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular
-   * shapes)
-   */
-  public RegionWrapper getLargestRegion() {
-    HashSet<RegionWrapper> regions = this.getRegions();
-    RegionWrapper max = null;
-    double area = Double.NEGATIVE_INFINITY;
-    for (RegionWrapper region : regions) {
-      double current =
-          (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1);
-      if (current > area) {
-        max = region;
-        area = current;
-      }
-    }
-    return max;
-  }
-
-  /**
-   * Do the plot entry tasks for each player in the plot<br> - Usually called when the plot state
-   * changes (unclaimed/claimed/flag change etc)
-   */
-  public void reEnter() {
-    TaskManager.runTaskLater(() -> {
-      for (PlotPlayer pp : Plot.this.getPlayersInPlot()) {
-        PlotListener.plotExit(pp, Plot.this);
-        PlotListener.plotEntry(pp, Plot.this);
-      }
-    }, 1);
-  }
-
-  /**
-   * Get all the corners of the plot (supports non-rectangular shapes).
-   *
-   * @return A list of the plot corners
-   */
-  public List<Location> getAllCorners() {
-    Area area = new Area();
-    for (RegionWrapper region : this.getRegions()) {
-      Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6,
-          region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
-      Area rectArea = new Area(rect);
-      area.add(rectArea);
-    }
-    List<Location> locs = new ArrayList<>();
-    double[] coords = new double[6];
-    for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
-      int type = pi.currentSegment(coords);
-      int x = (int) MathMan.inverseRound(coords[0]);
-      int z = (int) MathMan.inverseRound(coords[1]);
-      if (type != 4) {
-        locs.add(new Location(this.getWorldName(), x, 0, z));
-      }
-    }
-    return locs;
-  }
-
-  /**
-   * Teleport a player to a plot and send them the teleport message.
-   *
-   * @param player the player
-   * @return if the teleport succeeded
-   */
-  public boolean teleportPlayer(final PlotPlayer player) {
-    Plot plot = this.getBasePlot(false);
-    boolean result = EventUtil.manager.callTeleport(player, player.getLocation(), plot);
-    if (result) {
-      final Location location;
-      if (this.area.HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
-        location = this.getHome();
-      } else {
-        location = this.getDefaultHome(false);
-      }
-      if (Settings.Teleport.DELAY == 0 || Permissions
-          .hasPermission(player, "plots.teleport.delay.bypass")) {
-        MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
-        player.teleport(location);
-        return true;
-      }
-      MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
-      final String name = player.getName();
-      TaskManager.TELEPORT_QUEUE.add(name);
-      TaskManager.runTaskLater(() -> {
-        if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
-          MainUtil.sendMessage(player, C.TELEPORT_FAILED);
-          return;
-        }
-        TaskManager.TELEPORT_QUEUE.remove(name);
-        if (player.isOnline()) {
-          MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
-          player.teleport(location);
-        }
-      }, Settings.Teleport.DELAY * 20);
-      return true;
-    }
-    return false;
-  }
-
-  public boolean isOnline() {
-    if (this.owner == null) {
-      return false;
-    }
-    if (!isMerged()) {
-      return UUIDHandler.getPlayer(this.owner) != null;
-    }
-    for (Plot current : getConnectedPlots()) {
-      if (current.hasOwner() && UUIDHandler.getPlayer(current.owner) != null) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Set a component for a plot to the provided blocks<br> - E.g. floor, wall, border etc.<br> - The
-   * available components depend on the generator being used<br>
-   */
-  public boolean setComponent(String component, BlockBucket blocks) {
-    if (StringMan
-        .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
-      EventUtil.manager.callComponentSet(this, component);
-    }
-    return this.getManager().setComponent(this.area, this.getId(), component, blocks);
-  }
-
-  public int getDistanceFromOrigin() {
-    Location bot = getManager().getPlotBottomLocAbs(this.area, id);
-    Location top = getManager().getPlotTopLocAbs(this.area, id);
-    return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
-        Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
-  }
-
-  /**
-   * Expand the world border to include the provided plot (if applicable).
-   */
-  public void updateWorldBorder() {
-    if (this.owner == null) {
-      return;
-    }
-    int border = this.area.getBorder();
-    if (border == Integer.MAX_VALUE) {
-      return;
-    }
-    int max = getDistanceFromOrigin();
-    if (max > border) {
-      this.area.setMeta("worldBorder", max);
-    }
-  }
-
-  /**
-   * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other
-   * <br> - saves to DB
-   */
-  public void mergePlot(Plot lesserPlot, boolean removeRoads) {
-    Plot greaterPlot = this;
-    if (lesserPlot.getId().x == greaterPlot.getId().x) {
-      if (lesserPlot.getId().y > greaterPlot.getId().y) {
-        Plot tmp = lesserPlot;
-        lesserPlot = greaterPlot;
-        greaterPlot = tmp;
-      }
-      if (!lesserPlot.getMerged(2)) {
-        lesserPlot.clearRatings();
-        greaterPlot.clearRatings();
-        lesserPlot.setMerged(2, true);
-        greaterPlot.setMerged(0, true);
-        lesserPlot.mergeData(greaterPlot);
-        if (removeRoads) {
-          lesserPlot.removeRoadSouth();
-          Plot diagonal = greaterPlot.getRelative(1);
-          if (diagonal.getMerged(7)) {
-            lesserPlot.removeRoadSouthEast();
-          }
-          Plot below = greaterPlot.getRelative(3);
-          if (below.getMerged(4)) {
-            below.getRelative(0).removeRoadSouthEast();
-          }
-        }
-      }
-    } else {
-      if (lesserPlot.getId().x > greaterPlot.getId().x) {
-        Plot tmp = lesserPlot;
-        lesserPlot = greaterPlot;
-        greaterPlot = tmp;
-      }
-      if (!lesserPlot.getMerged(1)) {
-        lesserPlot.clearRatings();
-        greaterPlot.clearRatings();
-        lesserPlot.setMerged(1, true);
-        greaterPlot.setMerged(3, true);
-        lesserPlot.mergeData(greaterPlot);
-        if (removeRoads) {
-          Plot diagonal = greaterPlot.getRelative(2);
-          if (diagonal.getMerged(7)) {
-            lesserPlot.removeRoadSouthEast();
-          }
-          lesserPlot.removeRoadEast();
-        }
-        Plot below = greaterPlot.getRelative(0);
-        if (below.getMerged(6)) {
-          below.getRelative(3).removeRoadSouthEast();
-        }
-      }
-    }
-  }
-
-  /**
-   * Move a plot physically, as well as the corresponding settings.
-   *
-   * @param destination Plot moved to
-   * @param whenDone task when done
-   * @param allowSwap whether to swap plots
-   * @return success
-   */
-  public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
-    final PlotId offset = new PlotId(destination.getId().x - this.getId().x,
-        destination.getId().y - this.getId().y);
-    Location db = destination.getBottomAbs();
-    Location ob = this.getBottomAbs();
-    final int offsetX = db.getX() - ob.getX();
-    final int offsetZ = db.getZ() - ob.getZ();
-    if (this.owner == null) {
-      TaskManager.runTaskLater(whenDone, 1);
-      return false;
-    }
-    boolean occupied = false;
-    Set<Plot> plots = this.getConnectedPlots();
-    for (Plot plot : plots) {
-      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-      if (other.hasOwner()) {
-        if (!allowSwap) {
-          TaskManager.runTaskLater(whenDone, 1);
-          return false;
-        }
-        occupied = true;
-      } else {
-        plot.removeSign();
-      }
-    }
-    // world border
-    destination.updateWorldBorder();
-    final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-    // move / swap data
-    final PlotArea originArea = getArea();
-    for (Plot plot : plots) {
-      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-      plot.swapData(other, null);
-    }
-    // copy terrain
-    Runnable move = new Runnable() {
-      @Override
-      public void run() {
-        if (regions.isEmpty()) {
-          Plot plot = destination.getRelative(0, 0);
-          for (Plot current : plot.getConnectedPlots()) {
-            getManager().claimPlot(current.getArea(), current);
-            Plot originPlot = originArea.getPlotAbs(
-                new PlotId(current.id.x - offset.x, current.id.y - offset.y));
-            originPlot.getManager().unclaimPlot(originArea, originPlot, null);
-          }
-          plot.setSign();
-          TaskManager.runTask(whenDone);
-          return;
-        }
-        final Runnable task = this;
-        RegionWrapper region = regions.poll();
-        Location[] corners = region.getCorners(getWorldName());
-        final Location pos1 = corners[0];
-        final Location pos2 = corners[1];
-        Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-        newPos.setWorld(destination.getWorldName());
-        ChunkManager.manager.copyRegion(pos1, pos2, newPos,
-            () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
-      }
-    };
-    Runnable swap = new Runnable() {
-      @Override
-      public void run() {
-        if (regions.isEmpty()) {
-          TaskManager.runTask(whenDone);
-          return;
-        }
-        RegionWrapper region = regions.poll();
-        Location[] corners = region.getCorners(getWorldName());
-        Location pos1 = corners[0];
-        Location pos2 = corners[1];
-        Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
-        Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
-        pos3.setWorld(destination.getWorldName());
-        pos4.setWorld(destination.getWorldName());
-        ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
-      }
-    };
-    if (occupied) {
-      swap.run();
-    } else {
-      move.run();
-    }
-    return true;
-  }
-
-  /**
-   * Copy a plot to a location, both physically and the settings
-   */
-  public boolean copy(final Plot destination, final Runnable whenDone) {
-    PlotId offset = new PlotId(destination.getId().x - this.getId().x,
-        destination.getId().y - this.getId().y);
-    Location db = destination.getBottomAbs();
-    Location ob = this.getBottomAbs();
-    final int offsetX = db.getX() - ob.getX();
-    final int offsetZ = db.getZ() - ob.getZ();
-    if (this.owner == null) {
-      TaskManager.runTaskLater(whenDone, 1);
-      return false;
-    }
-    Set<Plot> plots = this.getConnectedPlots();
-    for (Plot plot : plots) {
-      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-      if (other.hasOwner()) {
+        // Swap cached
+        PlotId temp = new PlotId(this.getId().x, this.getId().y);
+        this.getId().x = plot.getId().x;
+        this.getId().y = plot.getId().y;
+        plot.getId().x = temp.x;
+        plot.getId().y = temp.y;
+        this.area.removePlot(this.getId());
+        plot.area.removePlot(plot.getId());
+        this.getId().recalculateHash();
+        plot.getId().recalculateHash();
+        this.area.addPlotAbs(this);
+        plot.area.addPlotAbs(plot);
+        // Swap database
+        DBFunc.swapPlots(plot, this);
         TaskManager.runTaskLater(whenDone, 1);
-        return false;
-      }
+        return true;
     }
-    // world border
-    destination.updateWorldBorder();
-    // copy data
-    for (Plot plot : plots) {
-      Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-      other.create(plot.owner, false);
-      if (!plot.getFlags().isEmpty()) {
-        other.getSettings().flags = plot.getFlags();
-        DBFunc.setFlags(other, plot.getFlags());
-      }
-      if (plot.isMerged()) {
-        other.setMerged(plot.getMerged());
-      }
-      if (plot.members != null && !plot.members.isEmpty()) {
-        other.members = plot.members;
-        for (UUID member : plot.members) {
-          DBFunc.setMember(other, member);
-        }
-      }
-      if (plot.trusted != null && !plot.trusted.isEmpty()) {
-        other.trusted = plot.trusted;
-        for (UUID trusted : plot.trusted) {
-          DBFunc.setTrusted(other, trusted);
-        }
-      }
-      if (plot.denied != null && !plot.denied.isEmpty()) {
-        other.denied = plot.denied;
-        for (UUID denied : plot.denied) {
-          DBFunc.setDenied(other, denied);
-        }
-      }
-    }
-    // copy terrain
-    final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-    Runnable run = new Runnable() {
-      @Override
-      public void run() {
-        if (regions.isEmpty()) {
-          for (Plot current : getConnectedPlots()) {
-            destination.getManager().claimPlot(destination.getArea(), destination);
-          }
-          destination.setSign();
-          TaskManager.runTask(whenDone);
-          return;
-        }
-        RegionWrapper region = regions.poll();
-        Location[] corners = region.getCorners(getWorldName());
-        Location pos1 = corners[0];
-        Location pos2 = corners[1];
-        Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-        newPos.setWorld(destination.getWorldName());
-        ChunkManager.manager.copyRegion(pos1, pos2, newPos, this);
-      }
-    };
-    run.run();
-    return true;
-  }
 
-  public boolean hasFlag(Flag<?> flag) {
-    return getFlags().containsKey(flag);
-  }
+    /**
+     * Move the settings for a plot.
+     *
+     * @param plot the plot to move
+     */
+    public boolean moveData(Plot plot, Runnable whenDone) {
+        if (this.owner == null) {
+            PlotSquared.debug(plot + " is unowned (single)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        if (plot.hasOwner()) {
+            PlotSquared.debug(plot + " is unowned (multi)");
+            TaskManager.runTask(whenDone);
+            return false;
+        }
+        this.area.removePlot(this.id);
+        this.getId().x = plot.getId().x;
+        this.getId().y = plot.getId().y;
+        this.getId().recalculateHash();
+        this.area.addPlotAbs(this);
+        DBFunc.movePlot(this, plot);
+        TaskManager.runTaskLater(whenDone, 1);
+        return true;
+    }
+
+    /**
+     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like
+     * each plot treated as a small plot use getPlotTopLocAbs(...)
+     *
+     * @return Location top of mega plot
+     */
+    public Location getExtendedTopAbs() {
+        Location top = this.getTopAbs();
+        if (!this.isMerged()) {
+            return top;
+        }
+        if (this.getMerged(2)) {
+            top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
+        }
+        if (this.getMerged(1)) {
+            top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
+        }
+        return top;
+    }
+
+    /**
+     * Gets the bottom location for a plot.<br> - Does not respect mega plots<br> - Merged plots, only
+     * the road will be considered part of the plot<br>
+     *
+     * @return Location bottom of mega plot
+     */
+    public Location getExtendedBottomAbs() {
+        Location bot = this.getBottomAbs();
+        if (!this.isMerged()) {
+            return bot;
+        }
+        if (this.getMerged(0)) {
+            bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
+        }
+        if (this.getMerged(3)) {
+            bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
+        }
+        return bot;
+    }
+
+    /**
+     * Returns the top and bottom location.<br> - If the plot is not connected, it will return its own
+     * corners<br> - the returned locations will not necessarily correspond to claimed plots if the
+     * connected plots do not form a rectangular shape
+     *
+     * @return new Location[] { bottom, top }
+     * @deprecated as merged plots no longer need to be rectangular
+     */
+    @Deprecated public Location[] getCorners() {
+        if (!this.isMerged()) {
+            return new Location[] {this.getBottomAbs(), this.getTopAbs()};
+        }
+        return MainUtil.getCorners(this.getWorldName(), this.getRegions());
+    }
+
+    /**
+     * Remove the east road section of a plot<br> - Used when a plot is merged<br>
+     */
+    public void removeRoadEast() {
+        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+            if (this.area.TERRAIN == 3) {
+                return;
+            }
+            Plot other = this.getRelative(1);
+            Location bot = other.getBottomAbs();
+            Location top = this.getTopAbs();
+            Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
+            Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
+            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+        } else {
+            this.area.getPlotManager().removeRoadEast(this.area, this);
+        }
+    }
+
+    /**
+     * @deprecated in favor of getCorners()[0];<br>
+     */
+    // Won't remove as suggestion also points to deprecated method
+    @Deprecated public Location getBottom() {
+        return this.getCorners()[0];
+    }
+
+    /**
+     * @return the top corner of the plot
+     * @deprecated in favor of getCorners()[1];
+     */
+    // Won't remove as suggestion also points to deprecated method
+    @Deprecated public Location getTop() {
+        return this.getCorners()[1];
+    }
+
+    /**
+     * Swap the plot contents and settings with another location<br> - The destination must correspond
+     * to a valid plot of equal dimensions
+     *
+     * @param destination The other plot to swap with
+     * @param whenDone    A task to run when finished, or null
+     * @return boolean if swap was successful
+     * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain
+     * @see this#swapData(Plot, Runnable) to swap plot settings
+     * @see this#swapData(Plot, Runnable)
+     */
+    public boolean swap(Plot destination, Runnable whenDone) {
+        return this.move(destination, whenDone, true);
+    }
+
+    /**
+     * Move the plot to an empty location<br> - The location must be empty
+     *
+     * @param destination Where to move the plot
+     * @param whenDone    A task to run when done, or null
+     * @return if the move was successful
+     */
+    public boolean move(Plot destination, Runnable whenDone) {
+        return this.move(destination, whenDone, false);
+    }
+
+    /**
+     * Get plot display name.
+     *
+     * @return alias if set, else id
+     */
+    @Override public String toString() {
+        if (this.settings != null && this.settings.getAlias().length() > 1) {
+            return this.settings.getAlias();
+        }
+        return this.area + ";" + this.id.x + ";" + this.id.y;
+    }
+
+
+    /**
+     * Remove a denied player (use DBFunc as well)<br> Using the * uuid will remove all users
+     */
+    public boolean removeDenied(UUID uuid) {
+        if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
+            boolean result = false;
+            for (UUID other : new HashSet<>(getDenied())) {
+                result = rmvDenied(other) || result;
+            }
+            return result;
+        }
+        return rmvDenied(uuid);
+    }
+
+    private boolean rmvDenied(UUID uuid) {
+        for (Plot current : this.getConnectedPlots()) {
+            if (current.getDenied().remove(uuid)) {
+                DBFunc.removeDenied(current, uuid);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Remove a helper (use DBFunc as well)<br> Using the * uuid will remove all users
+     */
+    public boolean removeTrusted(UUID uuid) {
+        if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
+            boolean result = false;
+            for (UUID other : new HashSet<>(getTrusted())) {
+                result = rmvTrusted(other) || result;
+            }
+            return result;
+        }
+        return rmvTrusted(uuid);
+    }
+
+    private boolean rmvTrusted(UUID uuid) {
+        for (Plot plot : this.getConnectedPlots()) {
+            if (plot.getTrusted().remove(uuid)) {
+                DBFunc.removeTrusted(plot, uuid);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Remove a trusted user (use DBFunc as well)<br> Using the * uuid will remove all users
+     */
+    public boolean removeMember(UUID uuid) {
+        if (this.members == null) {
+            return false;
+        }
+        if (uuid == DBFunc.EVERYONE && !members.contains(uuid)) {
+            boolean result = false;
+            for (UUID other : new HashSet<>(this.members)) {
+                result = rmvMember(other) || result;
+            }
+            return result;
+        }
+        return rmvMember(uuid);
+    }
+
+    private boolean rmvMember(UUID uuid) {
+        for (Plot current : this.getConnectedPlots()) {
+            if (current.getMembers().remove(uuid)) {
+                DBFunc.removeMember(current, uuid);
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Export the plot as a schematic to the configured output directory.
+     */
+    public void export(final RunnableVal<Boolean> whenDone) {
+        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
+            @Override public void run(final CompoundTag value) {
+                if (value == null) {
+                    if (whenDone != null) {
+                        whenDone.value = false;
+                        TaskManager.runTask(whenDone);
+                    }
+                } else {
+                    TaskManager.runTaskAsync(() -> {
+                        String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
+                            .getName(Plot.this.owner);
+                        boolean result = SchematicHandler.manager.save(value,
+                            Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
+                        if (whenDone != null) {
+                            whenDone.value = result;
+                            TaskManager.runTask(whenDone);
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    /**
+     * Upload the plot as a schematic to the configured web interface.
+     *
+     * @param whenDone value will be null if uploading fails
+     */
+    public void upload(final RunnableVal<URL> whenDone) {
+        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
+            @Override public void run(CompoundTag value) {
+                SchematicHandler.manager.upload(value, null, null, whenDone);
+            }
+        });
+    }
+
+    /**
+     * Upload this plot as a world file<br> - The mca files are each 512x512, so depending on the plot
+     * size it may also download adjacent plots<br> - Works best when (plot width + road width) % 512
+     * == 0<br>
+     *
+     * @see WorldUtil
+     */
+    public void uploadWorld(RunnableVal<URL> whenDone) {
+        WorldUtil.IMP.upload(this, null, null, whenDone);
+    }
+
+    @Override public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (this.getClass() != obj.getClass()) {
+            return false;
+        }
+        Plot other = (Plot) obj;
+        return this.hashCode() == other.hashCode() && this.id.equals(other.id)
+            && this.area == other.area;
+    }
+
+    /**
+     * Get the plot hashcode<br> Note: The hashcode is unique if:<br> - Plots are in the same
+     * world<br> - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
+     *
+     * @return integer.
+     */
+    @Override public int hashCode() {
+        return this.id.hashCode();
+    }
+
+    /**
+     * Get the flags specific to this plot<br> - Does not take default flags into account<br>
+     */
+    public HashMap<Flag<?>, Object> getFlags() {
+        return this.getSettings().flags;
+    }
+
+    /**
+     * Set a flag for this plot.
+     */
+    public void setFlags(HashMap<Flag<?>, Object> flags) {
+        FlagManager.setPlotFlags(this, flags);
+    }
+
+    /**
+     * Get the plot alias. - Returns an empty string if no alias is set
+     *
+     * @return The plot alias
+     */
+    public String getAlias() {
+        if (this.settings == null) {
+            return "";
+        }
+        return this.settings.getAlias();
+    }
+
+    /**
+     * Set the plot alias.
+     *
+     * @param alias The alias
+     */
+    public void setAlias(String alias) {
+        for (Plot current : this.getConnectedPlots()) {
+            String name = this.getSettings().getAlias();
+            if (alias == null) {
+                alias = "";
+            }
+            if (name.equals(alias)) {
+                return;
+            }
+            current.getSettings().setAlias(alias);
+            DBFunc.setAlias(current, alias);
+        }
+    }
+
+    /**
+     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> ----------<br> 0 =
+     * north<br> 1 = east<br> 2 = south<br> 3 = west<br> ----------<br>
+     */
+    private void setMerged(int direction, boolean value) {
+        if (this.getSettings().setMerged(direction, value)) {
+            if (value) {
+                Plot other = this.getRelative(direction).getBasePlot(false);
+                if (!other.equals(this.getBasePlot(false))) {
+                    Plot base = other.id.y < this.id.y
+                        || other.id.y == this.id.y && other.id.x < this.id.x ? other : this.origin;
+                    this.origin.origin = base;
+                    other.origin = base;
+                    this.origin = base;
+                    connected_cache = null;
+                }
+            } else {
+                if (this.origin != null) {
+                    this.origin.origin = null;
+                    this.origin = null;
+                }
+                connected_cache = null;
+            }
+            DBFunc.setMerged(this, this.getSettings().getMerged());
+            regions_cache = null;
+        }
+    }
+
+    /**
+     * Get the merged array.
+     *
+     * @return boolean [ north, east, south, west ]
+     */
+    public boolean[] getMerged() {
+        return this.getSettings().getMerged();
+    }
+
+    /**
+     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> Get if the plot is
+     * merged in a direction<br> ----------<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+     * ----------<br> Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
+     */
+    public void setMerged(boolean[] merged) {
+        this.getSettings().setMerged(merged);
+        DBFunc.setMerged(this, merged);
+        clearCache();
+    }
+
+    private void clearCache() {
+        connected_cache = null;
+        regions_cache = null;
+        if (this.origin != null) {
+            this.origin.origin = null;
+            this.origin = null;
+        }
+    }
+
+    /**
+     * Get the set home location or 0,0,0 if no location is set<br> - Does not take the default home
+     * location into account
+     *
+     * @see #getHome()
+     */
+    public BlockLoc getPosition() {
+        return this.getSettings().getPosition();
+    }
+
+    /**
+     * Check if a plot can be claimed by the provided player.
+     *
+     * @param player the claiming player
+     */
+    public boolean canClaim(@Nullable PlotPlayer player) {
+        PlotCluster cluster = this.getCluster();
+        if (cluster != null && player != null) {
+            if (!cluster.isAdded(player.getUUID()) && !Permissions
+                .hasPermission(player, "plots.admin.command.claim")) {
+                return false;
+            }
+        }
+        return this.guessOwner() == null && !isMerged();
+    }
+
+    /**
+     * Guess the owner of a plot either by the value in memory, or the sign data<br> Note: Recovering
+     * from sign information is useful if e.g. PlotMe conversion wasn't successful
+     *
+     * @return UUID
+     */
+    public UUID guessOwner() {
+        if (this.hasOwner()) {
+            return this.owner;
+        }
+        if (!this.area.ALLOW_SIGNS) {
+            return null;
+        }
+        try {
+            final Location loc = this.getManager().getSignLoc(this.area, this);
+            String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
+                @Override public void run(String[] value) {
+                    ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
+                    this.value = WorldUtil.IMP.getSign(loc);
+                }
+            });
+            if (lines == null) {
+                return null;
+            }
+            loop:
+            for (int i = 4; i > 0; i--) {
+                String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
+                int index = caption.indexOf("%plr%");
+                if (index < 0) {
+                    continue;
+                }
+                String line = lines[i - 1];
+                if (line.length() <= index) {
+                    return null;
+                }
+                String name = line.substring(index);
+                if (name.isEmpty()) {
+                    return null;
+                }
+                UUID owner = UUIDHandler.getUUID(name, null);
+                if (owner != null) {
+                    this.owner = owner;
+                    break;
+                }
+                if (lines[i - 1].length() == 15) {
+                    BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
+                    for (Entry<StringWrapper, UUID> entry : map.entrySet()) {
+                        String key = entry.getKey().value;
+                        if (key.length() > name.length() && key.startsWith(name)) {
+                            this.owner = entry.getValue();
+                            break loop;
+                        }
+                    }
+                }
+                this.owner = UUID.nameUUIDFromBytes(
+                    ("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
+                break;
+            }
+            if (this.hasOwner()) {
+                this.create();
+            }
+            return this.owner;
+        } catch (IllegalArgumentException ignored) {
+            return null;
+        }
+    }
+
+    /**
+     * Remove the south road section of a plot<br> - Used when a plot is merged<br>
+     */
+    public void removeRoadSouth() {
+        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+            if (this.area.TERRAIN == 3) {
+                return;
+            }
+            Plot other = this.getRelative(2);
+            Location bot = other.getBottomAbs();
+            Location top = this.getTopAbs();
+            Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
+            Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
+            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+        } else {
+            this.getManager().removeRoadSouth(this.area, this);
+        }
+    }
+
+    /**
+     * Auto merge a plot in a specific direction<br>
+     *
+     * @param dir         The direction to merge<br> -1 = All directions<br> 0 = north<br> 1 = east<br> 2 =
+     *                    south<br> 3 = west<br>
+     * @param max         The max number of merges to do
+     * @param uuid        The UUID it is allowed to merge with
+     * @param removeRoads Whether to remove roads
+     * @return true if a merge takes place
+     */
+    public boolean autoMerge(int dir, int max, UUID uuid, boolean removeRoads) {
+        if (this.owner == null) {
+            return false;
+        }
+        if (!EventUtil.manager.callMerge(this, dir, max)) {
+            return false;
+        }
+        HashSet<Plot> visited = new HashSet<>();
+        HashSet<PlotId> merged = new HashSet<>();
+        Set<Plot> connected = this.getConnectedPlots();
+        for (Plot current : connected) {
+            merged.add(current.getId());
+        }
+        ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
+        Plot current;
+        boolean toReturn = false;
+        while ((current = frontier.poll()) != null && max >= 0) {
+            if (visited.contains(current)) {
+                continue;
+            }
+            visited.add(current);
+            Set<Plot> plots;
+            if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
+                Plot other = current.getRelative(0);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+            if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
+                Plot other = current.getRelative(1);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+            if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
+                Plot other = current.getRelative(2);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+            if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
+                Plot other = current.getRelative(3);
+                if (other != null && other.isOwner(uuid) && (
+                    other.getBasePlot(false).equals(current.getBasePlot(false))
+                        || (plots = other.getConnectedPlots()).size() <= max && frontier
+                        .addAll(plots) && (max -= plots.size()) != -1)) {
+                    current.mergePlot(other, removeRoads);
+                    merged.add(current.getId());
+                    merged.add(other.getId());
+                    toReturn = true;
+                }
+            }
+        }
+        if (removeRoads && toReturn) {
+            ArrayList<PlotId> ids = new ArrayList<>(merged);
+            this.getManager().finishPlotMerge(this.area, ids);
+        }
+        return toReturn;
+    }
+
+    /**
+     * Merge the plot settings<br> - Used when a plot is merged<br>
+     */
+    public void mergeData(Plot b) {
+        HashMap<Flag<?>, Object> flags1 = this.getFlags();
+        HashMap<Flag<?>, Object> flags2 = b.getFlags();
+        if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
+            boolean greater = flags1.size() > flags2.size();
+            if (greater) {
+                flags1.putAll(flags2);
+            } else {
+                flags2.putAll(flags1);
+            }
+            HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
+            this.setFlags(net);
+            b.setFlags(net);
+        }
+        if (!this.getAlias().isEmpty()) {
+            b.setAlias(this.getAlias());
+        } else if (!b.getAlias().isEmpty()) {
+            this.setAlias(b.getAlias());
+        }
+        for (UUID uuid : this.getTrusted()) {
+            b.addTrusted(uuid);
+        }
+        for (UUID uuid : b.getTrusted()) {
+            this.addTrusted(uuid);
+        }
+        for (UUID uuid : this.getMembers()) {
+            b.addMember(uuid);
+        }
+        for (UUID uuid : b.getMembers()) {
+            this.addMember(uuid);
+        }
+
+        for (UUID uuid : this.getDenied()) {
+            b.addDenied(uuid);
+        }
+        for (UUID uuid : b.getDenied()) {
+            this.addDenied(uuid);
+        }
+    }
+
+    /**
+     * Remove the SE road (only effects terrain)
+     */
+    public void removeRoadSouthEast() {
+        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
+            if (this.area.TERRAIN == 3) {
+                return;
+            }
+            Plot other = this.getRelative(1, 1);
+            Location pos1 = this.getTopAbs().add(1, 0, 1);
+            Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
+            pos1.setY(0);
+            pos2.setY(256);
+            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
+        } else {
+            this.area.getPlotManager().removeRoadSouthEast(this.area, this);
+        }
+    }
+
+    /**
+     * Get the plot in a relative location<br> Note: May be null if the partial plot area does not
+     * include the relative location
+     *
+     * @return Plot
+     */
+    public Plot getRelative(int x, int y) {
+        return this.area.getPlotAbs(this.id.getRelative(x, y));
+    }
+
+    public Plot getRelative(PlotArea area, int x, int y) {
+        return area.getPlotAbs(this.id.getRelative(x, y));
+    }
+
+    /**
+     * Get the plot in a relative direction<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+     * Note: May be null if the partial plot area does not include the relative location
+     */
+    public Plot getRelative(int direction) {
+        return this.area.getPlotAbs(this.id.getRelative(direction));
+    }
+
+    /**
+     * Get a set of plots connected (and including) this plot<br> - This result is cached globally
+     */
+    public Set<Plot> getConnectedPlots() {
+        if (this.settings == null || !this.isMerged()) {
+            return Collections.singleton(this);
+        }
+        boolean[] merged = this.getMerged();
+        int hash = MainUtil.hash(merged);
+        if (hash == 0) {
+            return Collections.singleton(this);
+        }
+        if (connected_cache != null && connected_cache.contains(this)) {
+            return connected_cache;
+        }
+        regions_cache = null;
+
+        HashSet<Plot> tmpSet = new HashSet<>();
+        ArrayDeque<Plot> frontier = new ArrayDeque<>();
+        HashSet<Object> queuecache = new HashSet<>();
+        tmpSet.add(this);
+        Plot tmp;
+        if (merged[0]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(0));
+            if (!tmp.getMerged(2)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(2, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(0, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        if (merged[1]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(1));
+            if (!tmp.getMerged(3)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(3, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(1, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        if (merged[2]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(2));
+            if (!tmp.getMerged(0)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(0, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(2, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        if (merged[3]) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(3));
+            if (!tmp.getMerged(1)) {
+                // invalid merge
+                PlotSquared.debug("Fixing invalid merge: " + this);
+                if (tmp.isOwnerAbs(this.owner)) {
+                    tmp.getSettings().setMerged(1, true);
+                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
+                } else {
+                    this.getSettings().setMerged(3, false);
+                    DBFunc.setMerged(this, this.getSettings().getMerged());
+                }
+            }
+            queuecache.add(tmp);
+            frontier.add(tmp);
+        }
+        Plot current;
+        while ((current = frontier.poll()) != null) {
+            if (current.owner == null || current.settings == null) {
+                // Invalid plot
+                // merged onto unclaimed plot
+                PlotSquared
+                    .debug("Ignoring invalid merged plot: " + current + " | " + current.owner);
+                continue;
+            }
+            tmpSet.add(current);
+            queuecache.remove(current);
+            merged = current.getMerged();
+            if (merged[0]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(0));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+            if (merged[1]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(1));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+            if (merged[2]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(2));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+            if (merged[3]) {
+                tmp = current.area.getPlotAbs(current.id.getRelative(3));
+                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
+                    queuecache.add(tmp);
+                    frontier.add(tmp);
+                }
+            }
+        }
+        connected_cache = tmpSet;
+        return tmpSet;
+    }
+
+    /**
+     * This will combine each plot into effective rectangular regions<br> - This result is cached
+     * globally<br> - Useful for handling non rectangular shapes
+     */
+    public HashSet<RegionWrapper> getRegions() {
+        if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
+            return regions_cache;
+        }
+        if (!this.isMerged()) {
+            Location pos1 = this.getBottomAbs();
+            Location pos2 = this.getTopAbs();
+            connected_cache = new HashSet<>(Collections.singletonList(this));
+            regions_cache = new HashSet<>(1);
+            regions_cache.add(
+                new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
+                    pos2.getZ()));
+            return regions_cache;
+        }
+        Set<Plot> plots = this.getConnectedPlots();
+        HashSet<RegionWrapper> regions = regions_cache = new HashSet<>();
+        HashSet<PlotId> visited = new HashSet<>();
+        for (Plot current : plots) {
+            if (visited.contains(current.getId())) {
+                continue;
+            }
+            boolean merge = true;
+            PlotId bot = new PlotId(current.getId().x, current.getId().y);
+            PlotId top = new PlotId(current.getId().x, current.getId().y);
+            while (merge) {
+                merge = false;
+                ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, bot.y - 1),
+                    new PlotId(top.x, bot.y - 1));
+                boolean tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    bot.y--;
+                }
+                ids = MainUtil.getPlotSelectionIds(new PlotId(top.x + 1, bot.y),
+                    new PlotId(top.x + 1, top.y));
+                tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    top.x++;
+                }
+                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, top.y + 1),
+                    new PlotId(top.x, top.y + 1));
+                tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    top.y++;
+                }
+                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x - 1, bot.y),
+                    new PlotId(bot.x - 1, top.y));
+                tmp = true;
+                for (PlotId id : ids) {
+                    Plot plot = this.area.getPlotAbs(id);
+                    if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
+                        tmp = false;
+                    }
+                }
+                if (tmp) {
+                    merge = true;
+                    bot.x--;
+                }
+            }
+            Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
+            Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
+            visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
+            for (int x = bot.x; x <= top.x; x++) {
+                Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
+                if (plot.getMerged(2)) {
+                    // south wedge
+                    Location toploc = plot.getExtendedTopAbs();
+                    Location botabs = plot.getBottomAbs();
+                    Location topabs = plot.getTopAbs();
+                    regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
+                        toploc.getZ()));
+                    if (plot.getMerged(5)) {
+                        regions.add(
+                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
+                                toploc.getZ()));
+                        // intersection
+                    }
+                }
+            }
+
+            for (int y = bot.y; y <= top.y; y++) {
+                Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
+                if (plot.getMerged(1)) {
+                    // east wedge
+                    Location toploc = plot.getExtendedTopAbs();
+                    Location botabs = plot.getBottomAbs();
+                    Location topabs = plot.getTopAbs();
+                    regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
+                        topabs.getZ()));
+                    if (plot.getMerged(5)) {
+                        regions.add(
+                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
+                                toploc.getZ()));
+                        // intersection
+                    }
+                }
+            }
+            regions.add(
+                new RegionWrapper(gbotabs.getX(), gtopabs.getX(), gbotabs.getZ(), gtopabs.getZ()));
+        }
+        return regions;
+    }
+
+    /**
+     * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular
+     * shapes)
+     */
+    public RegionWrapper getLargestRegion() {
+        HashSet<RegionWrapper> regions = this.getRegions();
+        RegionWrapper max = null;
+        double area = Double.NEGATIVE_INFINITY;
+        for (RegionWrapper region : regions) {
+            double current =
+                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1);
+            if (current > area) {
+                max = region;
+                area = current;
+            }
+        }
+        return max;
+    }
+
+    /**
+     * Do the plot entry tasks for each player in the plot<br> - Usually called when the plot state
+     * changes (unclaimed/claimed/flag change etc)
+     */
+    public void reEnter() {
+        TaskManager.runTaskLater(() -> {
+            for (PlotPlayer pp : Plot.this.getPlayersInPlot()) {
+                PlotListener.plotExit(pp, Plot.this);
+                PlotListener.plotEntry(pp, Plot.this);
+            }
+        }, 1);
+    }
+
+    /**
+     * Get all the corners of the plot (supports non-rectangular shapes).
+     *
+     * @return A list of the plot corners
+     */
+    public List<Location> getAllCorners() {
+        Area area = new Area();
+        for (RegionWrapper region : this.getRegions()) {
+            Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6,
+                region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
+            Area rectArea = new Area(rect);
+            area.add(rectArea);
+        }
+        List<Location> locs = new ArrayList<>();
+        double[] coords = new double[6];
+        for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
+            int type = pi.currentSegment(coords);
+            int x = (int) MathMan.inverseRound(coords[0]);
+            int z = (int) MathMan.inverseRound(coords[1]);
+            if (type != 4) {
+                locs.add(new Location(this.getWorldName(), x, 0, z));
+            }
+        }
+        return locs;
+    }
+
+    /**
+     * Teleport a player to a plot and send them the teleport message.
+     *
+     * @param player the player
+     * @return if the teleport succeeded
+     */
+    public boolean teleportPlayer(final PlotPlayer player) {
+        Plot plot = this.getBasePlot(false);
+        boolean result = EventUtil.manager.callTeleport(player, player.getLocation(), plot);
+        if (result) {
+            final Location location;
+            if (this.area.HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
+                location = this.getHome();
+            } else {
+                location = this.getDefaultHome(false);
+            }
+            if (Settings.Teleport.DELAY == 0 || Permissions
+                .hasPermission(player, "plots.teleport.delay.bypass")) {
+                MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+                player.teleport(location);
+                return true;
+            }
+            MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
+            final String name = player.getName();
+            TaskManager.TELEPORT_QUEUE.add(name);
+            TaskManager.runTaskLater(() -> {
+                if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
+                    MainUtil.sendMessage(player, C.TELEPORT_FAILED);
+                    return;
+                }
+                TaskManager.TELEPORT_QUEUE.remove(name);
+                if (player.isOnline()) {
+                    MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+                    player.teleport(location);
+                }
+            }, Settings.Teleport.DELAY * 20);
+            return true;
+        }
+        return false;
+    }
+
+    public boolean isOnline() {
+        if (this.owner == null) {
+            return false;
+        }
+        if (!isMerged()) {
+            return UUIDHandler.getPlayer(this.owner) != null;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (current.hasOwner() && UUIDHandler.getPlayer(current.owner) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set a component for a plot to the provided blocks<br> - E.g. floor, wall, border etc.<br> - The
+     * available components depend on the generator being used<br>
+     */
+    public boolean setComponent(String component, BlockBucket blocks) {
+        if (StringMan
+            .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
+            EventUtil.manager.callComponentSet(this, component);
+        }
+        return this.getManager().setComponent(this.area, this.getId(), component, blocks);
+    }
+
+    public int getDistanceFromOrigin() {
+        Location bot = getManager().getPlotBottomLocAbs(this.area, id);
+        Location top = getManager().getPlotTopLocAbs(this.area, id);
+        return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
+            Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
+    }
+
+    /**
+     * Expand the world border to include the provided plot (if applicable).
+     */
+    public void updateWorldBorder() {
+        if (this.owner == null) {
+            return;
+        }
+        int border = this.area.getBorder();
+        if (border == Integer.MAX_VALUE) {
+            return;
+        }
+        int max = getDistanceFromOrigin();
+        if (max > border) {
+            this.area.setMeta("worldBorder", max);
+        }
+    }
+
+    /**
+     * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other
+     * <br> - saves to DB
+     */
+    public void mergePlot(Plot lesserPlot, boolean removeRoads) {
+        Plot greaterPlot = this;
+        if (lesserPlot.getId().x == greaterPlot.getId().x) {
+            if (lesserPlot.getId().y > greaterPlot.getId().y) {
+                Plot tmp = lesserPlot;
+                lesserPlot = greaterPlot;
+                greaterPlot = tmp;
+            }
+            if (!lesserPlot.getMerged(2)) {
+                lesserPlot.clearRatings();
+                greaterPlot.clearRatings();
+                lesserPlot.setMerged(2, true);
+                greaterPlot.setMerged(0, true);
+                lesserPlot.mergeData(greaterPlot);
+                if (removeRoads) {
+                    lesserPlot.removeRoadSouth();
+                    Plot diagonal = greaterPlot.getRelative(1);
+                    if (diagonal.getMerged(7)) {
+                        lesserPlot.removeRoadSouthEast();
+                    }
+                    Plot below = greaterPlot.getRelative(3);
+                    if (below.getMerged(4)) {
+                        below.getRelative(0).removeRoadSouthEast();
+                    }
+                }
+            }
+        } else {
+            if (lesserPlot.getId().x > greaterPlot.getId().x) {
+                Plot tmp = lesserPlot;
+                lesserPlot = greaterPlot;
+                greaterPlot = tmp;
+            }
+            if (!lesserPlot.getMerged(1)) {
+                lesserPlot.clearRatings();
+                greaterPlot.clearRatings();
+                lesserPlot.setMerged(1, true);
+                greaterPlot.setMerged(3, true);
+                lesserPlot.mergeData(greaterPlot);
+                if (removeRoads) {
+                    Plot diagonal = greaterPlot.getRelative(2);
+                    if (diagonal.getMerged(7)) {
+                        lesserPlot.removeRoadSouthEast();
+                    }
+                    lesserPlot.removeRoadEast();
+                }
+                Plot below = greaterPlot.getRelative(0);
+                if (below.getMerged(6)) {
+                    below.getRelative(3).removeRoadSouthEast();
+                }
+            }
+        }
+    }
+
+    /**
+     * Move a plot physically, as well as the corresponding settings.
+     *
+     * @param destination Plot moved to
+     * @param whenDone    task when done
+     * @param allowSwap   whether to swap plots
+     * @return success
+     */
+    public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
+        final PlotId offset = new PlotId(destination.getId().x - this.getId().x,
+            destination.getId().y - this.getId().y);
+        Location db = destination.getBottomAbs();
+        Location ob = this.getBottomAbs();
+        final int offsetX = db.getX() - ob.getX();
+        final int offsetZ = db.getZ() - ob.getZ();
+        if (this.owner == null) {
+            TaskManager.runTaskLater(whenDone, 1);
+            return false;
+        }
+        boolean occupied = false;
+        Set<Plot> plots = this.getConnectedPlots();
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            if (other.hasOwner()) {
+                if (!allowSwap) {
+                    TaskManager.runTaskLater(whenDone, 1);
+                    return false;
+                }
+                occupied = true;
+            } else {
+                plot.removeSign();
+            }
+        }
+        // world border
+        destination.updateWorldBorder();
+        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+        // move / swap data
+        final PlotArea originArea = getArea();
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            plot.swapData(other, null);
+        }
+        // copy terrain
+        Runnable move = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    Plot plot = destination.getRelative(0, 0);
+                    for (Plot current : plot.getConnectedPlots()) {
+                        getManager().claimPlot(current.getArea(), current);
+                        Plot originPlot = originArea.getPlotAbs(
+                            new PlotId(current.id.x - offset.x, current.id.y - offset.y));
+                        originPlot.getManager().unclaimPlot(originArea, originPlot, null);
+                    }
+                    plot.setSign();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                final Runnable task = this;
+                RegionWrapper region = regions.poll();
+                Location[] corners = region.getCorners(getWorldName());
+                final Location pos1 = corners[0];
+                final Location pos2 = corners[1];
+                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+                newPos.setWorld(destination.getWorldName());
+                ChunkManager.manager.copyRegion(pos1, pos2, newPos,
+                    () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
+            }
+        };
+        Runnable swap = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = regions.poll();
+                Location[] corners = region.getCorners(getWorldName());
+                Location pos1 = corners[0];
+                Location pos2 = corners[1];
+                Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
+                Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
+                pos3.setWorld(destination.getWorldName());
+                pos4.setWorld(destination.getWorldName());
+                ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
+            }
+        };
+        if (occupied) {
+            swap.run();
+        } else {
+            move.run();
+        }
+        return true;
+    }
+
+    /**
+     * Copy a plot to a location, both physically and the settings
+     */
+    public boolean copy(final Plot destination, final Runnable whenDone) {
+        PlotId offset = new PlotId(destination.getId().x - this.getId().x,
+            destination.getId().y - this.getId().y);
+        Location db = destination.getBottomAbs();
+        Location ob = this.getBottomAbs();
+        final int offsetX = db.getX() - ob.getX();
+        final int offsetZ = db.getZ() - ob.getZ();
+        if (this.owner == null) {
+            TaskManager.runTaskLater(whenDone, 1);
+            return false;
+        }
+        Set<Plot> plots = this.getConnectedPlots();
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            if (other.hasOwner()) {
+                TaskManager.runTaskLater(whenDone, 1);
+                return false;
+            }
+        }
+        // world border
+        destination.updateWorldBorder();
+        // copy data
+        for (Plot plot : plots) {
+            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
+            other.create(plot.owner, false);
+            if (!plot.getFlags().isEmpty()) {
+                other.getSettings().flags = plot.getFlags();
+                DBFunc.setFlags(other, plot.getFlags());
+            }
+            if (plot.isMerged()) {
+                other.setMerged(plot.getMerged());
+            }
+            if (plot.members != null && !plot.members.isEmpty()) {
+                other.members = plot.members;
+                for (UUID member : plot.members) {
+                    DBFunc.setMember(other, member);
+                }
+            }
+            if (plot.trusted != null && !plot.trusted.isEmpty()) {
+                other.trusted = plot.trusted;
+                for (UUID trusted : plot.trusted) {
+                    DBFunc.setTrusted(other, trusted);
+                }
+            }
+            if (plot.denied != null && !plot.denied.isEmpty()) {
+                other.denied = plot.denied;
+                for (UUID denied : plot.denied) {
+                    DBFunc.setDenied(other, denied);
+                }
+            }
+        }
+        // copy terrain
+        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                if (regions.isEmpty()) {
+                    for (Plot current : getConnectedPlots()) {
+                        destination.getManager().claimPlot(destination.getArea(), destination);
+                    }
+                    destination.setSign();
+                    TaskManager.runTask(whenDone);
+                    return;
+                }
+                RegionWrapper region = regions.poll();
+                Location[] corners = region.getCorners(getWorldName());
+                Location pos1 = corners[0];
+                Location pos2 = corners[1];
+                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+                newPos.setWorld(destination.getWorldName());
+                ChunkManager.manager.copyRegion(pos1, pos2, newPos, this);
+            }
+        };
+        run.run();
+        return true;
+    }
+
+    public boolean hasFlag(Flag<?> flag) {
+        return getFlags().containsKey(flag);
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
index 4a12bfb7b..ed9ca5fd8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
@@ -2,25 +2,21 @@ package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import lombok.Getter;
 
+import javax.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.UUID;
-import javax.annotation.Nonnull;
-import lombok.Getter;
 
 public class PlotCluster {
     public PlotArea area;
-    @Nonnull
-    @Getter
-    public PlotSettings settings;
+    @Nonnull @Getter public PlotSettings settings;
     public UUID owner;
     public HashSet<UUID> helpers = new HashSet<>();
     public HashSet<UUID> invited = new HashSet<>();
     public int temp;
-    @Nonnull
-    private PlotId pos1;
-    @Nonnull
-    private PlotId pos2;
+    @Nonnull private PlotId pos1;
+    @Nonnull private PlotId pos2;
     private RegionWrapper region;
 
     public PlotCluster(PlotArea area, @Nonnull PlotId pos1, @Nonnull PlotId pos2, UUID owner) {
@@ -88,11 +84,14 @@ public class PlotCluster {
         return this.settings.getAlias();
     }
 
+    public void setName(String name) {
+        this.settings.setAlias(name);
+    }
+
     public String getAlias() {
         return this.settings.getAlias();
     }
 
-    public void setName(String name) { this.settings.setAlias(name);}
     /**
      * Get the area (in plots).
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
index 51539dbdb..5280d6459 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
@@ -7,6 +7,23 @@ import lombok.NonNull;
 public class PlotInventory {
 
     private static final String META_KEY = "inventory";
+    public final PlotPlayer player;
+    public final int size;
+    private final PlotItemStack[] items;
+    private String title;
+    private boolean open = false;
+    public PlotInventory(PlotPlayer player) {
+        this.size = 4;
+        this.title = null;
+        this.player = player;
+        this.items = InventoryUtil.manager.getItems(player);
+    }
+    public PlotInventory(PlotPlayer player, int size, String name) {
+        this.size = size;
+        this.title = name == null ? "" : name;
+        this.player = player;
+        this.items = new PlotItemStack[size * 9];
+    }
 
     public static boolean hasPlotInventoryOpen(@NonNull final PlotPlayer plotPlayer) {
         return getOpenPlotInventory(plotPlayer) != null;
@@ -25,26 +42,6 @@ public class PlotInventory {
         plotPlayer.deleteMeta(META_KEY);
     }
 
-    public final PlotPlayer player;
-    public final int size;
-    private final PlotItemStack[] items;
-    private String title;
-    private boolean open = false;
-
-    public PlotInventory(PlotPlayer player) {
-        this.size = 4;
-        this.title = null;
-        this.player = player;
-        this.items = InventoryUtil.manager.getItems(player);
-    }
-
-    public PlotInventory(PlotPlayer player, int size, String name) {
-        this.size = size;
-        this.title = name == null ? "" : name;
-        this.player = player;
-        this.items = new PlotItemStack[size * 9];
-    }
-
     public boolean onClick(int index) {
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
index 631cbee39..e1254a8db 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
@@ -31,9 +31,11 @@ public class PlotLoc {
                 if (split.length == 2) {
                     return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
                 } else if (split.length == 3) {
-                    return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2]));
+                    return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]),
+                        Integer.parseInt(split[2]));
                 } else {
-                    throw new  IllegalArgumentException(String.format("Unable to deserialize: %s", input));
+                    throw new IllegalArgumentException(
+                        String.format("Unable to deserialize: %s", input));
                 }
             } catch (NumberFormatException ignored) {
                 return null;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index 850c77365..2fc42059f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -24,632 +24,625 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
-  public static final String META_LAST_PLOT = "lastplot";
-  public static final String META_LOCATION = "location";
-  private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
-  private Map<String, byte[]> metaMap = new HashMap<>();
-  /**
-   * The metadata map.
-   */
-  private ConcurrentHashMap<String, Object> meta;
+    public static final String META_LAST_PLOT = "lastplot";
+    public static final String META_LOCATION = "location";
+    private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
+    private Map<String, byte[]> metaMap = new HashMap<>();
+    /**
+     * The metadata map.
+     */
+    private ConcurrentHashMap<String, Object> meta;
 
-  public static <T> PlotPlayer from(@NonNull final T object) {
-    if (!converters.containsKey(object.getClass())) {
-      throw new IllegalArgumentException(String
-          .format("There is no registered PlotPlayer converter for type %s",
-              object.getClass().getSimpleName()));
-    }
-    return converters.get(object.getClass()).convert(object);
-  }
-
-  public static <T> void registerConverter(@NonNull final Class<T> clazz,
-      final PlotPlayerConverter<T> converter) {
-    converters.put(clazz, converter);
-  }
-
-  /**
-   * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's
-   * already cached)<br> - Accepts sponge/bukkit Player (online) - Accepts player name (online) -
-   * Accepts UUID - Accepts bukkit OfflinePlayer (offline)
-   */
-  public static PlotPlayer wrap(Object player) {
-    return PlotSquared.get().IMP.wrapPlayer(player);
-  }
-
-  /**
-   * Get the cached PlotPlayer from a username<br> - This will return null if the player has not
-   * finished logging in or is not online
-   */
-  public static PlotPlayer get(String name) {
-    return UUIDHandler.getPlayer(name);
-  }
-
-  /**
-   * Set some session only metadata for this player.
-   */
-  public void setMeta(String key, Object value) {
-    if (value == null) {
-      deleteMeta(key);
-    } else {
-      if (this.meta == null) {
-        this.meta = new ConcurrentHashMap<>();
-      }
-      this.meta.put(key, value);
-    }
-  }
-
-  /**
-   * Get the session metadata for a key.
-   *
-   * @param key the name of the metadata key
-   * @param <T> the object type to return
-   * @return the value assigned to the key or null if it does not exist
-   */
-  public <T> T getMeta(String key) {
-    if (this.meta != null) {
-      return (T) this.meta.get(key);
-    }
-    return null;
-  }
-
-  public <T> T getMeta(String key, T defaultValue) {
-    T meta = getMeta(key);
-    if (meta == null) {
-      return defaultValue;
-    }
-    return meta;
-  }
-
-  /**
-   * Delete the metadata for a key. - metadata is session only - deleting other plugin's metadata
-   * may cause issues
-   */
-  public Object deleteMeta(String key) {
-    return this.meta == null ? null : this.meta.remove(key);
-  }
-
-  /**
-   * This player's name.
-   *
-   * @return the name of the player
-   */
-  @Override
-  public String toString() {
-    return getName();
-  }
-
-  /**
-   * Get this player's current plot.
-   *
-   * @return the plot the player is standing on or null if standing on a road or not in a {@link
-   * PlotArea}
-   */
-  public Plot getCurrentPlot() {
-    Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
-    if (value == null && !Settings.Enabled_Components.EVENTS) {
-      return getLocation().getPlot();
-    }
-    return value;
-  }
-
-  /**
-   * Get the total number of allowed plots Possibly relevant: (To increment the player's allowed
-   * plots, see the example script on the wiki)
-   *
-   * @return number of allowed plots within the scope (globally, or in the player's current world as
-   * defined in the settings.yml)
-   */
-  public int getAllowedPlots() {
-    return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
-  }
-
-  /**
-   * Get the total number of allowed clusters
-   *
-   * @return number of allowed clusters within the scope (globally, or in the player's current world
-   * as defined in the settings.yml)
-   */
-  public int getAllowedClusters() {
-    return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
-  }
-
-  public int hasPermissionRange(String stub, int range) {
-    if (hasPermission(C.PERMISSION_ADMIN.s())) {
-      return Integer.MAX_VALUE;
-    }
-    String[] nodes = stub.split("\\.");
-    StringBuilder n = new StringBuilder();
-    for (int i = 0; i < (nodes.length - 1); i++) {
-      n.append(nodes[i]).append(".");
-      if (!stub.equals(n + C.PERMISSION_STAR.s())) {
-        if (hasPermission(n + C.PERMISSION_STAR.s())) {
-          return Integer.MAX_VALUE;
+    public static <T> PlotPlayer from(@NonNull final T object) {
+        if (!converters.containsKey(object.getClass())) {
+            throw new IllegalArgumentException(String
+                .format("There is no registered PlotPlayer converter for type %s",
+                    object.getClass().getSimpleName()));
         }
-      }
+        return converters.get(object.getClass()).convert(object);
     }
-    if (hasPermission(stub + ".*")) {
-      return Integer.MAX_VALUE;
-    }
-    for (int i = range; i > 0; i--) {
-      if (hasPermission(stub + "." + i)) {
-        return i;
-      }
-    }
-    return 0;
-  }
 
-  /**
-   * Get the number of plots this player owns.
-   *
-   * @return number of plots within the scope (globally, or in the player's current world as defined
-   * in the settings.yml)
-   * @see #getPlotCount(String);
-   * @see #getPlots()
-   */
-  public int getPlotCount() {
-    if (!Settings.Limit.GLOBAL) {
-      return getPlotCount(getLocation().getWorld());
+    public static <T> void registerConverter(@NonNull final Class<T> clazz,
+        final PlotPlayerConverter<T> converter) {
+        converters.put(clazz, converter);
     }
-    final AtomicInteger count = new AtomicInteger(0);
-    final UUID uuid = getUUID();
-    PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-          for (Plot plot : value.getPlotsAbs(uuid)) {
-            if (!plot.hasFlag(Flags.DONE)) {
-              count.incrementAndGet();
-            }
-          }
+
+    /**
+     * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's
+     * already cached)<br> - Accepts sponge/bukkit Player (online) - Accepts player name (online) -
+     * Accepts UUID - Accepts bukkit OfflinePlayer (offline)
+     */
+    public static PlotPlayer wrap(Object player) {
+        return PlotSquared.get().IMP.wrapPlayer(player);
+    }
+
+    /**
+     * Get the cached PlotPlayer from a username<br> - This will return null if the player has not
+     * finished logging in or is not online
+     */
+    public static PlotPlayer get(String name) {
+        return UUIDHandler.getPlayer(name);
+    }
+
+    /**
+     * Set some session only metadata for this player.
+     */
+    public void setMeta(String key, Object value) {
+        if (value == null) {
+            deleteMeta(key);
         } else {
-          count.addAndGet(value.getPlotsAbs(uuid).size());
-        }
-      }
-    });
-    return count.get();
-  }
-
-  public int getClusterCount() {
-    if (!Settings.Limit.GLOBAL) {
-      return getClusterCount(getLocation().getWorld());
-    }
-    final AtomicInteger count = new AtomicInteger(0);
-    final UUID uuid = getUUID();
-    PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        for (PlotCluster cluster : value.getClusters()) {
-          if (cluster.isOwner(getUUID())) {
-            count.incrementAndGet();
-          }
-        }
-      }
-    });
-    return count.get();
-  }
-
-  /**
-   * Get the number of plots this player owns in the world.
-   *
-   * @param world the name of the plotworld to check.
-   */
-  public int getPlotCount(String world) {
-    UUID uuid = getUUID();
-    int count = 0;
-    for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
-      if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-        for (Plot plot : area.getPlotsAbs(uuid)) {
-          if (!plot.getFlag(Flags.DONE).isPresent()) {
-            count++;
-          }
-        }
-      } else {
-        count += area.getPlotsAbs(uuid).size();
-      }
-    }
-    return count;
-  }
-
-  public int getClusterCount(String world) {
-    UUID uuid = getUUID();
-    int count = 0;
-    for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
-      for (PlotCluster cluster : area.getClusters()) {
-        if (cluster.isOwner(getUUID())) {
-          count++;
-        }
-      }
-    }
-    return count;
-  }
-
-  /**
-   * Get a {@code Set} of plots owned by this player.
-   *
-   * @return a {@code Set} of plots owned by the player
-   * @see PlotSquared for more searching functions
-   * @see #getPlotCount() for the number of plots
-   */
-  public Set<Plot> getPlots() {
-    return PlotSquared.get().getPlots(this);
-  }
-
-  /**
-   * Return the PlotArea this player is currently in, or null.
-   */
-  public PlotArea getPlotAreaAbs() {
-    return PlotSquared.get().getPlotAreaAbs(getLocation());
-  }
-
-  public PlotArea getApplicablePlotArea() {
-    return PlotSquared.get().getApplicablePlotArea(getLocation());
-  }
-
-  @Override
-  public RequiredType getSuperCaller() {
-    return RequiredType.PLAYER;
-  }
-
-  /**
-   * Get this player's last recorded location or null if they don't any plot relevant location.
-   *
-   * @return The location
-   */
-  public Location getLocation() {
-    Location location = getMeta("location");
-    if (location != null) {
-      return location;
-    }
-    return getLocationFull();
-  }
-
-  /////////////// PLAYER META ///////////////
-
-  ////////////// PARTIALLY IMPLEMENTED ///////////
-
-  /**
-   * Get this player's full location (including yaw/pitch)
-   */
-  public abstract Location getLocationFull();
-
-  ////////////////////////////////////////////////
-
-  /**
-   * Get this player's UUID. === !IMPORTANT ===<br> The UUID is dependent on the mode chosen in the
-   * settings.yml and may not be the same as Bukkit has (especially if using an old version of
-   * Bukkit that does not support UUIDs)
-   *
-   * @return UUID
-   */
-  @Override
-  public abstract UUID getUUID();
-
-  public boolean canTeleport(Location loc) {
-    Location current = getLocationFull();
-    teleport(loc);
-    boolean result = true;
-    if (!getLocation().equals(loc)) {
-      result = false;
-    }
-    teleport(current);
-    return result;
-  }
-
-  /**
-   * Teleport this player to a location.
-   *
-   * @param location the target location
-   */
-  public abstract void teleport(Location location);
-
-  /**
-   * Kick this player to a location
-   *
-   * @param location the target location
-   */
-  public void plotkick(Location location) {
-    setMeta("kick", true);
-    teleport(location);
-    deleteMeta("kick");
-  }
-
-  /**
-   * Set this compass target.
-   *
-   * @param location the target location
-   */
-  public abstract void setCompassTarget(Location location);
-
-  /**
-   * Set player data that will persist restarts. - Please note that this is not intended to store
-   * large values - For session only data use meta
-   */
-  public void setAttribute(String key) {
-    setPersistentMeta("attrib_" + key, new byte[]{(byte) 1});
-  }
-
-  /**
-   * Retrieves the attribute of this player.
-   *
-   * @return the attribute will be either true or false
-   */
-  public boolean getAttribute(String key) {
-    if (!hasPersistentMeta("attrib_" + key)) {
-      return false;
-    }
-    return getPersistentMeta("attrib_" + key)[0] == 1;
-  }
-
-  /**
-   * Remove an attribute from a player.
-   */
-  public void removeAttribute(String key) {
-    removePersistentMeta("attrib_" + key);
-  }
-
-  /**
-   * Sets the local weather for this Player.
-   *
-   * @param weather the weather visible to the player
-   */
-  public abstract void setWeather(PlotWeather weather);
-
-  /**
-   * Get this player's gamemode.
-   *
-   * @return the gamemode of the player.
-   */
-  public abstract PlotGameMode getGameMode();
-
-  /**
-   * Set this player's gameMode.
-   *
-   * @param gameMode the gamemode to set
-   */
-  public abstract void setGameMode(PlotGameMode gameMode);
-
-  /**
-   * Set this player's local time (ticks).
-   *
-   * @param time the time visible to the player
-   */
-  public abstract void setTime(long time);
-
-  public abstract boolean getFlight();
-
-  /**
-   * Set this player's fly mode.
-   *
-   * @param fly if the player can fly
-   */
-  public abstract void setFlight(boolean fly);
-
-  /**
-   * Play music at a location for this player.
-   *
-   * @param location where to play the music
-   * @param id the record item id
-   */
-  public abstract void playMusic(Location location, PlotBlock id);
-
-  /**
-   * Check if this player is banned.
-   *
-   * @return true if the player is banned, false otherwise.
-   */
-  public abstract boolean isBanned();
-
-  /**
-   * Kick this player from the game.
-   *
-   * @param message the reason for the kick
-   */
-  public abstract void kick(String message);
-
-  /**
-   * Called when this player quits.
-   */
-  public void unregister() {
-    Plot plot = getCurrentPlot();
-    if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
-        .getArea() instanceof SinglePlotArea) {
-      PlotId id = plot.getId();
-      int x = id.x;
-      int z = id.y;
-      ByteBuffer buffer = ByteBuffer.allocate(13);
-      buffer.putShort((short) x);
-      buffer.putShort((short) z);
-      Location loc = getLocation();
-      buffer.putInt(loc.getX());
-      buffer.put((byte) loc.getY());
-      buffer.putInt(loc.getZ());
-      setPersistentMeta("quitLoc", buffer.array());
-    } else if (hasPersistentMeta("quitLoc")) {
-      removePersistentMeta("quitLoc");
-    }
-    if (plot != null) {
-      EventUtil.manager.callLeave(this, plot);
-    }
-    if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
-      for (Plot owned : getPlots()) {
-        owned.deletePlot(null);
-        PlotSquared.debug(String
-            .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
-                owned.getId(), getName()));
-      }
-    }
-    String name = getName();
-    if (ExpireManager.IMP != null) {
-      ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
-    }
-    UUIDHandler.getPlayers().remove(name);
-    PlotSquared.get().IMP.unregister(this);
-  }
-
-  /**
-   * Get the amount of clusters this player owns in the specific world.
-   */
-  public int getPlayerClusterCount(String world) {
-    UUID uuid = getUUID();
-    int count = 0;
-    for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
-      if (uuid.equals(cluster.owner)) {
-        count += cluster.getArea();
-      }
-    }
-    return count;
-  }
-
-  /**
-   * Get the amount of clusters this player owns.
-   *
-   * @return the number of clusters this player owns
-   */
-  public int getPlayerClusterCount() {
-    final AtomicInteger count = new AtomicInteger();
-    PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-      @Override
-      public void run(PlotArea value) {
-        count.addAndGet(value.getClusters().size());
-      }
-    });
-    return count.get();
-  }
-
-  /**
-   * Return a {@code Set} of all plots this player owns in a certain world.
-   *
-   * @param world the world to retrieve plots from
-   * @return a {@code Set} of plots this player owns in the provided world
-   */
-  public Set<Plot> getPlots(String world) {
-    UUID uuid = getUUID();
-    HashSet<Plot> plots = new HashSet<>();
-    for (Plot plot : PlotSquared.get().getPlots(world)) {
-      if (plot.isOwner(uuid)) {
-        plots.add(plot);
-      }
-    }
-    return plots;
-  }
-
-  public void populatePersistentMetaMap() {
-    if (Settings.Enabled_Components.PERSISTENT_META) {
-      DBFunc.getPersistentMeta(getUUID(), new RunnableVal<Map<String, byte[]>>() {
-        @Override
-        public void run(Map<String, byte[]> value) {
-          try {
-            PlotPlayer.this.metaMap = value;
-            if (!value.isEmpty()) {
-              if (Settings.Enabled_Components.PERSISTENT_META) {
-                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
-                if (manager instanceof SinglePlotAreaManager) {
-                  PlotArea area = ((SinglePlotAreaManager) manager).getArea();
-                  byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
-                  if (arr != null) {
-                    removePersistentMeta("quitLoc");
-
-                    if (getMeta("teleportOnLogin", true)) {
-                      ByteBuffer quitWorld = ByteBuffer.wrap(arr);
-                      final int plotX = quitWorld.getShort();
-                      final int plotZ = quitWorld.getShort();
-                      PlotId id = new PlotId(plotX, plotZ);
-                      int x = quitWorld.getInt();
-                      int y = quitWorld.get() & 0xFF;
-                      int z = quitWorld.getInt();
-                      Plot plot = area.getOwnedPlot(id);
-                      if (plot != null) {
-                        final Location loc =
-                            new Location(plot.getWorldName(), x, y, z);
-                        if (plot.isLoaded()) {
-                          TaskManager.runTask(() -> {
-                            if (getMeta("teleportOnLogin", true)) {
-                              teleport(loc);
-                              sendMessage(C.TELEPORTED_TO_PLOT.f()
-                                  + " (quitLoc) (" + plotX + ","
-                                  + plotZ + ")");
-                            }
-                          });
-                        } else if (!PlotSquared.get()
-                            .isMainThread(Thread.currentThread())) {
-                          if (getMeta("teleportOnLogin", true)) {
-                            if (plot.teleportPlayer(PlotPlayer.this)) {
-                              TaskManager.runTask(() -> {
-                                if (getMeta("teleportOnLogin",
-                                    true)) {
-                                  teleport(loc);
-                                  sendMessage(
-                                      C.TELEPORTED_TO_PLOT.f()
-                                          + " (quitLoc-unloaded) ("
-                                          + plotX + ","
-                                          + plotZ + ")");
-                                }
-                              });
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            if (this.meta == null) {
+                this.meta = new ConcurrentHashMap<>();
             }
-          } catch (Throwable e) {
-            e.printStackTrace();
-          }
+            this.meta.put(key, value);
         }
-      });
     }
-  }
 
-  public byte[] getPersistentMeta(String key) {
-    return this.metaMap.get(key);
-  }
-
-  public void removePersistentMeta(String key) {
-    if (this.metaMap.containsKey(key)) {
-      this.metaMap.remove(key);
+    /**
+     * Get the session metadata for a key.
+     *
+     * @param key the name of the metadata key
+     * @param <T> the object type to return
+     * @return the value assigned to the key or null if it does not exist
+     */
+    public <T> T getMeta(String key) {
+        if (this.meta != null) {
+            return (T) this.meta.get(key);
+        }
+        return null;
     }
-    if (Settings.Enabled_Components.PERSISTENT_META) {
-      DBFunc.removePersistentMeta(getUUID(), key);
+
+    public <T> T getMeta(String key, T defaultValue) {
+        T meta = getMeta(key);
+        if (meta == null) {
+            return defaultValue;
+        }
+        return meta;
     }
-  }
 
-  public void setPersistentMeta(String key, byte[] value) {
-    boolean delete = hasPersistentMeta(key);
-    this.metaMap.put(key, value);
-    if (Settings.Enabled_Components.PERSISTENT_META) {
-      DBFunc.addPersistentMeta(getUUID(), key, value, delete);
+    /**
+     * Delete the metadata for a key. - metadata is session only - deleting other plugin's metadata
+     * may cause issues
+     */
+    public Object deleteMeta(String key) {
+        return this.meta == null ? null : this.meta.remove(key);
     }
-  }
 
-  public boolean hasPersistentMeta(String key) {
-    return this.metaMap.containsKey(key);
-  }
-
-  public abstract void stopSpectating();
-
-  /**
-   * The amount of money this Player has.
-   */
-  public double getMoney() {
-    return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
-  }
-
-  public void withdraw(double amount) {
-    if (EconHandler.manager != null) {
-      EconHandler.manager.withdrawMoney(this, amount);
+    /**
+     * This player's name.
+     *
+     * @return the name of the player
+     */
+    @Override public String toString() {
+        return getName();
     }
-  }
 
-  public void deposit(double amount) {
-    if (EconHandler.manager != null) {
-      EconHandler.manager.depositMoney(this, amount);
+    /**
+     * Get this player's current plot.
+     *
+     * @return the plot the player is standing on or null if standing on a road or not in a {@link
+     * PlotArea}
+     */
+    public Plot getCurrentPlot() {
+        Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
+        if (value == null && !Settings.Enabled_Components.EVENTS) {
+            return getLocation().getPlot();
+        }
+        return value;
     }
-  }
 
-  public interface PlotPlayerConverter<BaseObject> {
+    /**
+     * Get the total number of allowed plots Possibly relevant: (To increment the player's allowed
+     * plots, see the example script on the wiki)
+     *
+     * @return number of allowed plots within the scope (globally, or in the player's current world as
+     * defined in the settings.yml)
+     */
+    public int getAllowedPlots() {
+        return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
+    }
 
-    PlotPlayer convert(BaseObject object);
-  }
+    /**
+     * Get the total number of allowed clusters
+     *
+     * @return number of allowed clusters within the scope (globally, or in the player's current world
+     * as defined in the settings.yml)
+     */
+    public int getAllowedClusters() {
+        return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
+    }
+
+    public int hasPermissionRange(String stub, int range) {
+        if (hasPermission(C.PERMISSION_ADMIN.s())) {
+            return Integer.MAX_VALUE;
+        }
+        String[] nodes = stub.split("\\.");
+        StringBuilder n = new StringBuilder();
+        for (int i = 0; i < (nodes.length - 1); i++) {
+            n.append(nodes[i]).append(".");
+            if (!stub.equals(n + C.PERMISSION_STAR.s())) {
+                if (hasPermission(n + C.PERMISSION_STAR.s())) {
+                    return Integer.MAX_VALUE;
+                }
+            }
+        }
+        if (hasPermission(stub + ".*")) {
+            return Integer.MAX_VALUE;
+        }
+        for (int i = range; i > 0; i--) {
+            if (hasPermission(stub + "." + i)) {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * Get the number of plots this player owns.
+     *
+     * @return number of plots within the scope (globally, or in the player's current world as defined
+     * in the settings.yml)
+     * @see #getPlotCount(String);
+     * @see #getPlots()
+     */
+    public int getPlotCount() {
+        if (!Settings.Limit.GLOBAL) {
+            return getPlotCount(getLocation().getWorld());
+        }
+        final AtomicInteger count = new AtomicInteger(0);
+        final UUID uuid = getUUID();
+        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+                    for (Plot plot : value.getPlotsAbs(uuid)) {
+                        if (!plot.hasFlag(Flags.DONE)) {
+                            count.incrementAndGet();
+                        }
+                    }
+                } else {
+                    count.addAndGet(value.getPlotsAbs(uuid).size());
+                }
+            }
+        });
+        return count.get();
+    }
+
+    public int getClusterCount() {
+        if (!Settings.Limit.GLOBAL) {
+            return getClusterCount(getLocation().getWorld());
+        }
+        final AtomicInteger count = new AtomicInteger(0);
+        final UUID uuid = getUUID();
+        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                for (PlotCluster cluster : value.getClusters()) {
+                    if (cluster.isOwner(getUUID())) {
+                        count.incrementAndGet();
+                    }
+                }
+            }
+        });
+        return count.get();
+    }
+
+    /**
+     * Get the number of plots this player owns in the world.
+     *
+     * @param world the name of the plotworld to check.
+     */
+    public int getPlotCount(String world) {
+        UUID uuid = getUUID();
+        int count = 0;
+        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
+            if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+                for (Plot plot : area.getPlotsAbs(uuid)) {
+                    if (!plot.getFlag(Flags.DONE).isPresent()) {
+                        count++;
+                    }
+                }
+            } else {
+                count += area.getPlotsAbs(uuid).size();
+            }
+        }
+        return count;
+    }
+
+    public int getClusterCount(String world) {
+        UUID uuid = getUUID();
+        int count = 0;
+        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
+            for (PlotCluster cluster : area.getClusters()) {
+                if (cluster.isOwner(getUUID())) {
+                    count++;
+                }
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Get a {@code Set} of plots owned by this player.
+     *
+     * @return a {@code Set} of plots owned by the player
+     * @see PlotSquared for more searching functions
+     * @see #getPlotCount() for the number of plots
+     */
+    public Set<Plot> getPlots() {
+        return PlotSquared.get().getPlots(this);
+    }
+
+    /**
+     * Return the PlotArea this player is currently in, or null.
+     */
+    public PlotArea getPlotAreaAbs() {
+        return PlotSquared.get().getPlotAreaAbs(getLocation());
+    }
+
+    public PlotArea getApplicablePlotArea() {
+        return PlotSquared.get().getApplicablePlotArea(getLocation());
+    }
+
+    @Override public RequiredType getSuperCaller() {
+        return RequiredType.PLAYER;
+    }
+
+    /**
+     * Get this player's last recorded location or null if they don't any plot relevant location.
+     *
+     * @return The location
+     */
+    public Location getLocation() {
+        Location location = getMeta("location");
+        if (location != null) {
+            return location;
+        }
+        return getLocationFull();
+    }
+
+    /////////////// PLAYER META ///////////////
+
+    ////////////// PARTIALLY IMPLEMENTED ///////////
+
+    /**
+     * Get this player's full location (including yaw/pitch)
+     */
+    public abstract Location getLocationFull();
+
+    ////////////////////////////////////////////////
+
+    /**
+     * Get this player's UUID. === !IMPORTANT ===<br> The UUID is dependent on the mode chosen in the
+     * settings.yml and may not be the same as Bukkit has (especially if using an old version of
+     * Bukkit that does not support UUIDs)
+     *
+     * @return UUID
+     */
+    @Override public abstract UUID getUUID();
+
+    public boolean canTeleport(Location loc) {
+        Location current = getLocationFull();
+        teleport(loc);
+        boolean result = true;
+        if (!getLocation().equals(loc)) {
+            result = false;
+        }
+        teleport(current);
+        return result;
+    }
+
+    /**
+     * Teleport this player to a location.
+     *
+     * @param location the target location
+     */
+    public abstract void teleport(Location location);
+
+    /**
+     * Kick this player to a location
+     *
+     * @param location the target location
+     */
+    public void plotkick(Location location) {
+        setMeta("kick", true);
+        teleport(location);
+        deleteMeta("kick");
+    }
+
+    /**
+     * Set this compass target.
+     *
+     * @param location the target location
+     */
+    public abstract void setCompassTarget(Location location);
+
+    /**
+     * Set player data that will persist restarts. - Please note that this is not intended to store
+     * large values - For session only data use meta
+     */
+    public void setAttribute(String key) {
+        setPersistentMeta("attrib_" + key, new byte[] {(byte) 1});
+    }
+
+    /**
+     * Retrieves the attribute of this player.
+     *
+     * @return the attribute will be either true or false
+     */
+    public boolean getAttribute(String key) {
+        if (!hasPersistentMeta("attrib_" + key)) {
+            return false;
+        }
+        return getPersistentMeta("attrib_" + key)[0] == 1;
+    }
+
+    /**
+     * Remove an attribute from a player.
+     */
+    public void removeAttribute(String key) {
+        removePersistentMeta("attrib_" + key);
+    }
+
+    /**
+     * Sets the local weather for this Player.
+     *
+     * @param weather the weather visible to the player
+     */
+    public abstract void setWeather(PlotWeather weather);
+
+    /**
+     * Get this player's gamemode.
+     *
+     * @return the gamemode of the player.
+     */
+    public abstract PlotGameMode getGameMode();
+
+    /**
+     * Set this player's gameMode.
+     *
+     * @param gameMode the gamemode to set
+     */
+    public abstract void setGameMode(PlotGameMode gameMode);
+
+    /**
+     * Set this player's local time (ticks).
+     *
+     * @param time the time visible to the player
+     */
+    public abstract void setTime(long time);
+
+    public abstract boolean getFlight();
+
+    /**
+     * Set this player's fly mode.
+     *
+     * @param fly if the player can fly
+     */
+    public abstract void setFlight(boolean fly);
+
+    /**
+     * Play music at a location for this player.
+     *
+     * @param location where to play the music
+     * @param id       the record item id
+     */
+    public abstract void playMusic(Location location, PlotBlock id);
+
+    /**
+     * Check if this player is banned.
+     *
+     * @return true if the player is banned, false otherwise.
+     */
+    public abstract boolean isBanned();
+
+    /**
+     * Kick this player from the game.
+     *
+     * @param message the reason for the kick
+     */
+    public abstract void kick(String message);
+
+    /**
+     * Called when this player quits.
+     */
+    public void unregister() {
+        Plot plot = getCurrentPlot();
+        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
+            .getArea() instanceof SinglePlotArea) {
+            PlotId id = plot.getId();
+            int x = id.x;
+            int z = id.y;
+            ByteBuffer buffer = ByteBuffer.allocate(13);
+            buffer.putShort((short) x);
+            buffer.putShort((short) z);
+            Location loc = getLocation();
+            buffer.putInt(loc.getX());
+            buffer.put((byte) loc.getY());
+            buffer.putInt(loc.getZ());
+            setPersistentMeta("quitLoc", buffer.array());
+        } else if (hasPersistentMeta("quitLoc")) {
+            removePersistentMeta("quitLoc");
+        }
+        if (plot != null) {
+            EventUtil.manager.callLeave(this, plot);
+        }
+        if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
+            for (Plot owned : getPlots()) {
+                owned.deletePlot(null);
+                PlotSquared.debug(String
+                    .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
+                        owned.getId(), getName()));
+            }
+        }
+        String name = getName();
+        if (ExpireManager.IMP != null) {
+            ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
+        }
+        UUIDHandler.getPlayers().remove(name);
+        PlotSquared.get().IMP.unregister(this);
+    }
+
+    /**
+     * Get the amount of clusters this player owns in the specific world.
+     */
+    public int getPlayerClusterCount(String world) {
+        UUID uuid = getUUID();
+        int count = 0;
+        for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
+            if (uuid.equals(cluster.owner)) {
+                count += cluster.getArea();
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Get the amount of clusters this player owns.
+     *
+     * @return the number of clusters this player owns
+     */
+    public int getPlayerClusterCount() {
+        final AtomicInteger count = new AtomicInteger();
+        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
+            @Override public void run(PlotArea value) {
+                count.addAndGet(value.getClusters().size());
+            }
+        });
+        return count.get();
+    }
+
+    /**
+     * Return a {@code Set} of all plots this player owns in a certain world.
+     *
+     * @param world the world to retrieve plots from
+     * @return a {@code Set} of plots this player owns in the provided world
+     */
+    public Set<Plot> getPlots(String world) {
+        UUID uuid = getUUID();
+        HashSet<Plot> plots = new HashSet<>();
+        for (Plot plot : PlotSquared.get().getPlots(world)) {
+            if (plot.isOwner(uuid)) {
+                plots.add(plot);
+            }
+        }
+        return plots;
+    }
+
+    public void populatePersistentMetaMap() {
+        if (Settings.Enabled_Components.PERSISTENT_META) {
+            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<Map<String, byte[]>>() {
+                @Override public void run(Map<String, byte[]> value) {
+                    try {
+                        PlotPlayer.this.metaMap = value;
+                        if (!value.isEmpty()) {
+                            if (Settings.Enabled_Components.PERSISTENT_META) {
+                                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
+                                if (manager instanceof SinglePlotAreaManager) {
+                                    PlotArea area = ((SinglePlotAreaManager) manager).getArea();
+                                    byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
+                                    if (arr != null) {
+                                        removePersistentMeta("quitLoc");
+
+                                        if (getMeta("teleportOnLogin", true)) {
+                                            ByteBuffer quitWorld = ByteBuffer.wrap(arr);
+                                            final int plotX = quitWorld.getShort();
+                                            final int plotZ = quitWorld.getShort();
+                                            PlotId id = new PlotId(plotX, plotZ);
+                                            int x = quitWorld.getInt();
+                                            int y = quitWorld.get() & 0xFF;
+                                            int z = quitWorld.getInt();
+                                            Plot plot = area.getOwnedPlot(id);
+                                            if (plot != null) {
+                                                final Location loc =
+                                                    new Location(plot.getWorldName(), x, y, z);
+                                                if (plot.isLoaded()) {
+                                                    TaskManager.runTask(() -> {
+                                                        if (getMeta("teleportOnLogin", true)) {
+                                                            teleport(loc);
+                                                            sendMessage(C.TELEPORTED_TO_PLOT.f()
+                                                                + " (quitLoc) (" + plotX + ","
+                                                                + plotZ + ")");
+                                                        }
+                                                    });
+                                                } else if (!PlotSquared.get()
+                                                    .isMainThread(Thread.currentThread())) {
+                                                    if (getMeta("teleportOnLogin", true)) {
+                                                        if (plot.teleportPlayer(PlotPlayer.this)) {
+                                                            TaskManager.runTask(() -> {
+                                                                if (getMeta("teleportOnLogin",
+                                                                    true)) {
+                                                                    teleport(loc);
+                                                                    sendMessage(
+                                                                        C.TELEPORTED_TO_PLOT.f()
+                                                                            + " (quitLoc-unloaded) ("
+                                                                            + plotX + "," + plotZ
+                                                                            + ")");
+                                                                }
+                                                            });
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } catch (Throwable e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+    }
+
+    public byte[] getPersistentMeta(String key) {
+        return this.metaMap.get(key);
+    }
+
+    public void removePersistentMeta(String key) {
+        if (this.metaMap.containsKey(key)) {
+            this.metaMap.remove(key);
+        }
+        if (Settings.Enabled_Components.PERSISTENT_META) {
+            DBFunc.removePersistentMeta(getUUID(), key);
+        }
+    }
+
+    public void setPersistentMeta(String key, byte[] value) {
+        boolean delete = hasPersistentMeta(key);
+        this.metaMap.put(key, value);
+        if (Settings.Enabled_Components.PERSISTENT_META) {
+            DBFunc.addPersistentMeta(getUUID(), key, value, delete);
+        }
+    }
+
+    public boolean hasPersistentMeta(String key) {
+        return this.metaMap.containsKey(key);
+    }
+
+    public abstract void stopSpectating();
+
+    /**
+     * The amount of money this Player has.
+     */
+    public double getMoney() {
+        return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
+    }
+
+    public void withdraw(double amount) {
+        if (EconHandler.manager != null) {
+            EconHandler.manager.withdrawMoney(this, amount);
+        }
+    }
+
+    public void deposit(double amount) {
+        if (EconHandler.manager != null) {
+            EconHandler.manager.depositMoney(this, amount);
+        }
+    }
+
+    public interface PlotPlayerConverter<BaseObject> {
+
+        PlotPlayer convert(BaseObject object);
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
index 19425065f..900471193 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
@@ -5,30 +5,26 @@ import java.io.OutputStream;
 
 public class AbstractDelegateOutputStream extends OutputStream {
 
-  private final OutputStream parent;
+    private final OutputStream parent;
 
-  public AbstractDelegateOutputStream(OutputStream os) {
-    this.parent = os;
-  }
+    public AbstractDelegateOutputStream(OutputStream os) {
+        this.parent = os;
+    }
 
-  @Override
-  public void write(int b) throws IOException {
-    parent.write(b);
-  }
+    @Override public void write(int b) throws IOException {
+        parent.write(b);
+    }
 
-  @Override
-  public void write(byte[] b) throws IOException {
-    parent.write(b);
-  }
-    
-  @Override
-  public void flush() throws IOException {
-    parent.flush();
-  }
+    @Override public void write(byte[] b) throws IOException {
+        parent.write(b);
+    }
 
-  @Override
-  public void close() throws IOException {
-    parent.close();
-  }
+    @Override public void flush() throws IOException {
+        parent.flush();
+    }
+
+    @Override public void close() throws IOException {
+        parent.close();
+    }
 }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
index 0919624d9..f53465b2a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -89,8 +89,7 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         localAreas.add(plotArea);
         globalAreas.add(plotArea);
         this.plotAreas = globalAreas.toArray(new PlotArea[0]);
-        this.plotAreaMap
-            .put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
+        this.plotAreaMap.put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
         QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
         if (map == null) {
             map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
@@ -111,8 +110,7 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
             this.plotAreaMap.remove(area.worldname);
             this.plotAreaGrid.remove(area.worldname);
         } else {
-            this.plotAreaMap
-                .put(area.worldname, globalAreas.toArray(new PlotArea[0]));
+            this.plotAreaMap.put(area.worldname, globalAreas.toArray(new PlotArea[0]));
             this.plotAreaGrid.get(area.worldname).remove(area);
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
index 7d57e7d2c..5cf07cc14 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
@@ -4,10 +4,10 @@ import com.github.intellectualsites.plotsquared.plot.config.C;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 
+import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.UUID;
-import javax.annotation.Nonnull;
 
 public class SinglePlot extends Plot {
     private HashSet<RegionWrapper> regions;
@@ -41,8 +41,7 @@ public class SinglePlot extends Plot {
         return getId().toCommaSeparatedString();
     }
 
-    @Nonnull
-    @Override public SinglePlotArea getArea() {
+    @Nonnull @Override public SinglePlotArea getArea() {
         return (SinglePlotArea) super.getArea();
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index d27dc7597..cf2ca96ed 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -240,8 +240,8 @@ public abstract class ChunkManager {
         TaskManager.runTaskAsync(() -> {
             for (ChunkLoc loc : chunks) {
                 String directory =
-                    world + File.separator + "region" + File.separator + "r." + loc.x + "."
-                        + loc.z + ".mca";
+                    world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z
+                        + ".mca";
                 File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
                 PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
                 if (file.exists()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index cc5021c57..524ea7f67 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -31,8 +31,7 @@ public class CommentManager {
                         if (value != null) {
                             int num = 0;
                             for (PlotComment comment : value) {
-                                if (comment.timestamp > getTimestamp(player,
-                                    inbox.toString())) {
+                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
                                     num++;
                                 }
                             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
index 0a83301bb..18a822d07 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
@@ -1,8 +1,11 @@
 package com.github.intellectualsites.plotsquared.plot.util;
+
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.google.common.base.Charsets;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
@@ -11,8 +14,7 @@ import java.util.*;
 /**
  * Single class paster for the Incendo paste service
  */
-@SuppressWarnings({"unused", "WeakerAccess"})
-public final class IncendoPaster {
+@SuppressWarnings({"unused", "WeakerAccess"}) public final class IncendoPaster {
 
     /**
      * Upload service URL
@@ -21,9 +23,8 @@ public final class IncendoPaster {
     /**
      * Valid paste applications
      */
-    public static final Collection<String>
-        VALID_APPLICATIONS = Arrays
-        .asList("plotsquared", "fastasyncworldedit", "incendopermissions", "kvantum");
+    public static final Collection<String> VALID_APPLICATIONS =
+        Arrays.asList("plotsquared", "fastasyncworldedit", "incendopermissions", "kvantum");
 
     private final Collection<PasteFile> files = new ArrayList<>();
     private final String pasteApplication;
@@ -38,7 +39,8 @@ public final class IncendoPaster {
             throw new IllegalArgumentException("paste application cannot be null, nor empty");
         }
         if (!VALID_APPLICATIONS.contains(pasteApplication.toLowerCase(Locale.ENGLISH))) {
-            throw new IllegalArgumentException(String.format("Unknown application name: %s", pasteApplication));
+            throw new IllegalArgumentException(
+                String.format("Unknown application name: %s", pasteApplication));
         }
         this.pasteApplication = pasteApplication;
     }
@@ -64,8 +66,8 @@ public final class IncendoPaster {
         // Check to see that no duplicate files are submitted
         for (final PasteFile pasteFile : this.files) {
             if (pasteFile.fileName.equalsIgnoreCase(file.getFileName())) {
-                throw new IllegalArgumentException(String.format("Found duplicate file with name %s",
-                    file.getFileName()));
+                throw new IllegalArgumentException(
+                    String.format("Found duplicate file with name %s", file.getFileName()));
             }
         }
         this.files.add(file);
@@ -78,7 +80,8 @@ public final class IncendoPaster {
      */
     private String toJsonString() {
         final StringBuilder builder = new StringBuilder("{\n");
-        builder.append("\"paste_application\": \"").append(this.pasteApplication).append("\",\n\"files\": \"");
+        builder.append("\"paste_application\": \"").append(this.pasteApplication)
+            .append("\",\n\"files\": \"");
         Iterator<PasteFile> fileIterator = this.files.iterator();
         while (fileIterator.hasNext()) {
             final PasteFile file = fileIterator.next();
@@ -126,11 +129,13 @@ public final class IncendoPaster {
                 final long size = content.length;
                 PlotSquared.debug(String.format("Paste Too Big > Size: %dMB", size / 1_000_000));
             }
-            throw new IllegalStateException(String.format("Server returned status: %d %s",
-                httpURLConnection.getResponseCode(), httpURLConnection.getResponseMessage()));
+            throw new IllegalStateException(String
+                .format("Server returned status: %d %s", httpURLConnection.getResponseCode(),
+                    httpURLConnection.getResponseMessage()));
         }
         final StringBuilder input = new StringBuilder();
-        try (final BufferedReader inputStream = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream()))) {
+        try (final BufferedReader inputStream = new BufferedReader(
+            new InputStreamReader(httpURLConnection.getInputStream()))) {
             String line;
             while ((line = inputStream.readLine()) != null) {
                 input.append(line).append("\n");
@@ -151,7 +156,7 @@ public final class IncendoPaster {
          * Construct a new paste file
          *
          * @param fileName File name, cannot be empty, nor null
-         * @param content File content, cannot be empty, nor null
+         * @param content  File content, cannot be empty, nor null
          */
         public PasteFile(final String fileName, final String content) {
             if (fileName == null || fileName.isEmpty()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index e65169260..5dcc954a8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -780,8 +780,7 @@ public class MainUtil {
             final String newInfo = info;
             TaskManager.runTaskAsync(() -> {
                 int max = 10;
-                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES
-                    .isEmpty()) {
+                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
                     max = 8;
                 }
                 String info1;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
index d626eb3bd..739c31bec 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
@@ -245,8 +245,8 @@ public class StringMan {
     }
 
     public static boolean isEqual(String a, String b) {
-       return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && 
-              (a.hashCode() == b.hashCode()) && a.equals(b));
+        return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && (
+            a.hashCode() == b.hashCode()) && a.equals(b));
         // return a.equals(b) || b != null && a.length() == b.length() && a.hashCode() == b.hashCode()
         //    && a.equals(b);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
index 3d065a527..84d5f7ef4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -13,292 +13,291 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 public class GlobalBlockQueue {
 
-  public static GlobalBlockQueue IMP;
-  private final int PARALLEL_THREADS;
-  private final ConcurrentLinkedDeque<LocalBlockQueue> activeQueues;
-  private final ConcurrentLinkedDeque<LocalBlockQueue> inactiveQueues;
-  private final ConcurrentLinkedDeque<Runnable> runnables;
-  private final AtomicBoolean running;
-  private QueueProvider provider;
-  /**
-   * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the
-   * server
-   */
-  private long last;
-  private long secondLast;
-  private long lastSuccess;
-  private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
-      new RunnableVal2<Long, LocalBlockQueue>() {
-        @Override
-        public void run(Long free, LocalBlockQueue queue) {
-          do {
-            boolean more = queue.next();
-            if (!more) {
-              lastSuccess = last;
-              if (inactiveQueues.size() == 0 && activeQueues.size() == 0) {
-                tasks();
-              }
-              return;
+    public static GlobalBlockQueue IMP;
+    private final int PARALLEL_THREADS;
+    private final ConcurrentLinkedDeque<LocalBlockQueue> activeQueues;
+    private final ConcurrentLinkedDeque<LocalBlockQueue> inactiveQueues;
+    private final ConcurrentLinkedDeque<Runnable> runnables;
+    private final AtomicBoolean running;
+    private QueueProvider provider;
+    /**
+     * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the
+     * server
+     */
+    private long last;
+    private long secondLast;
+    private long lastSuccess;
+    private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
+        new RunnableVal2<Long, LocalBlockQueue>() {
+            @Override public void run(Long free, LocalBlockQueue queue) {
+                do {
+                    boolean more = queue.next();
+                    if (!more) {
+                        lastSuccess = last;
+                        if (inactiveQueues.size() == 0 && activeQueues.size() == 0) {
+                            tasks();
+                        }
+                        return;
+                    }
+                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
+                    - GlobalBlockQueue.this.last) < free);
             }
-          } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
-              - GlobalBlockQueue.this.last) < free);
+        };
+
+    public GlobalBlockQueue(QueueProvider provider, int threads) {
+        this.provider = provider;
+        activeQueues = new ConcurrentLinkedDeque<>();
+        inactiveQueues = new ConcurrentLinkedDeque<>();
+        runnables = new ConcurrentLinkedDeque<>();
+        running = new AtomicBoolean();
+        this.PARALLEL_THREADS = threads;
+    }
+
+    public QueueProvider getProvider() {
+        return provider;
+    }
+
+    public void setProvider(QueueProvider provider) {
+        this.provider = provider;
+    }
+
+    public LocalBlockQueue getNewQueue(String world, boolean autoQueue) {
+        LocalBlockQueue queue = provider.getNewQueue(world);
+        if (autoQueue) {
+            inactiveQueues.add(queue);
         }
-      };
-
-  public GlobalBlockQueue(QueueProvider provider, int threads) {
-    this.provider = provider;
-    activeQueues = new ConcurrentLinkedDeque<>();
-    inactiveQueues = new ConcurrentLinkedDeque<>();
-    runnables = new ConcurrentLinkedDeque<>();
-    running = new AtomicBoolean();
-    this.PARALLEL_THREADS = threads;
-  }
-
-  public QueueProvider getProvider() {
-    return provider;
-  }
-
-  public void setProvider(QueueProvider provider) {
-    this.provider = provider;
-  }
-
-  public LocalBlockQueue getNewQueue(String world, boolean autoQueue) {
-    LocalBlockQueue queue = provider.getNewQueue(world);
-    if (autoQueue) {
-      inactiveQueues.add(queue);
-    }
-    return queue;
-  }
-
-  public boolean stop() {
-    if (!running.get()) {
-      return false;
-    }
-    running.set(false);
-    return true;
-  }
-
-  public boolean runTask() {
-    if (running.get()) {
-      return false;
-    }
-    running.set(true);
-    TaskManager.runTaskRepeat(() -> {
-      if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
-        lastSuccess = System.currentTimeMillis();
-        tasks();
-        return;
-      }
-      SET_TASK.value1 = 50 + Math.min(
-          (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
-              System.currentTimeMillis()),
-          GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
-      SET_TASK.value2 = getNextQueue();
-      if (SET_TASK.value2 == null) {
-        return;
-      }
-      if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-        throw new IllegalStateException(
-            "This shouldn't be possible for placement to occur off the main thread");
-      }
-      // Disable the async catcher as it can't discern async vs parallel
-      SET_TASK.value2.startSet(true);
-      try {
-        if (PARALLEL_THREADS <= 1) {
-          SET_TASK.run();
-        } else {
-          ArrayList<Thread> threads = new ArrayList<Thread>();
-          for (int i = 0; i < PARALLEL_THREADS; i++) {
-            threads.add(new Thread(SET_TASK));
-          }
-          for (Thread thread : threads) {
-            thread.start();
-          }
-          for (Thread thread : threads) {
-            try {
-              thread.join();
-            } catch (InterruptedException e) {
-              e.printStackTrace();
-            }
-          }
-        }
-      } catch (Throwable e) {
-        e.printStackTrace();
-      } finally {
-        // Enable it again (note that we are still on the main thread)
-        SET_TASK.value2.endSet(true);
-      }
-    }, 1);
-    return true;
-  }
-
-  public QueueStage getStage(LocalBlockQueue queue) {
-    if (activeQueues.contains(queue)) {
-      return QueueStage.ACTIVE;
-    } else if (inactiveQueues.contains(queue)) {
-      return QueueStage.INACTIVE;
-    }
-    return QueueStage.NONE;
-  }
-
-  public boolean isStage(LocalBlockQueue queue, QueueStage stage) {
-    switch (stage) {
-      case ACTIVE:
-        return activeQueues.contains(queue);
-      case INACTIVE:
-        return inactiveQueues.contains(queue);
-      case NONE:
-        return !activeQueues.contains(queue) && !inactiveQueues.contains(queue);
-    }
-    return false;
-  }
-
-  public void enqueue(LocalBlockQueue queue) {
-    inactiveQueues.remove(queue);
-    if (queue.size() > 0 && !activeQueues.contains(queue)) {
-      queue.optimize();
-      activeQueues.add(queue);
-    }
-  }
-
-  public void dequeue(LocalBlockQueue queue) {
-    inactiveQueues.remove(queue);
-    activeQueues.remove(queue);
-  }
-
-  public List<LocalBlockQueue> getAllQueues() {
-    ArrayList<LocalBlockQueue> list =
-        new ArrayList<>(activeQueues.size() + inactiveQueues.size());
-    list.addAll(inactiveQueues);
-    list.addAll(activeQueues);
-    return list;
-  }
-
-  public List<LocalBlockQueue> getActiveQueues() {
-    return new ArrayList<>(activeQueues);
-  }
-
-  public List<LocalBlockQueue> getInactiveQueues() {
-    return new ArrayList<>(inactiveQueues);
-  }
-
-  public void flush(LocalBlockQueue queue) {
-    SET_TASK.value1 = Long.MAX_VALUE;
-    SET_TASK.value2 = queue;
-    if (SET_TASK.value2 == null) {
-      return;
-    }
-    if (PlotSquared.get().isMainThread(Thread.currentThread())) {
-      throw new IllegalStateException("Must be flushed on the main thread!");
-    }
-    // Disable the async catcher as it can't discern async vs parallel
-    SET_TASK.value2.startSet(true);
-    try {
-      if (PARALLEL_THREADS <= 1) {
-        SET_TASK.run();
-      } else {
-        ArrayList<Thread> threads = new ArrayList<>();
-        for (int i = 0; i < PARALLEL_THREADS; i++) {
-          threads.add(new Thread(SET_TASK));
-        }
-        for (Thread thread : threads) {
-          thread.start();
-        }
-        for (Thread thread : threads) {
-          try {
-            thread.join();
-          } catch (InterruptedException e) {
-            e.printStackTrace();
-          }
-        }
-      }
-    } catch (Throwable e) {
-      e.printStackTrace();
-    } finally {
-      // Enable it again (note that we are still on the main thread)
-      SET_TASK.value2.endSet(true);
-      dequeue(queue);
-    }
-  }
-
-  public LocalBlockQueue getNextQueue() {
-    long now = System.currentTimeMillis();
-    while (activeQueues.size() > 0) {
-      LocalBlockQueue queue = activeQueues.peek();
-      if (queue != null && queue.size() > 0) {
-        queue.setModified(now);
         return queue;
-      } else {
-        activeQueues.poll();
-      }
     }
-    int size = inactiveQueues.size();
-    if (size > 0) {
-      Iterator<LocalBlockQueue> iter = inactiveQueues.iterator();
-      try {
-        int total = 0;
-        LocalBlockQueue firstNonEmpty = null;
-        while (iter.hasNext()) {
-          LocalBlockQueue queue = iter.next();
-          long age = now - queue.getModified();
-          total += queue.size();
-          if (queue.size() == 0) {
-            if (age > 1000) {
-              iter.remove();
-            }
-            continue;
-          }
-          if (firstNonEmpty == null) {
-            firstNonEmpty = queue;
-          }
-          if (total > 64) {
-            firstNonEmpty.setModified(now);
-            return firstNonEmpty;
-          }
-          if (age > 60000) {
-            queue.setModified(now);
-            return queue;
-          }
+
+    public boolean stop() {
+        if (!running.get()) {
+            return false;
         }
-      } catch (ConcurrentModificationException e) {
-        e.printStackTrace();
-      }
+        running.set(false);
+        return true;
     }
-    return null;
-  }
 
-  public boolean isDone() {
-    return activeQueues.size() == 0 && inactiveQueues.size() == 0;
-  }
+    public boolean runTask() {
+        if (running.get()) {
+            return false;
+        }
+        running.set(true);
+        TaskManager.runTaskRepeat(() -> {
+            if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
+                lastSuccess = System.currentTimeMillis();
+                tasks();
+                return;
+            }
+            SET_TASK.value1 = 50 + Math.min(
+                (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
+                    System.currentTimeMillis()),
+                GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
+            SET_TASK.value2 = getNextQueue();
+            if (SET_TASK.value2 == null) {
+                return;
+            }
+            if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                throw new IllegalStateException(
+                    "This shouldn't be possible for placement to occur off the main thread");
+            }
+            // Disable the async catcher as it can't discern async vs parallel
+            SET_TASK.value2.startSet(true);
+            try {
+                if (PARALLEL_THREADS <= 1) {
+                    SET_TASK.run();
+                } else {
+                    ArrayList<Thread> threads = new ArrayList<Thread>();
+                    for (int i = 0; i < PARALLEL_THREADS; i++) {
+                        threads.add(new Thread(SET_TASK));
+                    }
+                    for (Thread thread : threads) {
+                        thread.start();
+                    }
+                    for (Thread thread : threads) {
+                        try {
+                            thread.join();
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } catch (Throwable e) {
+                e.printStackTrace();
+            } finally {
+                // Enable it again (note that we are still on the main thread)
+                SET_TASK.value2.endSet(true);
+            }
+        }, 1);
+        return true;
+    }
 
-  public boolean addTask(final Runnable whenDone) {
-    if (this.isDone()) {
-      // Run
-      this.tasks();
-      if (whenDone != null) {
-        whenDone.run();
-      }
-      return true;
+    public QueueStage getStage(LocalBlockQueue queue) {
+        if (activeQueues.contains(queue)) {
+            return QueueStage.ACTIVE;
+        } else if (inactiveQueues.contains(queue)) {
+            return QueueStage.INACTIVE;
+        }
+        return QueueStage.NONE;
     }
-    if (whenDone != null) {
-      this.runnables.add(whenDone);
-    }
-    return false;
-  }
 
-  public synchronized boolean tasks() {
-    if (this.runnables.isEmpty()) {
-      return false;
+    public boolean isStage(LocalBlockQueue queue, QueueStage stage) {
+        switch (stage) {
+            case ACTIVE:
+                return activeQueues.contains(queue);
+            case INACTIVE:
+                return inactiveQueues.contains(queue);
+            case NONE:
+                return !activeQueues.contains(queue) && !inactiveQueues.contains(queue);
+        }
+        return false;
     }
-    final ArrayList<Runnable> tmp = new ArrayList<>(this.runnables);
-    this.runnables.clear();
-    for (final Runnable runnable : tmp) {
-      runnable.run();
-    }
-    return true;
-  }
 
-  public enum QueueStage {
-    INACTIVE, ACTIVE, NONE
-  }
+    public void enqueue(LocalBlockQueue queue) {
+        inactiveQueues.remove(queue);
+        if (queue.size() > 0 && !activeQueues.contains(queue)) {
+            queue.optimize();
+            activeQueues.add(queue);
+        }
+    }
+
+    public void dequeue(LocalBlockQueue queue) {
+        inactiveQueues.remove(queue);
+        activeQueues.remove(queue);
+    }
+
+    public List<LocalBlockQueue> getAllQueues() {
+        ArrayList<LocalBlockQueue> list =
+            new ArrayList<>(activeQueues.size() + inactiveQueues.size());
+        list.addAll(inactiveQueues);
+        list.addAll(activeQueues);
+        return list;
+    }
+
+    public List<LocalBlockQueue> getActiveQueues() {
+        return new ArrayList<>(activeQueues);
+    }
+
+    public List<LocalBlockQueue> getInactiveQueues() {
+        return new ArrayList<>(inactiveQueues);
+    }
+
+    public void flush(LocalBlockQueue queue) {
+        SET_TASK.value1 = Long.MAX_VALUE;
+        SET_TASK.value2 = queue;
+        if (SET_TASK.value2 == null) {
+            return;
+        }
+        if (PlotSquared.get().isMainThread(Thread.currentThread())) {
+            throw new IllegalStateException("Must be flushed on the main thread!");
+        }
+        // Disable the async catcher as it can't discern async vs parallel
+        SET_TASK.value2.startSet(true);
+        try {
+            if (PARALLEL_THREADS <= 1) {
+                SET_TASK.run();
+            } else {
+                ArrayList<Thread> threads = new ArrayList<>();
+                for (int i = 0; i < PARALLEL_THREADS; i++) {
+                    threads.add(new Thread(SET_TASK));
+                }
+                for (Thread thread : threads) {
+                    thread.start();
+                }
+                for (Thread thread : threads) {
+                    try {
+                        thread.join();
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        } finally {
+            // Enable it again (note that we are still on the main thread)
+            SET_TASK.value2.endSet(true);
+            dequeue(queue);
+        }
+    }
+
+    public LocalBlockQueue getNextQueue() {
+        long now = System.currentTimeMillis();
+        while (activeQueues.size() > 0) {
+            LocalBlockQueue queue = activeQueues.peek();
+            if (queue != null && queue.size() > 0) {
+                queue.setModified(now);
+                return queue;
+            } else {
+                activeQueues.poll();
+            }
+        }
+        int size = inactiveQueues.size();
+        if (size > 0) {
+            Iterator<LocalBlockQueue> iter = inactiveQueues.iterator();
+            try {
+                int total = 0;
+                LocalBlockQueue firstNonEmpty = null;
+                while (iter.hasNext()) {
+                    LocalBlockQueue queue = iter.next();
+                    long age = now - queue.getModified();
+                    total += queue.size();
+                    if (queue.size() == 0) {
+                        if (age > 1000) {
+                            iter.remove();
+                        }
+                        continue;
+                    }
+                    if (firstNonEmpty == null) {
+                        firstNonEmpty = queue;
+                    }
+                    if (total > 64) {
+                        firstNonEmpty.setModified(now);
+                        return firstNonEmpty;
+                    }
+                    if (age > 60000) {
+                        queue.setModified(now);
+                        return queue;
+                    }
+                }
+            } catch (ConcurrentModificationException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    public boolean isDone() {
+        return activeQueues.size() == 0 && inactiveQueues.size() == 0;
+    }
+
+    public boolean addTask(final Runnable whenDone) {
+        if (this.isDone()) {
+            // Run
+            this.tasks();
+            if (whenDone != null) {
+                whenDone.run();
+            }
+            return true;
+        }
+        if (whenDone != null) {
+            this.runnables.add(whenDone);
+        }
+        return false;
+    }
+
+    public synchronized boolean tasks() {
+        if (this.runnables.isEmpty()) {
+            return false;
+        }
+        final ArrayList<Runnable> tmp = new ArrayList<>(this.runnables);
+        this.runnables.clear();
+        for (final Runnable runnable : tmp) {
+            runnable.run();
+        }
+        return true;
+    }
+
+    public enum QueueStage {
+        INACTIVE, ACTIVE, NONE
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index 2f69b818e..0362e0831 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -19,435 +19,431 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 
 public class ExpireManager {
 
-  public static ExpireManager IMP;
-  private final ConcurrentHashMap<UUID, Long> dates_cache;
-  private final ConcurrentHashMap<UUID, Long> account_age_cache;
-  private volatile HashSet<Plot> plotsToDelete;
-  private ArrayDeque<ExpiryTask> tasks;
-  /**
-   * 0 = stopped, 1 = stopping, 2 = running
-   */
-  private int running;
+    public static ExpireManager IMP;
+    private final ConcurrentHashMap<UUID, Long> dates_cache;
+    private final ConcurrentHashMap<UUID, Long> account_age_cache;
+    private volatile HashSet<Plot> plotsToDelete;
+    private ArrayDeque<ExpiryTask> tasks;
+    /**
+     * 0 = stopped, 1 = stopping, 2 = running
+     */
+    private int running;
 
-  public ExpireManager() {
-    tasks = new ArrayDeque<>();
-    dates_cache = new ConcurrentHashMap<>();
-    account_age_cache = new ConcurrentHashMap<>();
-  }
-
-  public void addTask(ExpiryTask task) {
-    PlotSquared.debug("Adding new expiry task!");
-    this.tasks.add(task);
-  }
-
-  public void handleJoin(PlotPlayer pp) {
-    storeDate(pp.getUUID(), System.currentTimeMillis());
-    if (plotsToDelete != null && !plotsToDelete.isEmpty()) {
-      for (Plot plot : pp.getPlots()) {
-        plotsToDelete.remove(plot);
-      }
+    public ExpireManager() {
+        tasks = new ArrayDeque<>();
+        dates_cache = new ConcurrentHashMap<>();
+        account_age_cache = new ConcurrentHashMap<>();
     }
-    confirmExpiry(pp);
-  }
 
-  public void handleEntry(PlotPlayer pp, Plot plot) {
-    if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
-        .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
-      if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
+    public void addTask(ExpiryTask task) {
+        PlotSquared.debug("Adding new expiry task!");
+        this.tasks.add(task);
+    }
+
+    public void handleJoin(PlotPlayer pp) {
+        storeDate(pp.getUUID(), System.currentTimeMillis());
+        if (plotsToDelete != null && !plotsToDelete.isEmpty()) {
+            for (Plot plot : pp.getPlots()) {
+                plotsToDelete.remove(plot);
+            }
+        }
         confirmExpiry(pp);
-      } else {
-        plotsToDelete.remove(plot);
-        confirmExpiry(pp);
-      }
     }
-  }
 
-  /**
-   * Gets the account last joined - first joined (or Long.MAX_VALUE)
-   *
-   * @return result
-   */
-  public long getAccountAge(UUID uuid) {
-    Long value = this.account_age_cache.get(uuid);
-    return value == null ? Long.MAX_VALUE : value;
-  }
-
-  public long getTimestamp(UUID uuid) {
-    Long value = this.dates_cache.get(uuid);
-    return value == null ? 0 : value;
-  }
-
-  public void updateExpired(Plot plot) {
-    if (plotsToDelete != null && !plotsToDelete.isEmpty() && plotsToDelete.contains(plot)) {
-      if (isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
-        plotsToDelete.remove(plot);
-      }
-    }
-  }
-
-  public void confirmExpiry(final PlotPlayer pp) {
-    if (pp.getMeta("ignoreExpireTask") != null) {
-      return;
-    }
-    if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
-        .hasPermission("plots.admin.command.autoclear")) {
-      final int num = plotsToDelete.size();
-      while (!plotsToDelete.isEmpty()) {
-        Iterator<Plot> iter = plotsToDelete.iterator();
-        final Plot current = iter.next();
-        if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
-          TaskManager.runTask(() -> {
-            pp.setMeta("ignoreExpireTask", true);
-            pp.teleport(current.getCenter());
-            pp.deleteMeta("ignoreExpireTask");
-            PlotMessage msg = new PlotMessage().text(
-                num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
-                .color("$1").text(current.toString()).color("$2")
-                .suggest("/plot list expired").tooltip("/plot list expired")
-                //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
-                .text("\n - ").color("$3").text("Delete this (/plot delete)")
-                .color("$2").suggest("/plot delete").tooltip("/plot delete")
-                .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
-                .color("$2").suggest("/plot set keep 1d")
-                .tooltip("/plot set keep 1d").text("\n - ").color("$3")
-                .text("Keep this (/plot set keep true)").color("$2")
-                .suggest("/plot set keep true").tooltip("/plot set keep true")
-                .text("\n - ").color("$3").text("Don't show me this").color("$2")
-                .suggest("/plot toggle clear-confirmation")
-                .tooltip("/plot toggle clear-confirmation");
-            msg.send(pp);
-          });
-          return;
-        } else {
-          iter.remove();
+    public void handleEntry(PlotPlayer pp, Plot plot) {
+        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
+            .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
+            if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
+                confirmExpiry(pp);
+            } else {
+                plotsToDelete.remove(plot);
+                confirmExpiry(pp);
+            }
         }
-      }
-      plotsToDelete.clear();
     }
-  }
 
-
-  public boolean cancelTask() {
-    if (this.running != 2) {
-      return false;
+    /**
+     * Gets the account last joined - first joined (or Long.MAX_VALUE)
+     *
+     * @return result
+     */
+    public long getAccountAge(UUID uuid) {
+        Long value = this.account_age_cache.get(uuid);
+        return value == null ? Long.MAX_VALUE : value;
     }
-    this.running = 1;
-    return true;
-  }
 
-  public boolean runAutomatedTask() {
-    return runTask(new RunnableVal3<Plot, Runnable, Boolean>() {
-      @Override
-      public void run(Plot plot, Runnable runnable, Boolean confirm) {
-        if (confirm) {
-          if (plotsToDelete == null) {
-            plotsToDelete = new HashSet<>();
-          }
-          plotsToDelete.add(plot);
-          runnable.run();
-        } else {
-          deleteWithMessage(plot, runnable);
+    public long getTimestamp(UUID uuid) {
+        Long value = this.dates_cache.get(uuid);
+        return value == null ? 0 : value;
+    }
+
+    public void updateExpired(Plot plot) {
+        if (plotsToDelete != null && !plotsToDelete.isEmpty() && plotsToDelete.contains(plot)) {
+            if (isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
+                plotsToDelete.remove(plot);
+            }
         }
-      }
-    });
-  }
-
-  public Collection<ExpiryTask> isExpired(ArrayDeque<ExpiryTask> applicable, Plot plot) {
-    // Filter out invalid worlds
-    for (int i = 0; i < applicable.size(); i++) {
-      ExpiryTask et = applicable.poll();
-      if (et.applies(plot.getArea())) {
-        applicable.add(et);
-      }
-    }
-    if (applicable.isEmpty()) {
-      return new ArrayList<>();
-    }
-    boolean shouldCheckAccountAge = false;
-
-    long diff = getAge(plot);
-    if (diff == 0) {
-      return new ArrayList<>();
-    }
-    // Filter out non old plots
-    for (int i = 0; i < applicable.size(); i++) {
-      ExpiryTask et = applicable.poll();
-      if (et.applies(diff)) {
-        applicable.add(et);
-        shouldCheckAccountAge |= et.getSettings().SKIP_ACCOUNT_AGE_DAYS != -1;
-      }
-    }
-    if (applicable.isEmpty()) {
-      return new ArrayList<>();
-    }
-    // Check account age
-    if (shouldCheckAccountAge) {
-      long accountAge = getAge(plot);
-      for (int i = 0; i < applicable.size(); i++) {
-        ExpiryTask et = applicable.poll();
-        if (et.appliesAccountAge(accountAge)) {
-          applicable.add(et);
-        }
-      }
-      if (applicable.isEmpty()) {
-        return new ArrayList<>();
-      }
     }
 
-    // Run applicable non confirming tasks
-    for (int i = 0; i < applicable.size(); i++) {
-      ExpiryTask expiryTask = applicable.poll();
-      if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
-        if (!expiryTask.requiresConfirmation()) {
-          return Collections.singletonList(expiryTask);
-        }
-      }
-      applicable.add(expiryTask);
-    }
-    // Run applicable confirming tasks
-    for (int i = 0; i < applicable.size(); i++) {
-      ExpiryTask expiryTask = applicable.poll();
-      if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
-        return Collections.singletonList(expiryTask);
-      }
-      applicable.add(expiryTask);
-    }
-    return applicable;
-  }
-
-  public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
-    ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
-    queue.removeIf(expiryTask -> !expiryTask.applies(area));
-    return queue;
-  }
-
-  public void passesComplexity(PlotAnalysis analysis, Collection<ExpiryTask> applicable,
-      RunnableVal<Boolean> success, Runnable failure) {
-    if (analysis != null) {
-      // Run non confirming tasks
-      for (ExpiryTask et : applicable) {
-        if (!et.requiresConfirmation() && et.applies(analysis)) {
-          success.run(false);
-          return;
-        }
-      }
-      for (ExpiryTask et : applicable) {
-        if (et.applies(analysis)) {
-          success.run(true);
-          return;
-        }
-      }
-      failure.run();
-    }
-  }
-
-  public boolean runTask(final RunnableVal3<Plot, Runnable, Boolean> expiredTask) {
-    if (this.running != 0) {
-      return false;
-    }
-    this.running = 2;
-    final ConcurrentLinkedDeque<Plot> plots =
-        new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
-    TaskManager.runTaskAsync(new Runnable() {
-      @Override
-      public void run() {
-        final Runnable task = this;
-        if (ExpireManager.this.running != 2) {
-          ExpireManager.this.running = 0;
-          return;
-        }
-        long start = System.currentTimeMillis();
-        while (!plots.isEmpty()) {
-          if (ExpireManager.this.running != 2) {
-            ExpireManager.this.running = 0;
+    public void confirmExpiry(final PlotPlayer pp) {
+        if (pp.getMeta("ignoreExpireTask") != null) {
             return;
-          }
-          Plot plot = plots.poll();
-          PlotArea area = plot.getArea();
-          final Plot newPlot = area.getPlot(plot.getId());
-          final ArrayDeque<ExpiryTask> applicable = new ArrayDeque<>(tasks);
-          final Collection<ExpiryTask> expired = isExpired(applicable, newPlot);
-          if (expired.isEmpty()) {
-            continue;
-          }
-          for (ExpiryTask expiryTask : expired) {
-            if (!expiryTask.needsAnalysis()) {
-              expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
-                  expiryTask.requiresConfirmation());
-              return;
-            }
-          }
-          final RunnableVal<PlotAnalysis> handleAnalysis =
-              new RunnableVal<PlotAnalysis>() {
-                @Override
-                public void run(final PlotAnalysis changed) {
-                  passesComplexity(changed, expired, new RunnableVal<Boolean>() {
-                    @Override
-                    public void run(Boolean confirmation) {
-                      expiredTask.run(newPlot,
-                          () -> TaskManager.IMP.taskLaterAsync(task, 1), confirmation);
-                    }
-                  }, () -> {
-                    FlagManager
-                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
-                    TaskManager.runTaskLaterAsync(task, 20);
-                  });
+        }
+        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
+            .hasPermission("plots.admin.command.autoclear")) {
+            final int num = plotsToDelete.size();
+            while (!plotsToDelete.isEmpty()) {
+                Iterator<Plot> iter = plotsToDelete.iterator();
+                final Plot current = iter.next();
+                if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
+                    TaskManager.runTask(() -> {
+                        pp.setMeta("ignoreExpireTask", true);
+                        pp.teleport(current.getCenter());
+                        pp.deleteMeta("ignoreExpireTask");
+                        PlotMessage msg = new PlotMessage()
+                            .text(num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
+                            .color("$1").text(current.toString()).color("$2")
+                            .suggest("/plot list expired").tooltip("/plot list expired")
+                            //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
+                            .text("\n - ").color("$3").text("Delete this (/plot delete)")
+                            .color("$2").suggest("/plot delete").tooltip("/plot delete")
+                            .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
+                            .color("$2").suggest("/plot set keep 1d").tooltip("/plot set keep 1d")
+                            .text("\n - ").color("$3").text("Keep this (/plot set keep true)")
+                            .color("$2").suggest("/plot set keep true")
+                            .tooltip("/plot set keep true").text("\n - ").color("$3")
+                            .text("Don't show me this").color("$2")
+                            .suggest("/plot toggle clear-confirmation")
+                            .tooltip("/plot toggle clear-confirmation");
+                        msg.send(pp);
+                    });
+                    return;
+                } else {
+                    iter.remove();
                 }
-              };
-          final Runnable doAnalysis = () -> HybridUtils.manager
-              .analyzePlot(newPlot, handleAnalysis);
-
-          PlotAnalysis analysis = newPlot.getComplexity(null);
-          if (analysis != null) {
-            passesComplexity(analysis, expired, new RunnableVal<Boolean>() {
-              @Override
-              public void run(Boolean value) {
-                doAnalysis.run();
-              }
-            }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
-          } else {
-            doAnalysis.run();
-          }
-          return;
-        }
-        if (plots.isEmpty()) {
-          ExpireManager.this.running = 3;
-          TaskManager.runTaskLater(() -> {
-            if (ExpireManager.this.running == 3) {
-              ExpireManager.this.running = 2;
-              runTask(expiredTask);
             }
-          }, 86400000);
+            plotsToDelete.clear();
+        }
+    }
+
+
+    public boolean cancelTask() {
+        if (this.running != 2) {
+            return false;
+        }
+        this.running = 1;
+        return true;
+    }
+
+    public boolean runAutomatedTask() {
+        return runTask(new RunnableVal3<Plot, Runnable, Boolean>() {
+            @Override public void run(Plot plot, Runnable runnable, Boolean confirm) {
+                if (confirm) {
+                    if (plotsToDelete == null) {
+                        plotsToDelete = new HashSet<>();
+                    }
+                    plotsToDelete.add(plot);
+                    runnable.run();
+                } else {
+                    deleteWithMessage(plot, runnable);
+                }
+            }
+        });
+    }
+
+    public Collection<ExpiryTask> isExpired(ArrayDeque<ExpiryTask> applicable, Plot plot) {
+        // Filter out invalid worlds
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask et = applicable.poll();
+            if (et.applies(plot.getArea())) {
+                applicable.add(et);
+            }
+        }
+        if (applicable.isEmpty()) {
+            return new ArrayList<>();
+        }
+        boolean shouldCheckAccountAge = false;
+
+        long diff = getAge(plot);
+        if (diff == 0) {
+            return new ArrayList<>();
+        }
+        // Filter out non old plots
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask et = applicable.poll();
+            if (et.applies(diff)) {
+                applicable.add(et);
+                shouldCheckAccountAge |= et.getSettings().SKIP_ACCOUNT_AGE_DAYS != -1;
+            }
+        }
+        if (applicable.isEmpty()) {
+            return new ArrayList<>();
+        }
+        // Check account age
+        if (shouldCheckAccountAge) {
+            long accountAge = getAge(plot);
+            for (int i = 0; i < applicable.size(); i++) {
+                ExpiryTask et = applicable.poll();
+                if (et.appliesAccountAge(accountAge)) {
+                    applicable.add(et);
+                }
+            }
+            if (applicable.isEmpty()) {
+                return new ArrayList<>();
+            }
+        }
+
+        // Run applicable non confirming tasks
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask expiryTask = applicable.poll();
+            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
+                if (!expiryTask.requiresConfirmation()) {
+                    return Collections.singletonList(expiryTask);
+                }
+            }
+            applicable.add(expiryTask);
+        }
+        // Run applicable confirming tasks
+        for (int i = 0; i < applicable.size(); i++) {
+            ExpiryTask expiryTask = applicable.poll();
+            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
+                return Collections.singletonList(expiryTask);
+            }
+            applicable.add(expiryTask);
+        }
+        return applicable;
+    }
+
+    public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
+        ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
+        queue.removeIf(expiryTask -> !expiryTask.applies(area));
+        return queue;
+    }
+
+    public void passesComplexity(PlotAnalysis analysis, Collection<ExpiryTask> applicable,
+        RunnableVal<Boolean> success, Runnable failure) {
+        if (analysis != null) {
+            // Run non confirming tasks
+            for (ExpiryTask et : applicable) {
+                if (!et.requiresConfirmation() && et.applies(analysis)) {
+                    success.run(false);
+                    return;
+                }
+            }
+            for (ExpiryTask et : applicable) {
+                if (et.applies(analysis)) {
+                    success.run(true);
+                    return;
+                }
+            }
+            failure.run();
+        }
+    }
+
+    public boolean runTask(final RunnableVal3<Plot, Runnable, Boolean> expiredTask) {
+        if (this.running != 0) {
+            return false;
+        }
+        this.running = 2;
+        final ConcurrentLinkedDeque<Plot> plots =
+            new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                final Runnable task = this;
+                if (ExpireManager.this.running != 2) {
+                    ExpireManager.this.running = 0;
+                    return;
+                }
+                long start = System.currentTimeMillis();
+                while (!plots.isEmpty()) {
+                    if (ExpireManager.this.running != 2) {
+                        ExpireManager.this.running = 0;
+                        return;
+                    }
+                    Plot plot = plots.poll();
+                    PlotArea area = plot.getArea();
+                    final Plot newPlot = area.getPlot(plot.getId());
+                    final ArrayDeque<ExpiryTask> applicable = new ArrayDeque<>(tasks);
+                    final Collection<ExpiryTask> expired = isExpired(applicable, newPlot);
+                    if (expired.isEmpty()) {
+                        continue;
+                    }
+                    for (ExpiryTask expiryTask : expired) {
+                        if (!expiryTask.needsAnalysis()) {
+                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                                expiryTask.requiresConfirmation());
+                            return;
+                        }
+                    }
+                    final RunnableVal<PlotAnalysis> handleAnalysis =
+                        new RunnableVal<PlotAnalysis>() {
+                            @Override public void run(final PlotAnalysis changed) {
+                                passesComplexity(changed, expired, new RunnableVal<Boolean>() {
+                                    @Override public void run(Boolean confirmation) {
+                                        expiredTask.run(newPlot,
+                                            () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                                            confirmation);
+                                    }
+                                }, () -> {
+                                    FlagManager
+                                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
+                                    TaskManager.runTaskLaterAsync(task, 20);
+                                });
+                            }
+                        };
+                    final Runnable doAnalysis =
+                        () -> HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
+
+                    PlotAnalysis analysis = newPlot.getComplexity(null);
+                    if (analysis != null) {
+                        passesComplexity(analysis, expired, new RunnableVal<Boolean>() {
+                            @Override public void run(Boolean value) {
+                                doAnalysis.run();
+                            }
+                        }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
+                    } else {
+                        doAnalysis.run();
+                    }
+                    return;
+                }
+                if (plots.isEmpty()) {
+                    ExpireManager.this.running = 3;
+                    TaskManager.runTaskLater(() -> {
+                        if (ExpireManager.this.running == 3) {
+                            ExpireManager.this.running = 2;
+                            runTask(expiredTask);
+                        }
+                    }, 86400000);
+                } else {
+                    TaskManager.runTaskLaterAsync(task, 20 * 10);
+                }
+            }
+        });
+        return true;
+    }
+
+    public void storeDate(UUID uuid, long time) {
+        Long existing = this.dates_cache.put(uuid, time);
+        if (existing != null) {
+            long diff = time - existing;
+            if (diff > 0) {
+                Long account_age = this.account_age_cache.get(uuid);
+                if (account_age != null) {
+                    this.account_age_cache.put(uuid, account_age + diff);
+                }
+            }
+        }
+    }
+
+    public void storeAccountAge(UUID uuid, long time) {
+        this.account_age_cache.put(uuid, time);
+    }
+
+    public HashSet<Plot> getPendingExpired() {
+        return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
+    }
+
+    public void deleteWithMessage(Plot plot, Runnable whenDone) {
+        if (plot.isMerged()) {
+            plot.unlinkPlot(true, false);
+        }
+        for (UUID helper : plot.getTrusted()) {
+            PlotPlayer player = UUIDHandler.getPlayer(helper);
+            if (player != null) {
+                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+            }
+        }
+        for (UUID helper : plot.getMembers()) {
+            PlotPlayer player = UUIDHandler.getPlayer(helper);
+            if (player != null) {
+                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+            }
+        }
+        Set<Plot> plots = plot.getConnectedPlots();
+        plot.deletePlot(whenDone);
+        PlotAnalysis changed = plot.getComplexity(null);
+        int changes = changed == null ? 0 : changed.changes_sd;
+        int modified = changed == null ? 0 : changed.changes;
+        PlotSquared.debug(
+            "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
+                + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
+                .getString(plots));
+        PlotSquared.debug("$4 - Area: " + plot.getArea());
+        if (plot.hasOwner()) {
+            PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
         } else {
-          TaskManager.runTaskLaterAsync(task, 20 * 10);
+            PlotSquared.debug("$4 - Owner: Unowned");
         }
-      }
-    });
-    return true;
-  }
+    }
 
-  public void storeDate(UUID uuid, long time) {
-    Long existing = this.dates_cache.put(uuid, time);
-    if (existing != null) {
-      long diff = time - existing;
-      if (diff > 0) {
-        Long account_age = this.account_age_cache.get(uuid);
-        if (account_age != null) {
-          this.account_age_cache.put(uuid, account_age + diff);
+    public long getAge(UUID uuid) {
+        if (UUIDHandler.getPlayer(uuid) != null) {
+            return 0;
         }
-      }
-    }
-  }
-
-  public void storeAccountAge(UUID uuid, long time) {
-    this.account_age_cache.put(uuid, time);
-  }
-
-  public HashSet<Plot> getPendingExpired() {
-    return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
-  }
-
-  public void deleteWithMessage(Plot plot, Runnable whenDone) {
-    if (plot.isMerged()) {
-      plot.unlinkPlot(true, false);
-    }
-    for (UUID helper : plot.getTrusted()) {
-      PlotPlayer player = UUIDHandler.getPlayer(helper);
-      if (player != null) {
-        MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
-      }
-    }
-    for (UUID helper : plot.getMembers()) {
-      PlotPlayer player = UUIDHandler.getPlayer(helper);
-      if (player != null) {
-        MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
-      }
-    }
-    Set<Plot> plots = plot.getConnectedPlots();
-    plot.deletePlot(whenDone);
-    PlotAnalysis changed = plot.getComplexity(null);
-    int changes = changed == null ? 0 : changed.changes_sd;
-    int modified = changed == null ? 0 : changed.changes;
-    PlotSquared.debug(
-        "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
-            + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
-            .getString(plots));
-    PlotSquared.debug("$4 - Area: " + plot.getArea());
-    if (plot.hasOwner()) {
-      PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
-    } else {
-      PlotSquared.debug("$4 - Owner: Unowned");
-    }
-  }
-
-  public long getAge(UUID uuid) {
-    if (UUIDHandler.getPlayer(uuid) != null) {
-      return 0;
-    }
-    String name = UUIDHandler.getName(uuid);
-    if (name != null) {
-      Long last = this.dates_cache.get(uuid);
-      if (last == null) {
-        OfflinePlotPlayer opp;
-        if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-          opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
-        } else {
-          opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(name);
+        String name = UUIDHandler.getName(uuid);
+        if (name != null) {
+            Long last = this.dates_cache.get(uuid);
+            if (last == null) {
+                OfflinePlotPlayer opp;
+                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
+                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
+                } else {
+                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(name);
+                }
+                if (opp != null && (last = opp.getLastPlayed()) != 0) {
+                    this.dates_cache.put(uuid, last);
+                } else {
+                    return 0;
+                }
+            }
+            if (last == 0) {
+                return 0;
+            }
+            return System.currentTimeMillis() - last;
         }
-        if (opp != null && (last = opp.getLastPlayed()) != 0) {
-          this.dates_cache.put(uuid, last);
-        } else {
-          return 0;
-        }
-      }
-      if (last == 0) {
         return 0;
-      }
-      return System.currentTimeMillis() - last;
     }
-    return 0;
-  }
 
-  public long getAccountAge(Plot plot) {
-    if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-        || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
-      return Long.MAX_VALUE;
+    public long getAccountAge(Plot plot) {
+        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
+            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+            return Long.MAX_VALUE;
+        }
+        long max = 0;
+        for (UUID owner : plot.getOwners()) {
+            long age = getAccountAge(owner);
+            max = Math.max(age, max);
+        }
+        return max;
     }
-    long max = 0;
-    for (UUID owner : plot.getOwners()) {
-      long age = getAccountAge(owner);
-      max = Math.max(age, max);
-    }
-    return max;
-  }
 
-  public long getAge(Plot plot) {
-    if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-        || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
-      return 0;
-    }
-    Optional<?> keep = plot.getFlag(Flags.KEEP);
-    if (keep.isPresent()) {
-      Object value = keep.get();
-      if (value instanceof Boolean) {
-        if (Boolean.TRUE.equals(value)) {
-          return 0;
+    public long getAge(Plot plot) {
+        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
+            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+            return 0;
         }
-      } else if (value instanceof Long) {
-        if ((Long) value > System.currentTimeMillis()) {
-          return 0;
+        Optional<?> keep = plot.getFlag(Flags.KEEP);
+        if (keep.isPresent()) {
+            Object value = keep.get();
+            if (value instanceof Boolean) {
+                if (Boolean.TRUE.equals(value)) {
+                    return 0;
+                }
+            } else if (value instanceof Long) {
+                if ((Long) value > System.currentTimeMillis()) {
+                    return 0;
+                }
+            } else { // Invalid?
+                return 0;
+            }
         }
-      } else { // Invalid?
-        return 0;
-      }
+        long min = Long.MAX_VALUE;
+        for (UUID owner : plot.getOwners()) {
+            long age = getAge(owner);
+            if (age < min) {
+                min = age;
+            }
+        }
+        return min;
     }
-    long min = Long.MAX_VALUE;
-    for (UUID owner : plot.getOwners()) {
-      long age = getAge(owner);
-      if (age < min) {
-        min = age;
-      }
-    }
-    return min;
-  }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
index 3a0b82c56..df1244a12 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
@@ -5,6 +5,7 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotFilter;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
index f11cb429a..2e7854828 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
@@ -433,7 +433,6 @@ public class PlotAnalysis {
 
     /**
      * An optimized lossy standard deviation algorithm.
-     *
      */
     public static int[] getSD(int[]... ranks) {
         if (ranks.length == 0) {
@@ -460,7 +459,6 @@ public class PlotAnalysis {
      * An optimized algorithm for ranking a very specific set of inputs<br>
      * - Input is an array of int with a max size of 102400<br>
      * - A reduced sample space allows for sorting (and ranking in this case) in linear time
-     *
      */
     public static int[] rank(int[] input) {
         return rank(input, 102400);
diff --git a/Core/src/main/resources/addplots.js b/Core/src/main/resources/addplots.js
index 6f12712b4..5691c181c 100644
--- a/Core/src/main/resources/addplots.js
+++ b/Core/src/main/resources/addplots.js
@@ -4,7 +4,7 @@ This will increase a player's allowed plots by the provided value
 */
 var uuid = UUIDHandler.getUUID('%s0', null);
 if (uuid === null) {
-    C_INVALID_PLAYER.send(PlotPlayer, '%s0');    
+    C_INVALID_PLAYER.send(PlotPlayer, '%s0');
 }
 else if (!MathMan.class.static.isInteger('%s1')) {
     C_NOT_VALID_NUMBER.send(PlotPlayer, '(0, ' + Settings.MAX_PLOTS + ')');
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
index cf118c717..1ef04abba 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
@@ -84,7 +84,7 @@ public class AbstractDBTest implements AbstractDB {
     @Override public void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
     }
 
-  @Override public void setClusterName(PlotCluster cluster, String name) {
+    @Override public void setClusterName(PlotCluster cluster, String name) {
     }
 
     @Override public void setAlias(Plot plot, String alias) {
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
index f6550ce98..6ae75a86d 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
@@ -40,7 +40,7 @@ public class EventUtilTest extends EventUtil {
         return true;
     }
 
-  @Override public boolean callMerge(Plot plot, int dir, int max){
+    @Override public boolean callMerge(Plot plot, int dir, int max) {
         return false;
     }
 

From 6d6087b1e3b6f2e30ce5862a36bd275919210357 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Mon, 4 Feb 2019 14:02:21 +0000
Subject: [PATCH 015/210] And don't add the Core/ code into Bukkit/ code

---
 .../plotsquared/api/PlotAPI.java              |  224 -
 .../plotsquared/bukkit/BukkitMain.java        |   82 +-
 .../plotsquared/bukkit/chat/FancyMessage.java |    5 +-
 .../bukkit/listeners/ChunkListener.java       |   44 +-
 .../bukkit/listeners/ForceFieldListener.java  |  165 +-
 .../bukkit/listeners/PlayerEvents.java        | 5277 ++++++++---------
 .../bukkit/listeners/PlotPlusListener.java    |   32 +-
 .../bukkit/listeners/SingleWorldListener.java |    9 +-
 .../bukkit/object/BukkitPlayer.java           |   12 +-
 .../entity/ReplicatingEntityWrapper.java      | 1319 ++--
 .../bukkit/object/schematic/StateWrapper.java |    4 +-
 .../bukkit/util/BukkitEventUtil.java          |    6 +-
 .../bukkit/util/BukkitHybridUtils.java        |    6 +-
 .../bukkit/util/BukkitLegacyMappings.java     |    1 -
 .../plotsquared/bukkit/util/SendChunk.java    |  150 +-
 .../bukkit/uuid/DefaultUUIDWrapper.java       |    5 +-
 .../bukkit/uuid/FileUUIDHandler.java          |   16 +-
 .../bukkit/uuid/OfflineUUIDWrapper.java       |    5 +-
 .../bukkit/uuid/SQLUUIDHandler.java           |   37 +-
 .../plotsquared/commands/Argument.java        |   68 -
 .../plotsquared/commands/Command.java         |  596 --
 .../plotsquared/commands/CommandCaller.java   |   24 -
 .../commands/CommandDeclaration.java          |   29 -
 .../configuration/Configuration.java          |   87 -
 .../configuration/ConfigurationOptions.java   |   90 -
 .../configuration/ConfigurationSection.java   |  649 --
 .../InvalidConfigurationException.java        |   45 -
 .../configuration/MemoryConfiguration.java    |   73 -
 .../MemoryConfigurationOptions.java           |   25 -
 .../configuration/MemorySection.java          |  771 ---
 .../configuration/file/FileConfiguration.java |  158 -
 .../file/FileConfigurationOptions.java        |  115 -
 .../configuration/file/YamlConfiguration.java |  189 -
 .../file/YamlConfigurationOptions.java        |   68 -
 .../configuration/file/YamlConstructor.java   |   46 -
 .../configuration/file/YamlRepresenter.java   |   40 -
 .../ConfigurationSerializable.java            |   34 -
 .../ConfigurationSerialization.java           |  262 -
 .../DelegateDeserialization.java              |   21 -
 .../serialization/SerializableAs.java         |   32 -
 .../plotsquared/json/JSONArray.java           |  815 ---
 .../plotsquared/json/JSONException.java       |   40 -
 .../plotsquared/json/JSONObject.java          | 1425 -----
 .../plotsquared/json/JSONString.java          |   16 -
 .../plotsquared/json/JSONTokener.java         |  384 --
 .../plotsquared/json/Property.java            |   52 -
 .../plotsquared/json/XML.java                 |  375 --
 .../plotsquared/json/XMLTokener.java          |  315 -
 .../plotsquared/plot/IPlotMain.java           |  285 -
 .../plotsquared/plot/Platform.java            |    6 -
 .../plotsquared/plot/PlotSquared.java         | 2066 -------
 .../plotsquared/plot/PlotVersion.java         |   45 -
 .../plotsquared/plot/commands/Add.java        |   82 -
 .../plotsquared/plot/commands/Alias.java      |  123 -
 .../plotsquared/plot/commands/Area.java       |  469 --
 .../plotsquared/plot/commands/Auto.java       |  256 -
 .../plotsquared/plot/commands/Biome.java      |   38 -
 .../plotsquared/plot/commands/Buy.java        |   72 -
 .../plotsquared/plot/commands/Chat.java       |   14 -
 .../plotsquared/plot/commands/Claim.java      |   99 -
 .../plotsquared/plot/commands/Clear.java      |   68 -
 .../plotsquared/plot/commands/Cluster.java    |  612 --
 .../plot/commands/CommandCategory.java        |   56 -
 .../plotsquared/plot/commands/Comment.java    |   74 -
 .../plotsquared/plot/commands/Condense.java   |  209 -
 .../plotsquared/plot/commands/Confirm.java    |   31 -
 .../plotsquared/plot/commands/Continue.java   |   45 -
 .../plotsquared/plot/commands/Copy.java       |   54 -
 .../plot/commands/CreateRoadSchematic.java    |   32 -
 .../plotsquared/plot/commands/Database.java   |  184 -
 .../plotsquared/plot/commands/Debug.java      |   46 -
 .../plot/commands/DebugAllowUnsafe.java       |   30 -
 .../plot/commands/DebugClaimTest.java         |  113 -
 .../plotsquared/plot/commands/DebugExec.java  |  429 --
 .../plot/commands/DebugFixFlags.java          |   52 -
 .../plot/commands/DebugImportWorlds.java      |   58 -
 .../plot/commands/DebugLoadTest.java          |   17 -
 .../plotsquared/plot/commands/DebugPaste.java |  146 -
 .../plot/commands/DebugRoadRegen.java         |   41 -
 .../plot/commands/DebugSaveTest.java          |   29 -
 .../plotsquared/plot/commands/Delete.java     |   71 -
 .../plotsquared/plot/commands/Deny.java       |  114 -
 .../plotsquared/plot/commands/Desc.java       |   30 -
 .../plotsquared/plot/commands/Done.java       |   68 -
 .../plotsquared/plot/commands/Download.java   |   95 -
 .../plotsquared/plot/commands/FlagCmd.java    |  299 -
 .../plot/commands/GenerateDocs.java           |  221 -
 .../plotsquared/plot/commands/Grant.java      |   71 -
 .../plotsquared/plot/commands/Help.java       |   91 -
 .../plotsquared/plot/commands/Inbox.java      |  198 -
 .../plotsquared/plot/commands/Info.java       |  155 -
 .../plotsquared/plot/commands/Kick.java       |   92 -
 .../plotsquared/plot/commands/Leave.java      |   48 -
 .../plotsquared/plot/commands/ListCmd.java    |  397 --
 .../plotsquared/plot/commands/Load.java       |  179 -
 .../plot/commands/MainCommand.java            |  286 -
 .../plotsquared/plot/commands/Merge.java      |  198 -
 .../plotsquared/plot/commands/Middle.java     |   29 -
 .../plotsquared/plot/commands/Move.java       |   65 -
 .../plotsquared/plot/commands/Music.java      |   69 -
 .../plotsquared/plot/commands/Near.java       |   24 -
 .../plotsquared/plot/commands/Owner.java      |   96 -
 .../plotsquared/plot/commands/PluginCmd.java  |   38 -
 .../plotsquared/plot/commands/Purge.java      |  167 -
 .../plotsquared/plot/commands/Rate.java       |  217 -
 .../plot/commands/RegenAllRoads.java          |   60 -
 .../plotsquared/plot/commands/Relight.java    |   39 -
 .../plotsquared/plot/commands/Reload.java     |   84 -
 .../plotsquared/plot/commands/Remove.java     |  108 -
 .../plot/commands/RequiredType.java           |   16 -
 .../plotsquared/plot/commands/Save.java       |   76 -
 .../plot/commands/SchematicCmd.java           |  222 -
 .../plotsquared/plot/commands/Set.java        |  167 -
 .../plotsquared/plot/commands/SetCommand.java |   43 -
 .../plotsquared/plot/commands/SetHome.java    |   40 -
 .../plotsquared/plot/commands/Setup.java      |  434 --
 .../plotsquared/plot/commands/SubCommand.java |   39 -
 .../plotsquared/plot/commands/Swap.java       |   54 -
 .../plotsquared/plot/commands/Target.java     |   49 -
 .../plotsquared/plot/commands/Template.java   |  201 -
 .../plotsquared/plot/commands/Toggle.java     |   90 -
 .../plotsquared/plot/commands/Trim.java       |  214 -
 .../plotsquared/plot/commands/Trust.java      |   82 -
 .../plotsquared/plot/commands/Unlink.java     |   58 -
 .../plotsquared/plot/commands/Visit.java      |  142 -
 .../plot/commands/WE_Anywhere.java            |   16 -
 .../plotsquared/plot/config/C.java            | 1070 ----
 .../plotsquared/plot/config/Config.java       |  440 --
 .../plot/config/Configuration.java            |  174 -
 .../plot/config/ConfigurationNode.java        |   89 -
 .../plotsquared/plot/config/Settings.java     |  357 --
 .../plotsquared/plot/config/Storage.java      |   38 -
 .../plotsquared/plot/database/AbstractDB.java |  341 --
 .../plotsquared/plot/database/DBFunc.java     |  495 --
 .../plotsquared/plot/database/Database.java   |   72 -
 .../plotsquared/plot/database/MySQL.java      |   89 -
 .../plotsquared/plot/database/SQLManager.java | 3082 ----------
 .../plotsquared/plot/database/SQLite.java     |   86 -
 .../plotsquared/plot/database/StmtMod.java    |   39 -
 .../plotsquared/plot/flag/BooleanFlag.java    |   45 -
 .../plotsquared/plot/flag/DoubleFlag.java     |   25 -
 .../plotsquared/plot/flag/EnumFlag.java       |   31 -
 .../plotsquared/plot/flag/Flag.java           |   60 -
 .../plotsquared/plot/flag/FlagManager.java    |  299 -
 .../plotsquared/plot/flag/Flags.java          |  207 -
 .../plotsquared/plot/flag/GameModeFlag.java   |   40 -
 .../plotsquared/plot/flag/IntegerFlag.java    |   41 -
 .../plot/flag/IntegerListFlag.java            |   31 -
 .../plotsquared/plot/flag/IntervalFlag.java   |   41 -
 .../plotsquared/plot/flag/ListFlag.java       |   17 -
 .../plotsquared/plot/flag/LongFlag.java       |   24 -
 .../plot/flag/PlotBlockListFlag.java          |   33 -
 .../plot/flag/PlotWeatherFlag.java            |   35 -
 .../plotsquared/plot/flag/StringFlag.java     |   21 -
 .../plotsquared/plot/flag/StringListFlag.java |   26 -
 .../plot/flag/TeleportDenyFlag.java           |   39 -
 .../plot/generator/AugmentedUtils.java        |  141 -
 .../plot/generator/ClassicPlotManager.java    |  467 --
 .../plot/generator/ClassicPlotWorld.java      |  117 -
 .../plot/generator/GeneratorWrapper.java      |   18 -
 .../plot/generator/GridPlotManager.java       |   10 -
 .../plot/generator/GridPlotWorld.java         |   14 -
 .../plotsquared/plot/generator/HybridGen.java |  266 -
 .../plot/generator/HybridPlotManager.java     |  225 -
 .../plot/generator/HybridPlotWorld.java       |  283 -
 .../plot/generator/HybridUtils.java           |  381 --
 .../generator/IndependentPlotGenerator.java   |   90 -
 .../plot/generator/PlotGenerator.java         |   37 -
 .../plot/generator/SquarePlotManager.java     |  220 -
 .../plot/generator/SquarePlotWorld.java       |   29 -
 .../plot/listener/ExtentWrapper.java          |   12 -
 .../plot/listener/PlayerBlockEventType.java   |   32 -
 .../plot/listener/PlotListener.java           |  260 -
 .../plot/listener/ProcessedWEExtent.java      |  178 -
 .../plotsquared/plot/listener/WEExtent.java   |   63 -
 .../plotsquared/plot/listener/WEManager.java  |  101 -
 .../plot/listener/WESubscriber.java           |   76 -
 .../plot/logger/DelegateLogger.java           |   18 -
 .../plotsquared/plot/logger/ILogger.java      |    5 -
 .../plotsquared/plot/object/BlockBucket.java  |  276 -
 .../plotsquared/plot/object/BlockLoc.java     |   77 -
 .../plot/object/BlockRegistry.java            |   34 -
 .../plotsquared/plot/object/ChunkLoc.java     |   34 -
 .../plotsquared/plot/object/ChunkWrapper.java |   43 -
 .../plotsquared/plot/object/CmdInstance.java  |   11 -
 .../plot/object/ConsolePlayer.java            |  131 -
 .../plotsquared/plot/object/Expression.java   |   55 -
 .../plotsquared/plot/object/FileBytes.java    |   12 -
 .../plotsquared/plot/object/LazyBlock.java    |   10 -
 .../plotsquared/plot/object/LazyResult.java   |   19 -
 .../plot/object/LegacyPlotBlock.java          |   60 -
 .../plotsquared/plot/object/Location.java     |  205 -
 .../plot/object/OfflinePlotPlayer.java        |   34 -
 .../plotsquared/plot/object/Plot.java         | 2888 ---------
 .../plotsquared/plot/object/PlotArea.java     |  961 ---
 .../plotsquared/plot/object/PlotBlock.java    |  136 -
 .../plotsquared/plot/object/PlotCluster.java  |  187 -
 .../plotsquared/plot/object/PlotFilter.java   |   11 -
 .../plotsquared/plot/object/PlotHandler.java  |   19 -
 .../plotsquared/plot/object/PlotId.java       |  180 -
 .../plot/object/PlotInventory.java            |  108 -
 .../plot/object/PlotItemStack.java            |   44 -
 .../plotsquared/plot/object/PlotLoc.java      |   75 -
 .../plotsquared/plot/object/PlotManager.java  |   82 -
 .../plotsquared/plot/object/PlotMessage.java  |   70 -
 .../plotsquared/plot/object/PlotPlayer.java   |  648 --
 .../plotsquared/plot/object/PlotSettings.java |  185 -
 .../plotsquared/plot/object/PseudoRandom.java |   29 -
 .../plotsquared/plot/object/Rating.java       |   81 -
 .../plot/object/RegionWrapper.java            |   71 -
 .../plotsquared/plot/object/RunnableVal.java  |   18 -
 .../plotsquared/plot/object/RunnableVal2.java |   20 -
 .../plotsquared/plot/object/RunnableVal3.java |   22 -
 .../plotsquared/plot/object/SetupObject.java  |   67 -
 .../plot/object/StringPlotBlock.java          |   95 -
 .../plot/object/StringWrapper.java            |   72 -
 .../plot/object/chat/PlainChatManager.java    |   43 -
 .../plot/object/comment/CommentInbox.java     |   64 -
 .../plot/object/comment/InboxOwner.java       |   51 -
 .../plot/object/comment/InboxPublic.java      |   47 -
 .../plot/object/comment/InboxReport.java      |   34 -
 .../plot/object/comment/PlotComment.java      |   22 -
 .../plot/object/schematic/ItemType.java       |  307 -
 .../plot/object/schematic/PlotItem.java       |   22 -
 .../plot/object/schematic/Schematic.java      |   47 -
 .../plot/object/schematic/StoredEntity.java   |   54 -
 .../stream/AbstractDelegateOutputStream.java  |   30 -
 .../object/worlds/DefaultPlotAreaManager.java |  231 -
 .../plot/object/worlds/PlotAreaManager.java   |   28 -
 .../plot/object/worlds/SinglePlot.java        |   71 -
 .../plot/object/worlds/SinglePlotArea.java    |  139 -
 .../object/worlds/SinglePlotAreaManager.java  |  131 -
 .../plot/object/worlds/SinglePlotManager.java |  104 -
 .../object/worlds/SingleWorldGenerator.java   |   91 -
 .../plotsquared/plot/util/AbstractTitle.java  |   20 -
 .../plotsquared/plot/util/ArrayUtil.java      |   19 -
 .../plot/util/ByteArrayUtilities.java         |   26 -
 .../plotsquared/plot/util/ChatManager.java    |   22 -
 .../plotsquared/plot/util/ChunkManager.java   |  296 -
 .../plotsquared/plot/util/CmdConfirm.java     |   27 -
 .../plotsquared/plot/util/CommentManager.java |   65 -
 .../plotsquared/plot/util/ConsoleColors.java  |   87 -
 .../plotsquared/plot/util/EconHandler.java    |   41 -
 .../plotsquared/plot/util/EntityUtil.java     |   76 -
 .../plotsquared/plot/util/EventUtil.java      |  428 --
 .../plot/util/HastebinUtility.java            |   65 -
 .../plotsquared/plot/util/HttpUtil.java       |   29 -
 .../plotsquared/plot/util/IncendoPaster.java  |  191 -
 .../plotsquared/plot/util/InventoryUtil.java  |   27 -
 .../plot/util/LegacyConverter.java            |  134 -
 .../plotsquared/plot/util/LegacyMappings.java |   15 -
 .../plotsquared/plot/util/MainUtil.java       |  867 ---
 .../plotsquared/plot/util/MathMan.java        |  323 -
 .../plotsquared/plot/util/Permissions.java    |  126 -
 .../plotsquared/plot/util/PlotGameMode.java   |   32 -
 .../plotsquared/plot/util/PlotWeather.java    |    5 -
 .../plot/util/ReflectionUtils.java            |  677 ---
 .../plotsquared/plot/util/RegExUtil.java      |   15 -
 .../plot/util/SchematicHandler.java           |  463 --
 .../plotsquared/plot/util/SetupUtils.java     |   22 -
 .../plot/util/StringComparison.java           |  157 -
 .../plotsquared/plot/util/StringMan.java      |  290 -
 .../plotsquared/plot/util/TaskManager.java    |  168 -
 .../plotsquared/plot/util/UUIDHandler.java    |  169 -
 .../plot/util/UUIDHandlerImplementation.java  |  286 -
 .../plotsquared/plot/util/WorldUtil.java      |  150 -
 .../plotsquared/plot/util/area/QuadMap.java   |  297 -
 .../plot/util/block/BasicLocalBlockQueue.java |  278 -
 .../util/block/DelegateLocalBlockQueue.java   |  110 -
 .../plot/util/block/GlobalBlockQueue.java     |  303 -
 .../plot/util/block/LocalBlockQueue.java      |  108 -
 .../util/block/OffsetLocalBlockQueue.java     |   24 -
 .../plot/util/block/QueueProvider.java        |   30 -
 .../util/block/ScopedLocalBlockQueue.java     |   98 -
 .../plot/util/expiry/ExpireManager.java       |  449 --
 .../plot/util/expiry/ExpirySettings.java      |    4 -
 .../plot/util/expiry/ExpiryTask.java          |  127 -
 .../plot/util/expiry/PlotAnalysis.java        |  552 --
 .../plot/util/helpmenu/HelpMenu.java          |   58 -
 .../plot/util/helpmenu/HelpObject.java        |   36 -
 .../plot/util/helpmenu/HelpPage.java          |   37 -
 .../plotsquared/plot/uuid/UUIDWrapper.java    |   21 -
 Bukkit/src/main/resources/LICENSE             |  553 --
 Bukkit/src/main/resources/addplots.js         |   18 -
 Bukkit/src/main/resources/addsigns.js         |   12 -
 Bukkit/src/main/resources/automerge.js        |   48 -
 Bukkit/src/main/resources/bridge.template     |  Bin 5325 -> 0 bytes
 Bukkit/src/main/resources/de-DE.yml           |  414 --
 Bukkit/src/main/resources/es-ES.yml           |  394 --
 Bukkit/src/main/resources/fr-FR.yml           |  393 --
 Bukkit/src/main/resources/furthest.js         |   33 -
 Bukkit/src/main/resources/it-IT.yml           |  393 --
 Bukkit/src/main/resources/ko-KR.yml           |  402 --
 Bukkit/src/main/resources/mycommand.js        |    2 -
 Bukkit/src/main/resources/plugin.properties   |    3 -
 Bukkit/src/main/resources/setbiomes.js        |   12 -
 Bukkit/src/main/resources/skyblock.template   |  Bin 1127 -> 0 bytes
 Bukkit/src/main/resources/start.js            |    7 -
 Bukkit/src/main/resources/town.template       |  Bin 1771 -> 0 bytes
 Bukkit/src/main/resources/zh-CN.yml           |  407 --
 .../plotsquared/plot/FlagTest.java            |   51 -
 .../plot/database/AbstractDBTest.java         |  183 -
 .../plotsquared/plot/util/EventUtilTest.java  |   75 -
 303 files changed, 3544 insertions(+), 52398 deletions(-)
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
 delete mode 100644 Bukkit/src/main/resources/LICENSE
 delete mode 100644 Bukkit/src/main/resources/addplots.js
 delete mode 100644 Bukkit/src/main/resources/addsigns.js
 delete mode 100644 Bukkit/src/main/resources/automerge.js
 delete mode 100644 Bukkit/src/main/resources/bridge.template
 delete mode 100644 Bukkit/src/main/resources/de-DE.yml
 delete mode 100644 Bukkit/src/main/resources/es-ES.yml
 delete mode 100644 Bukkit/src/main/resources/fr-FR.yml
 delete mode 100644 Bukkit/src/main/resources/furthest.js
 delete mode 100644 Bukkit/src/main/resources/it-IT.yml
 delete mode 100644 Bukkit/src/main/resources/ko-KR.yml
 delete mode 100644 Bukkit/src/main/resources/mycommand.js
 delete mode 100644 Bukkit/src/main/resources/plugin.properties
 delete mode 100644 Bukkit/src/main/resources/setbiomes.js
 delete mode 100644 Bukkit/src/main/resources/skyblock.template
 delete mode 100644 Bukkit/src/main/resources/start.js
 delete mode 100644 Bukkit/src/main/resources/town.template
 delete mode 100644 Bukkit/src/main/resources/zh-CN.yml
 delete mode 100644 Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java
 delete mode 100644 Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
 delete mode 100644 Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
deleted file mode 100644
index c966903be..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package com.github.intellectualsites.plotsquared.api;
-
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
-import lombok.NoArgsConstructor;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.UUID;
-
-/**
- * PlotSquared API.
- *
- * <p>Useful classes:
- * <ul>
- * <li>{@link PlotPlayer}</li>
- * <li>{@link Plot}</li>
- * <li>{@link com.github.intellectualsites.plotsquared.plot.object.Location}</li>
- * <li>{@link PlotArea}</li>
- * <li>{@link PlotSquared}</li>
- * </ul>
- *
- * @version 3.3.3
- */
-@SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI {
-
-    /**
-     * Get all plots.
-     *
-     * @return all plots
-     * @see PlotSquared#getPlots()
-     */
-    public Set<Plot> getAllPlots() {
-        return PlotSquared.get().getPlots();
-    }
-
-    /**
-     * Return all plots for a player.
-     *
-     * @param player Player, whose plots to search for
-     * @return all plots that a player owns
-     */
-    public Set<Plot> getPlayerPlots(PlotPlayer player) {
-        return PlotSquared.get().getPlots(player);
-    }
-
-    /**
-     * Add a plot world.
-     *
-     * @param plotArea Plot World Object
-     * @see PlotSquared#addPlotArea(PlotArea)
-     */
-    public void addPlotArea(PlotArea plotArea) {
-        PlotSquared.get().addPlotArea(plotArea);
-    }
-
-    /**
-     * Returns the PlotSquared configurations file.
-     *
-     * @return main configuration
-     * @see PlotSquared#config
-     */
-    public YamlConfiguration getConfig() {
-        return PlotSquared.get().config;
-    }
-
-    /**
-     * Get the PlotSquared storage file.
-     *
-     * @return storage configuration
-     * @see PlotSquared#storage
-     */
-    public YamlConfiguration getStorage() {
-        return PlotSquared.get().storage;
-    }
-
-    /**
-     * Get the main class for this plugin. Only use this if you really need it.
-     *
-     * @return PlotSquared PlotSquared Main Class
-     * @see PlotSquared
-     */
-    public PlotSquared getMain() {
-        return PlotSquared.get();
-    }
-
-    /**
-     * ChunkManager class contains several useful methods.
-     * <ul>
-     * <li>Chunk deletion</li>
-     * <li>Moving or copying regions</li>
-     * <li>Plot swapping</li>
-     * <li>Entity Tracking</li>
-     * <li>Region Regeneration</li>
-     * </ul>
-     *
-     * @return ChunkManager
-     * @see ChunkManager
-     */
-    public ChunkManager getChunkManager() {
-        return ChunkManager.manager;
-    }
-
-    /**
-     * Get the block/biome set queue
-     *
-     * @return GlobalBlockQueue.IMP
-     */
-    public GlobalBlockQueue getBlockQueue() {
-        return GlobalBlockQueue.IMP;
-    }
-
-    /**
-     * UUIDWrapper class has basic methods for getting UUIDS. It's recommended
-     * to use the UUIDHandler class instead.
-     *
-     * @return UUIDWrapper
-     * @see UUIDWrapper
-     */
-    public UUIDWrapper getUUIDWrapper() {
-        return UUIDHandler.getUUIDWrapper();
-    }
-
-    /**
-     * SchematicHandler class contains methods related to pasting, reading
-     * and writing schematics.
-     *
-     * @return SchematicHandler
-     * @see SchematicHandler
-     */
-    public SchematicHandler getSchematicHandler() {
-        return SchematicHandler.manager;
-    }
-
-    /**
-     * Get a list of PlotAreas in the world.
-     *
-     * @param world The world to check for plot areas
-     * @return A set of PlotAreas
-     */
-    public Set<PlotArea> getPlotAreas(String world) {
-        if (world == null) {
-            return Collections.emptySet();
-        }
-        return PlotSquared.get().getPlotAreas(world);
-    }
-
-    /**
-     * Send a message to the console. The message supports color codes.
-     *
-     * @param message the message
-     * @see MainUtil#sendConsoleMessage(C, String...)
-     */
-    public void sendConsoleMessage(String message) {
-        PlotSquared.log(message);
-    }
-
-    /**
-     * Send a message to the console.
-     *
-     * @param caption the message
-     * @see #sendConsoleMessage(String)
-     * @see C
-     */
-    public void sendConsoleMessage(C caption) {
-        sendConsoleMessage(caption.s());
-    }
-
-    /**
-     * Registers a flag for use in plots.
-     *
-     * @param flag the flag to register
-     */
-    public void addFlag(Flag<?> flag) {
-        Flags.registerFlag(flag);
-    }
-
-    /**
-     * Gets the PlotSquared class.
-     *
-     * @return PlotSquared Class
-     * @see PlotSquared
-     */
-    public PlotSquared getPlotSquared() {
-        return PlotSquared.get();
-    }
-
-    /**
-     * Get the PlotPlayer for a UUID.
-     *
-     * <p><i>Please note that PlotSquared can be configured to provide
-     * different UUIDs than bukkit</i>
-     *
-     * @param uuid the uuid of the player to wrap
-     * @return a {@code PlotPlayer}
-     * @see PlotPlayer#wrap(Object)
-     */
-    public PlotPlayer wrapPlayer(UUID uuid) {
-        return PlotPlayer.wrap(uuid);
-    }
-
-    /**
-     * Get the PlotPlayer for a username.
-     *
-     * @param player the player to wrap
-     * @return a {@code PlotPlayer}
-     * @see PlotPlayer#wrap(Object)
-     */
-    public PlotPlayer wrapPlayer(String player) {
-        return PlotPlayer.wrap(player);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index ab1894a9d..e1006b056 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -1,36 +1,11 @@
 package com.github.intellectualsites.plotsquared.bukkit;
 
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
-
 import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.ChunkListener;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.EntitySpawnListener;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.PlayerEvents;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.PlotPlusListener;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.SingleWorldListener;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.WorldEvents;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.*;
 import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle_111;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitBlockRegistry;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitChatManager;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitChunkManager;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitCommand;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitEconHandler;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitEventUtil;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitHybridUtils;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitInventoryUtil;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitLegacyMappings;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitSchematicHandler;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitSetupUtils;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitTaskManager;
-import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
-import com.github.intellectualsites.plotsquared.bukkit.util.SendChunk;
-import com.github.intellectualsites.plotsquared.bukkit.util.SetGenCB;
+import com.github.intellectualsites.plotsquared.bukkit.util.*;
 import com.github.intellectualsites.plotsquared.bukkit.util.block.BukkitLocalQueue;
-import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper;
-import com.github.intellectualsites.plotsquared.bukkit.uuid.FileUUIDHandler;
-import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper;
-import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper;
-import com.github.intellectualsites.plotsquared.bukkit.uuid.SQLUUIDHandler;
+import com.github.intellectualsites.plotsquared.bukkit.uuid.*;
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.IPlotMain;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
@@ -41,57 +16,22 @@ import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridGen;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
 import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.object.BlockRegistry;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
+import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator;
-import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
-import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.ConsoleColors;
-import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil;
-import com.github.intellectualsites.plotsquared.plot.util.LegacyMappings;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
-import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandlerImplementation;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
+import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extension.platform.Capability;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-import javax.annotation.Nullable;
 import lombok.Getter;
 import lombok.NonNull;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Chunk;
+import org.bukkit.*;
 import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -104,6 +44,13 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import javax.annotation.Nullable;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.*;
+
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+
 public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
 
     @Getter private static WorldEdit worldEdit;
@@ -319,8 +266,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return getDescription().getVersion();
     }
 
-    @Override
-    public String getPluginName() {
+    @Override public String getPluginName() {
         return pluginName;
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
index 69b168b3d..5e87231df 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
@@ -5,7 +5,10 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonWriter;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
 import org.bukkit.Statistic.Type;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index 7b56cabfd..a57a8dbe3 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -1,7 +1,5 @@
 package com.github.intellectualsites.plotsquared.bukkit.listeners;
 
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
-
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.C;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
@@ -11,8 +9,6 @@ import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefCla
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefField;
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import java.lang.reflect.Method;
-import java.util.HashSet;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
@@ -31,8 +27,12 @@ import org.bukkit.event.entity.ItemSpawnEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.event.world.ChunkUnloadEvent;
 
-@SuppressWarnings("unused")
-public class ChunkListener implements Listener {
+import java.lang.reflect.Method;
+import java.util.HashSet;
+
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+
+@SuppressWarnings("unused") public class ChunkListener implements Listener {
 
     private RefMethod methodGetHandleChunk;
     private RefField mustSave;
@@ -48,7 +48,7 @@ public class ChunkListener implements Listener {
                 this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
             } catch (Throwable ignored) {
                 PlotSquared.debug(PlotSquared.get().IMP.getPluginName()
-                        + "/Server not compatible for chunk processor trim/gc");
+                    + "/Server not compatible for chunk processor trim/gc");
 
                 Settings.Chunk_Processor.AUTO_TRIM = false;
             }
@@ -68,10 +68,9 @@ public class ChunkListener implements Listener {
                         continue;
                     }
                     Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
-                    Object chunkMap =
-                        w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
-                    Method methodIsChunkInUse = chunkMap.getClass()
-                        .getDeclaredMethod("isChunkInUse", int.class, int.class);
+                    Object chunkMap = w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
+                    Method methodIsChunkInUse =
+                        chunkMap.getClass().getDeclaredMethod("isChunkInUse", int.class, int.class);
                     Chunk[] chunks = world.getLoadedChunks();
                     for (Chunk chunk : chunks) {
                         if ((boolean) methodIsChunkInUse
@@ -145,8 +144,7 @@ public class ChunkListener implements Listener {
         return plot != null && plot.hasOwner();
     }
 
-    @EventHandler
-    public void onChunkUnload(ChunkUnloadEvent event) {
+    @EventHandler public void onChunkUnload(ChunkUnloadEvent event) {
         if (ignoreUnload) {
             return;
         }
@@ -164,13 +162,11 @@ public class ChunkListener implements Listener {
         }
     }
 
-    @EventHandler
-    public void onChunkLoad(ChunkLoadEvent event) {
+    @EventHandler public void onChunkLoad(ChunkLoadEvent event) {
         processChunk(event.getChunk(), false);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onItemSpawn(ItemSpawnEvent event) {
+    @EventHandler(priority = EventPriority.LOWEST) public void onItemSpawn(ItemSpawnEvent event) {
         Item entity = event.getEntity();
         Chunk chunk = entity.getLocation().getChunk();
         if (chunk == this.lastChunk) {
@@ -227,8 +223,7 @@ public class ChunkListener implements Listener {
             if (!chunk.isLoaded()) {
                 Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                 TaskManager.tasks.remove(currentIndex);
-                PlotSquared
-                        .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                PlotSquared.debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
                 chunk.unload(true, true);
                 return;
             }
@@ -236,8 +231,7 @@ public class ChunkListener implements Listener {
             if (tiles.length == 0) {
                 Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                 TaskManager.tasks.remove(currentIndex);
-                PlotSquared
-                    .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                PlotSquared.debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
                 chunk.unload(true, true);
                 return;
             }
@@ -272,14 +266,14 @@ public class ChunkListener implements Listener {
                 }
             }
             PlotSquared.debug(
-                    C.PREFIX.s() + "&a detected unsafe chunk and processed: " + (chunk.getX() << 4)
-                            + "," + (chunk.getX() << 4));
+                C.PREFIX.s() + "&a detected unsafe chunk and processed: " + (chunk.getX() << 4)
+                    + "," + (chunk.getX() << 4));
         }
         if (tiles.length > Settings.Chunk_Processor.MAX_TILES) {
             if (unload) {
                 PlotSquared.debug(
-                        C.PREFIX.s() + "&c detected unsafe chunk: " + (chunk.getX() << 4) + "," + (
-                                chunk.getX() << 4));
+                    C.PREFIX.s() + "&c detected unsafe chunk: " + (chunk.getX() << 4) + "," + (
+                        chunk.getX() << 4));
                 cleanChunk(chunk);
                 return true;
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
index bf33577a1..97d1bb7d7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
@@ -16,90 +16,89 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 
-@SuppressWarnings("unused")
-public class ForceFieldListener {
+@SuppressWarnings("unused") public class ForceFieldListener {
 
-  private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) {
-    Set<PlotPlayer> players = new HashSet<>();
-    for (Player nearPlayer : Iterables
-        .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
-      PlotPlayer plotPlayer;
-      if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
-          .equals(plotPlayer.getCurrentPlot())) {
-        continue;
-      }
-      if (!plot.isAdded(plotPlayer.getUUID())) {
-        players.add(plotPlayer);
-      }
-    }
-    return players;
-  }
-
-  private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) {
-    for (Player nearPlayer : Iterables
-        .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
-      PlotPlayer plotPlayer;
-      if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
-          .equals(plotPlayer.getCurrentPlot())) {
-        continue;
-      }
-      if (plot.isAdded(plotPlayer.getUUID())) {
-        return plotPlayer;
-      }
-    }
-    return null;
-  }
-
-  private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) {
-    Location playerLocation = player.getLocationFull();
-    Location oPlayerLocation = e.getLocation();
-    double playerX = playerLocation.getX();
-    double playerY = playerLocation.getY();
-    double playerZ = playerLocation.getZ();
-    double oPlayerX = oPlayerLocation.getX();
-    double oPlayerY = oPlayerLocation.getY();
-    double oPlayerZ = oPlayerLocation.getZ();
-    double x = 0d;
-    if (playerX < oPlayerX) {
-      x = 1.0d;
-    } else if (playerX > oPlayerX) {
-      x = -1.0d;
-    }
-    double y = 0d;
-    if (playerY < oPlayerY) {
-      y = 0.5d;
-    } else if (playerY > oPlayerY) {
-      y = -0.5d;
-    }
-    double z = 0d;
-    if (playerZ < oPlayerZ) {
-      z = 1.0d;
-    } else if (playerZ > oPlayerZ) {
-      z = -1.0d;
-    }
-    return new Vector(x, y, z);
-  }
-
-  public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) {
-    if (Flags.FORCEFIELD.isTrue(plot)) {
-      UUID uuid = plotPlayer.getUUID();
-      if (plot.isAdded(uuid)) {
-        Set<PlotPlayer> players = getNearbyPlayers(player, plot);
-        for (PlotPlayer oPlayer : players) {
-          if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
-            ((BukkitPlayer) oPlayer).player
-                .setVelocity(calculateVelocity(plotPlayer, oPlayer));
-          }
+    private static Set<PlotPlayer> getNearbyPlayers(Player player, Plot plot) {
+        Set<PlotPlayer> players = new HashSet<>();
+        for (Player nearPlayer : Iterables
+            .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
+            PlotPlayer plotPlayer;
+            if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
+                .equals(plotPlayer.getCurrentPlot())) {
+                continue;
+            }
+            if (!plot.isAdded(plotPlayer.getUUID())) {
+                players.add(plotPlayer);
+            }
+        }
+        return players;
+    }
+
+    private static PlotPlayer hasNearbyPermitted(Player player, Plot plot) {
+        for (Player nearPlayer : Iterables
+            .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) {
+            PlotPlayer plotPlayer;
+            if ((plotPlayer = BukkitUtil.getPlayer(nearPlayer)) == null || !plot
+                .equals(plotPlayer.getCurrentPlot())) {
+                continue;
+            }
+            if (plot.isAdded(plotPlayer.getUUID())) {
+                return plotPlayer;
+            }
+        }
+        return null;
+    }
+
+    private static Vector calculateVelocity(PlotPlayer player, PlotPlayer e) {
+        Location playerLocation = player.getLocationFull();
+        Location oPlayerLocation = e.getLocation();
+        double playerX = playerLocation.getX();
+        double playerY = playerLocation.getY();
+        double playerZ = playerLocation.getZ();
+        double oPlayerX = oPlayerLocation.getX();
+        double oPlayerY = oPlayerLocation.getY();
+        double oPlayerZ = oPlayerLocation.getZ();
+        double x = 0d;
+        if (playerX < oPlayerX) {
+            x = 1.0d;
+        } else if (playerX > oPlayerX) {
+            x = -1.0d;
+        }
+        double y = 0d;
+        if (playerY < oPlayerY) {
+            y = 0.5d;
+        } else if (playerY > oPlayerY) {
+            y = -0.5d;
+        }
+        double z = 0d;
+        if (playerZ < oPlayerZ) {
+            z = 1.0d;
+        } else if (playerZ > oPlayerZ) {
+            z = -1.0d;
+        }
+        return new Vector(x, y, z);
+    }
+
+    public static void handleForcefield(Player player, PlotPlayer plotPlayer, Plot plot) {
+        if (Flags.FORCEFIELD.isTrue(plot)) {
+            UUID uuid = plotPlayer.getUUID();
+            if (plot.isAdded(uuid)) {
+                Set<PlotPlayer> players = getNearbyPlayers(player, plot);
+                for (PlotPlayer oPlayer : players) {
+                    if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+                        ((BukkitPlayer) oPlayer).player
+                            .setVelocity(calculateVelocity(plotPlayer, oPlayer));
+                    }
+                }
+            } else {
+                PlotPlayer oPlayer = hasNearbyPermitted(player, plot);
+                if (oPlayer == null) {
+                    return;
+                }
+                if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+                    player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
+                }
+            }
         }
-      } else {
-        PlotPlayer oPlayer = hasNearbyPermitted(player, plot);
-        if (oPlayer == null) {
-          return;
-        }
-        if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
-          player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
-        }
-      }
     }
-  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index ecb6b50ef..d0511aaa7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -58,188 +58,186 @@ import java.util.regex.Pattern;
 /**
  * Player Events involving plots.
  */
-@SuppressWarnings("unused")
-public class PlayerEvents extends PlotListener implements Listener {
+@SuppressWarnings("unused") public class PlayerEvents extends PlotListener implements Listener {
 
-  private boolean pistonBlocks = true;
-  private float lastRadius;
-  // To prevent recursion
-  private boolean tmpTeleport = true;
-  private Field fieldPlayer;
-  private PlayerMoveEvent moveTmp;
+    private boolean pistonBlocks = true;
+    private float lastRadius;
+    // To prevent recursion
+    private boolean tmpTeleport = true;
+    private Field fieldPlayer;
+    private PlayerMoveEvent moveTmp;
 
-  {
-    try {
-      fieldPlayer = PlayerEvent.class.getDeclaredField("player");
-      fieldPlayer.setAccessible(true);
-    } catch (NoSuchFieldException e) {
-      e.printStackTrace();
+    {
+        try {
+            fieldPlayer = PlayerEvent.class.getDeclaredField("player");
+            fieldPlayer.setAccessible(true);
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
     }
-  }
 
-  public static void sendBlockChange(final org.bukkit.Location bloc, final BlockData data) {
-    TaskManager.runTaskLater(() -> {
-      String world = bloc.getWorld().getName();
-      int x = bloc.getBlockX();
-      int z = bloc.getBlockZ();
-      int distance = Bukkit.getViewDistance() * 16;
-      for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-        PlotPlayer player = entry.getValue();
-        Location loc = player.getLocation();
-        if (loc.getWorld().equals(world)) {
-          if (16 * Math.abs(loc.getX() - x) / 16 > distance
-              || 16 * Math.abs(loc.getZ() - z) / 16 > distance) {
-            continue;
-          }
-          ((BukkitPlayer) player).player.sendBlockChange(bloc, data);
-        }
-      }
-    }, 3);
-  }
-
-  public static boolean checkEntity(Entity entity, Plot plot) {
-    if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot
-        .getArea().DEFAULT_FLAGS.isEmpty()) {
-      return false;
+    public static void sendBlockChange(final org.bukkit.Location bloc, final BlockData data) {
+        TaskManager.runTaskLater(() -> {
+            String world = bloc.getWorld().getName();
+            int x = bloc.getBlockX();
+            int z = bloc.getBlockZ();
+            int distance = Bukkit.getViewDistance() * 16;
+            for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+                PlotPlayer player = entry.getValue();
+                Location loc = player.getLocation();
+                if (loc.getWorld().equals(world)) {
+                    if (16 * Math.abs(loc.getX() - x) / 16 > distance
+                        || 16 * Math.abs(loc.getZ() - z) / 16 > distance) {
+                        continue;
+                    }
+                    ((BukkitPlayer) player).player.sendBlockChange(bloc, data);
+                }
+            }
+        }, 3);
     }
-    switch (entity.getType()) {
-      case PLAYER:
-        return false;
-      case ARROW:
-      case DRAGON_FIREBALL:
-      case DROPPED_ITEM:
-      case EGG:
-      case ENDER_PEARL:
-      case FIREBALL:
-      case LINGERING_POTION:
-      case LLAMA_SPIT:
-      case SHULKER_BULLET:
-      case SMALL_FIREBALL:
-      case SNOWBALL:
-      case SPECTRAL_ARROW:
-      case SPLASH_POTION:
-      case THROWN_EXP_BOTTLE:
-      case TIPPED_ARROW:
-        // projectile
-      case FALLING_BLOCK:
-      case PRIMED_TNT:
-        // Block entities
-      case AREA_EFFECT_CLOUD:
-      case COMPLEX_PART:
-      case ENDER_CRYSTAL:
-      case ENDER_SIGNAL:
-      case EVOKER_FANGS:
-      case EXPERIENCE_ORB:
-      case FIREWORK:
-      case FISHING_HOOK:
-      case LEASH_HITCH:
-      case LIGHTNING:
-      case UNKNOWN:
-      case WEATHER:
-      case WITHER_SKULL:
-        // non moving / unmovable
-        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
-      case ARMOR_STAND:
-      case ITEM_FRAME:
-      case PAINTING:
-        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
-      // misc
-      case BOAT:
-      case MINECART:
-      case MINECART_CHEST:
-      case MINECART_COMMAND:
-      case MINECART_FURNACE:
-      case MINECART_HOPPER:
-      case MINECART_MOB_SPAWNER:
-      case MINECART_TNT:
-        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
-      case BAT:
-      case CHICKEN:
-      case COD:
-      case COW:
-      case DOLPHIN:
-      case DONKEY:
-      case HORSE:
-      case IRON_GOLEM:
-      case LLAMA:
-      case MULE:
-      case MUSHROOM_COW:
-      case OCELOT:
-      case PARROT:
-      case PIG:
-      case POLAR_BEAR:
-      case PUFFERFISH:
-      case RABBIT:
-      case SALMON:
-      case SHEEP:
-      case SKELETON_HORSE:
-      case SNOWMAN:
-      case SQUID:
-      case TROPICAL_FISH:
-      case TURTLE:
-      case VILLAGER:
-      case WOLF:
-      case ZOMBIE_HORSE:
-        // animal
-        return EntityUtil
-            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
-      case BLAZE:
-      case CAVE_SPIDER:
-      case CREEPER:
-      case DROWNED:
-      case ELDER_GUARDIAN:
-      case ENDERMAN:
-      case ENDERMITE:
-      case ENDER_DRAGON:
-      case EVOKER:
-      case GHAST:
-      case GIANT:
-      case GUARDIAN:
-      case HUSK:
-      case ILLUSIONER:
-      case MAGMA_CUBE:
-      case PIG_ZOMBIE:
-      case SHULKER:
-      case SILVERFISH:
-      case SKELETON:
-      case SLIME:
-      case SPIDER:
-      case STRAY:
-      case VEX:
-      case VINDICATOR:
-      case WITCH:
-      case WITHER:
-      case WITHER_SKELETON:
-      case ZOMBIE:
-      case ZOMBIE_VILLAGER:
-        // monster
-        return EntityUtil
-            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
-      default:
-        if (entity instanceof LivingEntity) {
-          if (entity instanceof Animals || entity instanceof WaterMob) {
-            return EntityUtil
-                .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
-          } else if (entity instanceof Monster) {
-            return EntityUtil
-                .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
-          } else {
-            return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP);
-          }
-        }
-        if (entity instanceof Vehicle) {
-          return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
-        }
-        if (entity instanceof Hanging) {
-          return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
-        }
-        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
-    }
-  }
 
-  @EventHandler
-  public void onRedstoneEvent(BlockRedstoneEvent event) {
-    Block block = event.getBlock();
+    public static boolean checkEntity(Entity entity, Plot plot) {
+        if (plot == null || !plot.hasOwner() || plot.getFlags().isEmpty() && plot
+            .getArea().DEFAULT_FLAGS.isEmpty()) {
+            return false;
+        }
+        switch (entity.getType()) {
+            case PLAYER:
+                return false;
+            case ARROW:
+            case DRAGON_FIREBALL:
+            case DROPPED_ITEM:
+            case EGG:
+            case ENDER_PEARL:
+            case FIREBALL:
+            case LINGERING_POTION:
+            case LLAMA_SPIT:
+            case SHULKER_BULLET:
+            case SMALL_FIREBALL:
+            case SNOWBALL:
+            case SPECTRAL_ARROW:
+            case SPLASH_POTION:
+            case THROWN_EXP_BOTTLE:
+            case TIPPED_ARROW:
+                // projectile
+            case FALLING_BLOCK:
+            case PRIMED_TNT:
+                // Block entities
+            case AREA_EFFECT_CLOUD:
+            case COMPLEX_PART:
+            case ENDER_CRYSTAL:
+            case ENDER_SIGNAL:
+            case EVOKER_FANGS:
+            case EXPERIENCE_ORB:
+            case FIREWORK:
+            case FISHING_HOOK:
+            case LEASH_HITCH:
+            case LIGHTNING:
+            case UNKNOWN:
+            case WEATHER:
+            case WITHER_SKULL:
+                // non moving / unmovable
+                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
+            case ARMOR_STAND:
+            case ITEM_FRAME:
+            case PAINTING:
+                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
+            // misc
+            case BOAT:
+            case MINECART:
+            case MINECART_CHEST:
+            case MINECART_COMMAND:
+            case MINECART_FURNACE:
+            case MINECART_HOPPER:
+            case MINECART_MOB_SPAWNER:
+            case MINECART_TNT:
+                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
+            case BAT:
+            case CHICKEN:
+            case COD:
+            case COW:
+            case DOLPHIN:
+            case DONKEY:
+            case HORSE:
+            case IRON_GOLEM:
+            case LLAMA:
+            case MULE:
+            case MUSHROOM_COW:
+            case OCELOT:
+            case PARROT:
+            case PIG:
+            case POLAR_BEAR:
+            case PUFFERFISH:
+            case RABBIT:
+            case SALMON:
+            case SHEEP:
+            case SKELETON_HORSE:
+            case SNOWMAN:
+            case SQUID:
+            case TROPICAL_FISH:
+            case TURTLE:
+            case VILLAGER:
+            case WOLF:
+            case ZOMBIE_HORSE:
+                // animal
+                return EntityUtil
+                    .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
+            case BLAZE:
+            case CAVE_SPIDER:
+            case CREEPER:
+            case DROWNED:
+            case ELDER_GUARDIAN:
+            case ENDERMAN:
+            case ENDERMITE:
+            case ENDER_DRAGON:
+            case EVOKER:
+            case GHAST:
+            case GIANT:
+            case GUARDIAN:
+            case HUSK:
+            case ILLUSIONER:
+            case MAGMA_CUBE:
+            case PIG_ZOMBIE:
+            case SHULKER:
+            case SILVERFISH:
+            case SKELETON:
+            case SLIME:
+            case SPIDER:
+            case STRAY:
+            case VEX:
+            case VINDICATOR:
+            case WITCH:
+            case WITHER:
+            case WITHER_SKELETON:
+            case ZOMBIE:
+            case ZOMBIE_VILLAGER:
+                // monster
+                return EntityUtil
+                    .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
+            default:
+                if (entity instanceof LivingEntity) {
+                    if (entity instanceof Animals || entity instanceof WaterMob) {
+                        return EntityUtil
+                            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.ANIMAL_CAP);
+                    } else if (entity instanceof Monster) {
+                        return EntityUtil
+                            .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
+                    } else {
+                        return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP);
+                    }
+                }
+                if (entity instanceof Vehicle) {
+                    return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
+                }
+                if (entity instanceof Hanging) {
+                    return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.MISC_CAP);
+                }
+                return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
+        }
+    }
+
+    @EventHandler public void onRedstoneEvent(BlockRedstoneEvent event) {
+        Block block = event.getBlock();
 /*        switch (block.getType()) {
             case OBSERVER:
             case REDSTONE:
@@ -287,2575 +285,2570 @@ public class PlayerEvents extends PlotListener implements Listener {
             case POWERED_RAIL:
                 return;
             default:*/
-    Location loc = BukkitUtil.getLocation(block.getLocation());
-    PlotArea area = loc.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlot(loc);
-    if (plot == null) {
-      return;
-    }
-    if (Flags.REDSTONE.isFalse(plot)) {
-      event.setNewCurrent(0);
-      return;
-    }
-    if (Settings.Redstone.DISABLE_OFFLINE) {
-      boolean disable;
-      if (plot.isMerged()) {
-        disable = true;
-        for (UUID owner : plot.getOwners()) {
-          if (UUIDHandler.getPlayer(owner) != null) {
-            disable = false;
-            break;
-          }
-        }
-      } else {
-        disable = UUIDHandler.getPlayer(plot.guessOwner()) == null;
-      }
-      if (disable) {
-        for (UUID trusted : plot.getTrusted()) {
-          if (UUIDHandler.getPlayer(trusted) != null) {
-            disable = false;
-            break;
-          }
-        }
-        if (disable) {
-          event.setNewCurrent(0);
-          return;
-        }
-      }
-    }
-    if (Settings.Redstone.DISABLE_UNOCCUPIED) {
-      for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-        if (plot.equals(entry.getValue().getCurrentPlot())) {
-          return;
-        }
-      }
-      event.setNewCurrent(0);
-    }
-    //}
-  }
-
-  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-  public void onPhysicsEvent(BlockPhysicsEvent event) {
-    switch (event.getChangedType()) {
-      case COMPARATOR: {
-        Block block = event.getBlock();
         Location loc = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = loc.getPlotArea();
         if (area == null) {
-          return;
+            return;
         }
-        Plot plot = area.getOwnedPlotAbs(loc);
+        Plot plot = area.getOwnedPlot(loc);
         if (plot == null) {
-          return;
+            return;
         }
         if (Flags.REDSTONE.isFalse(plot)) {
-          event.setCancelled(true);
+            event.setNewCurrent(0);
+            return;
+        }
+        if (Settings.Redstone.DISABLE_OFFLINE) {
+            boolean disable;
+            if (plot.isMerged()) {
+                disable = true;
+                for (UUID owner : plot.getOwners()) {
+                    if (UUIDHandler.getPlayer(owner) != null) {
+                        disable = false;
+                        break;
+                    }
+                }
+            } else {
+                disable = UUIDHandler.getPlayer(plot.guessOwner()) == null;
+            }
+            if (disable) {
+                for (UUID trusted : plot.getTrusted()) {
+                    if (UUIDHandler.getPlayer(trusted) != null) {
+                        disable = false;
+                        break;
+                    }
+                }
+                if (disable) {
+                    event.setNewCurrent(0);
+                    return;
+                }
+            }
+        }
+        if (Settings.Redstone.DISABLE_UNOCCUPIED) {
+            for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+                if (plot.equals(entry.getValue().getCurrentPlot())) {
+                    return;
+                }
+            }
+            event.setNewCurrent(0);
+        }
+        //}
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onPhysicsEvent(BlockPhysicsEvent event) {
+        switch (event.getChangedType()) {
+            case COMPARATOR: {
+                Block block = event.getBlock();
+                Location loc = BukkitUtil.getLocation(block.getLocation());
+                PlotArea area = loc.getPlotArea();
+                if (area == null) {
+                    return;
+                }
+                Plot plot = area.getOwnedPlotAbs(loc);
+                if (plot == null) {
+                    return;
+                }
+                if (Flags.REDSTONE.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                return;
+            }
+            case ANVIL:
+            case DRAGON_EGG:
+            case GRAVEL:
+            case SAND:
+            case TURTLE_EGG:
+            case TURTLE_HELMET:
+            case TURTLE_SPAWN_EGG: {
+                Block block = event.getBlock();
+                Location loc = BukkitUtil.getLocation(block.getLocation());
+                PlotArea area = loc.getPlotArea();
+                if (area == null) {
+                    return;
+                }
+                Plot plot = area.getOwnedPlotAbs(loc);
+                if (plot == null) {
+                    return;
+                }
+                if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                return;
+            }
+            default:
+                if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) {
+                    Block block = event.getBlock();
+                    switch (block.getType()) {
+                        case PISTON:
+                        case STICKY_PISTON:
+                            Piston piston = (Piston) block.getBlockData();
+                            Location loc = BukkitUtil.getLocation(block.getLocation());
+                            PlotArea area = loc.getPlotArea();
+                            if (area == null) {
+                                return;
+                            }
+                            Plot plot = area.getOwnedPlotAbs(loc);
+                            if (plot == null) {
+                                return;
+                            }
+                            switch (piston.getFacing()) {
+                                case EAST:
+                                    loc.setX(loc.getX() + 1);
+                                    break;
+                                case SOUTH:
+                                    loc.setX(loc.getX() - 1);
+                                    break;
+                                case WEST:
+                                    loc.setZ(loc.getZ() + 1);
+                                    break;
+                                case NORTH:
+                                    loc.setZ(loc.getZ() - 1);
+                                    break;
+                            }
+                            Plot newPlot = area.getOwnedPlotAbs(loc);
+                            if (!plot.equals(newPlot)) {
+                                event.setCancelled(true);
+                                return;
+                            }
+                    }
+                }
+                break;
+        }
+    }
+
+    @EventHandler public void onProjectileLaunch(ProjectileLaunchEvent event) {
+        Projectile entity = event.getEntity();
+        if (!(entity instanceof ThrownPotion)) {
+            return;
+        }
+        ProjectileSource shooter = entity.getShooter();
+        if (!(shooter instanceof Player)) {
+            return;
+        }
+        Location l = BukkitUtil.getLocation(entity);
+        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+            return;
+        }
+        PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
+        Plot plot = l.getOwnedPlot();
+        if (plot != null && !plot.isAdded(pp.getUUID())) {
+            entity.remove();
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler public boolean onProjectileHit(ProjectileHitEvent event) {
+        Projectile entity = event.getEntity();
+        Location loc = BukkitUtil.getLocation(entity);
+        if (!PlotSquared.get().hasPlotArea(loc.getWorld())) {
+            return true;
         }
-        return;
-      }
-      case ANVIL:
-      case DRAGON_EGG:
-      case GRAVEL:
-      case SAND:
-      case TURTLE_EGG:
-      case TURTLE_HELMET:
-      case TURTLE_SPAWN_EGG: {
-        Block block = event.getBlock();
-        Location loc = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = loc.getPlotArea();
         if (area == null) {
-          return;
-        }
-        Plot plot = area.getOwnedPlotAbs(loc);
-        if (plot == null) {
-          return;
-        }
-        if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        return;
-      }
-      default:
-        if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) {
-          Block block = event.getBlock();
-          switch (block.getType()) {
-            case PISTON:
-            case STICKY_PISTON:
-              Piston piston = (Piston) block.getBlockData();
-              Location loc = BukkitUtil.getLocation(block.getLocation());
-              PlotArea area = loc.getPlotArea();
-              if (area == null) {
-                return;
-              }
-              Plot plot = area.getOwnedPlotAbs(loc);
-              if (plot == null) {
-                return;
-              }
-              switch (piston.getFacing()) {
-                case EAST:
-                  loc.setX(loc.getX() + 1);
-                  break;
-                case SOUTH:
-                  loc.setX(loc.getX() - 1);
-                  break;
-                case WEST:
-                  loc.setZ(loc.getZ() + 1);
-                  break;
-                case NORTH:
-                  loc.setZ(loc.getZ() - 1);
-                  break;
-              }
-              Plot newPlot = area.getOwnedPlotAbs(loc);
-              if (!plot.equals(newPlot)) {
-                event.setCancelled(true);
-                return;
-              }
-          }
-        }
-        break;
-    }
-  }
-
-  @EventHandler
-  public void onProjectileLaunch(ProjectileLaunchEvent event) {
-    Projectile entity = event.getEntity();
-    if (!(entity instanceof ThrownPotion)) {
-      return;
-    }
-    ProjectileSource shooter = entity.getShooter();
-    if (!(shooter instanceof Player)) {
-      return;
-    }
-    Location l = BukkitUtil.getLocation(entity);
-    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-      return;
-    }
-    PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
-    Plot plot = l.getOwnedPlot();
-    if (plot != null && !plot.isAdded(pp.getUUID())) {
-      entity.remove();
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler
-  public boolean onProjectileHit(ProjectileHitEvent event) {
-    Projectile entity = event.getEntity();
-    Location loc = BukkitUtil.getLocation(entity);
-    if (!PlotSquared.get().hasPlotArea(loc.getWorld())) {
-      return true;
-    }
-    PlotArea area = loc.getPlotArea();
-    if (area == null) {
-      return true;
-    }
-    Plot plot = area.getPlot(loc);
-    ProjectileSource shooter = entity.getShooter();
-    if (shooter instanceof Player) {
-      PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
-      if (plot == null) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED)) {
-          entity.remove();
-          return false;
-        }
-        return true;
-      }
-      if (plot.isAdded(pp.getUUID()) || Permissions
-          .hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) {
-        return true;
-      }
-      entity.remove();
-      return false;
-    }
-    if (!(shooter instanceof Entity) && shooter != null) {
-      if (plot == null) {
-        entity.remove();
-        return false;
-      }
-      Location sLoc =
-          BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
-      if (!area.contains(sLoc.getX(), sLoc.getZ())) {
-        entity.remove();
-        return false;
-      }
-      Plot sPlot = area.getOwnedPlotAbs(sLoc);
-      if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
-        entity.remove();
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-  public void playerCommand(PlayerCommandPreprocessEvent event) {
-    String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
-    if (msg.isEmpty()) {
-      return;
-    }
-    Player player = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    Location loc = pp.getLocation();
-    PlotArea area = loc.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    String[] parts = msg.split(" ");
-    Plot plot = pp.getCurrentPlot();
-    if (BukkitMain.getWorldEdit() != null) { // Check WorldEdit
-      switch (parts[0].toLowerCase()) {
-        case "up":
-        case "/up":
-        case "worldedit:up":
-        case "worldedit:/up":
-          if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
-              .hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER, true))) {
-            event.setCancelled(true);
-            return;
-          }
-      }
-    }
-    if (plot == null) {
-      return;
-    }
-    Optional<List<String>> flag = plot.getFlag(Flags.BLOCKED_CMDS);
-    if (flag.isPresent() && !Permissions
-        .hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
-      List<String> blocked_cmds = flag.get();
-      String c = parts[0];
-      if (parts[0].contains(":")) {
-        c = parts[0].split(":")[1];
-        msg = msg.replace(parts[0].split(":")[0] + ':', "");
-      }
-      String l = c;
-      List<String> aliases = new ArrayList<>();
-      for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
-        if (c.equals(cmdLabel.getName())) {
-          break;
-        }
-        String label = cmdLabel.getName().replaceFirst("/", "");
-        if (aliases.contains(label)) {
-          continue;
-        }
-        PluginCommand p;
-        if ((p = Bukkit.getPluginCommand(label)) != null) {
-          for (String a : p.getAliases()) {
-            if (aliases.contains(a)) {
-              continue;
-            }
-            aliases.add(a);
-            a = a.replaceFirst("/", "");
-            if (!a.equals(label) && a.equals(c)) {
-              c = label;
-              break;
-            }
-          }
-        }
-      }
-      if (!l.equals(c)) {
-        msg = msg.replace(l, c);
-      }
-      for (String s : blocked_cmds) {
-        Pattern pattern;
-        if (!RegExUtil.compiledPatterns.containsKey(s)) {
-          RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
-        } else {
-          pattern = RegExUtil.compiledPatterns.get(s);
-        }
-        if (pattern.matcher(msg).matches()) {
-          String perm;
-          if (plot.isAdded(pp.getUUID())) {
-            perm = "plots.admin.command.blocked-cmds.shared";
-          } else {
-            perm = "plots.admin.command.blocked-cmds.other";
-          }
-          if (!Permissions.hasPermission(pp, perm)) {
-            MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
-            event.setCancelled(true);
-          }
-          return;
-        }
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-  public void onConnect(PlayerJoinEvent event) {
-    final Player player = event.getPlayer();
-    UUIDHandler.getPlayers().remove(player.getName());
-    BukkitUtil.removePlayer(player.getName());
-    final PlotPlayer pp = BukkitUtil.getPlayer(player);
-    // Now
-    String name = pp.getName();
-    StringWrapper sw = new StringWrapper(name);
-    UUID uuid = pp.getUUID();
-    UUIDHandler.add(sw, uuid);
-
-    Location loc = pp.getLocation();
-    PlotArea area = loc.getPlotArea();
-    if (area != null) {
-      Plot plot = area.getPlot(loc);
-      if (plot != null) {
-        plotEntry(pp, plot);
-      }
-    }
-    // Delayed
-
-    // Async
-    TaskManager.runTaskLaterAsync(() -> {
-      if (!player.hasPlayedBefore() && player.isOnline()) {
-        player.saveData();
-      }
-      EventUtil.manager.doJoinTask(pp);
-    }, 20);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void playerRespawn(PlayerRespawnEvent event) {
-    Player player = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    EventUtil.manager.doRespawnTask(pp);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onTeleport(PlayerTeleportEvent event) {
-    if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
-        .equals(event.getTo().getWorld())) {
-      final Object lastLoc = BukkitUtil.getPlayer(event.getPlayer())
-          .deleteMeta(PlotPlayer.META_LOCATION);
-      final Object lastPlot = BukkitUtil.getPlayer(event.getPlayer())
-          .deleteMeta(PlotPlayer.META_LAST_PLOT);
-      org.bukkit.Location to = event.getTo();
-      if (to != null) {
-        Player player = event.getPlayer();
-        PlotPlayer pp = PlotPlayer.wrap(player);
-        Location loc = BukkitUtil.getLocation(to);
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
-        if (area == null) {
-          return;
+            return true;
         }
         Plot plot = area.getPlot(loc);
-        if (plot != null) {
-          final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
-          if (!result) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-            event.setCancelled(true);
-            if (lastLoc != null) {
-              pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
-            }
-            if (lastPlot != null) {
-              pp.setMeta(PlotPlayer.META_LAST_PLOT, lastPlot);
-            }
-          } else {
-            plotEntry(pp, plot);
-          }
-        }
-      }
-      return;
-    }
-    playerMove(event);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void vehicleMove(VehicleMoveEvent event) throws IllegalAccessException {
-    final org.bukkit.Location from = event.getFrom();
-    final org.bukkit.Location to = event.getTo();
-
-    int toX, toZ;
-    if ((toX = MathMan.roundInt(to.getX())) != MathMan.roundInt(from.getX())
-        | (toZ = MathMan.roundInt(to.getZ())) != MathMan.roundInt(from.getZ())) {
-      Vehicle vehicle = event.getVehicle();
-
-      // Check allowed
-      if (!vehicle.getPassengers().isEmpty()) {
-        Entity passenger = vehicle.getPassengers().get(0);
-
-        if (passenger instanceof Player) {
-          final Player player = (Player) passenger;
-          // reset
-          if (moveTmp == null) {
-            moveTmp = new PlayerMoveEvent(null, from, to);
-          }
-          moveTmp.setFrom(from);
-          moveTmp.setTo(to);
-          moveTmp.setCancelled(false);
-          fieldPlayer.set(moveTmp, player);
-
-          List<Entity> passengers = vehicle.getPassengers();
-
-          this.playerMove(moveTmp);
-          org.bukkit.Location dest;
-          if (moveTmp.isCancelled()) {
-            dest = from;
-          } else if (MathMan.roundInt(moveTmp.getTo().getX()) != toX
-              || MathMan.roundInt(moveTmp.getTo().getZ()) != toZ) {
-            dest = to;
-          } else {
-            dest = null;
-          }
-          if (dest != null) {
-            if (passengers != null) {
-              vehicle.eject();
-              vehicle.setVelocity(new Vector(0d, 0d, 0d));
-              vehicle.teleport(dest);
-              passengers.forEach(vehicle::addPassenger);
-            } else {
-              vehicle.eject();
-              vehicle.setVelocity(new Vector(0d, 0d, 0d));
-              vehicle.teleport(dest);
-              vehicle.addPassenger(player);
-            }
-            return;
-          }
-        }
-        if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-          switch (vehicle.getType()) {
-            case BOAT:
-            case ENDER_CRYSTAL:
-            case MINECART:
-            case MINECART_CHEST:
-            case MINECART_COMMAND:
-            case MINECART_FURNACE:
-            case MINECART_HOPPER:
-            case MINECART_MOB_SPAWNER:
-            case MINECART_TNT: {
-              List<MetadataValue> meta = vehicle.getMetadata("plot");
-              Plot toPlot = BukkitUtil.getLocation(to).getPlot();
-              if (!meta.isEmpty()) {
-                Plot origin = (Plot) meta.get(0).value();
-                if (!origin.getBasePlot(false).equals(toPlot)) {
-                  vehicle.remove();
+        ProjectileSource shooter = entity.getShooter();
+        if (shooter instanceof Player) {
+            PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
+            if (plot == null) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED)) {
+                    entity.remove();
+                    return false;
                 }
-              } else if (toPlot != null) {
-                vehicle.setMetadata("plot",
-                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, toPlot));
-              }
+                return true;
             }
-          }
-        }
-      }
-
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void playerMove(PlayerMoveEvent event) {
-    org.bukkit.Location from = event.getFrom();
-    org.bukkit.Location to = event.getTo();
-    int x2;
-    if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX()))) {
-      Player player = event.getPlayer();
-      PlotPlayer pp = BukkitUtil.getPlayer(player);
-      // Cancel teleport
-      TaskManager.TELEPORT_QUEUE.remove(pp.getName());
-      // Set last location
-      Location loc = BukkitUtil.getLocation(to);
-      pp.setMeta(PlotPlayer.META_LOCATION, loc);
-      PlotArea area = loc.getPlotArea();
-      if (area == null) {
-        pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
-        return;
-      }
-      Plot now = area.getPlot(loc);
-      Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
-      if (now == null) {
-        if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
-            .getMeta("kick", false)) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-          this.tmpTeleport = false;
-          if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
-            player.teleport(from);
-          } else {
-            player.teleport(player.getWorld().getSpawnLocation());
-          }
-          this.tmpTeleport = true;
-          event.setCancelled(true);
-          return;
-        }
-      } else if (now.equals(lastPlot)) {
-        ForceFieldListener.handleForcefield(player, pp, now);
-        return;
-      } else if (!plotEntry(pp, now) && this.tmpTeleport) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-        this.tmpTeleport = false;
-        to.setX(from.getBlockX());
-        to.setY(from.getBlockY());
-        to.setZ(from.getBlockZ());
-        player.teleport(event.getTo());
-        this.tmpTeleport = true;
-        return;
-      }
-      int border = area.getBorder();
-      if (x2 > border && this.tmpTeleport) {
-        to.setX(x2 - 1);
-        this.tmpTeleport = false;
-        player.teleport(event.getTo());
-        this.tmpTeleport = true;
-        MainUtil.sendMessage(pp, C.BORDER);
-        return;
-      }
-      if (x2 < -border && this.tmpTeleport) {
-        to.setX(x2 + 1);
-        this.tmpTeleport = false;
-        player.teleport(event.getTo());
-        this.tmpTeleport = true;
-        MainUtil.sendMessage(pp, C.BORDER);
-        return;
-      }
-      return;
-    }
-    int z2;
-    if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ()))) {
-      Player player = event.getPlayer();
-      PlotPlayer pp = BukkitUtil.getPlayer(player);
-      // Cancel teleport
-      TaskManager.TELEPORT_QUEUE.remove(pp.getName());
-      // Set last location
-      Location loc = BukkitUtil.getLocation(to);
-      pp.setMeta(PlotPlayer.META_LOCATION, loc);
-      PlotArea area = loc.getPlotArea();
-      if (area == null) {
-        pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
-        return;
-      }
-      Plot now = area.getPlot(loc);
-      Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
-      if (now == null) {
-        if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
-            .getMeta("kick", false)) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
-          this.tmpTeleport = false;
-          if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
-            player.teleport(from);
-          } else {
-            player.teleport(player.getWorld().getSpawnLocation());
-          }
-          this.tmpTeleport = true;
-          event.setCancelled(true);
-          return;
-        }
-      } else if (now.equals(lastPlot)) {
-        ForceFieldListener.handleForcefield(player, pp, now);
-        return;
-      } else if (!plotEntry(pp, now) && this.tmpTeleport) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
-        this.tmpTeleport = false;
-        player.teleport(from);
-        to.setX(from.getBlockX());
-        to.setY(from.getBlockY());
-        to.setZ(from.getBlockZ());
-        player.teleport(event.getTo());
-        this.tmpTeleport = true;
-        return;
-      }
-      int border = area.getBorder();
-      if (z2 > border && this.tmpTeleport) {
-        to.setZ(z2 - 1);
-        this.tmpTeleport = false;
-        player.teleport(event.getTo());
-        this.tmpTeleport = true;
-        MainUtil.sendMessage(pp, C.BORDER);
-      } else if (z2 < -border && this.tmpTeleport) {
-        to.setZ(z2 + 1);
-        this.tmpTeleport = false;
-        player.teleport(event.getTo());
-        this.tmpTeleport = true;
-        MainUtil.sendMessage(pp, C.BORDER);
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.LOW)
-  public void onChat(AsyncPlayerChatEvent event) {
-    if (event.isCancelled()) {
-      return;
-    }
-
-    PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
-    Location location = plotPlayer.getLocation();
-    PlotArea area = location.getPlotArea();
-    if (area == null || (area.PLOT_CHAT == plotPlayer.getAttribute("chat"))) {
-      return;
-    }
-    Plot plot = area.getPlot(location);
-    if (plot == null) {
-      return;
-    }
-    event.setCancelled(true);
-    String message = event.getMessage();
-    String format = C.PLOT_CHAT_FORMAT.s();
-    String sender = event.getPlayer().getDisplayName();
-    PlotId id = plot.getId();
-    Set<Player> recipients = event.getRecipients();
-    Set<Player> spies = new HashSet<>();
-    recipients.clear();
-    for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-      PlotPlayer pp = entry.getValue();
-      if (pp.getAttribute("chatspy")) {
-        spies.add(((BukkitPlayer) pp).player);
-      } else {
-        Plot current = pp.getCurrentPlot();
-        if (current != null && current.getBasePlot(false).equals(plot)) {
-          recipients.add(((BukkitPlayer) pp).player);
-        }
-      }
-    }
-    String partial = ChatColor.translateAlternateColorCodes('&',
-        format.replace("%plot_id%", id.x + ";" + id.y).replace("%sender%", sender));
-    if (plotPlayer.hasPermission("plots.chat.color")) {
-      message = C.color(message);
-    }
-    String full = partial.replace("%msg%", message);
-    for (Player receiver : recipients) {
-      receiver.sendMessage(full);
-    }
-    if (!spies.isEmpty()) {
-      String spyMessage = C.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
-          .replace("%sender%", sender).replace("%msg%", message);
-      for (Player player : spies) {
-        player.sendMessage(spyMessage);
-      }
-    }
-    PlotSquared.debug(full);
-  }
-
-  @EventHandler(priority = EventPriority.LOWEST)
-  public void blockDestroy(BlockBreakEvent event) {
-    Player player = event.getPlayer();
-    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getPlot(location);
-    if (plot != null) {
-      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-      if (event.getBlock().getY() == 0) {
-        if (!Permissions
-            .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
-          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-              C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL);
-          event.setCancelled(true);
-          return;
-        }
-      } else if (
-          (location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
-              && !Permissions
-              .hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
-        event.setCancelled(true);
-        MainUtil.sendMessage(plotPlayer,
-            C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
-      }
-      if (!plot.hasOwner()) {
-        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-          return;
-        }
-        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-            C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-        event.setCancelled(true);
-        return;
-      }
-      if (!plot.isAdded(plotPlayer.getUUID())) {
-        Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
-        Block block = event.getBlock();
-        if (destroy.isPresent() && destroy.get()
-            .contains(PlotBlock.get(block.getType().name()))) {
-          return;
-        }
-        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-          return;
-        }
-        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-            C.PERMISSION_ADMIN_DESTROY_OTHER);
-        event.setCancelled(true);
-      } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-        if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-              C.PERMISSION_ADMIN_BUILD_OTHER);
-          event.setCancelled(true);
-          return;
-        }
-      }
-      return;
-    }
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-      return;
-    }
-    if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
-      if (player.getInventory().getItemInMainHand().getType() == Material
-          .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
-        return;
-      }
-    }
-    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-    event.setCancelled(true);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBigBoom(EntityExplodeEvent event) {
-    Location location = BukkitUtil.getLocation(event.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-        return;
-      }
-      Iterator<Block> iterator = event.blockList().iterator();
-      while (iterator.hasNext()) {
-        iterator.next();
-        if (location.getPlotArea() != null) {
-          iterator.remove();
-        }
-      }
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot != null) {
-      if (Flags.EXPLOSION.isTrue(plot)) {
-        List<MetadataValue> meta = event.getEntity().getMetadata("plot");
-        Plot origin;
-        if (meta.isEmpty()) {
-          origin = plot;
-        } else {
-          origin = (Plot) meta.get(0).value();
-        }
-        if (this.lastRadius != 0) {
-          List<Entity> nearby = event.getEntity()
-              .getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
-          for (Entity near : nearby) {
-            if (near instanceof TNTPrimed || near.getType()
-                .equals(EntityType.MINECART_TNT)) {
-              if (!near.hasMetadata("plot")) {
-                near.setMetadata("plot",
-                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
-              }
+            if (plot.isAdded(pp.getUUID()) || Permissions
+                .hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) {
+                return true;
             }
-          }
-          this.lastRadius = 0;
+            entity.remove();
+            return false;
         }
-        Iterator<Block> iterator = event.blockList().iterator();
-        while (iterator.hasNext()) {
-          Block block = iterator.next();
-          location = BukkitUtil.getLocation(block.getLocation());
-          if (!area.contains(location.getX(), location.getZ()) || !origin
-              .equals(area.getOwnedPlot(location))) {
-            iterator.remove();
-          }
+        if (!(shooter instanceof Entity) && shooter != null) {
+            if (plot == null) {
+                entity.remove();
+                return false;
+            }
+            Location sLoc =
+                BukkitUtil.getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+            if (!area.contains(sLoc.getX(), sLoc.getZ())) {
+                entity.remove();
+                return false;
+            }
+            Plot sPlot = area.getOwnedPlotAbs(sLoc);
+            if (sPlot == null || !PlotHandler.sameOwners(plot, sPlot)) {
+                entity.remove();
+                return false;
+            }
         }
-        return;
-      }
+        return true;
     }
-    event.setCancelled(true);
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onWorldChanged(PlayerChangedWorldEvent event) {
-    Player player = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    // Delete last location
-    pp.deleteMeta(PlotPlayer.META_LOCATION);
-    Plot plot = (Plot) pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
-    if (plot != null) {
-      plotExit(pp, plot);
-    }
-    if (PlotSquared.get().worldedit != null) {
-      if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS)) {
-        if (pp.getAttribute("worldedit")) {
-          pp.removeAttribute("worldedit");
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void playerCommand(PlayerCommandPreprocessEvent event) {
+        String msg = event.getMessage().toLowerCase().replaceAll("/", "").trim();
+        if (msg.isEmpty()) {
+            return;
+        }
+        Player player = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        Location loc = pp.getLocation();
+        PlotArea area = loc.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        String[] parts = msg.split(" ");
+        Plot plot = pp.getCurrentPlot();
+        if (BukkitMain.getWorldEdit() != null) { // Check WorldEdit
+            switch (parts[0].toLowerCase()) {
+                case "up":
+                case "/up":
+                case "worldedit:up":
+                case "worldedit:/up":
+                    if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
+                        .hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER, true))) {
+                        event.setCancelled(true);
+                        return;
+                    }
+            }
+        }
+        if (plot == null) {
+            return;
+        }
+        Optional<List<String>> flag = plot.getFlag(Flags.BLOCKED_CMDS);
+        if (flag.isPresent() && !Permissions
+            .hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
+            List<String> blocked_cmds = flag.get();
+            String c = parts[0];
+            if (parts[0].contains(":")) {
+                c = parts[0].split(":")[1];
+                msg = msg.replace(parts[0].split(":")[0] + ':', "");
+            }
+            String l = c;
+            List<String> aliases = new ArrayList<>();
+            for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
+                if (c.equals(cmdLabel.getName())) {
+                    break;
+                }
+                String label = cmdLabel.getName().replaceFirst("/", "");
+                if (aliases.contains(label)) {
+                    continue;
+                }
+                PluginCommand p;
+                if ((p = Bukkit.getPluginCommand(label)) != null) {
+                    for (String a : p.getAliases()) {
+                        if (aliases.contains(a)) {
+                            continue;
+                        }
+                        aliases.add(a);
+                        a = a.replaceFirst("/", "");
+                        if (!a.equals(label) && a.equals(c)) {
+                            c = label;
+                            break;
+                        }
+                    }
+                }
+            }
+            if (!l.equals(c)) {
+                msg = msg.replace(l, c);
+            }
+            for (String s : blocked_cmds) {
+                Pattern pattern;
+                if (!RegExUtil.compiledPatterns.containsKey(s)) {
+                    RegExUtil.compiledPatterns.put(s, pattern = Pattern.compile(s));
+                } else {
+                    pattern = RegExUtil.compiledPatterns.get(s);
+                }
+                if (pattern.matcher(msg).matches()) {
+                    String perm;
+                    if (plot.isAdded(pp.getUUID())) {
+                        perm = "plots.admin.command.blocked-cmds.shared";
+                    } else {
+                        perm = "plots.admin.command.blocked-cmds.other";
+                    }
+                    if (!Permissions.hasPermission(pp, perm)) {
+                        MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
+            }
         }
-      }
     }
-    if (Settings.Enabled_Components.PERMISSION_CACHE) {
-      pp.deleteMeta("perm");
-    }
-    Location loc = pp.getLocation();
-    PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
-    if (area == null) {
-      return;
-    }
-    plot = area.getPlot(loc);
-    if (plot != null) {
-      plotEntry(pp, plot);
-    }
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onPeskyMobsChangeTheWorldLikeWTFEvent(EntityChangeBlockEvent event) {
-    Entity e = event.getEntity();
-    if (!(e instanceof FallingBlock)) {
-      Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-      PlotArea area = location.getPlotArea();
-      if (area != null) {
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onConnect(PlayerJoinEvent event) {
+        final Player player = event.getPlayer();
+        UUIDHandler.getPlayers().remove(player.getName());
+        BukkitUtil.removePlayer(player.getName());
+        final PlotPlayer pp = BukkitUtil.getPlayer(player);
+        // Now
+        String name = pp.getName();
+        StringWrapper sw = new StringWrapper(name);
+        UUID uuid = pp.getUUID();
+        UUIDHandler.add(sw, uuid);
+
+        Location loc = pp.getLocation();
+        PlotArea area = loc.getPlotArea();
+        if (area != null) {
+            Plot plot = area.getPlot(loc);
+            if (plot != null) {
+                plotEntry(pp, plot);
+            }
+        }
+        // Delayed
+
+        // Async
+        TaskManager.runTaskLaterAsync(() -> {
+            if (!player.hasPlayedBefore() && player.isOnline()) {
+                player.saveData();
+            }
+            EventUtil.manager.doJoinTask(pp);
+        }, 20);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void playerRespawn(PlayerRespawnEvent event) {
+        Player player = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        EventUtil.manager.doRespawnTask(pp);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onTeleport(PlayerTeleportEvent event) {
+        if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
+            .equals(event.getTo().getWorld())) {
+            final Object lastLoc =
+                BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
+            final Object lastPlot =
+                BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LAST_PLOT);
+            org.bukkit.Location to = event.getTo();
+            if (to != null) {
+                Player player = event.getPlayer();
+                PlotPlayer pp = PlotPlayer.wrap(player);
+                Location loc = BukkitUtil.getLocation(to);
+                PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
+                if (area == null) {
+                    return;
+                }
+                Plot plot = area.getPlot(loc);
+                if (plot != null) {
+                    final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
+                    if (!result) {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                            C.PERMISSION_ADMIN_ENTRY_DENIED);
+                        event.setCancelled(true);
+                        if (lastLoc != null) {
+                            pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
+                        }
+                        if (lastPlot != null) {
+                            pp.setMeta(PlotPlayer.META_LAST_PLOT, lastPlot);
+                        }
+                    } else {
+                        plotEntry(pp, plot);
+                    }
+                }
+            }
+            return;
+        }
+        playerMove(event);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void vehicleMove(VehicleMoveEvent event) throws IllegalAccessException {
+        final org.bukkit.Location from = event.getFrom();
+        final org.bukkit.Location to = event.getTo();
+
+        int toX, toZ;
+        if ((toX = MathMan.roundInt(to.getX())) != MathMan.roundInt(from.getX())
+            | (toZ = MathMan.roundInt(to.getZ())) != MathMan.roundInt(from.getZ())) {
+            Vehicle vehicle = event.getVehicle();
+
+            // Check allowed
+            if (!vehicle.getPassengers().isEmpty()) {
+                Entity passenger = vehicle.getPassengers().get(0);
+
+                if (passenger instanceof Player) {
+                    final Player player = (Player) passenger;
+                    // reset
+                    if (moveTmp == null) {
+                        moveTmp = new PlayerMoveEvent(null, from, to);
+                    }
+                    moveTmp.setFrom(from);
+                    moveTmp.setTo(to);
+                    moveTmp.setCancelled(false);
+                    fieldPlayer.set(moveTmp, player);
+
+                    List<Entity> passengers = vehicle.getPassengers();
+
+                    this.playerMove(moveTmp);
+                    org.bukkit.Location dest;
+                    if (moveTmp.isCancelled()) {
+                        dest = from;
+                    } else if (MathMan.roundInt(moveTmp.getTo().getX()) != toX
+                        || MathMan.roundInt(moveTmp.getTo().getZ()) != toZ) {
+                        dest = to;
+                    } else {
+                        dest = null;
+                    }
+                    if (dest != null) {
+                        if (passengers != null) {
+                            vehicle.eject();
+                            vehicle.setVelocity(new Vector(0d, 0d, 0d));
+                            vehicle.teleport(dest);
+                            passengers.forEach(vehicle::addPassenger);
+                        } else {
+                            vehicle.eject();
+                            vehicle.setVelocity(new Vector(0d, 0d, 0d));
+                            vehicle.teleport(dest);
+                            vehicle.addPassenger(player);
+                        }
+                        return;
+                    }
+                }
+                if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+                    switch (vehicle.getType()) {
+                        case BOAT:
+                        case ENDER_CRYSTAL:
+                        case MINECART:
+                        case MINECART_CHEST:
+                        case MINECART_COMMAND:
+                        case MINECART_FURNACE:
+                        case MINECART_HOPPER:
+                        case MINECART_MOB_SPAWNER:
+                        case MINECART_TNT: {
+                            List<MetadataValue> meta = vehicle.getMetadata("plot");
+                            Plot toPlot = BukkitUtil.getLocation(to).getPlot();
+                            if (!meta.isEmpty()) {
+                                Plot origin = (Plot) meta.get(0).value();
+                                if (!origin.getBasePlot(false).equals(toPlot)) {
+                                    vehicle.remove();
+                                }
+                            } else if (toPlot != null) {
+                                vehicle.setMetadata("plot",
+                                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, toPlot));
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void playerMove(PlayerMoveEvent event) {
+        org.bukkit.Location from = event.getFrom();
+        org.bukkit.Location to = event.getTo();
+        int x2;
+        if (MathMan.roundInt(from.getX()) != (x2 = MathMan.roundInt(to.getX()))) {
+            Player player = event.getPlayer();
+            PlotPlayer pp = BukkitUtil.getPlayer(player);
+            // Cancel teleport
+            TaskManager.TELEPORT_QUEUE.remove(pp.getName());
+            // Set last location
+            Location loc = BukkitUtil.getLocation(to);
+            pp.setMeta(PlotPlayer.META_LOCATION, loc);
+            PlotArea area = loc.getPlotArea();
+            if (area == null) {
+                pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
+                return;
+            }
+            Plot now = area.getPlot(loc);
+            Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
+            if (now == null) {
+                if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
+                    .getMeta("kick", false)) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    this.tmpTeleport = false;
+                    if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
+                        player.teleport(from);
+                    } else {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    this.tmpTeleport = true;
+                    event.setCancelled(true);
+                    return;
+                }
+            } else if (now.equals(lastPlot)) {
+                ForceFieldListener.handleForcefield(player, pp, now);
+                return;
+            } else if (!plotEntry(pp, now) && this.tmpTeleport) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                this.tmpTeleport = false;
+                to.setX(from.getBlockX());
+                to.setY(from.getBlockY());
+                to.setZ(from.getBlockZ());
+                player.teleport(event.getTo());
+                this.tmpTeleport = true;
+                return;
+            }
+            int border = area.getBorder();
+            if (x2 > border && this.tmpTeleport) {
+                to.setX(x2 - 1);
+                this.tmpTeleport = false;
+                player.teleport(event.getTo());
+                this.tmpTeleport = true;
+                MainUtil.sendMessage(pp, C.BORDER);
+                return;
+            }
+            if (x2 < -border && this.tmpTeleport) {
+                to.setX(x2 + 1);
+                this.tmpTeleport = false;
+                player.teleport(event.getTo());
+                this.tmpTeleport = true;
+                MainUtil.sendMessage(pp, C.BORDER);
+                return;
+            }
+            return;
+        }
+        int z2;
+        if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ()))) {
+            Player player = event.getPlayer();
+            PlotPlayer pp = BukkitUtil.getPlayer(player);
+            // Cancel teleport
+            TaskManager.TELEPORT_QUEUE.remove(pp.getName());
+            // Set last location
+            Location loc = BukkitUtil.getLocation(to);
+            pp.setMeta(PlotPlayer.META_LOCATION, loc);
+            PlotArea area = loc.getPlotArea();
+            if (area == null) {
+                pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
+                return;
+            }
+            Plot now = area.getPlot(loc);
+            Plot lastPlot = pp.getMeta(PlotPlayer.META_LAST_PLOT);
+            if (now == null) {
+                if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
+                    .getMeta("kick", false)) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    this.tmpTeleport = false;
+                    if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
+                        player.teleport(from);
+                    } else {
+                        player.teleport(player.getWorld().getSpawnLocation());
+                    }
+                    this.tmpTeleport = true;
+                    event.setCancelled(true);
+                    return;
+                }
+            } else if (now.equals(lastPlot)) {
+                ForceFieldListener.handleForcefield(player, pp, now);
+                return;
+            } else if (!plotEntry(pp, now) && this.tmpTeleport) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                this.tmpTeleport = false;
+                player.teleport(from);
+                to.setX(from.getBlockX());
+                to.setY(from.getBlockY());
+                to.setZ(from.getBlockZ());
+                player.teleport(event.getTo());
+                this.tmpTeleport = true;
+                return;
+            }
+            int border = area.getBorder();
+            if (z2 > border && this.tmpTeleport) {
+                to.setZ(z2 - 1);
+                this.tmpTeleport = false;
+                player.teleport(event.getTo());
+                this.tmpTeleport = true;
+                MainUtil.sendMessage(pp, C.BORDER);
+            } else if (z2 < -border && this.tmpTeleport) {
+                to.setZ(z2 + 1);
+                this.tmpTeleport = false;
+                player.teleport(event.getTo());
+                this.tmpTeleport = true;
+                MainUtil.sendMessage(pp, C.BORDER);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW) public void onChat(AsyncPlayerChatEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
+        Location location = plotPlayer.getLocation();
+        PlotArea area = location.getPlotArea();
+        if (area == null || (area.PLOT_CHAT == plotPlayer.getAttribute("chat"))) {
+            return;
+        }
+        Plot plot = area.getPlot(location);
+        if (plot == null) {
+            return;
+        }
+        event.setCancelled(true);
+        String message = event.getMessage();
+        String format = C.PLOT_CHAT_FORMAT.s();
+        String sender = event.getPlayer().getDisplayName();
+        PlotId id = plot.getId();
+        Set<Player> recipients = event.getRecipients();
+        Set<Player> spies = new HashSet<>();
+        recipients.clear();
+        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
+            PlotPlayer pp = entry.getValue();
+            if (pp.getAttribute("chatspy")) {
+                spies.add(((BukkitPlayer) pp).player);
+            } else {
+                Plot current = pp.getCurrentPlot();
+                if (current != null && current.getBasePlot(false).equals(plot)) {
+                    recipients.add(((BukkitPlayer) pp).player);
+                }
+            }
+        }
+        String partial = ChatColor.translateAlternateColorCodes('&',
+            format.replace("%plot_id%", id.x + ";" + id.y).replace("%sender%", sender));
+        if (plotPlayer.hasPermission("plots.chat.color")) {
+            message = C.color(message);
+        }
+        String full = partial.replace("%msg%", message);
+        for (Player receiver : recipients) {
+            receiver.sendMessage(full);
+        }
+        if (!spies.isEmpty()) {
+            String spyMessage = C.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
+                .replace("%sender%", sender).replace("%msg%", message);
+            for (Player player : spies) {
+                player.sendMessage(spyMessage);
+            }
+        }
+        PlotSquared.debug(full);
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST) public void blockDestroy(BlockBreakEvent event) {
+        Player player = event.getPlayer();
+        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getPlot(location);
+        if (plot != null) {
+            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+            if (event.getBlock().getY() == 0) {
+                if (!Permissions
+                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
+                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                        C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL);
+                    event.setCancelled(true);
+                    return;
+                }
+            } else if (
+                (location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
+                    && !Permissions
+                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+                event.setCancelled(true);
+                MainUtil.sendMessage(plotPlayer,
+                    C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+            }
+            if (!plot.hasOwner()) {
+                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                    return;
+                }
+                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                    C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                event.setCancelled(true);
+                return;
+            }
+            if (!plot.isAdded(plotPlayer.getUUID())) {
+                Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
+                Block block = event.getBlock();
+                if (destroy.isPresent() && destroy.get()
+                    .contains(PlotBlock.get(block.getType().name()))) {
+                    return;
+                }
+                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                    return;
+                }
+                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                    C.PERMISSION_ADMIN_DESTROY_OTHER);
+                event.setCancelled(true);
+            } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+                if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                        C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            return;
+        }
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+            return;
+        }
+        if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
+            if (player.getInventory().getItemInMainHand().getType() == Material
+                .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
+                return;
+            }
+        }
+        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBigBoom(EntityExplodeEvent event) {
+        Location location = BukkitUtil.getLocation(event.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+                return;
+            }
+            Iterator<Block> iterator = event.blockList().iterator();
+            while (iterator.hasNext()) {
+                iterator.next();
+                if (location.getPlotArea() != null) {
+                    iterator.remove();
+                }
+            }
+            return;
+        }
         Plot plot = area.getOwnedPlot(location);
-        if (plot != null && Flags.MOB_BREAK.isTrue(plot)) {
-          return;
-        }
-        event.setCancelled(true);
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onEntityBlockForm(EntityBlockFormEvent event) {
-    String world = event.getBlock().getWorld().getName();
-    if (!PlotSquared.get().hasPlotArea(world)) {
-      return;
-    }
-    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot == null) {
-      event.setCancelled(true);
-      return;
-    }
-    Entity entity = event.getEntity();
-    if (entity instanceof Player) {
-      Player player = (Player) entity;
-      if (!plot.hasOwner()) {
-        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        if (Flags.ICE_FORM.isTrue(plot)) {
-          return;
-        }
-        event.setCancelled(true);
-        return;
-      }
-      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-      if (!plot.isAdded(plotPlayer.getUUID())) {
-        if (Flags.ICE_FORM.isTrue(plot)) {
-          return;
-        }
-        event.setCancelled(true);
-        return;
-      }
-      return;
-    }
-    if (!Flags.ICE_FORM.isTrue(plot)) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockSpread(BlockSpreadEvent event) {
-    Block block = event.getBlock();
-    Location location = BukkitUtil.getLocation(block.getLocation());
-    if (location.isPlotRoad()) {
-      event.setCancelled(true);
-      return;
-    }
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot == null) {
-      return;
-    }
-    switch (event.getSource().getType()) {
-      case GRASS:
-        if (Flags.GRASS_GROW.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        break;
-      case MYCELIUM:
-        if (Flags.MYCEL_GROW.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        break;
-      case VINE:
-        if (Flags.VINE_GROW.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        break;
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockForm(BlockFormEvent event) {
-    Block block = event.getBlock();
-    Location location = BukkitUtil.getLocation(block.getLocation());
-    if (location.isPlotRoad()) {
-      event.setCancelled(true);
-      return;
-    }
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot == null) {
-      return;
-    }
-    switch (event.getNewState().getType()) {
-      case SNOW:
-      case SNOW_BLOCK:
-        if (Flags.SNOW_FORM.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        return;
-      case ICE:
-      case FROSTED_ICE:
-      case PACKED_ICE:
-        if (Flags.ICE_FORM.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        return;
-      case STONE:
-      case OBSIDIAN:
-      case COBBLESTONE:
-        // TODO event ?
-        return;
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockDamage(BlockDamageEvent event) {
-    Player player = event.getPlayer();
-    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-    if (player == null) {
-      if (location.isPlotRoad()) {
-        event.setCancelled(true);
-        return;
-      }
-    }
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getPlot(location);
-    if (plot != null) {
-      if (location.getY() == 0) {
-        event.setCancelled(true);
-        return;
-      }
-      if (!plot.hasOwner()) {
-        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-          return;
-        }
-        event.setCancelled(true);
-        return;
-      }
-      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-      if (!plot.isAdded(plotPlayer.getUUID())) {
-        Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
-        Block block = event.getBlock();
-        if (destroy.isPresent() && destroy.get()
-            .contains(PlotBlock.get(block.getType().name())) || Permissions
-            .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-          return;
-        }
-        event.setCancelled(true);
-        return;
-      }
-      return;
-    }
-    PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-    if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-      return;
-    }
-    event.setCancelled(true);
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onFade(BlockFadeEvent event) {
-    Block b = event.getBlock();
-    Location location = BukkitUtil.getLocation(b.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot == null) {
-      event.setCancelled(true);
-      return;
-    }
-    switch (b.getType()) {
-      case ICE:
-        if (Flags.ICE_MELT.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        break;
-      case SNOW:
-        if (Flags.SNOW_MELT.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        break;
-      case FARMLAND:
-        if (Flags.SOIL_DRY.isFalse(plot)) {
-          event.setCancelled(true);
-        }
-        break;
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onChange(BlockFromToEvent event) {
-    Block from = event.getBlock();
-    Block to = event.getToBlock();
-    Location tLocation = BukkitUtil.getLocation(to.getLocation());
-    PlotArea area = tLocation.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlot(tLocation);
-    Location fLocation = BukkitUtil.getLocation(from.getLocation());
-    if (plot != null) {
-      if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
-        event.setCancelled(true);
-        return;
-      } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
-          .equals(plot, area.getOwnedPlot(fLocation))) {
-        event.setCancelled(true);
-        return;
-      }
-      if (Flags.LIQUID_FLOW.isFalse(plot)) {
-        switch (to.getType()) {
-          case WATER:
-          case LAVA:
-            event.setCancelled(true);
-        }
-      }
-    } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
-        .equals(null, area.getOwnedPlot(fLocation))) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onGrow(BlockGrowEvent event) {
-    Block b = event.getBlock();
-    Location location = BukkitUtil.getLocation(b.getLocation());
-    if (location.isUnownedPlotArea()) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockPistonExtend(BlockPistonExtendEvent event) {
-    Block block = event.getBlock();
-    Location location = BukkitUtil.getLocation(block.getLocation());
-    BlockFace face = event.getDirection();
-    Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-        return;
-      }
-      for (Block b : event.getBlocks()) {
-        if (BukkitUtil.getLocation(b.getLocation().add(relative)).getPlotArea() != null) {
-          event.setCancelled(true);
-          return;
-        }
-      }
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot == null) {
-      event.setCancelled(true);
-      return;
-    }
-    List<Block> blocks = event.getBlocks();
-    for (Block b : blocks) {
-      Location bloc = BukkitUtil.getLocation(b.getLocation());
-      if (!area.contains(bloc.getX(), bloc.getZ()) || !area
-          .contains(bloc.getX() + relative.getBlockX(), bloc.getZ() + relative.getBlockZ())) {
-        event.setCancelled(true);
-        return;
-      }
-      if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(
-          bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) {
-        event.setCancelled(true);
-        return;
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-    Block block = event.getBlock();
-    Location location = BukkitUtil.getLocation(block.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
-        return;
-      }
-      if (this.pistonBlocks) {
-        try {
-          for (Block pulled : event.getBlocks()) {
-            location = BukkitUtil.getLocation(pulled.getLocation());
-            if (location.getPlotArea() != null) {
-              event.setCancelled(true);
-              return;
+        if (plot != null) {
+            if (Flags.EXPLOSION.isTrue(plot)) {
+                List<MetadataValue> meta = event.getEntity().getMetadata("plot");
+                Plot origin;
+                if (meta.isEmpty()) {
+                    origin = plot;
+                } else {
+                    origin = (Plot) meta.get(0).value();
+                }
+                if (this.lastRadius != 0) {
+                    List<Entity> nearby = event.getEntity()
+                        .getNearbyEntities(this.lastRadius, this.lastRadius, this.lastRadius);
+                    for (Entity near : nearby) {
+                        if (near instanceof TNTPrimed || near.getType()
+                            .equals(EntityType.MINECART_TNT)) {
+                            if (!near.hasMetadata("plot")) {
+                                near.setMetadata("plot",
+                                    new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+                            }
+                        }
+                    }
+                    this.lastRadius = 0;
+                }
+                Iterator<Block> iterator = event.blockList().iterator();
+                while (iterator.hasNext()) {
+                    Block block = iterator.next();
+                    location = BukkitUtil.getLocation(block.getLocation());
+                    if (!area.contains(location.getX(), location.getZ()) || !origin
+                        .equals(area.getOwnedPlot(location))) {
+                        iterator.remove();
+                    }
+                }
+                return;
             }
-          }
-        } catch (Throwable ignored) {
-          this.pistonBlocks = false;
         }
-      }
-      if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
-        BlockFace dir = event.getDirection();
-        location = BukkitUtil.getLocation(block.getLocation()
-            .add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
-        if (location.getPlotArea() != null) {
-          event.setCancelled(true);
-          return;
-        }
-      }
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    BlockFace dir = event.getDirection();
-    //        Location head = location.add(-dir.getModX(), -dir.getModY(), -dir.getModZ());
-    //
-    //        if (!Objects.equals(plot, area.getOwnedPlot(head))) {
-    //            // FIXME: cancelling the event doesn't work here. See issue #1484
-    //            event.setCancelled(true);
-    //            return;
-    //        }
-    if (this.pistonBlocks) {
-      try {
-        for (Block pulled : event.getBlocks()) {
-          Location from = BukkitUtil.getLocation(
-              pulled.getLocation().add(dir.getModX(), dir.getModY(), dir.getModZ()));
-          Location to = BukkitUtil.getLocation(pulled.getLocation());
-          if (!area.contains(to.getX(), to.getZ())) {
-            event.setCancelled(true);
-            return;
-          }
-          Plot fromPlot = area.getOwnedPlot(from);
-          Plot toPlot = area.getOwnedPlot(to);
-          if (!Objects.equals(fromPlot, toPlot)) {
-            event.setCancelled(true);
-            return;
-          }
-        }
-      } catch (Throwable ignored) {
-        this.pistonBlocks = false;
-      }
-    }
-    if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
-      location = BukkitUtil.getLocation(
-          block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
-      if (!area.contains(location)) {
         event.setCancelled(true);
-        return;
-      }
-      Plot newPlot = area.getOwnedPlot(location);
-      if (!Objects.equals(plot, newPlot)) {
-        event.setCancelled(true);
-      }
     }
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockDispense(BlockDispenseEvent event) {
-    Material type = event.getItem().getType();
-    switch (type) {
-      case WATER_BUCKET:
-      case LAVA_BUCKET: {
-        if (event.getBlock().getType() == Material.DROPPER) {
-          return;
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onWorldChanged(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        // Delete last location
+        pp.deleteMeta(PlotPlayer.META_LOCATION);
+        Plot plot = (Plot) pp.deleteMeta(PlotPlayer.META_LAST_PLOT);
+        if (plot != null) {
+            plotExit(pp, plot);
         }
-        BlockFace targetFace =
-            ((Directional) event.getBlock().getState().getData()).getFacing();
-        Location location =
-            BukkitUtil.getLocation(event.getBlock().getRelative(targetFace).getLocation());
+        if (PlotSquared.get().worldedit != null) {
+            if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS)) {
+                if (pp.getAttribute("worldedit")) {
+                    pp.removeAttribute("worldedit");
+                }
+            }
+        }
+        if (Settings.Enabled_Components.PERMISSION_CACHE) {
+            pp.deleteMeta("perm");
+        }
+        Location loc = pp.getLocation();
+        PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
+        if (area == null) {
+            return;
+        }
+        plot = area.getPlot(loc);
+        if (plot != null) {
+            plotEntry(pp, plot);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPeskyMobsChangeTheWorldLikeWTFEvent(EntityChangeBlockEvent event) {
+        Entity e = event.getEntity();
+        if (!(e instanceof FallingBlock)) {
+            Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+            PlotArea area = location.getPlotArea();
+            if (area != null) {
+                Plot plot = area.getOwnedPlot(location);
+                if (plot != null && Flags.MOB_BREAK.isTrue(plot)) {
+                    return;
+                }
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onEntityBlockForm(EntityBlockFormEvent event) {
+        String world = event.getBlock().getWorld().getName();
+        if (!PlotSquared.get().hasPlotArea(world)) {
+            return;
+        }
+        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (plot == null) {
+            event.setCancelled(true);
+            return;
+        }
+        Entity entity = event.getEntity();
+        if (entity instanceof Player) {
+            Player player = (Player) entity;
+            if (!plot.hasOwner()) {
+                PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+                if (Flags.ICE_FORM.isTrue(plot)) {
+                    return;
+                }
+                event.setCancelled(true);
+                return;
+            }
+            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+            if (!plot.isAdded(plotPlayer.getUUID())) {
+                if (Flags.ICE_FORM.isTrue(plot)) {
+                    return;
+                }
+                event.setCancelled(true);
+                return;
+            }
+            return;
+        }
+        if (!Flags.ICE_FORM.isTrue(plot)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockSpread(BlockSpreadEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
         if (location.isPlotRoad()) {
-          event.setCancelled(true);
+            event.setCancelled(true);
+            return;
         }
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onStructureGrow(StructureGrowEvent event) {
-    if (!PlotSquared.get().hasPlotArea(event.getWorld().getName())) {
-      return;
-    }
-    List<BlockState> blocks = event.getBlocks();
-    if (blocks.isEmpty()) {
-      return;
-    }
-    Location location = BukkitUtil.getLocation(blocks.get(0).getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      for (int i = blocks.size() - 1; i >= 0; i--) {
-        location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-        if (location.getPlotArea() != null) {
-          blocks.remove(i);
-        }
-      }
-      return;
-    } else {
-      Plot origin = area.getOwnedPlot(location);
-      if (origin == null) {
-        event.setCancelled(true);
-        return;
-      }
-      for (int i = blocks.size() - 1; i >= 0; i--) {
-        location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-        if (!area.contains(location.getX(), location.getZ())) {
-          blocks.remove(i);
-          continue;
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
         }
         Plot plot = area.getOwnedPlot(location);
-        if (!Objects.equals(plot, origin)) {
-          event.getBlocks().remove(i);
+        if (plot == null) {
+            return;
+        }
+        switch (event.getSource().getType()) {
+            case GRASS:
+                if (Flags.GRASS_GROW.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
+            case MYCELIUM:
+                if (Flags.MYCEL_GROW.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
+            case VINE:
+                if (Flags.VINE_GROW.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
         }
-      }
     }
-    Plot origin = area.getPlot(location);
-    if (origin == null) {
-      event.setCancelled(true);
-      return;
-    }
-    for (int i = blocks.size() - 1; i >= 0; i--) {
-      location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-      Plot plot = area.getOwnedPlot(location);
-      /*
-       * plot -> the base plot of the merged area
-       * origin -> the plot where the event gets called
-       */
 
-      // Are plot and origin not the same AND are both plots merged
-      if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) {
-        event.getBlocks().remove(i);
-      }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockForm(BlockFormEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
+        if (location.isPlotRoad()) {
+            event.setCancelled(true);
+            return;
+        }
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (plot == null) {
+            return;
+        }
+        switch (event.getNewState().getType()) {
+            case SNOW:
+            case SNOW_BLOCK:
+                if (Flags.SNOW_FORM.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                return;
+            case ICE:
+            case FROSTED_ICE:
+            case PACKED_ICE:
+                if (Flags.ICE_FORM.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                return;
+            case STONE:
+            case OBSIDIAN:
+            case COBBLESTONE:
+                // TODO event ?
+                return;
+        }
     }
-  }
 
-  @SuppressWarnings("deprecation")
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onInventoryClick(InventoryClickEvent event) {
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockDamage(BlockDamageEvent event) {
+        Player player = event.getPlayer();
+        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+        if (player == null) {
+            if (location.isPlotRoad()) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getPlot(location);
+        if (plot != null) {
+            if (location.getY() == 0) {
+                event.setCancelled(true);
+                return;
+            }
+            if (!plot.hasOwner()) {
+                PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                    return;
+                }
+                event.setCancelled(true);
+                return;
+            }
+            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+            if (!plot.isAdded(plotPlayer.getUUID())) {
+                Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
+                Block block = event.getBlock();
+                if (destroy.isPresent() && destroy.get()
+                    .contains(PlotBlock.get(block.getType().name())) || Permissions
+                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                    return;
+                }
+                event.setCancelled(true);
+                return;
+            }
+            return;
+        }
+        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+            return;
+        }
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onFade(BlockFadeEvent event) {
+        Block b = event.getBlock();
+        Location location = BukkitUtil.getLocation(b.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (plot == null) {
+            event.setCancelled(true);
+            return;
+        }
+        switch (b.getType()) {
+            case ICE:
+                if (Flags.ICE_MELT.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
+            case SNOW:
+                if (Flags.SNOW_MELT.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
+            case FARMLAND:
+                if (Flags.SOIL_DRY.isFalse(plot)) {
+                    event.setCancelled(true);
+                }
+                break;
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onChange(BlockFromToEvent event) {
+        Block from = event.getBlock();
+        Block to = event.getToBlock();
+        Location tLocation = BukkitUtil.getLocation(to.getLocation());
+        PlotArea area = tLocation.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getOwnedPlot(tLocation);
+        Location fLocation = BukkitUtil.getLocation(from.getLocation());
+        if (plot != null) {
+            if (Flags.DISABLE_PHYSICS.isFalse(plot)) {
+                event.setCancelled(true);
+                return;
+            } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
+                .equals(plot, area.getOwnedPlot(fLocation))) {
+                event.setCancelled(true);
+                return;
+            }
+            if (Flags.LIQUID_FLOW.isFalse(plot)) {
+                switch (to.getType()) {
+                    case WATER:
+                    case LAVA:
+                        event.setCancelled(true);
+                }
+            }
+        } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects
+            .equals(null, area.getOwnedPlot(fLocation))) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onGrow(BlockGrowEvent event) {
+        Block b = event.getBlock();
+        Location location = BukkitUtil.getLocation(b.getLocation());
+        if (location.isUnownedPlotArea()) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
+        BlockFace face = event.getDirection();
+        Vector relative = new Vector(face.getModX(), face.getModY(), face.getModZ());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+                return;
+            }
+            for (Block b : event.getBlocks()) {
+                if (BukkitUtil.getLocation(b.getLocation().add(relative)).getPlotArea() != null) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (plot == null) {
+            event.setCancelled(true);
+            return;
+        }
+        List<Block> blocks = event.getBlocks();
+        for (Block b : blocks) {
+            Location bloc = BukkitUtil.getLocation(b.getLocation());
+            if (!area.contains(bloc.getX(), bloc.getZ()) || !area
+                .contains(bloc.getX() + relative.getBlockX(), bloc.getZ() + relative.getBlockZ())) {
+                event.setCancelled(true);
+                return;
+            }
+            if (!plot.equals(area.getOwnedPlot(bloc)) || !plot.equals(area.getOwnedPlot(
+                bloc.add(relative.getBlockX(), relative.getBlockY(), relative.getBlockZ())))) {
+                event.setCancelled(true);
+                return;
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
+                return;
+            }
+            if (this.pistonBlocks) {
+                try {
+                    for (Block pulled : event.getBlocks()) {
+                        location = BukkitUtil.getLocation(pulled.getLocation());
+                        if (location.getPlotArea() != null) {
+                            event.setCancelled(true);
+                            return;
+                        }
+                    }
+                } catch (Throwable ignored) {
+                    this.pistonBlocks = false;
+                }
+            }
+            if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
+                BlockFace dir = event.getDirection();
+                location = BukkitUtil.getLocation(block.getLocation()
+                    .add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
+                if (location.getPlotArea() != null) {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        BlockFace dir = event.getDirection();
+        //        Location head = location.add(-dir.getModX(), -dir.getModY(), -dir.getModZ());
+        //
+        //        if (!Objects.equals(plot, area.getOwnedPlot(head))) {
+        //            // FIXME: cancelling the event doesn't work here. See issue #1484
+        //            event.setCancelled(true);
+        //            return;
+        //        }
+        if (this.pistonBlocks) {
+            try {
+                for (Block pulled : event.getBlocks()) {
+                    Location from = BukkitUtil.getLocation(
+                        pulled.getLocation().add(dir.getModX(), dir.getModY(), dir.getModZ()));
+                    Location to = BukkitUtil.getLocation(pulled.getLocation());
+                    if (!area.contains(to.getX(), to.getZ())) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                    Plot fromPlot = area.getOwnedPlot(from);
+                    Plot toPlot = area.getOwnedPlot(to);
+                    if (!Objects.equals(fromPlot, toPlot)) {
+                        event.setCancelled(true);
+                        return;
+                    }
+                }
+            } catch (Throwable ignored) {
+                this.pistonBlocks = false;
+            }
+        }
+        if (!this.pistonBlocks && !block.getType().toString().contains("PISTON")) {
+            location = BukkitUtil.getLocation(
+                block.getLocation().add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
+            if (!area.contains(location)) {
+                event.setCancelled(true);
+                return;
+            }
+            Plot newPlot = area.getOwnedPlot(location);
+            if (!Objects.equals(plot, newPlot)) {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockDispense(BlockDispenseEvent event) {
+        Material type = event.getItem().getType();
+        switch (type) {
+            case WATER_BUCKET:
+            case LAVA_BUCKET: {
+                if (event.getBlock().getType() == Material.DROPPER) {
+                    return;
+                }
+                BlockFace targetFace =
+                    ((Directional) event.getBlock().getState().getData()).getFacing();
+                Location location =
+                    BukkitUtil.getLocation(event.getBlock().getRelative(targetFace).getLocation());
+                if (location.isPlotRoad()) {
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onStructureGrow(StructureGrowEvent event) {
+        if (!PlotSquared.get().hasPlotArea(event.getWorld().getName())) {
+            return;
+        }
+        List<BlockState> blocks = event.getBlocks();
+        if (blocks.isEmpty()) {
+            return;
+        }
+        Location location = BukkitUtil.getLocation(blocks.get(0).getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            for (int i = blocks.size() - 1; i >= 0; i--) {
+                location = BukkitUtil.getLocation(blocks.get(i).getLocation());
+                if (location.getPlotArea() != null) {
+                    blocks.remove(i);
+                }
+            }
+            return;
+        } else {
+            Plot origin = area.getOwnedPlot(location);
+            if (origin == null) {
+                event.setCancelled(true);
+                return;
+            }
+            for (int i = blocks.size() - 1; i >= 0; i--) {
+                location = BukkitUtil.getLocation(blocks.get(i).getLocation());
+                if (!area.contains(location.getX(), location.getZ())) {
+                    blocks.remove(i);
+                    continue;
+                }
+                Plot plot = area.getOwnedPlot(location);
+                if (!Objects.equals(plot, origin)) {
+                    event.getBlocks().remove(i);
+                }
+            }
+        }
+        Plot origin = area.getPlot(location);
+        if (origin == null) {
+            event.setCancelled(true);
+            return;
+        }
+        for (int i = blocks.size() - 1; i >= 0; i--) {
+            location = BukkitUtil.getLocation(blocks.get(i).getLocation());
+            Plot plot = area.getOwnedPlot(location);
+            /*
+             * plot -> the base plot of the merged area
+             * origin -> the plot where the event gets called
+             */
+
+            // Are plot and origin not the same AND are both plots merged
+            if (!Objects.equals(plot, origin) && (!plot.isMerged() && !origin.isMerged())) {
+                event.getBlocks().remove(i);
+            }
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInventoryClick(InventoryClickEvent event) {
         /*if (!event.isLeftClick() || (event.getAction() != InventoryAction.PLACE_ALL) || event
             .isShiftClick()) {
             return;
         }*/
-    HumanEntity entity = event.getWhoClicked();
-    if (!(entity instanceof Player) || !PlotSquared.get()
-        .hasPlotArea(entity.getWorld().getName())) {
-      return;
-    }
-
-    HumanEntity clicker = event.getWhoClicked();
-    if (!(clicker instanceof Player)) {
-      return;
-    }
-    Player player = (Player) clicker;
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    final PlotInventory inventory = PlotInventory.getOpenPlotInventory(pp);
-    if (inventory != null && event.getRawSlot() == event.getSlot()) {
-      if (!inventory.onClick(event.getSlot())) {
-        event.setResult(Event.Result.DENY);
-        event.setCancelled(true);
-        inventory.close();
-      }
-    }
-    PlayerInventory inv = player.getInventory();
-    int slot = inv.getHeldItemSlot();
-    if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) {
-      return;
-    }
-    ItemStack current = inv.getItemInHand();
-    ItemStack newItem = event.getCursor();
-    ItemMeta newMeta = newItem.getItemMeta();
-    ItemMeta oldMeta = newItem.getItemMeta();
-    String newLore = "";
-    if (newMeta != null) {
-      List<String> lore = newMeta.getLore();
-      if (lore != null) {
-        newLore = lore.toString();
-      }
-    }
-    String oldLore = "";
-    if (oldMeta != null) {
-      List<String> lore = oldMeta.getLore();
-      if (lore != null) {
-        oldLore = lore.toString();
-      }
-    }
-    if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) {
-      switch (newItem.getType()) {
-        case LEGACY_BANNER:
-        case PLAYER_HEAD:
-          if (newMeta != null) {
-            break;
-          }
-        default:
-          return;
-      }
-    }
-    Block block = player.getTargetBlock(null, 7);
-    BlockState state = block.getState();
-    if (state == null) {
-      return;
-    }
-    Material stateType = state.getType();
-    Material itemType = newItem.getType();
-    if (stateType != itemType) {
-      switch (stateType) {
-        case LEGACY_STANDING_BANNER:
-        case LEGACY_WALL_BANNER:
-          if (itemType == Material.LEGACY_BANNER) {
-            break;
-          }
-        case LEGACY_SKULL:
-          if (itemType == Material.LEGACY_SKULL_ITEM) {
-            break;
-          }
-        default:
-          return;
-      }
-    }
-    Location l = BukkitUtil.getLocation(state.getLocation());
-    PlotArea area = l.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getPlotAbs(l);
-    boolean cancelled = false;
-    if (plot == null) {
-      if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
-        cancelled = true;
-      }
-    } else if (!plot.hasOwner()) {
-      if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
-        cancelled = true;
-      }
-    } else {
-      UUID uuid = pp.getUUID();
-      if (!plot.isAdded(uuid)) {
-        if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
-          cancelled = true;
+        HumanEntity entity = event.getWhoClicked();
+        if (!(entity instanceof Player) || !PlotSquared.get()
+            .hasPlotArea(entity.getWorld().getName())) {
+            return;
         }
-      }
-    }
-    if (cancelled) {
-      if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem
-          .getDurability())) {
-        event.setCursor(
-            new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
-        event.setCancelled(true);
-        return;
-      }
-      event.setCursor(
-          new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
-    }
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onPotionSplash(LingeringPotionSplashEvent event) {
-    LingeringPotion entity = event.getEntity();
-    Location l = BukkitUtil.getLocation(entity);
-    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-      return;
-    }
-    if (!this.onProjectileHit(event)) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onInteract(PlayerInteractAtEntityEvent e) {
-    Entity entity = e.getRightClicked();
-    if (!(entity instanceof ArmorStand)) {
-      return;
-    }
-    Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
-    PlotArea area = l.getPlotArea();
-    if (area == null) {
-      return;
-    }
-
-    EntitySpawnListener.test(entity);
-
-    Plot plot = area.getPlotAbs(l);
-    PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
-    if (plot == null) {
-      if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
-        e.setCancelled(true);
-      }
-    } else if (!plot.hasOwner()) {
-      if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
-        e.setCancelled(true);
-      }
-    } else {
-      UUID uuid = pp.getUUID();
-      if (!plot.isAdded(uuid)) {
-        if (Flags.MISC_INTERACT.isTrue(plot)) {
-          return;
+        HumanEntity clicker = event.getWhoClicked();
+        if (!(clicker instanceof Player)) {
+            return;
         }
-        if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
-          e.setCancelled(true);
-        }
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBigBoom(BlockExplodeEvent event) {
-    Block block = event.getBlock();
-    Location location = BukkitUtil.getLocation(block.getLocation());
-    String world = location.getWorld();
-    if (!PlotSquared.get().hasPlotArea(world)) {
-      return;
-    }
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      Iterator<Block> iterator = event.blockList().iterator();
-      while (iterator.hasNext()) {
-        location = BukkitUtil.getLocation(iterator.next().getLocation());
-        if (location.getPlotArea() != null) {
-          iterator.remove();
-        }
-      }
-      return;
-    }
-    Plot plot = area.getOwnedPlot(location);
-    if (plot == null || !plot.getFlag(Flags.EXPLOSION).orElse(false)) {
-      event.setCancelled(true);
-    }
-    event.blockList().removeIf(
-        b -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(b.getLocation()))));
-  }
-
-  @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
-  public void onInteract(PlayerInteractEvent event) {
-    Player player = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    PlotArea area = pp.getPlotAreaAbs();
-    if (area == null) {
-      return;
-    }
-    PlayerBlockEventType eventType = null;
-    BukkitLazyBlock lb;
-    Location location;
-    Action action = event.getAction();
-    switch (action) {
-      case PHYSICAL: {
-        eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
-        Block block = event.getClickedBlock();
-        lb = new BukkitLazyBlock(block);
-        location = BukkitUtil.getLocation(block.getLocation());
-        break;
-      }
-      case RIGHT_CLICK_BLOCK: {
-        Block block = event.getClickedBlock();
-        location = BukkitUtil.getLocation(block.getLocation());
-        Material blockType = block.getType();
-        switch (blockType) {
-          case ACACIA_DOOR:
-          case BIRCH_DOOR:
-          case DARK_OAK_DOOR:
-          case IRON_DOOR:
-          case JUNGLE_DOOR:
-          case OAK_DOOR:
-          case SPRUCE_DOOR:
-
-          case ACACIA_TRAPDOOR:
-          case BIRCH_TRAPDOOR:
-          case DARK_OAK_TRAPDOOR:
-          case IRON_TRAPDOOR:
-          case JUNGLE_TRAPDOOR:
-          case OAK_TRAPDOOR:
-          case SPRUCE_TRAPDOOR:
-
-          case CHEST:
-          case ENDER_CHEST:
-          case TRAPPED_CHEST:
-
-          case ACACIA_FENCE_GATE:
-          case BIRCH_FENCE_GATE:
-          case DARK_OAK_FENCE_GATE:
-          case OAK_FENCE_GATE:
-          case JUNGLE_FENCE_GATE:
-          case SPRUCE_FENCE_GATE:
-
-          case ACACIA_BUTTON:
-          case BIRCH_BUTTON:
-          case DARK_OAK_BUTTON:
-          case JUNGLE_BUTTON:
-          case OAK_BUTTON:
-          case SPRUCE_BUTTON:
-          case STONE_BUTTON:
-
-          case BLACK_BED:
-          case BLUE_BED:
-          case BROWN_BED:
-          case CYAN_BED:
-          case GRAY_BED:
-          case GREEN_BED:
-          case LIGHT_BLUE_BED:
-          case LIGHT_GRAY_BED:
-          case LIME_BED:
-          case MAGENTA_BED:
-          case ORANGE_BED:
-          case PINK_BED:
-          case PURPLE_BED:
-          case RED_BED:
-          case WHITE_BED:
-          case YELLOW_BED:
-
-          case BLACK_BANNER:
-          case BLACK_WALL_BANNER:
-          case BLUE_BANNER:
-          case BLUE_WALL_BANNER:
-          case BROWN_BANNER:
-          case BROWN_WALL_BANNER:
-          case CYAN_BANNER:
-          case CYAN_WALL_BANNER:
-          case GRAY_BANNER:
-          case GRAY_WALL_BANNER:
-          case GREEN_BANNER:
-          case GREEN_WALL_BANNER:
-          case LIGHT_BLUE_BANNER:
-          case LIGHT_BLUE_WALL_BANNER:
-          case LIGHT_GRAY_BANNER:
-          case LIGHT_GRAY_WALL_BANNER:
-          case LIME_BANNER:
-          case LIME_WALL_BANNER:
-          case MAGENTA_BANNER:
-          case MAGENTA_WALL_BANNER:
-          case ORANGE_BANNER:
-          case ORANGE_WALL_BANNER:
-          case PINK_BANNER:
-          case PINK_WALL_BANNER:
-          case PURPLE_BANNER:
-          case PURPLE_WALL_BANNER:
-          case RED_BANNER:
-          case RED_WALL_BANNER:
-          case WHITE_BANNER:
-          case WHITE_WALL_BANNER:
-          case YELLOW_BANNER:
-          case YELLOW_WALL_BANNER:
-
-          case BLACK_SHULKER_BOX:
-          case BLUE_SHULKER_BOX:
-          case BROWN_SHULKER_BOX:
-          case CYAN_SHULKER_BOX:
-          case GRAY_SHULKER_BOX:
-          case GREEN_SHULKER_BOX:
-          case LIGHT_BLUE_SHULKER_BOX:
-          case LIGHT_GRAY_SHULKER_BOX:
-          case LIME_SHULKER_BOX:
-          case MAGENTA_SHULKER_BOX:
-          case ORANGE_SHULKER_BOX:
-          case PINK_SHULKER_BOX:
-          case PURPLE_SHULKER_BOX:
-          case RED_SHULKER_BOX:
-          case WHITE_SHULKER_BOX:
-          case YELLOW_SHULKER_BOX:
-
-          case CHAIN_COMMAND_BLOCK:
-          case REPEATING_COMMAND_BLOCK:
-
-          case SIGN:
-          case WALL_SIGN:
-
-          case REDSTONE_TORCH:
-          case REDSTONE_WALL_TORCH:
-
-          case TURTLE_EGG:
-          case TURTLE_HELMET:
-          case TURTLE_SPAWN_EGG:
-
-          case ANVIL:
-          case BEACON:
-          case BREWING_STAND:
-          case CAKE:
-          case COMMAND_BLOCK:
-          case COMPARATOR:
-          case CRAFTING_TABLE:
-          case DISPENSER:
-          case DROPPER:
-          case ENCHANTING_TABLE:
-          case FURNACE:
-          case HOPPER:
-          case JUKEBOX:
-          case LEVER:
-          case NOTE_BLOCK:
-          case REDSTONE_ORE:
-            eventType = PlayerBlockEventType.INTERACT_BLOCK;
-            break;
-          case DRAGON_EGG:
-            eventType = PlayerBlockEventType.TELEPORT_OBJECT;
-            break;
-          default:
-            int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
-                .fromStringToLegacy(blockType.name())).id;
-            if (blockId > 197) {
-              eventType = PlayerBlockEventType.INTERACT_BLOCK;
+        Player player = (Player) clicker;
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        final PlotInventory inventory = PlotInventory.getOpenPlotInventory(pp);
+        if (inventory != null && event.getRawSlot() == event.getSlot()) {
+            if (!inventory.onClick(event.getSlot())) {
+                event.setResult(Event.Result.DENY);
+                event.setCancelled(true);
+                inventory.close();
             }
-            break;
         }
-        lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString()));
-        ItemStack hand = player.getInventory().getItemInMainHand();
-        if (eventType != null && (eventType != PlayerBlockEventType.INTERACT_BLOCK
-            || !player.isSneaking())) {
-          break;
+        PlayerInventory inv = player.getInventory();
+        int slot = inv.getHeldItemSlot();
+        if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) {
+            return;
         }
-        Material type = (hand == null) ? null : hand.getType();
-        if (type == Material.AIR) {
-          eventType = PlayerBlockEventType.INTERACT_BLOCK;
-          break;
+        ItemStack current = inv.getItemInHand();
+        ItemStack newItem = event.getCursor();
+        ItemMeta newMeta = newItem.getItemMeta();
+        ItemMeta oldMeta = newItem.getItemMeta();
+        String newLore = "";
+        if (newMeta != null) {
+            List<String> lore = newMeta.getLore();
+            if (lore != null) {
+                newLore = lore.toString();
+            }
         }
-        if (type == null || type.isBlock()) {
-          location = BukkitUtil
-              .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-          eventType = PlayerBlockEventType.PLACE_BLOCK;
-          break;
+        String oldLore = "";
+        if (oldMeta != null) {
+            List<String> lore = oldMeta.getLore();
+            if (lore != null) {
+                oldLore = lore.toString();
+            }
         }
-        Material handType = hand.getType();
-        lb = new BukkitLazyBlock(PlotBlock.get(handType.toString()));
-        if (handType.toString().endsWith("egg")) {
-          eventType = PlayerBlockEventType.SPAWN_MOB;
+        if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) {
+            switch (newItem.getType()) {
+                case LEGACY_BANNER:
+                case PLAYER_HEAD:
+                    if (newMeta != null) {
+                        break;
+                    }
+                default:
+                    return;
+            }
+        }
+        Block block = player.getTargetBlock(null, 7);
+        BlockState state = block.getState();
+        if (state == null) {
+            return;
+        }
+        Material stateType = state.getType();
+        Material itemType = newItem.getType();
+        if (stateType != itemType) {
+            switch (stateType) {
+                case LEGACY_STANDING_BANNER:
+                case LEGACY_WALL_BANNER:
+                    if (itemType == Material.LEGACY_BANNER) {
+                        break;
+                    }
+                case LEGACY_SKULL:
+                    if (itemType == Material.LEGACY_SKULL_ITEM) {
+                        break;
+                    }
+                default:
+                    return;
+            }
+        }
+        Location l = BukkitUtil.getLocation(state.getLocation());
+        PlotArea area = l.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getPlotAbs(l);
+        boolean cancelled = false;
+        if (plot == null) {
+            if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
+                cancelled = true;
+            }
+        } else if (!plot.hasOwner()) {
+            if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+                cancelled = true;
+            }
         } else {
-          switch (handType) {
-            case FIREWORK_ROCKET:
-            case FIREWORK_STAR:
-              eventType = PlayerBlockEventType.SPAWN_MOB;
-              break;
-            case ARMOR_STAND:
-              location = BukkitUtil
-                  .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-              eventType = PlayerBlockEventType.PLACE_MISC;
-              break;
-            case BOOK:
-            case ENCHANTED_BOOK:
-            case KNOWLEDGE_BOOK:
-            case WRITABLE_BOOK:
-            case WRITTEN_BOOK:
-              eventType = PlayerBlockEventType.READ;
-              break;
-            case APPLE:
-            case BAKED_POTATO:
-            case BEEF:
-            case BREAD:
-            case CARROT:
-            case CHICKEN:
-            case COD:
-            case COOKED_BEEF:
-            case COOKED_CHICKEN:
-            case COOKED_COD:
-            case COOKED_MUTTON:
-            case COOKED_PORKCHOP:
-            case COOKED_RABBIT:
-            case COOKED_SALMON:
-            case COOKIE:
-            case GOLDEN_CARROT:
-            case MUSHROOM_STEW:
-            case MUTTON:
-            case POISONOUS_POTATO:
-            case PORKCHOP:
-            case POTATO:
-            case POTION:
-            case PUFFERFISH:
-            case PUMPKIN_PIE:
-            case RABBIT:
-            case RABBIT_FOOT:
-            case RABBIT_STEW:
-            case SALMON:
-            case TROPICAL_FISH:
-              eventType = PlayerBlockEventType.EAT;
-              break;
-            case ACACIA_BOAT:
-            case BIRCH_BOAT:
-            case CHEST_MINECART:
-            case COMMAND_BLOCK_MINECART:
-            case DARK_OAK_BOAT:
-            case FURNACE_MINECART:
-            case HOPPER_MINECART:
-            case JUNGLE_BOAT:
-            case MINECART:
-            case OAK_BOAT:
-            case SPRUCE_BOAT:
-            case TNT_MINECART:
-              eventType = PlayerBlockEventType.PLACE_VEHICLE;
-              break;
-            case ITEM_FRAME:
-            case PAINTING:
-              location = BukkitUtil
-                  .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-              eventType = PlayerBlockEventType.PLACE_HANGING;
-              break;
-            default:
-              eventType = PlayerBlockEventType.INTERACT_BLOCK;
-              break;
-          }
-        }
-        break;
-      }
-      case LEFT_CLICK_BLOCK:
-        Block block = event.getClickedBlock();
-        location = BukkitUtil.getLocation(block.getLocation());
-        eventType = PlayerBlockEventType.BREAK_BLOCK;
-        lb = new BukkitLazyBlock(block);
-        break;
-      default:
-        return;
-    }
-    if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
-      if (player.getInventory().getItemInMainHand().getType() == Material
-          .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
-        return;
-      }
-    }
-    if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, location, lb, true)) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void creatureSpawnEvent(CreatureSpawnEvent event) {
-    Entity entity = event.getEntity();
-    Location location = BukkitUtil.getLocation(entity.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
-    //TODO needs an overhaul for the increased number of spawn reasons added to this event.
-    //I can't believe they waited so damn long to expand this API set.
-    switch (reason) {
-      case DISPENSE_EGG:
-      case EGG:
-      case OCELOT_BABY:
-      case SPAWNER_EGG:
-        if (!area.SPAWN_EGGS) {
-          event.setCancelled(true);
-          return;
-        }
-        break;
-      case REINFORCEMENTS:
-      case NATURAL:
-      case CHUNK_GEN:
-        if (!area.MOB_SPAWNING) {
-          event.setCancelled(true);
-          return;
-        }
-      case BREEDING:
-        if (!area.SPAWN_BREEDING) {
-          event.setCancelled(true);
-          return;
-        }
-        break;
-      case BUILD_IRONGOLEM:
-      case BUILD_SNOWMAN:
-      case BUILD_WITHER:
-      case CUSTOM:
-        if (!area.SPAWN_CUSTOM && entity.getType() != EntityType.ARMOR_STAND) {
-          event.setCancelled(true);
-          return;
-        }
-        break;
-      case SPAWNER:
-        if (!area.MOB_SPAWNER_SPAWNING) {
-          event.setCancelled(true);
-          return;
-        }
-        break;
-    }
-    Plot plot = area.getOwnedPlotAbs(location);
-    if (plot == null) {
-      if (!area.MOB_SPAWNING) {
-        event.setCancelled(true);
-      }
-      return;
-    }
-    if (checkEntity(entity, plot)) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-  public void onEntityFall(EntityChangeBlockEvent event) {
-    if (event.getEntityType() != EntityType.FALLING_BLOCK) {
-      return;
-    }
-    Block block = event.getBlock();
-    World world = block.getWorld();
-    String worldName = world.getName();
-    if (!PlotSquared.get().hasPlotArea(worldName)) {
-      return;
-    }
-    Location location = BukkitUtil.getLocation(block.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlotAbs(location);
-    if (plot == null || plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
-      event.setCancelled(true);
-      return;
-    }
-    if (event.getTo().hasGravity()) {
-      Entity entity = event.getEntity();
-      List<MetadataValue> meta = entity.getMetadata("plot");
-      if (meta.isEmpty()) {
-        return;
-      }
-      Plot origin = (Plot) meta.get(0).value();
-      if (origin != null && !origin.equals(plot)) {
-        event.setCancelled(true);
-        entity.remove();
-      }
-    } else if (event.getTo() == Material.AIR) {
-      event.getEntity()
-          .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
-    }
-  }
-
-  @EventHandler
-  public void onPrime(ExplosionPrimeEvent event) {
-    this.lastRadius = event.getRadius() + 1;
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockBurn(BlockBurnEvent event) {
-    Block b = event.getBlock();
-    Location location = BukkitUtil.getLocation(b.getLocation());
-
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-
-    Plot plot = location.getOwnedPlot();
-    if (plot == null || !plot.getFlag(Flags.BLOCK_BURN, false)) {
-      event.setCancelled(true);
-      return;
-    }
-
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBlockIgnite(BlockIgniteEvent event) {
-    Player player = event.getPlayer();
-    Entity ignitingEntity = event.getIgnitingEntity();
-    Block block = event.getBlock();
-    BlockIgniteEvent.IgniteCause igniteCause = event.getCause();
-    Location loc;
-    if (block != null) {
-      loc = BukkitUtil.getLocation(block.getLocation());
-    } else if (ignitingEntity != null) {
-      loc = BukkitUtil.getLocation(ignitingEntity);
-    } else if (player != null) {
-      loc = BukkitUtil.getLocation(player);
-    } else {
-      return;
-    }
-    PlotArea area = loc.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    if (igniteCause == BlockIgniteEvent.IgniteCause.LIGHTNING) {
-      event.setCancelled(true);
-      return;
-    }
-
-    Plot plot = area.getOwnedPlotAbs(loc);
-    if (player != null) {
-      PlotPlayer pp = BukkitUtil.getPlayer(player);
-      if (plot == null) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-          event.setCancelled(true);
-        }
-      } else if (!plot.hasOwner()) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-          event.setCancelled(true);
-        }
-      } else if (!plot.isAdded(pp.getUUID())) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-          event.setCancelled(true);
-        }
-      } else if (Flags.BLOCK_IGNITION.isFalse(plot)) {
-        event.setCancelled(true);
-      }
-    } else {
-      if (plot == null) {
-        event.setCancelled(true);
-        return;
-      }
-      if (ignitingEntity != null) {
-        if (!plot.getFlag(Flags.BLOCK_IGNITION, false)) {
-          event.setCancelled(true);
-          return;
-        }
-        if (igniteCause == BlockIgniteEvent.IgniteCause.FIREBALL) {
-          if (ignitingEntity instanceof Fireball) {
-            Projectile fireball = (Projectile) ignitingEntity;
-            Location location = null;
-            if (fireball.getShooter() instanceof Entity) {
-              Entity shooter = (Entity) fireball.getShooter();
-              location = BukkitUtil.getLocation(shooter.getLocation());
-            } else if (fireball.getShooter() instanceof BlockProjectileSource) {
-              Block shooter =
-                  ((BlockProjectileSource) fireball.getShooter()).getBlock();
-              location = BukkitUtil.getLocation(shooter.getLocation());
+            UUID uuid = pp.getUUID();
+            if (!plot.isAdded(uuid)) {
+                if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
+                    cancelled = true;
+                }
             }
-            if (location != null && !plot.equals(location.getPlot())) {
-              event.setCancelled(true);
+        }
+        if (cancelled) {
+            if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem
+                .getDurability())) {
+                event.setCursor(
+                    new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
+                event.setCancelled(true);
+                return;
             }
-          }
+            event.setCursor(
+                new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability()));
         }
+    }
 
-      } else if (event.getIgnitingBlock() != null) {
-        Block ignitingBlock = event.getIgnitingBlock();
-        Plot plotIgnited = BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot();
-        if (igniteCause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL && (
-            !plot.getFlag(Flags.BLOCK_IGNITION, false) || plotIgnited == null
-                || !plotIgnited.equals(plot)) ||
-            (igniteCause == BlockIgniteEvent.IgniteCause.SPREAD
-                || igniteCause == BlockIgniteEvent.IgniteCause.LAVA) && (
-                !plot.getFlag(Flags.BLOCK_IGNITION).orElse(false) || plotIgnited == null
-                    || !plotIgnited.equals(plot))) {
-          event.setCancelled(true);
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPotionSplash(LingeringPotionSplashEvent event) {
+        LingeringPotion entity = event.getEntity();
+        Location l = BukkitUtil.getLocation(entity);
+        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+            return;
         }
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-    BlockFace bf = event.getBlockFace();
-    Block b =
-        event.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ())
-            .getBlock();
-    Location location = BukkitUtil.getLocation(b.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
-    Plot plot = area.getPlot(location);
-    if (plot == null) {
-      if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-        return;
-      }
-      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-      event.setCancelled(true);
-    } else if (!plot.hasOwner()) {
-      if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-        return;
-      }
-      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-      event.setCancelled(true);
-    } else if (!plot.isAdded(pp.getUUID())) {
-      if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().getId(), 0))) {
-        return;
-      }
-      if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-        return;
-      }
-      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-      event.setCancelled(true);
-    } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-        event.setCancelled(true);
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void onInventoryClose(InventoryCloseEvent event) {
-    HumanEntity closer = event.getPlayer();
-    if (!(closer instanceof Player)) {
-      return;
-    }
-    Player player = (Player) closer;
-    PlotInventory.removePlotInventoryOpen(BukkitUtil.getPlayer(player));
-  }
-
-  @EventHandler(priority = EventPriority.MONITOR)
-  public void onLeave(PlayerQuitEvent event) {
-    TaskManager.TELEPORT_QUEUE.remove(event.getPlayer().getName());
-    PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
-    pp.unregister();
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onBucketFill(PlayerBucketFillEvent event) {
-    Block b = event.getBlockClicked();
-    Location location = BukkitUtil.getLocation(b.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Player player = event.getPlayer();
-    PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-    Plot plot = area.getPlot(location);
-    if (plot == null) {
-      if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-        return;
-      }
-      MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-      event.setCancelled(true);
-    } else if (!plot.hasOwner()) {
-      if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-        return;
-      }
-      MainUtil
-          .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-      event.setCancelled(true);
-    } else if (!plot.isAdded(plotPlayer.getUUID())) {
-      Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
-      Block block = event.getBlockClicked();
-      if (use.isPresent() && use.get().contains(PlotBlock.get(block.getType().name()))) {
-        return;
-      }
-      if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-        return;
-      }
-      MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-      event.setCancelled(true);
-    } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-      if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-        MainUtil
-            .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-        event.setCancelled(true);
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onVehicleCreate(VehicleCreateEvent event) {
-    Vehicle entity = event.getVehicle();
-    Location location = BukkitUtil.getLocation(entity);
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Plot plot = area.getOwnedPlotAbs(location);
-    if (plot == null || checkEntity(entity, plot)) {
-      entity.remove();
-      return;
-    }
-    if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-      entity
-          .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onHangingPlace(HangingPlaceEvent event) {
-    Block b = event.getBlock().getRelative(event.getBlockFace());
-    Location location = BukkitUtil.getLocation(b.getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Player p = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(p);
-    Plot plot = area.getPlot(location);
-    if (plot == null) {
-      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-        event.setCancelled(true);
-      }
-    } else {
-      if (!plot.hasOwner()) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-          event.setCancelled(true);
-        }
-        return;
-      }
-      if (!plot.isAdded(pp.getUUID())) {
-        if (!plot.getFlag(Flags.HANGING_PLACE, false)) {
-          if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-            MainUtil
-                .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+        if (!this.onProjectileHit(event)) {
             event.setCancelled(true);
-          }
-          return;
         }
-      }
-      if (checkEntity(event.getEntity(), plot)) {
-        event.setCancelled(true);
-      }
-
     }
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onHangingBreakByEntity(HangingBreakByEntityEvent event) {
-    Entity remover = event.getRemover();
-    if (remover instanceof Player) {
-      Player p = (Player) remover;
-      Location location = BukkitUtil.getLocation(event.getEntity());
-      PlotArea area = location.getPlotArea();
-      if (area == null) {
-        return;
-      }
-      PlotPlayer pp = BukkitUtil.getPlayer(p);
-      Plot plot = area.getPlot(location);
-      if (plot == null) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
-          event.setCancelled(true);
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onInteract(PlayerInteractAtEntityEvent e) {
+        Entity entity = e.getRightClicked();
+        if (!(entity instanceof ArmorStand)) {
+            return;
         }
-      } else if (!plot.hasOwner()) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-          event.setCancelled(true);
+        Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
+        PlotArea area = l.getPlotArea();
+        if (area == null) {
+            return;
         }
-      } else if (!plot.isAdded(pp.getUUID())) {
-        if (plot.getFlag(Flags.HANGING_BREAK, false)) {
-          return;
+
+        EntitySpawnListener.test(entity);
+
+        Plot plot = area.getPlotAbs(l);
+        PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
+        if (plot == null) {
+            if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
+                e.setCancelled(true);
+            }
+        } else if (!plot.hasOwner()) {
+            if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+                e.setCancelled(true);
+            }
+        } else {
+            UUID uuid = pp.getUUID();
+            if (!plot.isAdded(uuid)) {
+                if (Flags.MISC_INTERACT.isTrue(plot)) {
+                    return;
+                }
+                if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
+                    e.setCancelled(true);
+                }
+            }
         }
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
-          event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBigBoom(BlockExplodeEvent event) {
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
+        String world = location.getWorld();
+        if (!PlotSquared.get().hasPlotArea(world)) {
+            return;
         }
-      }
-    } else if (remover instanceof Projectile) {
-      Projectile p = (Projectile) remover;
-      if (p.getShooter() instanceof Player) {
-        Player shooter = (Player) p.getShooter();
-        Location location = BukkitUtil.getLocation(event.getEntity());
         PlotArea area = location.getPlotArea();
         if (area == null) {
-          return;
-        }
-        PlotPlayer player = BukkitUtil.getPlayer(shooter);
-        Plot plot = area.getPlot(BukkitUtil.getLocation(event.getEntity()));
-        if (plot != null) {
-          if (!plot.hasOwner()) {
-            if (!Permissions
-                .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-              MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
-                  C.PERMISSION_ADMIN_DESTROY_UNOWNED);
-              event.setCancelled(true);
+            Iterator<Block> iterator = event.blockList().iterator();
+            while (iterator.hasNext()) {
+                location = BukkitUtil.getLocation(iterator.next().getLocation());
+                if (location.getPlotArea() != null) {
+                    iterator.remove();
+                }
             }
-          } else if (!plot.isAdded(player.getUUID())) {
-            if (!plot.getFlag(Flags.HANGING_BREAK, false)) {
-              if (!Permissions
-                  .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
-                    C.PERMISSION_ADMIN_DESTROY_OTHER);
+            return;
+        }
+        Plot plot = area.getOwnedPlot(location);
+        if (plot == null || !plot.getFlag(Flags.EXPLOSION).orElse(false)) {
+            event.setCancelled(true);
+        }
+        event.blockList().removeIf(
+            b -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(b.getLocation()))));
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onInteract(PlayerInteractEvent event) {
+        Player player = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        PlotArea area = pp.getPlotAreaAbs();
+        if (area == null) {
+            return;
+        }
+        PlayerBlockEventType eventType = null;
+        BukkitLazyBlock lb;
+        Location location;
+        Action action = event.getAction();
+        switch (action) {
+            case PHYSICAL: {
+                eventType = PlayerBlockEventType.TRIGGER_PHYSICAL;
+                Block block = event.getClickedBlock();
+                lb = new BukkitLazyBlock(block);
+                location = BukkitUtil.getLocation(block.getLocation());
+                break;
+            }
+            case RIGHT_CLICK_BLOCK: {
+                Block block = event.getClickedBlock();
+                location = BukkitUtil.getLocation(block.getLocation());
+                Material blockType = block.getType();
+                switch (blockType) {
+                    case ACACIA_DOOR:
+                    case BIRCH_DOOR:
+                    case DARK_OAK_DOOR:
+                    case IRON_DOOR:
+                    case JUNGLE_DOOR:
+                    case OAK_DOOR:
+                    case SPRUCE_DOOR:
+
+                    case ACACIA_TRAPDOOR:
+                    case BIRCH_TRAPDOOR:
+                    case DARK_OAK_TRAPDOOR:
+                    case IRON_TRAPDOOR:
+                    case JUNGLE_TRAPDOOR:
+                    case OAK_TRAPDOOR:
+                    case SPRUCE_TRAPDOOR:
+
+                    case CHEST:
+                    case ENDER_CHEST:
+                    case TRAPPED_CHEST:
+
+                    case ACACIA_FENCE_GATE:
+                    case BIRCH_FENCE_GATE:
+                    case DARK_OAK_FENCE_GATE:
+                    case OAK_FENCE_GATE:
+                    case JUNGLE_FENCE_GATE:
+                    case SPRUCE_FENCE_GATE:
+
+                    case ACACIA_BUTTON:
+                    case BIRCH_BUTTON:
+                    case DARK_OAK_BUTTON:
+                    case JUNGLE_BUTTON:
+                    case OAK_BUTTON:
+                    case SPRUCE_BUTTON:
+                    case STONE_BUTTON:
+
+                    case BLACK_BED:
+                    case BLUE_BED:
+                    case BROWN_BED:
+                    case CYAN_BED:
+                    case GRAY_BED:
+                    case GREEN_BED:
+                    case LIGHT_BLUE_BED:
+                    case LIGHT_GRAY_BED:
+                    case LIME_BED:
+                    case MAGENTA_BED:
+                    case ORANGE_BED:
+                    case PINK_BED:
+                    case PURPLE_BED:
+                    case RED_BED:
+                    case WHITE_BED:
+                    case YELLOW_BED:
+
+                    case BLACK_BANNER:
+                    case BLACK_WALL_BANNER:
+                    case BLUE_BANNER:
+                    case BLUE_WALL_BANNER:
+                    case BROWN_BANNER:
+                    case BROWN_WALL_BANNER:
+                    case CYAN_BANNER:
+                    case CYAN_WALL_BANNER:
+                    case GRAY_BANNER:
+                    case GRAY_WALL_BANNER:
+                    case GREEN_BANNER:
+                    case GREEN_WALL_BANNER:
+                    case LIGHT_BLUE_BANNER:
+                    case LIGHT_BLUE_WALL_BANNER:
+                    case LIGHT_GRAY_BANNER:
+                    case LIGHT_GRAY_WALL_BANNER:
+                    case LIME_BANNER:
+                    case LIME_WALL_BANNER:
+                    case MAGENTA_BANNER:
+                    case MAGENTA_WALL_BANNER:
+                    case ORANGE_BANNER:
+                    case ORANGE_WALL_BANNER:
+                    case PINK_BANNER:
+                    case PINK_WALL_BANNER:
+                    case PURPLE_BANNER:
+                    case PURPLE_WALL_BANNER:
+                    case RED_BANNER:
+                    case RED_WALL_BANNER:
+                    case WHITE_BANNER:
+                    case WHITE_WALL_BANNER:
+                    case YELLOW_BANNER:
+                    case YELLOW_WALL_BANNER:
+
+                    case BLACK_SHULKER_BOX:
+                    case BLUE_SHULKER_BOX:
+                    case BROWN_SHULKER_BOX:
+                    case CYAN_SHULKER_BOX:
+                    case GRAY_SHULKER_BOX:
+                    case GREEN_SHULKER_BOX:
+                    case LIGHT_BLUE_SHULKER_BOX:
+                    case LIGHT_GRAY_SHULKER_BOX:
+                    case LIME_SHULKER_BOX:
+                    case MAGENTA_SHULKER_BOX:
+                    case ORANGE_SHULKER_BOX:
+                    case PINK_SHULKER_BOX:
+                    case PURPLE_SHULKER_BOX:
+                    case RED_SHULKER_BOX:
+                    case WHITE_SHULKER_BOX:
+                    case YELLOW_SHULKER_BOX:
+
+                    case CHAIN_COMMAND_BLOCK:
+                    case REPEATING_COMMAND_BLOCK:
+
+                    case SIGN:
+                    case WALL_SIGN:
+
+                    case REDSTONE_TORCH:
+                    case REDSTONE_WALL_TORCH:
+
+                    case TURTLE_EGG:
+                    case TURTLE_HELMET:
+                    case TURTLE_SPAWN_EGG:
+
+                    case ANVIL:
+                    case BEACON:
+                    case BREWING_STAND:
+                    case CAKE:
+                    case COMMAND_BLOCK:
+                    case COMPARATOR:
+                    case CRAFTING_TABLE:
+                    case DISPENSER:
+                    case DROPPER:
+                    case ENCHANTING_TABLE:
+                    case FURNACE:
+                    case HOPPER:
+                    case JUKEBOX:
+                    case LEVER:
+                    case NOTE_BLOCK:
+                    case REDSTONE_ORE:
+                        eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                        break;
+                    case DRAGON_EGG:
+                        eventType = PlayerBlockEventType.TELEPORT_OBJECT;
+                        break;
+                    default:
+                        int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
+                            .fromStringToLegacy(blockType.name())).id;
+                        if (blockId > 197) {
+                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                        }
+                        break;
+                }
+                lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString()));
+                ItemStack hand = player.getInventory().getItemInMainHand();
+                if (eventType != null && (eventType != PlayerBlockEventType.INTERACT_BLOCK
+                    || !player.isSneaking())) {
+                    break;
+                }
+                Material type = (hand == null) ? null : hand.getType();
+                if (type == Material.AIR) {
+                    eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                    break;
+                }
+                if (type == null || type.isBlock()) {
+                    location = BukkitUtil
+                        .getLocation(block.getRelative(event.getBlockFace()).getLocation());
+                    eventType = PlayerBlockEventType.PLACE_BLOCK;
+                    break;
+                }
+                Material handType = hand.getType();
+                lb = new BukkitLazyBlock(PlotBlock.get(handType.toString()));
+                if (handType.toString().endsWith("egg")) {
+                    eventType = PlayerBlockEventType.SPAWN_MOB;
+                } else {
+                    switch (handType) {
+                        case FIREWORK_ROCKET:
+                        case FIREWORK_STAR:
+                            eventType = PlayerBlockEventType.SPAWN_MOB;
+                            break;
+                        case ARMOR_STAND:
+                            location = BukkitUtil
+                                .getLocation(block.getRelative(event.getBlockFace()).getLocation());
+                            eventType = PlayerBlockEventType.PLACE_MISC;
+                            break;
+                        case BOOK:
+                        case ENCHANTED_BOOK:
+                        case KNOWLEDGE_BOOK:
+                        case WRITABLE_BOOK:
+                        case WRITTEN_BOOK:
+                            eventType = PlayerBlockEventType.READ;
+                            break;
+                        case APPLE:
+                        case BAKED_POTATO:
+                        case BEEF:
+                        case BREAD:
+                        case CARROT:
+                        case CHICKEN:
+                        case COD:
+                        case COOKED_BEEF:
+                        case COOKED_CHICKEN:
+                        case COOKED_COD:
+                        case COOKED_MUTTON:
+                        case COOKED_PORKCHOP:
+                        case COOKED_RABBIT:
+                        case COOKED_SALMON:
+                        case COOKIE:
+                        case GOLDEN_CARROT:
+                        case MUSHROOM_STEW:
+                        case MUTTON:
+                        case POISONOUS_POTATO:
+                        case PORKCHOP:
+                        case POTATO:
+                        case POTION:
+                        case PUFFERFISH:
+                        case PUMPKIN_PIE:
+                        case RABBIT:
+                        case RABBIT_FOOT:
+                        case RABBIT_STEW:
+                        case SALMON:
+                        case TROPICAL_FISH:
+                            eventType = PlayerBlockEventType.EAT;
+                            break;
+                        case ACACIA_BOAT:
+                        case BIRCH_BOAT:
+                        case CHEST_MINECART:
+                        case COMMAND_BLOCK_MINECART:
+                        case DARK_OAK_BOAT:
+                        case FURNACE_MINECART:
+                        case HOPPER_MINECART:
+                        case JUNGLE_BOAT:
+                        case MINECART:
+                        case OAK_BOAT:
+                        case SPRUCE_BOAT:
+                        case TNT_MINECART:
+                            eventType = PlayerBlockEventType.PLACE_VEHICLE;
+                            break;
+                        case ITEM_FRAME:
+                        case PAINTING:
+                            location = BukkitUtil
+                                .getLocation(block.getRelative(event.getBlockFace()).getLocation());
+                            eventType = PlayerBlockEventType.PLACE_HANGING;
+                            break;
+                        default:
+                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                            break;
+                    }
+                }
+                break;
+            }
+            case LEFT_CLICK_BLOCK:
+                Block block = event.getClickedBlock();
+                location = BukkitUtil.getLocation(block.getLocation());
+                eventType = PlayerBlockEventType.BREAK_BLOCK;
+                lb = new BukkitLazyBlock(block);
+                break;
+            default:
+                return;
+        }
+        if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
+            if (player.getInventory().getItemInMainHand().getType() == Material
+                .getMaterial(PlotSquared.get().worldedit.getConfiguration().wandItem)) {
+                return;
+            }
+        }
+        if (!EventUtil.manager.checkPlayerBlockEvent(pp, eventType, location, lb, true)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void creatureSpawnEvent(CreatureSpawnEvent event) {
+        Entity entity = event.getEntity();
+        Location location = BukkitUtil.getLocation(entity.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        CreatureSpawnEvent.SpawnReason reason = event.getSpawnReason();
+        //TODO needs an overhaul for the increased number of spawn reasons added to this event.
+        //I can't believe they waited so damn long to expand this API set.
+        switch (reason) {
+            case DISPENSE_EGG:
+            case EGG:
+            case OCELOT_BABY:
+            case SPAWNER_EGG:
+                if (!area.SPAWN_EGGS) {
+                    event.setCancelled(true);
+                    return;
+                }
+                break;
+            case REINFORCEMENTS:
+            case NATURAL:
+            case CHUNK_GEN:
+                if (!area.MOB_SPAWNING) {
+                    event.setCancelled(true);
+                    return;
+                }
+            case BREEDING:
+                if (!area.SPAWN_BREEDING) {
+                    event.setCancelled(true);
+                    return;
+                }
+                break;
+            case BUILD_IRONGOLEM:
+            case BUILD_SNOWMAN:
+            case BUILD_WITHER:
+            case CUSTOM:
+                if (!area.SPAWN_CUSTOM && entity.getType() != EntityType.ARMOR_STAND) {
+                    event.setCancelled(true);
+                    return;
+                }
+                break;
+            case SPAWNER:
+                if (!area.MOB_SPAWNER_SPAWNING) {
+                    event.setCancelled(true);
+                    return;
+                }
+                break;
+        }
+        Plot plot = area.getOwnedPlotAbs(location);
+        if (plot == null) {
+            if (!area.MOB_SPAWNING) {
                 event.setCancelled(true);
-              }
             }
-          }
+            return;
         }
-      }
-    } else {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
-    Location location = BukkitUtil.getLocation(event.getRightClicked().getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Player p = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(p);
-    Plot plot = area.getPlot(location);
-    if (plot == null) {
-      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
-        event.setCancelled(true);
-      }
-    } else if (!plot.hasOwner()) {
-      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
-        MainUtil
-            .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
-        event.setCancelled(true);
-      }
-    } else if (!plot.isAdded(pp.getUUID())) {
-      Entity entity = event.getRightClicked();
-      if (entity instanceof Monster && plot.getFlag(Flags.HOSTILE_INTERACT, false)) {
-        return;
-      }
-      if (entity instanceof Animals && plot.getFlag(Flags.ANIMAL_INTERACT, false)) {
-        return;
-      }
-      if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot
-          .getFlag(Flags.TAMED_INTERACT, false)) {
-        return;
-      }
-      if (entity instanceof Vehicle && plot.getFlag(Flags.VEHICLE_USE, false)) {
-        return;
-      }
-      if (entity instanceof Player && plot.getFlag(Flags.PLAYER_INTERACT, false)) {
-        return;
-      }
-      if (entity instanceof Villager && plot.getFlag(Flags.VILLAGER_INTERACT, false)) {
-        return;
-      }
-      if (entity instanceof ItemFrame && plot.getFlag(Flags.MISC_INTERACT, false)) {
-        return;
-      }
-      if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
-        event.setCancelled(true);
-      }
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onVehicleDestroy(VehicleDestroyEvent event) {
-    Location l = BukkitUtil.getLocation(event.getVehicle());
-    PlotArea area = l.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Entity d = event.getAttacker();
-    if (d instanceof Player) {
-      Player p = (Player) d;
-      PlotPlayer pp = BukkitUtil.getPlayer(p);
-      Plot plot = area.getPlot(l);
-      if (plot == null) {
-        if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
-          event.setCancelled(true);
+        if (checkEntity(entity, plot)) {
+            event.setCancelled(true);
         }
-      } else {
-        if (!plot.hasOwner()) {
-          if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
-                "plots.admin.vehicle.break.unowned");
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
+    public void onEntityFall(EntityChangeBlockEvent event) {
+        if (event.getEntityType() != EntityType.FALLING_BLOCK) {
+            return;
+        }
+        Block block = event.getBlock();
+        World world = block.getWorld();
+        String worldName = world.getName();
+        if (!PlotSquared.get().hasPlotArea(worldName)) {
+            return;
+        }
+        Location location = BukkitUtil.getLocation(block.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getOwnedPlotAbs(location);
+        if (plot == null || plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
             event.setCancelled(true);
             return;
-          }
-          return;
         }
-        if (!plot.isAdded(pp.getUUID())) {
-          if (plot.getFlag(Flags.VEHICLE_BREAK, false)) {
+        if (event.getTo().hasGravity()) {
+            Entity entity = event.getEntity();
+            List<MetadataValue> meta = entity.getMetadata("plot");
+            if (meta.isEmpty()) {
+                return;
+            }
+            Plot origin = (Plot) meta.get(0).value();
+            if (origin != null && !origin.equals(plot)) {
+                event.setCancelled(true);
+                entity.remove();
+            }
+        } else if (event.getTo() == Material.AIR) {
+            event.getEntity()
+                .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
+        }
+    }
+
+    @EventHandler public void onPrime(ExplosionPrimeEvent event) {
+        this.lastRadius = event.getRadius() + 1;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockBurn(BlockBurnEvent event) {
+        Block b = event.getBlock();
+        Location location = BukkitUtil.getLocation(b.getLocation());
+
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
             return;
-          }
-          if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
-                "plots.admin.vehicle.break.other");
+        }
+
+        Plot plot = location.getOwnedPlot();
+        if (plot == null || !plot.getFlag(Flags.BLOCK_BURN, false)) {
             event.setCancelled(true);
-          }
+            return;
         }
-      }
-    }
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onPotionSplash(PotionSplashEvent event) {
-    ThrownPotion damager = event.getPotion();
-    Location l = BukkitUtil.getLocation(damager);
-    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-      return;
-    }
-    int count = 0;
-    for (LivingEntity victim : event.getAffectedEntities()) {
-      if (!entityDamage(damager, victim)) {
-        event.setIntensity(victim, 0);
-        count++;
-      }
-    }
-    if ((count > 0 && count == event.getAffectedEntities().size()) || !onProjectileHit(event)) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
-    EntityDamageByEntityEvent eventChange = new EntityDamageByEntityEvent(event.getCombuster(),
-        event.getEntity(),
-        EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
-    onEntityDamageByEntityEvent(eventChange);
-    if (eventChange.isCancelled()) {
-      event.setCancelled(true);
-    }
-  }
-
-  @EventHandler(priority = EventPriority.HIGHEST)
-  public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
-    Entity damager = event.getDamager();
-    Location l = BukkitUtil.getLocation(damager);
-    if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
-      return;
-    }
-    Entity victim = event.getEntity();
-    if (!entityDamage(damager, victim)) {
-      if (event.isCancelled()) {
-        if (victim instanceof Ageable) {
-          Ageable ageable = (Ageable) victim;
-          if (ageable.getAge() == -24000) {
-            ageable.setAge(0);
-            ageable.setAdult();
-          }
-        }
-      }
-      event.setCancelled(true);
-    }
-  }
-
-  public boolean entityDamage(Entity damager, Entity victim) {
-    Location dloc = BukkitUtil.getLocation(damager);
-    Location vloc = BukkitUtil.getLocation(victim);
-    PlotArea dArea = dloc.getPlotArea();
-    PlotArea vArea =
-        dArea != null && dArea.contains(vloc.getX(), vloc.getZ()) ? dArea : vloc.getPlotArea();
-    if (dArea == null && vArea == null) {
-      return true;
     }
 
-    Plot dplot = dArea != null ? dArea.getPlot(dloc) : null;
-    Plot vplot = vArea != null ? vArea.getPlot(vloc) : null;
-
-    Plot plot;
-    String stub;
-    if (dplot == null && vplot == null) {
-      if (dArea == null) {
-        return true;
-      }
-      plot = null;
-      stub = "road";
-    } else {
-      // Prioritize plots for close to seamless pvp zones
-      if (victim.getTicksLived() > damager.getTicksLived()) {
-        if (dplot == null || !(victim instanceof Player)) {
-          if (vplot == null) {
-            plot = dplot;
-          } else {
-            plot = vplot;
-          }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBlockIgnite(BlockIgniteEvent event) {
+        Player player = event.getPlayer();
+        Entity ignitingEntity = event.getIgnitingEntity();
+        Block block = event.getBlock();
+        BlockIgniteEvent.IgniteCause igniteCause = event.getCause();
+        Location loc;
+        if (block != null) {
+            loc = BukkitUtil.getLocation(block.getLocation());
+        } else if (ignitingEntity != null) {
+            loc = BukkitUtil.getLocation(ignitingEntity);
+        } else if (player != null) {
+            loc = BukkitUtil.getLocation(player);
         } else {
-          plot = dplot;
+            return;
         }
-      } else if (dplot == null || !(victim instanceof Player)) {
-        if (vplot == null) {
-          plot = dplot;
+        PlotArea area = loc.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        if (igniteCause == BlockIgniteEvent.IgniteCause.LIGHTNING) {
+            event.setCancelled(true);
+            return;
+        }
+
+        Plot plot = area.getOwnedPlotAbs(loc);
+        if (player != null) {
+            PlotPlayer pp = BukkitUtil.getPlayer(player);
+            if (plot == null) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                    event.setCancelled(true);
+                }
+            } else if (!plot.hasOwner()) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    event.setCancelled(true);
+                }
+            } else if (!plot.isAdded(pp.getUUID())) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                }
+            } else if (Flags.BLOCK_IGNITION.isFalse(plot)) {
+                event.setCancelled(true);
+            }
         } else {
-          plot = vplot;
+            if (plot == null) {
+                event.setCancelled(true);
+                return;
+            }
+            if (ignitingEntity != null) {
+                if (!plot.getFlag(Flags.BLOCK_IGNITION, false)) {
+                    event.setCancelled(true);
+                    return;
+                }
+                if (igniteCause == BlockIgniteEvent.IgniteCause.FIREBALL) {
+                    if (ignitingEntity instanceof Fireball) {
+                        Projectile fireball = (Projectile) ignitingEntity;
+                        Location location = null;
+                        if (fireball.getShooter() instanceof Entity) {
+                            Entity shooter = (Entity) fireball.getShooter();
+                            location = BukkitUtil.getLocation(shooter.getLocation());
+                        } else if (fireball.getShooter() instanceof BlockProjectileSource) {
+                            Block shooter =
+                                ((BlockProjectileSource) fireball.getShooter()).getBlock();
+                            location = BukkitUtil.getLocation(shooter.getLocation());
+                        }
+                        if (location != null && !plot.equals(location.getPlot())) {
+                            event.setCancelled(true);
+                        }
+                    }
+                }
+
+            } else if (event.getIgnitingBlock() != null) {
+                Block ignitingBlock = event.getIgnitingBlock();
+                Plot plotIgnited = BukkitUtil.getLocation(ignitingBlock.getLocation()).getPlot();
+                if (igniteCause == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL && (
+                    !plot.getFlag(Flags.BLOCK_IGNITION, false) || plotIgnited == null
+                        || !plotIgnited.equals(plot)) ||
+                    (igniteCause == BlockIgniteEvent.IgniteCause.SPREAD
+                        || igniteCause == BlockIgniteEvent.IgniteCause.LAVA) && (
+                        !plot.getFlag(Flags.BLOCK_IGNITION).orElse(false) || plotIgnited == null
+                            || !plotIgnited.equals(plot))) {
+                    event.setCancelled(true);
+                }
+            }
         }
-      } else if (vplot == null) {
-        plot = dplot;
-      } else {
-        plot = vplot;
-      }
-      if (plot.hasOwner()) {
-        stub = "other";
-      } else {
-        stub = "unowned";
-      }
     }
 
-    Player player;
-    if (damager instanceof Player) { // attacker is player
-      player = (Player) damager;
-    } else if (damager instanceof Projectile) {
-      Projectile projectile = (Projectile) damager;
-      ProjectileSource shooter = projectile.getShooter();
-      if (shooter instanceof Player) { // shooter is player
-        player = (Player) shooter;
-      } else { // shooter is not player
-        if (shooter instanceof BlockProjectileSource) {
-          Location sLoc = BukkitUtil
-              .getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
-          dplot = dArea.getPlot(sLoc);
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBucketEmpty(PlayerBucketEmptyEvent event) {
+        BlockFace bf = event.getBlockFace();
+        Block b =
+            event.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ())
+                .getBlock();
+        Location location = BukkitUtil.getLocation(b.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
+        Plot plot = area.getPlot(location);
+        if (plot == null) {
+            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+                return;
+            }
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+            event.setCancelled(true);
+        } else if (!plot.hasOwner()) {
+            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                return;
+            }
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+            event.setCancelled(true);
+        } else if (!plot.isAdded(pp.getUUID())) {
+            if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().getId(), 0))) {
+                return;
+            }
+            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                return;
+            }
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+            event.setCancelled(true);
+        } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                event.setCancelled(true);
+            }
         }
-        player = null;
-      }
-    } else { // Attacker is not player
-      player = null;
     }
-    if (player != null) {
-      PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-      if (victim instanceof Hanging) { // hanging
-        if (plot != null && (plot.getFlag(Flags.HANGING_BREAK, false) || plot
-            .isAdded(plotPlayer.getUUID()))) {
-          return true;
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onInventoryClose(InventoryCloseEvent event) {
+        HumanEntity closer = event.getPlayer();
+        if (!(closer instanceof Player)) {
+            return;
         }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-              "plots.admin.destroy." + stub);
-          return false;
+        Player player = (Player) closer;
+        PlotInventory.removePlotInventoryOpen(BukkitUtil.getPlayer(player));
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR) public void onLeave(PlayerQuitEvent event) {
+        TaskManager.TELEPORT_QUEUE.remove(event.getPlayer().getName());
+        PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
+        pp.unregister();
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onBucketFill(PlayerBucketFillEvent event) {
+        Block b = event.getBlockClicked();
+        Location location = BukkitUtil.getLocation(b.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
         }
-      } else if (victim.getEntityId() == 30) {
-        if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot
-            .isAdded(plotPlayer.getUUID()))) {
-          return true;
+        Player player = event.getPlayer();
+        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+        Plot plot = area.getPlot(location);
+        if (plot == null) {
+            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+                return;
+            }
+            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+            event.setCancelled(true);
+        } else if (!plot.hasOwner()) {
+            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                return;
+            }
+            MainUtil
+                .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+            event.setCancelled(true);
+        } else if (!plot.isAdded(plotPlayer.getUUID())) {
+            Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
+            Block block = event.getBlockClicked();
+            if (use.isPresent() && use.get().contains(PlotBlock.get(block.getType().name()))) {
+                return;
+            }
+            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                return;
+            }
+            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+            event.setCancelled(true);
+        } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+            if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                MainUtil
+                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                event.setCancelled(true);
+            }
         }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-          MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-              "plots.admin.destroy." + stub);
-          return false;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onVehicleCreate(VehicleCreateEvent event) {
+        Vehicle entity = event.getVehicle();
+        Location location = BukkitUtil.getLocation(entity);
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
         }
-      } else if (victim instanceof Monster
-          || victim instanceof EnderDragon) { // victim is monster
-        if (plot != null && (plot.getFlag(Flags.HOSTILE_ATTACK, false) || plot
-            .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
-          return true;
+        Plot plot = area.getOwnedPlotAbs(location);
+        if (plot == null || checkEntity(entity, plot)) {
+            entity.remove();
+            return;
         }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-          MainUtil
-              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-          return false;
+        if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+            entity
+                .setMetadata("plot", new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot));
         }
-      } else if (victim instanceof Tameable) { // victim is tameable
-        if (plot != null && (plot.getFlag(Flags.TAMED_ATTACK, false) || plot
-            .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
-          return true;
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onHangingPlace(HangingPlaceEvent event) {
+        Block b = event.getBlock().getRelative(event.getBlockFace());
+        Location location = BukkitUtil.getLocation(b.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
         }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-          MainUtil
-              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-          return false;
+        Player p = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(p);
+        Plot plot = area.getPlot(location);
+        if (plot == null) {
+            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                event.setCancelled(true);
+            }
+        } else {
+            if (!plot.hasOwner()) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    event.setCancelled(true);
+                }
+                return;
+            }
+            if (!plot.isAdded(pp.getUUID())) {
+                if (!plot.getFlag(Flags.HANGING_PLACE, false)) {
+                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                        MainUtil
+                            .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                        event.setCancelled(true);
+                    }
+                    return;
+                }
+            }
+            if (checkEntity(event.getEntity(), plot)) {
+                event.setCancelled(true);
+            }
+
         }
-      } else if (victim instanceof Player) {
-        if (plot != null) {
-          if (Flags.PVP.isFalse(plot) && !Permissions
-              .hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                "plots.admin.pvp." + stub);
-            return false;
-          } else {
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onHangingBreakByEntity(HangingBreakByEntityEvent event) {
+        Entity remover = event.getRemover();
+        if (remover instanceof Player) {
+            Player p = (Player) remover;
+            Location location = BukkitUtil.getLocation(event.getEntity());
+            PlotArea area = location.getPlotArea();
+            if (area == null) {
+                return;
+            }
+            PlotPlayer pp = BukkitUtil.getPlayer(p);
+            Plot plot = area.getPlot(location);
+            if (plot == null) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+                    event.setCancelled(true);
+                }
+            } else if (!plot.hasOwner()) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                    event.setCancelled(true);
+                }
+            } else if (!plot.isAdded(pp.getUUID())) {
+                if (plot.getFlag(Flags.HANGING_BREAK, false)) {
+                    return;
+                }
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+                    event.setCancelled(true);
+                }
+            }
+        } else if (remover instanceof Projectile) {
+            Projectile p = (Projectile) remover;
+            if (p.getShooter() instanceof Player) {
+                Player shooter = (Player) p.getShooter();
+                Location location = BukkitUtil.getLocation(event.getEntity());
+                PlotArea area = location.getPlotArea();
+                if (area == null) {
+                    return;
+                }
+                PlotPlayer player = BukkitUtil.getPlayer(shooter);
+                Plot plot = area.getPlot(BukkitUtil.getLocation(event.getEntity()));
+                if (plot != null) {
+                    if (!plot.hasOwner()) {
+                        if (!Permissions
+                            .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                            MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
+                                C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                            event.setCancelled(true);
+                        }
+                    } else if (!plot.isAdded(player.getUUID())) {
+                        if (!plot.getFlag(Flags.HANGING_BREAK, false)) {
+                            if (!Permissions
+                                .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
+                                    C.PERMISSION_ADMIN_DESTROY_OTHER);
+                                event.setCancelled(true);
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
+        Location location = BukkitUtil.getLocation(event.getRightClicked().getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Player p = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(p);
+        Plot plot = area.getPlot(location);
+        if (plot == null) {
+            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
+                event.setCancelled(true);
+            }
+        } else if (!plot.hasOwner()) {
+            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
+                MainUtil
+                    .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
+                event.setCancelled(true);
+            }
+        } else if (!plot.isAdded(pp.getUUID())) {
+            Entity entity = event.getRightClicked();
+            if (entity instanceof Monster && plot.getFlag(Flags.HOSTILE_INTERACT, false)) {
+                return;
+            }
+            if (entity instanceof Animals && plot.getFlag(Flags.ANIMAL_INTERACT, false)) {
+                return;
+            }
+            if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot
+                .getFlag(Flags.TAMED_INTERACT, false)) {
+                return;
+            }
+            if (entity instanceof Vehicle && plot.getFlag(Flags.VEHICLE_USE, false)) {
+                return;
+            }
+            if (entity instanceof Player && plot.getFlag(Flags.PLAYER_INTERACT, false)) {
+                return;
+            }
+            if (entity instanceof Villager && plot.getFlag(Flags.VILLAGER_INTERACT, false)) {
+                return;
+            }
+            if (entity instanceof ItemFrame && plot.getFlag(Flags.MISC_INTERACT, false)) {
+                return;
+            }
+            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
+                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onVehicleDestroy(VehicleDestroyEvent event) {
+        Location l = BukkitUtil.getLocation(event.getVehicle());
+        PlotArea area = l.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Entity d = event.getAttacker();
+        if (d instanceof Player) {
+            Player p = (Player) d;
+            PlotPlayer pp = BukkitUtil.getPlayer(p);
+            Plot plot = area.getPlot(l);
+            if (plot == null) {
+                if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
+                    event.setCancelled(true);
+                }
+            } else {
+                if (!plot.hasOwner()) {
+                    if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                            "plots.admin.vehicle.break.unowned");
+                        event.setCancelled(true);
+                        return;
+                    }
+                    return;
+                }
+                if (!plot.isAdded(pp.getUUID())) {
+                    if (plot.getFlag(Flags.VEHICLE_BREAK, false)) {
+                        return;
+                    }
+                    if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                            "plots.admin.vehicle.break.other");
+                        event.setCancelled(true);
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPotionSplash(PotionSplashEvent event) {
+        ThrownPotion damager = event.getPotion();
+        Location l = BukkitUtil.getLocation(damager);
+        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+            return;
+        }
+        int count = 0;
+        for (LivingEntity victim : event.getAffectedEntities()) {
+            if (!entityDamage(damager, victim)) {
+                event.setIntensity(victim, 0);
+                count++;
+            }
+        }
+        if ((count > 0 && count == event.getAffectedEntities().size()) || !onProjectileHit(event)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
+        EntityDamageByEntityEvent eventChange =
+            new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
+                EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
+        onEntityDamageByEntityEvent(eventChange);
+        if (eventChange.isCancelled()) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
+        Entity damager = event.getDamager();
+        Location l = BukkitUtil.getLocation(damager);
+        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+            return;
+        }
+        Entity victim = event.getEntity();
+        if (!entityDamage(damager, victim)) {
+            if (event.isCancelled()) {
+                if (victim instanceof Ageable) {
+                    Ageable ageable = (Ageable) victim;
+                    if (ageable.getAge() == -24000) {
+                        ageable.setAge(0);
+                        ageable.setAdult();
+                    }
+                }
+            }
+            event.setCancelled(true);
+        }
+    }
+
+    public boolean entityDamage(Entity damager, Entity victim) {
+        Location dloc = BukkitUtil.getLocation(damager);
+        Location vloc = BukkitUtil.getLocation(victim);
+        PlotArea dArea = dloc.getPlotArea();
+        PlotArea vArea =
+            dArea != null && dArea.contains(vloc.getX(), vloc.getZ()) ? dArea : vloc.getPlotArea();
+        if (dArea == null && vArea == null) {
             return true;
-          }
         }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-          MainUtil
-              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
-          return false;
-        }
-      } else if (victim instanceof Creature) { // victim is animal
-        if (plot != null && (plot.getFlag(Flags.ANIMAL_ATTACK, false) || plot
-            .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
-          return true;
-        }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-          MainUtil
-              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-          return false;
-        }
-      } else if (victim instanceof Vehicle) { // Vehicles are managed in vehicle destroy event
-        return true;
-      } else { // victim is something else
-        if (plot != null && (plot.getFlag(Flags.PVE, false) || plot
-            .isAdded(plotPlayer.getUUID()))) {
-          return true;
-        }
-        if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-          MainUtil
-              .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
-          return false;
-        }
-      }
-      return true;
-    } else if (dplot != null && (!dplot.equals(vplot) || Objects
-        .equals(dplot.guessOwner(), vplot.guessOwner()))) {
-      return vplot != null && Flags.PVE.isTrue(vplot);
-    }
-    return ((vplot != null && Flags.PVE.isTrue(vplot)) || !(damager instanceof Arrow
-        && !(victim instanceof Creature)));
-  }
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void onPlayerEggThrow(PlayerEggThrowEvent event) {
-    Location l = BukkitUtil.getLocation(event.getEgg().getLocation());
-    PlotArea area = l.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Player player = event.getPlayer();
-    PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-    Plot plot = area.getPlot(l);
-    if (plot == null) {
-      if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.road")) {
-        MainUtil
-            .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
-        event.setHatching(false);
-      }
-    } else if (!plot.hasOwner()) {
-      if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.unowned")) {
-        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-            "plots.admin.projectile.unowned");
-        event.setHatching(false);
-      }
-    } else if (!plot.isAdded(plotPlayer.getUUID())) {
-      if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.other")) {
-        MainUtil
-            .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
-        event.setHatching(false);
-      }
-    }
-  }
+        Plot dplot = dArea != null ? dArea.getPlot(dloc) : null;
+        Plot vplot = vArea != null ? vArea.getPlot(vloc) : null;
 
-  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-  public void blockCreate(BlockPlaceEvent event) {
-    Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
-    PlotArea area = location.getPlotArea();
-    if (area == null) {
-      return;
-    }
-    Player player = event.getPlayer();
-    PlotPlayer pp = BukkitUtil.getPlayer(player);
-    Plot plot = area.getPlot(location);
-    if (plot != null) {
-      if ((location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
-          && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
-        event.setCancelled(true);
-        MainUtil.sendMessage(pp,
-            C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
-      }
-      if (!plot.hasOwner()) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-          MainUtil
-              .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
-          event.setCancelled(true);
-          return;
+        Plot plot;
+        String stub;
+        if (dplot == null && vplot == null) {
+            if (dArea == null) {
+                return true;
+            }
+            plot = null;
+            stub = "road";
+        } else {
+            // Prioritize plots for close to seamless pvp zones
+            if (victim.getTicksLived() > damager.getTicksLived()) {
+                if (dplot == null || !(victim instanceof Player)) {
+                    if (vplot == null) {
+                        plot = dplot;
+                    } else {
+                        plot = vplot;
+                    }
+                } else {
+                    plot = dplot;
+                }
+            } else if (dplot == null || !(victim instanceof Player)) {
+                if (vplot == null) {
+                    plot = dplot;
+                } else {
+                    plot = vplot;
+                }
+            } else if (vplot == null) {
+                plot = dplot;
+            } else {
+                plot = vplot;
+            }
+            if (plot.hasOwner()) {
+                stub = "other";
+            } else {
+                stub = "unowned";
+            }
         }
-      } else if (!plot.isAdded(pp.getUUID())) {
-        Set<PlotBlock> place = plot.getFlag(Flags.PLACE, null);
-        if (place != null) {
-          Block block = event.getBlock();
-          if (place.contains(PlotBlock.get(block.getType().name()))) {
+
+        Player player;
+        if (damager instanceof Player) { // attacker is player
+            player = (Player) damager;
+        } else if (damager instanceof Projectile) {
+            Projectile projectile = (Projectile) damager;
+            ProjectileSource shooter = projectile.getShooter();
+            if (shooter instanceof Player) { // shooter is player
+                player = (Player) shooter;
+            } else { // shooter is not player
+                if (shooter instanceof BlockProjectileSource) {
+                    Location sLoc = BukkitUtil
+                        .getLocation(((BlockProjectileSource) shooter).getBlock().getLocation());
+                    dplot = dArea.getPlot(sLoc);
+                }
+                player = null;
+            }
+        } else { // Attacker is not player
+            player = null;
+        }
+        if (player != null) {
+            PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+            if (victim instanceof Hanging) { // hanging
+                if (plot != null && (plot.getFlag(Flags.HANGING_BREAK, false) || plot
+                    .isAdded(plotPlayer.getUUID()))) {
+                    return true;
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
+                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                        "plots.admin.destroy." + stub);
+                    return false;
+                }
+            } else if (victim.getEntityId() == 30) {
+                if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot
+                    .isAdded(plotPlayer.getUUID()))) {
+                    return true;
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
+                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                        "plots.admin.destroy." + stub);
+                    return false;
+                }
+            } else if (victim instanceof Monster
+                || victim instanceof EnderDragon) { // victim is monster
+                if (plot != null && (plot.getFlag(Flags.HOSTILE_ATTACK, false) || plot
+                    .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
+                    return true;
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+                    MainUtil
+                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            } else if (victim instanceof Tameable) { // victim is tameable
+                if (plot != null && (plot.getFlag(Flags.TAMED_ATTACK, false) || plot
+                    .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
+                    return true;
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+                    MainUtil
+                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            } else if (victim instanceof Player) {
+                if (plot != null) {
+                    if (Flags.PVP.isFalse(plot) && !Permissions
+                        .hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
+                        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                            "plots.admin.pvp." + stub);
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
+                    MainUtil
+                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
+                    return false;
+                }
+            } else if (victim instanceof Creature) { // victim is animal
+                if (plot != null && (plot.getFlag(Flags.ANIMAL_ATTACK, false) || plot
+                    .getFlag(Flags.PVE, false) || plot.isAdded(plotPlayer.getUUID()))) {
+                    return true;
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+                    MainUtil
+                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            } else if (victim instanceof Vehicle) { // Vehicles are managed in vehicle destroy event
+                return true;
+            } else { // victim is something else
+                if (plot != null && (plot.getFlag(Flags.PVE, false) || plot
+                    .isAdded(plotPlayer.getUUID()))) {
+                    return true;
+                }
+                if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
+                    MainUtil
+                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    return false;
+                }
+            }
+            return true;
+        } else if (dplot != null && (!dplot.equals(vplot) || Objects
+            .equals(dplot.guessOwner(), vplot.guessOwner()))) {
+            return vplot != null && Flags.PVE.isTrue(vplot);
+        }
+        return ((vplot != null && Flags.PVE.isTrue(vplot)) || !(damager instanceof Arrow
+            && !(victim instanceof Creature)));
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onPlayerEggThrow(PlayerEggThrowEvent event) {
+        Location l = BukkitUtil.getLocation(event.getEgg().getLocation());
+        PlotArea area = l.getPlotArea();
+        if (area == null) {
             return;
-          }
         }
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-          event.setCancelled(true);
-          return;
+        Player player = event.getPlayer();
+        PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+        Plot plot = area.getPlot(l);
+        if (plot == null) {
+            if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.road")) {
+                MainUtil
+                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
+                event.setHatching(false);
+            }
+        } else if (!plot.hasOwner()) {
+            if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.unowned")) {
+                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                    "plots.admin.projectile.unowned");
+                event.setHatching(false);
+            }
+        } else if (!plot.isAdded(plotPlayer.getUUID())) {
+            if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.other")) {
+                MainUtil
+                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
+                event.setHatching(false);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void blockCreate(BlockPlaceEvent event) {
+        Location location = BukkitUtil.getLocation(event.getBlock().getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Player player = event.getPlayer();
+        PlotPlayer pp = BukkitUtil.getPlayer(player);
+        Plot plot = area.getPlot(location);
+        if (plot != null) {
+            if ((location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
+                && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+                event.setCancelled(true);
+                MainUtil.sendMessage(pp,
+                    C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+            }
+            if (!plot.hasOwner()) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                    MainUtil
+                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                    event.setCancelled(true);
+                    return;
+                }
+            } else if (!plot.isAdded(pp.getUUID())) {
+                Set<PlotBlock> place = plot.getFlag(Flags.PLACE, null);
+                if (place != null) {
+                    Block block = event.getBlock();
+                    if (place.contains(PlotBlock.get(block.getType().name()))) {
+                        return;
+                    }
+                }
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                    return;
+                }
+            } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    event.setCancelled(true);
+                    return;
+                }
+            }
+            if (plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
+                Block block = event.getBlockPlaced();
+                if (block.getType().hasGravity()) {
+                    sendBlockChange(block.getLocation(), block.getBlockData());
+                }
+            }
+        } else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+            event.setCancelled(true);
         }
-      } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-        if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-          MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
-          event.setCancelled(true);
-          return;
-        }
-      }
-      if (plot.getFlag(Flags.DISABLE_PHYSICS, false)) {
-        Block block = event.getBlockPlaced();
-        if (block.getType().hasGravity()) {
-          sendBlockChange(block.getLocation(), block.getBlockData());
-        }
-      }
-    } else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-      MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
-      event.setCancelled(true);
     }
-  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index 19cd4c554..33a63dbde 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -31,8 +31,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
 
-@SuppressWarnings("unused")
-public class PlotPlusListener extends PlotListener implements Listener {
+@SuppressWarnings("unused") public class PlotPlusListener extends PlotListener implements Listener {
 
     private static final HashMap<UUID, Interval> feedRunnable = new HashMap<>();
     private static final HashMap<UUID, Interval> healRunnable = new HashMap<>();
@@ -82,8 +81,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
         }, 0L, 20L);
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onInteract(BlockDamageEvent event) {
+    @EventHandler(priority = EventPriority.HIGH) public void onInteract(BlockDamageEvent event) {
         Player player = event.getPlayer();
         if (player.getGameMode() != GameMode.SURVIVAL) {
             return;
@@ -102,8 +100,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onDamage(EntityDamageEvent event) {
+    @EventHandler(priority = EventPriority.HIGH) public void onDamage(EntityDamageEvent event) {
         if (event.getEntityType() != EntityType.PLAYER) {
             return;
         }
@@ -117,8 +114,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
         }
     }
 
-    @EventHandler
-    public void onItemDrop(PlayerDropItemEvent event) {
+    @EventHandler public void onItemDrop(PlayerDropItemEvent event) {
         Player player = event.getPlayer();
         PlotPlayer pp = BukkitUtil.getPlayer(player);
         Plot plot = BukkitUtil.getLocation(player).getOwnedPlot();
@@ -133,27 +129,24 @@ public class PlotPlusListener extends PlotListener implements Listener {
         }
     }
 
-    @EventHandler
-    public void onPlotEnter(PlayerEnterPlotEvent event) {
+    @EventHandler public void onPlotEnter(PlayerEnterPlotEvent event) {
         Player player = event.getPlayer();
         Plot plot = event.getPlot();
         Optional<Integer[]> feed = plot.getFlag(Flags.FEED);
-        feed.ifPresent( value -> feedRunnable.put(player.getUniqueId(), new Interval(value[0], value[1], 20))
-        );
+        feed.ifPresent(
+            value -> feedRunnable.put(player.getUniqueId(), new Interval(value[0], value[1], 20)));
         Optional<Integer[]> heal = plot.getFlag(Flags.HEAL);
-        heal.ifPresent( value -> healRunnable.put(player.getUniqueId(), new Interval(value[0], value[1], 20))
-        );
+        heal.ifPresent(
+            value -> healRunnable.put(player.getUniqueId(), new Interval(value[0], value[1], 20)));
     }
 
-    @EventHandler
-    public void onPlayerQuit(PlayerQuitEvent event) {
+    @EventHandler public void onPlayerQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
         feedRunnable.remove(player.getUniqueId());
         healRunnable.remove(player.getUniqueId());
     }
 
-    @EventHandler
-    public void onPlotLeave(PlayerLeavePlotEvent event) {
+    @EventHandler public void onPlotLeave(PlayerLeavePlotEvent event) {
         Player leaver = event.getPlayer();
         Plot plot = event.getPlot();
         if (!plot.hasOwner()) {
@@ -164,8 +157,7 @@ public class PlotPlusListener extends PlotListener implements Listener {
         healRunnable.remove(leaver.getUniqueId());
     }
 
-    @EventHandler
-    public void onItemPickup(EntityPickupItemEvent event) {
+    @EventHandler public void onItemPickup(EntityPickupItemEvent event) {
         LivingEntity ent = event.getEntity();
         if (ent instanceof Player) {
             Player player = (Player) ent;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index 321dde939..b0912fea2 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -1,13 +1,9 @@
 package com.github.intellectualsites.plotsquared.bukkit.listeners;
 
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
-
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.World;
@@ -18,6 +14,11 @@ import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.plugin.Plugin;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
+
 @SuppressWarnings("unused") public class SingleWorldListener implements Listener {
 
     private Method methodGetHandleChunk;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 7aecb854c..dddf43738 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -7,7 +7,10 @@ import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
-import org.bukkit.*;
+import org.bukkit.GameMode;
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.WeatherType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventException;
@@ -255,14 +258,15 @@ public class BukkitPlayer extends PlotPlayer {
     @Override public void playMusic(Location location, PlotBlock id) {
         if (PlotBlock.isEverything(id) || id.isAir()) {
             // Let's just stop all the discs because why not?
-            for (final Sound sound : Arrays.stream(Sound.values()).filter(sound -> sound.name().contains("DISC")).collect(
-                Collectors.toList())) {
+            for (final Sound sound : Arrays.stream(Sound.values())
+                .filter(sound -> sound.name().contains("DISC")).collect(Collectors.toList())) {
                 player.stopSound(sound);
             }
             // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
         } else {
             // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
-            this.player.playSound(BukkitUtil.getLocation(location), Sound.valueOf(id.to(Material.class).name()), Float.MAX_VALUE, 1f);
+            this.player.playSound(BukkitUtil.getLocation(location),
+                Sound.valueOf(id.to(Material.class).name()), Float.MAX_VALUE, 1f);
         }
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index c06b66b71..0b6921f88 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -12,697 +12,694 @@ import org.bukkit.util.Vector;
 
 public final class ReplicatingEntityWrapper extends EntityWrapper {
 
-  private final short depth;
-  private final int hash;
-  private final EntityBaseStats base = new EntityBaseStats();
+    private final short depth;
+    private final int hash;
+    private final EntityBaseStats base = new EntityBaseStats();
 
-  public ItemStack[] inventory;
-  // Extended
-  private ItemStack stack;
-  private byte dataByte;
-  private byte dataByte2;
-  private String dataString;
-  private LivingEntityStats lived;
-  private AgeableStats aged;
-  private TameableStats tamed;
-  private ArmorStandStats stand;
-  private HorseStats horse;
-  private boolean noGravity;
+    public ItemStack[] inventory;
+    // Extended
+    private ItemStack stack;
+    private byte dataByte;
+    private byte dataByte2;
+    private String dataString;
+    private LivingEntityStats lived;
+    private AgeableStats aged;
+    private TameableStats tamed;
+    private ArmorStandStats stand;
+    private HorseStats horse;
+    private boolean noGravity;
 
-  public ReplicatingEntityWrapper(Entity entity, short depth) {
-    super(entity);
+    public ReplicatingEntityWrapper(Entity entity, short depth) {
+        super(entity);
 
-    this.hash = entity.getEntityId();
-    this.depth = depth;
+        this.hash = entity.getEntityId();
+        this.depth = depth;
 
-    if (depth == 0) {
-      return;
+        if (depth == 0) {
+            return;
+        }
+        Entity passenger = entity.getPassenger();
+        if (passenger != null) {
+            this.base.passenger = new ReplicatingEntityWrapper(passenger, depth);
+        }
+        this.base.fall = entity.getFallDistance();
+        this.base.fire = (short) entity.getFireTicks();
+        this.base.age = entity.getTicksLived();
+        Vector velocity = entity.getVelocity();
+        this.base.vX = velocity.getX();
+        this.base.vY = velocity.getY();
+        this.base.vZ = velocity.getZ();
+        if (depth == 1) {
+            return;
+        }
+        if (!entity.hasGravity()) {
+            this.noGravity = true;
+        }
+        switch (entity.getType()) {
+            case BOAT:
+                Boat boat = (Boat) entity;
+                this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
+                return;
+            case ARROW:
+            case COMPLEX_PART:
+            case EGG:
+            case ENDER_CRYSTAL:
+            case ENDER_PEARL:
+            case ENDER_SIGNAL:
+            case EXPERIENCE_ORB:
+            case FALLING_BLOCK:
+            case FIREBALL:
+            case FIREWORK:
+            case FISHING_HOOK:
+            case LEASH_HITCH:
+            case LIGHTNING:
+            case MINECART:
+            case MINECART_COMMAND:
+            case MINECART_MOB_SPAWNER:
+            case MINECART_TNT:
+            case PLAYER:
+            case PRIMED_TNT:
+            case SLIME:
+            case SMALL_FIREBALL:
+            case SNOWBALL:
+            case MINECART_FURNACE:
+            case SPLASH_POTION:
+            case THROWN_EXP_BOTTLE:
+            case WEATHER:
+            case WITHER_SKULL:
+            case UNKNOWN:
+            case TIPPED_ARROW:
+            case SPECTRAL_ARROW:
+            case SHULKER_BULLET:
+            case DRAGON_FIREBALL:
+            case LINGERING_POTION:
+            case AREA_EFFECT_CLOUD:
+                // Do this stuff later
+                return;
+            // MISC //
+            case DROPPED_ITEM:
+                Item item = (Item) entity;
+                this.stack = item.getItemStack();
+                return;
+            case ITEM_FRAME:
+                this.x = Math.floor(this.x);
+                this.y = Math.floor(this.y);
+                this.z = Math.floor(this.z);
+                ItemFrame itemFrame = (ItemFrame) entity;
+                this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
+                this.stack = itemFrame.getItem().clone();
+                return;
+            case PAINTING:
+                this.x = Math.floor(this.x);
+                this.y = Math.floor(this.y);
+                this.z = Math.floor(this.z);
+                Painting painting = (Painting) entity;
+                Art art = painting.getArt();
+                this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
+                int h = art.getBlockHeight();
+                if (h % 2 == 0) {
+                    this.y -= 1;
+                }
+                this.dataString = art.name();
+                return;
+            // END MISC //
+            // INVENTORY HOLDER //
+            case MINECART_CHEST:
+            case MINECART_HOPPER:
+                storeInventory((InventoryHolder) entity);
+                return;
+            // START LIVING ENTITY //
+            // START AGEABLE //
+            // START TAMEABLE //
+            case HORSE:
+                Horse horse = (Horse) entity;
+                this.horse = new HorseStats();
+                this.horse.jump = horse.getJumpStrength();
+                if (horse instanceof ChestedHorse) {
+                    this.horse.chest = ((ChestedHorse) horse).isCarryingChest();
+                } else {
+                    this.horse.chest = false;
+                }
+                this.horse.variant = horse.getVariant();
+                this.horse.style = horse.getStyle();
+                this.horse.color = horse.getColor();
+                storeTameable(horse);
+                storeAgeable(horse);
+                storeLiving(horse);
+                storeInventory(horse);
+                return;
+            // END INVENTORY HOLDER //
+            case WOLF:
+            case OCELOT:
+                storeTameable((Tameable) entity);
+                storeAgeable((Ageable) entity);
+                storeLiving((LivingEntity) entity);
+                return;
+            // END TAMEABLE //
+            case SHEEP:
+                Sheep sheep = (Sheep) entity;
+                this.dataByte = (byte) (sheep.isSheared() ? 1 : 0);
+                this.dataByte2 = sheep.getColor().getDyeData();
+                storeAgeable(sheep);
+                storeLiving(sheep);
+                return;
+            case VILLAGER:
+            case CHICKEN:
+            case COW:
+            case MUSHROOM_COW:
+            case PIG:
+            case POLAR_BEAR:
+                storeAgeable((Ageable) entity);
+                storeLiving((LivingEntity) entity);
+                return;
+            case RABBIT:
+                this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
+                storeAgeable((Ageable) entity);
+                storeLiving((LivingEntity) entity);
+                return;
+            // END AGEABLE //
+            case GUARDIAN:
+                //todo no longer works (possible exception thrown)
+                this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
+                storeLiving((LivingEntity) entity);
+                return;
+            case SKELETON:
+                //todo no longer works (possible exception thrown)
+                this.dataByte = getOrdinal(Skeleton.SkeletonType.values(),
+                    ((Skeleton) entity).getSkeletonType());
+                storeLiving((LivingEntity) entity);
+                return;
+            case ARMOR_STAND:
+                ArmorStand stand = (ArmorStand) entity;
+                this.inventory =
+                    new ItemStack[] {stand.getItemInHand().clone(), stand.getHelmet().clone(),
+                        stand.getChestplate().clone(), stand.getLeggings().clone(),
+                        stand.getBoots().clone()};
+                storeLiving(stand);
+                this.stand = new ArmorStandStats();
+
+                EulerAngle head = stand.getHeadPose();
+                this.stand.head[0] = (float) head.getX();
+                this.stand.head[1] = (float) head.getY();
+                this.stand.head[2] = (float) head.getZ();
+
+                EulerAngle body = stand.getBodyPose();
+                this.stand.body[0] = (float) body.getX();
+                this.stand.body[1] = (float) body.getY();
+                this.stand.body[2] = (float) body.getZ();
+
+                EulerAngle leftLeg = stand.getLeftLegPose();
+                this.stand.leftLeg[0] = (float) leftLeg.getX();
+                this.stand.leftLeg[1] = (float) leftLeg.getY();
+                this.stand.leftLeg[2] = (float) leftLeg.getZ();
+
+                EulerAngle rightLeg = stand.getRightLegPose();
+                this.stand.rightLeg[0] = (float) rightLeg.getX();
+                this.stand.rightLeg[1] = (float) rightLeg.getY();
+                this.stand.rightLeg[2] = (float) rightLeg.getZ();
+
+                EulerAngle leftArm = stand.getLeftArmPose();
+                this.stand.leftArm[0] = (float) leftArm.getX();
+                this.stand.leftArm[1] = (float) leftArm.getY();
+                this.stand.leftArm[2] = (float) leftArm.getZ();
+
+                EulerAngle rightArm = stand.getRightArmPose();
+                this.stand.rightArm[0] = (float) rightArm.getX();
+                this.stand.rightArm[1] = (float) rightArm.getY();
+                this.stand.rightArm[2] = (float) rightArm.getZ();
+
+                if (stand.hasArms()) {
+                    this.stand.arms = true;
+                }
+                if (!stand.hasBasePlate()) {
+                    this.stand.noPlate = true;
+                }
+                if (!stand.isVisible()) {
+                    this.stand.invisible = true;
+                }
+                if (stand.isSmall()) {
+                    this.stand.small = true;
+                }
+                return;
+            case ENDERMITE:
+                return;
+            case BAT:
+                if (((Bat) entity).isAwake()) {
+                    this.dataByte = (byte) 1;
+                } else {
+                    this.dataByte = (byte) 0;
+                }
+                return;
+            case ENDER_DRAGON:
+                EnderDragon entity1 = (EnderDragon) entity;
+                this.dataByte = (byte) entity1.getPhase().ordinal();
+                return;
+            case GHAST:
+            case MAGMA_CUBE:
+            case SQUID:
+            case PIG_ZOMBIE:
+            case ZOMBIE:
+            case WITHER:
+            case WITCH:
+            case SPIDER:
+            case CAVE_SPIDER:
+            case SILVERFISH:
+            case GIANT:
+            case ENDERMAN:
+            case CREEPER:
+            case BLAZE:
+            case SHULKER:
+            case SNOWMAN:
+                storeLiving((LivingEntity) entity);
+                return;
+            case IRON_GOLEM:
+                if (((IronGolem) entity).isPlayerCreated()) {
+                    this.dataByte = (byte) 1;
+                } else {
+                    this.dataByte = (byte) 0;
+                }
+                storeLiving((LivingEntity) entity);
+                // END LIVING //
+            default:
+                PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
+        }
     }
-    Entity passenger = entity.getPassenger();
-    if (passenger != null) {
-      this.base.passenger = new ReplicatingEntityWrapper(passenger, depth);
-    }
-    this.base.fall = entity.getFallDistance();
-    this.base.fire = (short) entity.getFireTicks();
-    this.base.age = entity.getTicksLived();
-    Vector velocity = entity.getVelocity();
-    this.base.vX = velocity.getX();
-    this.base.vY = velocity.getY();
-    this.base.vZ = velocity.getZ();
-    if (depth == 1) {
-      return;
-    }
-    if (!entity.hasGravity()) {
-      this.noGravity = true;
-    }
-    switch (entity.getType()) {
-      case BOAT:
-        Boat boat = (Boat) entity;
-        this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
-        return;
-      case ARROW:
-      case COMPLEX_PART:
-      case EGG:
-      case ENDER_CRYSTAL:
-      case ENDER_PEARL:
-      case ENDER_SIGNAL:
-      case EXPERIENCE_ORB:
-      case FALLING_BLOCK:
-      case FIREBALL:
-      case FIREWORK:
-      case FISHING_HOOK:
-      case LEASH_HITCH:
-      case LIGHTNING:
-      case MINECART:
-      case MINECART_COMMAND:
-      case MINECART_MOB_SPAWNER:
-      case MINECART_TNT:
-      case PLAYER:
-      case PRIMED_TNT:
-      case SLIME:
-      case SMALL_FIREBALL:
-      case SNOWBALL:
-      case MINECART_FURNACE:
-      case SPLASH_POTION:
-      case THROWN_EXP_BOTTLE:
-      case WEATHER:
-      case WITHER_SKULL:
-      case UNKNOWN:
-      case TIPPED_ARROW:
-      case SPECTRAL_ARROW:
-      case SHULKER_BULLET:
-      case DRAGON_FIREBALL:
-      case LINGERING_POTION:
-      case AREA_EFFECT_CLOUD:
-        // Do this stuff later
-        return;
-      // MISC //
-      case DROPPED_ITEM:
-        Item item = (Item) entity;
-        this.stack = item.getItemStack();
-        return;
-      case ITEM_FRAME:
-        this.x = Math.floor(this.x);
-        this.y = Math.floor(this.y);
-        this.z = Math.floor(this.z);
-        ItemFrame itemFrame = (ItemFrame) entity;
-        this.dataByte = getOrdinal(Rotation.values(), itemFrame.getRotation());
-        this.stack = itemFrame.getItem().clone();
-        return;
-      case PAINTING:
-        this.x = Math.floor(this.x);
-        this.y = Math.floor(this.y);
-        this.z = Math.floor(this.z);
-        Painting painting = (Painting) entity;
-        Art art = painting.getArt();
-        this.dataByte = getOrdinal(BlockFace.values(), painting.getFacing());
-        int h = art.getBlockHeight();
-        if (h % 2 == 0) {
-          this.y -= 1;
-        }
-        this.dataString = art.name();
-        return;
-      // END MISC //
-      // INVENTORY HOLDER //
-      case MINECART_CHEST:
-      case MINECART_HOPPER:
-        storeInventory((InventoryHolder) entity);
-        return;
-      // START LIVING ENTITY //
-      // START AGEABLE //
-      // START TAMEABLE //
-      case HORSE:
-        Horse horse = (Horse) entity;
-        this.horse = new HorseStats();
-        this.horse.jump = horse.getJumpStrength();
-        if (horse instanceof ChestedHorse) {
-          this.horse.chest = ((ChestedHorse) horse).isCarryingChest();
-        } else {
-          this.horse.chest = false;
-        }
-        this.horse.variant = horse.getVariant();
-        this.horse.style = horse.getStyle();
-        this.horse.color = horse.getColor();
-        storeTameable(horse);
-        storeAgeable(horse);
-        storeLiving(horse);
-        storeInventory(horse);
-        return;
-      // END INVENTORY HOLDER //
-      case WOLF:
-      case OCELOT:
-        storeTameable((Tameable) entity);
-        storeAgeable((Ageable) entity);
-        storeLiving((LivingEntity) entity);
-        return;
-      // END TAMEABLE //
-      case SHEEP:
-        Sheep sheep = (Sheep) entity;
-        this.dataByte = (byte) (sheep.isSheared() ? 1 : 0);
-        this.dataByte2 = sheep.getColor().getDyeData();
-        storeAgeable(sheep);
-        storeLiving(sheep);
-        return;
-      case VILLAGER:
-      case CHICKEN:
-      case COW:
-      case MUSHROOM_COW:
-      case PIG:
-      case POLAR_BEAR:
-        storeAgeable((Ageable) entity);
-        storeLiving((LivingEntity) entity);
-        return;
-      case RABBIT:
-        this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
-        storeAgeable((Ageable) entity);
-        storeLiving((LivingEntity) entity);
-        return;
-      // END AGEABLE //
-      case GUARDIAN:
-        //todo no longer works (possible exception thrown)
-        this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
-        storeLiving((LivingEntity) entity);
-        return;
-      case SKELETON:
-        //todo no longer works (possible exception thrown)
-        this.dataByte = getOrdinal(Skeleton.SkeletonType.values(),
-            ((Skeleton) entity).getSkeletonType());
-        storeLiving((LivingEntity) entity);
-        return;
-      case ARMOR_STAND:
-        ArmorStand stand = (ArmorStand) entity;
-        this.inventory =
-            new ItemStack[]{stand.getItemInHand().clone(), stand.getHelmet().clone(),
-                stand.getChestplate().clone(), stand.getLeggings().clone(),
-                stand.getBoots().clone()};
-        storeLiving(stand);
-        this.stand = new ArmorStandStats();
 
-        EulerAngle head = stand.getHeadPose();
-        this.stand.head[0] = (float) head.getX();
-        this.stand.head[1] = (float) head.getY();
-        this.stand.head[2] = (float) head.getZ();
-
-        EulerAngle body = stand.getBodyPose();
-        this.stand.body[0] = (float) body.getX();
-        this.stand.body[1] = (float) body.getY();
-        this.stand.body[2] = (float) body.getZ();
-
-        EulerAngle leftLeg = stand.getLeftLegPose();
-        this.stand.leftLeg[0] = (float) leftLeg.getX();
-        this.stand.leftLeg[1] = (float) leftLeg.getY();
-        this.stand.leftLeg[2] = (float) leftLeg.getZ();
-
-        EulerAngle rightLeg = stand.getRightLegPose();
-        this.stand.rightLeg[0] = (float) rightLeg.getX();
-        this.stand.rightLeg[1] = (float) rightLeg.getY();
-        this.stand.rightLeg[2] = (float) rightLeg.getZ();
-
-        EulerAngle leftArm = stand.getLeftArmPose();
-        this.stand.leftArm[0] = (float) leftArm.getX();
-        this.stand.leftArm[1] = (float) leftArm.getY();
-        this.stand.leftArm[2] = (float) leftArm.getZ();
-
-        EulerAngle rightArm = stand.getRightArmPose();
-        this.stand.rightArm[0] = (float) rightArm.getX();
-        this.stand.rightArm[1] = (float) rightArm.getY();
-        this.stand.rightArm[2] = (float) rightArm.getZ();
-
-        if (stand.hasArms()) {
-          this.stand.arms = true;
-        }
-        if (!stand.hasBasePlate()) {
-          this.stand.noPlate = true;
-        }
-        if (!stand.isVisible()) {
-          this.stand.invisible = true;
-        }
-        if (stand.isSmall()) {
-          this.stand.small = true;
-        }
-        return;
-      case ENDERMITE:
-        return;
-      case BAT:
-        if (((Bat) entity).isAwake()) {
-          this.dataByte = (byte) 1;
-        } else {
-          this.dataByte = (byte) 0;
-        }
-        return;
-      case ENDER_DRAGON:
-        EnderDragon entity1 = (EnderDragon) entity;
-        this.dataByte = (byte) entity1.getPhase().ordinal();
-        return;
-      case GHAST:
-      case MAGMA_CUBE:
-      case SQUID:
-      case PIG_ZOMBIE:
-      case ZOMBIE:
-      case WITHER:
-      case WITCH:
-      case SPIDER:
-      case CAVE_SPIDER:
-      case SILVERFISH:
-      case GIANT:
-      case ENDERMAN:
-      case CREEPER:
-      case BLAZE:
-      case SHULKER:
-      case SNOWMAN:
-        storeLiving((LivingEntity) entity);
-        return;
-      case IRON_GOLEM:
-        if (((IronGolem) entity).isPlayerCreated()) {
-          this.dataByte = (byte) 1;
-        } else {
-          this.dataByte = (byte) 0;
-        }
-        storeLiving((LivingEntity) entity);
-        // END LIVING //
-      default:
-        PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
+    @Override public boolean equals(Object obj) {
+        return this.hash == obj.hashCode();
     }
-  }
 
-  @Override
-  public boolean equals(Object obj) {
-    return this.hash == obj.hashCode();
-  }
+    @Override public int hashCode() {
+        return this.hash;
+    }
 
-  @Override
-  public int hashCode() {
-    return this.hash;
-  }
+    public void storeInventory(InventoryHolder held) {
+        this.inventory = held.getInventory().getContents().clone();
+    }
 
-  public void storeInventory(InventoryHolder held) {
-    this.inventory = held.getInventory().getContents().clone();
-  }
+    void restoreLiving(LivingEntity entity) {
+        entity.setCanPickupItems(this.lived.loot);
+        if (this.lived.name != null) {
+            entity.setCustomName(this.lived.name);
+            entity.setCustomNameVisible(this.lived.visible);
+        }
+        if (this.lived.potions != null && !this.lived.potions.isEmpty()) {
+            entity.addPotionEffects(this.lived.potions);
+        }
+        entity.setRemainingAir(this.lived.air);
+        entity.setRemoveWhenFarAway(this.lived.persistent);
+        if (this.lived.equipped) {
+            this.restoreEquipment(entity);
+        }
+        if (this.lived.leashed) {
+            // TODO leashes
+            //            World world = entity.getWorld();
+            //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) + lived.leashX, Math.floor(y) + lived.leashY, Math
+            // .floor(z) + lived.leashZ), EntityType.LEASH_HITCH);
+            //            entity.setLeashHolder(leash);
+        }
+    }
 
-  void restoreLiving(LivingEntity entity) {
-    entity.setCanPickupItems(this.lived.loot);
-    if (this.lived.name != null) {
-      entity.setCustomName(this.lived.name);
-      entity.setCustomNameVisible(this.lived.visible);
+    void restoreEquipment(LivingEntity entity) {
+        EntityEquipment equipment = entity.getEquipment();
+        equipment.setItemInMainHand(this.lived.mainHand);
+        equipment.setItemInOffHand(this.lived.offHand);
+        equipment.setHelmet(this.lived.helmet);
+        equipment.setChestplate(this.lived.chestplate);
+        equipment.setLeggings(this.lived.leggings);
+        equipment.setBoots(this.lived.boots);
     }
-    if (this.lived.potions != null && !this.lived.potions.isEmpty()) {
-      entity.addPotionEffects(this.lived.potions);
-    }
-    entity.setRemainingAir(this.lived.air);
-    entity.setRemoveWhenFarAway(this.lived.persistent);
-    if (this.lived.equipped) {
-      this.restoreEquipment(entity);
-    }
-    if (this.lived.leashed) {
-      // TODO leashes
-      //            World world = entity.getWorld();
-      //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) + lived.leashX, Math.floor(y) + lived.leashY, Math
-      // .floor(z) + lived.leashZ), EntityType.LEASH_HITCH);
-      //            entity.setLeashHolder(leash);
-    }
-  }
 
-  void restoreEquipment(LivingEntity entity) {
-    EntityEquipment equipment = entity.getEquipment();
-    equipment.setItemInMainHand(this.lived.mainHand);
-    equipment.setItemInOffHand(this.lived.offHand);
-    equipment.setHelmet(this.lived.helmet);
-    equipment.setChestplate(this.lived.chestplate);
-    equipment.setLeggings(this.lived.leggings);
-    equipment.setBoots(this.lived.boots);
-  }
+    private void restoreInventory(InventoryHolder entity) {
+        try {
+            entity.getInventory().setContents(this.inventory);
+        } catch (IllegalArgumentException e) {
+            PlotSquared.debug("&c[WARN] Failed to restore inventory.\n Reason: " + e.getMessage());
+        }
+    }
 
-  private void restoreInventory(InventoryHolder entity) {
-    try {
-      entity.getInventory().setContents(this.inventory);
-    } catch (IllegalArgumentException e) {
-      PlotSquared.debug("&c[WARN] Failed to restore inventory.\n Reason: " + e.getMessage());
+    public void storeLiving(LivingEntity lived) {
+        this.lived = new LivingEntityStats();
+        this.lived.potions = lived.getActivePotionEffects();
+        this.lived.loot = lived.getCanPickupItems();
+        this.lived.name = lived.getCustomName();
+        this.lived.visible = lived.isCustomNameVisible();
+        this.lived.health = (float) lived.getHealth();
+        this.lived.air = (short) lived.getRemainingAir();
+        this.lived.persistent = lived.getRemoveWhenFarAway();
+        this.lived.leashed = lived.isLeashed();
+        if (this.lived.leashed) {
+            Location location = lived.getLeashHolder().getLocation();
+            this.lived.leashX = (short) (this.x - location.getBlockX());
+            this.lived.leashY = (short) (this.y - location.getBlockY());
+            this.lived.leashZ = (short) (this.z - location.getBlockZ());
+        }
+        EntityEquipment equipment = lived.getEquipment();
+        this.lived.equipped = equipment != null;
+        if (this.lived.equipped) {
+            storeEquipment(equipment);
+        }
     }
-  }
 
-  public void storeLiving(LivingEntity lived) {
-    this.lived = new LivingEntityStats();
-    this.lived.potions = lived.getActivePotionEffects();
-    this.lived.loot = lived.getCanPickupItems();
-    this.lived.name = lived.getCustomName();
-    this.lived.visible = lived.isCustomNameVisible();
-    this.lived.health = (float) lived.getHealth();
-    this.lived.air = (short) lived.getRemainingAir();
-    this.lived.persistent = lived.getRemoveWhenFarAway();
-    this.lived.leashed = lived.isLeashed();
-    if (this.lived.leashed) {
-      Location location = lived.getLeashHolder().getLocation();
-      this.lived.leashX = (short) (this.x - location.getBlockX());
-      this.lived.leashY = (short) (this.y - location.getBlockY());
-      this.lived.leashZ = (short) (this.z - location.getBlockZ());
+    void storeEquipment(EntityEquipment equipment) {
+        this.lived.mainHand = equipment.getItemInMainHand().clone();
+        this.lived.offHand = equipment.getItemInOffHand().clone();
+        this.lived.boots = equipment.getBoots().clone();
+        this.lived.leggings = equipment.getLeggings().clone();
+        this.lived.chestplate = equipment.getChestplate().clone();
+        this.lived.helmet = equipment.getHelmet().clone();
     }
-    EntityEquipment equipment = lived.getEquipment();
-    this.lived.equipped = equipment != null;
-    if (this.lived.equipped) {
-      storeEquipment(equipment);
-    }
-  }
 
-  void storeEquipment(EntityEquipment equipment) {
-    this.lived.mainHand = equipment.getItemInMainHand().clone();
-    this.lived.offHand = equipment.getItemInOffHand().clone();
-    this.lived.boots = equipment.getBoots().clone();
-    this.lived.leggings = equipment.getLeggings().clone();
-    this.lived.chestplate = equipment.getChestplate().clone();
-    this.lived.helmet = equipment.getHelmet().clone();
-  }
+    private void restoreTameable(Tameable entity) {
+        if (this.tamed.tamed) {
+            if (this.tamed.owner != null) {
+                entity.setTamed(true);
+                entity.setOwner(this.tamed.owner);
+            }
+        }
+    }
 
-  private void restoreTameable(Tameable entity) {
-    if (this.tamed.tamed) {
-      if (this.tamed.owner != null) {
-        entity.setTamed(true);
-        entity.setOwner(this.tamed.owner);
-      }
+    private void restoreAgeable(Ageable entity) {
+        if (!this.aged.adult) {
+            entity.setBaby();
+        }
+        entity.setAgeLock(this.aged.locked);
+        if (this.aged.age > 0) {
+            entity.setAge(this.aged.age);
+        }
     }
-  }
 
-  private void restoreAgeable(Ageable entity) {
-    if (!this.aged.adult) {
-      entity.setBaby();
+    public void storeAgeable(Ageable aged) {
+        this.aged = new AgeableStats();
+        this.aged.age = aged.getAge();
+        this.aged.locked = aged.getAgeLock();
+        this.aged.adult = aged.isAdult();
     }
-    entity.setAgeLock(this.aged.locked);
-    if (this.aged.age > 0) {
-      entity.setAge(this.aged.age);
-    }
-  }
 
-  public void storeAgeable(Ageable aged) {
-    this.aged = new AgeableStats();
-    this.aged.age = aged.getAge();
-    this.aged.locked = aged.getAgeLock();
-    this.aged.adult = aged.isAdult();
-  }
+    public void storeTameable(Tameable tamed) {
+        this.tamed = new TameableStats();
+        this.tamed.owner = tamed.getOwner();
+        this.tamed.tamed = tamed.isTamed();
+    }
 
-  public void storeTameable(Tameable tamed) {
-    this.tamed = new TameableStats();
-    this.tamed.owner = tamed.getOwner();
-    this.tamed.tamed = tamed.isTamed();
-  }
+    @Override public Entity spawn(World world, int xOffset, int zOffset) {
+        Location location = new Location(world, this.x + xOffset, this.y, this.z + zOffset);
+        location.setYaw(this.yaw);
+        location.setPitch(this.pitch);
+        if (!this.getType().isSpawnable()) {
+            return null;
+        }
+        Entity entity;
+        switch (this.getType()) {
+            case DROPPED_ITEM:
+                return world.dropItem(location, this.stack);
+            case PLAYER:
+            case LEASH_HITCH:
+                return null;
+            case ITEM_FRAME:
+                entity = world.spawn(location, ItemFrame.class);
+                break;
+            case PAINTING:
+                entity = world.spawn(location, Painting.class);
+                break;
+            default:
+                entity = world.spawnEntity(location, this.getType());
+                break;
+        }
+        if (this.depth == 0) {
+            return entity;
+        }
+        if (this.base.passenger != null) {
+            entity.addPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
+        }
+        if (this.base.fall != 0) {
+            entity.setFallDistance(this.base.fall);
+        }
+        if (this.base.fire != 0) {
+            entity.setFireTicks(this.base.fire);
+        }
+        if (this.base.age != 0) {
+            entity.setTicksLived(this.base.age);
+        }
+        entity.setVelocity(new Vector(this.base.vX, this.base.vY, this.base.vZ));
+        if (this.depth == 1) {
+            return entity;
+        }
+        if (this.noGravity) {
+            entity.setGravity(false);
+        }
+        switch (entity.getType()) {
+            case BOAT:
+                Boat boat = (Boat) entity;
+                boat.setWoodType(TreeSpecies.values()[dataByte]);
+                return entity;
+            case SLIME:
+                ((Slime) entity).setSize(this.dataByte);
+                return entity;
+            case ARROW:
+            case COMPLEX_PART:
+            case EGG:
+            case ENDER_CRYSTAL:
+            case ENDER_PEARL:
+            case ENDER_SIGNAL:
+            case DROPPED_ITEM:
+            case EXPERIENCE_ORB:
+            case FALLING_BLOCK:
+            case FIREBALL:
+            case FIREWORK:
+            case FISHING_HOOK:
+            case LEASH_HITCH:
+            case LIGHTNING:
+            case MINECART:
+            case MINECART_COMMAND:
+            case MINECART_MOB_SPAWNER:
+            case MINECART_TNT:
+            case PLAYER:
+            case PRIMED_TNT:
+            case SMALL_FIREBALL:
+            case SNOWBALL:
+            case SPLASH_POTION:
+            case THROWN_EXP_BOTTLE:
+            case WEATHER:
+            case TIPPED_ARROW:
+            case SPECTRAL_ARROW:
+            case SHULKER_BULLET:
+            case LINGERING_POTION:
+            case AREA_EFFECT_CLOUD:
+            case DRAGON_FIREBALL:
+            case WITHER_SKULL:
+            case MINECART_FURNACE:
+            case UNKNOWN:
+                // Do this stuff later
+                return entity;
+            // MISC //
+            case ITEM_FRAME:
+                ItemFrame itemframe = (ItemFrame) entity;
+                itemframe.setRotation(Rotation.values()[this.dataByte]);
+                itemframe.setItem(this.stack);
+                return entity;
+            case PAINTING:
+                Painting painting = (Painting) entity;
+                painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
+                painting.setArt(Art.getByName(this.dataString), true);
+                return entity;
+            // END MISC //
+            // INVENTORY HOLDER //
+            case MINECART_CHEST:
+            case MINECART_HOPPER:
+                restoreInventory((InventoryHolder) entity);
+                return entity;
+            // START LIVING ENTITY //
+            // START AGEABLE //
+            // START TAMEABLE //
+            case HORSE:
+                Horse horse = (Horse) entity;
+                horse.setJumpStrength(this.horse.jump);
+                if (horse instanceof ChestedHorse && this.horse.chest) {
+                    ((ChestedHorse) horse).setCarryingChest(true);
+                }
+                //todo broken in 1.13 possible exception thrown
+                horse.setVariant(this.horse.variant);
+                horse.setStyle(this.horse.style);
+                horse.setColor(this.horse.color);
+                restoreTameable(horse);
+                restoreAgeable(horse);
+                restoreLiving(horse);
+                restoreInventory(horse);
+                return entity;
+            // END INVENTORY HOLDER //
+            case WOLF:
+            case OCELOT:
+                restoreTameable((Tameable) entity);
+                restoreAgeable((Ageable) entity);
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            // END AGEABLE //
+            case SHEEP:
+                Sheep sheep = (Sheep) entity;
+                if (this.dataByte == 1) {
+                    sheep.setSheared(true);
+                }
+                if (this.dataByte2 != 0) {
+                    sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
+                }
+                restoreAgeable(sheep);
+                restoreLiving(sheep);
+                return sheep;
+            case VILLAGER:
+            case CHICKEN:
+            case COW:
+            case POLAR_BEAR:
+            case MUSHROOM_COW:
+            case PIG:
+                restoreAgeable((Ageable) entity);
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            // END AGEABLE //
+            case RABBIT:
+                if (this.dataByte != 0) {
+                    ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
+                }
+                restoreAgeable((Ageable) entity);
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            case GUARDIAN:
+                if (this.dataByte != 0) {
+                    //todo broken in 1.13 possible exception thrown
 
-  @Override
-  public Entity spawn(World world, int xOffset, int zOffset) {
-    Location location = new Location(world, this.x + xOffset, this.y, this.z + zOffset);
-    location.setYaw(this.yaw);
-    location.setPitch(this.pitch);
-    if (!this.getType().isSpawnable()) {
-      return null;
-    }
-    Entity entity;
-    switch (this.getType()) {
-      case DROPPED_ITEM:
-        return world.dropItem(location, this.stack);
-      case PLAYER:
-      case LEASH_HITCH:
-        return null;
-      case ITEM_FRAME:
-        entity = world.spawn(location, ItemFrame.class);
-        break;
-      case PAINTING:
-        entity = world.spawn(location, Painting.class);
-        break;
-      default:
-        entity = world.spawnEntity(location, this.getType());
-        break;
-    }
-    if (this.depth == 0) {
-      return entity;
-    }
-    if (this.base.passenger != null) {
-      entity.addPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
-    }
-    if (this.base.fall != 0) {
-      entity.setFallDistance(this.base.fall);
-    }
-    if (this.base.fire != 0) {
-      entity.setFireTicks(this.base.fire);
-    }
-    if (this.base.age != 0) {
-      entity.setTicksLived(this.base.age);
-    }
-    entity.setVelocity(new Vector(this.base.vX, this.base.vY, this.base.vZ));
-    if (this.depth == 1) {
-      return entity;
-    }
-    if (this.noGravity) {
-      entity.setGravity(false);
-    }
-    switch (entity.getType()) {
-      case BOAT:
-        Boat boat = (Boat) entity;
-        boat.setWoodType(TreeSpecies.values()[dataByte]);
-        return entity;
-      case SLIME:
-        ((Slime) entity).setSize(this.dataByte);
-        return entity;
-      case ARROW:
-      case COMPLEX_PART:
-      case EGG:
-      case ENDER_CRYSTAL:
-      case ENDER_PEARL:
-      case ENDER_SIGNAL:
-      case DROPPED_ITEM:
-      case EXPERIENCE_ORB:
-      case FALLING_BLOCK:
-      case FIREBALL:
-      case FIREWORK:
-      case FISHING_HOOK:
-      case LEASH_HITCH:
-      case LIGHTNING:
-      case MINECART:
-      case MINECART_COMMAND:
-      case MINECART_MOB_SPAWNER:
-      case MINECART_TNT:
-      case PLAYER:
-      case PRIMED_TNT:
-      case SMALL_FIREBALL:
-      case SNOWBALL:
-      case SPLASH_POTION:
-      case THROWN_EXP_BOTTLE:
-      case WEATHER:
-      case TIPPED_ARROW:
-      case SPECTRAL_ARROW:
-      case SHULKER_BULLET:
-      case LINGERING_POTION:
-      case AREA_EFFECT_CLOUD:
-      case DRAGON_FIREBALL:
-      case WITHER_SKULL:
-      case MINECART_FURNACE:
-      case UNKNOWN:
-        // Do this stuff later
-        return entity;
-      // MISC //
-      case ITEM_FRAME:
-        ItemFrame itemframe = (ItemFrame) entity;
-        itemframe.setRotation(Rotation.values()[this.dataByte]);
-        itemframe.setItem(this.stack);
-        return entity;
-      case PAINTING:
-        Painting painting = (Painting) entity;
-        painting.setFacingDirection(BlockFace.values()[this.dataByte], true);
-        painting.setArt(Art.getByName(this.dataString), true);
-        return entity;
-      // END MISC //
-      // INVENTORY HOLDER //
-      case MINECART_CHEST:
-      case MINECART_HOPPER:
-        restoreInventory((InventoryHolder) entity);
-        return entity;
-      // START LIVING ENTITY //
-      // START AGEABLE //
-      // START TAMEABLE //
-      case HORSE:
-        Horse horse = (Horse) entity;
-        horse.setJumpStrength(this.horse.jump);
-        if (horse instanceof ChestedHorse && this.horse.chest) {
-          ((ChestedHorse) horse).setCarryingChest(true);
+                    ((Guardian) entity).setElder(true);
+                }
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            case SKELETON:
+                if (this.dataByte != 0) {
+                    //todo broken in 1.13 possible exception thrown
+                    ((Skeleton) entity)
+                        .setSkeletonType(Skeleton.SkeletonType.values()[this.dataByte]);
+                }
+                storeLiving((LivingEntity) entity);
+                return entity;
+            case ARMOR_STAND:
+                // CHECK positions
+                ArmorStand stand = (ArmorStand) entity;
+                if (this.inventory[0] != null) {
+                    stand.setItemInHand(this.inventory[0]);
+                }
+                if (this.inventory[1] != null) {
+                    stand.setHelmet(this.inventory[1]);
+                }
+                if (this.inventory[2] != null) {
+                    stand.setChestplate(this.inventory[2]);
+                }
+                if (this.inventory[3] != null) {
+                    stand.setLeggings(this.inventory[3]);
+                }
+                if (this.inventory[4] != null) {
+                    stand.setBoots(this.inventory[4]);
+                }
+                if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
+                    EulerAngle pose =
+                        new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
+                    stand.setHeadPose(pose);
+                }
+                if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
+                    EulerAngle pose =
+                        new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
+                    stand.setBodyPose(pose);
+                }
+                if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0
+                    || this.stand.leftLeg[2] != 0) {
+                    EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1],
+                        this.stand.leftLeg[2]);
+                    stand.setLeftLegPose(pose);
+                }
+                if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0
+                    || this.stand.rightLeg[2] != 0) {
+                    EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1],
+                        this.stand.rightLeg[2]);
+                    stand.setRightLegPose(pose);
+                }
+                if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0
+                    || this.stand.leftArm[2] != 0) {
+                    EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1],
+                        this.stand.leftArm[2]);
+                    stand.setLeftArmPose(pose);
+                }
+                if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0
+                    || this.stand.rightArm[2] != 0) {
+                    EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1],
+                        this.stand.rightArm[2]);
+                    stand.setRightArmPose(pose);
+                }
+                if (this.stand.invisible) {
+                    stand.setVisible(false);
+                }
+                if (this.stand.arms) {
+                    stand.setArms(true);
+                }
+                if (this.stand.noPlate) {
+                    stand.setBasePlate(false);
+                }
+                if (this.stand.small) {
+                    stand.setSmall(true);
+                }
+                restoreLiving(stand);
+                return stand;
+            case BAT:
+                if (this.dataByte != 0) {
+                    ((Bat) entity).setAwake(true);
+                }
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            case ENDER_DRAGON:
+                if (this.dataByte != 0) {
+                    ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
+                }
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            case ENDERMITE:
+            case GHAST:
+            case MAGMA_CUBE:
+            case SQUID:
+            case PIG_ZOMBIE:
+            case ZOMBIE:
+            case WITHER:
+            case WITCH:
+            case SPIDER:
+            case CAVE_SPIDER:
+            case SILVERFISH:
+            case GIANT:
+            case ENDERMAN:
+            case CREEPER:
+            case BLAZE:
+            case SNOWMAN:
+            case SHULKER:
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            case IRON_GOLEM:
+                if (this.dataByte != 0) {
+                    ((IronGolem) entity).setPlayerCreated(true);
+                }
+                restoreLiving((LivingEntity) entity);
+                return entity;
+            default:
+                PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
+                return entity;
+            // END LIVING
         }
-        //todo broken in 1.13 possible exception thrown
-        horse.setVariant(this.horse.variant);
-        horse.setStyle(this.horse.style);
-        horse.setColor(this.horse.color);
-        restoreTameable(horse);
-        restoreAgeable(horse);
-        restoreLiving(horse);
-        restoreInventory(horse);
-        return entity;
-      // END INVENTORY HOLDER //
-      case WOLF:
-      case OCELOT:
-        restoreTameable((Tameable) entity);
-        restoreAgeable((Ageable) entity);
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      // END AGEABLE //
-      case SHEEP:
-        Sheep sheep = (Sheep) entity;
-        if (this.dataByte == 1) {
-          sheep.setSheared(true);
-        }
-        if (this.dataByte2 != 0) {
-          sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
-        }
-        restoreAgeable(sheep);
-        restoreLiving(sheep);
-        return sheep;
-      case VILLAGER:
-      case CHICKEN:
-      case COW:
-      case POLAR_BEAR:
-      case MUSHROOM_COW:
-      case PIG:
-        restoreAgeable((Ageable) entity);
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      // END AGEABLE //
-      case RABBIT:
-        if (this.dataByte != 0) {
-          ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
-        }
-        restoreAgeable((Ageable) entity);
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      case GUARDIAN:
-        if (this.dataByte != 0) {
-          //todo broken in 1.13 possible exception thrown
+    }
 
-          ((Guardian) entity).setElder(true);
-        }
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      case SKELETON:
-        if (this.dataByte != 0) {
-          //todo broken in 1.13 possible exception thrown
-          ((Skeleton) entity)
-              .setSkeletonType(Skeleton.SkeletonType.values()[this.dataByte]);
-        }
-        storeLiving((LivingEntity) entity);
-        return entity;
-      case ARMOR_STAND:
-        // CHECK positions
-        ArmorStand stand = (ArmorStand) entity;
-        if (this.inventory[0] != null) {
-          stand.setItemInHand(this.inventory[0]);
-        }
-        if (this.inventory[1] != null) {
-          stand.setHelmet(this.inventory[1]);
-        }
-        if (this.inventory[2] != null) {
-          stand.setChestplate(this.inventory[2]);
-        }
-        if (this.inventory[3] != null) {
-          stand.setLeggings(this.inventory[3]);
-        }
-        if (this.inventory[4] != null) {
-          stand.setBoots(this.inventory[4]);
-        }
-        if (this.stand.head[0] != 0 || this.stand.head[1] != 0 || this.stand.head[2] != 0) {
-          EulerAngle pose =
-              new EulerAngle(this.stand.head[0], this.stand.head[1], this.stand.head[2]);
-          stand.setHeadPose(pose);
-        }
-        if (this.stand.body[0] != 0 || this.stand.body[1] != 0 || this.stand.body[2] != 0) {
-          EulerAngle pose =
-              new EulerAngle(this.stand.body[0], this.stand.body[1], this.stand.body[2]);
-          stand.setBodyPose(pose);
-        }
-        if (this.stand.leftLeg[0] != 0 || this.stand.leftLeg[1] != 0
-            || this.stand.leftLeg[2] != 0) {
-          EulerAngle pose = new EulerAngle(this.stand.leftLeg[0], this.stand.leftLeg[1],
-              this.stand.leftLeg[2]);
-          stand.setLeftLegPose(pose);
-        }
-        if (this.stand.rightLeg[0] != 0 || this.stand.rightLeg[1] != 0
-            || this.stand.rightLeg[2] != 0) {
-          EulerAngle pose = new EulerAngle(this.stand.rightLeg[0], this.stand.rightLeg[1],
-              this.stand.rightLeg[2]);
-          stand.setRightLegPose(pose);
-        }
-        if (this.stand.leftArm[0] != 0 || this.stand.leftArm[1] != 0
-            || this.stand.leftArm[2] != 0) {
-          EulerAngle pose = new EulerAngle(this.stand.leftArm[0], this.stand.leftArm[1],
-              this.stand.leftArm[2]);
-          stand.setLeftArmPose(pose);
-        }
-        if (this.stand.rightArm[0] != 0 || this.stand.rightArm[1] != 0
-            || this.stand.rightArm[2] != 0) {
-          EulerAngle pose = new EulerAngle(this.stand.rightArm[0], this.stand.rightArm[1],
-              this.stand.rightArm[2]);
-          stand.setRightArmPose(pose);
-        }
-        if (this.stand.invisible) {
-          stand.setVisible(false);
-        }
-        if (this.stand.arms) {
-          stand.setArms(true);
-        }
-        if (this.stand.noPlate) {
-          stand.setBasePlate(false);
-        }
-        if (this.stand.small) {
-          stand.setSmall(true);
-        }
-        restoreLiving(stand);
-        return stand;
-      case BAT:
-        if (this.dataByte != 0) {
-          ((Bat) entity).setAwake(true);
-        }
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      case ENDER_DRAGON:
-        if (this.dataByte != 0) {
-          ((EnderDragon) entity).setPhase(EnderDragon.Phase.values()[this.dataByte]);
-        }
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      case ENDERMITE:
-      case GHAST:
-      case MAGMA_CUBE:
-      case SQUID:
-      case PIG_ZOMBIE:
-      case ZOMBIE:
-      case WITHER:
-      case WITCH:
-      case SPIDER:
-      case CAVE_SPIDER:
-      case SILVERFISH:
-      case GIANT:
-      case ENDERMAN:
-      case CREEPER:
-      case BLAZE:
-      case SNOWMAN:
-      case SHULKER:
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      case IRON_GOLEM:
-        if (this.dataByte != 0) {
-          ((IronGolem) entity).setPlayerCreated(true);
-        }
-        restoreLiving((LivingEntity) entity);
-        return entity;
-      default:
-        PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
-        return entity;
-      // END LIVING
+    public void saveEntity() {
     }
-  }
 
-  public void saveEntity() {
-  }
-
-  private byte getOrdinal(Object[] list, Object value) {
-    for (byte i = 0; i < list.length; i++) {
-      if (list[i].equals(value)) {
-        return i;
-      }
+    private byte getOrdinal(Object[] list, Object value) {
+        for (byte i = 0; i < list.length; i++) {
+            if (list[i].equals(value)) {
+                return i;
+            }
+        }
+        return 0;
     }
-    return 0;
-  }
 
 
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
index d1eaa9081..4815c2e01 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
@@ -14,13 +14,13 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.Damageable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import org.bukkit.inventory.meta.Damageable;
 
 public class StateWrapper {
 
@@ -242,7 +242,7 @@ public class StateWrapper {
     public Map<String, Tag> serializeItem(ItemStack item) {
         Map<String, Tag> data = new HashMap<>();
         data.put("id", new StringTag(item.getType().name()));
-        data.put("Damage", new ShortTag((short) ((Damageable)item.getItemMeta()).getDamage()));
+        data.put("Damage", new ShortTag((short) ((Damageable) item.getItemMeta()).getDamage()));
         data.put("Count", new ByteTag((byte) item.getAmount()));
         if (!item.getEnchantments().isEmpty()) {
             List<CompoundTag> enchantmentList = new ArrayList<>();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
index 34e392a27..5a4cf885a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
@@ -61,11 +61,13 @@ public final class BukkitEventUtil extends EventUtil {
     }
 
     @Override public boolean callMerge(Plot plot, int dir, int max) {
-        return callEvent(new PlotMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, dir, max));
+        return callEvent(
+            new PlotMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, dir, max));
     }
 
     @Override public boolean callAutoMerge(Plot plot, List<PlotId> plots) {
-        return callEvent(new PlotAutoMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, plots));
+        return callEvent(
+            new PlotAutoMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, plots));
     }
 
     @Override public boolean callUnlink(PlotArea area, List<PlotId> plots) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index 452d04c35..395523f35 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -110,7 +110,7 @@ public class BukkitHybridUtils extends HybridUtils {
                     rz[i] = v;
                 }
                 int minY;
-                if ( Settings.Schematics.PASTE_ON_TOP) {
+                if (Settings.Schematics.PASTE_ON_TOP) {
                     minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
                 } else {
                     minY = 1;
@@ -162,9 +162,7 @@ public class BukkitHybridUtils extends HybridUtils {
                                 continue;
                             }
                             int y = MainUtil.y_loc[i][j];
-                            oldBlocks[y][x][z] = result[i][j] != null ?
-                                result[i][j] :
-                                airBucket;
+                            oldBlocks[y][x][z] = result[i][j] != null ? result[i][j] : airBucket;
                         }
                     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index e9ec7742f..bc5265114 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -1,6 +1,5 @@
 package com.github.intellectualsites.plotsquared.bukkit.util;
 
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.LegacyPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
index 41e515cc7..6be193778 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
@@ -1,7 +1,5 @@
 package com.github.intellectualsites.plotsquared.bukkit.util;
 
-import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
-
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
@@ -14,15 +12,18 @@ import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefFie
 import com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.RefMethod;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map.Entry;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
+
+import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
 
 /**
  * An utility that can be used to send chunks, rather than using bukkit code to do so (uses heavy
@@ -30,33 +31,33 @@ import org.bukkit.entity.Player;
  */
 public class SendChunk {
 
-  private final RefMethod methodGetHandlePlayer;
-  private final RefMethod methodGetHandleChunk;
-  private final RefConstructor mapChunk;
-  private final RefField connection;
-  private final RefMethod send;
-  private final RefMethod methodInitLighting;
+    private final RefMethod methodGetHandlePlayer;
+    private final RefMethod methodGetHandleChunk;
+    private final RefConstructor mapChunk;
+    private final RefField connection;
+    private final RefMethod send;
+    private final RefMethod methodInitLighting;
 
-  /**
-   * Constructor.
-   */
-  public SendChunk() throws ClassNotFoundException, NoSuchMethodException, NoSuchFieldException {
-    RefConstructor tempMapChunk;
-    RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
-    this.methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
-    RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-    this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
-    RefClass classChunk = getRefClass("{nms}.Chunk");
-    this.methodInitLighting = classChunk.getMethod("initLighting");
-    RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
-    tempMapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), int.class);
-    this.mapChunk = tempMapChunk;
-    RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
-    this.connection = classEntityPlayer.getField("playerConnection");
-    RefClass classPacket = getRefClass("{nms}.Packet");
-    RefClass classConnection = getRefClass("{nms}.PlayerConnection");
-    this.send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
-  }
+    /**
+     * Constructor.
+     */
+    public SendChunk() throws ClassNotFoundException, NoSuchMethodException, NoSuchFieldException {
+        RefConstructor tempMapChunk;
+        RefClass classCraftPlayer = getRefClass("{cb}.entity.CraftPlayer");
+        this.methodGetHandlePlayer = classCraftPlayer.getMethod("getHandle");
+        RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
+        this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
+        RefClass classChunk = getRefClass("{nms}.Chunk");
+        this.methodInitLighting = classChunk.getMethod("initLighting");
+        RefClass classMapChunk = getRefClass("{nms}.PacketPlayOutMapChunk");
+        tempMapChunk = classMapChunk.getConstructor(classChunk.getRealClass(), int.class);
+        this.mapChunk = tempMapChunk;
+        RefClass classEntityPlayer = getRefClass("{nms}.EntityPlayer");
+        this.connection = classEntityPlayer.getField("playerConnection");
+        RefClass classPacket = getRefClass("{nms}.Packet");
+        RefClass classConnection = getRefClass("{nms}.PlayerConnection");
+        this.send = classConnection.getMethod("sendPacket", classPacket.getRealClass());
+    }
 
     public void sendChunk(Collection<Chunk> input) {
         HashSet<Chunk> chunks = new HashSet<>(input);
@@ -96,52 +97,51 @@ public class SendChunk {
             Player player = ((BukkitPlayer) pp).player;
             Object entity = this.methodGetHandlePlayer.of(player).call();
 
-      for (Chunk chunk : list) {
-        int dx = Math.abs(cx - chunk.getX());
-        int dz = Math.abs(cz - chunk.getZ());
-        if ((dx > view) || (dz > view)) {
-          continue;
+            for (Chunk chunk : list) {
+                int dx = Math.abs(cx - chunk.getX());
+                int dz = Math.abs(cz - chunk.getZ());
+                if ((dx > view) || (dz > view)) {
+                    continue;
+                }
+                Object c = this.methodGetHandleChunk.of(chunk).call();
+                chunks.remove(chunk);
+                Object con = this.connection.of(entity).get();
+                Object packet = null;
+                try {
+                    packet = this.mapChunk.create(c, 65535);
+                } catch (Exception ignored) {
+                }
+                if (packet == null) {
+                    PlotSquared.debug("Error with PacketPlayOutMapChunk reflection.");
+                }
+                this.send.of(con).call(packet);
+            }
         }
-        Object c = this.methodGetHandleChunk.of(chunk).call();
-        chunks.remove(chunk);
-        Object con = this.connection.of(entity).get();
-        Object packet = null;
-        try {
-          packet = this.mapChunk.create(c, 65535);
-        } catch (Exception ignored) {
+        for (final Chunk chunk : chunks) {
+            TaskManager.runTask(() -> {
+                try {
+                    chunk.unload(true, false);
+                } catch (Throwable ignored) {
+                    String worldName = chunk.getWorld().getName();
+                    PlotSquared.debug(
+                        "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";" + chunk
+                            .getZ());
+                    PlotSquared.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
+                    PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
+                        + "/level_old.dat may be corrupt (try repairing or removing these)");
+                }
+            });
         }
-        if (packet == null) {
-          PlotSquared.debug("Error with PacketPlayOutMapChunk reflection.");
-        }
-        this.send.of(con).call(packet);
-      }
     }
-    for (final Chunk chunk : chunks) {
-      TaskManager.runTask(() -> {
-        try {
-          chunk.unload(true, false);
-        } catch (Throwable ignored) {
-          String worldName = chunk.getWorld().getName();
-          PlotSquared.debug(
-              "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";"
-                  + chunk.getZ());
-          PlotSquared
-              .debug("$3 - $4File may be open in another process (e.g. MCEdit)");
-          PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
-              + "/level_old.dat may be corrupt (try repairing or removing these)");
-        }
-      });
-    }
-  }
 
-  public void sendChunk(String worldName, Collection<ChunkLoc> chunkLocations) {
-    World myWorld = Bukkit.getWorld(worldName);
-    ArrayList<Chunk> chunks = new ArrayList<>();
-    for (ChunkLoc loc : chunkLocations) {
-      if (myWorld.isChunkLoaded(loc.x, loc.z)) {
-        chunks.add(myWorld.getChunkAt(loc.x, loc.z));
-      }
+    public void sendChunk(String worldName, Collection<ChunkLoc> chunkLocations) {
+        World myWorld = Bukkit.getWorld(worldName);
+        ArrayList<Chunk> chunks = new ArrayList<>();
+        for (ChunkLoc loc : chunkLocations) {
+            if (myWorld.isChunkLoaded(loc.x, loc.z)) {
+                chunks.add(myWorld.getChunkAt(loc.x, loc.z));
+            }
+        }
+        sendChunk(chunks);
     }
-    sendChunk(chunks);
-  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index aaa94dbeb..40305cca5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -5,10 +5,10 @@ import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
-import java.util.Arrays;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
+import java.util.Arrays;
 import java.util.UUID;
 
 public class DefaultUUIDWrapper implements UUIDWrapper {
@@ -31,8 +31,7 @@ public class DefaultUUIDWrapper implements UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        return Arrays.stream(ops).map(BukkitOfflinePlayer::new)
-            .toArray(BukkitOfflinePlayer[]::new);
+        return Arrays.stream(ops).map(BukkitOfflinePlayer::new).toArray(BukkitOfflinePlayer[]::new);
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index a8e2278b4..42a83f466 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -80,13 +80,11 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                     e.printStackTrace();
                 }
             }
-            HashBiMap<StringWrapper, UUID> toAdd =
-                HashBiMap.create(new HashMap<>());
+            HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<>());
             if (Settings.UUID.NATIVE_UUID_PROVIDER) {
                 HashSet<UUID> all = UUIDHandler.getAllUUIDS();
                 PlotSquared.debug("&aFast mode UUID caching enabled!");
-                File playerDataFolder =
-                    new File(container, world + File.separator + "playerdata");
+                File playerDataFolder = new File(container, world + File.separator + "playerdata");
                 String[] dat = playerDataFolder.list(new DatFileFilter());
                 boolean check = all.isEmpty();
                 if (dat != null) {
@@ -128,8 +126,8 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                     }
                     return;
                 } else {
-                    PlotSquared.debug("Failed to cache: " + all.size()
-                        + " uuids - slowly processing all files");
+                    PlotSquared.debug(
+                        "Failed to cache: " + all.size() + " uuids - slowly processing all files");
                 }
             }
             HashSet<String> worlds1 = Sets.newHashSet(world, "world");
@@ -138,8 +136,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             File playerDataFolder = null;
             for (String worldName : worlds1) {
                 // Getting UUIDs
-                playerDataFolder =
-                    new File(container, worldName + File.separator + "playerdata");
+                playerDataFolder = new File(container, worldName + File.separator + "playerdata");
                 String[] dat = playerDataFolder.list(new DatFileFilter());
                 if ((dat != null) && (dat.length != 0)) {
                     for (String current : dat) {
@@ -213,8 +210,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             }
 
             if (getUUIDMap().isEmpty()) {
-                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
-                    .getOfflinePlayers()) {
+                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper.getOfflinePlayers()) {
                     long last = op.getLastPlayed();
                     if (last != 0) {
                         String name = op.getName();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index c06c7a3cc..0f3b4d5ea 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -9,7 +9,6 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
-import java.util.Arrays;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
@@ -17,6 +16,7 @@ import org.bukkit.entity.Player;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.UUID;
 
@@ -93,8 +93,7 @@ public class OfflineUUIDWrapper implements UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        return Arrays.stream(ops).map(BukkitOfflinePlayer::new)
-            .toArray(BukkitOfflinePlayer[]::new);
+        return Arrays.stream(ops).map(BukkitOfflinePlayer::new).toArray(BukkitOfflinePlayer[]::new);
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 04f0b146c..234059e02 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -73,14 +73,12 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         }
         TaskManager.runTaskAsync(() -> {
             try {
-                HashBiMap<StringWrapper, UUID> toAdd =
-                    HashBiMap.create(new HashMap<>());
+                HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<>());
                 try (PreparedStatement statement = getConnection()
                     .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
                     ResultSet resultSet = statement.executeQuery()) {
                     while (resultSet.next()) {
-                        StringWrapper username =
-                            new StringWrapper(resultSet.getString("username"));
+                        StringWrapper username = new StringWrapper(resultSet.getString("username"));
                         UUID uuid = UUID.fromString(resultSet.getString("uuid"));
                         toAdd.put(new StringWrapper(username.value), uuid);
                     }
@@ -99,8 +97,7 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                     }
                     return;
                 }
-                FileUUIDHandler fileHandler =
-                    new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
+                FileUUIDHandler fileHandler = new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
                 fileHandler.startCaching(() -> {
                     // If the file based UUID handler didn't cache it, then we can't cache offline mode
                     // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
@@ -114,18 +111,13 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                     TaskManager.runTaskAsync(() -> {
                         while (!toFetch.isEmpty()) {
                             try {
-                                for (int i = 0;
-                                    i < Math.min(500, toFetch.size()); i++) {
+                                for (int i = 0; i < Math.min(500, toFetch.size()); i++) {
                                     UUID uuid = toFetch.pop();
-                                    HttpURLConnection connection =
-                                        (HttpURLConnection) new URL(
-                                            SQLUUIDHandler.this.PROFILE_URL + uuid
-                                                .toString().replace("-", ""))
-                                            .openConnection();
-                                    try (InputStream con = connection
-                                        .getInputStream()) {
-                                        InputStreamReader reader =
-                                            new InputStreamReader(con);
+                                    HttpURLConnection connection = (HttpURLConnection) new URL(
+                                        SQLUUIDHandler.this.PROFILE_URL + uuid.toString()
+                                            .replace("-", "")).openConnection();
+                                    try (InputStream con = connection.getInputStream()) {
+                                        InputStreamReader reader = new InputStreamReader(con);
                                         JSONObject response =
                                             (JSONObject) SQLUUIDHandler.this.jsonParser
                                                 .parse(reader);
@@ -208,13 +200,12 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         // Ignoring duplicates
         if (super.add(name, uuid)) {
             TaskManager.runTaskAsync(() -> {
-                try (PreparedStatement statement = getConnection().prepareStatement(
-                    "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
+                try (PreparedStatement statement = getConnection()
+                    .prepareStatement("REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
                     statement.setString(1, uuid.toString());
                     statement.setString(2, name.toString());
                     statement.execute();
-                    PlotSquared
-                        .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
+                    PlotSquared.debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
@@ -235,8 +226,8 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                 statement.setString(1, name.value);
                 statement.setString(2, uuid.toString());
                 statement.execute();
-                PlotSquared.debug(
-                    C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
+                PlotSquared
+                    .debug(C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
             } catch (SQLException e) {
                 e.printStackTrace();
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
deleted file mode 100644
index dd5221a3a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.github.intellectualsites.plotsquared.commands;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-
-public abstract class Argument<T> {
-
-    public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
-        @Override public Integer parse(String in) {
-            Integer value = null;
-            try {
-                value = java.lang.Integer.parseInt(in);
-            } catch (Exception ignored) {
-            }
-            return value;
-        }
-    };
-    public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
-        @Override public Boolean parse(String in) {
-            Boolean value = null;
-            if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in
-                .equalsIgnoreCase("1")) {
-                value = true;
-            } else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in
-                .equalsIgnoreCase("0")) {
-                value = false;
-            }
-            return value;
-        }
-    };
-    public static final Argument<String> String = new Argument<String>("String", "Example") {
-        @Override public String parse(String in) {
-            return in;
-        }
-    };
-    public static final Argument<String> PlayerName =
-        new Argument<String>("PlayerName", "Dinnerbone") {
-            @Override public String parse(String in) {
-                return in.length() <= 16 ? in : null;
-            }
-        };
-    public static final Argument<PlotId> PlotID =
-        new Argument<PlotId>("PlotID", new PlotId(-6, 3)) {
-            @Override public PlotId parse(String in) {
-                return PlotId.fromString(in);
-            }
-        };
-    private final String name;
-    private final T example;
-
-    public Argument(String name, T example) {
-        this.name = name;
-        this.example = example;
-    }
-
-    public abstract T parse(String in);
-
-    @Override public final String toString() {
-        return this.getName();
-    }
-
-    public final String getName() {
-        return this.name;
-    }
-
-    public final T getExample() {
-        return this.example;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
deleted file mode 100644
index 6bac09a26..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
+++ /dev/null
@@ -1,596 +0,0 @@
-package com.github.intellectualsites.plotsquared.commands;
-
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
-import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
-import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-
-public abstract class Command {
-
-    // May be none
-    private final ArrayList<Command> allCommands = new ArrayList<>();
-    private final ArrayList<Command> dynamicCommands = new ArrayList<>();
-    private final HashMap<String, Command> staticCommands = new HashMap<>();
-
-    // Parent command (may be null)
-    private final Command parent;
-    private final boolean isStatic;
-    // The command ID
-    private String id;
-    private List<String> aliases;
-    private RequiredType required;
-    private String usage;
-    private String description;
-    private String perm;
-    private boolean confirmation;
-    private CommandCategory category;
-    private Argument[] arguments;
-
-    public Command(Command parent, boolean isStatic, String id, String perm, RequiredType required,
-        CommandCategory cat) {
-        this.parent = parent;
-        this.isStatic = isStatic;
-        this.id = id;
-        this.perm = perm;
-        this.required = required;
-        this.category = cat;
-        this.aliases = Arrays.asList(id);
-        if (this.parent != null) {
-            this.parent.register(this);
-        }
-    }
-
-    public Command(Command parent, boolean isStatic) {
-        this.parent = parent;
-        this.isStatic = isStatic;
-        Annotation cdAnnotation = getClass().getAnnotation(CommandDeclaration.class);
-        if (cdAnnotation != null) {
-            CommandDeclaration declaration = (CommandDeclaration) cdAnnotation;
-            init(declaration);
-        }
-        for (final Method method : getClass().getDeclaredMethods()) {
-            if (method.isAnnotationPresent(CommandDeclaration.class)) {
-                Class<?>[] types = method.getParameterTypes();
-                // final PlotPlayer player, String[] args, RunnableVal3<Command,Runnable,Runnable> confirm, RunnableVal2<Command, CommandResult>
-                // whenDone
-                if (types.length == 5 && types[0] == Command.class && types[1] == PlotPlayer.class
-                    && types[2] == String[].class && types[3] == RunnableVal3.class
-                    && types[4] == RunnableVal2.class) {
-                    Command tmp = new Command(this, true) {
-                        @Override public void execute(PlotPlayer player, String[] args,
-                            RunnableVal3<Command, Runnable, Runnable> confirm,
-                            RunnableVal2<Command, CommandResult> whenDone) {
-                            try {
-                                method.invoke(Command.this, this, player, args, confirm, whenDone);
-                            } catch (IllegalAccessException | InvocationTargetException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    };
-                    tmp.init(method.getAnnotation(CommandDeclaration.class));
-                }
-            }
-        }
-    }
-
-    public Command getParent() {
-        return this.parent;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public String getFullId() {
-        if (this.parent != null && this.parent.getParent() != null) {
-            return this.parent.getFullId() + "." + this.id;
-        }
-        return this.id;
-    }
-
-    public List<Command> getCommands(PlotPlayer player) {
-        List<Command> commands = new ArrayList<>();
-        for (Command cmd : this.allCommands) {
-            if (cmd.canExecute(player, false)) {
-                commands.add(cmd);
-            }
-        }
-        return commands;
-    }
-
-    public List<Command> getCommands(CommandCategory cat, PlotPlayer player) {
-        List<Command> commands = getCommands(player);
-        if (cat != null) {
-            Iterator<Command> iterator = commands.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().category != cat) {
-                    iterator.remove();
-                }
-            }
-        }
-        return commands;
-    }
-
-    public List<Command> getCommands() {
-        return this.allCommands;
-    }
-
-    public boolean hasConfirmation(PlotPlayer player) {
-        return this.confirmation && !player.hasPermission(getPermission() + ".confirm.bypass");
-    }
-
-    public List<String> getAliases() {
-        return this.aliases;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-
-    public RequiredType getRequiredType() {
-        return this.required;
-    }
-
-    public Argument[] getRequiredArguments() {
-        return this.arguments;
-    }
-
-    public void setRequiredArguments(Argument[] arguments) {
-        this.arguments = arguments;
-    }
-
-    public void init(CommandDeclaration declaration) {
-        this.id = declaration.command();
-        this.perm = declaration.permission();
-        this.required = declaration.requiredType();
-        this.category = declaration.category();
-        HashMap<String, Object> options = new HashMap<>();
-        List<String> aliasOptions = new ArrayList<>();
-        aliasOptions.add(this.id);
-        aliasOptions.addAll(Arrays.asList(declaration.aliases()));
-        options.put("aliases", aliasOptions);
-        options.put("description", declaration.description());
-        options.put("usage", declaration.usage());
-        options.put("confirmation", declaration.confirmation());
-        boolean set = false;
-        YamlConfiguration commands =
-            PlotSquared.get() == null ? new YamlConfiguration() : PlotSquared.get().commands;
-        for (Map.Entry<String, Object> entry : options.entrySet()) {
-            String key = this.getFullId() + "." + entry.getKey();
-            if (!commands.contains(key)) {
-                commands.set(key, entry.getValue());
-                set = true;
-            }
-        }
-        if (set && PlotSquared.get() != null) {
-            try {
-                commands.save(PlotSquared.get().commandsFile);
-            } catch (IOException e) {
-                e.printStackTrace();
-
-            }
-        }
-        this.aliases = commands.getStringList(this.getFullId() + ".aliases");
-        this.description = commands.getString(this.getFullId() + ".description");
-        this.usage = commands.getString(this.getFullId() + ".usage");
-        this.confirmation = commands.getBoolean(this.getFullId() + ".confirmation");
-        if (this.parent != null) {
-            this.parent.register(this);
-        }
-    }
-
-    public void register(Command command) {
-        if (command.isStatic) {
-            for (String alias : command.aliases) {
-                this.staticCommands.put(alias.toLowerCase(), command);
-            }
-        } else {
-            this.dynamicCommands.add(command);
-        }
-        this.allCommands.add(command);
-    }
-
-    public String getPermission() {
-        if (this.perm != null && !this.perm.isEmpty()) {
-            return this.perm;
-        }
-        if (this.parent == null) {
-            return "plots.use";
-        }
-        return "plots." + getFullId();
-    }
-
-    public <T> void paginate(PlotPlayer player, List<T> c, int size, int page,
-        RunnableVal3<Integer, T, PlotMessage> add, String baseCommand, String header) {
-        // Calculate pages & index
-        if (page < 0) {
-            page = 0;
-        }
-        int totalPages = (int) Math.ceil(c.size() / size);
-        if (page > totalPages) {
-            page = totalPages;
-        }
-        int max = page * size + size;
-        if (max > c.size()) {
-            max = c.size();
-        }
-        // Send the header
-        header = header.replaceAll("%cur", page + 1 + "").replaceAll("%max", totalPages + 1 + "")
-            .replaceAll("%amount%", c.size() + "").replaceAll("%word%", "all");
-        MainUtil.sendMessage(player, header);
-        // Send the page content
-        List<T> subList = c.subList(page * size, max);
-        int i = page * size;
-        for (T obj : subList) {
-            i++;
-            PlotMessage msg = new PlotMessage();
-            add.run(i, obj, msg);
-            msg.send(player);
-        }
-        // Send the footer
-        if (page < totalPages && page > 0) { // Back | Next
-            new PlotMessage().text("<-").color("$1").command(baseCommand + " " + page).text(" | ")
-                .color("$3").text("->").color("$1").command(baseCommand + " " + (page + 2))
-                .text(C.CLICKABLE.s()).color("$2").send(player);
-            return;
-        }
-        if (page == 0 && totalPages != 0) { // Next
-            new PlotMessage().text("<-").color("$3").text(" | ").color("$3").text("->").color("$1")
-                .command(baseCommand + " " + (0 + 2)).text(C.CLICKABLE.s()).color("$2")
-                .send(player);
-            return;
-        }
-        if (page == totalPages && totalPages != 0) { // Back
-            new PlotMessage().text("<-").color("$1").command(baseCommand + " " + page).text(" | ")
-                .color("$3").text("->").color("$3").text(C.CLICKABLE.s()).color("$2").send(player);
-        }
-    }
-
-    /**
-     * @param player  Caller
-     * @param args    Arguments
-     * @param confirm Instance, Success, Failure
-     * @return
-     */
-    public void execute(PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        if (args.length == 0 || args[0] == null) {
-            if (this.parent == null) {
-                MainCommand.getInstance().help.displayHelp(player, null, 0);
-            } else {
-                C.COMMAND_SYNTAX.send(player, getUsage());
-            }
-            return;
-        }
-        if (this.allCommands == null || this.allCommands.isEmpty()) {
-            player.sendMessage(
-                "Not Implemented: https://github.com/IntellectualSites/PlotSquared/issues/new");
-            return;
-        }
-        Command cmd = getCommand(args[0]);
-        if (cmd == null) {
-            if (this.parent != null) {
-                C.COMMAND_SYNTAX.send(player, getUsage());
-                return;
-            }
-            // Help command
-            try {
-                if (args.length == 0 || MathMan.isInteger(args[0])
-                    || CommandCategory.valueOf(args[0].toUpperCase()) != null) {
-                    // This will default certain syntax to the help command
-                    // e.g. /plot, /plot 1, /plot claiming
-                    MainCommand.getInstance().help.execute(player, args, null, null);
-                    return;
-                }
-            } catch (IllegalArgumentException ignored) {
-            }
-            // Command recommendation
-            MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
-            List<Command> commands = getCommands(player);
-            if (commands.isEmpty()) {
-                MainUtil
-                    .sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
-                return;
-            }
-            HashSet<String> setargs = new HashSet<>(args.length);
-            for (String arg : args) {
-                setargs.add(arg.toLowerCase());
-            }
-            String[] allargs = setargs.toArray(new String[setargs.size()]);
-            int best = 0;
-            for (Command current : commands) {
-                int match = getMatch(allargs, current);
-                if (match > best) {
-                    cmd = current;
-                }
-            }
-            if (cmd == null) {
-                cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
-            }
-            MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
-            return;
-        }
-        String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
-        if (!cmd.checkArgs(player, newArgs) || !cmd.canExecute(player, true)) {
-            return;
-        }
-        try {
-            cmd.execute(player, newArgs, confirm, whenDone);
-        } catch (CommandException e) {
-            e.perform(player);
-        }
-    }
-
-    public boolean checkArgs(PlotPlayer player, String[] args) {
-        Argument<?>[] reqArgs = getRequiredArguments();
-        if (reqArgs != null && reqArgs.length > 0) {
-            boolean failed = args.length < reqArgs.length;
-            String[] baseSplit = getCommandString().split(" ");
-            String[] fullSplit = getUsage().split(" ");
-            String base = getCommandString();
-            if (fullSplit.length - baseSplit.length < reqArgs.length) {
-                String[] tmp = new String[baseSplit.length + reqArgs.length];
-                System.arraycopy(fullSplit, 0, tmp, 0, fullSplit.length);
-                fullSplit = tmp;
-            }
-            for (int i = 0; i < reqArgs.length; i++) {
-                fullSplit[i + baseSplit.length] = reqArgs[i].getExample().toString();
-                failed = failed || reqArgs[i].parse(args[i]) == null;
-            }
-            if (failed) {
-                C.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public int getMatch(String[] args, Command cmd) {
-        int count = 0;
-        String perm = cmd.getPermission();
-        HashSet<String> desc = new HashSet<>();
-        for (String alias : cmd.getAliases()) {
-            if (alias.startsWith(args[0])) {
-                count += 5;
-            }
-        }
-        Collections.addAll(desc, cmd.getDescription().split(" "));
-        for (String arg : args) {
-            if (perm.startsWith(arg)) {
-                count++;
-            }
-            if (desc.contains(arg)) {
-                count++;
-            }
-        }
-        String[] usage = cmd.getUsage().split(" ");
-        for (int i = 0; i < Math.min(4, usage.length); i++) {
-            int require;
-            if (usage[i].startsWith("<")) {
-                require = 1;
-            } else {
-                require = 0;
-            }
-            String[] split = usage[i].split("\\|| |\\>|\\<|\\[|\\]|\\{|\\}|\\_|\\/");
-            for (String aSplit : split) {
-                for (String arg : args) {
-                    if (StringMan.isEqualIgnoreCase(arg, aSplit)) {
-                        count += 5 - i + require;
-                    }
-                }
-            }
-        }
-        count += StringMan.intersection(desc, args);
-        return count;
-    }
-
-    public Command getCommand(String arg) {
-        Command cmd = this.staticCommands.get(arg.toLowerCase());
-        if (cmd == null) {
-            for (Command command : this.dynamicCommands) {
-                if (command.matches(arg)) {
-                    return command;
-                }
-            }
-        }
-        return cmd;
-    }
-
-    public Command getCommand(Class clazz) {
-        for (Command cmd : this.allCommands) {
-            if (cmd.getClass() == clazz) {
-                return cmd;
-            }
-        }
-        return null;
-    }
-
-    public Command getCommandById(String id) {
-        Command exact = this.staticCommands.get(id);
-        if (exact != null) {
-            return exact;
-        }
-        for (Command cmd : this.allCommands) {
-            if (cmd.getId().equals(id)) {
-                return cmd;
-            }
-        }
-        return null;
-    }
-
-    public boolean canExecute(PlotPlayer player, boolean message) {
-        if (player == null) {
-            return true;
-        }
-        if (!this.required.allows(player)) {
-            if (message) {
-                MainUtil.sendMessage(player,
-                    this.required == RequiredType.PLAYER ? C.IS_CONSOLE : C.NOT_CONSOLE);
-            }
-        } else if (!Permissions.hasPermission(player, getPermission())) {
-            if (message) {
-                C.NO_PERMISSION.send(player, getPermission());
-            }
-        } else {
-            return true;
-        }
-        return false;
-    }
-
-    public boolean matches(String arg) {
-        arg = arg.toLowerCase();
-        return StringMan.isEqual(arg, this.id) || this.aliases.contains(arg);
-    }
-
-    public String getCommandString() {
-        String base;
-        if (this.parent == null) {
-            return "/" + toString();
-        } else {
-            return this.parent.getCommandString() + " " + toString();
-        }
-    }
-
-    public String getUsage() {
-        if (this.usage != null && !this.usage.isEmpty()) {
-            if (this.usage.startsWith("/")) {
-                return this.usage;
-            }
-            return getCommandString() + " " + this.usage;
-        }
-        if (this.allCommands.isEmpty()) {
-            return getCommandString();
-        }
-        StringBuilder args = new StringBuilder("[");
-        String prefix = "";
-        for (Command cmd : this.allCommands) {
-            args.append(prefix).append(cmd.isStatic ? cmd.toString() : "<" + cmd + ">");
-            prefix = "|";
-        }
-        return getCommandString() + " " + args + "]";
-    }
-
-    public Collection<Command> tabOf(PlotPlayer player, String[] input, boolean space,
-        String... args) {
-        if (!space) {
-            return null;
-        }
-        List<Command> result = new ArrayList<>();
-        int index = input.length - (space ? 0 : 1);
-        for (String arg : args) {
-            arg = arg.replace(getCommandString() + " ", "");
-            String[] split = arg.split(" ");
-            if (split.length <= index) {
-                continue;
-            }
-            arg = StringMan.join(Arrays.copyOfRange(split, index, split.length), " ");
-            Command cmd = new Command(null, false, arg, getPermission(), getRequiredType(), null) {
-            };
-            result.add(cmd);
-        }
-        return result;
-    }
-
-    public Collection<Command> tab(PlotPlayer player, String[] args, boolean space) {
-        switch (args.length) {
-            case 0:
-                return this.allCommands;
-            case 1:
-                String arg = args[0].toLowerCase();
-                if (space) {
-                    Command cmd = getCommand(arg);
-                    if (cmd != null && cmd.canExecute(player, false)) {
-                        return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
-                    } else {
-                        return null;
-                    }
-                } else {
-                    Set<Command> commands = new HashSet<Command>();
-                    for (Map.Entry<String, Command> entry : this.staticCommands.entrySet()) {
-                        if (entry.getKey().startsWith(arg) && entry.getValue()
-                            .canExecute(player, false)) {
-                            commands.add(entry.getValue());
-                        }
-                    }
-                    return commands;
-                }
-            default:
-                Command cmd = getCommand(args[0]);
-                if (cmd != null) {
-                    return cmd.tab(player, Arrays.copyOfRange(args, 1, args.length), space);
-                } else {
-                    return null;
-                }
-        }
-    }
-
-    @Override public String toString() {
-        return !this.aliases.isEmpty() ? this.aliases.get(0) : this.id;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        Command other = (Command) obj;
-        if (this.hashCode() != other.hashCode()) {
-            return false;
-        }
-        return this.getFullId().equals(other.getFullId());
-    }
-
-    @Override public int hashCode() {
-        return this.getFullId().hashCode();
-    }
-
-    public void checkTrue(boolean mustBeTrue, C message, Object... args) {
-        if (!mustBeTrue) {
-            throw new CommandException(message, args);
-        }
-    }
-
-    public <T extends Object> T check(T object, C message, Object... args) {
-        if (object == null) {
-            throw new CommandException(message, args);
-        }
-        return object;
-    }
-
-    public enum CommandResult {
-        FAILURE, SUCCESS
-    }
-
-
-    public static class CommandException extends RuntimeException {
-        private final Object[] args;
-        private final C message;
-
-        public CommandException(C message, Object... args) {
-            this.message = message;
-            this.args = args;
-        }
-
-        public void perform(PlotPlayer player) {
-            if (player != null && message != null) {
-                message.send(player, args);
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
deleted file mode 100644
index 3b5ee295e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.intellectualsites.plotsquared.commands;
-
-import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-
-public interface CommandCaller {
-
-    /**
-     * Send the player a message.
-     *
-     * @param message the message to send
-     */
-    void sendMessage(String message);
-
-    /**
-     * Check the player's permissions. <i>Will be cached if permission caching is enabled.</i>
-     *
-     * @param permission the name of the permission
-     */
-    boolean hasPermission(String permission);
-
-    boolean isPermissionSet(String permission);
-
-    RequiredType getSuperCaller();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java
deleted file mode 100644
index 851a03174..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.intellectualsites.plotsquared.commands;
-
-import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
-import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME)
-public @interface CommandDeclaration {
-
-    String command();
-
-    String[] aliases() default {};
-
-    String permission() default "";
-
-    String usage() default "";
-
-    String description() default "";
-
-    RequiredType requiredType() default RequiredType.NONE;
-
-    CommandCategory category() default CommandCategory.INFO;
-
-    boolean confirmation() default false;
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
deleted file mode 100644
index 9d694c1ec..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-import javax.annotation.Nonnull;
-import java.util.Map;
-
-/**
- * Represents a source of configurable options and settings.
- */
-public interface Configuration extends ConfigurationSection {
-    /**
-     * Sets the default value of the given path as provided.
-     * <p>
-     * <p>If no source {@link Configuration} was provided as a default
-     * collection, then a new {@link MemoryConfiguration} will be created to
-     * hold the new default value.</p>
-     * <p>
-     * <p>If value is null, the value will be removed from the default
-     * Configuration source.</p>
-     *
-     * @param path  Path of the value to set.
-     * @param value Value to set the default to.
-     * @throws IllegalArgumentException Thrown if path is null.
-     */
-    @Override void addDefault(@Nonnull String path, Object value);
-
-    /**
-     * Sets the default values of the given paths as provided.
-     * <p>
-     * <p>If no source {@link Configuration} was provided as a default
-     * collection, then a new {@link MemoryConfiguration} will be created to
-     * hold the new default values.</p>
-     *
-     * @param defaults A map of Path->Values to add to defaults.
-     * @throws IllegalArgumentException Thrown if defaults is null.
-     */
-    void addDefaults(Map<String, Object> defaults);
-
-    /**
-     * Sets the default values of the given paths as provided.
-     * <p>
-     * <p>If no source {@link Configuration} was provided as a default
-     * collection, then a new {@link MemoryConfiguration} will be created to
-     * hold the new default value.</p>
-     * <p>
-     * <p>This method will not hold a reference to the specified Configuration,
-     * nor will it automatically update if that Configuration ever changes. If
-     * you check this, you should set the default source with {@link
-     * #setDefaults(Configuration)}.</p>
-     *
-     * @param defaults A configuration holding a list of defaults to copy.
-     * @throws IllegalArgumentException Thrown if defaults is null or this.
-     */
-    void addDefaults(Configuration defaults);
-
-    /**
-     * Gets the source {@link Configuration} for this configuration.
-     * <p>
-     * <p>
-     * If no configuration source was set, but default values were added, then
-     * a {@link MemoryConfiguration} will be returned. If no source was set
-     * and no defaults were set, then this method will return null.</p>
-     *
-     * @return Configuration source for default values, or null if none exist.
-     */
-    Configuration getDefaults();
-
-    /**
-     * Sets the source of all default values for this {@link Configuration}.
-     * <p>
-     * <p>
-     * If a previous source was set, or previous default values were defined,
-     * then they will not be copied to the new source.</p>
-     *
-     * @param defaults New source of default values for this configuration.
-     * @throws IllegalArgumentException Thrown if defaults is null or this.
-     */
-    void setDefaults(Configuration defaults);
-
-    /**
-     * Gets the {@link ConfigurationOptions} for this {@link Configuration}.
-     * <p>
-     * <p>All setters through this method are chainable.</p>
-     *
-     * @return Options for this configuration
-     */
-    ConfigurationOptions options();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
deleted file mode 100644
index f86016031..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-/**
- * Various settings for controlling the input and output of a {@link
- * Configuration}.
- */
-class ConfigurationOptions {
-    private final Configuration configuration;
-    private char pathSeparator = '.';
-    private boolean copyDefaults = false;
-
-    protected ConfigurationOptions(Configuration configuration) {
-        this.configuration = configuration;
-    }
-
-    /**
-     * Returns the {@link Configuration} that this object is responsible for.
-     *
-     * @return Parent configuration
-     */
-    public Configuration configuration() {
-        return configuration;
-    }
-
-    /**
-     * Gets the char that will be used to separate {@link
-     * ConfigurationSection}s.
-     *
-     * <p>This value does not affect how the {@link Configuration} is stored,
-     * only in how you access the data. The default value is '.'.
-     *
-     * @return Path separator
-     */
-    char pathSeparator() {
-        return pathSeparator;
-    }
-
-    /**
-     * Sets the char that will be used to separate {@link
-     * ConfigurationSection}s.
-     *
-     * <p>This value does not affect how the {@link Configuration} is stored,
-     * only in how you access the data. The default value is '.'.
-     *
-     * @param value Path separator
-     * @return This object, for chaining
-     */
-    public ConfigurationOptions pathSeparator(char value) {
-        pathSeparator = value;
-        return this;
-    }
-
-    /**
-     * Checks if the {@link Configuration} should copy values from its default
-     * {@link Configuration} directly.
-     *
-     * <p>If this is true, all values in the default Configuration will be
-     * directly copied, making it impossible to distinguish between values
-     * that were set and values that are provided by default. As a result,
-     * {@link ConfigurationSection#contains(String)} will always
-     * return the same value as {@link
-     * ConfigurationSection#isSet(String)}. The default value is
-     * false.
-     *
-     * @return Whether or not defaults are directly copied
-     */
-    boolean copyDefaults() {
-        return copyDefaults;
-    }
-
-    /**
-     * Sets if the {@link Configuration} should copy values from its default
-     * {@link Configuration} directly.
-     *
-     * <p>If this is true, all values in the default Configuration will be
-     * directly copied, making it impossible to distinguish between values
-     * that were set and values that are provided by default. As a result,
-     * {@link ConfigurationSection#contains(String)} will always
-     * return the same value as {@link
-     * ConfigurationSection#isSet(String)}. The default value is
-     * false.
-     *
-     * @param value Whether or not defaults are directly copied
-     * @return This object, for chaining
-     */
-    public ConfigurationOptions copyDefaults(boolean value) {
-        copyDefaults = value;
-        return this;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
deleted file mode 100644
index 9e15a9030..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
+++ /dev/null
@@ -1,649 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-import javax.annotation.Nonnull;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Represents a section of a {@link Configuration}.
- */
-public interface ConfigurationSection {
-
-    /**
-     * Gets a set containing all keys in this section.
-     *
-     * <p>If deep is set to true, then this will contain all the keys within any
-     * child {@link ConfigurationSection}s (and their children, etc). These
-     * will be in a valid path notation for you to use.
-     *
-     * <p>If deep is set to false, then this will contain only the keys of any
-     * direct children, and not their own children.
-     *
-     * @param deep Whether or not to get a deep list, as opposed to a shallow
-     *             list.
-     * @return Set of keys contained within this ConfigurationSection.
-     */
-    Set<String> getKeys(boolean deep);
-
-    /**
-     * Gets a Map containing all keys and their values for this section.
-     *
-     * <p>If deep is set to true, then this will contain all the keys and values
-     * within any child {@link ConfigurationSection}s (and their children,
-     * etc). These keys will be in a valid path notation for you to use.
-     *
-     * <p>If deep is set to false, then this will contain only the keys and
-     * values of any direct children, and not their own children.
-     *
-     * @param deep Whether or not to get a deep list, as opposed to a shallow
-     *             list.
-     * @return Map of keys and values of this section.
-     */
-    Map<String, Object> getValues(boolean deep);
-
-    /**
-     * Checks if this {@link ConfigurationSection} contains the given path.
-     *
-     * <p>If the value for the requested path does not exist but a default value
-     * has been specified, this will return true.
-     *
-     * @param path Path to check for existence.
-     * @return True if this section contains the requested path, either via
-     * default or being set.
-     * @throws IllegalArgumentException Thrown when path is {@code null}.
-     */
-    boolean contains(@Nonnull String path);
-
-    /**
-     * Checks if this {@link ConfigurationSection} has a value set for the
-     * given path.
-     *
-     * <p>If the value for the requested path does not exist but a default value
-     * has been specified, this will still return false.
-     *
-     * @param path Path to check for existence.
-     * @return True if this section contains the requested path, regardless of
-     * having a default.
-     * @throws IllegalArgumentException Thrown when path is {@code null}.
-     */
-    boolean isSet(@Nonnull String path);
-
-    /**
-     * Gets the path of this {@link ConfigurationSection} from its root {@link
-     * Configuration}.
-     *
-     * <p>For any {@link Configuration} themselves, this will return an empty
-     * string.
-     *
-     * <p>If the section is no longer contained within its root for any reason,
-     * such as being replaced with a different value,
-     * this may return {@code null}.
-     *
-     * <p>To retrieve the single name of this section, that is, the final part
-     * of the path returned by this method, you may use {@link #getName()}.
-     *
-     * @return Path of this section relative to its root
-     */
-    String getCurrentPath();
-
-    /**
-     * Gets the name of this individual {@link ConfigurationSection}, in the
-     * path.
-     *
-     * <p>This will always be the final part of {@link #getCurrentPath()}, unless
-     * the section is orphaned.
-     *
-     * @return Name of this section
-     */
-    String getName();
-
-    /**
-     * Gets the root {@link Configuration} that contains this {@link
-     * ConfigurationSection}
-     *
-     * <p>For any {@link Configuration} themselves, this will return its own
-     * object.
-     *
-     * <p>If the section is no longer contained within its root for any reason,
-     * such as being replaced with a different value,
-     * this may return {@code null}.
-     *
-     * @return Root configuration containing this section.
-     */
-    Configuration getRoot();
-
-    /**
-     * Gets the parent {@link ConfigurationSection} that directly contains
-     * this {@link ConfigurationSection}.
-     *
-     * <p>For any {@link Configuration} themselves, this will return
-     * {@code null}.
-     *
-     * <p>If the section is no longer contained within its parent for any
-     * reason, such as being replaced with a different value, this may
-     * return {@code null}.
-     *
-     * @return Parent section containing this section.
-     */
-    ConfigurationSection getParent();
-
-    /**
-     * Gets the requested Object by path.
-     *
-     * <p>If the Object does not exist but a default value has been specified,
-     * this will return the default value. If the Object does not exist and no
-     * default value was specified, this will return {@code null}.
-     *
-     * @param path Path of the Object to get.
-     * @return Requested Object.
-     */
-    Object get(String path);
-
-    /**
-     * Gets the requested Object by path, returning a default value if not
-     * found.
-     *
-     * <p>If the Object does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path         Path of the Object to get.
-     * @param defaultValue The default value to return if the path is not found.
-     * @return Requested Object.
-     */
-    Object getOrDefault(@Nonnull String path, Object defaultValue);
-
-    /**
-     * Sets the specified path to the given value.
-     *
-     * <p>If value is {@code null}, the entry will be removed. Any
-     * existing entry will be replaced, regardless of what the new value is.
-     *
-     * <p>Some implementations may have limitations on what you may store. See
-     * their individual javadoc for details. No implementations should allow
-     * you to store {@link Configuration}s or {@link ConfigurationSection}s,
-     * please use {@link #createSection(String)} for that.
-     *
-     * @param path  Path of the object to set.
-     * @param value New value to set the path to.
-     */
-    void set(String path, Object value);
-
-    /**
-     * Creates an empty {@link ConfigurationSection} at the specified path.
-     *
-     * <p>Any value that was previously set at this path will be overwritten. If
-     * the previous value was itself a {@link ConfigurationSection}, it will
-     * be orphaned.
-     *
-     * @param path Path to create the section at.
-     * @return Newly created section
-     */
-    ConfigurationSection createSection(String path);
-
-    /**
-     * Creates a {@link ConfigurationSection} at the specified path, with
-     * specified values.
-     *
-     * <p>Any value that was previously set at this path will be overwritten. If
-     * the previous value was itself a {@link ConfigurationSection}, it will
-     * be orphaned.
-     *
-     * @param path Path to create the section at.
-     * @param map  The values to used.
-     * @return Newly created section
-     */
-    ConfigurationSection createSection(String path, Map<?, ?> map);
-
-    // Primitives
-
-    /**
-     * Gets the requested String by path.
-     *
-     * <p>If the String does not exist but a default value has been specified,
-     * this will return the default value. If the String does not exist and no
-     * default value was specified, this will return {@code null}.
-     *
-     * @param path Path of the String to get.
-     * @return Requested String.
-     */
-    String getString(String path);
-
-    /**
-     * Gets the requested String by path, returning a default value if not
-     * found.
-     *
-     * <p>If the String does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path Path of the String to get.
-     * @param def  The default value to return if the path is not found or is
-     *             not a String.
-     * @return Requested String.
-     */
-    String getString(String path, String def);
-
-    /**
-     * Checks if the specified path is a String.
-     *
-     * <p>If the path exists but is not a String, this will return false. If
-     * the path does not exist, this will return false. If the path does not
-     * exist but a default value has been specified, this will check if that
-     * defaultvalue is a String and return appropriately.
-     *
-     * @param path Path of the String to check.
-     * @return Whether or not the specified path is a String.
-     */
-    boolean isString(String path);
-
-    /**
-     * Gets the requested int by path.
-     *
-     * <p>If the int does not exist but a default value has been specified, this
-     * will return the default value. If the int does not exist and no default
-     * value was specified, this will return 0.
-     *
-     * @param path Path of the int to get.
-     * @return Requested int.
-     */
-    int getInt(String path);
-
-    /**
-     * Gets the requested int by path, returning a default value if not found.
-     *
-     * <p>If the int does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path Path of the int to get.
-     * @param def  The default value to return if the path is not found or is
-     *             not an int.
-     * @return Requested int.
-     */
-    int getInt(String path, int def);
-
-    /**
-     * Checks if the specified path is an int.
-     *
-     * <p>If the path exists but is not a int, this will return false. If the
-     * path does not exist, this will return false. If the path does not exist
-     * but a default value has been specified, this will check if that default
-     * value is a int and return appropriately.
-     *
-     * @param path Path of the int to check.
-     * @return Whether or not the specified path is an int.
-     */
-    boolean isInt(String path);
-
-    /**
-     * Gets the requested boolean by path.
-     *
-     * <p>If the boolean does not exist but a default value has been specified,
-     * this will return the default value. If the boolean does not exist and
-     * no default value was specified, this will return false.
-     *
-     * @param path Path of the boolean to get.
-     * @return Requested boolean.
-     */
-    boolean getBoolean(String path);
-
-    /**
-     * Gets the requested boolean by path, returning a default value if not
-     * found.
-     *
-     * <p>If the boolean does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path         Path of the boolean to get.
-     * @param defaultValue The default value to return if the path is not found or is
-     *                     not a boolean.
-     * @return Requested boolean.
-     */
-    boolean getBoolean(String path, boolean defaultValue);
-
-    /**
-     * Checks if the specified path is a boolean.
-     *
-     * <p>If the path exists but is not a boolean, this will return false. If the
-     * path does not exist, this will return false. If the path does not exist
-     * but a default value has been specified, this will check if that default
-     * value is a boolean and return appropriately.
-     *
-     * @param path Path of the boolean to check.
-     * @return Whether or not the specified path is a boolean.
-     */
-    boolean isBoolean(String path);
-
-    /**
-     * Gets the requested double by path.
-     *
-     * <p>If the double does not exist but a default value has been specified,
-     * this will return the default value. If the double does not exist and no
-     * default value was specified, this will return 0.
-     *
-     * @param path Path of the double to get.
-     * @return Requested double.
-     */
-    double getDouble(String path);
-
-    /**
-     * Gets the requested double by path, returning a default value if not
-     * found.
-     *
-     * <p>If the double does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path         Path of the double to get.
-     * @param defaultValue The default value to return if the path is not found or is
-     *                     not a double.
-     * @return Requested double.
-     */
-    double getDouble(String path, double defaultValue);
-
-    /**
-     * Checks if the specified path is a double.
-     *
-     * <p>If the path exists but is not a double, this will return false. If the
-     * path does not exist, this will return false. If the path does not exist
-     * but a default value has been specified, this will check if that default
-     * value is a double and return appropriately.
-     *
-     * @param path Path of the double to check.
-     * @return Whether or not the specified path is a double.
-     */
-    boolean isDouble(String path);
-
-    /**
-     * Gets the requested long by path.
-     *
-     * <p>If the long does not exist but a default value has been specified, this
-     * will return the default value. If the long does not exist and no
-     * default value was specified, this will return 0.
-     *
-     * @param path Path of the long to get.
-     * @return Requested long.
-     */
-    long getLong(String path);
-
-    /**
-     * Gets the requested long by path, returning a default value if not
-     * found.
-     *
-     * <p>If the long does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path Path of the long to get.
-     * @param def  The default value to return if the path is not found or is
-     *             not a long.
-     * @return Requested long.
-     */
-    long getLong(String path, long def);
-
-    /**
-     * Checks if the specified path is a long.
-     *
-     * <p>If the path exists but is not a long, this will return false. If the
-     * path does not exist, this will return false. If the path does not exist
-     * but a default value has been specified, this will check if that default
-     * value is a long and return appropriately.
-     *
-     * @param path Path of the long to check.
-     * @return Whether or not the specified path is a long.
-     */
-    boolean isLong(String path);
-
-    // Java
-
-    /**
-     * Gets the requested List by path.
-     *
-     * <p>If the List does not exist but a default value has been specified, this
-     * will return the default value. If the List does not exist and no
-     * default value was specified, this will return null.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List.
-     */
-    List<?> getList(String path);
-
-    /**
-     * Gets the requested List by path, returning a default value if not
-     * found.
-     *
-     * <p>If the List does not exist then the specified default value will
-     * returned regardless of if a default has been identified in the root
-     * {@link Configuration}.
-     *
-     * @param path Path of the List to get.
-     * @param def  The default value to return if the path is not found or is
-     *             not a List.
-     * @return Requested List.
-     */
-    List<?> getList(String path, List<?> def);
-
-    /**
-     * Checks if the specified path is a List.
-     *
-     * <p>If the path exists but is not a List, this will return false. If the
-     * path does not exist, this will return false. If the path does not exist
-     * but a default value has been specified, this will check if that default
-     * value is a List and return appropriately.
-     *
-     * @param path Path of the List to check.
-     * @return Whether or not the specified path is a List.
-     */
-    boolean isList(String path);
-
-    /**
-     * Gets the requested List of String by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a String if possible,
-     * but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of String.
-     */
-    List<String> getStringList(String path);
-
-    /**
-     * Gets the requested List of Integer by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Integer if
-     * possible, but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Integer.
-     */
-    List<Integer> getIntegerList(String path);
-
-    /**
-     * Gets the requested List of Boolean by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Boolean if
-     * possible, but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Boolean.
-     */
-    List<Boolean> getBooleanList(String path);
-
-    /**
-     * Gets the requested List of Double by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Double if possible,
-     * but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Double.
-     */
-    List<Double> getDoubleList(String path);
-
-    /**
-     * Gets the requested List of Float by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Float if possible,
-     * but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Float.
-     */
-    List<Float> getFloatList(String path);
-
-    /**
-     * Gets the requested List of Long by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Long if possible,
-     * but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Long.
-     */
-    List<Long> getLongList(String path);
-
-    /**
-     * Gets the requested List of Byte by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Byte if possible,
-     * but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Byte.
-     */
-    List<Byte> getByteList(String path);
-
-    /**
-     * Gets the requested List of Character by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Character if
-     * possible, but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Character.
-     */
-    List<Character> getCharacterList(String path);
-
-    /**
-     * Gets the requested List of Short by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     *
-     * <p>This method will attempt to cast any values into a Short if
-     * possible, but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Short.
-     */
-    List<Short> getShortList(String path);
-
-    /**
-     * Gets the requested List of Maps by path.
-     *
-     * <p>If the List does not exist but a default value has been specified,
-     * this will return the default value. If the List does not exist and no
-     * default value was specified, this will return an empty List.
-     * <p>This method will attempt to cast any values into a Map if possible,
-     * but may miss any values out if they are not compatible.
-     *
-     * @param path Path of the List to get.
-     * @return Requested List of Maps.
-     */
-    List<Map<?, ?>> getMapList(String path);
-
-    /**
-     * Gets the requested ConfigurationSection by path.
-     *
-     * <p>If the ConfigurationSection does not exist but a default value has
-     * been specified, this will return the default value. If the
-     * ConfigurationSection does not exist and no default value was specified,
-     * this will return {@code null}.
-     *
-     * @param path Path of the ConfigurationSection to get.
-     * @return Requested ConfigurationSection.
-     */
-    ConfigurationSection getConfigurationSection(String path);
-
-    /**
-     * Checks if the specified path is a ConfigurationSection.
-     *
-     * <p>If the path exists but is not a ConfigurationSection, this will return
-     * false. If the path does not exist, this will return false. If the path
-     * does not exist but a default value has been specified, this will check
-     * if that default value is a ConfigurationSection and return
-     * appropriately.
-     *
-     * @param path Path of the ConfigurationSection to check.
-     * @return Whether or not the specified path is a ConfigurationSection.
-     */
-    boolean isConfigurationSection(String path);
-
-    /**
-     * Gets the equivalent {@link ConfigurationSection} from the default
-     * {@link Configuration} defined in {@link #getRoot()}.
-     *
-     * <p>If the root contains no defaults, or the defaults doesn't contain a
-     * value for this path, or the value at this path is not a {@link
-     * ConfigurationSection} then this will return {@code null}.
-     *
-     * @return Equivalent section in root configuration
-     */
-    ConfigurationSection getDefaultSection();
-
-    /**
-     * Sets the default value in the root at the given path as provided.
-     *
-     * <p>If no source {@link Configuration} was provided as a default
-     * collection, then a new {@link MemoryConfiguration} will be created to
-     * hold the new default value.
-     *
-     * <p>If value is {@code null}, the value will be removed from the
-     * default Configuration source.
-     *
-     * <p>If the value as returned by {@link #getDefaultSection()} is
-     * {@code null}, then this will create a new section at the path,
-     * replacing anything that may have existed there previously.
-     *
-     * @param path  Path of the value to set
-     * @param value Value to set the default to
-     * @throws IllegalArgumentException Thrown if path is {@code null}
-     */
-    void addDefault(@Nonnull String path, Object value);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java
deleted file mode 100644
index e9c099ed1..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-/**
- * Exception thrown when attempting to load an invalid {@link Configuration}.
- */
-@SuppressWarnings("serial") public class InvalidConfigurationException extends Exception {
-
-    /**
-     * Creates a new instance of InvalidConfigurationException without a
-     * message or cause.
-     */
-    public InvalidConfigurationException() {
-    }
-
-    /**
-     * Constructs an instance of InvalidConfigurationException with the
-     * specified message.
-     *
-     * @param msg The details of the exception.
-     */
-    public InvalidConfigurationException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Constructs an instance of InvalidConfigurationException with the
-     * specified cause.
-     *
-     * @param cause The cause of the exception.
-     */
-    public InvalidConfigurationException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * Constructs an instance of InvalidConfigurationException with the
-     * specified message and cause.
-     *
-     * @param cause The cause of the exception.
-     * @param msg   The details of the exception.
-     */
-    public InvalidConfigurationException(String msg, Throwable cause) {
-        super(msg, cause);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
deleted file mode 100644
index d1677c54d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-import javax.annotation.Nonnull;
-import java.util.Map;
-
-/**
- * This is a {@link Configuration} implementation that does not save or load
- * from any source, and stores all values in memory only.
- * This is useful for temporary Configurations for providing defaults.
- */
-public class MemoryConfiguration extends MemorySection implements Configuration {
-    protected Configuration defaults;
-    protected MemoryConfigurationOptions options;
-
-    /**
-     * Creates an empty {@link MemoryConfiguration} with no default values.
-     */
-    public MemoryConfiguration() {
-    }
-
-    /**
-     * Creates an empty {@link MemoryConfiguration} using the specified {@link
-     * Configuration} as a source for all default values.
-     *
-     * @param defaults Default value provider
-     * @throws IllegalArgumentException Thrown if defaults is null
-     */
-    public MemoryConfiguration(Configuration defaults) {
-        this.defaults = defaults;
-    }
-
-    @Override public void addDefault(@Nonnull String path, Object value) {
-        if (this.defaults == null) {
-            this.defaults = new MemoryConfiguration();
-        }
-
-        this.defaults.set(path, value);
-    }
-
-    @Override public void addDefaults(Map<String, Object> defaults) {
-        for (Map.Entry<String, Object> entry : defaults.entrySet()) {
-            addDefault(entry.getKey(), entry.getValue());
-        }
-    }
-
-    @Override public void addDefaults(Configuration defaults) {
-        addDefaults(defaults.getValues(true));
-    }
-
-    @Override public Configuration getDefaults() {
-        return this.defaults;
-    }
-
-    @Override public void setDefaults(Configuration defaults) {
-        if (defaults == null) {
-            throw new NullPointerException("Defaults may not be null");
-        }
-
-        this.defaults = defaults;
-    }
-
-    @Override public ConfigurationSection getParent() {
-        return null;
-    }
-
-    @Override public MemoryConfigurationOptions options() {
-        if (this.options == null) {
-            this.options = new MemoryConfigurationOptions(this);
-        }
-
-        return this.options;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java
deleted file mode 100644
index 971ea1e70..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-/**
- * Various settings for controlling the input and output of a {@link
- * MemoryConfiguration}.
- */
-public class MemoryConfigurationOptions extends ConfigurationOptions {
-    protected MemoryConfigurationOptions(MemoryConfiguration configuration) {
-        super(configuration);
-    }
-
-    @Override public MemoryConfiguration configuration() {
-        return (MemoryConfiguration) super.configuration();
-    }
-
-    @Override public MemoryConfigurationOptions copyDefaults(boolean value) {
-        super.copyDefaults(value);
-        return this;
-    }
-
-    @Override public MemoryConfigurationOptions pathSeparator(char value) {
-        super.pathSeparator(value);
-        return this;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
deleted file mode 100644
index 26f6760c8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
+++ /dev/null
@@ -1,771 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration;
-
-import javax.annotation.Nonnull;
-import java.util.*;
-
-/**
- * A type of {@link ConfigurationSection} that is stored in memory.
- */
-public class MemorySection implements ConfigurationSection {
-
-    protected final Map<String, Object> map = new LinkedHashMap<>();
-    private final Configuration root;
-    private final ConfigurationSection parent;
-    private final String path;
-    private final String fullPath;
-
-    /**
-     * Creates an empty MemorySection for use as a root {@link Configuration} section.
-     *
-     * <p>Note that calling this without being yourself a {@link Configuration}
-     * will throw an exception!
-     *
-     * @throws IllegalStateException Thrown if this is not a {@link Configuration} root.
-     */
-    protected MemorySection() {
-        if (!(this instanceof Configuration)) {
-            throw new IllegalStateException(
-                "Cannot construct a root MemorySection when not a Configuration");
-        }
-
-        this.path = "";
-        this.fullPath = "";
-        this.parent = null;
-        this.root = (Configuration) this;
-    }
-
-    /**
-     * Creates an empty MemorySection with the specified parent and path.
-     *
-     * @param parent Parent section that contains this own section.
-     * @param path   Path that you may access this section from via the root {@link Configuration}.
-     * @throws IllegalArgumentException Thrown is parent or path is null, or if parent contains no
-     *                                  root Configuration.
-     */
-    protected MemorySection(ConfigurationSection parent, String path) {
-        this.path = path;
-        this.parent = parent;
-        this.root = parent.getRoot();
-
-        if (this.root == null) {
-            throw new NullPointerException("Path may not be orphaned");
-        }
-
-        this.fullPath = createPath(parent, path);
-    }
-
-    public static double toDouble(Object obj, double def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).doubleValue();
-        }
-        if (obj instanceof String) {
-            try {
-                return Double.parseDouble((String) obj);
-            } catch (NumberFormatException ignored) {
-            }
-        } else if (obj instanceof List) {
-            List<?> val = (List<?>) obj;
-            if (!val.isEmpty()) {
-                return toDouble(val.get(0), def);
-            }
-        }
-        return def;
-    }
-
-    public static int toInt(Object obj, int def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).intValue();
-        }
-        if (obj instanceof String) {
-            try {
-                return Integer.parseInt((String) obj);
-            } catch (NumberFormatException ignored) {
-            }
-        } else if (obj instanceof List) {
-            List<?> val = (List<?>) obj;
-            if (!val.isEmpty()) {
-                return toInt(val.get(0), def);
-            }
-        }
-        return def;
-    }
-
-    public static long toLong(Object obj, long def) {
-        if (obj instanceof Number) {
-            return ((Number) obj).longValue();
-        }
-        if (obj instanceof String) {
-            try {
-                return Long.parseLong((String) obj);
-            } catch (NumberFormatException ignored) {
-            }
-        } else if (obj instanceof List) {
-            List<?> val = (List<?>) obj;
-            if (!val.isEmpty()) {
-                return toLong(val.get(0), def);
-            }
-        }
-        return def;
-    }
-
-    /**
-     * Creates a full path to the given {@link ConfigurationSection} from its root {@link
-     * Configuration}.
-     *
-     * <p>You may use this method for any given {@link ConfigurationSection}, not
-     * only {@link MemorySection}.
-     *
-     * @param section Section to create a path for.
-     * @param key     Name of the specified section.
-     * @return Full path of the section from its root.
-     */
-    public static String createPath(ConfigurationSection section, String key) {
-        return createPath(section, key, section.getRoot());
-    }
-
-    /**
-     * Creates a relative path to the given {@link ConfigurationSection} from the given relative
-     * section.
-     *
-     * <p>You may use this method for any given {@link ConfigurationSection}, not
-     * only {@link MemorySection}.
-     *
-     * @param section    Section to create a path for.
-     * @param key        Name of the specified section.
-     * @param relativeTo Section to create the path relative to.
-     * @return Full path of the section from its root.
-     */
-    public static String createPath(ConfigurationSection section, String key,
-        ConfigurationSection relativeTo) {
-        Configuration root = section.getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot create path without a root");
-        }
-        char separator = root.options().pathSeparator();
-
-        StringBuilder builder = new StringBuilder();
-        for (ConfigurationSection parent = section;
-             (parent != null) && (parent != relativeTo); parent = parent.getParent()) {
-            if (builder.length() > 0) {
-                builder.insert(0, separator);
-            }
-
-            builder.insert(0, parent.getName());
-        }
-
-        if ((key != null) && !key.isEmpty()) {
-            if (builder.length() > 0) {
-                builder.append(separator);
-            }
-
-            builder.append(key);
-        }
-
-        return builder.toString();
-    }
-
-    @Override public Set<String> getKeys(boolean deep) {
-        Set<String> result = new LinkedHashSet<>();
-
-        Configuration root = getRoot();
-        if ((root != null) && root.options().copyDefaults()) {
-            ConfigurationSection defaults = getDefaultSection();
-
-            if (defaults != null) {
-                result.addAll(defaults.getKeys(deep));
-            }
-        }
-
-        mapChildrenKeys(result, this, deep);
-
-        return result;
-    }
-
-    @Override public Map<String, Object> getValues(boolean deep) {
-        Map<String, Object> result = new LinkedHashMap<>();
-
-        Configuration root = getRoot();
-        if ((root != null) && root.options().copyDefaults()) {
-            ConfigurationSection defaults = getDefaultSection();
-
-            if (defaults != null) {
-                result.putAll(defaults.getValues(deep));
-            }
-        }
-
-        mapChildrenValues(result, this, deep);
-
-        return result;
-    }
-
-    @Override public boolean contains(@Nonnull String path) {
-        return get(path) != null;
-    }
-
-    @Override public boolean isSet(@Nonnull String path) {
-        Configuration root = getRoot();
-        if (root == null) {
-            return false;
-        }
-        if (root.options().copyDefaults()) {
-            return contains(path);
-        }
-        return getOrDefault(path, null) != null;
-    }
-
-    @Override public String getCurrentPath() {
-        return this.fullPath;
-    }
-
-    @Override public String getName() {
-        return this.path;
-    }
-
-    @Override public Configuration getRoot() {
-        return this.root;
-    }
-
-    @Override public ConfigurationSection getParent() {
-        return this.parent;
-    }
-
-    @Override public void addDefault(@Nonnull String path, Object value) {
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot add default without root");
-        }
-        if (root == this) {
-            throw new UnsupportedOperationException(
-                "Unsupported addDefault(String, Object) implementation");
-        }
-        root.addDefault(createPath(this, path), value);
-    }
-
-    @Override public ConfigurationSection getDefaultSection() {
-        Configuration root = getRoot();
-        Configuration defaults = root == null ? null : root.getDefaults();
-
-        if (defaults != null) {
-            if (defaults.isConfigurationSection(getCurrentPath())) {
-                return defaults.getConfigurationSection(getCurrentPath());
-            }
-        }
-
-        return null;
-    }
-
-    @Override public void set(String path, Object value) {
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot use section without a root");
-        }
-
-        char separator = root.options().pathSeparator();
-        // i1 is the leading (higher) index
-        // i2 is the trailing (lower) index
-        int i1 = -1;
-        int i2;
-        ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            String node = path.substring(i2, i1);
-            ConfigurationSection subSection = section.getConfigurationSection(node);
-            if (subSection == null) {
-                section = section.createSection(node);
-            } else {
-                section = subSection;
-            }
-        }
-
-        String key = path.substring(i2);
-        if (section == this) {
-            if (value == null) {
-                this.map.remove(key);
-            } else {
-                this.map.put(key, value);
-            }
-        } else {
-            section.set(key, value);
-        }
-    }
-
-    @Override public Object get(String path) {
-        return getOrDefault(path, getDefault(path));
-    }
-
-    @Override public Object getOrDefault(@Nonnull String path, Object defaultValue) {
-        if (path.isEmpty()) {
-            return this;
-        }
-
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot access section without a root");
-        }
-
-        char separator = root.options().pathSeparator();
-        // i1 is the leading (higher) index
-        // i2 is the trailing (lower) index
-        int i1 = -1;
-        int i2;
-        ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            section = section.getConfigurationSection(path.substring(i2, i1));
-            if (section == null) {
-                return defaultValue;
-            }
-        }
-
-        String key = path.substring(i2);
-        if (section == this) {
-            Object result = this.map.get(key);
-            if (result == null) {
-                return defaultValue;
-            } else {
-                return result;
-            }
-        }
-        return section.getOrDefault(key, defaultValue);
-    }
-
-    @Override public ConfigurationSection createSection(String path) {
-        Configuration root = getRoot();
-        if (root == null) {
-            throw new IllegalStateException("Cannot create section without a root");
-        }
-
-        char separator = root.options().pathSeparator();
-        // i1 is the leading (higher) index
-        // i2 is the trailing (lower) index
-        int i1 = -1;
-        int i2;
-        ConfigurationSection section = this;
-        while ((i1 = path.indexOf(separator, i2 = i1 + 1)) != -1) {
-            String node = path.substring(i2, i1);
-            ConfigurationSection subSection = section.getConfigurationSection(node);
-            if (subSection == null) {
-                section = section.createSection(node);
-            } else {
-                section = subSection;
-            }
-        }
-
-        String key = path.substring(i2);
-        if (section == this) {
-            ConfigurationSection result = new MemorySection(this, key);
-            this.map.put(key, result);
-            return result;
-        }
-        return section.createSection(key);
-    }
-
-    @Override public ConfigurationSection createSection(String path, Map<?, ?> map) {
-        ConfigurationSection section = createSection(path);
-
-        for (Map.Entry<?, ?> entry : map.entrySet()) {
-            if (entry.getValue() instanceof Map) {
-                section.createSection(entry.getKey().toString(), (Map<?, ?>) entry.getValue());
-            } else {
-                section.set(entry.getKey().toString(), entry.getValue());
-            }
-        }
-
-        return section;
-    }
-
-    // Primitives
-    @Override public String getString(String path) {
-        Object def = getDefault(path);
-        return getString(path, def != null ? def.toString() : null);
-    }
-
-    @Override public String getString(String path, String def) {
-        Object val = getOrDefault(path, def);
-        if (val != null) {
-            return val.toString();
-        } else {
-            return def;
-        }
-    }
-
-    @Override public boolean isString(String path) {
-        Object val = get(path);
-        return val instanceof String;
-    }
-
-    @Override public int getInt(String path) {
-        Object def = getDefault(path);
-        return getInt(path, toInt(def, 0));
-    }
-
-    @Override public int getInt(String path, int def) {
-        Object val = getOrDefault(path, def);
-        return toInt(val, def);
-    }
-
-    @Override public boolean isInt(String path) {
-        Object val = get(path);
-        return val instanceof Integer;
-    }
-
-    @Override public boolean getBoolean(String path) {
-        Object def = getDefault(path);
-        if (def instanceof Boolean) {
-            return getBoolean(path, (Boolean) def);
-        } else {
-            return getBoolean(path, false);
-        }
-    }
-
-    @Override public boolean getBoolean(String path, boolean defaultValue) {
-        Object val = getOrDefault(path, defaultValue);
-        if (val instanceof Boolean) {
-            return (Boolean) val;
-        } else {
-            return defaultValue;
-        }
-    }
-
-    @Override public boolean isBoolean(String path) {
-        Object val = get(path);
-        return val instanceof Boolean;
-    }
-
-    @Override public double getDouble(String path) {
-        Object def = getDefault(path);
-        return getDouble(path, toDouble(def, 0));
-    }
-
-    @Override public double getDouble(String path, double defaultValue) {
-        Object val = getOrDefault(path, defaultValue);
-        return toDouble(val, defaultValue);
-    }
-
-    @Override public boolean isDouble(String path) {
-        Object val = get(path);
-        return val instanceof Double;
-    }
-
-    @Override public long getLong(String path) {
-        Object def = getDefault(path);
-        return getLong(path, toLong(def, 0));
-    }
-
-    @Override public long getLong(String path, long def) {
-        Object val = getOrDefault(path, def);
-        return toLong(val, def);
-    }
-
-    @Override public boolean isLong(String path) {
-        Object val = get(path);
-        return val instanceof Long;
-    }
-
-    // Java
-    @Override public List<?> getList(String path) {
-        Object def = getDefault(path);
-        return getList(path, def instanceof List ? (List<?>) def : null);
-    }
-
-    @Override public List<?> getList(String path, List<?> def) {
-        Object val = getOrDefault(path, def);
-        return (List<?>) ((val instanceof List) ? val : def);
-    }
-
-    @Override public boolean isList(String path) {
-        Object val = get(path);
-        return val instanceof List;
-    }
-
-    @Override public List<String> getStringList(String path) {
-        List<?> list = getList(path);
-
-        if (list == null) {
-            return new ArrayList<>(0);
-        }
-
-        List<String> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if ((object instanceof String) || isPrimitiveWrapper(object)) {
-                result.add(String.valueOf(object));
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Integer> getIntegerList(String path) {
-        List<?> list = getList(path);
-
-        List<Integer> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Integer) {
-                result.add((Integer) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Integer.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((int) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).intValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Boolean> getBooleanList(String path) {
-        List<?> list = getList(path);
-
-        List<Boolean> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Boolean) {
-                result.add((Boolean) object);
-            } else if (object instanceof String) {
-                if (Boolean.TRUE.toString().equals(object)) {
-                    result.add(true);
-                } else if (Boolean.FALSE.toString().equals(object)) {
-                    result.add(false);
-                }
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Double> getDoubleList(String path) {
-        List<?> list = getList(path);
-
-        List<Double> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Double) {
-                result.add((Double) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Double.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((double) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).doubleValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Float> getFloatList(String path) {
-        List<?> list = getList(path);
-
-        List<Float> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Float) {
-                result.add((Float) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Float.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((float) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).floatValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Long> getLongList(String path) {
-        List<?> list = getList(path);
-
-        List<Long> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Long) {
-                result.add((Long) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Long.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((long) (Character) object);
-            } else if (object instanceof Number) {
-                result.add(((Number) object).longValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Byte> getByteList(String path) {
-        List<?> list = getList(path);
-
-        List<Byte> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Byte) {
-                result.add((Byte) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Byte.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((byte) ((Character) object).charValue());
-            } else if (object instanceof Number) {
-                result.add(((Number) object).byteValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Character> getCharacterList(String path) {
-        List<?> list = getList(path);
-
-        List<Character> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Character) {
-                result.add((Character) object);
-            } else if (object instanceof String) {
-                String str = (String) object;
-
-                if (str.length() == 1) {
-                    result.add(str.charAt(0));
-                }
-            } else if (object instanceof Number) {
-                result.add((char) ((Number) object).intValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Short> getShortList(String path) {
-        List<?> list = getList(path);
-
-        List<Short> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Short) {
-                result.add((Short) object);
-            } else if (object instanceof String) {
-                try {
-                    result.add(Short.valueOf((String) object));
-                } catch (NumberFormatException ignored) {
-                }
-            } else if (object instanceof Character) {
-                result.add((short) ((Character) object).charValue());
-            } else if (object instanceof Number) {
-                result.add(((Number) object).shortValue());
-            }
-        }
-
-        return result;
-    }
-
-    @Override public List<Map<?, ?>> getMapList(String path) {
-        List<?> list = getList(path);
-        List<Map<?, ?>> result = new ArrayList<>();
-
-        for (Object object : list) {
-            if (object instanceof Map) {
-                result.add((Map<?, ?>) object);
-            }
-        }
-
-        return result;
-    }
-
-    @Override public ConfigurationSection getConfigurationSection(String path) {
-        Object val = getOrDefault(path, null);
-        if (val != null) {
-            return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
-        }
-
-        val = getOrDefault(path, getDefault(path));
-        return (val instanceof ConfigurationSection) ? createSection(path) : null;
-    }
-
-    @Override public boolean isConfigurationSection(String path) {
-        Object val = get(path);
-        return val instanceof ConfigurationSection;
-    }
-
-    protected boolean isPrimitiveWrapper(Object input) {
-        return (input instanceof Integer) || (input instanceof Boolean)
-            || (input instanceof Character) || (input instanceof Byte) || (input instanceof Short)
-            || (input instanceof Double) || (input instanceof Long) || (input instanceof Float);
-    }
-
-    protected Object getDefault(String path) {
-        Configuration root = getRoot();
-        Configuration defaults = root == null ? null : root.getDefaults();
-        return (defaults == null) ? null : defaults.get(createPath(this, path));
-    }
-
-    protected void mapChildrenKeys(Set<String> output, ConfigurationSection section, boolean deep) {
-        if (section instanceof MemorySection) {
-            MemorySection sec = (MemorySection) section;
-
-            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
-                output.add(createPath(section, entry.getKey(), this));
-
-                if (deep && (entry.getValue() instanceof ConfigurationSection)) {
-                    ConfigurationSection subsection = (ConfigurationSection) entry.getValue();
-                    mapChildrenKeys(output, subsection, deep);
-                }
-            }
-        } else {
-            Set<String> keys = section.getKeys(deep);
-
-            for (String key : keys) {
-                output.add(createPath(section, key, this));
-            }
-        }
-    }
-
-    protected void mapChildrenValues(Map<String, Object> output, ConfigurationSection section,
-        boolean deep) {
-        if (section instanceof MemorySection) {
-            MemorySection sec = (MemorySection) section;
-
-            for (Map.Entry<String, Object> entry : sec.map.entrySet()) {
-                output.put(createPath(section, entry.getKey(), this), entry.getValue());
-
-                if (entry.getValue() instanceof ConfigurationSection) {
-                    if (deep) {
-                        mapChildrenValues(output, (ConfigurationSection) entry.getValue(), deep);
-                    }
-                }
-            }
-        } else {
-            Map<String, Object> values = section.getValues(deep);
-
-            for (Map.Entry<String, Object> entry : values.entrySet()) {
-                output.put(createPath(section, entry.getKey(), this), entry.getValue());
-            }
-        }
-    }
-
-    @Override public String toString() {
-        Configuration root = getRoot();
-        if (root == null) {
-            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + null
-                + "']";
-        } else {
-            return getClass().getSimpleName() + "[path='" + getCurrentPath() + "', root='" + root
-                .getClass().getSimpleName() + "']";
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
deleted file mode 100644
index bc0b375e9..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.file;
-
-import com.github.intellectualsites.plotsquared.configuration.Configuration;
-import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
-import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration;
-
-import javax.annotation.Nonnull;
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-
-/**
- * This is a base class for all File based implementations of {@link
- * Configuration}.
- */
-public abstract class FileConfiguration extends MemoryConfiguration {
-
-    /**
-     * Creates an empty {@link FileConfiguration} with no default values.
-     */
-    FileConfiguration() {
-    }
-
-    /**
-     * Creates an empty {@link FileConfiguration} using the specified {@link
-     * Configuration} as a source for all default values.
-     *
-     * @param defaults Default value provider
-     */
-    public FileConfiguration(Configuration defaults) {
-        super(defaults);
-    }
-
-    /**
-     * Saves this {@link FileConfiguration} to the specified location.
-     *
-     * <p>If the file does not exist, it will be created. If already exists, it
-     * will be overwritten. If it cannot be overwritten or created, an
-     * exception will be thrown.
-     *
-     * <p>This method will save using the system default encoding, or possibly
-     * using UTF8.
-     *
-     * @param file File to save to.
-     * @throws IOException Thrown when the given file cannot be written to for
-     *                     any reason.
-     */
-    public void save(File file) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null) {
-            parent.mkdirs();
-        }
-
-        String data = saveToString();
-
-        try (Writer writer = new OutputStreamWriter(new FileOutputStream(file),
-            StandardCharsets.UTF_8)) {
-            writer.write(data);
-        }
-    }
-
-    /**
-     * Saves this {@link FileConfiguration} to a string, and returns it.
-     *
-     * @return String containing this configuration.
-     */
-    public abstract String saveToString();
-
-    /**
-     * Loads this {@link FileConfiguration} from the specified location.
-     *
-     * <p>All the values contained within this configuration will be removed,
-     * leaving only settings and defaults, and the new values will be loaded
-     * from the given file.
-     *
-     * <p>If the file cannot be loaded for any reason, an exception will be
-     * thrown.
-     *
-     * @param file File to load from.
-     * @throws FileNotFoundException         Thrown when the given file cannot be
-     *                                       opened.
-     * @throws IOException                   Thrown when the given file cannot be read.
-     * @throws InvalidConfigurationException Thrown when the given file is not
-     *                                       a valid Configuration.
-     * @throws IllegalArgumentException      Thrown when file is null.
-     */
-    public void load(@Nonnull File file) throws IOException, InvalidConfigurationException {
-
-        FileInputStream stream = new FileInputStream(file);
-
-        load(new InputStreamReader(stream, StandardCharsets.UTF_8));
-    }
-
-    /**
-     * Loads this {@link FileConfiguration} from the specified reader.
-     *
-     * <p>All the values contained within this configuration will be removed,
-     * leaving only settings and defaults, and the new values will be loaded
-     * from the given stream.
-     *
-     * @param reader the reader to load from
-     * @throws IOException                   thrown when underlying reader throws an IOException
-     * @throws InvalidConfigurationException thrown when the reader does not
-     *                                       represent a valid Configuration
-     */
-    public void load(Reader reader) throws IOException, InvalidConfigurationException {
-
-        StringBuilder builder = new StringBuilder();
-
-        try (BufferedReader input = reader instanceof BufferedReader ?
-            (BufferedReader) reader :
-            new BufferedReader(reader)) {
-            String line;
-
-            while ((line = input.readLine()) != null) {
-                builder.append(line);
-                builder.append('\n');
-            }
-        }
-
-        loadFromString(builder.toString());
-    }
-
-    /**
-     * Loads this {@link FileConfiguration} from the specified string, as
-     * opposed to from file.
-     *
-     * <p>All the values contained within this configuration will be removed,
-     * leaving only settings and defaults, and the new values will be loaded
-     * from the given string.
-     *
-     * <p>If the string is invalid in any way, an exception will be thrown.
-     *
-     * @param contents Contents of a Configuration to load.
-     * @throws InvalidConfigurationException Thrown if the specified string is
-     *                                       invalid.
-     */
-    public abstract void loadFromString(String contents) throws InvalidConfigurationException;
-
-    /**
-     * Compiles the header for this {@link FileConfiguration} and returns the
-     * result.
-     *
-     * <p>This will use the header from {@link #options()} -> {@link
-     * FileConfigurationOptions#header()}, respecting the rules of {@link
-     * FileConfigurationOptions#copyHeader()} if set.
-     *
-     * @return Compiled header
-     */
-    protected abstract String buildHeader();
-
-    @Override public FileConfigurationOptions options() {
-        if (this.options == null) {
-            this.options = new FileConfigurationOptions(this);
-        }
-
-        return (FileConfigurationOptions) this.options;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java
deleted file mode 100644
index a216d0566..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.file;
-
-import com.github.intellectualsites.plotsquared.configuration.Configuration;
-import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration;
-import com.github.intellectualsites.plotsquared.configuration.MemoryConfigurationOptions;
-
-/**
- * Various settings for controlling the input and output of a {@link
- * FileConfiguration}.
- */
-public class FileConfigurationOptions extends MemoryConfigurationOptions {
-    private String header = null;
-    private boolean copyHeader = true;
-
-    protected FileConfigurationOptions(MemoryConfiguration configuration) {
-        super(configuration);
-    }
-
-    @Override public FileConfiguration configuration() {
-        return (FileConfiguration) super.configuration();
-    }
-
-    @Override public FileConfigurationOptions copyDefaults(boolean value) {
-        super.copyDefaults(value);
-        return this;
-    }
-
-    @Override public FileConfigurationOptions pathSeparator(char value) {
-        super.pathSeparator(value);
-        return this;
-    }
-
-    /**
-     * Gets the header that will be applied to the top of the saved output.
-     *
-     * <p>This header will be commented out and applied directly at the top of
-     * the generated output of the {@link FileConfiguration}. It is not
-     * required to include a newline at the end of the header as it will
-     * automatically be applied, but you may include one if you wish for extra
-     * spacing.
-     *
-     * <p>{@code null} is a valid value which will indicate that no header]
-     * is to be applied. The default value is {@code null}.
-     *
-     * @return Header
-     */
-    public String header() {
-        return header;
-    }
-
-    /**
-     * Sets the header that will be applied to the top of the saved output.
-     *
-     * <p>This header will be commented out and applied directly at the top of
-     * the generated output of the {@link FileConfiguration}. It is not
-     * required to include a newline at the end of the header as it will
-     * automatically be applied, but you may include one if you wish for extra
-     * spacing.
-     *
-     * <p>{@code null} is a valid value which will indicate that no header
-     * is to be applied.
-     *
-     * @param value New header
-     * @return This object, for chaining
-     */
-    public FileConfigurationOptions header(String value) {
-        header = value;
-        return this;
-    }
-
-    /**
-     * Gets whether or not the header should be copied from a default source.
-     *
-     * <p>If this is true, if a default {@link FileConfiguration} is passed to
-     * {@link FileConfiguration#setDefaults(Configuration)}
-     * then upon saving it will use the header from that config, instead of
-     * the one provided here.
-     *
-     * <p>If no default is set on the configuration, or the default is not of
-     * type FileConfiguration, or that config has no header ({@link #header()}
-     * returns null) then the header specified in this configuration will be
-     * used.
-     *
-     * <p>Defaults to true.
-     *
-     * @return Whether or not to copy the header
-     */
-    public boolean copyHeader() {
-        return copyHeader;
-    }
-
-    /**
-     * Sets whether or not the header should be copied from a default source.
-     *
-     * <p>If this is true, if a default {@link FileConfiguration} is passed to
-     * {@link FileConfiguration#setDefaults(Configuration)}
-     * then upon saving it will use the header from that config, instead of
-     * the one provided here.
-     *
-     * <p>If no default is set on the configuration, or the default is not of
-     * type FileConfiguration, or that config has no header ({@link #header()}
-     * returns null) then the header specified in this configuration will be
-     * used.
-     *
-     * <p>Defaults to true.
-     *
-     * @param value Whether or not to copy the header
-     * @return This object, for chaining
-     */
-    public FileConfigurationOptions copyHeader(boolean value) {
-        copyHeader = value;
-
-        return this;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
deleted file mode 100644
index 1e694f05a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.file;
-
-import com.github.intellectualsites.plotsquared.configuration.Configuration;
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.representer.Representer;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.Map;
-
-/**
- * An implementation of {@link Configuration} which saves all files in Yaml.
- * Note that this implementation is not synchronized.
- */
-public class YamlConfiguration extends FileConfiguration {
-    private static final String COMMENT_PREFIX = "# ";
-    private static final String BLANK_CONFIG = "{}\n";
-    private final DumperOptions yamlOptions = new DumperOptions();
-    private final Representer yamlRepresenter = new YamlRepresenter();
-    private final Yaml yaml = new Yaml(new YamlConstructor(), yamlRepresenter, yamlOptions);
-
-    /**
-     * Creates a new {@link YamlConfiguration}, loading from the given file.
-     *
-     * <p>Any errors loading the Configuration will be logged and then ignored.
-     * If the specified input is not a valid config, a blank config will be
-     * returned.
-     *
-     * <p>The encoding used may follow the system dependent default.
-     *
-     * @param file Input file
-     * @return Resulting configuration
-     */
-    public static YamlConfiguration loadConfiguration(File file) {
-        YamlConfiguration config = new YamlConfiguration();
-
-        try {
-            config.load(file);
-        } catch (InvalidConfigurationException | IOException ex) {
-            try {
-                File dest = new File(file.getAbsolutePath() + "_broken");
-                int i = 0;
-                while (dest.exists()) {
-                    dest = new File(file.getAbsolutePath() + "_broken_" + i++);
-                }
-                Files.copy(file.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING);
-                PlotSquared.debug("&dCould not read: &7" + file);
-                PlotSquared.debug("&dRenamed to: &7" + dest.getName());
-                PlotSquared.debug("&c============ Full stacktrace ============");
-                ex.printStackTrace();
-                PlotSquared.debug("&c=========================================");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return config;
-    }
-
-    @Override public String saveToString() {
-        yamlOptions.setIndent(options().indent());
-        yamlOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-        yamlRepresenter.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
-
-        String header = buildHeader();
-        String dump = yaml.dump(getValues(false));
-
-        if (dump.equals(BLANK_CONFIG)) {
-            dump = "";
-        }
-
-        return header + dump;
-    }
-
-    @Override public void loadFromString(String contents) throws InvalidConfigurationException {
-
-        Map<?, ?> input;
-        try {
-            input = yaml.load(contents);
-        } catch (YAMLException e) {
-            throw new InvalidConfigurationException(e);
-        } catch (ClassCastException ignored) {
-            throw new InvalidConfigurationException("Top level is not a Map.");
-        }
-
-        String header = parseHeader(contents);
-        if (!header.isEmpty()) {
-            options().header(header);
-        }
-
-        if (input != null) {
-            convertMapsToSections(input, this);
-        }
-    }
-
-    protected void convertMapsToSections(Map<?, ?> input, ConfigurationSection section) {
-        for (Map.Entry<?, ?> entry : input.entrySet()) {
-            String key = entry.getKey().toString();
-            Object value = entry.getValue();
-
-            if (value instanceof Map) {
-                convertMapsToSections((Map<?, ?>) value, section.createSection(key));
-            } else {
-                section.set(key, value);
-            }
-        }
-    }
-
-    protected String parseHeader(String input) {
-        String[] lines = input.split("\r?\n", -1);
-        StringBuilder result = new StringBuilder();
-        boolean readingHeader = true;
-        boolean foundHeader = false;
-
-        for (int i = 0; (i < lines.length) && readingHeader; i++) {
-            String line = lines[i];
-
-            if (line.startsWith(COMMENT_PREFIX)) {
-                if (i > 0) {
-                    result.append('\n');
-                }
-
-                if (line.length() > COMMENT_PREFIX.length()) {
-                    result.append(line.substring(COMMENT_PREFIX.length()));
-                }
-
-                foundHeader = true;
-            } else if (foundHeader && line.isEmpty()) {
-                result.append('\n');
-            } else if (foundHeader) {
-                readingHeader = false;
-            }
-        }
-
-        return result.toString();
-    }
-
-    @Override protected String buildHeader() {
-        String header = options().header();
-
-        if (options().copyHeader()) {
-            Configuration def = getDefaults();
-
-            if (def instanceof FileConfiguration) {
-                FileConfiguration fileDefaults = (FileConfiguration) def;
-                String defaultsHeader = fileDefaults.buildHeader();
-
-                if ((defaultsHeader != null) && !defaultsHeader.isEmpty()) {
-                    return defaultsHeader;
-                }
-            }
-        }
-
-        if (header == null) {
-            return "";
-        }
-
-        StringBuilder builder = new StringBuilder();
-        String[] lines = header.split("\r?\n", -1);
-        boolean startedHeader = false;
-
-        for (int i = lines.length - 1; i >= 0; i--) {
-            builder.insert(0, '\n');
-
-            if (startedHeader || !lines[i].isEmpty()) {
-                builder.insert(0, lines[i]);
-                builder.insert(0, COMMENT_PREFIX);
-                startedHeader = true;
-            }
-        }
-
-        return builder.toString();
-    }
-
-    @Override public YamlConfigurationOptions options() {
-        if (options == null) {
-            options = new YamlConfigurationOptions(this);
-        }
-
-        return (YamlConfigurationOptions) options;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
deleted file mode 100644
index 730527652..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.file;
-
-/**
- * Various settings for controlling the input and output of a {@link
- * YamlConfiguration}.
- */
-public class YamlConfigurationOptions extends FileConfigurationOptions {
-    private int indent = 2;
-
-    YamlConfigurationOptions(YamlConfiguration configuration) {
-        super(configuration);
-    }
-
-    @Override public YamlConfiguration configuration() {
-        return (YamlConfiguration) super.configuration();
-    }
-
-    @Override public YamlConfigurationOptions copyDefaults(boolean value) {
-        super.copyDefaults(value);
-        return this;
-    }
-
-    @Override public YamlConfigurationOptions pathSeparator(char value) {
-        super.pathSeparator(value);
-        return this;
-    }
-
-    @Override public YamlConfigurationOptions header(String value) {
-        super.header(value);
-        return this;
-    }
-
-    @Override public YamlConfigurationOptions copyHeader(boolean value) {
-        super.copyHeader(value);
-        return this;
-    }
-
-    /**
-     * Gets how much spaces should be used to indent each line.
-     *
-     * <p>The minimum value this may be is 2, and the maximum is 9.
-     *
-     * @return How much to indent by
-     */
-    int indent() {
-        return indent;
-    }
-
-    /**
-     * Sets how much spaces should be used to indent each line.
-     *
-     * <p>The minimum value this may be is 2, and the maximum is 9.
-     *
-     * @param value New indent
-     * @return This object, for chaining
-     */
-    public YamlConfigurationOptions indent(int value) {
-        if (value < 2) {
-            throw new IllegalArgumentException("Indent must be at least 2 characters");
-        }
-        if (value > 9) {
-            throw new IllegalArgumentException("Indent cannot be greater than 9 characters");
-        }
-
-        indent = value;
-        return this;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
deleted file mode 100644
index cdc5eb821..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.file;
-
-import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
-import org.yaml.snakeyaml.constructor.SafeConstructor;
-import org.yaml.snakeyaml.error.YAMLException;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.nodes.Tag;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-class YamlConstructor extends SafeConstructor {
-
-    YamlConstructor() {
-        yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
-    }
-
-    private class ConstructCustomObject extends ConstructYamlMap {
-        @Override public Object construct(final Node node) {
-            if (node.isTwoStepsConstruction()) {
-                throw new YAMLException("Unexpected referential mapping structure. Node: " + node);
-            }
-
-            final Map<?, ?> raw = (Map<?, ?>) super.construct(node);
-
-            if (raw.containsKey(ConfigurationSerialization.SERIALIZED_TYPE_KEY)) {
-                final Map<String, Object> typed = new LinkedHashMap<>(raw.size());
-                for (final Map.Entry<?, ?> entry : raw.entrySet()) {
-                    typed.put(entry.getKey().toString(), entry.getValue());
-                }
-
-                try {
-                    return ConfigurationSerialization.deserializeObject(typed);
-                } catch (final IllegalArgumentException ex) {
-                    throw new YAMLException("Could not deserialize object", ex);
-                }
-            }
-
-            return raw;
-        }
-
-        @Override public void construct2ndStep(final Node node, final Object object) {
-            throw new YAMLException("Unexpected referential mapping structure. Node: " + node);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java
deleted file mode 100644
index ebe1aebee..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.file;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
-import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
-import org.yaml.snakeyaml.nodes.Node;
-import org.yaml.snakeyaml.representer.Representer;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-class YamlRepresenter extends Representer {
-
-    YamlRepresenter() {
-        this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
-        this.multiRepresenters
-            .put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());
-    }
-
-    private class RepresentConfigurationSection extends RepresentMap {
-
-        @Override public Node representData(Object data) {
-            return super.representData(((ConfigurationSection) data).getValues(false));
-        }
-    }
-
-
-    private class RepresentConfigurationSerializable extends RepresentMap {
-
-        @Override public Node representData(Object data) {
-            ConfigurationSerializable serializable = (ConfigurationSerializable) data;
-            Map<String, Object> values = new LinkedHashMap<>();
-            values.put(ConfigurationSerialization.SERIALIZED_TYPE_KEY,
-                ConfigurationSerialization.getAlias(serializable.getClass()));
-            values.putAll(serializable.serialize());
-
-            return super.representData(values);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java
deleted file mode 100644
index f83e7a468..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.serialization;
-
-import java.util.Map;
-
-/**
- * Represents an object that may be serialized.
- * <p>These objects MUST implement one of the following, in addition to
- * the methods as defined by this interface:
- * <ul>
- * <li>A static method "deserialize" that accepts a single {@link Map}&lt;
- * {@link String}, {@link Object}> and returns the class.</li>
- * <li>A static method "valueOf" that accepts a single {@link Map}&lt;{@link
- * String}, {@link Object}> and returns the class.</li>
- * <li>A constructor that accepts a single {@link Map}&lt;{@link String},
- * {@link Object}>.</li>
- * </ul>
- * In addition to implementing this interface, you must register the class
- * with {@link ConfigurationSerialization#registerClass(Class)}.
- *
- * @see DelegateDeserialization
- * @see SerializableAs
- */
-public interface ConfigurationSerializable {
-
-    /**
-     * Creates a Map representation of this class.
-     *
-     * <p>This class must provide a method to restore this class, as defined in
-     * the {@link ConfigurationSerializable} interface javadoc.
-     *
-     * @return Map containing the current state of this class
-     */
-    Map<String, Object> serialize();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
deleted file mode 100644
index 0783b4af5..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.serialization;
-
-import com.github.intellectualsites.plotsquared.configuration.Configuration;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Utility class for storing and retrieving classes for {@link Configuration}.
- */
-public class ConfigurationSerialization {
-
-    public static final String SERIALIZED_TYPE_KEY = "==";
-    private static final Map<String, Class<? extends ConfigurationSerializable>> aliases =
-        new HashMap<>();
-    private final Class<? extends ConfigurationSerializable> clazz;
-
-    protected ConfigurationSerialization(Class<? extends ConfigurationSerializable> clazz) {
-        this.clazz = clazz;
-    }
-
-    /**
-     * Attempts to deserialize the given arguments into a new instance of the
-     * given class.
-     * <p>
-     * <p>The class must implement {@link ConfigurationSerializable}, including
-     * the extra methods as specified in the javadoc of
-     * ConfigurationSerializable.</p>
-     * <p>
-     * <p>If a new instance could not be made, an example being the class not
-     * fully implementing the interface, null will be returned.</p>
-     *
-     * @param args  Arguments for deserialization
-     * @param clazz Class to deserialize into
-     * @return New instance of the specified class
-     */
-    public static ConfigurationSerializable deserializeObject(Map<String, ?> args,
-        Class<? extends ConfigurationSerializable> clazz) {
-        return new ConfigurationSerialization(clazz).deserialize(args);
-    }
-
-    /**
-     * Attempts to deserialize the given arguments into a new instance of the
-     * <p>
-     * given class.
-     * <p>
-     * The class must implement {@link ConfigurationSerializable}, including
-     * the extra methods as specified in the javadoc of
-     * ConfigurationSerializable.</p>
-     * <p>
-     * <p>
-     * If a new instance could not be made, an example being the class not
-     * fully implementing the interface, null will be returned.</p>
-     *
-     * @param args Arguments for deserialization
-     * @return New instance of the specified class
-     */
-    public static ConfigurationSerializable deserializeObject(Map<String, ?> args) {
-        Class<? extends ConfigurationSerializable> clazz = null;
-
-        if (args.containsKey(SERIALIZED_TYPE_KEY)) {
-            try {
-                String alias = (String) args.get(SERIALIZED_TYPE_KEY);
-
-                if (alias == null) {
-                    throw new IllegalArgumentException("Cannot have null alias");
-                }
-                clazz = getClassByAlias(alias);
-                if (clazz == null) {
-                    throw new IllegalArgumentException(
-                        "Specified class does not exist ('" + alias + "')");
-                }
-            } catch (ClassCastException ex) {
-                ex.fillInStackTrace();
-                throw ex;
-            }
-        } else {
-            throw new IllegalArgumentException(
-                "Args doesn't contain type key ('" + SERIALIZED_TYPE_KEY + "')");
-        }
-
-        return new ConfigurationSerialization(clazz).deserialize(args);
-    }
-
-    /**
-     * Registers the given {@link ConfigurationSerializable} class by its
-     * alias.
-     *
-     * @param clazz Class to register
-     */
-    public static void registerClass(Class<? extends ConfigurationSerializable> clazz) {
-        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
-
-        if (delegate == null) {
-            registerClass(clazz, getAlias(clazz));
-            registerClass(clazz, clazz.getName());
-        }
-    }
-
-    /**
-     * Registers the given alias to the specified {@link
-     * ConfigurationSerializable} class.
-     *
-     * @param clazz Class to register
-     * @param alias Alias to register as
-     * @see SerializableAs
-     */
-    public static void registerClass(Class<? extends ConfigurationSerializable> clazz,
-        String alias) {
-        aliases.put(alias, clazz);
-    }
-
-    /**
-     * Unregisters the specified alias to a {@link ConfigurationSerializable}
-     *
-     * @param alias Alias to unregister
-     */
-    public static void unregisterClass(String alias) {
-        aliases.remove(alias);
-    }
-
-    /**
-     * Unregisters any aliases for the specified {@link
-     * ConfigurationSerializable} class.
-     *
-     * @param clazz Class to unregister
-     */
-    public static void unregisterClass(Class<? extends ConfigurationSerializable> clazz) {
-        while (aliases.values().remove(clazz)) {
-        }
-    }
-
-    /**
-     * Attempts to get a registered {@link ConfigurationSerializable} class by
-     * its alias.
-     *
-     * @param alias Alias of the serializable
-     * @return Registered class, or null if not found
-     */
-    public static Class<? extends ConfigurationSerializable> getClassByAlias(String alias) {
-        return aliases.get(alias);
-    }
-
-    /**
-     * Gets the correct alias for the given {@link ConfigurationSerializable}
-     * class.
-     *
-     * @param clazz Class to get alias for
-     * @return Alias to use for the class
-     */
-    public static String getAlias(Class<? extends ConfigurationSerializable> clazz) {
-        DelegateDeserialization delegate = clazz.getAnnotation(DelegateDeserialization.class);
-
-        if (delegate != null) {
-            if (delegate.value() == clazz) {
-                delegate = null;
-            } else {
-                return getAlias(delegate.value());
-            }
-        }
-
-        SerializableAs alias = clazz.getAnnotation(SerializableAs.class);
-
-        if (alias != null) {
-            return alias.value();
-        }
-
-        return clazz.getName();
-    }
-
-    protected Method getMethod(String name, boolean isStatic) {
-        try {
-            Method method = this.clazz.getDeclaredMethod(name, Map.class);
-
-            if (!ConfigurationSerializable.class.isAssignableFrom(method.getReturnType())) {
-                return null;
-            }
-            if (Modifier.isStatic(method.getModifiers()) != isStatic) {
-                return null;
-            }
-
-            return method;
-        } catch (NoSuchMethodException | SecurityException ignored) {
-            return null;
-        }
-    }
-
-    protected Constructor<? extends ConfigurationSerializable> getConstructor() {
-        try {
-            return this.clazz.getConstructor(Map.class);
-        } catch (NoSuchMethodException | SecurityException ignored) {
-            return null;
-        }
-    }
-
-    protected ConfigurationSerializable deserializeViaMethod(Method method, Map<String, ?> args) {
-        try {
-            ConfigurationSerializable result =
-                (ConfigurationSerializable) method.invoke(null, args);
-
-            if (result == null) {
-                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
-                    "Could not call method '" + method.toString() + "' of " + this.clazz
-                        + " for deserialization: method returned null");
-            } else {
-                return result;
-            }
-        } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ex) {
-            Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
-                "Could not call method '" + method.toString() + "' of " + this.clazz
-                    + " for deserialization",
-                ex instanceof InvocationTargetException ? ex.getCause() : ex);
-        }
-
-        return null;
-    }
-
-    protected ConfigurationSerializable deserializeViaCtor(
-        Constructor<? extends ConfigurationSerializable> ctor, Map<String, ?> args) {
-        try {
-            return ctor.newInstance(args);
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | InstantiationException ex) {
-            Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
-                "Could not call constructor '" + ctor.toString() + "' of " + this.clazz
-                    + " for deserialization",
-                ex instanceof InvocationTargetException ? ex.getCause() : ex);
-        }
-
-        return null;
-    }
-
-    public ConfigurationSerializable deserialize(Map<String, ?> args) {
-        if (args == null) {
-            throw new NullPointerException("Args must not be null");
-        }
-        ConfigurationSerializable result = null;
-        Method method = getMethod("deserialize", true);
-        if (method != null) {
-            result = deserializeViaMethod(method, args);
-        }
-        if (result == null) {
-            method = getMethod("valueOf", true);
-            if (method != null) {
-                result = deserializeViaMethod(method, args);
-            }
-        }
-        if (result == null) {
-            Constructor<? extends ConfigurationSerializable> constructor = getConstructor();
-            if (constructor != null) {
-                result = deserializeViaCtor(constructor, args);
-            }
-        }
-
-        return result;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java
deleted file mode 100644
index 8a071cb2e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.serialization;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Applies to a {@link ConfigurationSerializable} that will delegate all
- * deserialization to another {@link ConfigurationSerializable}.
- */
-@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE)
-public @interface DelegateDeserialization {
-    /**
-     * Which class should be used as a delegate for this classes
-     * deserialization
-     *
-     * @return Delegate class
-     */
-    Class<? extends ConfigurationSerializable> value();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java
deleted file mode 100644
index 79b50998c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.intellectualsites.plotsquared.configuration.serialization;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Represents an "alias" that a {@link ConfigurationSerializable} may be
- * stored as.
- * If this is not present on a {@link ConfigurationSerializable} class, it
- * will use the fully qualified name of the class.
- * <p>
- * This value will be stored in the configuration so that the configuration
- * deserialization can determine what type it is.
- * <p>
- * Using this annotation on any other class than a {@link
- * ConfigurationSerializable} will have no effect.
- *
- * @see ConfigurationSerialization#registerClass(Class, String)
- */
-@Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface SerializableAs {
-    /**
-     * This is the name your class will be stored and retrieved as.
-     * <p>
-     * This name MUST be unique. We recommend using names such as
-     * "MyPluginThing" instead of "Thing".
-     *
-     * @return Name to serialize the class as.
-     */
-    String value();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java
deleted file mode 100644
index 62ee01329..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONArray.java
+++ /dev/null
@@ -1,815 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * A JSONArray is an ordered sequence of values. Its external text form is a string wrapped in square brackets with
- * commas separating the values. The internal form is an object having {@code get} and {@code opt} methods for
- * accessing the values by index, and {@code put} methods for adding or replacing values. The values can be any of
- * these types: {@code Boolean}, {@code JSONArray}, {@code JSONObject}, {@code Number},
- * {@code String}, or the {@code JSONObject.NULL object}.
- *
- * <p>The constructor can convert a JSON text into a Java object. The {@code toString} method converts to JSON text.
- *
- * <p>A {@code get} method returns a value if one can be found, and throws an exception if one cannot be found. An
- * {@code opt} method returns a default value instead of throwing an exception, and so is useful for obtaining
- * optional values.
- *
- * <p>The generic {@code get()} and {@code opt()} methods return an object which you can cast or query for type.
- * There are also typed {@code get} and {@code opt} methods that do type checking and type coercion for you.
- *
- * <p>The texts produced by the {@code toString} methods strictly conform to JSON syntax rules. The constructors are
- * more forgiving in the texts they will accept: <ul> <li>An extra {@code ,}&nbsp;<small>(comma)</small> may appear
- * just before the closing bracket.</li> <li>The {@code null} value will be inserted when there is {@code ,}
- * &nbsp;<small>(comma)</small> elision.</li> <li>Strings may be quoted with {@code '}&nbsp;<small>(single
- * quote)</small>.</li> <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
- * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: {@code { }
- * [ ] / \ : , #} and if they do not look like numbers and if they are not the reserved words {@code true},
- * {@code false}, or {@code null}.</li> </ul>
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class JSONArray {
-    /**
-     * The arrayList where the JSONArray's properties are kept.
-     */
-    private final ArrayList<Object> myArrayList;
-
-    /**
-     * Construct an empty JSONArray.
-     */
-    public JSONArray() {
-        this.myArrayList = new ArrayList<Object>();
-    }
-
-    /**
-     * Construct a JSONArray from a JSONTokener.
-     *
-     * @param x A JSONTokener
-     * @throws JSONException If there is a syntax error.
-     */
-    public JSONArray(JSONTokener x) throws JSONException {
-        this();
-        if (x.nextClean() != '[') {
-            throw x.syntaxError("A JSONArray text must start with '['");
-        }
-        if (x.nextClean() != ']') {
-            x.back();
-            for (; ; ) {
-                if (x.nextClean() == ',') {
-                    x.back();
-                    this.myArrayList.add(JSONObject.NULL);
-                } else {
-                    x.back();
-                    this.myArrayList.add(x.nextValue());
-                }
-                switch (x.nextClean()) {
-                    case ',':
-                        if (x.nextClean() == ']') {
-                            return;
-                        }
-                        x.back();
-                        break;
-                    case ']':
-                        return;
-                    default:
-                        throw x.syntaxError("Expected a ',' or ']'");
-                }
-            }
-        }
-    }
-
-    /**
-     * Construct a JSONArray from a source JSON text.
-     *
-     * @param source A string that begins with {@code [}&nbsp;<small>(left bracket)</small> and ends with
-     *               {@code ]} &nbsp;<small>(right bracket)</small>.
-     * @throws JSONException If there is a syntax error.
-     */
-    public JSONArray(String source) throws JSONException {
-        this(new JSONTokener(source));
-    }
-
-    /**
-     * Construct a JSONArray from a Collection.
-     *
-     * @param collection A Collection.
-     */
-    public JSONArray(Collection<Object> collection) {
-        this.myArrayList = new ArrayList<Object>();
-        if (collection != null) {
-            for (Object aCollection : collection) {
-                this.myArrayList.add(JSONObject.wrap(aCollection));
-            }
-        }
-    }
-
-    /**
-     * Construct a JSONArray from an array
-     *
-     * @throws JSONException If not an array.
-     */
-    public JSONArray(Object array) throws JSONException {
-        this();
-        if (array.getClass().isArray()) {
-            int length = Array.getLength(array);
-            for (int i = 0; i < length; i += 1) {
-                this.put(JSONObject.wrap(Array.get(array, i)));
-            }
-        } else {
-            throw new JSONException(
-                "JSONArray initial value should be a string or collection or array.");
-        }
-    }
-
-    /**
-     * Get the object value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return An object value.
-     * @throws JSONException If there is no value for the index.
-     */
-    public Object get(int index) throws JSONException {
-        Object object = opt(index);
-        if (object == null) {
-            throw new JSONException("JSONArray[" + index + "] not found.");
-        }
-        return object;
-    }
-
-    /**
-     * Get the boolean value associated with an index. The string values "true" and "false" are converted to boolean.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The truth.
-     * @throws JSONException If there is no value for the index or if the value is not convertible to boolean.
-     */
-    public boolean getBoolean(int index) throws JSONException {
-        Object object = get(index);
-        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object)
-            .equalsIgnoreCase("false"))) {
-            return false;
-        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object)
-            .equalsIgnoreCase("true"))) {
-            return true;
-        }
-        throw new JSONException("JSONArray[" + index + "] is not a boolean.");
-    }
-
-    /**
-     * Get the double value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The value.
-     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
-     */
-    public double getDouble(int index) throws JSONException {
-        Object object = get(index);
-        try {
-            return object instanceof Number ?
-                ((Number) object).doubleValue() :
-                Double.parseDouble((String) object);
-        } catch (NumberFormatException ignored) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
-        }
-    }
-
-    /**
-     * Get the int value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The value.
-     * @throws JSONException If the key is not found or if the value is not a number.
-     */
-    public int getInt(int index) throws JSONException {
-        Object object = get(index);
-        try {
-            return object instanceof Number ?
-                ((Number) object).intValue() :
-                Integer.parseInt((String) object);
-        } catch (NumberFormatException ignored) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
-        }
-    }
-
-    /**
-     * Get the JSONArray associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return A JSONArray value.
-     * @throws JSONException If there is no value for the index. or if the value is not a JSONArray
-     */
-    public JSONArray getJSONArray(int index) throws JSONException {
-        Object object = get(index);
-        if (object instanceof JSONArray) {
-            return (JSONArray) object;
-        }
-        throw new JSONException("JSONArray[" + index + "] is not a JSONArray.");
-    }
-
-    /**
-     * Get the JSONObject associated with an index.
-     *
-     * @param index subscript
-     * @return A JSONObject value.
-     * @throws JSONException If there is no value for the index or if the value is not a JSONObject
-     */
-    public JSONObject getJSONObject(int index) throws JSONException {
-        Object object = get(index);
-        if (object instanceof JSONObject) {
-            return (JSONObject) object;
-        }
-        throw new JSONException("JSONArray[" + index + "] is not a JSONObject.");
-    }
-
-    /**
-     * Get the long value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The value.
-     * @throws JSONException If the key is not found or if the value cannot be converted to a number.
-     */
-    public long getLong(int index) throws JSONException {
-        Object object = get(index);
-        try {
-            return object instanceof Number ?
-                ((Number) object).longValue() :
-                Long.parseLong((String) object);
-        } catch (NumberFormatException ignored) {
-            throw new JSONException("JSONArray[" + index + "] is not a number.");
-        }
-    }
-
-    /**
-     * Get the string associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return A string value.
-     * @throws JSONException If there is no string value for the index.
-     */
-    public String getString(int index) throws JSONException {
-        Object object = get(index);
-        if (object instanceof String) {
-            return (String) object;
-        }
-        throw new JSONException("JSONArray[" + index + "] not a string.");
-    }
-
-    /**
-     * Determine if the value is null.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return true if the value at the index is null, or if there is no value.
-     */
-    public boolean isNull(int index) {
-        return JSONObject.NULL.equals(opt(index));
-    }
-
-    /**
-     * Make a string from the contents of this JSONArray. The {@code separator} string is inserted between each
-     * element. Warning: This method assumes that the data structure is acyclical.
-     *
-     * @param separator A string that will be inserted between the elements.
-     * @return a string.
-     * @throws JSONException If the array contains an invalid number.
-     */
-    public String join(String separator) throws JSONException {
-        int len = length();
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < len; i += 1) {
-            if (i > 0) {
-                sb.append(separator);
-            }
-            sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Get the number of elements in the JSONArray, included nulls.
-     *
-     * @return The length (or size).
-     */
-    public int length() {
-        return this.myArrayList.size();
-    }
-
-    /**
-     * Get the optional object value associated with an index.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return An object value, or null if there is no object at that index.
-     */
-    public Object opt(int index) {
-        return ((index < 0) || (index >= length())) ? null : this.myArrayList.get(index);
-    }
-
-    /**
-     * Get the optional boolean value associated with an index. It returns false if there is no value at that index, or
-     * if the value is not Boolean.TRUE or the String "true".
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The truth.
-     */
-    public boolean optBoolean(int index) {
-        return this.optBoolean(index, false);
-    }
-
-    /**
-     * Get the optional boolean value associated with an index. It returns the defaultValue if there is no value at that
-     * index or if it is not a Boolean or the String "true" or "false" (case insensitive).
-     *
-     * @param index        The index must be between 0 and length() - 1.
-     * @param defaultValue A boolean default.
-     * @return The truth.
-     */
-    public boolean optBoolean(int index, boolean defaultValue) {
-        try {
-            return getBoolean(index);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get the optional double value associated with an index. NaN is returned if there is no value for the index, or if
-     * the value is not a number and cannot be converted to a number.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The value.
-     */
-    public double optDouble(int index) {
-        return this.optDouble(index, Double.NaN);
-    }
-
-    /**
-     * Get the optional double value associated with an index. The defaultValue is returned if there is no value for the
-     * index, or if the value is not a number and cannot be converted to a number.
-     *
-     * @param index        subscript
-     * @param defaultValue The default value.
-     * @return The value.
-     */
-    public double optDouble(int index, double defaultValue) {
-        try {
-            return getDouble(index);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get the optional int value associated with an index. Zero is returned if there is no value for the index, or if
-     * the value is not a number and cannot be converted to a number.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The value.
-     */
-    public int optInt(int index) {
-        return this.optInt(index, 0);
-    }
-
-    /**
-     * Get the optional int value associated with an index. The defaultValue is returned if there is no value for the
-     * index, or if the value is not a number and cannot be converted to a number.
-     *
-     * @param index        The index must be between 0 and length() - 1.
-     * @param defaultValue The default value.
-     * @return The value.
-     */
-    public int optInt(int index, int defaultValue) {
-        try {
-            return getInt(index);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get the optional JSONArray associated with an index.
-     *
-     * @param index subscript
-     * @return A JSONArray value, or null if the index has no value, or if the value is not a JSONArray.
-     */
-    public JSONArray optJSONArray(int index) {
-        Object o = opt(index);
-        return o instanceof JSONArray ? (JSONArray) o : null;
-    }
-
-    /**
-     * Get the optional JSONObject associated with an index. Null is returned if the key is not found, or null if the
-     * index has no value, or if the value is not a JSONObject.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return A JSONObject value.
-     */
-    public JSONObject optJSONObject(int index) {
-        Object o = opt(index);
-        return o instanceof JSONObject ? (JSONObject) o : null;
-    }
-
-    /**
-     * Get the optional long value associated with an index. Zero is returned if there is no value for the index, or if
-     * the value is not a number and cannot be converted to a number.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return The value.
-     */
-    public long optLong(int index) {
-        return this.optLong(index, 0);
-    }
-
-    /**
-     * Get the optional long value associated with an index. The defaultValue
-     * is returned if there is no value for the index, or if the value is not a
-     * number and cannot be converted to a number.
-     *
-     * @param index        The index must be between 0 and length() - 1.
-     * @param defaultValue The default value.
-     * @return The value.
-     */
-    public long optLong(int index, long defaultValue) {
-        try {
-            return getLong(index);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get the optional string value associated with an index. It returns an
-     * empty string if there is no value at that index. If the value is not a
-     * string and is not null, then it is converted to a string.
-     *
-     * @param index The index must be between 0 and length() - 1.
-     * @return A String value.
-     */
-    public String optString(int index) {
-        return this.optString(index, "");
-    }
-
-    /**
-     * Get the optional string associated with an index. The defaultValue is
-     * returned if the key is not found.
-     *
-     * @param index        The index must be between 0 and length() - 1.
-     * @param defaultValue The default value.
-     * @return A String value.
-     */
-    public String optString(int index, String defaultValue) {
-        Object object = opt(index);
-        return JSONObject.NULL.equals(object) ? defaultValue : object.toString();
-    }
-
-    /**
-     * Append a boolean value. This increases the array's length by one.
-     *
-     * @param value A boolean value.
-     * @return this.
-     */
-    public JSONArray put(boolean value) {
-        this.put(value ? Boolean.TRUE : Boolean.FALSE);
-        return this;
-    }
-
-    /**
-     * Put a value in the JSONArray, where the value will be a JSONArray which
-     * is produced from a Collection.
-     *
-     * @param value A Collection value.
-     * @return this.
-     */
-    public JSONArray put(Collection<Object> value) {
-        this.put(new JSONArray(value));
-        return this;
-    }
-
-    /**
-     * Append a double value. This increases the array's length by one.
-     *
-     * @param value A double value.
-     * @return this.
-     * @throws JSONException if the value is not finite.
-     */
-    public JSONArray put(double value) throws JSONException {
-        Double d = value;
-        JSONObject.testValidity(d);
-        this.put(d);
-        return this;
-    }
-
-    /**
-     * Append an int value. This increases the array's length by one.
-     *
-     * @param value An int value.
-     * @return this.
-     */
-    public JSONArray put(int value) {
-        this.put(Integer.valueOf(value));
-        return this;
-    }
-
-    /**
-     * Append an long value. This increases the array's length by one.
-     *
-     * @param value A long value.
-     * @return this.
-     */
-    public JSONArray put(long value) {
-        this.put(Long.valueOf(value));
-        return this;
-    }
-
-    /**
-     * Put a value in the JSONArray, where the value will be a JSONObject which
-     * is produced from a Map.
-     *
-     * @param value A Map value.
-     * @return this.
-     */
-    public JSONArray put(Map<String, Object> value) {
-        this.put(new JSONObject(value));
-        return this;
-    }
-
-    /**
-     * Append an object value. This increases the array's length by one.
-     *
-     * @param value An object value. The value should be a Boolean, Double,
-     *              Integer, JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
-     * @return this.
-     */
-    public JSONArray put(Object value) {
-        this.myArrayList.add(value);
-        return this;
-    }
-
-    /**
-     * Put or replace a boolean value in the JSONArray. If the index is greater than the length of the JSONArray, then
-     * null elements will be added as necessary to pad it out.
-     *
-     * @param index The subscript.
-     * @param value A boolean value.
-     * @return this.
-     * @throws JSONException If the index is negative.
-     */
-    public JSONArray put(int index, boolean value) throws JSONException {
-        this.put(index, value ? Boolean.TRUE : Boolean.FALSE);
-        return this;
-    }
-
-    /**
-     * Put a value in the JSONArray, where the value will be a JSONArray which
-     * is produced from a Collection.
-     *
-     * @param index The subscript.
-     * @param value A Collection value.
-     * @return this.
-     * @throws JSONException If the index is negative or if the value is not
-     *                       finite.
-     */
-    public JSONArray put(int index, Collection<Object> value) throws JSONException {
-        this.put(index, new JSONArray(value));
-        return this;
-    }
-
-    /**
-     * Put or replace a double value. If the index is greater than the length
-     * of the JSONArray, then null elements will be added as necessary to pad
-     * it out.
-     *
-     * @param index The subscript.
-     * @param value A double value.
-     * @return this.
-     * @throws JSONException If the index is negative or if the value is not
-     *                       finite.
-     */
-    public JSONArray put(int index, double value) throws JSONException {
-        this.put(index, new Double(value));
-        return this;
-    }
-
-    /**
-     * Put or replace an int value. If the index is greater than the length of the JSONArray, then null elements will be
-     * added as necessary to pad it out.
-     *
-     * @param index The subscript.
-     * @param value An int value.
-     * @return this.
-     * @throws JSONException If the index is negative.
-     */
-    public JSONArray put(int index, int value) throws JSONException {
-        this.put(index, Integer.valueOf(value));
-        return this;
-    }
-
-    /**
-     * Put or replace a long value. If the index is greater than the length of the JSONArray, then null elements will be
-     * added as necessary to pad it out.
-     *
-     * @param index The subscript.
-     * @param value A long value.
-     * @return this.
-     * @throws JSONException If the index is negative.
-     */
-    public JSONArray put(int index, long value) throws JSONException {
-        this.put(index, Long.valueOf(value));
-        return this;
-    }
-
-    /**
-     * Put a value in the JSONArray, where the value will be a JSONObject that
-     * is produced from a Map.
-     *
-     * @param index The subscript.
-     * @param value The Map value.
-     * @return this.
-     * @throws JSONException If the index is negative or if the the value is an
-     *                       invalid number.
-     */
-    public JSONArray put(int index, Map<String, Object> value) throws JSONException {
-        this.put(index, new JSONObject(value));
-        return this;
-    }
-
-    /**
-     * Put or replace an object value in the JSONArray. If the index is greater than the length of the JSONArray, then
-     * null elements will be added as necessary to pad it out.
-     *
-     * @param index The subscript.
-     * @param value The value to put into the array. The value should be a Boolean, Double, Integer, JSONArray,
-     *              JSONObject, Long, or String, or the JSONObject.NULL object.
-     * @return this.
-     * @throws JSONException If the index is negative or if the the value is an invalid number.
-     */
-    public JSONArray put(int index, Object value) throws JSONException {
-        JSONObject.testValidity(value);
-        if (index < 0) {
-            throw new JSONException("JSONArray[" + index + "] not found.");
-        }
-        if (index < length()) {
-            this.myArrayList.set(index, value);
-        } else {
-            while (index != length()) {
-                this.put(JSONObject.NULL);
-            }
-            this.put(value);
-        }
-        return this;
-    }
-
-    /**
-     * Remove an index and close the hole.
-     *
-     * @param index The index of the element to be removed.
-     * @return The value that was associated with the index, or null if there was no value.
-     */
-    public Object remove(int index) {
-        return (index >= 0) && (index < length()) ? this.myArrayList.remove(index) : null;
-    }
-
-    /**
-     * Determine if two JSONArrays are similar. They must contain similar sequences.
-     *
-     * @param other The other JSONArray
-     * @return true if they are equal
-     */
-    public boolean similar(Object other) {
-        if (!(other instanceof JSONArray)) {
-            return false;
-        }
-        int len = length();
-        if (len != ((JSONArray) other).length()) {
-            return false;
-        }
-        for (int i = 0; i < len; i += 1) {
-            Object valueThis = get(i);
-            Object valueOther = ((JSONArray) other).get(i);
-            if (valueThis instanceof JSONObject) {
-                if (!((JSONObject) valueThis).similar(valueOther)) {
-                    return false;
-                }
-            } else if (valueThis instanceof JSONArray) {
-                if (!((JSONArray) valueThis).similar(valueOther)) {
-                    return false;
-                }
-            } else if (!valueThis.equals(valueOther)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Produce a JSONObject by combining a JSONArray of names with the values of this JSONArray.
-     *
-     * @param names A JSONArray containing a list of key strings. These will be paired with the values.
-     * @return A JSONObject, or null if there are no names or if this JSONArray has no values.
-     * @throws JSONException If any of the names are null.
-     */
-    public JSONObject toJSONObject(JSONArray names) throws JSONException {
-        if ((names == null) || (names.length() == 0) || (length() == 0)) {
-            return null;
-        }
-        JSONObject jo = new JSONObject();
-        for (int i = 0; i < names.length(); i += 1) {
-            jo.put(names.getString(i), opt(i));
-        }
-        return jo;
-    }
-
-    /**
-     * Make a JSON text of this JSONArray. For compactness, no unnecessary whitespace is added. If it is not possible to
-     * produce a syntactically correct JSON text then null will be returned instead. This could occur if the array
-     * contains an invalid number.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return a printable, displayable, transmittable representation of the array.
-     */
-    @Override public String toString() {
-        try {
-            return this.toString(0);
-        } catch (JSONException ignored) {
-            return null;
-        }
-    }
-
-    /**
-     * Make a prettyprinted JSON text of this JSONArray. Warning: This method assumes that the data structure is
-     * acyclical.
-     *
-     * @param indentFactor The number of spaces to add to each level of indentation.
-     * @return a printable, displayable, transmittable representation of the object, beginning with
-     * {@code [}&nbsp;<small>(left bracket)</small> and ending with {@code ]} &nbsp;<small>(right
-     * bracket)</small>.
-     * @throws JSONException
-     */
-    public String toString(int indentFactor) throws JSONException {
-        StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            return this.write(sw, indentFactor, 0).toString();
-        }
-    }
-
-    /**
-     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return The writer.
-     * @throws JSONException
-     */
-    public Writer write(Writer writer) throws JSONException {
-        return this.write(writer, 0, 0);
-    }
-
-    /**
-     * Write the contents of the JSONArray as JSON text to a writer. For compactness, no whitespace is added.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @param indentFactor The number of spaces to add to each level of indentation.
-     * @param indent       The indention of the top level.
-     * @return The writer.
-     * @throws JSONException
-     */
-    Writer write(Writer writer, int indentFactor, int indent) throws JSONException {
-        try {
-            boolean commanate = false;
-            int length = length();
-            writer.write('[');
-            if (length == 1) {
-                JSONObject.writeValue(writer, this.myArrayList.get(0), indentFactor, indent);
-            } else if (length != 0) {
-                int newindent = indent + indentFactor;
-                for (int i = 0; i < length; i += 1) {
-                    if (commanate) {
-                        writer.write(',');
-                    }
-                    if (indentFactor > 0) {
-                        writer.write('\n');
-                    }
-                    JSONObject.indent(writer, newindent);
-                    JSONObject.writeValue(writer, this.myArrayList.get(i), indentFactor, newindent);
-                    commanate = true;
-                }
-                if (indentFactor > 0) {
-                    writer.write('\n');
-                }
-                JSONObject.indent(writer, indent);
-            }
-            writer.write(']');
-            return writer;
-        } catch (IOException e) {
-            throw new JSONException(e);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java
deleted file mode 100644
index 67de10815..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONException.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-/**
- * The JSONException is thrown by the JSON.org classes when things are amiss.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class JSONException extends RuntimeException {
-    private static final long serialVersionUID = 0;
-    private Throwable cause;
-
-    /**
-     * Constructs a JSONException with an explanatory message.
-     *
-     * @param message Detail about the reason for the exception.
-     */
-    public JSONException(final String message) {
-        super(message);
-    }
-
-    /**
-     * Constructs a new JSONException with the specified cause.
-     *
-     * @param cause The cause.
-     */
-    public JSONException(final Throwable cause) {
-        super(cause.getMessage());
-        this.cause = cause;
-    }
-
-    /**
-     * Returns the cause of this exception or null if the cause is nonexistent or unknown.
-     *
-     * @return the cause of this exception or null if the cause is nonexistent or unknown.
-     */
-    @Override public Throwable getCause() {
-        return cause;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
deleted file mode 100644
index 9a84920dc..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
+++ /dev/null
@@ -1,1425 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-import java.util.Map.Entry;
-
-/**
- * A JSONObject is an unordered collection of name/value pairs. Its external form is a string wrapped in curly braces
- * with colons between the names and values, and commas between the values and names. The internal form is an object
- * having <code>get</code> and <code>opt</code> methods for accessing the values by name, and <code>put</code> methods
- * for adding or replacing values by name. The values can be any of these types: <code>Boolean</code>,
- * <code>JSONArray</code>, <code>JSONObject</code>, <code>Number</code>, <code>String</code>, or the
- * <code>JSONObject.NULL</code> object. A JSONObject constructor can be used to convert an external form JSON text into
- * an internal form whose values can be retrieved with the <code>get</code> and <code>opt</code> methods, or to convert
- * values into a JSON text using the <code>put</code> and <code>toString</code> methods. A <code>get</code> method
- * returns a value if one can be found, and throws an exception if one cannot be found. An <code>opt</code> method
- * returns a default value instead of throwing an exception, and so is useful for obtaining optional values.
- * <p>
- * The generic <code>get()</code> and <code>opt()</code> methods return an object, which you can cast or query for type.
- * There are also typed <code>get</code> and <code>opt</code> methods that do type checking and type coercion for you.
- * The opt methods differ from the get methods in that they do not throw. Instead, they return a specified value, such
- * as null.
- * <p>
- * The <code>put</code> methods add or replace values in an object. For example,
- *
- *
- * <pre>
- * myString = new JSONObject().put(&quot;JSON&quot;, &quot;Hello, World!&quot;).toString();
- * </pre>
- * <p>
- * produces the string <code>{"JSON": "Hello, World"}</code>.
- * <p>
- * The texts produced by the <code>toString</code> methods strictly conform to the JSON syntax rules. The constructors
- * are more forgiving in the texts they will accept: <ul> <li>An extra <code>,</code>&nbsp;<small>(comma)</small> may
- * appear just before the closing brace.</li> <li>Strings may be quoted with <code>'</code>&nbsp;<small>(single
- * quote)</small>.</li> <li>Strings do not need to be quoted at all if they do not begin with a quote or single quote,
- * and if they do not contain leading or trailing spaces, and if they do not contain any of these characters: <code>{ }
- * [ ] / \ : , #</code> and if they do not look like numbers and if they are not the reserved words <code>true</code>,
- * <code>false</code>, or <code>null</code>.</li> </ul>
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class JSONObject {
-    /**
-     * It is sometimes more convenient and less ambiguous to have a <code>NULL</code> object than to use Java's
-     * <code>null</code> value. <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
-     * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
-     */
-    public static final Object NULL = new Null();
-    /**
-     * The map where the JSONObject's properties are kept.
-     */
-    private final Map<String, Object> map;
-
-    /**
-     * Construct an empty JSONObject.
-     */
-    public JSONObject() {
-        this.map = new HashMap<String, Object>();
-    }
-
-    /**
-     * Construct a JSONObject from a subset of another JSONObject. An array of strings is used to identify the keys that
-     * should be copied. Missing keys are ignored.
-     *
-     * @param jo    A JSONObject.
-     * @param names An array of strings.
-     * @throws JSONException
-     * @throws JSONException If a value is a non-finite number or if a name is duplicated.
-     */
-    public JSONObject(JSONObject jo, String[] names) {
-        this();
-        for (String name : names) {
-            try {
-                putOnce(name, jo.opt(name));
-            } catch (JSONException ignore) {
-            }
-        }
-    }
-
-    /**
-     * Construct a JSONObject from a JSONTokener.
-     *
-     * @param x A JSONTokener object containing the source string.
-     * @throws JSONException If there is a syntax error in the source string or a duplicated key.
-     */
-    public JSONObject(JSONTokener x) throws JSONException {
-        this();
-        char c;
-        String key;
-        if (x.nextClean() != '{') {
-            throw x.syntaxError("A JSONObject text must begin with '{'");
-        }
-        for (; ; ) {
-            c = x.nextClean();
-            switch (c) {
-                case 0:
-                    throw x.syntaxError("A JSONObject text must end with '}'");
-                case '}':
-                    return;
-                default:
-                    x.back();
-                    key = x.nextValue().toString();
-            }
-            // The key is followed by ':'.
-            c = x.nextClean();
-            if (c != ':') {
-                throw x.syntaxError("Expected a ':' after a key");
-            }
-            putOnce(key, x.nextValue());
-            // Pairs are separated by ','.
-            switch (x.nextClean()) {
-                case ';':
-                case ',':
-                    if (x.nextClean() == '}') {
-                        return;
-                    }
-                    x.back();
-                    break;
-                case '}':
-                    return;
-                default:
-                    throw x.syntaxError("Expected a ',' or '}'");
-            }
-        }
-    }
-
-    /**
-     * Construct a JSONObject from a Map.
-     *
-     * @param map A map object that can be used to initialize the contents of the JSONObject.
-     * @throws JSONException
-     */
-    public JSONObject(Map<String, Object> map) {
-        this.map = new HashMap<String, Object>();
-        if (map != null) {
-            for (Entry<String, Object> entry : map.entrySet()) {
-                Object value = entry.getValue();
-                if (value != null) {
-                    this.map.put(entry.getKey(), wrap(value));
-                }
-            }
-        }
-    }
-
-    /**
-     * Construct a JSONObject from an Object using bean getters. It reflects on all of the public methods of the object.
-     * For each of the methods with no parameters and a name starting with <code>"get"</code> or <code>"is"</code>
-     * followed by an uppercase letter, the method is invoked, and a key and the value returned from the getter method
-     * are put into the new JSONObject.
-     * <p>
-     * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix. If the second remaining
-     * character is not upper case, then the first character is converted to lower case.
-     * <p>
-     * For example, if an object has a method named <code>"getPluginName"</code>, and if the result of calling
-     * <code>object.getPluginName()</code> is <code>"Larry Fine"</code>, then the JSONObject will contain <code>"name": "Larry
-     * Fine"</code>.
-     *
-     * @param bean An object that has getter methods that should be used to make a JSONObject.
-     */
-    public JSONObject(Object bean) {
-        this();
-        populateMap(bean);
-    }
-
-    /**
-     * Construct a JSONObject from an Object, using reflection to find the public members. The resulting JSONObject's
-     * keys will be the strings from the names array, and the values will be the field values associated with those keys
-     * in the object. If a key is not found or not visible, then it will not be copied into the new JSONObject.
-     *
-     * @param object An object that has fields that should be used to make a JSONObject.
-     * @param names  An array of strings, the names of the fields to be obtained from the object.
-     */
-    public JSONObject(Object object, String names[]) {
-        this();
-        Class c = object.getClass();
-        for (String name : names) {
-            try {
-                putOpt(name, c.getField(name).get(object));
-            } catch (JSONException | SecurityException | NoSuchFieldException | IllegalArgumentException | IllegalAccessException ignore) {
-            }
-        }
-    }
-
-    /**
-     * Construct a JSONObject from a source JSON text string. This is the most commonly used JSONObject constructor.
-     *
-     * @param source A string beginning with <code>{</code>&nbsp;<small>(left brace)</small> and ending with
-     *               <code>}</code> &nbsp;<small>(right brace)</small>.
-     * @throws JSONException If there is a syntax error in the source string or a duplicated key.
-     */
-    public JSONObject(String source) throws JSONException {
-        this(new JSONTokener(source));
-    }
-
-    /**
-     * Construct a JSONObject from a ResourceBundle.
-     *
-     * @param baseName The ResourceBundle base name.
-     * @param locale   The Locale to load the ResourceBundle for.
-     * @throws JSONException If any JSONExceptions are detected.
-     */
-    public JSONObject(String baseName, Locale locale) throws JSONException {
-        this();
-        ResourceBundle bundle = ResourceBundle
-            .getBundle(baseName, locale, Thread.currentThread().getContextClassLoader());
-        // Iterate through the keys in the bundle.
-        Enumeration<String> keys = bundle.getKeys();
-        while (keys.hasMoreElements()) {
-            Object key = keys.nextElement();
-            if (key != null) {
-                // Go through the path, ensuring that there is a nested
-                // JSONObject for each
-                // segment except the last. Add the value using the last
-                // segment's name into
-                // the deepest nested JSONObject.
-                String[] path = ((String) key).split("\\.");
-                int last = path.length - 1;
-                JSONObject target = this;
-                for (int i = 0; i < last; i += 1) {
-                    String segment = path[i];
-                    JSONObject nextTarget = target.optJSONObject(segment);
-                    if (nextTarget == null) {
-                        nextTarget = new JSONObject();
-                        target.put(segment, nextTarget);
-                    }
-                    target = nextTarget;
-                }
-                target.put(path[last], bundle.getString((String) key));
-            }
-        }
-    }
-
-    /**
-     * Produce a string from a double. The string "null" will be returned if the number is not finite.
-     *
-     * @param d A double.
-     * @return A String.
-     */
-    public static String doubleToString(double d) {
-        if (Double.isInfinite(d) || Double.isNaN(d)) {
-            return "null";
-        }
-        // Shave off trailing zeros and decimal point, if possible.
-        String string = Double.toString(d);
-        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
-            while (string.endsWith("0")) {
-                string = string.substring(0, string.length() - 1);
-            }
-            if (string.endsWith(".")) {
-                string = string.substring(0, string.length() - 1);
-            }
-        }
-        return string;
-    }
-
-    /**
-     * Get an array of field names from a JSONObject.
-     *
-     * @return An array of field names, or null if there are no names.
-     */
-    public static String[] getNames(JSONObject jo) {
-        int length = jo.length();
-        if (length == 0) {
-            return null;
-        }
-        Iterator<String> iterator = jo.keys();
-        String[] names = new String[length];
-        int i = 0;
-        while (iterator.hasNext()) {
-            names[i] = iterator.next();
-            i += 1;
-        }
-        return names;
-    }
-
-    /**
-     * Get an array of field names from an Object.
-     *
-     * @return An array of field names, or null if there are no names.
-     */
-    public static String[] getNames(Object object) {
-        if (object == null) {
-            return null;
-        }
-        Class klass = object.getClass();
-        Field[] fields = klass.getFields();
-        int length = fields.length;
-        if (length == 0) {
-            return null;
-        }
-        String[] names = new String[length];
-        for (int i = 0; i < length; i += 1) {
-            names[i] = fields[i].getName();
-        }
-        return names;
-    }
-
-    /**
-     * Produce a string from a Number.
-     *
-     * @param number A Number
-     * @return A String.
-     * @throws JSONException If n is a non-finite number.
-     */
-    public static String numberToString(Number number) throws JSONException {
-        if (number == null) {
-            throw new JSONException("Null pointer");
-        }
-        testValidity(number);
-        // Shave off trailing zeros and decimal point, if possible.
-        String string = number.toString();
-        if ((string.indexOf('.') > 0) && (string.indexOf('e') < 0) && (string.indexOf('E') < 0)) {
-            while (string.endsWith("0")) {
-                string = string.substring(0, string.length() - 1);
-            }
-            if (string.endsWith(".")) {
-                string = string.substring(0, string.length() - 1);
-            }
-        }
-        return string;
-    }
-
-    /**
-     * Produce a string in double quotes with backslash sequences in all the right places. A backslash will be inserted
-     * control character or an unescaped quote or backslash.
-     *
-     * @param string A String
-     * @return A String correctly formatted for insertion in a JSON text.
-     */
-    public static String quote(String string) {
-        StringWriter sw = new StringWriter();
-        synchronized (sw.getBuffer()) {
-            try {
-                return quote(string, sw).toString();
-            } catch (IOException ignored) {
-                // will never happen - we are writing to a string writer
-                return "";
-            }
-        }
-    }
-
-    public static Writer quote(String string, Writer w) throws IOException {
-        if ((string == null) || string.isEmpty()) {
-            w.write("\"\"");
-            return w;
-        }
-        char b;
-        char c = 0;
-        String hhhh;
-        int i;
-        int len = string.length();
-        w.write('"');
-        for (i = 0; i < len; i += 1) {
-            b = c;
-            c = string.charAt(i);
-            switch (c) {
-                case '\\':
-                case '"':
-                    w.write('\\');
-                    w.write(c);
-                    break;
-                case '/':
-                    if (b == '<') {
-                        w.write('\\');
-                    }
-                    w.write(c);
-                    break;
-                case '\b':
-                    w.write("\\b");
-                    break;
-                case '\t':
-                    w.write("\\t");
-                    break;
-                case '\n':
-                    w.write("\\n");
-                    break;
-                case '\f':
-                    w.write("\\f");
-                    break;
-                case '\r':
-                    w.write("\\r");
-                    break;
-                default:
-                    if ((c < ' ') || ((c >= '\u0080') && (c < '\u00a0')) || ((c >= '\u2000') && (c
-                        < '\u2100'))) {
-                        w.write("\\u");
-                        hhhh = Integer.toHexString(c);
-                        w.write("0000", 0, 4 - hhhh.length());
-                        w.write(hhhh);
-                    } else {
-                        w.write(c);
-                    }
-            }
-        }
-        w.write('"');
-        return w;
-    }
-
-    /**
-     * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
-     *
-     * @param string A String.
-     * @return A simple JSON value.
-     */
-    public static Object stringToValue(String string) {
-        Double d;
-        if (string.isEmpty()) {
-            return string;
-        }
-        if (string.equalsIgnoreCase("true")) {
-            return Boolean.TRUE;
-        }
-        if (string.equalsIgnoreCase("false")) {
-            return Boolean.FALSE;
-        }
-        if (string.equalsIgnoreCase("null")) {
-            return JSONObject.NULL;
-        }
-        /*
-         * If it might be a number, try converting it. If a number cannot be
-         * produced, then the value will just be a string.
-         */
-        char b = string.charAt(0);
-        if (((b >= '0') && (b <= '9')) || (b == '-')) {
-            try {
-                if ((string.indexOf('.') > -1) || (string.indexOf('e') > -1) || (string.indexOf('E')
-                    > -1)) {
-                    d = Double.valueOf(string);
-                    if (!d.isInfinite() && !d.isNaN()) {
-                        return d;
-                    }
-                } else {
-                    Long myLong = Long.valueOf(string);
-                    if (string.equals(myLong.toString())) {
-                        if (myLong == myLong.intValue()) {
-                            return myLong.intValue();
-                        } else {
-                            return myLong;
-                        }
-                    }
-                }
-            } catch (NumberFormatException ignore) {
-            }
-        }
-        return string;
-    }
-
-    /**
-     * Throw an exception if the object is a NaN or infinite number.
-     *
-     * @param o The object to test.
-     * @throws JSONException If o is a non-finite number.
-     */
-    public static void testValidity(Object o) throws JSONException {
-        if (o != null) {
-            if (o instanceof Double) {
-                if (((Double) o).isInfinite() || ((Double) o).isNaN()) {
-                    throw new JSONException("JSON does not allow non-finite numbers.");
-                }
-            } else if (o instanceof Float) {
-                if (((Float) o).isInfinite() || ((Float) o).isNaN()) {
-                    throw new JSONException("JSON does not allow non-finite numbers.");
-                }
-            }
-        }
-    }
-
-    /**
-     * Make a JSON text of an Object value. If the object has an value.toJSONString() method, then that method will be
-     * used to produce the JSON text. The method is required to produce a strictly conforming text. If the object does
-     * not contain a toJSONString method (which is the most common case), then a text will be produced by other means.
-     * If the value is an array or Collection, then a JSONArray will be made from it and its toJSONString method will be
-     * called. If the value is a MAP, then a JSONObject will be made from it and its toJSONString method will be called.
-     * Otherwise, the value's toString method will be called, and the result will be quoted.
-     * <p>
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @param value The value to be serialized.
-     * @return a printable, displayable, transmittable representation of the object, beginning with
-     * <code>{</code>&nbsp;<small>(left brace)</small> and ending with <code>}</code>&nbsp;<small>(right
-     * brace)</small>.
-     * @throws JSONException If the value is or contains an invalid number.
-     */
-    public static String valueToString(Object value) throws JSONException {
-        if ((value == null) || value.equals(null)) {
-            return "null";
-        }
-        if (value instanceof JSONString) {
-            Object object;
-            try {
-                object = ((JSONString) value).toJSONString();
-            } catch (Exception e) {
-                throw new JSONException(e);
-            }
-            if (object != null) {
-                return (String) object;
-            }
-            throw new JSONException("Bad value from toJSONString: " + object);
-        }
-        if (value instanceof Number) {
-            return numberToString((Number) value);
-        }
-        if ((value instanceof Boolean) || (value instanceof JSONObject)
-            || (value instanceof JSONArray)) {
-            return value.toString();
-        }
-        if (value instanceof Map) {
-            return new JSONObject((Map<String, Object>) value).toString();
-        }
-        if (value instanceof Collection) {
-            return new JSONArray((Collection<Object>) value).toString();
-        }
-        if (value.getClass().isArray()) {
-            return new JSONArray(value).toString();
-        }
-        return quote(value.toString());
-    }
-
-    /**
-     * Wrap an object, if necessary. If the object is null, return the NULL object. If it is an array or collection,
-     * wrap it in a JSONArray. If it is a map, wrap it in a JSONObject. If it is a standard property (Double, String, et
-     * al) then it is already wrapped. Otherwise, if it comes from one of the java packages, turn it into a string. And
-     * if it doesn't, try to wrap it in a JSONObject. If the wrapping fails, then null is returned.
-     *
-     * @param object The object to wrap
-     * @return The wrapped value
-     */
-    public static Object wrap(Object object) {
-        try {
-            if (object == null) {
-                return NULL;
-            }
-            if ((object instanceof JSONObject) || (object instanceof JSONArray) || NULL
-                .equals(object) || (object instanceof JSONString) || (object instanceof Byte)
-                || (object instanceof Character) || (object instanceof Short)
-                || (object instanceof Integer) || (object instanceof Long)
-                || (object instanceof Boolean) || (object instanceof Float)
-                || (object instanceof Double) || (object instanceof String)) {
-                return object;
-            }
-            if (object instanceof Collection) {
-                return new JSONArray((Collection<Object>) object);
-            }
-            if (object.getClass().isArray()) {
-                return new JSONArray(object);
-            }
-            if (object instanceof Map) {
-                return new JSONObject((Map<String, Object>) object);
-            }
-            Package objectPackage = object.getClass().getPackage();
-            String objectPackageName = objectPackage != null ? objectPackage.getName() : "";
-            if (objectPackageName.startsWith("java.") || objectPackageName.startsWith("javax.") || (
-                object.getClass().getClassLoader() == null)) {
-                return object.toString();
-            }
-            return new JSONObject(object);
-        } catch (JSONException ignored) {
-            return null;
-        }
-    }
-
-    static final Writer writeValue(Writer writer, Object value, int indentFactor, int indent)
-        throws JSONException, IOException {
-        if ((value == null) || value.equals(null)) {
-            writer.write("null");
-        } else if (value instanceof JSONObject) {
-            ((JSONObject) value).write(writer, indentFactor, indent);
-        } else if (value instanceof JSONArray) {
-            ((JSONArray) value).write(writer, indentFactor, indent);
-        } else if (value instanceof Map) {
-            new JSONObject((Map<String, Object>) value).write(writer, indentFactor, indent);
-        } else if (value instanceof Collection) {
-            new JSONArray((Collection<Object>) value).write(writer, indentFactor, indent);
-        } else if (value.getClass().isArray()) {
-            new JSONArray(value).write(writer, indentFactor, indent);
-        } else if (value instanceof Number) {
-            writer.write(numberToString((Number) value));
-        } else if (value instanceof Boolean) {
-            writer.write(value.toString());
-        } else if (value instanceof JSONString) {
-            Object o;
-            try {
-                o = ((JSONString) value).toJSONString();
-            } catch (Exception e) {
-                throw new JSONException(e);
-            }
-            writer.write(o != null ? o.toString() : quote(value.toString()));
-        } else {
-            quote(value.toString(), writer);
-        }
-        return writer;
-    }
-
-    static final void indent(Writer writer, int indent) throws IOException {
-        for (int i = 0; i < indent; i += 1) {
-            writer.write(' ');
-        }
-    }
-
-    /**
-     * Accumulate values under a key. It is similar to the put method except that if there is already an object stored
-     * under the key then a JSONArray is stored under the key to hold all of the accumulated values. If there is already
-     * a JSONArray, then the new value is appended to it. In contrast, the put method replaces the previous value.
-     * <p>
-     * If only one value is accumulated that is not a JSONArray, then the result will be the same as using put. But if
-     * multiple values are accumulated, then the result will be like append.
-     *
-     * @param key   A key string.
-     * @param value An object to be accumulated under the key.
-     * @return this.
-     * @throws JSONException If the value is an invalid number or if the key is null.
-     */
-    public JSONObject accumulate(String key, Object value) throws JSONException {
-        testValidity(value);
-        Object object = opt(key);
-        if (object == null) {
-            this.put(key, value instanceof JSONArray ? new JSONArray().put(value) : value);
-        } else if (object instanceof JSONArray) {
-            ((JSONArray) object).put(value);
-        } else {
-            this.put(key, new JSONArray().put(object).put(value));
-        }
-        return this;
-    }
-
-    /**
-     * Append values to the array under a key. If the key does not exist in the JSONObject, then the key is put in the
-     * JSONObject with its value being a JSONArray containing the value parameter. If the key was already associated
-     * with a JSONArray, then the value parameter is appended to it.
-     *
-     * @param key   A key string.
-     * @param value An object to be accumulated under the key.
-     * @return this.
-     * @throws JSONException If the key is null or if the current value associated with the key is not a JSONArray.
-     */
-    public JSONObject append(String key, Object value) throws JSONException {
-        testValidity(value);
-        Object object = opt(key);
-        if (object == null) {
-            this.put(key, new JSONArray().put(value));
-        } else if (object instanceof JSONArray) {
-            this.put(key, ((JSONArray) object).put(value));
-        } else {
-            throw new JSONException("JSONObject[" + key + "] is not a JSONArray.");
-        }
-        return this;
-    }
-
-    /**
-     * Get the value object associated with a key.
-     *
-     * @param key A key string.
-     * @return The object associated with the key.
-     * @throws JSONException if the key is not found.
-     */
-    public Object get(String key) throws JSONException {
-        if (key == null) {
-            throw new JSONException("Null key.");
-        }
-        Object object = opt(key);
-        if (object == null) {
-            throw new JSONException("JSONObject[" + quote(key) + "] not found.");
-        }
-        return object;
-    }
-
-    /**
-     * Get the boolean value associated with a key.
-     *
-     * @param key A key string.
-     * @return The truth.
-     * @throws JSONException if the value is not a Boolean or the String "true" or "false".
-     */
-    public boolean getBoolean(String key) throws JSONException {
-        Object object = get(key);
-        if (object.equals(Boolean.FALSE) || ((object instanceof String) && ((String) object)
-            .equalsIgnoreCase("false"))) {
-            return false;
-        } else if (object.equals(Boolean.TRUE) || ((object instanceof String) && ((String) object)
-            .equalsIgnoreCase("true"))) {
-            return true;
-        }
-        throw new JSONException("JSONObject[" + quote(key) + "] is not a Boolean.");
-    }
-
-    /**
-     * Get the double value associated with a key.
-     *
-     * @param key A key string.
-     * @return The numeric value.
-     * @throws JSONException if the key is not found or if the value is not a Number object and cannot be converted to a
-     *                       number.
-     */
-    public double getDouble(String key) throws JSONException {
-        Object object = get(key);
-        try {
-            return object instanceof Number ?
-                ((Number) object).doubleValue() :
-                Double.parseDouble((String) object);
-        } catch (NumberFormatException ignored) {
-            throw new JSONException("JSONObject[" + quote(key) + "] is not a number.");
-        }
-    }
-
-    /**
-     * Get the int value associated with a key.
-     *
-     * @param key A key string.
-     * @return The integer value.
-     * @throws JSONException if the key is not found or if the value cannot be converted to an integer.
-     */
-    public int getInt(String key) throws JSONException {
-        Object object = get(key);
-        try {
-            return object instanceof Number ?
-                ((Number) object).intValue() :
-                Integer.parseInt((String) object);
-        } catch (NumberFormatException ignored) {
-            throw new JSONException("JSONObject[" + quote(key) + "] is not an int.");
-        }
-    }
-
-    /**
-     * Get the JSONArray value associated with a key.
-     *
-     * @param key A key string.
-     * @return A JSONArray which is the value.
-     * @throws JSONException if the key is not found or if the value is not a JSONArray.
-     */
-    public JSONArray getJSONArray(String key) throws JSONException {
-        Object object = get(key);
-        if (object instanceof JSONArray) {
-            return (JSONArray) object;
-        }
-        throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONArray.");
-    }
-
-    /**
-     * Get the JSONObject value associated with a key.
-     *
-     * @param key A key string.
-     * @return A JSONObject which is the value.
-     * @throws JSONException if the key is not found or if the value is not a JSONObject.
-     */
-    public JSONObject getJSONObject(String key) throws JSONException {
-        Object object = get(key);
-        if (object instanceof JSONObject) {
-            return (JSONObject) object;
-        }
-        throw new JSONException("JSONObject[" + quote(key) + "] is not a JSONObject.");
-    }
-
-    /**
-     * Get the long value associated with a key.
-     *
-     * @param key A key string.
-     * @return The long value.
-     * @throws JSONException if the key is not found or if the value cannot be converted to a long.
-     */
-    public long getLong(String key) throws JSONException {
-        Object object = get(key);
-        try {
-            return object instanceof Number ?
-                ((Number) object).longValue() :
-                Long.parseLong((String) object);
-        } catch (NumberFormatException ignored) {
-            throw new JSONException("JSONObject[" + quote(key) + "] is not a long.");
-        }
-    }
-
-    /**
-     * Get the string associated with a key.
-     *
-     * @param key A key string.
-     * @return A string which is the value.
-     * @throws JSONException if there is no string value for the key.
-     */
-    public String getString(String key) throws JSONException {
-        Object object = get(key);
-        if (object instanceof String) {
-            return (String) object;
-        }
-        throw new JSONException("JSONObject[" + quote(key) + "] not a string.");
-    }
-
-    /**
-     * Determine if the JSONObject contains a specific key.
-     *
-     * @param key A key string.
-     * @return true if the key exists in the JSONObject.
-     */
-    public boolean has(String key) {
-        return this.map.containsKey(key);
-    }
-
-    /**
-     * Increment a property of a JSONObject. If there is no such property, create one with a value of 1. If there is
-     * such a property, and if it is an Integer, Long, Double, or Float, then add one to it.
-     *
-     * @param key A key string.
-     * @return this.
-     * @throws JSONException If there is already a property with this name that is not an Integer, Long, Double, or
-     *                       Float.
-     */
-    public JSONObject increment(String key) throws JSONException {
-        Object value = opt(key);
-        if (value == null) {
-            this.put(key, 1);
-        } else if (value instanceof Integer) {
-            this.put(key, (Integer) value + 1);
-        } else if (value instanceof Long) {
-            this.put(key, (Long) value + 1);
-        } else if (value instanceof Double) {
-            this.put(key, (Double) value + 1);
-        } else if (value instanceof Float) {
-            this.put(key, (Float) value + 1);
-        } else {
-            throw new JSONException("Unable to increment [" + quote(key) + "].");
-        }
-        return this;
-    }
-
-    /**
-     * Determine if the value associated with the key is null or if there is no value.
-     *
-     * @param key A key string.
-     * @return true if there is no value associated with the key or if the value is the JSONObject.NULL object.
-     */
-    public boolean isNull(String key) {
-        return JSONObject.NULL.equals(opt(key));
-    }
-
-    /**
-     * Get an enumeration of the keys of the JSONObject.
-     *
-     * @return An iterator of the keys.
-     */
-    public Iterator<String> keys() {
-        return keySet().iterator();
-    }
-
-    /**
-     * Get a set of keys of the JSONObject.
-     *
-     * @return A keySet.
-     */
-    public Set<String> keySet() {
-        return this.map.keySet();
-    }
-
-    /**
-     * Get the number of keys stored in the JSONObject.
-     *
-     * @return The number of keys in the JSONObject.
-     */
-    public int length() {
-        return this.map.size();
-    }
-
-    /**
-     * Produce a JSONArray containing the names of the elements of this JSONObject.
-     *
-     * @return A JSONArray containing the key strings, or null if the JSONObject is empty.
-     */
-    public JSONArray names() {
-        JSONArray ja = new JSONArray();
-        Iterator<String> keys = keys();
-        while (keys.hasNext()) {
-            ja.put(keys.next());
-        }
-        return ja.length() == 0 ? null : ja;
-    }
-
-    /**
-     * Get an optional value associated with a key.
-     *
-     * @param key A key string.
-     * @return An object which is the value, or null if there is no value.
-     */
-    public Object opt(String key) {
-        return key == null ? null : this.map.get(key);
-    }
-
-    /**
-     * Get an optional boolean associated with a key. It returns false if there is no such key, or if the value is not
-     * Boolean.TRUE or the String "true".
-     *
-     * @param key A key string.
-     * @return The truth.
-     */
-    public boolean optBoolean(String key) {
-        return this.optBoolean(key, false);
-    }
-
-    /**
-     * Get an optional boolean associated with a key. It returns the defaultValue if there is no such key, or if it is
-     * not a Boolean or the String "true" or "false" (case insensitive).
-     *
-     * @param key          A key string.
-     * @param defaultValue The default.
-     * @return The truth.
-     */
-    public boolean optBoolean(String key, boolean defaultValue) {
-        try {
-            return getBoolean(key);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get an optional double associated with a key, or NaN if there is no such key or if its value is not a number. If
-     * the value is a string, an attempt will be made to evaluate it as a number.
-     *
-     * @param key A string which is the key.
-     * @return An object which is the value.
-     */
-    public double optDouble(String key) {
-        return this.optDouble(key, Double.NaN);
-    }
-
-    /**
-     * Get an optional double associated with a key, or the defaultValue if there is no such key or if its value is not
-     * a number. If the value is a string, an attempt will be made to evaluate it as a number.
-     *
-     * @param key          A key string.
-     * @param defaultValue The default.
-     * @return An object which is the value.
-     */
-    public double optDouble(String key, double defaultValue) {
-        try {
-            return getDouble(key);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get an optional int value associated with a key, or zero if there is no such key or if the value is not a number.
-     * If the value is a string, an attempt will be made to evaluate it as a number.
-     *
-     * @param key A key string.
-     * @return An object which is the value.
-     */
-    public int optInt(String key) {
-        return this.optInt(key, 0);
-    }
-
-    /**
-     * Get an optional int value associated with a key, or the default if there is no such key or if the value is not a
-     * number. If the value is a string, an attempt will be made to evaluate it as a number.
-     *
-     * @param key          A key string.
-     * @param defaultValue The default.
-     * @return An object which is the value.
-     */
-    public int optInt(String key, int defaultValue) {
-        try {
-            return getInt(key);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get an optional JSONArray associated with a key. It returns null if there is no such key, or if its value is not
-     * a JSONArray.
-     *
-     * @param key A key string.
-     * @return A JSONArray which is the value.
-     */
-    public JSONArray optJSONArray(String key) {
-        Object o = opt(key);
-        return o instanceof JSONArray ? (JSONArray) o : null;
-    }
-
-    /**
-     * Get an optional JSONObject associated with a key. It returns null if there is no such key, or if its value is not
-     * a JSONObject.
-     *
-     * @param key A key string.
-     * @return A JSONObject which is the value.
-     */
-    public JSONObject optJSONObject(String key) {
-        Object object = opt(key);
-        return object instanceof JSONObject ? (JSONObject) object : null;
-    }
-
-    /**
-     * Get an optional long value associated with a key, or zero if there is no such key or if the value is not a
-     * number. If the value is a string, an attempt will be made to evaluate it as a number.
-     *
-     * @param key A key string.
-     * @return An object which is the value.
-     */
-    public long optLong(String key) {
-        return this.optLong(key, 0);
-    }
-
-    /**
-     * Get an optional long value associated with a key, or the default if there is no such key or if the value is not a
-     * number. If the value is a string, an attempt will be made to evaluate it as a number.
-     *
-     * @param key          A key string.
-     * @param defaultValue The default.
-     * @return An object which is the value.
-     */
-    public long optLong(String key, long defaultValue) {
-        try {
-            return getLong(key);
-        } catch (JSONException ignored) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Get an optional string associated with a key. It returns an empty string if there is no such key. If the value is
-     * not a string and is not null, then it is converted to a string.
-     *
-     * @param key A key string.
-     * @return A string which is the value.
-     */
-    public String optString(String key) {
-        return this.optString(key, "");
-    }
-
-    /**
-     * Get an optional string associated with a key. It returns the defaultValue if there is no such key.
-     *
-     * @param key          A key string.
-     * @param defaultValue The default.
-     * @return A string which is the value.
-     */
-    public String optString(String key, String defaultValue) {
-        Object object = opt(key);
-        return NULL.equals(object) ? defaultValue : object.toString();
-    }
-
-    private void populateMap(Object bean) {
-        Class klass = bean.getClass();
-        // If klass is a System class then set includeSuperClass to false.
-        boolean includeSuperClass = klass.getClassLoader() != null;
-        Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
-        for (Method method : methods) {
-            try {
-                if (Modifier.isPublic(method.getModifiers())) {
-                    String name = method.getName();
-                    String key = "";
-                    if (name.startsWith("get")) {
-                        if ("getClass".equals(name) || "getDeclaringClass".equals(name)) {
-                            key = "";
-                        } else {
-                            key = name.substring(3);
-                        }
-                    } else if (name.startsWith("is")) {
-                        key = name.substring(2);
-                    }
-                    if (!key.isEmpty() && Character.isUpperCase(key.charAt(0)) && (
-                        method.getParameterTypes().length == 0)) {
-                        if (key.length() == 1) {
-                            key = key.toLowerCase();
-                        } else if (!Character.isUpperCase(key.charAt(1))) {
-                            key = key.substring(0, 1).toLowerCase() + key.substring(1);
-                        }
-                        Object result = method.invoke(bean, (Object[]) null);
-                        if (result != null) {
-                            this.map.put(key, wrap(result));
-                        }
-                    }
-                }
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignore) {
-            }
-        }
-    }
-
-    /**
-     * Put a key/boolean pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value A boolean which is the value.
-     * @return this.
-     * @throws JSONException If the key is null.
-     */
-    public JSONObject put(String key, boolean value) throws JSONException {
-        this.put(key, value ? Boolean.TRUE : Boolean.FALSE);
-        return this;
-    }
-
-    /**
-     * Put a key/value pair in the JSONObject, where the value will be a JSONArray which is produced from a Collection.
-     *
-     * @param key   A key string.
-     * @param value A Collection value.
-     * @return this.
-     * @throws JSONException
-     */
-    public JSONObject put(String key, Collection<Object> value) throws JSONException {
-        this.put(key, new JSONArray(value));
-        return this;
-    }
-
-    /**
-     * Put a key/double pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value A double which is the value.
-     * @return this.
-     * @throws JSONException If the key is null or if the number is invalid.
-     */
-    public JSONObject put(String key, double value) throws JSONException {
-        this.put(key, new Double(value));
-        return this;
-    }
-
-    /**
-     * Put a key/int pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value An int which is the value.
-     * @return this.
-     * @throws JSONException If the key is null.
-     */
-    public JSONObject put(String key, int value) throws JSONException {
-        this.put(key, Integer.valueOf(value));
-        return this;
-    }
-
-    /**
-     * Put a key/long pair in the JSONObject.
-     *
-     * @param key   A key string.
-     * @param value A long which is the value.
-     * @return this.
-     * @throws JSONException If the key is null.
-     */
-    public JSONObject put(String key, long value) throws JSONException {
-        this.put(key, Long.valueOf(value));
-        return this;
-    }
-
-    /**
-     * Put a key/value pair in the JSONObject, where the value will be a JSONObject which is produced from a Map.
-     *
-     * @param key   A key string.
-     * @param value A Map value.
-     * @return this.
-     * @throws JSONException
-     */
-    public JSONObject put(String key, Map<String, Object> value) throws JSONException {
-        this.put(key, new JSONObject(value));
-        return this;
-    }
-
-    /**
-     * Put a key/value pair in the JSONObject. If the value is null, then the key will be removed from the JSONObject if
-     * it is present.
-     *
-     * @param key   A key string.
-     * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
-     *              JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
-     * @return this.
-     * @throws JSONException If the value is non-finite number or if the key is null.
-     */
-    public JSONObject put(String key, Object value) throws JSONException {
-        if (key == null) {
-            throw new NullPointerException("Null key.");
-        }
-        if (value != null) {
-            testValidity(value);
-            this.map.put(key, value);
-        } else {
-            remove(key);
-        }
-        return this;
-    }
-
-    /**
-     * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null, and only if there is
-     * not already a member with that name.
-     *
-     * @param key   string
-     * @param value object
-     * @return this.
-     * @throws JSONException if the key is a duplicate
-     */
-    public JSONObject putOnce(String key, Object value) throws JSONException {
-        if ((key != null) && (value != null)) {
-            if (opt(key) != null) {
-                throw new JSONException("Duplicate key \"" + key + "\"");
-            }
-            this.put(key, value);
-        }
-        return this;
-    }
-
-    /**
-     * Put a key/value pair in the JSONObject, but only if the key and the value are both non-null.
-     *
-     * @param key   A key string.
-     * @param value An object which is the value. It should be of one of these types: Boolean, Double, Integer,
-     *              JSONArray, JSONObject, Long, String, or the JSONObject.NULL object.
-     * @return this.
-     * @throws JSONException If the value is a non-finite number.
-     */
-    public JSONObject putOpt(String key, Object value) throws JSONException {
-        if ((key != null) && (value != null)) {
-            this.put(key, value);
-        }
-        return this;
-    }
-
-    /**
-     * Remove a name and its value, if present.
-     *
-     * @param key The name to be removed.
-     * @return The value that was associated with the name, or null if there was no value.
-     */
-    public Object remove(String key) {
-        return this.map.remove(key);
-    }
-
-    /**
-     * Determine if two JSONObjects are similar. They must contain the same set of names which must be associated with
-     * similar values.
-     *
-     * @param other The other JSONObject
-     * @return true if they are equal
-     */
-    public boolean similar(Object other) {
-        try {
-            if (!(other instanceof JSONObject)) {
-                return false;
-            }
-            Set<String> set = keySet();
-            if (!set.equals(((JSONObject) other).keySet())) {
-                return false;
-            }
-            for (String name : set) {
-                Object valueThis = get(name);
-                Object valueOther = ((JSONObject) other).get(name);
-                if (valueThis instanceof JSONObject) {
-                    if (!((JSONObject) valueThis).similar(valueOther)) {
-                        return false;
-                    }
-                } else if (valueThis instanceof JSONArray) {
-                    if (!((JSONArray) valueThis).similar(valueOther)) {
-                        return false;
-                    }
-                } else if (!valueThis.equals(valueOther)) {
-                    return false;
-                }
-            }
-            return true;
-        } catch (JSONException ignored) {
-            return false;
-        }
-    }
-
-    /**
-     * Produce a JSONArray containing the values of the members of this JSONObject.
-     *
-     * @param names A JSONArray containing a list of key strings. This determines the sequence of the values in the
-     *              result.
-     * @return A JSONArray of values.
-     * @throws JSONException If any of the values are non-finite numbers.
-     */
-    public JSONArray toJSONArray(JSONArray names) throws JSONException {
-        if ((names == null) || (names.length() == 0)) {
-            return null;
-        }
-        JSONArray ja = new JSONArray();
-        for (int i = 0; i < names.length(); i += 1) {
-            ja.put(opt(names.getString(i)));
-        }
-        return ja;
-    }
-
-    /**
-     * Make a JSON text of this JSONObject. For compactness, no whitespace is added. If this would not result in a
-     * syntactically correct JSON text, then null will be returned instead.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return a printable, displayable, portable, transmittable representation of the object, beginning with
-     * <code>{</code>&nbsp;<small>(left brace)</small> and ending with <code>}</code>&nbsp;<small>(right
-     * brace)</small>.
-     */
-    @Override public String toString() {
-        try {
-            return this.toString(0);
-        } catch (JSONException ignored) {
-            return null;
-        }
-    }
-
-    /**
-     * Make a prettyprinted JSON text of this JSONObject.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @param indentFactor The number of spaces to add to each level of indentation.
-     * @return a printable, displayable, portable, transmittable representation of the object, beginning with
-     * <code>{</code>&nbsp;<small>(left brace)</small> and ending with <code>}</code>&nbsp;<small>(right
-     * brace)</small>.
-     * @throws JSONException If the object contains an invalid number.
-     */
-    public String toString(int indentFactor) throws JSONException {
-        StringWriter w = new StringWriter();
-        synchronized (w.getBuffer()) {
-            return this.write(w, indentFactor, 0).toString();
-        }
-    }
-
-    /**
-     * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return The writer.
-     * @throws JSONException
-     */
-    public Writer write(Writer writer) throws JSONException {
-        return this.write(writer, 0, 0);
-    }
-
-    /**
-     * Write the contents of the JSONObject as JSON text to a writer. For compactness, no whitespace is added.
-     * <p>
-     * Warning: This method assumes that the data structure is acyclical.
-     *
-     * @return The writer.
-     * @throws JSONException
-     */
-    Writer write(Writer writer, int indentFactor, int indent) throws JSONException {
-        try {
-            boolean commanate = false;
-            int length = length();
-            Iterator<String> keys = keys();
-            writer.write('{');
-            if (length == 1) {
-                Object key = keys.next();
-                writer.write(quote(key.toString()));
-                writer.write(':');
-                if (indentFactor > 0) {
-                    writer.write(' ');
-                }
-                writeValue(writer, this.map.get(key), indentFactor, indent);
-            } else if (length != 0) {
-                int newindent = indent + indentFactor;
-                while (keys.hasNext()) {
-                    Object key = keys.next();
-                    if (commanate) {
-                        writer.write(',');
-                    }
-                    if (indentFactor > 0) {
-                        writer.write('\n');
-                    }
-                    indent(writer, newindent);
-                    writer.write(quote(key.toString()));
-                    writer.write(':');
-                    if (indentFactor > 0) {
-                        writer.write(' ');
-                    }
-                    writeValue(writer, this.map.get(key), indentFactor, newindent);
-                    commanate = true;
-                }
-                if (indentFactor > 0) {
-                    writer.write('\n');
-                }
-                indent(writer, indent);
-            }
-            writer.write('}');
-            return writer;
-        } catch (IOException exception) {
-            throw new JSONException(exception);
-        }
-    }
-
-    /**
-     * JSONObject.NULL is equivalent to the value that JavaScript calls null, whilst Java's null is equivalent to the
-     * value that JavaScript calls undefined.
-     */
-    private static final class Null {
-        /**
-         * There is only intended to be a single instance of the NULL object, so the clone method returns itself.
-         *
-         * @return NULL.
-         */
-        @Override protected final Object clone() {
-            try {
-                return super.clone();
-            } catch (CloneNotSupportedException ignored) {
-                return this;
-            }
-        }
-
-        /**
-         * A Null object is equal to the null value and to itself.
-         *
-         * @param object An object to test for nullness.
-         * @return true if the object parameter is the JSONObject.NULL object or null.
-         */
-        @Override public boolean equals(Object object) {
-            return (object == null) || (object == this);
-        }
-
-        /**
-         * Get the "null" string value.
-         *
-         * @return The string "null".
-         */
-        @Override public String toString() {
-            return "null";
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java
deleted file mode 100644
index 019776e58..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONString.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-/**
- * The <code>JSONString</code> interface allows a <code>toJSONString()</code> method so that a class can change the
- * behavior of <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>, and
- * <code>JSONWriter.value(</code>Object<code>)</code>. The <code>toJSONString</code> method will be used instead of the
- * default behavior of using the Object's <code>toString()</code> method and quoting the result.
- */
-public interface JSONString {
-    /**
-     * The <code>toJSONString</code> method allows a class to produce its own JSON serialization.
-     *
-     * @return A strictly syntactically correct JSON text.
-     */
-    String toJSONString();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java
deleted file mode 100644
index 290b9ea0b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/JSONTokener.java
+++ /dev/null
@@ -1,384 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-import java.io.*;
-
-/**
- * A JSONTokener takes a source string and extracts characters and tokens from it. It is used by the JSONObject and
- * JSONArray constructors to parse JSON source strings.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class JSONTokener {
-    private final Reader reader;
-    private long character;
-    private boolean eof;
-    private long index;
-    private long line;
-    private char previous;
-    private boolean usePrevious;
-
-    /**
-     * Construct a JSONTokener from a Reader.
-     *
-     * @param reader A reader.
-     */
-    public JSONTokener(final Reader reader) {
-        this.reader = reader.markSupported() ? reader : new BufferedReader(reader);
-        eof = false;
-        usePrevious = false;
-        previous = 0;
-        index = 0;
-        character = 1;
-        line = 1;
-    }
-
-    /**
-     * Construct a JSONTokener from an InputStream.
-     *
-     * @param inputStream The source.
-     */
-    public JSONTokener(final InputStream inputStream) throws JSONException {
-        this(new InputStreamReader(inputStream));
-    }
-
-    /**
-     * Construct a JSONTokener from a string.
-     *
-     * @param s A source string.
-     */
-    public JSONTokener(final String s) {
-        this(new StringReader(s));
-    }
-
-    /**
-     * Get the hex value of a character (base16).
-     *
-     * @param c A character between '0' and '9' or between 'A' and 'F' or between 'a' and 'f'.
-     * @return An int between 0 and 15, or -1 if c was not a hex digit.
-     */
-    public static int dehexchar(final char c) {
-        if ((c >= '0') && (c <= '9')) {
-            return c - '0';
-        }
-        if ((c >= 'A') && (c <= 'F')) {
-            return c - ('A' - 10);
-        }
-        if ((c >= 'a') && (c <= 'f')) {
-            return c - ('a' - 10);
-        }
-        return -1;
-    }
-
-    /**
-     * Back up one character. This provides a sort of lookahead capability, so that you can test for a digit or letter
-     * before attempting to parse the next number or identifier.
-     */
-    public void back() throws JSONException {
-        if (usePrevious || (index <= 0)) {
-            throw new JSONException("Stepping back two steps is not supported");
-        }
-        index -= 1;
-        character -= 1;
-        usePrevious = true;
-        eof = false;
-    }
-
-    public boolean end() {
-        return eof && !usePrevious;
-    }
-
-    /**
-     * Determine if the source string still contains characters that next() can consume.
-     *
-     * @return true if not yet at the end of the source.
-     */
-    public boolean more() throws JSONException {
-        this.next();
-        if (end()) {
-            return false;
-        }
-        back();
-        return true;
-    }
-
-    /**
-     * Get the next character in the source string.
-     *
-     * @return The next character, or 0 if past the end of the source string.
-     */
-    public char next() throws JSONException {
-        int c;
-        if (usePrevious) {
-            usePrevious = false;
-            c = previous;
-        } else {
-            try {
-                c = reader.read();
-            } catch (final IOException exception) {
-                throw new JSONException(exception);
-            }
-            if (c <= 0) { // End of stream
-                eof = true;
-                c = 0;
-            }
-        }
-        index += 1;
-        if (previous == '\r') {
-            line += 1;
-            character = c == '\n' ? 0 : 1;
-        } else if (c == '\n') {
-            line += 1;
-            character = 0;
-        } else {
-            character += 1;
-        }
-        previous = (char) c;
-        return previous;
-    }
-
-    /**
-     * Consume the next character, and check that it matches a specified character.
-     *
-     * @param c The character to match.
-     * @return The character.
-     * @throws JSONException if the character does not match.
-     */
-    public char next(final char c) throws JSONException {
-        final char n = this.next();
-        if (n != c) {
-            throw syntaxError("Expected '" + c + "' and instead saw '" + n + "'");
-        }
-        return n;
-    }
-
-    /**
-     * Get the next n characters.
-     *
-     * @param n The number of characters to take.
-     * @return A string of n characters.
-     * @throws JSONException Substring bounds error if there are not n characters remaining in the source string.
-     */
-    public String next(final int n) throws JSONException {
-        if (n == 0) {
-            return "";
-        }
-        final char[] chars = new char[n];
-        int pos = 0;
-        while (pos < n) {
-            chars[pos] = this.next();
-            if (end()) {
-                throw syntaxError("Substring bounds error");
-            }
-            pos += 1;
-        }
-        return new String(chars);
-    }
-
-    /**
-     * Get the next char in the string, skipping whitespace.
-     *
-     * @return A character, or 0 if there are no more characters.
-     * @throws JSONException
-     */
-    public char nextClean() throws JSONException {
-        for (; ; ) {
-            final char c = this.next();
-            if ((c == 0) || (c > ' ')) {
-                return c;
-            }
-        }
-    }
-
-    /**
-     * Return the characters up to the next close quote character. Backslash processing is done. The formal JSON format
-     * does not allow strings in single quotes, but an implementation is allowed to accept them.
-     *
-     * @param quote The quoting character, either <code>"</code> &nbsp;<small>(double quote)</small> or <code>'</code>
-     *              &nbsp;<small>(single quote)</small>.
-     * @return A String.
-     * @throws JSONException Unterminated string.
-     */
-    public String nextString(final char quote) throws JSONException {
-        char c;
-        final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
-            c = this.next();
-            switch (c) {
-                case 0:
-                case '\n':
-                case '\r':
-                    throw syntaxError("Unterminated string");
-                case '\\':
-                    c = this.next();
-                    switch (c) {
-                        case 'b':
-                            sb.append('\b');
-                            break;
-                        case 't':
-                            sb.append('\t');
-                            break;
-                        case 'n':
-                            sb.append('\n');
-                            break;
-                        case 'f':
-                            sb.append('\f');
-                            break;
-                        case 'r':
-                            sb.append('\r');
-                            break;
-                        case 'u':
-                            sb.append((char) Integer.parseInt(this.next(4), 16));
-                            break;
-                        case '"':
-                        case '\'':
-                        case '\\':
-                        case '/':
-                            sb.append(c);
-                            break;
-                        default:
-                            throw syntaxError("Illegal escape.");
-                    }
-                    break;
-                default:
-                    if (c == quote) {
-                        return sb.toString();
-                    }
-                    sb.append(c);
-            }
-        }
-    }
-
-    /**
-     * Get the text up but not including the specified character or the end of line, whichever comes first.
-     *
-     * @param delimiter A delimiter character.
-     * @return A string.
-     */
-    public String nextTo(final char delimiter) throws JSONException {
-        final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
-            final char c = this.next();
-            if ((c == delimiter) || (c == 0) || (c == '\n') || (c == '\r')) {
-                if (c != 0) {
-                    back();
-                }
-                return sb.toString().trim();
-            }
-            sb.append(c);
-        }
-    }
-
-    /**
-     * Get the text up but not including one of the specified delimiter characters or the end of line, whichever comes
-     * first.
-     *
-     * @param delimiters A set of delimiter characters.
-     * @return A string, trimmed.
-     */
-    public String nextTo(final String delimiters) throws JSONException {
-        char c;
-        final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
-            c = this.next();
-            if ((delimiters.indexOf(c) >= 0) || (c == 0) || (c == '\n') || (c == '\r')) {
-                if (c != 0) {
-                    back();
-                }
-                return sb.toString().trim();
-            }
-            sb.append(c);
-        }
-    }
-
-    /**
-     * Get the next value. The value can be a Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
-     * JSONObject.NULL object.
-     *
-     * @return An object.
-     * @throws JSONException If syntax error.
-     */
-    public Object nextValue() throws JSONException {
-        char c = nextClean();
-        String string;
-        switch (c) {
-            case '"':
-            case '\'':
-                return nextString(c);
-            case '{':
-                back();
-                return new JSONObject(this);
-            case '[':
-                back();
-                return new JSONArray(this);
-        }
-        /*
-         * Handle unquoted text. This could be the values true, false, or
-         * null, or it can be a number. An implementation (such as this one)
-         * is allowed to also accept non-standard forms.
-         * Accumulate characters until we reach the end of the text or a
-         * formatting character.
-         */
-        final StringBuilder sb = new StringBuilder();
-        while ((c >= ' ') && (",:]}/\\\"[{;=#".indexOf(c) < 0)) {
-            sb.append(c);
-            c = this.next();
-        }
-        back();
-        string = sb.toString().trim();
-        if (string.isEmpty()) {
-            throw syntaxError("Missing value");
-        }
-        return JSONObject.stringToValue(string);
-    }
-
-    /**
-     * Skip characters until the next character is the requested character. If the requested character is not found, no
-     * characters are skipped.
-     *
-     * @param to A character to skip to.
-     * @return The requested character, or zero if the requested character is not found.
-     */
-    public char skipTo(final char to) throws JSONException {
-        char c;
-        try {
-            final long startIndex = index;
-            final long startCharacter = character;
-            final long startLine = line;
-            reader.mark(1000000);
-            do {
-                c = this.next();
-                if (c == 0) {
-                    reader.reset();
-                    index = startIndex;
-                    character = startCharacter;
-                    line = startLine;
-                    return 0;
-                }
-            } while (c != to);
-        } catch (final IOException exception) {
-            throw new JSONException(exception);
-        }
-        back();
-        return c;
-    }
-
-    /**
-     * Make a JSONException to signal a syntax error.
-     *
-     * @param message The error message.
-     * @return A JSONException object, suitable for throwing
-     */
-    public JSONException syntaxError(final String message) {
-        return new JSONException(message + toString());
-    }
-
-    /**
-     * Make a printable string of this JSONTokener.
-     *
-     * @return " at {index} [character {character} line {line}]"
-     */
-    @Override public String toString() {
-        return " at " + index + " [character " + character + " line " + line + "]";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java
deleted file mode 100644
index 7ace1989b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/Property.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Properties;
-
-/**
- * Converts a Property file data into JSONObject and back.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class Property {
-    /**
-     * Converts a property file object into a JSONObject. The property file object is a table of name value pairs.
-     *
-     * @param properties java.util.Properties
-     * @return JSONObject
-     * @throws JSONException
-     */
-    public static JSONObject toJSONObject(final java.util.Properties properties)
-        throws JSONException {
-        final JSONObject jo = new JSONObject();
-        if ((properties != null) && !properties.isEmpty()) {
-            final Enumeration enumProperties = properties.propertyNames();
-            while (enumProperties.hasMoreElements()) {
-                final String name = (String) enumProperties.nextElement();
-                jo.put(name, properties.getProperty(name));
-            }
-        }
-        return jo;
-    }
-
-    /**
-     * Converts the JSONObject into a property file object.
-     *
-     * @param jo JSONObject
-     * @return java.util.Properties
-     * @throws JSONException
-     */
-    public static Properties toProperties(final JSONObject jo) throws JSONException {
-        final Properties properties = new Properties();
-        if (jo != null) {
-            final Iterator<String> keys = jo.keys();
-            while (keys.hasNext()) {
-                final String name = keys.next();
-                properties.put(name, jo.getString(name));
-            }
-        }
-        return properties;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java
deleted file mode 100644
index 51a0cdb10..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XML.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-import java.util.Iterator;
-
-/**
- * This provides static methods to convert an XML text into a JSONObject, and to covert a JSONObject into an XML text.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-class XML {
-
-    static final Character AMP = '&';
-    static final Character APOS = '\'';
-    static final Character BANG = '!';
-    static final Character EQ = '=';
-    static final Character GT = '>';
-    static final Character LT = '<';
-    static final Character QUEST = '?';
-    static final Character QUOT = '"';
-    static final Character SLASH = '/';
-
-    static String escape(String string) {
-        StringBuilder sb = new StringBuilder(string.length());
-        for (int i = 0, length = string.length(); i < length; i++) {
-            char c = string.charAt(i);
-            switch (c) {
-                case '&':
-                    sb.append("&amp;");
-                    break;
-                case '<':
-                    sb.append("&lt;");
-                    break;
-                case '>':
-                    sb.append("&gt;");
-                    break;
-                case '"':
-                    sb.append("&quot;");
-                    break;
-                case '\'':
-                    sb.append("&apos;");
-                    break;
-                default:
-                    sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Throw an exception if the string contains whitespace. Whitespace is not allowed in tagNames and attributes.
-     *
-     * @param string A string.
-     * @throws JSONException
-     */
-    static void noSpace(String string) throws JSONException {
-        int length = string.length();
-        if (length == 0) {
-            throw new JSONException("Empty string.");
-        }
-        for (char c : string.toCharArray()) {
-            if (Character.isWhitespace(c)) {
-                throw new JSONException('\'' + string + "' contains a space character.");
-            }
-        }
-    }
-
-    /**
-     * Scan the content following the named tag, attaching it to the context.
-     *
-     * @param x       The XMLTokener containing the source string.
-     * @param context The JSONObject that will include the new material.
-     * @param name    The tag name.
-     * @return true if the close tag is processed.
-     * @throws JSONException
-     */
-    private static boolean parse(XMLTokener x, JSONObject context, String name)
-        throws JSONException {
-        // Test for and skip past these forms:
-        // <!-- ... -->
-        // <! ... >
-        // <![ ... ]]>
-        // <? ... ?>
-        // Report errors for these forms:
-        // <>
-        // <=
-        // <<
-        Object token = x.nextToken();
-        // <!
-        String string;
-        if (token == BANG) {
-            char c = x.next();
-            if (c == '-') {
-                if (x.next() == '-') {
-                    x.skipPast("-->");
-                    return false;
-                }
-                x.back();
-            } else if (c == '[') {
-                token = x.nextToken();
-                if ("CDATA".equals(token)) {
-                    if (x.next() == '[') {
-                        string = x.nextCDATA();
-                        if (!string.isEmpty()) {
-                            context.accumulate("content", string);
-                        }
-                        return false;
-                    }
-                }
-                throw x.syntaxError("Expected 'CDATA['");
-            }
-            int i = 1;
-            do {
-                token = x.nextMeta();
-                if (token == null) {
-                    throw x.syntaxError("Missing '>' after '<!'.");
-                } else if (token == LT) {
-                    i += 1;
-                } else if (token == GT) {
-                    i -= 1;
-                }
-            } while (i > 0);
-            return false;
-        } else if (token == QUEST) {
-            // <?
-            x.skipPast("?>");
-            return false;
-        } else if (token == SLASH) {
-            // Close tag </
-            token = x.nextToken();
-            if (name == null) {
-                throw x.syntaxError("Mismatched close tag " + token);
-            }
-            if (!token.equals(name)) {
-                throw x.syntaxError("Mismatched " + name + " and " + token);
-            }
-            if (x.nextToken() != GT) {
-                throw x.syntaxError("Misshaped close tag");
-            }
-            return true;
-        } else if (token instanceof Character) {
-            throw x.syntaxError("Misshaped tag");
-            // Open tag <
-        } else {
-            String tagName = (String) token;
-            token = null;
-            JSONObject jsonobject = new JSONObject();
-            for (; ; ) {
-                if (token == null) {
-                    token = x.nextToken();
-                }
-                // attribute = value
-                if (token instanceof String) {
-                    string = (String) token;
-                    token = x.nextToken();
-                    if (token == EQ) {
-                        token = x.nextToken();
-                        if (!(token instanceof String)) {
-                            throw x.syntaxError("Missing value");
-                        }
-                        jsonobject.accumulate(string, XML.stringToValue((String) token));
-                        token = null;
-                    } else {
-                        jsonobject.accumulate(string, "");
-                    }
-                    // Empty tag <.../>
-                } else if (token == SLASH) {
-                    if (x.nextToken() != GT) {
-                        throw x.syntaxError("Misshaped tag");
-                    }
-                    if (jsonobject.length() > 0) {
-                        context.accumulate(tagName, jsonobject);
-                    } else {
-                        context.accumulate(tagName, "");
-                    }
-                    return false;
-                    // Content, between <...> and </...>
-                } else if (token == GT) {
-                    for (; ; ) {
-                        token = x.nextContent();
-                        if (token == null) {
-                            if (tagName != null) {
-                                throw x.syntaxError("Unclosed tag " + tagName);
-                            }
-                            return false;
-                        } else if (token instanceof String) {
-                            string = (String) token;
-                            if (!string.isEmpty()) {
-                                jsonobject.accumulate("content", XML.stringToValue(string));
-                            }
-                            // Nested element
-                        } else if (token == LT) {
-                            if (parse(x, jsonobject, tagName)) {
-                                if (jsonobject.length() == 0) {
-                                    context.accumulate(tagName, "");
-                                } else if ((jsonobject.length() == 1) && (jsonobject.opt("content")
-                                    != null)) {
-                                    context.accumulate(tagName, jsonobject.opt("content"));
-                                } else {
-                                    context.accumulate(tagName, jsonobject);
-                                }
-                                return false;
-                            }
-                        }
-                    }
-                } else {
-                    throw x.syntaxError("Misshaped tag");
-                }
-            }
-        }
-    }
-
-    /**
-     * Try to convert a string into a number, boolean, or null. If the string can't be converted, return the string.
-     * This is much less ambitious than JSONObject.stringToValue, especially because it does not attempt to convert plus
-     * forms, octal forms, hex forms, or E forms lacking decimal points.
-     *
-     * @param string A String.
-     * @return A simple JSON value.
-     */
-    static Object stringToValue(String string) {
-        if ("true".equalsIgnoreCase(string)) {
-            return Boolean.TRUE;
-        }
-        if ("false".equalsIgnoreCase(string)) {
-            return Boolean.FALSE;
-        }
-        if ("null".equalsIgnoreCase(string)) {
-            return JSONObject.NULL;
-        }
-        //If it might be a number, try converting it, first as a Long, and then as a Double. If that doesn't work, return the string.
-        try {
-            char initial = string.charAt(0);
-            if ((initial == '-') || ((initial >= '0') && (initial <= '9'))) {
-                Long value = Long.valueOf(string);
-                if (value.toString().equals(string)) {
-                    return value;
-                }
-            }
-        } catch (NumberFormatException ignore) {
-            try {
-                Double value = Double.valueOf(string);
-                if (value.toString().equals(string)) {
-                    return value;
-                }
-            } catch (NumberFormatException ignored) {
-            }
-        }
-        return string;
-    }
-
-    public static JSONObject toJSONObject(String string) throws JSONException {
-        JSONObject jo = new JSONObject();
-        XMLTokener x = new XMLTokener(string);
-        while (x.more() && x.skipPast("<")) {
-            parse(x, jo, null);
-        }
-        return jo;
-    }
-
-    /**
-     * Convert a JSONObject into a well-formed, element-normal XML string.
-     *
-     * @param object A JSONObject.
-     * @return A string.
-     * @throws JSONException
-     */
-    public static String toString(Object object) throws JSONException {
-        return toString(object, null);
-    }
-
-    /**
-     * Convert a JSONObject into a well-formed, element-normal XML string.
-     *
-     * @param object  A JSONObject.
-     * @param tagName The optional name of the enclosing tag.
-     * @return A string.
-     * @throws JSONException
-     */
-    public static String toString(Object object, String tagName) throws JSONException {
-        StringBuilder sb = new StringBuilder();
-        int i;
-        JSONArray ja;
-        int length;
-        String string;
-        if (object instanceof JSONObject) {
-            // Emit <tagName>
-            if (tagName != null) {
-                sb.append('<');
-                sb.append(tagName);
-                sb.append('>');
-            }
-            // Loop thru the keys.
-            JSONObject jo = (JSONObject) object;
-            Iterator<String> keys = jo.keys();
-            while (keys.hasNext()) {
-                String key = keys.next();
-                Object value = jo.opt(key);
-                if (value == null) {
-                    value = "";
-                }
-                string = value instanceof String ? (String) value : null;
-                // Emit content in body
-                if ("content".equals(key)) {
-                    if (value instanceof JSONArray) {
-                        ja = (JSONArray) value;
-                        length = ja.length();
-                        for (i = 0; i < length; i += 1) {
-                            if (i > 0) {
-                                sb.append('\n');
-                            }
-                            sb.append(escape(ja.get(i).toString()));
-                        }
-                    } else {
-                        sb.append(escape(value.toString()));
-                    }
-                    // Emit an array of similar keys
-                } else if (value instanceof JSONArray) {
-                    ja = (JSONArray) value;
-                    length = ja.length();
-                    for (i = 0; i < length; i += 1) {
-                        value = ja.get(i);
-                        if (value instanceof JSONArray) {
-                            sb.append('<');
-                            sb.append(key);
-                            sb.append('>');
-                            sb.append(toString(value));
-                            sb.append("</");
-                            sb.append(key);
-                            sb.append('>');
-                        } else {
-                            sb.append(toString(value, key));
-                        }
-                    }
-                } else if ("".equals(value)) {
-                    sb.append('<');
-                    sb.append(key);
-                    sb.append("/>");
-                    // Emit a new tag <k>
-                } else {
-                    sb.append(toString(value, key));
-                }
-            }
-            if (tagName != null) {
-                // Emit the </tagname> close tag
-                sb.append("</");
-                sb.append(tagName);
-                sb.append('>');
-            }
-            return sb.toString();
-            // XML does not have good support for arrays. If an array appears in
-            // a place
-            // where XML is lacking, synthesize an <array> element.
-        } else {
-            if (object.getClass().isArray()) {
-                object = new JSONArray(object);
-            }
-            if (object instanceof JSONArray) {
-                ja = (JSONArray) object;
-                length = ja.length();
-                for (i = 0; i < length; i += 1) {
-                    sb.append(toString(ja.opt(i), tagName == null ? "array" : tagName));
-                }
-                return sb.toString();
-            } else {
-                string = escape(object.toString());
-                return (tagName == null) ?
-                    '"' + string + '"' :
-                    string.isEmpty() ?
-                        '<' + tagName + "/>" :
-                        '<' + tagName + '>' + string + "</" + tagName + '>';
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java
deleted file mode 100644
index 96d65541f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/json/XMLTokener.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package com.github.intellectualsites.plotsquared.json;
-
-import java.util.HashMap;
-
-/**
- * The XMLTokener extends the JSONTokener to provide additional methods for the parsing of XML texts.
- *
- * @author JSON.org
- * @version 2014-05-03
- */
-public class XMLTokener extends JSONTokener {
-    /**
-     * The table of entity values. It initially contains Character values for amp, apos, gt, lt, quot.
-     */
-    public static final HashMap<String, Character> entity;
-
-    static {
-        entity = new HashMap<>(8);
-        entity.put("amp", XML.AMP);
-        entity.put("apos", XML.APOS);
-        entity.put("gt", XML.GT);
-        entity.put("lt", XML.LT);
-        entity.put("quot", XML.QUOT);
-    }
-
-    /**
-     * Construct an XMLTokener from a string.
-     *
-     * @param s A source string.
-     */
-    public XMLTokener(final String s) {
-        super(s);
-    }
-
-    /**
-     * Get the text in the CDATA block.
-     *
-     * @return The string up to the <code>]]&gt;</code>.
-     * @throws JSONException If the <code>]]&gt;</code> is not found.
-     */
-    public String nextCDATA() throws JSONException {
-        final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
-            char c = next();
-            if (end()) {
-                throw syntaxError("Unclosed CDATA");
-            }
-            sb.append(c);
-            int i = sb.length() - 3;
-            if ((i >= 0) && (sb.charAt(i) == ']') && (sb.charAt(i + 1) == ']') && (sb.charAt(i + 2)
-                == '>')) {
-                sb.setLength(i);
-                return sb.toString();
-            }
-        }
-    }
-
-    /**
-     * Get the next XML outer token, trimming whitespace. There are two kinds of tokens: the '&lt;' character which begins
-     * a markup tag, and the content text between markup tags.
-     *
-     * @return A string, or a '&lt;' Character, or null if there is no more source text.
-     * @throws JSONException
-     */
-    public Object nextContent() throws JSONException {
-        char c;
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        if (c == 0) {
-            return null;
-        }
-        if (c == '<') {
-            return XML.LT;
-        }
-        StringBuilder sb = new StringBuilder();
-        for (; ; ) {
-            if ((c == '<') || (c == 0)) {
-                back();
-                return sb.toString().trim();
-            }
-            if (c == '&') {
-                sb.append(nextEntity('&'));
-            } else {
-                sb.append(c);
-            }
-            c = next();
-        }
-    }
-
-    /**
-     * Return the next entity. These entities are translated to Characters: <code>&amp; &quot; &gt;  &lt;
-     * &quot;</code>.
-     *
-     * @param ampersand An ampersand character.
-     * @return A Character or an entity String if the entity is not recognized.
-     * @throws JSONException If missing ';' in XML entity.
-     */
-    public Object nextEntity(final char ampersand) throws JSONException {
-        final StringBuilder sb = new StringBuilder();
-        for (; ; ) {
-            final char c = next();
-            if (Character.isLetterOrDigit(c) || (c == '#')) {
-                sb.append(Character.toLowerCase(c));
-            } else if (c == ';') {
-                break;
-            } else {
-                throw syntaxError("Missing ';' in XML entity: &" + sb);
-            }
-        }
-        final String string = sb.toString();
-        final Object object = entity.get(string);
-        return object != null ? object : ampersand + string + ';';
-    }
-
-    /**
-     * Returns the next XML meta token. This is used for skipping over <!...> and <?...?> structures.
-     *
-     * @return Syntax characters (<code>&lt; &gt; / = ! ?</code>) are returned as Character, and strings and names are
-     * returned as Boolean. We don't care what the values actually are.
-     * @throws JSONException If a string is not properly closed or if the XML is badly structured.
-     */
-    public Object nextMeta() throws JSONException {
-        char c;
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        char q;
-        switch (c) {
-            case 0:
-                throw syntaxError("Misshaped meta tag");
-            case '<':
-                return XML.LT;
-            case '>':
-                return XML.GT;
-            case '/':
-                return XML.SLASH;
-            case '=':
-                return XML.EQ;
-            case '!':
-                return XML.BANG;
-            case '?':
-                return XML.QUEST;
-            case '"':
-            case '\'':
-                q = c;
-                for (; ; ) {
-                    c = next();
-                    if (c == 0) {
-                        throw syntaxError("Unterminated string");
-                    }
-                    if (c == q) {
-                        return Boolean.TRUE;
-                    }
-                }
-            default:
-                for (; ; ) {
-                    c = next();
-                    if (Character.isWhitespace(c)) {
-                        return Boolean.TRUE;
-                    }
-                    switch (c) {
-                        case 0:
-                        case '<':
-                        case '>':
-                        case '/':
-                        case '=':
-                        case '!':
-                        case '?':
-                        case '"':
-                        case '\'':
-                            back();
-                            return Boolean.TRUE;
-                    }
-                }
-        }
-    }
-
-    /**
-     * Get the next XML Token. These tokens are found inside of angle brackets. It may be one of these characters:
-     * <code>/ &gt;= ! ?</code> or it may be a string wrapped in single quotes or double quotes, or it may be a name.
-     *
-     * @return a String or a Character.
-     * @throws JSONException If the XML is not well formed.
-     */
-    public Object nextToken() throws JSONException {
-        char c;
-        do {
-            c = next();
-        } while (Character.isWhitespace(c));
-        char q;
-        StringBuilder sb;
-        switch (c) {
-            case 0:
-                throw syntaxError("Misshaped element");
-            case '<':
-                throw syntaxError("Misplaced '<'");
-            case '>':
-                return XML.GT;
-            case '/':
-                return XML.SLASH;
-            case '=':
-                return XML.EQ;
-            case '!':
-                return XML.BANG;
-            case '?':
-                return XML.QUEST;
-            // Quoted string
-            case '"':
-            case '\'':
-                q = c;
-                sb = new StringBuilder();
-                for (; ; ) {
-                    c = next();
-                    if (c == 0) {
-                        throw syntaxError("Unterminated string");
-                    }
-                    if (c == q) {
-                        return sb.toString();
-                    }
-                    if (c == '&') {
-                        sb.append(nextEntity('&'));
-                    } else {
-                        sb.append(c);
-                    }
-                }
-            default:
-                // Name
-                sb = new StringBuilder();
-                for (; ; ) {
-                    sb.append(c);
-                    c = next();
-                    if (Character.isWhitespace(c)) {
-                        return sb.toString();
-                    }
-                    switch (c) {
-                        case 0:
-                            return sb.toString();
-                        case '>':
-                        case '/':
-                        case '=':
-                        case '!':
-                        case '?':
-                        case '[':
-                        case ']':
-                            back();
-                            return sb.toString();
-                        case '<':
-                        case '"':
-                        case '\'':
-                            throw syntaxError("Bad character in a name");
-                    }
-                }
-        }
-    }
-
-    /**
-     * Skip characters until past the requested string. If it is not found, we are left at the end of the source with a
-     * result of false.
-     *
-     * @param to A string to skip past.
-     * @throws JSONException
-     */
-    public boolean skipPast(final String to) throws JSONException {
-        char c;
-        int i;
-        final int length = to.length();
-        final char[] circle = new char[length];
-        /*
-         * First fill the circle buffer with as many characters as are in the
-         * to string. If we reach an early end, bail.
-         */
-        for (i = 0; i < length; i += 1) {
-            c = next();
-            if (c == 0) {
-                return false;
-            }
-            circle[i] = c;
-        }
-        /* We will loop, possibly for all of the remaining characters. */
-        for (int offset = 0; ; ) {
-            int j = offset;
-            boolean b = true;
-            /* Compare the circle buffer with the to string. */
-            for (i = 0; i < length; i += 1) {
-                if (circle[j] != to.charAt(i)) {
-                    b = false;
-                    break;
-                }
-                j += 1;
-                if (j >= length) {
-                    j -= length;
-                }
-            }
-            /* If we exit the loop with b intact, then victory is ours. */
-            if (b) {
-                return true;
-            }
-            /* Get the next character. If there isn't one, then defeat is ours. */
-            c = next();
-            if (c == 0) {
-                return false;
-            }
-            /*
-             * Shove the character in the circle buffer and advance the
-             * circle offset. The offset is mod n.
-             */
-            circle[offset] = c;
-            offset += 1;
-            if (offset >= length) {
-                offset -= length;
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
deleted file mode 100644
index 2f6559a4e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot;
-
-import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.logger.ILogger;
-import com.github.intellectualsites.plotsquared.plot.object.BlockRegistry;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
-
-import java.io.File;
-import java.util.List;
-
-public interface IPlotMain extends ILogger {
-
-    /**
-     * Log a message to console.
-     *
-     * @param message The message to log
-     */
-    void log(String message);
-
-    /**
-     * Get the `PlotSquared` directory.
-     *
-     * @return The plugin directory
-     */
-    File getDirectory();
-
-    /**
-     * Get the directory containing all the worlds.
-     *
-     * @return The directory containing the worlds
-     */
-    File getWorldContainer();
-
-    /**
-     * Wrap a player into a PlotPlayer object.
-     *
-     * @param player The player to convert to a PlotPlayer
-     * @return A PlotPlayer
-     */
-    PlotPlayer wrapPlayer(Object player);
-
-    /**
-     * Disable the implementation.
-     *
-     * <ul>
-     * <li>If a full disable isn't feasibly, just disable what it can.
-     * </ul>
-     */
-    void disable();
-
-    /**
-     * Completely shut down the plugin
-     */
-    void shutdown();
-
-    /**
-     * Get the version of the PlotSquared being used.
-     *
-     * @return the plugin version
-     */
-    int[] getPluginVersion();
-
-    /**
-     * Get the version of the PlotSquared being used as a string.
-     *
-     * @return the plugin version as a string
-     */
-    String getPluginVersionString();
-
-    /**
-     * Usually PlotSquared
-     *
-     * @return
-     */
-    default String getPluginName() {
-        return "PlotSquared";
-    }
-
-    /**
-     * Get the version of Minecraft that is running.
-     *
-     * @return
-     */
-    int[] getServerVersion();
-
-    /**
-     * Get the server implementation name and version
-     */
-    String getServerImplementation();
-
-    /**
-     * Get the NMS package prefix.
-     *
-     * @return The NMS package prefix
-     */
-    String getNMSPackage();
-
-    /**
-     * Get the schematic handler.
-     *
-     * @return The {@link SchematicHandler}
-     */
-    SchematicHandler initSchematicHandler();
-
-    /**
-     * Get the Chat Manager.
-     *
-     * @return The {@link ChatManager}
-     */
-    ChatManager initChatManager();
-
-    /**
-     * The task manager will run and manage Minecraft tasks.
-     *
-     * @return
-     */
-    TaskManager getTaskManager();
-
-    /**
-     * Run the task that will kill road mobs.
-     */
-    void runEntityTask();
-
-    /**
-     * Register the implementation specific commands.
-     */
-    void registerCommands();
-
-    /**
-     * Register the protection system.
-     */
-    void registerPlayerEvents();
-
-    /**
-     * Register inventory related events.
-     */
-    void registerInventoryEvents();
-
-    /**
-     * Register plot plus related events.
-     */
-    void registerPlotPlusEvents();
-
-    /**
-     * Register force field events.
-     */
-    void registerForceFieldEvents();
-
-    /**
-     * Register the WorldEdit hook.
-     */
-    boolean initWorldEdit();
-
-    /**
-     * Get the economy provider.
-     *
-     * @return
-     */
-    EconHandler getEconomyHandler();
-
-    /**
-     * Get the {@link QueueProvider} class.
-     *
-     * @return
-     */
-    QueueProvider initBlockQueue();
-
-    /**
-     * Get the {@link WorldUtil} class.
-     *
-     * @return
-     */
-    WorldUtil initWorldUtil();
-
-    /**
-     * Get the EventUtil class.
-     *
-     * @return
-     */
-    EventUtil initEventUtil();
-
-    /**
-     * Get the chunk manager.
-     *
-     * @return
-     */
-    ChunkManager initChunkManager();
-
-    /**
-     * Get the {@link SetupUtils} class.
-     *
-     * @return
-     */
-    SetupUtils initSetupUtils();
-
-    /**
-     * Get {@link HybridUtils} class.
-     *
-     * @return
-     */
-    HybridUtils initHybridUtils();
-
-    /**
-     * Start Metrics.
-     */
-    void startMetrics();
-
-    /**
-     * If a world is already loaded, set the generator (use NMS if required).
-     *
-     * @param world The world to set the generator
-     */
-    void setGenerator(String world);
-
-    /**
-     * Get the {@link UUIDHandlerImplementation} which will cache and
-     * provide UUIDs.
-     *
-     * @return
-     */
-    UUIDHandlerImplementation initUUIDHandler();
-
-    /**
-     * Get the {@link InventoryUtil} class (used for implementation specific
-     * inventory guis).
-     *
-     * @return
-     */
-    InventoryUtil initInventoryUtil();
-
-    /**
-     * Unregister a PlotPlayer from cache e.g. if they have logged off.
-     *
-     * @param player
-     */
-    void unregister(PlotPlayer player);
-
-    /**
-     * Get the generator wrapper for a world (world) and generator (name).
-     *
-     * @param world
-     * @param name
-     * @return
-     */
-    GeneratorWrapper<?> getGenerator(String world, String name);
-
-    GeneratorWrapper<?> wrapPlotGenerator(String world, IndependentPlotGenerator generator);
-
-    /**
-     * Register the chunk processor which will clean out chunks that have too
-     * many blockstates or entities.
-     */
-    void registerChunkProcessor();
-
-    /**
-     * Register the world initialization events (used to keep track of worlds
-     * being generated).
-     */
-    void registerWorldEvents();
-
-    /**
-     * Usually HybridGen
-     *
-     * @return Default implementation generator
-     */
-    IndependentPlotGenerator getDefaultGenerator();
-
-    /**
-     * Get the class that will manage player titles.
-     *
-     * @return
-     */
-    AbstractTitle initTitleManager();
-
-    List<String> getPluginIds();
-
-    BlockRegistry<?> getBlockRegistry();
-
-    LegacyMappings getLegacyMappings();
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
deleted file mode 100644
index 9dfbf2ffb..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot;
-
-public enum Platform {
-    Bukkit, Sponge, Spigot
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
deleted file mode 100644
index 63bbf8142..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ /dev/null
@@ -1,2066 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.configuration.MemorySection;
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
-import com.github.intellectualsites.plotsquared.plot.commands.WE_Anywhere;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.config.Storage;
-import com.github.intellectualsites.plotsquared.plot.database.*;
-import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.listener.WESubscriber;
-import com.github.intellectualsites.plotsquared.plot.logger.ILogger;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpiryTask;
-import com.sk89q.worldedit.WorldEdit;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.Setter;
-
-import javax.annotation.Nullable;
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.file.Files;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-/**
- * An implementation of the core, with a static getter for easy access.
- */
-@SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
-
-    private static final Set<Plot> EMPTY_SET = Collections.unmodifiableSet(Collections.emptySet());
-    private static PlotSquared instance;
-    // Implementation
-    public final IPlotMain IMP;
-    // Current thread
-    private final Thread thread;
-    // WorldEdit instance
-    public WorldEdit worldedit;
-    public File styleFile;
-    public File configFile;
-    public File worldsFile;
-    public File commandsFile;
-    public File translationFile;
-    public YamlConfiguration style;
-    public YamlConfiguration config;
-    public YamlConfiguration worlds;
-    public YamlConfiguration storage;
-    public YamlConfiguration commands;
-    // Temporary hold the plots/clusters before the worlds load
-    public HashMap<String, Set<PlotCluster>> clusters_tmp;
-    public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
-    // Implementation logger
-    @Setter @Getter private ILogger logger;
-    // Platform / Version / Update URL
-    private PlotVersion version;
-    // Files and configuration
-    @Getter private File jarFile = null; // This file
-    private File storageFile;
-    @Getter private PlotAreaManager plotAreaManager;
-
-    /**
-     * Initialize PlotSquared with the desired Implementation class.
-     *
-     * @param iPlotMain Implementation of {@link IPlotMain} used
-     * @param platform  The platform being used
-     */
-    public PlotSquared(final IPlotMain iPlotMain, final String platform) {
-        if (instance != null) {
-            throw new IllegalStateException("Cannot re-initialize the PlotSquared singleton");
-        }
-        instance = this;
-
-        this.thread = Thread.currentThread();
-        this.IMP = iPlotMain;
-        this.logger = iPlotMain;
-        Settings.PLATFORM = platform;
-
-        //
-        // Register configuration serializable classes
-        //
-        ConfigurationSerialization.registerClass(PlotBlock.class, "PlotBlock");
-        ConfigurationSerialization.registerClass(BlockBucket.class, "BlockBucket");
-
-        try {
-            new ReflectionUtils(this.IMP.getNMSPackage());
-            try {
-                URL url = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
-                this.jarFile = new File(
-                    new URL(url.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
-                        .toURI().getPath());
-            } catch (MalformedURLException | URISyntaxException | SecurityException e) {
-                e.printStackTrace();
-                this.jarFile = new File(this.IMP.getDirectory().getParentFile(), "PlotSquared.jar");
-                if (!this.jarFile.exists()) {
-                    this.jarFile = new File(this.IMP.getDirectory().getParentFile(),
-                        "PlotSquared-" + platform + ".jar");
-                }
-            }
-            TaskManager.IMP = this.IMP.getTaskManager();
-
-            // World Util. Has to be done before config files are loaded
-            WorldUtil.IMP = this.IMP.initWorldUtil();
-
-            if (!setupConfigs()) {
-                return;
-            }
-            this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
-                Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
-                    + ".use_THIS.yml");
-            C.load(this.translationFile);
-
-            // Setup plotAreaManager
-            if (Settings.Enabled_Components.WORLDS) {
-                this.plotAreaManager = new SinglePlotAreaManager();
-            } else {
-                this.plotAreaManager = new DefaultPlotAreaManager();
-            }
-
-            // Database
-            if (Settings.Enabled_Components.DATABASE) {
-                setupDatabase();
-            }
-            // Comments
-            CommentManager.registerDefaultInboxes();
-            // Kill entities
-            if (Settings.Enabled_Components.KILL_ROAD_MOBS
-                || Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
-                this.IMP.runEntityTask();
-            }
-            if (Settings.Enabled_Components.EVENTS) {
-                this.IMP.registerPlayerEvents();
-                this.IMP.registerInventoryEvents();
-                this.IMP.registerPlotPlusEvents();
-            }
-            // Required
-            this.IMP.registerWorldEvents();
-            if (Settings.Enabled_Components.METRICS) {
-                this.IMP.startMetrics();
-            } else {
-                PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
-            }
-            if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
-                this.IMP.registerChunkProcessor();
-            }
-            // create UUIDWrapper
-            UUIDHandler.implementation = this.IMP.initUUIDHandler();
-            if (Settings.Enabled_Components.UUID_CACHE) {
-                startUuidCatching();
-            } else {
-                // Start these separately
-                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                startExpiryTasks();
-            }
-            // create event util class
-            EventUtil.manager = this.IMP.initEventUtil();
-            // create Hybrid utility class
-            HybridUtils.manager = this.IMP.initHybridUtils();
-            // Inventory utility class
-            InventoryUtil.manager = this.IMP.initInventoryUtil();
-            // create setup util class
-            SetupUtils.manager = this.IMP.initSetupUtils();
-            // Set block
-            GlobalBlockQueue.IMP = new GlobalBlockQueue(IMP.initBlockQueue(), 1);
-            GlobalBlockQueue.IMP.runTask();
-            // Set chunk
-            ChunkManager.manager = this.IMP.initChunkManager();
-            // Schematic handler
-            SchematicHandler.manager = this.IMP.initSchematicHandler();
-            // Titles
-            AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
-            // Chat
-            ChatManager.manager = this.IMP.initChatManager();
-            // Commands
-            if (Settings.Enabled_Components.COMMANDS) {
-                this.IMP.registerCommands();
-            }
-            // WorldEdit
-            if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
-                try {
-                    if (this.IMP.initWorldEdit()) {
-                        PlotSquared.debug(IMP.getPluginName() + " hooked into WorldEdit.");
-                        this.worldedit = WorldEdit.getInstance();
-                        WorldEdit.getInstance().getEventBus().register(new WESubscriber());
-                        if (Settings.Enabled_Components.COMMANDS) {
-                            new WE_Anywhere();
-                        }
-
-                    }
-                } catch (Throwable e) {
-                    PlotSquared.debug(
-                        "Incompatible version of WorldEdit, please upgrade: http://builds.enginehub.org/job/worldedit?branch=master");
-                }
-            }
-            // Economy
-            if (Settings.Enabled_Components.ECONOMY) {
-                TaskManager
-                    .runTask(() -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
-            }
-
-/*            // Check for updates
-            if (Settings.Enabled_Components.UPDATER) {
-                updater = new Updater();
-                TaskManager.IMP.taskAsync(new Runnable() {
-                    @Override public void run() {
-                        updater.update(getPlatform(), getVersion());
-                    }
-                });
-                TaskManager.IMP.taskRepeatAsync(new Runnable() {
-                    @Override public void run() {
-                        updater.update(getPlatform(), getVersion());
-                    }
-                }, 36000);
-            }*/
-
-            // World generators:
-            final ConfigurationSection section = this.worlds.getConfigurationSection("worlds");
-            if (section != null) {
-                for (String world : section.getKeys(false)) {
-                    if (world.equals("CheckingPlotSquaredGenerator")) {
-                        continue;
-                    }
-                    if (WorldUtil.IMP.isWorld(world)) {
-                        this.IMP.setGenerator(world);
-                    }
-                }
-                TaskManager.runTaskLater(() -> {
-                    for (String world : section.getKeys(false)) {
-                        if (world.equals("CheckingPlotSquaredGenerator")) {
-                            continue;
-                        }
-                        if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
-                            debug(
-                                "&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
-                                    + " will now try to load it properly: ");
-                            debug(
-                                "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
-                            debug(
-                                "&8 - &7Your world management plugin may be faulty (or non existent)");
-                            PlotSquared.this.IMP.setGenerator(world);
-                        }
-                    }
-                }, 1);
-            }
-
-            // Copy files
-            copyFile("addplots.js", Settings.Paths.SCRIPTS);
-            copyFile("addsigns.js", Settings.Paths.SCRIPTS);
-            copyFile("automerge.js", Settings.Paths.SCRIPTS);
-            copyFile("furthest.js", Settings.Paths.SCRIPTS);
-            copyFile("mycommand.js", Settings.Paths.SCRIPTS);
-            copyFile("setbiomes.js", Settings.Paths.SCRIPTS);
-            copyFile("start.js", Settings.Paths.SCRIPTS);
-            copyFile("town.template", Settings.Paths.TEMPLATES);
-            copyFile("skyblock.template", Settings.Paths.TEMPLATES);
-            copyFile("bridge.template", Settings.Paths.TEMPLATES);
-            copyFile("de-DE.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("es-ES.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("zh-CN.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("it-IT.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("ko-KR.yml", Settings.Paths.TRANSLATIONS);
-            copyFile("fr-FR.yml", Settings.Paths.TRANSLATIONS);
-            showDebug();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-
-        PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
-    }
-
-    /**
-     * Get an instance of PlotSquared.
-     *
-     * @return instance of PlotSquared
-     */
-    public static PlotSquared get() {
-        return PlotSquared.instance;
-    }
-
-    public static IPlotMain imp() {
-        if (instance != null) {
-            return instance.IMP;
-        }
-        return null;
-    }
-
-    /**
-     * Log a message to the IPlotMain logger.
-     *
-     * @param message Message to log
-     * @see IPlotMain#log(String)
-     */
-    public static void log(Object message) {
-        if (message == null || message.toString().isEmpty()) {
-            return;
-        }
-        if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
-            System.out.printf("[P2][Info] %s\n", StringMan.getString(message));
-        } else {
-            PlotSquared.get().getLogger().log(StringMan.getString(message));
-        }
-    }
-
-    /**
-     * Log a message to the IPlotMain logger.
-     *
-     * @param message Message to log
-     * @see IPlotMain#log(String)
-     */
-    public static void debug(@Nullable Object message) {
-        if (Settings.DEBUG) {
-            if (PlotSquared.get() == null || PlotSquared.get().getLogger() == null) {
-                System.out.printf("[P2][Debug] %s\n", StringMan.getString(message));
-            } else {
-                PlotSquared.get().getLogger().log(StringMan.getString(message));
-            }
-        }
-    }
-
-    private void startUuidCatching() {
-        TaskManager.runTaskLater(() -> {
-            debug("Starting UUID caching");
-            UUIDHandler.startCaching(() -> {
-                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                foreachPlotRaw(new RunnableVal<Plot>() {
-                    @Override public void run(Plot plot) {
-                        if (plot.hasOwner() && plot.temp != -1) {
-                            if (UUIDHandler.getName(plot.owner) == null) {
-                                UUIDHandler.implementation.unknown.add(plot.owner);
-                            }
-                        }
-                    }
-                });
-                startExpiryTasks();
-            });
-        }, 20);
-    }
-
-    private void startExpiryTasks() {
-        if (Settings.Enabled_Components.PLOT_EXPIRY) {
-            ExpireManager.IMP = new ExpireManager();
-            ExpireManager.IMP.runAutomatedTask();
-            for (Settings.Auto_Clear settings : Settings.AUTO_CLEAR.getInstances()) {
-                ExpiryTask task = new ExpiryTask(settings);
-                ExpireManager.IMP.addTask(task);
-            }
-        }
-    }
-
-    public boolean isMainThread(Thread thread) {
-        return this.thread == thread;
-    }
-
-    /**
-     * Check if `version` is >= `version2`.
-     *
-     * @param version  First version
-     * @param version2 Second version
-     * @return true if `version` is >= `version2`
-     */
-    public boolean checkVersion(int[] version, int... version2) {
-        return version[0] > version2[0] || version[0] == version2[0] && version[1] > version2[1]
-            || version[0] == version2[0] && version[1] == version2[1] && version[2] >= version2[2];
-    }
-
-    /**
-     * Get the current PlotSquared version.
-     *
-     * @return current version in config or null
-     */
-    public PlotVersion getVersion() {
-        return this.version;
-    }
-
-    /**
-     * Get the server platform this plugin is running on this is running on.
-     * <p>
-     * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
-     *
-     * @return the server implementation
-     */
-    public String getPlatform() {
-        return Settings.PLATFORM;
-    }
-
-    public PlotManager getPlotManager(Plot plot) {
-        return plot.getArea().manager;
-    }
-
-    public PlotManager getPlotManager(Location location) {
-        PlotArea pa = getPlotAreaAbs(location);
-        return pa != null ? pa.manager : null;
-    }
-
-    /**
-     * Add a global reference to a plot world.
-     *
-     * @param plotArea the {@code PlotArea} to add.
-     * @see #removePlotArea(PlotArea) To remove the reference
-     */
-    public void addPlotArea(PlotArea plotArea) {
-        HashMap<PlotId, Plot> plots;
-        if (plots_tmp == null || (plots = plots_tmp.remove(plotArea.toString())) == null) {
-            if (plotArea.TYPE == 2) {
-                plots = this.plots_tmp != null ? this.plots_tmp.get(plotArea.worldname) : null;
-                if (plots != null) {
-                    Iterator<Entry<PlotId, Plot>> iterator = plots.entrySet().iterator();
-                    while (iterator.hasNext()) {
-                        Entry<PlotId, Plot> next = iterator.next();
-                        PlotId id = next.getKey();
-                        if (plotArea.contains(id)) {
-                            next.getValue().setArea(plotArea);
-                            iterator.remove();
-                        }
-                    }
-                }
-            }
-        } else {
-            for (Plot entry : plots.values()) {
-                entry.setArea(plotArea);
-            }
-        }
-        Set<PlotCluster> clusters;
-        if (clusters_tmp == null || (clusters = clusters_tmp.remove(plotArea.toString())) == null) {
-            if (plotArea.TYPE == 2) {
-                clusters =
-                    this.clusters_tmp != null ? this.clusters_tmp.get(plotArea.worldname) : null;
-                if (clusters != null) {
-                    Iterator<PlotCluster> iterator = clusters.iterator();
-                    while (iterator.hasNext()) {
-                        PlotCluster next = iterator.next();
-                        if (next.intersects(plotArea.getMin(), plotArea.getMax())) {
-                            next.setArea(plotArea);
-                            iterator.remove();
-                        }
-                    }
-                }
-            }
-        } else {
-            for (PlotCluster cluster : clusters) {
-                cluster.setArea(plotArea);
-            }
-        }
-        plotAreaManager.addPlotArea(plotArea);
-        plotArea.setupBorder();
-    }
-
-    /**
-     * Remove a plot world reference.
-     *
-     * @param area the {@code PlotArea} to remove
-     */
-    public void removePlotArea(PlotArea area) {
-        plotAreaManager.removePlotArea(area);
-        setPlotsTmp(area);
-    }
-
-    public void removePlotAreas(String world) {
-        for (PlotArea area : getPlotAreas(world)) {
-            if (area.worldname.equals(world)) {
-                removePlotArea(area);
-            }
-        }
-    }
-
-    private void setPlotsTmp(PlotArea area) {
-        if (this.plots_tmp == null) {
-            this.plots_tmp = new HashMap<>();
-        }
-        HashMap<PlotId, Plot> map =
-            this.plots_tmp.computeIfAbsent(area.toString(), k -> new HashMap<>());
-        for (Plot plot : area.getPlots()) {
-            map.put(plot.getId(), plot);
-        }
-        if (this.clusters_tmp == null) {
-            this.clusters_tmp = new HashMap<>();
-        }
-        this.clusters_tmp.put(area.toString(), area.getClusters());
-    }
-
-    public Set<PlotCluster> getClusters(String world) {
-        Set<PlotCluster> set = new HashSet<>();
-        for (PlotArea area : getPlotAreas(world)) {
-            set.addAll(area.getClusters());
-        }
-        return Collections.unmodifiableSet(set);
-
-    }
-
-    /**
-     * Get all the base plots in a single set (for merged plots it just returns the bottom plot).
-     *
-     * @return Set of base Plots
-     */
-    public Set<Plot> getBasePlots() {
-        int size = getPlotCount();
-        final Set<Plot> result = new HashSet<>(size);
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (Plot plot : value.getPlots()) {
-                    if (!plot.isBasePlot()) {
-                        continue;
-                    }
-                    result.add(plot);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(result);
-    }
-
-    public List<Plot> sortPlotsByTemp(Collection<Plot> plots) {
-        int max = 0;
-        int overflowCount = 0;
-        for (Plot plot : plots) {
-            if (plot.temp > 0) {
-                if (plot.temp > max) {
-                    max = plot.temp;
-                }
-            } else {
-                overflowCount++;
-            }
-        }
-        Plot[] array = new Plot[max + 1];
-        List<Plot> overflow = new ArrayList<>(overflowCount);
-        for (Plot plot : plots) {
-            if (plot.temp <= 0) {
-                overflow.add(plot);
-            } else {
-                array[plot.temp] = plot;
-            }
-        }
-        ArrayList<Plot> result = new ArrayList<>(plots.size());
-        for (Plot plot : array) {
-            if (plot != null) {
-                result.add(plot);
-            }
-        }
-        overflow.sort(Comparator.comparingInt(Plot::hashCode));
-        result.addAll(overflow);
-        return result;
-    }
-
-    /**
-     * Sort plots by hashcode.
-     *
-     * @param plots the collection of plots to sort
-     * @return the sorted collection {@link #sortPlots(Collection, SortType, PlotArea)} which has
-     * additional checks before calling this
-     */
-    // TODO: Re-evaluate this (previously public and deprecated), as it's being used internally
-    private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
-        int hardmax = 256000;
-        int max = 0;
-        int overflowSize = 0;
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash > max) {
-                if (hash >= hardmax) {
-                    overflowSize++;
-                } else {
-                    max = hash;
-                }
-            }
-        }
-        hardmax = Math.min(hardmax, max);
-        Plot[] cache = new Plot[hardmax + 1];
-        List<Plot> overflow = new ArrayList<>(overflowSize);
-        ArrayList<Plot> extra = new ArrayList<>();
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash < hardmax) {
-                if (hash >= 0) {
-                    cache[hash] = plot;
-                } else {
-                    extra.add(plot);
-                }
-            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
-                extra.add(plot);
-            } else {
-                overflow.add(plot);
-            }
-        }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
-        sortPlotsByHash(overflowArray);
-        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
-        for (Plot plot : cache) {
-            if (plot != null) {
-                result.add(plot);
-            }
-        }
-        Collections.addAll(result, overflowArray);
-        result.addAll(extra);
-        return result;
-    }
-
-    private void sortPlotsByHash(Plot[] input) {
-        List<Plot>[] bucket = new ArrayList[32];
-        for (int i = 0; i < bucket.length; i++) {
-            bucket[i] = new ArrayList<>();
-        }
-        boolean maxLength = false;
-        int placement = 1;
-        while (!maxLength) {
-            maxLength = true;
-            for (Plot i : input) {
-                int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
-                bucket[tmp & 31].add(i);
-                if (maxLength && tmp > 0) {
-                    maxLength = false;
-                }
-            }
-            int a = 0;
-            for (int b = 0; b < 32; b++) {
-                for (Plot i : bucket[b]) {
-                    input[a++] = i;
-                }
-                bucket[b].clear();
-            }
-            placement *= 32;
-        }
-    }
-
-    private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
-        int hardMax = 256000;
-        int max = 0;
-        int overflowSize = 0;
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash > max) {
-                if (hash >= hardMax) {
-                    overflowSize++;
-                } else {
-                    max = hash;
-                }
-            }
-        }
-        hardMax = Math.min(hardMax, max);
-        Plot[] cache = new Plot[hardMax + 1];
-        List<Plot> overflow = new ArrayList<>(overflowSize);
-        ArrayList<Plot> extra = new ArrayList<>();
-        for (Plot plot : plots) {
-            int hash = MathMan.getPositiveId(plot.hashCode());
-            if (hash < hardMax) {
-                if (hash >= 0) {
-                    cache[hash] = plot;
-                } else {
-                    extra.add(plot);
-                }
-            } else if (Math.abs(plot.getId().x) > 15446 || Math.abs(plot.getId().y) > 15446) {
-                extra.add(plot);
-            } else {
-                overflow.add(plot);
-            }
-        }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
-        sortPlotsByHash(overflowArray);
-        ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
-        for (Plot plot : cache) {
-            if (plot != null) {
-                result.add(plot);
-            }
-        }
-        Collections.addAll(result, overflowArray);
-        result.addAll(extra);
-        return result;
-    }
-
-    /**
-     * Sort plots by creation timestamp.
-     */
-
-    private List<Plot> sortPlotsByModified(Collection<Plot> input) {
-        List<Plot> list;
-        if (input instanceof List) {
-            list = (List<Plot>) input;
-        } else {
-            list = new ArrayList<>(input);
-        }
-        list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
-        return list;
-    }
-
-    /**
-     * Sort a collection of plots by world (with a priority world), then by hashcode.
-     *
-     * @param plots        the plots to sort
-     * @param type         The sorting method to use for each world (timestamp, or hash)
-     * @param priorityArea Use null, "world", or "gibberish" if you want default world order
-     * @return ArrayList of plot
-     */
-    public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
-        final PlotArea priorityArea) {
-        // group by world
-        // sort each
-        HashMap<PlotArea, Collection<Plot>> map = new HashMap<>();
-        int totalSize = getPlotCount();
-        if (plots.size() == totalSize) {
-            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                map.put(area, area.getPlots());
-            }
-        } else {
-            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                map.put(area, new ArrayList<>(0));
-            }
-            Collection<Plot> lastList = null;
-            PlotArea lastWorld = null;
-            for (Plot plot : plots) {
-                if (lastWorld == plot.getArea()) {
-                    lastList.add(plot);
-                } else {
-                    lastWorld = plot.getArea();
-                    lastList = map.get(lastWorld);
-                    lastList.add(plot);
-                }
-            }
-        }
-        List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
-        areas.sort((a, b) -> {
-            if (priorityArea != null) {
-                if (a.equals(priorityArea)) {
-                    return -1;
-                } else if (b.equals(priorityArea)) {
-                    return 1;
-                }
-            }
-            return a.hashCode() - b.hashCode();
-        });
-        ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
-        for (PlotArea area : areas) {
-            switch (type) {
-                case CREATION_DATE:
-                    toReturn.addAll(sortPlotsByTemp(map.get(area)));
-                    break;
-                case CREATION_DATE_TIMESTAMP:
-                    toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
-                    break;
-                case DISTANCE_FROM_ORIGIN:
-                    toReturn.addAll(sortPlotsByHash(map.get(area)));
-                    break;
-                case LAST_MODIFIED:
-                    toReturn.addAll(sortPlotsByModified(map.get(area)));
-                    break;
-                default:
-                    break;
-            }
-        }
-        return toReturn;
-    }
-
-    /**
-     * A more generic way to filter plots - make your own method if you need complex filters.
-     *
-     * @param filters the filter
-     * @return a filtered set of plots
-     */
-    public Set<Plot> getPlots(final PlotFilter... filters) {
-        final HashSet<Plot> set = new HashSet<>();
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (PlotFilter filter : filters) {
-                    if (!filter.allowsArea(value)) {
-                        return;
-                    }
-                }
-                loop:
-                for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
-                    Plot plot = entry2.getValue();
-                    for (PlotFilter filter : filters) {
-                        if (!filter.allowsPlot(plot)) {
-                            continue loop;
-                        }
-                    }
-                    set.add(plot);
-                }
-            }
-        });
-        return set;
-    }
-
-    /**
-     * Get all the plots in a single set.
-     *
-     * @return Set of Plots
-     */
-    public Set<Plot> getPlots() {
-        int size = getPlotCount();
-        final Set<Plot> result = new HashSet<>(size);
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                result.addAll(value.getPlots());
-            }
-        });
-        return result;
-    }
-
-    //TODO look at uncommenting or deleting tis. Is it useful and will it work?
-    //If it is readded make sure there is proper javadoc documentation for it.
-/*
-  public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
-    if (this.plots_tmp == null) {
-      this.plots_tmp = new HashMap<>();
-    }
-    for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
-      String world = entry.getKey();
-      PlotArea area = getPlotArea(world, null);
-      if (area == null) {
-        HashMap<PlotId, Plot> map = this.plots_tmp
-            .computeIfAbsent(world, k -> new HashMap<>());
-        map.putAll(entry.getValue());
-      } else {
-        for (Plot plot : entry.getValue().values()) {
-          plot.setArea(area);
-          area.addPlot(plot);
-        }
-      }
-    }
-  }
-*/
-
-    /**
-     * Get all the plots owned by a player name.
-     *
-     * @param world  the world
-     * @param player the plot owner
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlots(String world, String player) {
-        final UUID uuid = UUIDHandler.getUUID(player, null);
-        return getPlots(world, uuid);
-    }
-
-    /**
-     * Get all the plots owned by a player name.
-     *
-     * @param area   the PlotArea
-     * @param player the plot owner
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlots(PlotArea area, String player) {
-        UUID uuid = UUIDHandler.getUUID(player, null);
-        return getPlots(area, uuid);
-    }
-
-    /**
-     * Get all plots by a PlotPlayer.
-     *
-     * @param world  the world
-     * @param player the plot owner
-     * @return Set of plot
-     */
-    public Set<Plot> getPlots(String world, PlotPlayer player) {
-        return getPlots(world, player.getUUID());
-    }
-
-    /**
-     * Get all plots by a PlotPlayer.
-     *
-     * @param area   the PlotArea
-     * @param player the plot owner
-     * @return Set of plot
-     */
-    public Set<Plot> getPlots(PlotArea area, PlotPlayer player) {
-        return getPlots(area, player.getUUID());
-    }
-
-    /**
-     * Get all plots by a UUID in a world.
-     *
-     * @param world the world
-     * @param uuid  the plot owner
-     * @return Set of plot
-     */
-    public Set<Plot> getPlots(String world, UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        for (final Plot plot : getPlots(world)) {
-            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Get all plots by a UUID in an area.
-     *
-     * @param area the {@code PlotArea}
-     * @param uuid the plot owner
-     * @return Set of plots
-     */
-    public Set<Plot> getPlots(PlotArea area, UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        for (Plot plot : getPlots(area)) {
-            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Check if a plot world.
-     *
-     * @param world the world
-     * @return if a plot world is registered
-     * @see #getPlotAreaByString(String) to get the PlotArea object
-     */
-    public boolean hasPlotArea(String world) {
-        return plotAreaManager.getPlotAreas(world, null).length != 0;
-    }
-
-    public Collection<Plot> getPlots(String world) {
-        final Set<Plot> set = new HashSet<>();
-        foreachPlotArea(world, new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                set.addAll(value.getPlots());
-            }
-        });
-        return set;
-    }
-
-    /**
-     * Get the plots for a PlotPlayer.
-     *
-     * @param player the player to retrieve the plots for
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlots(PlotPlayer player) {
-        return getPlots(player.getUUID());
-    }
-
-    public Collection<Plot> getPlots(PlotArea area) {
-        return area == null ? EMPTY_SET : area.getPlots();
-    }
-
-    public Plot getPlot(PlotArea area, PlotId id) {
-        return area == null ? null : id == null ? null : area.getPlot(id);
-    }
-
-    public Set<Plot> getBasePlots(PlotPlayer player) {
-        return getBasePlots(player.getUUID());
-    }
-
-    /**
-     * Get the plots for a UUID.
-     *
-     * @param uuid the plot owner
-     * @return Set of Plot's owned by the player
-     */
-    public Set<Plot> getPlots(final UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        foreachPlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwnerAbs(uuid)) {
-                    plots.add(value);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(plots);
-    }
-
-    public boolean hasPlot(final UUID uuid) {
-        for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
-            if (area.hasPlot(uuid)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public Set<Plot> getBasePlots(final UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        foreachBasePlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwner(uuid)) {
-                    plots.add(value);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Get the plots for a UUID.
-     *
-     * @param uuid the UUID of the owner
-     * @return Set of Plot
-     */
-    public Set<Plot> getPlotsAbs(final UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        foreachPlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwnerAbs(uuid)) {
-                    plots.add(value);
-                }
-            }
-        });
-        return Collections.unmodifiableSet(plots);
-    }
-
-    /**
-     * Unregister a plot from local memory (does not call DB).
-     *
-     * @param plot      the plot to remove
-     * @param callEvent If to call an event about the plot being removed
-     * @return true if plot existed | false if it didn't
-     */
-    public boolean removePlot(Plot plot, boolean callEvent) {
-        if (plot == null) {
-            return false;
-        }
-        if (callEvent) {
-            EventUtil.manager.callDelete(plot);
-        }
-        if (plot.getArea().removePlot(plot.getId())) {
-            PlotId last = (PlotId) plot.getArea().getMeta("lastPlot");
-            int last_max = Math.max(Math.abs(last.x), Math.abs(last.y));
-            int this_max = Math.max(Math.abs(plot.getId().x), Math.abs(plot.getId().y));
-            if (this_max < last_max) {
-                plot.getArea().setMeta("lastPlot", plot.getId());
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * This method is called by the PlotGenerator class normally.
-     * <ul>
-     * <li>Initializes the PlotArea and PlotManager classes
-     * <li>Registers the PlotArea and PlotManager classes
-     * <li>Loads (and/or generates) the PlotArea configuration
-     * <li>Sets up the world border if configured
-     * </ul>
-     *
-     * <p>If loading an augmented plot world:
-     * <ul>
-     * <li>Creates the AugmentedPopulator classes
-     * <li>Injects the AugmentedPopulator classes if required
-     * </ul>
-     *
-     * @param world         the world to load
-     * @param baseGenerator The generator for that world, or null
-     */
-    public void loadWorld(String world, GeneratorWrapper<?> baseGenerator) {
-        if (world.equals("CheckingPlotSquaredGenerator")) {
-            return;
-        }
-        this.plotAreaManager.addWorld(world);
-        Set<String> worlds;
-        if (this.worlds.contains("worlds")) {
-            worlds = this.worlds.getConfigurationSection("worlds").getKeys(false);
-        } else {
-            worlds = new HashSet<>();
-        }
-        String path = "worlds." + world;
-        ConfigurationSection worldSection = this.worlds.getConfigurationSection(path);
-        int type;
-        if (worldSection != null) {
-            type = worldSection.getInt("generator.type", 0);
-        } else {
-            type = 0;
-        }
-        if (type == 0) {
-            if (plotAreaManager.getPlotAreas(world, null).length != 0) {
-                debug("World possibly already loaded: " + world);
-                return;
-            }
-            IndependentPlotGenerator plotGenerator;
-            if (baseGenerator != null && baseGenerator.isFull()) {
-                plotGenerator = baseGenerator.getPlotGenerator();
-            } else if (worldSection != null) {
-                String secondaryGeneratorName = worldSection.getString("generator.plugin");
-                GeneratorWrapper<?> secondaryGenerator =
-                    this.IMP.getGenerator(world, secondaryGeneratorName);
-                if (secondaryGenerator != null && secondaryGenerator.isFull()) {
-                    plotGenerator = secondaryGenerator.getPlotGenerator();
-                } else {
-                    String primaryGeneratorName = worldSection.getString("generator.init");
-                    GeneratorWrapper<?> primaryGenerator =
-                        this.IMP.getGenerator(world, primaryGeneratorName);
-                    if (primaryGenerator != null && primaryGenerator.isFull()) {
-                        plotGenerator = primaryGenerator.getPlotGenerator();
-                    } else {
-                        return;
-                    }
-                }
-            } else {
-                return;
-            }
-            // Conventional plot generator
-            PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
-            PlotManager plotManager = plotGenerator.getNewPlotManager();
-            PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-            PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
-            PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
-            PlotSquared
-                .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
-            if (!this.worlds.contains(path)) {
-                this.worlds.createSection(path);
-                worldSection = this.worlds.getConfigurationSection(path);
-            }
-            plotArea.saveConfiguration(worldSection);
-            plotArea.loadDefaultConfiguration(worldSection);
-            try {
-                this.worlds.save(this.worldsFile);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            // Now add it
-            addPlotArea(plotArea);
-            plotGenerator.initialize(plotArea);
-        } else {
-            if (!worlds.contains(world)) {
-                return;
-            }
-            ConfigurationSection areasSection = worldSection.getConfigurationSection("areas");
-            if (areasSection == null) {
-                if (plotAreaManager.getPlotAreas(world, null).length != 0) {
-                    debug("World possibly already loaded: " + world);
-                    return;
-                }
-                PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-                String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
-                if (type == 2) {
-                    Set<PlotCluster> clusters =
-                        this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<>();
-                    if (clusters == null) {
-                        throw new IllegalArgumentException("No cluster exists for world: " + world);
-                    }
-                    ArrayDeque<PlotArea> toLoad = new ArrayDeque<>();
-                    for (PlotCluster cluster : clusters) {
-                        PlotId pos1 = cluster.getP1(); // Cluster pos1
-                        PlotId pos2 = cluster.getP2(); // Cluster pos2
-                        String name = cluster.getName(); // Cluster name
-                        String fullId = name + "-" + pos1 + "-" + pos2;
-                        worldSection.createSection("areas." + fullId);
-                        DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
-
-                        PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
-                        GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-                        if (areaGen == null) {
-                            throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-                        }
-                        PlotArea pa =
-                            areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
-                        pa.saveConfiguration(worldSection);
-                        pa.loadDefaultConfiguration(worldSection);
-                        try {
-                            this.worlds.save(this.worldsFile);
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                        PlotSquared
-                            .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
-                        PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
-                            + " (invalid or old configuration?)");
-                        areaGen.getPlotGenerator().initialize(pa);
-                        areaGen.augment(pa);
-                        toLoad.add(pa);
-                    }
-                    for (PlotArea area : toLoad) {
-                        addPlotArea(area);
-                    }
-                    return;
-                }
-                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-                if (areaGen == null) {
-                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-                }
-                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null);
-                pa.saveConfiguration(worldSection);
-                pa.loadDefaultConfiguration(worldSection);
-                try {
-                    this.worlds.save(this.worldsFile);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
-                PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
-                PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
-                areaGen.getPlotGenerator().initialize(pa);
-                areaGen.augment(pa);
-                addPlotArea(pa);
-                return;
-            }
-            if (type == 1) {
-                throw new IllegalArgumentException(
-                    "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
-            }
-            for (String areaId : areasSection.getKeys(false)) {
-                PlotSquared.log(C.PREFIX + "&3 - " + areaId);
-                String[] split = areaId.split("(?<=[^;-])-");
-                if (split.length != 3) {
-                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
-                        + ". Expected form `<name>-<pos1>-<pos2>`");
-                }
-                String name = split[0];
-                PlotId pos1 = PlotId.fromString(split[1]);
-                PlotId pos2 = PlotId.fromString(split[2]);
-                if (pos1 == null || pos2 == null || name.isEmpty()) {
-                    throw new IllegalArgumentException("Invalid Area identifier: " + areaId
-                        + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
-                }
-                PlotArea existing = getPlotArea(world, name);
-                if (existing != null && name.equals(existing.id)) {
-                    continue;
-                }
-                ConfigurationSection section = areasSection.getConfigurationSection(areaId);
-                YamlConfiguration clone = new YamlConfiguration();
-                for (String key : section.getKeys(true)) {
-                    if (section.get(key) instanceof MemorySection) {
-                        continue;
-                    }
-                    if (!clone.contains(key)) {
-                        clone.set(key, section.get(key));
-                    }
-                }
-                for (String key : worldSection.getKeys(true)) {
-                    if (worldSection.get(key) instanceof MemorySection) {
-                        continue;
-                    }
-                    if (!key.startsWith("areas") && !clone.contains(key)) {
-                        clone.set(key, worldSection.get(key));
-                    }
-                }
-                String gen_string = clone.getString("generator.plugin", IMP.getPluginName());
-                GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
-                if (areaGen == null) {
-                    throw new IllegalArgumentException("Invalid Generator: " + gen_string);
-                }
-                PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, name, pos1, pos2);
-                pa.saveConfiguration(clone);
-                // netSections is the combination of
-                for (String key : clone.getKeys(true)) {
-                    if (clone.get(key) instanceof MemorySection) {
-                        continue;
-                    }
-                    if (!worldSection.contains(key)) {
-                        worldSection.set(key, clone.get(key));
-                    } else {
-                        Object value = worldSection.get(key);
-                        if (!Objects.equals(value, clone.get(key))) {
-                            section.set(key, clone.get(key));
-                        }
-                    }
-                }
-                pa.loadDefaultConfiguration(clone);
-                try {
-                    this.worlds.save(this.worldsFile);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
-                PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
-                areaGen.getPlotGenerator().initialize(pa);
-                areaGen.augment(pa);
-                addPlotArea(pa);
-            }
-        }
-    }
-
-    /**
-     * Setup the configuration for a plot world based on world arguments.
-     *
-     *
-     * <i>e.g. /mv create &lt;world&gt; normal -g PlotSquared:&lt;args&gt;</i>
-     *
-     * @param world     The name of the world
-     * @param args      The arguments
-     * @param generator the plot generator
-     * @return boolean | if valid arguments were provided
-     */
-    public boolean setupPlotWorld(String world, String args, IndependentPlotGenerator generator) {
-        if (args != null && !args.isEmpty()) {
-            // save configuration
-
-            final List<String> validArguments = Arrays
-                .asList("s=", "size=", "g=", "gap=", "h=", "height=", "f=", "floor=", "m=", "main=",
-                    "w=", "wall=", "b=", "border=");
-
-            // Calculate the number of expected arguments
-            int expected = 0;
-            for (final String validArgument : validArguments) {
-                if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
-                    expected += 1;
-                }
-            }
-
-            String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
-
-            if (split.length > expected) {
-                // This means we have multi-block block buckets
-                String[] combinedArgs = new String[expected];
-                int index = 0;
-
-                StringBuilder argBuilder = new StringBuilder();
-                outer:
-                for (final String string : split) {
-                    for (final String validArgument : validArguments) {
-                        if (string.contains(validArgument)) {
-                            if (!argBuilder.toString().isEmpty()) {
-                                combinedArgs[index++] = argBuilder.toString();
-                                argBuilder = new StringBuilder();
-                            }
-                            argBuilder.append(string);
-                            continue outer;
-                        }
-                    }
-                    if (argBuilder.toString().charAt(argBuilder.length() - 1) != '=') {
-                        argBuilder.append(",");
-                    }
-                    argBuilder.append(string);
-                }
-
-                if (!argBuilder.toString().isEmpty()) {
-                    combinedArgs[index] = argBuilder.toString();
-                }
-
-                split = combinedArgs;
-            }
-
-            HybridPlotWorld plotworld = new HybridPlotWorld(world, null, generator, null, null);
-            for (String element : split) {
-                String[] pair = element.split("=");
-                if (pair.length != 2) {
-                    PlotSquared.log("&cNo value provided for: &7" + element);
-                    return false;
-                }
-                String key = pair[0].toLowerCase();
-                String value = pair[1];
-                String base = "worlds." + world + ".";
-                try {
-                    switch (key) {
-                        case "s":
-                        case "size":
-                            this.worlds.set(base + "plot.size",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            break;
-                        case "g":
-                        case "gap":
-                            this.worlds.set(base + "road.width",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            break;
-                        case "h":
-                        case "height":
-                            this.worlds.set(base + "road.height",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            this.worlds.set(base + "plot.height",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            this.worlds.set(base + "wall.height",
-                                Configuration.INTEGER.parseString(value).shortValue());
-                            break;
-                        case "f":
-                        case "floor":
-                            this.worlds.set(base + "plot.floor",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        case "m":
-                        case "main":
-                            this.worlds.set(base + "plot.filling",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        case "w":
-                        case "wall":
-                            this.worlds.set(base + "wall.filling",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        case "b":
-                        case "border":
-                            this.worlds.set(base + "wall.block",
-                                Configuration.BLOCK_BUCKET.parseString(value).toString());
-                            break;
-                        default:
-                            PlotSquared.log("&cKey not found: &7" + element);
-                            return false;
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    PlotSquared.log("&cInvalid value: &7" + value + " in arg " + element);
-                    return false;
-                }
-            }
-            try {
-                ConfigurationSection section =
-                    this.worlds.getConfigurationSection("worlds." + world);
-                plotworld.saveConfiguration(section);
-                plotworld.loadConfiguration(section);
-                this.worlds.save(this.worldsFile);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return true;
-    }
-
-    public boolean canUpdate(@NonNull final String current, @NonNull final String other) {
-        final String s1 = normalisedVersion(current);
-        final String s2 = normalisedVersion(other);
-        return s1.compareTo(s2) < 0;
-    }
-
-    public String normalisedVersion(@NonNull final String version) {
-        final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
-        final StringBuilder sb = new StringBuilder();
-        for (final String s : split) {
-            sb.append(String.format("%" + 4 + 's', s));
-        }
-        return sb.toString();
-    }
-
-    public boolean update(PlotPlayer sender, URL url) {
-        try {
-            String name = this.jarFile.getName();
-            File newJar = new File("plugins/update/" + name);
-            MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
-            URLConnection con = url.openConnection();
-            try (InputStream stream = con.getInputStream()) {
-                File parent = newJar.getParentFile();
-                if (!parent.exists()) {
-                    parent.mkdirs();
-                }
-                MainUtil.sendMessage(sender, "$2 - Output: " + newJar);
-                if (!newJar.delete()) {
-                    MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
-                    MainUtil.sendMessage(sender, "Jar file failed to delete.");
-                    MainUtil.sendMessage(sender, " - Please update manually");
-                }
-                Files.copy(stream, newJar.toPath());
-            }
-            MainUtil.sendMessage(sender,
-                "$1The update will take effect when the server is restarted next");
-            return true;
-        } catch (IOException e) {
-            MainUtil.sendMessage(sender, "Failed to update " + IMP.getPluginName() + "");
-            MainUtil.sendMessage(sender, " - Please update manually");
-            PlotSquared.log("============ Stacktrace ============");
-            e.printStackTrace();
-            PlotSquared.log("====================================");
-        }
-        return false;
-    }
-
-    /**
-     * Copy a file from inside the jar to a location
-     *
-     * @param file   Name of the file inside PlotSquared.jar
-     * @param folder The output location relative to /plugins/PlotSquared/
-     */
-    public void copyFile(String file, String folder) {
-        try {
-            File output = this.IMP.getDirectory();
-            if (!output.exists()) {
-                output.mkdirs();
-            }
-            File newFile = MainUtil.getFile(output, folder + File.separator + file);
-            if (newFile.exists()) {
-                return;
-            }
-            try (InputStream stream = this.IMP.getClass().getResourceAsStream(file)) {
-                byte[] buffer = new byte[2048];
-                if (stream == null) {
-                    try (ZipInputStream zis = new ZipInputStream(
-                        new FileInputStream(this.jarFile))) {
-                        ZipEntry ze = zis.getNextEntry();
-                        while (ze != null) {
-                            String name = ze.getName();
-                            if (name.equals(file)) {
-                                new File(newFile.getParent()).mkdirs();
-                                try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                                    int len;
-                                    while ((len = zis.read(buffer)) > 0) {
-                                        fos.write(buffer, 0, len);
-                                    }
-                                }
-                                ze = null;
-                            } else {
-                                ze = zis.getNextEntry();
-                            }
-                        }
-                        zis.closeEntry();
-                    }
-                    return;
-                }
-                newFile.createNewFile();
-                try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                    int len;
-                    while ((len = stream.read(buffer)) > 0) {
-                        fos.write(buffer, 0, len);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-            PlotSquared.log("&cCould not save " + file);
-        }
-    }
-
-    private Map<String, Map<PlotId, Plot>> getPlotsRaw() {
-        HashMap<String, Map<PlotId, Plot>> map = new HashMap<>();
-        for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            Map<PlotId, Plot> map2 = map.get(area.toString());
-            if (map2 == null) {
-                map.put(area.toString(), area.getPlotsRaw());
-            } else {
-                map2.putAll(area.getPlotsRaw());
-            }
-        }
-        return map;
-    }
-
-    /**
-     * Close the database connection.
-     */
-    public void disable() {
-        try {
-            // Validate that all data in the db is correct
-            final HashSet<Plot> plots = new HashSet<>();
-            try {
-                foreachPlotRaw(new RunnableVal<Plot>() {
-                    @Override public void run(Plot value) {
-                        plots.add(value);
-                    }
-                });
-            } catch (final Exception ignored) {
-            }
-            DBFunc.validatePlots(plots);
-
-            // Close the connection
-            DBFunc.close();
-            UUIDHandler.handleShutdown();
-        } catch (NullPointerException exception) {
-            exception.printStackTrace();
-            PlotSquared.log("&cCould not close database connection!");
-        }
-    }
-
-    /**
-     * Setup the database connection.
-     */
-    public void setupDatabase() {
-        try {
-            if (DBFunc.dbManager != null) {
-                DBFunc.dbManager.close();
-            }
-            Database database;
-            if (Storage.MySQL.USE) {
-                database = new MySQL(Storage.MySQL.HOST, Storage.MySQL.PORT, Storage.MySQL.DATABASE,
-                    Storage.MySQL.USER, Storage.MySQL.PASSWORD);
-            } else if (Storage.SQLite.USE) {
-                File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
-                database = new SQLite(file);
-            } else {
-                PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
-                this.IMP.disable();
-                return;
-            }
-            DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
-            PlotSquared.log("GETTING PLOTS NOW AND STORING TO PLOTS_TMP");
-            for (PlotArea allPlotArea : plotAreaManager.getAllPlotAreas()) {
-                PlotSquared.log(allPlotArea.toString());
-            }
-
-            this.plots_tmp = DBFunc.getPlots();
-            if (plotAreaManager instanceof SinglePlotAreaManager) {
-                SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
-                addPlotArea(area);
-                ConfigurationSection section = worlds.getConfigurationSection("worlds.*");
-                if (section == null) {
-                    section = worlds.createSection("worlds.*");
-                }
-                area.saveConfiguration(section);
-                area.loadDefaultConfiguration(section);
-            }
-            this.clusters_tmp = DBFunc.getClusters();
-        } catch (ClassNotFoundException | SQLException e) {
-            PlotSquared.log(
-                C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
-            if (Storage.MySQL.USE) {
-                PlotSquared.log("$4MYSQL");
-            } else if (Storage.SQLite.USE) {
-                PlotSquared.log("$4SQLITE");
-            }
-            PlotSquared.log(
-                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-            e.printStackTrace();
-            PlotSquared.log("&d==== End of stacktrace ====");
-            PlotSquared.log("&6Please go to the " + IMP.getPluginName()
-                + " 'storage.yml' and configure the database correctly.");
-            this.IMP.disable();
-        }
-    }
-
-    /**
-     * Setup the default configuration.
-     *
-     * @throws IOException if the config failed to save
-     */
-    public void setupConfig() throws IOException {
-        String lastVersionString = this.config.getString("version");
-        if (lastVersionString != null) {
-            String[] split = lastVersionString.split("\\.");
-            int[] lastVersion = new int[] {Integer.parseInt(split[0]), Integer.parseInt(split[1]),
-                Integer.parseInt(split[2])};
-            if (checkVersion(new int[] {3, 4, 0}, lastVersion)) {
-                Settings.convertLegacy(configFile);
-                if (config.contains("worlds")) {
-                    ConfigurationSection worldSection = config.getConfigurationSection("worlds");
-                    worlds.set("worlds", worldSection);
-                    try {
-                        worlds.save(worldsFile);
-                    } catch (IOException e) {
-                        PlotSquared.debug("Failed to save " + IMP.getPluginName() + " worlds.yml");
-                        e.printStackTrace();
-                    }
-                }
-                Settings.save(configFile);
-            }
-        }
-        Settings.load(configFile);
-        try {
-            InputStream stream = getClass().getResourceAsStream("/plugin.properties");
-            BufferedReader br = new BufferedReader(new InputStreamReader(stream));
-            //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
-            String versionString = br.readLine();
-            String commitString = br.readLine();
-            String dateString = br.readLine();
-            //scanner.close();
-            br.close();
-            this.version = PlotVersion.tryParse(versionString, commitString, dateString);
-            Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
-            Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
-            Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
-                .toHexString(version.hash);
-            System.out.println("Version is " + this.version);
-        } catch (IOException exception) {
-            exception.printStackTrace();
-        }
-        Settings.save(configFile);
-        config = YamlConfiguration.loadConfiguration(configFile);
-    }
-
-    /**
-     * Setup all configuration files<br> - Config: settings.yml<br> - Storage: storage.yml<br> -
-     * Translation: PlotSquared.use_THIS.yml, style.yml<br>
-     */
-    public boolean setupConfigs() {
-        File folder = new File(this.IMP.getDirectory(), "config");
-        if (!folder.exists() && !folder.mkdirs()) {
-            PlotSquared.log(C.PREFIX
-                + "&cFailed to create the /plugins/config folder. Please create it manually.");
-        }
-        try {
-            this.worldsFile = new File(folder, "worlds.yml");
-            if (!this.worldsFile.exists() && !this.worldsFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not create the worlds file, please create \"worlds.yml\" manually.");
-            }
-            this.worlds = YamlConfiguration.loadConfiguration(this.worldsFile);
-
-            if (this.worlds.contains("worlds")) {
-                if (!this.worlds.contains("configuration_version") || !this.worlds
-                    .getString("configuration_version")
-                    .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
-                    // Conversion needed
-                    log(C.LEGACY_CONFIG_FOUND.s());
-                    try {
-                        com.google.common.io.Files
-                            .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
-                        log(C.LEGACY_CONFIG_BACKUP.s());
-                        final ConfigurationSection worlds =
-                            this.worlds.getConfigurationSection("worlds");
-                        final LegacyConverter converter = new LegacyConverter(worlds);
-                        converter.convert();
-                        this.worlds
-                            .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
-                        this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
-                        this.worlds.save(this.worldsFile);
-                        log(C.LEGACY_CONFIG_DONE.s());
-                    } catch (final Exception e) {
-                        log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
-                        e.printStackTrace();
-                    }
-                    // Disable plugin
-                    this.IMP.shutdown();
-                    return false;
-                }
-            } else {
-                this.worlds.set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
-            }
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save settings.yml");
-        }
-        try {
-            this.configFile = new File(folder, "settings.yml");
-            if (!this.configFile.exists() && !this.configFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not create the settings file, please create \"settings.yml\" manually.");
-            }
-            this.config = YamlConfiguration.loadConfiguration(this.configFile);
-            setupConfig();
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save settings.yml");
-        }
-        try {
-            this.styleFile = MainUtil.getFile(IMP.getDirectory(),
-                Settings.Paths.TRANSLATIONS + File.separator + "style.yml");
-            if (!this.styleFile.exists()) {
-                if (!this.styleFile.getParentFile().exists()) {
-                    this.styleFile.getParentFile().mkdirs();
-                }
-                if (!this.styleFile.createNewFile()) {
-                    PlotSquared.log(
-                        "Could not create the style file, please create \"translations/style.yml\" manually");
-                }
-            }
-            this.style = YamlConfiguration.loadConfiguration(this.styleFile);
-            setupStyle();
-        } catch (IOException err) {
-            err.printStackTrace();
-            PlotSquared.log("failed to save style.yml");
-        }
-        try {
-            this.storageFile = new File(folder, "storage.yml");
-            if (!this.storageFile.exists() && !this.storageFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not the storage settings file, please create \"storage.yml\" manually.");
-            }
-            this.storage = YamlConfiguration.loadConfiguration(this.storageFile);
-            setupStorage();
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save storage.yml");
-        }
-        try {
-            this.commandsFile = new File(folder, "commands.yml");
-            if (!this.commandsFile.exists() && !this.commandsFile.createNewFile()) {
-                PlotSquared.log(
-                    "Could not the storage settings file, please create \"commands.yml\" manually.");
-            }
-            this.commands = YamlConfiguration.loadConfiguration(this.commandsFile);
-        } catch (IOException ignored) {
-            PlotSquared.log("Failed to save commands.yml");
-        }
-        try {
-            this.style.save(this.styleFile);
-            this.commands.save(this.commandsFile);
-        } catch (IOException e) {
-            PlotSquared.log("Configuration file saving failed");
-            e.printStackTrace();
-        }
-        return true;
-    }
-
-    /**
-     * Setup the storage file (load + save missing nodes).
-     */
-    private void setupStorage() {
-        Storage.load(storageFile);
-        Storage.save(storageFile);
-        storage = YamlConfiguration.loadConfiguration(storageFile);
-    }
-
-    /**
-     * Show startup debug information.
-     */
-    private void showDebug() {
-        if (Settings.DEBUG) {
-            Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
-            for (Entry<String, Object> component : components.entrySet()) {
-                PlotSquared.log(C.PREFIX + String
-                    .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
-                        component.getValue()));
-            }
-        }
-    }
-
-    /**
-     * Setup the style.yml file
-     */
-    private void setupStyle() {
-        if (this.version != null) {
-            this.style.set("version", this.version.toString());
-        }
-        Map<String, Object> o = new HashMap<>(4);
-        o.put("color.1", "6");
-        o.put("color.2", "7");
-        o.put("color.3", "8");
-        o.put("color.4", "3");
-        if (!this.style.contains("color")) {
-            for (Entry<String, Object> node : o.entrySet()) {
-                this.style.set(node.getKey(), node.getValue());
-            }
-        }
-    }
-
-    /**
-     * Get the Java version.
-     *
-     * @return the java version
-     */
-    public double getJavaVersion() {
-        return Double.parseDouble(System.getProperty("java.specification.version"));
-    }
-
-    public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            runnable.run(area);
-        }
-    }
-
-    public void foreachPlotArea(@NonNull final String world,
-        @NonNull final RunnableVal<PlotArea> runnable) {
-        final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
-        if (array == null) {
-            return;
-        }
-        for (final PlotArea area : array) {
-            runnable.run(area);
-        }
-    }
-
-    public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable::run);
-        }
-    }
-
-    public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable::run);
-        }
-        if (this.plots_tmp != null) {
-            for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
-                entry.values().forEach(runnable::run);
-            }
-        }
-    }
-
-    public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.foreachBasePlot(run);
-        }
-    }
-
-    public PlotArea getFirstPlotArea() {
-        PlotArea[] areas = plotAreaManager.getAllPlotAreas();
-        return areas.length > 0 ? areas[0] : null;
-    }
-
-    public int getPlotAreaCount() {
-        return this.plotAreaManager.getAllPlotAreas().length;
-    }
-
-    public int getPlotCount() {
-        int count = 0;
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            count += area.getPlotCount();
-        }
-        return count;
-    }
-
-    public Set<PlotArea> getPlotAreas() {
-        final Set<PlotArea> set = new HashSet<>();
-        Collections.addAll(set, plotAreaManager.getAllPlotAreas());
-        return Collections.unmodifiableSet(set);
-    }
-
-    public boolean isAugmented(@NonNull final String world) {
-        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, null);
-        return areas != null && (areas.length > 1 || areas[0].TYPE != 0);
-    }
-
-    /**
-     * Get a list of PlotArea objects.
-     *
-     * @param world the world
-     * @return Collection of PlotArea objects
-     */
-    public Set<PlotArea> getPlotAreas(@NonNull final String world) {
-        final Set<PlotArea> set = new HashSet<>();
-        Collections.addAll(set, plotAreaManager.getPlotAreas(world, null));
-        return set;
-    }
-
-    /**
-     * Get the relevant plot area for a specified location.
-     * <ul>
-     * <li>If there is only one plot area globally that will be returned.
-     * <li>If there is only one plot area in the world, it will return that.
-     * <li>If the plot area for a location cannot be unambiguously
-     * resolved, null will be returned.
-     * </ul>
-     * Note: An applicable plot area may not include the location i.e. clusters
-     *
-     * @param location the location
-     */
-    public PlotArea getApplicablePlotArea(@NonNull final Location location) {
-        return plotAreaManager.getApplicablePlotArea(location);
-    }
-
-    public PlotArea getPlotArea(@NonNull final String world, final String id) {
-        return plotAreaManager.getPlotArea(world, id);
-    }
-
-    /**
-     * Get the {@code PlotArea} which contains a location.
-     * <ul>
-     * <li>If the plot area does not contain a location, null
-     * will be returned.
-     * </ul>
-     *
-     * @param location the location
-     * @return the {@link PlotArea} in the location, null if non existent
-     */
-    public PlotArea getPlotAreaAbs(@NonNull final Location location) {
-        return plotAreaManager.getPlotArea(location);
-    }
-
-    public PlotArea getPlotAreaByString(@NonNull final String search) {
-        String[] split = search.split("[;,]");
-        PlotArea[] areas = plotAreaManager.getPlotAreas(split[0], null);
-        if (areas == null) {
-            for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                if (area.worldname.equalsIgnoreCase(split[0])) {
-                    if (area.id == null || split.length == 2 && area.id
-                        .equalsIgnoreCase(split[1])) {
-                        return area;
-                    }
-                }
-            }
-            return null;
-        }
-        if (areas.length == 1) {
-            return areas[0];
-        } else if (split.length == 1) {
-            return null;
-        } else {
-            for (PlotArea area : areas) {
-                if (StringMan.isEqual(split[1], area.id)) {
-                    return area;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Get Plots based on alias
-     *
-     * @param alias     to search plots
-     * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{
-                       *       @       link
-                       *       <   p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * Plot
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * }> empty if nothing found
-     */
-    public Set<Plot> getPlotsByAlias(@Nullable final String alias,
-        @NonNull final String worldname) {
-        final Set<Plot> result = new HashSet<>();
-        if (alias != null) {
-            for (final Plot plot : getPlots()) {
-                if (alias.equals(plot.getAlias()) && (worldname == null || worldname
-                    .equals(plot.getWorldName()))) {
-                    result.add(plot);
-                }
-            }
-        }
-        return Collections.unmodifiableSet(result);
-    }
-
-    public Set<PlotArea> getPlotAreas(final String world, final RegionWrapper region) {
-        final PlotArea[] areas = plotAreaManager.getPlotAreas(world, region);
-        final Set<PlotArea> set = new HashSet<>();
-        Collections.addAll(set, areas);
-        return Collections.unmodifiableSet(set);
-    }
-
-    public enum SortType {
-        CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
deleted file mode 100644
index ecb423970..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot;
-
-public class PlotVersion {
-    public final int year, month, day, hash, build;
-
-    public PlotVersion(int year, int month, int day, int hash, int build) {
-        this.year = year;
-        this.month = month;
-        this.day = day;
-        this.hash = hash;
-        this.build = build;
-    }
-
-    public PlotVersion(String version, String commit, String date) {
-        String[] split = version.substring(version.indexOf('=') + 1).split("\\.");
-        this.build = Integer.parseInt(split[1]);
-        this.hash = Integer.parseInt(commit.substring(commit.indexOf('=') + 1), 16);
-        String[] split1 = date.substring(date.indexOf('=') + 1).split("\\.");
-        this.year = Integer.parseInt(split1[0]);
-        this.month = Integer.parseInt(split1[1]);
-        this.day = Integer.parseInt(split1[2]);
-    }
-
-    public static PlotVersion tryParse(String version, String commit, String date) {
-        try {
-            return new PlotVersion(version, commit, date);
-        } catch (Exception ignore) {
-            ignore.printStackTrace();
-            return new PlotVersion(0, 0, 0, 0, 0);
-        }
-    }
-
-    @Override public String toString() {
-        if (hash == 0 && build == 0) {
-            return "PlotSquared-" + year + "." + month + "." + day + "-SNAPSHOT";
-        } else {
-            return "PlotSquared-" + year + "." + month + "." + day + "-" + Integer.toHexString(hash)
-                + "-" + build;
-        }
-    }
-
-    public boolean isNewer(PlotVersion other) {
-        return other.build < this.build;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
deleted file mode 100644
index 03d27555a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "add",
-    description = "Allow a user to build in a plot while you are online",
-    usage = "/plot add <player>", category = CommandCategory.SETTINGS, permission = "plots.add",
-    requiredType = RequiredType.NONE) public class Add extends Command {
-
-    public Add() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
-        checkTrue(plot.isOwner(player.getUUID()) || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.NO_PLOT_PERMS);
-        checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
-        final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-        checkTrue(!uuids.isEmpty(), C.INVALID_PLAYER, args[0]);
-        Iterator<UUID> iter = uuids.iterator();
-        int size = plot.getTrusted().size() + plot.getMembers().size();
-        while (iter.hasNext()) {
-            UUID uuid = iter.next();
-            if (uuid == DBFunc.EVERYONE && !(
-                Permissions.hasPermission(player, C.PERMISSION_TRUST_EVERYONE) || Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST))) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
-                iter.remove();
-                continue;
-            }
-            if (plot.isOwner(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
-                iter.remove();
-                continue;
-            }
-            if (plot.getMembers().contains(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
-                iter.remove();
-                continue;
-            }
-            size += plot.getTrusted().contains(uuid) ? 0 : 1;
-        }
-        checkTrue(!uuids.isEmpty(), null);
-        checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
-        confirm.run(this, new Runnable() {
-            @Override // Success
-            public void run() {
-                for (UUID uuid : uuids) {
-                    if (uuid != DBFunc.EVERYONE) {
-                        if (!plot.removeTrusted(uuid)) {
-                            if (plot.getDenied().contains(uuid)) {
-                                plot.removeDenied(uuid);
-                            }
-                        }
-                    }
-                    plot.addMember(uuid);
-                    EventUtil.manager.callMember(player, plot, uuid, true);
-                    MainUtil.sendMessage(player, C.MEMBER_ADDED);
-                }
-            }
-        }, null);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
deleted file mode 100644
index 2eeb0a49d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-@CommandDeclaration(command = "setalias", permission = "plots.alias",
-    description = "Set the plot name", usage = "/plot alias <set|remove> <alias>",
-    aliases = {"alias", "sa", "name", "rename", "setname", "seta", "nameplot"},
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Alias
-    extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-
-        if (args.length == 0) {
-            C.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <value>");
-            return false;
-        }
-
-        Location loc = player.getLocation();
-        Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-
-        if (!plot.hasOwner()) {
-            sendMessage(player, C.PLOT_NOT_CLAIMED);
-            return false;
-        }
-
-        if (!plot.isOwner(player.getUUID())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-
-        boolean result = false;
-
-        switch (args[0].toLowerCase()) {
-            case "set":
-                if (args.length != 2) {
-                    C.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
-                    return false;
-                }
-
-                if (canExecuteCommand(player, C.PERMISSION_ALIAS_SET, false) || canExecuteCommand(
-                    player, C.PERMISSION_ALIAS_SET_OBSOLETE, false)) {
-                    result = setAlias(player, plot, args[1]);
-                } else {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION);
-                }
-
-                break;
-            case "remove":
-                if (canExecuteCommand(player, C.PERMISSION_ALIAS_REMOVE, true)) {
-                    result = removeAlias(player, plot);
-                }
-                break;
-            default:
-                C.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <alias>");
-                result = false;
-        }
-
-        return result;
-    }
-
-
-    private boolean setAlias(PlotPlayer player, Plot plot, String alias) {
-        if (alias.isEmpty()) {
-            C.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
-            return false;
-        }
-        if (alias.length() >= 50) {
-            MainUtil.sendMessage(player, C.ALIAS_TOO_LONG);
-            return false;
-        }
-        if (alias.contains(" ")) {
-            C.NOT_VALID_VALUE.send(player);
-            return false;
-        }
-        if (MathMan.isInteger(alias)) {
-            C.NOT_VALID_VALUE.send(player);
-            return false;
-        }
-        for (Plot p : PlotSquared.get().getPlots(plot.getArea())) {
-            if (p.getAlias().equalsIgnoreCase(alias)) {
-                MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
-                return false;
-            }
-        }
-        if (UUIDHandler.nameExists(new StringWrapper(alias)) || PlotSquared.get()
-            .hasPlotArea(alias)) {
-            MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
-            return false;
-        }
-        plot.setAlias(alias);
-        MainUtil.sendMessage(player, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
-        return true;
-    }
-
-    private boolean removeAlias(PlotPlayer player, Plot plot) {
-        plot.setAlias(null);
-        MainUtil.sendMessage(player, C.ALIAS_REMOVED.s());
-        return true;
-    }
-
-    private boolean canExecuteCommand(PlotPlayer player, C caption, boolean sendMessage) {
-        if (!Permissions.hasPermission(player, caption)) {
-            if (sendMessage) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION);
-            }
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
deleted file mode 100644
index ee7c1cb23..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ /dev/null
@@ -1,469 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Objects;
-import java.util.Set;
-
-@CommandDeclaration(command = "area", permission = "plots.area",
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
-    description = "Create a new PlotArea", aliases = "world",
-    usage = "/plot area <create|info|list|tp|regen>", confirmation = true) public class Area
-    extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length == 0) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        switch (args[0].toLowerCase()) {
-            case "c":
-            case "setup":
-            case "create":
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_CREATE)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_CREATE);
-                    return false;
-                }
-                switch (args.length) {
-                    case 1:
-                        C.COMMAND_SYNTAX
-                            .send(player, "/plot area create [world[:id]] [<modifier>=<value>]...");
-                        return false;
-                    case 2:
-                        switch (args[1].toLowerCase()) {
-                            case "pos1": { // Set position 1
-                                HybridPlotWorld area = player.getMeta("area_create_area");
-                                if (area == null) {
-                                    C.COMMAND_SYNTAX.send(player,
-                                        "/plot area create [world[:id]] [<modifier>=<value>]...");
-                                    return false;
-                                }
-                                Location location = player.getLocation();
-                                player.setMeta("area_pos1", location);
-                                C.SET_ATTRIBUTE.send(player, "area_pos1",
-                                    location.getX() + "," + location.getZ());
-                                MainUtil.sendMessage(player,
-                                    "You will now set pos2: /plot area create pos2"
-                                        + "\nNote: The chosen plot size may result in the created area not exactly matching your second position.");
-                                return true;
-                            }
-                            case "pos2":  // Set position 2 and finish creation for type=2 (partial)
-                                final HybridPlotWorld area = player.getMeta("area_create_area");
-                                if (area == null) {
-                                    C.COMMAND_SYNTAX.send(player,
-                                        "/plot area create [world[:id]] [<modifier>=<value>]...");
-                                    return false;
-                                }
-                                Location pos1 = player.getLocation();
-                                Location pos2 = player.getMeta("area_pos1");
-                                int dx = Math.abs(pos1.getX() - pos2.getX());
-                                int dz = Math.abs(pos1.getZ() - pos2.getZ());
-                                int numX = Math.max(1,
-                                    (dx + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
-                                int numZ = Math.max(1,
-                                    (dz + 1 + area.ROAD_WIDTH + area.SIZE / 2) / area.SIZE);
-                                int ddx = dx - (numX * area.SIZE - area.ROAD_WIDTH);
-                                int ddz = dz - (numZ * area.SIZE - area.ROAD_WIDTH);
-                                int bx = Math.min(pos1.getX(), pos2.getX()) + ddx;
-                                int bz = Math.min(pos1.getZ(), pos2.getZ()) + ddz;
-                                int tx = Math.max(pos1.getX(), pos2.getX()) - ddx;
-                                int tz = Math.max(pos1.getZ(), pos2.getZ()) - ddz;
-                                int lower = (area.ROAD_WIDTH & 1) == 0 ?
-                                    area.ROAD_WIDTH / 2 - 1 :
-                                    area.ROAD_WIDTH / 2;
-                                final int offsetX = bx - (area.ROAD_WIDTH == 0 ? 0 : lower);
-                                final int offsetZ = bz - (area.ROAD_WIDTH == 0 ? 0 : lower);
-                                final RegionWrapper region = new RegionWrapper(bx, tx, bz, tz);
-                                Set<PlotArea> areas =
-                                    PlotSquared.get().getPlotAreas(area.worldname, region);
-                                if (!areas.isEmpty()) {
-                                    C.CLUSTER_INTERSECTION
-                                        .send(player, areas.iterator().next().toString());
-                                    return false;
-                                }
-                                final SetupObject object = new SetupObject();
-                                object.world = area.worldname;
-                                object.id = area.id;
-                                object.terrain = area.TERRAIN;
-                                object.type = area.TYPE;
-                                object.min = new PlotId(1, 1);
-                                object.max = new PlotId(numX, numZ);
-                                object.plotManager = PlotSquared.imp().getPluginName();
-                                object.setupGenerator = PlotSquared.imp().getPluginName();
-                                object.step = area.getSettingNodes();
-                                final String path =
-                                    "worlds." + area.worldname + ".areas." + area.id + '-'
-                                        + object.min + '-' + object.max;
-                                Runnable run = () -> {
-                                    if (offsetX != 0) {
-                                        PlotSquared.get().worlds
-                                            .set(path + ".road.offset.x", offsetX);
-                                    }
-                                    if (offsetZ != 0) {
-                                        PlotSquared.get().worlds
-                                            .set(path + ".road.offset.z", offsetZ);
-                                    }
-                                    final String world = SetupUtils.manager.setupWorld(object);
-                                    if (WorldUtil.IMP.isWorld(world)) {
-                                        PlotSquared.get().loadWorld(world, null);
-                                        C.SETUP_FINISHED.send(player);
-                                        player.teleport(WorldUtil.IMP.getSpawn(world));
-                                        if (area.TERRAIN != 3) {
-                                            ChunkManager.largeRegionTask(world, region,
-                                                new RunnableVal<ChunkLoc>() {
-                                                    @Override public void run(ChunkLoc value) {
-                                                        AugmentedUtils
-                                                            .generate(world, value.x, value.z,
-                                                                null);
-                                                    }
-                                                }, null);
-                                        }
-                                    } else {
-                                        MainUtil.sendMessage(player,
-                                            "An error occurred while creating the world: "
-                                                + area.worldname);
-                                    }
-                                };
-                                if (hasConfirmation(player)) {
-                                    CmdConfirm.addPending(player,
-                                        getCommandString() + " create pos2 (Creates world)", run);
-                                } else {
-                                    run.run();
-                                }
-                                return true;
-                        }
-                    default: // Start creation
-                        final SetupObject object = new SetupObject();
-                        String[] split = args[1].split(":");
-                        String id;
-                        if (split.length == 2) {
-                            id = split[1];
-                        } else {
-                            id = null;
-                        }
-                        object.world = split[0];
-                        final HybridPlotWorld pa = new HybridPlotWorld(object.world, id,
-                            PlotSquared.get().IMP.getDefaultGenerator(), null, null);
-                        PlotArea other = PlotSquared.get().getPlotArea(pa.worldname, id);
-                        if (other != null && Objects.equals(pa.id, other.id)) {
-                            C.SETUP_WORLD_TAKEN.send(player, pa.toString());
-                            return false;
-                        }
-                        Set<PlotArea> areas = PlotSquared.get().getPlotAreas(pa.worldname);
-                        if (!areas.isEmpty()) {
-                            PlotArea area = areas.iterator().next();
-                            pa.TYPE = area.TYPE;
-                        }
-                        pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
-                        for (int i = 2; i < args.length; i++) {
-                            String[] pair = args[i].split("=");
-                            if (pair.length != 2) {
-                                C.COMMAND_SYNTAX.send(player, getCommandString()
-                                    + " create [world[:id]] [<modifier>=<value>]...");
-                                return false;
-                            }
-                            switch (pair[0].toLowerCase()) {
-                                case "s":
-                                case "size":
-                                    pa.PLOT_WIDTH = Integer.parseInt(pair[1]);
-                                    pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
-                                    break;
-                                case "g":
-                                case "gap":
-                                    pa.ROAD_WIDTH = Integer.parseInt(pair[1]);
-                                    pa.SIZE = (short) (pa.PLOT_WIDTH + pa.ROAD_WIDTH);
-                                    break;
-                                case "h":
-                                case "height":
-                                    int value = Integer.parseInt(pair[1]);
-                                    pa.PLOT_HEIGHT = value;
-                                    pa.ROAD_HEIGHT = value;
-                                    pa.WALL_HEIGHT = value;
-                                    break;
-                                case "f":
-                                case "floor":
-                                    pa.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
-                                    break;
-                                case "m":
-                                case "main":
-                                    pa.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
-                                    break;
-                                case "w":
-                                case "wall":
-                                    pa.WALL_FILLING =
-                                        Configuration.BLOCK_BUCKET.parseString(pair[1]);
-                                    break;
-                                case "b":
-                                case "border":
-                                    pa.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(pair[1]);
-                                    break;
-                                case "terrain":
-                                    pa.TERRAIN = Integer.parseInt(pair[1]);
-                                    object.terrain = pa.TERRAIN;
-                                    break;
-                                case "type":
-                                    pa.TYPE = Integer.parseInt(pair[1]);
-                                    object.type = pa.TYPE;
-                                    break;
-                                default:
-                                    C.COMMAND_SYNTAX.send(player, getCommandString()
-                                        + " create [world[:id]] [<modifier>=<value>]...");
-                                    return false;
-                            }
-                        }
-                        if (pa.TYPE != 2) {
-                            if (WorldUtil.IMP.isWorld(pa.worldname)) {
-                                C.SETUP_WORLD_TAKEN.send(player, pa.worldname);
-                                return false;
-                            }
-                            Runnable run = () -> {
-                                String path = "worlds." + pa.worldname;
-                                if (!PlotSquared.get().worlds.contains(path)) {
-                                    PlotSquared.get().worlds.createSection(path);
-                                }
-                                ConfigurationSection section =
-                                    PlotSquared.get().worlds.getConfigurationSection(path);
-                                pa.saveConfiguration(section);
-                                pa.loadConfiguration(section);
-                                object.plotManager = PlotSquared.imp().getPluginName();
-                                object.setupGenerator = PlotSquared.imp().getPluginName();
-                                String world = SetupUtils.manager.setupWorld(object);
-                                if (WorldUtil.IMP.isWorld(world)) {
-                                    C.SETUP_FINISHED.send(player);
-                                    player.teleport(WorldUtil.IMP.getSpawn(world));
-                                } else {
-                                    MainUtil.sendMessage(player,
-                                        "An error occurred while creating the world: "
-                                            + pa.worldname);
-                                }
-                                try {
-                                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                }
-                            };
-                            if (hasConfirmation(player)) {
-                                CmdConfirm.addPending(player,
-                                    getCommandString() + ' ' + StringMan.join(args, " "), run);
-                            } else {
-                                run.run();
-                            }
-                            return true;
-                        }
-                        if (pa.id == null) {
-                            C.COMMAND_SYNTAX.send(player, getCommandString()
-                                + " create [world[:id]] [<modifier>=<value>]...");
-                            return false;
-                        }
-                        if (WorldUtil.IMP.isWorld(pa.worldname)) {
-                            if (!player.getLocation().getWorld().equals(pa.worldname)) {
-                                player.teleport(WorldUtil.IMP.getSpawn(pa.worldname));
-                            }
-                        } else {
-                            object.terrain = 0;
-                            object.type = 0;
-                            SetupUtils.manager.setupWorld(object);
-                            player.teleport(WorldUtil.IMP.getSpawn(pa.worldname));
-                        }
-                        player.setMeta("area_create_area", pa);
-                        MainUtil.sendMessage(player,
-                            "$1Go to the first corner and use: $2 " + getCommandString()
-                                + " create pos1");
-                        break;
-                }
-                return true;
-            case "i":
-            case "info": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_INFO)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_INFO);
-                    return false;
-                }
-                PlotArea area;
-                switch (args.length) {
-                    case 1:
-                        area = player.getApplicablePlotArea();
-                        break;
-                    case 2:
-                        area = PlotSquared.get().getPlotAreaByString(args[1]);
-                        break;
-                    default:
-                        C.COMMAND_SYNTAX.send(player, getCommandString() + " info [area]");
-                        return false;
-                }
-                if (area == null) {
-                    if (args.length == 2) {
-                        C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
-                    } else {
-                        C.NOT_IN_PLOT_WORLD.send(player);
-                    }
-                    return false;
-                }
-                String name;
-                double percent;
-                int claimed = area.getPlotCount();
-                int clusters = area.getClusters().size();
-                String region;
-                String generator = String.valueOf(area.getGenerator());
-                if (area.TYPE == 2) {
-                    PlotId min = area.getMin();
-                    PlotId max = area.getMax();
-                    name = area.worldname + ';' + area.id + ';' + min + ';' + max;
-                    int size = (max.x - min.x + 1) * (max.y - min.y + 1);
-                    percent = claimed == 0 ? 0 : size / (double) claimed;
-                    region = area.getRegion().toString();
-                } else {
-                    name = area.worldname;
-                    percent = claimed == 0 ? 0 : 100d * claimed / Integer.MAX_VALUE;
-                    region = "N/A";
-                }
-                String value = "&r$1NAME: " + name + "\n$1Type: $2" + area.TYPE + "\n$1Terrain: $2"
-                    + area.TERRAIN + "\n$1Usage: $2" + String.format("%.2f", percent) + '%'
-                    + "\n$1Claimed: $2" + claimed + "\n$1Clusters: $2" + clusters + "\n$1Region: $2"
-                    + region + "\n$1Generator: $2" + generator;
-                MainUtil.sendMessage(player,
-                    C.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + C.PLOT_INFO_FOOTER.s(), false);
-                return true;
-            }
-            case "l":
-            case "list":
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_LIST)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_LIST);
-                    return false;
-                }
-                int page;
-                switch (args.length) {
-                    case 1:
-                        page = 0;
-                        break;
-                    case 2:
-                        if (MathMan.isInteger(args[1])) {
-                            page = Integer.parseInt(args[1]) - 1;
-                            break;
-                        }
-                    default:
-                        C.COMMAND_SYNTAX.send(player, getCommandString() + " list [#]");
-                        return false;
-                }
-                ArrayList<PlotArea> areas = new ArrayList<>(PlotSquared.get().getPlotAreas());
-                paginate(player, areas, 8, page,
-                    new RunnableVal3<Integer, PlotArea, PlotMessage>() {
-                        @Override public void run(Integer i, PlotArea area, PlotMessage message) {
-                            String name;
-                            double percent;
-                            int claimed = area.getPlotCount();
-                            int clusters = area.getClusters().size();
-                            String region;
-                            String generator = String.valueOf(area.getGenerator());
-                            if (area.TYPE == 2) {
-                                PlotId min = area.getMin();
-                                PlotId max = area.getMax();
-                                name = area.worldname + ';' + area.id + ';' + min + ';' + max;
-                                int size = (max.x - min.x + 1) * (max.y - min.y + 1);
-                                percent = claimed == 0 ? 0 : size / (double) claimed;
-                                region = area.getRegion().toString();
-                            } else {
-                                name = area.worldname;
-                                percent = claimed == 0 ?
-                                    0 :
-                                    Short.MAX_VALUE * Short.MAX_VALUE / (double) claimed;
-                                region = "N/A";
-                            }
-                            PlotMessage tooltip = new PlotMessage().text("Claimed=").color("$1")
-                                .text(String.valueOf(claimed)).color("$2").text("\nUsage=")
-                                .color("$1").text(String.format("%.2f", percent) + '%').color("$2")
-                                .text("\nClusters=").color("$1").text(String.valueOf(clusters))
-                                .color("$2").text("\nRegion=").color("$1").text(region).color("$2")
-                                .text("\nGenerator=").color("$1").text(generator).color("$2");
-
-                            // type / terrain
-                            String visit = "/plot area tp " + area.toString();
-                            message.text("[").color("$3").text(String.valueOf(i)).command(visit)
-                                .tooltip(visit).color("$1").text("]").color("$3").text(' ' + name)
-                                .tooltip(tooltip).command(getCommandString() + " info " + area)
-                                .color("$1").text(" - ").color("$2")
-                                .text(area.TYPE + ":" + area.TERRAIN).color("$3");
-                        }
-                    }, "/plot area list", C.AREA_LIST_HEADER_PAGED.s());
-                return true;
-            case "regen":
-            case "clear":
-            case "reset":
-            case "regenerate": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_REGEN)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_REGEN);
-                    return false;
-                }
-                final PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                if (area.TYPE != 2) {
-                    MainUtil.sendMessage(player,
-                        "$4Stop the server and delete: " + area.worldname + "/region");
-                    return false;
-                }
-                ChunkManager
-                    .largeRegionTask(area.worldname, area.getRegion(), new RunnableVal<ChunkLoc>() {
-                        @Override public void run(ChunkLoc value) {
-                            AugmentedUtils.generate(area.worldname, value.x, value.z, null);
-                        }
-                    }, () -> player.sendMessage("Regen complete"));
-                return true;
-            }
-            case "goto":
-            case "v":
-            case "teleport":
-            case "visit":
-            case "tp":
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_TP)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_TP);
-                    return false;
-                }
-                if (args.length != 2) {
-                    C.COMMAND_SYNTAX.send(player, "/plot visit [area]");
-                    return false;
-                }
-                PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
-                if (area == null) {
-                    C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
-                    return false;
-                }
-                Location center;
-                if (area.TYPE != 2) {
-                    center = WorldUtil.IMP.getSpawn(area.worldname);
-                } else {
-                    RegionWrapper region = area.getRegion();
-                    center =
-                        new Location(area.worldname, region.minX + (region.maxX - region.minX) / 2,
-                            0, region.minZ + (region.maxZ - region.minZ) / 2);
-                    center.setY(1 + WorldUtil.IMP
-                        .getHighestBlock(area.worldname, center.getX(), center.getZ()));
-                }
-                player.teleport(center);
-                return true;
-            case "delete":
-            case "remove":
-                MainUtil.sendMessage(player,
-                    "$1World creation settings may be stored in multiple locations:"
-                        + "\n$3 - $2Bukkit bukkit.yml" + "\n$3 - $2" + PlotSquared.imp()
-                        .getPluginName() + " settings.yml"
-                        + "\n$3 - $2Multiverse worlds.yml (or any world management plugin)"
-                        + "\n$1Stop the server and delete it from these locations.");
-                return true;
-        }
-        C.COMMAND_SYNTAX.send(player, getUsage());
-        return false;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
deleted file mode 100644
index 5035c1480..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import javax.annotation.Nullable;
-import java.util.Set;
-
-@CommandDeclaration(command = "auto", permission = "plots.auto",
-    category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE,
-    description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length,width]")
-public class Auto extends SubCommand {
-
-    @Deprecated public static PlotId getNextPlotId(PlotId id, int step) {
-        return id.getNextId(step);
-    }
-
-    private static boolean checkAllowedPlots(PlotPlayer player, PlotArea plotarea,
-        @Nullable Integer allowed_plots, int size_x, int size_z) {
-        if (allowed_plots == null)
-            allowed_plots = player.getAllowedPlots();
-        int currentPlots =
-            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plotarea.worldname);
-        int diff = currentPlots - allowed_plots;
-        if (diff + size_x * size_z > 0) {
-            if (diff < 0) {
-                MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS_NUM, -diff + "");
-                return false;
-            } else if (player.hasPersistentMeta("grantedPlots")) {
-                int grantedPlots =
-                    ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
-                if (grantedPlots - diff < size_x * size_z) {
-                    player.removePersistentMeta("grantedPlots");
-                    MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
-                    return false;
-                } else {
-                    int left = grantedPlots - diff - size_x * size_z;
-                    if (left == 0) {
-                        player.removePersistentMeta("grantedPlots");
-                    } else {
-                        player.setPersistentMeta("grantedPlots",
-                            ByteArrayUtilities.integerToBytes(left));
-                    }
-                    MainUtil.sendMessage(player, C.REMOVED_GRANTED_PLOT, "" + left,
-                        "" + (grantedPlots - left));
-                }
-            } else {
-                MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Teleport the player home, or claim a new plot
-     *
-     * @param player
-     * @param area
-     * @param start
-     * @param schem
-     */
-    public static void homeOrAuto(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem) {
-        Set<Plot> plots = player.getPlots();
-        if (!plots.isEmpty()) {
-            plots.iterator().next().teleportPlayer(player);
-        } else {
-            autoClaimSafe(player, area, start, schem);
-        }
-    }
-
-    /**
-     * Claim a new plot for a player
-     *
-     * @param player
-     * @param area
-     * @param start
-     * @param schem
-     */
-    public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem) {
-        autoClaimSafe(player, area, start, schem, null);
-    }
-
-    /**
-     * Claim a new plot for a player
-     *
-     * @param player
-     * @param area
-     * @param start
-     * @param schem
-     */
-    public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem, @Nullable final Integer allowed_plots) {
-        player.setMeta(Auto.class.getName(), true);
-        autoClaimFromDatabase(player, area, start, new RunnableVal<Plot>() {
-            @Override public void run(final Plot plot) {
-                TaskManager.IMP.sync(new RunnableVal<Object>() {
-                    @Override public void run(Object ignore) {
-                        player.deleteMeta(Auto.class.getName());
-                        if (plot == null) {
-                            MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
-                        } else if (checkAllowedPlots(player, area, allowed_plots, 1, 1)) {
-                            plot.claim(player, true, schem, false);
-                            if (area.AUTO_MERGE) {
-                                plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
-                            }
-                        } else {
-                            DBFunc.delete(plot);
-                        }
-                    }
-                });
-            }
-        });
-    }
-
-    public static void autoClaimFromDatabase(final PlotPlayer player, final PlotArea area,
-        PlotId start, final RunnableVal<Plot> whenDone) {
-        final Plot plot = area.getNextFreePlot(player, start);
-        if (plot == null) {
-            whenDone.run(null);
-            return;
-        }
-        whenDone.value = plot;
-        plot.owner = player.getUUID();
-        DBFunc.createPlotSafe(plot, whenDone, new Runnable() {
-            @Override public void run() {
-                autoClaimFromDatabase(player, area, plot.getId(), whenDone);
-            }
-        });
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        PlotArea plotarea = player.getApplicablePlotArea();
-        if (plotarea == null) {
-            if (EconHandler.manager != null) {
-                for (PlotArea area : PlotSquared.get().getPlotAreaManager().getAllPlotAreas()) {
-                    if (EconHandler.manager
-                        .hasPermission(area.worldname, player.getName(), "plots.auto")) {
-                        if (plotarea != null) {
-                            plotarea = null;
-                            break;
-                        }
-                        plotarea = area;
-                    }
-                }
-            }
-            if (plotarea == null) {
-                MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
-                return false;
-            }
-        }
-        int size_x = 1;
-        int size_z = 1;
-        String schematic = null;
-        if (args.length > 0) {
-            if (Permissions.hasPermission(player, C.PERMISSION_AUTO_MEGA)) {
-                try {
-                    String[] split = args[0].split(",|;");
-                    size_x = Integer.parseInt(split[0]);
-                    size_z = Integer.parseInt(split[1]);
-                    if (size_x < 1 || size_z < 1) {
-                        MainUtil.sendMessage(player, "&cError: size<=0");
-                    }
-                    if (args.length > 1) {
-                        schematic = args[1];
-                    }
-                } catch (NumberFormatException ignored) {
-                    size_x = 1;
-                    size_z = 1;
-                    schematic = args[0];
-                    // PlayerFunctions.sendMessage(plr,
-                    // "&cError: Invalid size (X,Y)");
-                    // return false;
-                }
-            } else {
-                schematic = args[0];
-                // PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
-                // return false;
-            }
-        }
-        if (size_x * size_z > Settings.Claim.MAX_AUTO_AREA) {
-            MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS_NUM,
-                Settings.Claim.MAX_AUTO_AREA + "");
-            return false;
-        }
-        final int allowed_plots = player.getAllowedPlots();
-        if (player.getMeta(Auto.class.getName(), false) || !checkAllowedPlots(player, plotarea,
-            allowed_plots, size_x, size_z))
-            return false;
-
-        if (schematic != null && !schematic.isEmpty()) {
-            if (!plotarea.SCHEMATICS.contains(schematic.toLowerCase())) {
-                sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
-                return true;
-            }
-            if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
-                && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                    C.PERMISSION_CLAIM_SCHEMATIC.f(schematic));
-                return true;
-            }
-        }
-        if (EconHandler.manager != null && plotarea.USE_ECONOMY) {
-            Expression<Double> costExp = plotarea.PRICES.get("claim");
-            double cost = costExp.evaluate((double) (Settings.Limit.GLOBAL ?
-                player.getPlotCount() :
-                player.getPlotCount(plotarea.worldname)));
-            cost = (size_x * size_z) * cost;
-            if (cost > 0d) {
-                if (EconHandler.manager.getMoney(player) < cost) {
-                    sendMessage(player, C.CANNOT_AFFORD_PLOT, "" + cost);
-                    return true;
-                }
-                EconHandler.manager.withdrawMoney(player, cost);
-                sendMessage(player, C.REMOVED_BALANCE, cost + "");
-            }
-        }
-        // TODO handle type 2 the same as normal worlds!
-        if (size_x == 1 && size_z == 1) {
-            autoClaimSafe(player, plotarea, null, schematic, allowed_plots);
-            return true;
-        } else {
-            if (plotarea.TYPE == 2) {
-                MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
-                return false;
-            }
-            while (true) {
-                PlotId start = plotarea.getMeta("lastPlot", new PlotId(0, 0)).getNextId(1);
-                PlotId end = new PlotId(start.x + size_x - 1, start.y + size_z - 1);
-                if (plotarea.canClaim(player, start, end)) {
-                    plotarea.setMeta("lastPlot", start);
-                    for (int i = start.x; i <= end.x; i++) {
-                        for (int j = start.y; j <= end.y; j++) {
-                            Plot plot = plotarea.getPlotAbs(new PlotId(i, j));
-                            boolean teleport = i == end.x && j == end.y;
-                            plot.claim(player, teleport, null);
-                        }
-                    }
-                    if (!plotarea.mergePlots(MainUtil.getPlotSelectionIds(start, end), true)) {
-                        return false;
-                    }
-                    break;
-                }
-                plotarea.setMeta("lastPlot", start);
-            }
-            return true;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
deleted file mode 100644
index 82a573949..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-
-@CommandDeclaration(command = "setbiome", permission = "plots.set.biome",
-    description = "Set the plot biome", usage = "/plot biome [biome]",
-    aliases = {"biome", "sb", "setb", "b"}, category = CommandCategory.APPEARANCE,
-    requiredType = RequiredType.NONE) public class Biome extends SetCommand {
-
-    @Override public boolean set(final PlotPlayer player, final Plot plot, final String value) {
-        int biome = WorldUtil.IMP.getBiomeFromString(value);
-        if (biome == -1) {
-            String biomes =
-                StringMan.join(WorldUtil.IMP.getBiomeList(), C.BLOCK_LIST_SEPARATER.s());
-            C.NEED_BIOME.send(player);
-            MainUtil.sendMessage(player, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + biomes);
-            return false;
-        }
-        if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-            return false;
-        }
-        plot.addRunning();
-        plot.setBiome(value.toUpperCase(), new Runnable() {
-            @Override public void run() {
-                plot.removeRunning();
-                MainUtil.sendMessage(player, C.BIOME_SET_TO.s() + value.toLowerCase());
-            }
-        });
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
deleted file mode 100644
index 25f9484b1..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.Optional;
-import java.util.Set;
-
-@CommandDeclaration(command = "buy", description = "Buy the plot you are standing on",
-    usage = "/plot buy", permission = "plots.buy", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE) public class Buy extends Command {
-
-    public Buy() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        final RunnableVal2<Command, CommandResult> whenDone) {
-        check(EconHandler.manager, C.ECON_DISABLED);
-        final Plot plot;
-        if (args.length != 0) {
-            checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
-            plot = check(MainUtil.getPlotFromString(player, args[0], true), null);
-        } else {
-            plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        }
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
-        checkTrue(!plot.isOwner(player.getUUID()), C.CANNOT_BUY_OWN);
-        Set<Plot> plots = plot.getConnectedPlots();
-        checkTrue(player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
-            C.CANT_CLAIM_MORE_PLOTS);
-        Optional<Double> flag = plot.getFlag(Flags.PRICE);
-        if (!flag.isPresent()) {
-            throw new CommandException(C.NOT_FOR_SALE);
-        }
-        final double price = flag.get();
-        checkTrue(player.getMoney() >= price, C.CANNOT_AFFORD_PLOT);
-        player.withdraw(price);
-        confirm.run(this, new Runnable() {
-            @Override // Success
-            public void run() {
-                C.REMOVED_BALANCE.send(player, price);
-                EconHandler.manager
-                    .depositMoney(UUIDHandler.getUUIDWrapper().getOfflinePlayer(plot.owner), price);
-                PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
-                if (owner != null) {
-                    C.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
-                }
-                plot.removeFlag(Flags.PRICE);
-                plot.setOwner(player.getUUID());
-                C.CLAIMED.send(player);
-                whenDone.run(Buy.this, CommandResult.SUCCESS);
-            }
-        }, new Runnable() {
-            @Override // Failure
-            public void run() {
-                player.deposit(price);
-                whenDone.run(Buy.this, CommandResult.FAILURE);
-            }
-        });
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
deleted file mode 100644
index 453a6a8ac..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-@CommandDeclaration(command = "chat", description = "Toggle plot chat on or off",
-    usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT,
-    requiredType = RequiredType.NONE) public class Chat extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        MainCommand.getInstance().toggle.chat(this, player, new String[0], null, null);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
deleted file mode 100644
index e49155b8d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities;
-import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-@CommandDeclaration(command = "claim", aliases = "c",
-    description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
-public class Claim extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        String schematic = "";
-        if (args.length >= 1) {
-            schematic = args[0];
-        }
-        Location loc = player.getLocation();
-        final Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
-        }
-        int currentPlots =
-            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(loc.getWorld());
-        int grants = 0;
-        if (currentPlots >= player.getAllowedPlots()) {
-            if (player.hasPersistentMeta("grantedPlots")) {
-                grants =
-                    ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
-                if (grants <= 0) {
-                    player.removePersistentMeta("grantedPlots");
-                    return sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
-                }
-            } else {
-                return sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
-            }
-        }
-        if (!plot.canClaim(player)) {
-            return sendMessage(player, C.PLOT_IS_CLAIMED);
-        }
-        final PlotArea area = plot.getArea();
-        if (!schematic.isEmpty()) {
-            if (area.SCHEMATIC_CLAIM_SPECIFY) {
-                if (!area.SCHEMATICS.contains(schematic.toLowerCase())) {
-                    return sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
-                }
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
-                    && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
-                    return sendMessage(player, C.NO_SCHEMATIC_PERMISSION, schematic);
-                }
-            }
-        }
-        int border = area.getBorder();
-        if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border) {
-            return !sendMessage(player, C.BORDER);
-        }
-        if ((EconHandler.manager != null) && area.USE_ECONOMY) {
-            Expression<Double> costExr = area.PRICES.get("claim");
-            double cost = costExr.evaluate((double) currentPlots);
-            if (cost > 0d) {
-                if (EconHandler.manager.getMoney(player) < cost) {
-                    return sendMessage(player, C.CANNOT_AFFORD_PLOT, "" + cost);
-                }
-                EconHandler.manager.withdrawMoney(player, cost);
-                sendMessage(player, C.REMOVED_BALANCE, cost + "");
-            }
-        }
-        if (grants > 0) {
-            if (grants == 1) {
-                player.removePersistentMeta("grantedPlots");
-            } else {
-                player.setPersistentMeta("grantedPlots",
-                    ByteArrayUtilities.integerToBytes(grants - 1));
-            }
-            sendMessage(player, C.REMOVED_GRANTED_PLOT, "1", "" + (grants - 1));
-        }
-        if (plot.canClaim(player)) {
-            plot.owner = player.getUUID();
-            final String finalSchematic = schematic;
-            DBFunc.createPlotSafe(plot, () -> TaskManager.IMP.sync(new RunnableVal<Object>() {
-                @Override public void run(Object value) {
-                    plot.claim(player, true, finalSchematic, false);
-                    if (area.AUTO_MERGE) {
-                        plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
-                    }
-                }
-            }), () -> sendMessage(player, C.PLOT_NOT_CLAIMED));
-            return true;
-        } else {
-            sendMessage(player, C.PLOT_NOT_CLAIMED);
-        }
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
deleted file mode 100644
index efd6b1525..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-
-@CommandDeclaration(command = "clear", description = "Clear the plot you stand on",
-    permission = "plots.clear", category = CommandCategory.APPEARANCE, usage = "/plot clear",
-    aliases = "reset", confirmation = true) public class Clear extends Command {
-
-    // Note: To clear a specific plot use /plot <plot> clear
-    // The syntax also works with any command: /plot <plot> <command>
-
-    public Clear() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        checkTrue(args.length == 0, C.COMMAND_SYNTAX, getUsage());
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.isOwner(player.getUUID()) || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_CLEAR), C.NO_PLOT_PERMS);
-        checkTrue(plot.getRunning() == 0, C.WAIT_FOR_TIMER);
-        checkTrue(!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot) || Permissions
-            .hasPermission(player, C.PERMISSION_CONTINUE), C.DONE_ALREADY_DONE);
-        confirm.run(this, new Runnable() {
-            @Override public void run() {
-                final long start = System.currentTimeMillis();
-                boolean result = plot.clear(true, false, new Runnable() {
-                    @Override public void run() {
-                        plot.unlink();
-                        GlobalBlockQueue.IMP.addTask(new Runnable() {
-                            @Override public void run() {
-                                plot.removeRunning();
-                                // If the state changes, then mark it as no longer done
-                                if (plot.getFlag(Flags.DONE).isPresent()) {
-                                    FlagManager.removePlotFlag(plot, Flags.DONE);
-                                }
-                                if (plot.getFlag(Flags.ANALYSIS).isPresent()) {
-                                    FlagManager.removePlotFlag(plot, Flags.ANALYSIS);
-                                }
-                                MainUtil.sendMessage(player, C.CLEARING_DONE,
-                                    "" + (System.currentTimeMillis() - start));
-                            }
-                        });
-                    }
-                });
-                if (!result) {
-                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-                } else {
-                    plot.addRunning();
-                }
-            }
-        }, null);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
deleted file mode 100644
index b4b24021f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ /dev/null
@@ -1,612 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "cluster", aliases = "clusters",
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
-    permission = "plots.cluster", description = "Manage a plot cluster") public class Cluster
-    extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-
-        // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
-        if (args.length == 0) {
-            // return arguments
-            MainUtil.sendMessage(player, C.CLUSTER_AVAILABLE_ARGS);
-            return false;
-        }
-        String sub = args[0].toLowerCase();
-        switch (sub) {
-            case "l":
-            case "list": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_LIST)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_LIST);
-                    return false;
-                }
-                if (args.length != 1) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster list");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                Set<PlotCluster> clusters = area.getClusters();
-                MainUtil.sendMessage(player, C.CLUSTER_LIST_HEADING, clusters.size() + "");
-                for (PlotCluster cluster : clusters) {
-                    // Ignore unmanaged clusters
-                    String name = "'" + cluster.getName() + "' : " + cluster.toString();
-                    if (player.getUUID().equals(cluster.owner)) {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&a" + name);
-                    } else if (cluster.helpers.contains(player.getUUID())) {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&3" + name);
-                    } else if (cluster.invited.contains(player.getUUID())) {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&9" + name);
-                    } else {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, cluster.toString());
-                    }
-                }
-                return true;
-            }
-            case "c":
-            case "create": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_CREATE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_CREATE);
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                if (args.length != 4) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                        "/plot cluster create <name> <id-bot> <id-top>");
-                    return false;
-                }
-                int currentClusters = Settings.Limit.GLOBAL ?
-                    player.getClusterCount() :
-                    player.getPlotCount(player.getLocation().getWorld());
-                if (currentClusters >= player.getAllowedPlots()) {
-                    return sendMessage(player, C.CANT_CLAIM_MORE_CLUSTERS);
-                }
-                // check pos1 / pos2
-                PlotId pos1 = PlotId.fromString(args[2]);
-                PlotId pos2 = PlotId.fromString(args[3]);
-                if (pos1 == null || pos2 == null) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-                    return false;
-                }
-                // check if name is taken
-                String name = args[1];
-                if (area.getCluster(name) != null) {
-                    MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
-                    return false;
-                }
-                if (pos2.x < pos1.x || pos2.y < pos1.y) {
-                    PlotId tmp = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y));
-                    pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y));
-                    pos1 = tmp;
-                }
-                //check if overlap
-                PlotCluster cluster = area.getFirstIntersectingCluster(pos1, pos2);
-                if (cluster != null) {
-                    MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, cluster.getName());
-                    return false;
-                }
-                // Check if it occupies existing plots
-                if (!area.contains(pos1) || !area.contains(pos2)) {
-                    C.CLUSTER_OUTSIDE.send(player, area);
-                    return false;
-                }
-                Set<Plot> plots = area.getPlotSelectionOwned(pos1, pos2);
-                if (!plots.isEmpty()) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_CREATE_OTHER)) {
-                        UUID uuid = player.getUUID();
-                        for (Plot plot : plots) {
-                            if (!plot.isOwner(uuid)) {
-                                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                                    C.PERMISSION_CLUSTER_CREATE_OTHER);
-                                return false;
-                            }
-                        }
-                    }
-                }
-                // Check allowed cluster size
-                cluster = new PlotCluster(area, pos1, pos2, player.getUUID());
-                int current;
-                if (Settings.Limit.GLOBAL) {
-                    current = player.getPlayerClusterCount();
-                } else {
-                    current = player.getPlayerClusterCount(player.getLocation().getWorld());
-                }
-                int allowed = Permissions.hasPermissionRange(player, C.PERMISSION_CLUSTER_SIZE,
-                    Settings.Limit.MAX_PLOTS);
-                if (current + cluster.getArea() > allowed) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()));
-                    return false;
-                }
-                // create cluster
-                cluster.settings.setAlias(name);
-                area.addCluster(cluster);
-                DBFunc.createCluster(cluster);
-                // Add any existing plots to the current cluster
-                for (Plot plot : plots) {
-                    if (plot.hasOwner()) {
-                        if (!cluster.isAdded(plot.owner)) {
-                            cluster.invited.add(plot.owner);
-                            DBFunc.setInvited(cluster, plot.owner);
-                        }
-                    }
-                }
-                MainUtil.sendMessage(player, C.CLUSTER_ADDED);
-                return true;
-            }
-            case "disband":
-            case "del":
-            case "delete": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_DELETE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_DELETE);
-                    return false;
-                }
-                if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster delete [name]");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster;
-                if (args.length == 2) {
-                    cluster = area.getCluster(args[1]);
-                    if (cluster == null) {
-                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
-                        return false;
-                    }
-                } else {
-                    cluster = area.getCluster(player.getLocation());
-                    if (cluster == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                        return false;
-                    }
-                }
-                if (!cluster.owner.equals(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_DELETE_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_DELETE_OTHER);
-                        return false;
-                    }
-                }
-                DBFunc.delete(cluster);
-                MainUtil.sendMessage(player, C.CLUSTER_DELETED);
-                return true;
-            }
-            case "res":
-            case "resize": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_RESIZE);
-                    return false;
-                }
-                if (args.length != 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                        "/plot cluster resize <pos1> <pos2>");
-                    return false;
-                }
-                // check pos1 / pos2
-                PlotId pos1 = PlotId.fromString(args[1]);
-                PlotId pos2 = PlotId.fromString(args[2]);
-                if (pos1 == null || pos2 == null) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-                    return false;
-                }
-                if (pos2.x < pos1.x || pos2.y < pos1.y) {
-                    pos1 = new PlotId(Math.min(pos1.x, pos2.x), Math.min(pos1.y, pos2.y));
-                    pos2 = new PlotId(Math.max(pos1.x, pos2.x), Math.max(pos1.y, pos2.y));
-                }
-                // check if in cluster
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster = area.getCluster(player.getLocation());
-                if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                    return false;
-                }
-                if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_RESIZE_OTHER);
-                        return false;
-                    }
-                }
-                //check if overlap
-                PlotCluster intersect = area.getFirstIntersectingCluster(pos1, pos2);
-                if (intersect != null) {
-                    MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, intersect.getName());
-                    return false;
-                }
-                Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
-                Set<Plot> newPlots = area.getPlotSelectionOwned(pos1, pos2);
-                // Set<Plot> removed = (HashSet<Plot>) existing.clone();
-                Set<Plot> removed = new HashSet<>(existing);
-
-                removed.removeAll(newPlots);
-                // Check expand / shrink
-                if (!removed.isEmpty()) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_RESIZE_SHRINK);
-                        return false;
-                    }
-                }
-                newPlots.removeAll(existing);
-                if (!newPlots.isEmpty()) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_RESIZE_EXPAND);
-                        return false;
-                    }
-                }
-                // Check allowed cluster size
-                int current;
-                if (Settings.Limit.GLOBAL) {
-                    current = player.getPlayerClusterCount();
-                } else {
-                    current = player.getPlayerClusterCount(player.getLocation().getWorld());
-                }
-                current -= cluster.getArea() + (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
-                int allowed = Permissions
-                    .hasPermissionRange(player, C.PERMISSION_CLUSTER, Settings.Limit.MAX_PLOTS);
-                if (current + cluster.getArea() > allowed) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_CLUSTER.s() + "." + (current + cluster.getArea()));
-                    return false;
-                }
-                // resize cluster
-                DBFunc.resizeCluster(cluster, pos1, pos2);
-                MainUtil.sendMessage(player, C.CLUSTER_RESIZED);
-                return true;
-            }
-            case "add":
-            case "inv":
-            case "invite": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INVITE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_INVITE);
-                    return false;
-                }
-                if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster invite <player>");
-                    return false;
-                }
-                // check if in cluster
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster = area.getCluster(player.getLocation());
-                if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                    return false;
-                }
-                if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INVITE_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_INVITE_OTHER);
-                        return false;
-                    }
-                }
-                // check uuid
-                UUID uuid = UUIDHandler.getUUID(args[1], null);
-                if (uuid == null) {
-                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[2]);
-                    return false;
-                }
-                if (!cluster.isAdded(uuid)) {
-                    // add the user if not added
-                    cluster.invited.add(uuid);
-                    DBFunc.setInvited(cluster, uuid);
-                    PlotPlayer player2 = UUIDHandler.getPlayer(uuid);
-                    if (player2 != null) {
-                        MainUtil.sendMessage(player2, C.CLUSTER_INVITED, cluster.getName());
-                    }
-                }
-                MainUtil.sendMessage(player, C.CLUSTER_ADDED_USER);
-                return true;
-            }
-            case "k":
-            case "remove":
-            case "kick": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_KICK)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_KICK);
-                    return false;
-                }
-                if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster kick <player>");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster = area.getCluster(player.getLocation());
-                if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                    return false;
-                }
-                if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_KICK_OTHER)) {
-                        MainUtil
-                            .sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_KICK_OTHER);
-                        return false;
-                    }
-                }
-                // check uuid
-                UUID uuid = UUIDHandler.getUUID(args[1], null);
-                if (uuid == null) {
-                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[1]);
-                    return false;
-                }
-                // Can't kick if the player is yourself, the owner, or not added to the cluster
-                if (uuid.equals(player.getUUID()) || uuid.equals(cluster.owner) || !cluster
-                    .isAdded(uuid)) {
-                    MainUtil.sendMessage(player, C.CANNOT_KICK_PLAYER, cluster.getName());
-                    return false;
-                }
-                if (cluster.helpers.contains(uuid)) {
-                    cluster.helpers.remove(uuid);
-                    DBFunc.removeHelper(cluster, uuid);
-                }
-                cluster.invited.remove(uuid);
-                DBFunc.removeInvited(cluster, uuid);
-                PlotPlayer player2 = UUIDHandler.getPlayer(uuid);
-                if (player2 != null) {
-                    MainUtil.sendMessage(player2, C.CLUSTER_REMOVED, cluster.getName());
-                }
-                for (Plot plot : new ArrayList<>(
-                    PlotSquared.get().getPlots(player2.getLocation().getWorld(), uuid))) {
-                    PlotCluster current = plot.getCluster();
-                    if (current != null && current.equals(cluster)) {
-                        plot.unclaim();
-                    }
-                }
-                MainUtil.sendMessage(player2, C.CLUSTER_KICKED_USER);
-                return true;
-            }
-            case "quit":
-            case "leave": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_LEAVE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_LEAVE);
-                    return false;
-                }
-                if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster leave [name]");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster;
-                if (args.length == 2) {
-                    cluster = area.getCluster(args[1]);
-                    if (cluster == null) {
-                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
-                        return false;
-                    }
-                } else {
-                    cluster = area.getCluster(player.getLocation());
-                    if (cluster == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                        return false;
-                    }
-                }
-                UUID uuid = player.getUUID();
-                if (!cluster.isAdded(uuid)) {
-                    MainUtil.sendMessage(player, C.CLUSTER_NOT_ADDED);
-                    return false;
-                }
-                if (uuid.equals(cluster.owner)) {
-                    MainUtil.sendMessage(player, C.CLUSTER_CANNOT_LEAVE);
-                    return false;
-                }
-                if (cluster.helpers.contains(uuid)) {
-                    cluster.helpers.remove(uuid);
-                    DBFunc.removeHelper(cluster, uuid);
-                }
-                cluster.invited.remove(uuid);
-                DBFunc.removeInvited(cluster, uuid);
-                MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
-                for (Plot plot : new ArrayList<>(
-                    PlotSquared.get().getPlots(player.getLocation().getWorld(), uuid))) {
-                    PlotCluster current = plot.getCluster();
-                    if (current != null && current.equals(cluster)) {
-                        plot.unclaim();
-                    }
-                }
-                return true;
-            }
-            case "members":
-            case "admin":
-            case "helper":
-            case "helpers": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_HELPERS)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_HELPERS);
-                    return false;
-                }
-                if (args.length != 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                        "/plot cluster helpers <add|remove> <player>");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster = area.getCluster(player.getLocation());
-                if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                    return false;
-                }
-                UUID uuid = UUIDHandler.getUUID(args[2], null);
-                if (uuid == null) {
-                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[2]);
-                    return false;
-                }
-                if (args[1].equalsIgnoreCase("add")) {
-                    cluster.helpers.add(uuid);
-                    DBFunc.setHelper(cluster, uuid);
-                    return MainUtil.sendMessage(player, C.CLUSTER_ADDED_HELPER);
-                }
-                if (args[1].equalsIgnoreCase("remove")) {
-                    cluster.helpers.remove(uuid);
-                    DBFunc.removeHelper(cluster, uuid);
-                    return MainUtil.sendMessage(player, C.CLUSTER_REMOVED_HELPER);
-                }
-                MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                    "/plot cluster helpers <add|remove> <player>");
-                return false;
-            }
-            case "spawn":
-            case "home":
-            case "tp": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_TP)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_TP);
-                    return false;
-                }
-                if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster tp <name>");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster = area.getCluster(args[1]);
-                if (cluster == null) {
-                    MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
-                    return false;
-                }
-                UUID uuid = player.getUUID();
-                if (!cluster.isAdded(uuid)) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_TP_OTHER)) {
-                        MainUtil
-                            .sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_TP_OTHER);
-                        return false;
-                    }
-                }
-                player.teleport(cluster.getHome());
-                return MainUtil.sendMessage(player, C.CLUSTER_TELEPORTING);
-            }
-            case "i":
-            case "info":
-            case "show":
-            case "information": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INFO)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_INFO);
-                    return false;
-                }
-                if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster info [name]");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster;
-                if (args.length == 2) {
-                    cluster = area.getCluster(args[1]);
-                    if (cluster == null) {
-                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
-                        return false;
-                    }
-                } else {
-                    cluster = area.getCluster(player.getLocation());
-                    if (cluster == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                        return false;
-                    }
-                }
-                String id = cluster.toString();
-                String owner = UUIDHandler.getName(cluster.owner);
-                if (owner == null) {
-                    owner = "unknown";
-                }
-                String name = cluster.getName();
-                String size = (cluster.getP2().x - cluster.getP1().x + 1) + "x" + (
-                    cluster.getP2().y - cluster.getP1().y + 1);
-                String rights = cluster.isAdded(player.getUUID()) + "";
-                String message = C.CLUSTER_INFO.s();
-                message = message.replaceAll("%id%", id);
-                message = message.replaceAll("%owner%", owner);
-                message = message.replaceAll("%name%", name);
-                message = message.replaceAll("%size%", size);
-                message = message.replaceAll("%rights%", rights);
-                MainUtil.sendMessage(player, message);
-                return true;
-            }
-            case "sh":
-            case "setspawn":
-            case "sethome":
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_SETHOME)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_SETHOME);
-                    return false;
-                }
-                if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster sethome");
-                    return false;
-                }
-                PlotArea area = player.getApplicablePlotArea();
-                if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
-                }
-                PlotCluster cluster = area.getCluster(player.getLocation());
-                if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
-                    return false;
-                }
-                if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_SETHOME_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_SETHOME_OTHER);
-                        return false;
-                    }
-                }
-                Location base = cluster.getClusterBottom();
-                Location relative = player.getLocation().subtract(base.getX(), 0, base.getZ());
-                BlockLoc blockloc = new BlockLoc(relative.getX(), relative.getY(), relative.getZ());
-                cluster.settings.setPosition(blockloc);
-                DBFunc.setPosition(cluster,
-                    relative.getX() + "," + relative.getY() + "," + relative.getZ());
-                return MainUtil.sendMessage(player, C.POSITION_SET);
-        }
-        MainUtil.sendMessage(player, C.CLUSTER_AVAILABLE_ARGS);
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
deleted file mode 100644
index 4aeacf85c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-/**
- * CommandCategory.
- */
-public enum CommandCategory {
-    /**
-     * Claiming CommandConfig.
-     * Such as: /plot claim
-     */
-    CLAIMING("Claiming"), /**
-     * Teleportation CommandConfig.
-     * Such as: /plot visit
-     */
-    TELEPORT("Teleport"), /**
-     * Protection.
-     */
-    SETTINGS("Protection"), /**
-     * Chat.
-     */
-    CHAT("Chat"), /**
-     * Web.
-     */
-    SCHEMATIC("Web"), /**
-     * Cosmetic.
-     */
-    APPEARANCE("Cosmetic"), /**
-     * Information CommandConfig.
-     * Such as: /plot info
-     */
-    INFO("Info"), /**
-     * Debug CommandConfig.
-     * Such as: /plot debug
-     */
-    DEBUG("Debug"), /**
-     * Administration commands.
-     */
-    ADMINISTRATION("Admin");
-    /**
-     * The category name (Readable).
-     */
-    private final String name;
-
-    /**
-     * Constructor.
-     *
-     * @param name readable name
-     */
-    CommandCategory(String name) {
-        this.name = name;
-    }
-
-    @Override public String toString() {
-        return this.name;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
deleted file mode 100644
index 775450517..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-import com.github.intellectualsites.plotsquared.plot.util.CommentManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.Arrays;
-import java.util.Map.Entry;
-
-@CommandDeclaration(command = "comment", aliases = {"msg"}, description = "Comment on a plot",
-    category = CommandCategory.CHAT, requiredType = RequiredType.NONE, permission = "plots.comment")
-public class Comment extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        if (args.length < 2) {
-            sendMessage(player, C.COMMENT_SYNTAX,
-                StringMan.join(CommentManager.inboxes.keySet(), "|"));
-            return false;
-        }
-        CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
-        if (inbox == null) {
-            sendMessage(player, C.COMMENT_SYNTAX,
-                StringMan.join(CommentManager.inboxes.keySet(), "|"));
-            return false;
-        }
-        Location loc = player.getLocation();
-        PlotId id = PlotId.fromString(args[1]);
-        Plot plot = MainUtil.getPlotFromString(player, args[1], false);
-        int index;
-        if (plot == null) {
-            index = 1;
-            plot = loc.getPlotAbs();
-        } else {
-            if (args.length < 4) {
-                sendMessage(player, C.COMMENT_SYNTAX,
-                    StringMan.join(CommentManager.inboxes.keySet(), "|"));
-                return false;
-            }
-            index = 2;
-        }
-        if (!inbox.canWrite(plot, player)) {
-            sendMessage(player, C.NO_PERM_INBOX, "");
-            return false;
-        }
-        String message = StringMan.join(Arrays.copyOfRange(args, index, args.length), " ");
-        PlotComment comment =
-            new PlotComment(loc.getWorld(), id, message, player.getName(), inbox.toString(),
-                System.currentTimeMillis());
-        boolean result = inbox.addComment(plot, comment);
-        if (!result) {
-            sendMessage(player, C.NO_PLOT_INBOX, "");
-            sendMessage(player, C.COMMENT_SYNTAX,
-                StringMan.join(CommentManager.inboxes.keySet(), "|"));
-            return false;
-        }
-        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-            PlotPlayer pp = entry.getValue();
-            if (pp.getAttribute("chatspy")) {
-                MainUtil.sendMessage(pp, "/plot comment " + StringMan.join(args, " "));
-            }
-        }
-        sendMessage(player, C.COMMENT_ADDED);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
deleted file mode 100644
index 44d0e5593..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-
-import java.util.*;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-@CommandDeclaration(command = "condense", permission = "plots.admin",
-    description = "Condense a plotworld", category = CommandCategory.ADMINISTRATION,
-    requiredType = RequiredType.CONSOLE) public class Condense extends SubCommand {
-
-    public static boolean TASK = false;
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length != 2 && args.length != 3) {
-            MainUtil.sendMessage(player, "/plot condense <area> <start|stop|info> [radius]");
-            return false;
-        }
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
-            MainUtil.sendMessage(player, "INVALID AREA");
-            return false;
-        }
-        switch (args[1].toLowerCase()) {
-            case "start": {
-                if (args.length == 2) {
-                    MainUtil.sendMessage(player,
-                        "/plot condense " + area.toString() + " start <radius>");
-                    return false;
-                }
-                if (Condense.TASK) {
-                    MainUtil.sendMessage(player, "TASK ALREADY STARTED");
-                    return false;
-                }
-                if (!MathMan.isInteger(args[2])) {
-                    MainUtil.sendMessage(player, "INVALID RADIUS");
-                    return false;
-                }
-                int radius = Integer.parseInt(args[2]);
-                ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots(area));
-                // remove non base plots
-                Iterator<Plot> iterator = plots.iterator();
-                int maxSize = 0;
-                ArrayList<Integer> sizes = new ArrayList<>();
-                while (iterator.hasNext()) {
-                    Plot plot = iterator.next();
-                    if (!plot.isBasePlot()) {
-                        iterator.remove();
-                        continue;
-                    }
-                    int size = plot.getConnectedPlots().size();
-                    if (size > maxSize) {
-                        maxSize = size;
-                    }
-                    sizes.add(size - 1);
-                }
-                // Sort plots by size (buckets?)]
-                //noinspection unchecked
-                ArrayList<Plot>[] buckets = new ArrayList[maxSize];
-                for (int i = 0; i < plots.size(); i++) {
-                    Plot plot = plots.get(i);
-                    int size = sizes.get(i);
-                    ArrayList<Plot> array = buckets[size];
-                    if (array == null) {
-                        array = new ArrayList<>();
-                        buckets[size] = array;
-                    }
-                    array.add(plot);
-                }
-                final ArrayList<Plot> allPlots = new ArrayList<>(plots.size());
-                for (int i = buckets.length - 1; i >= 0; i--) {
-                    ArrayList<Plot> array = buckets[i];
-                    if (array != null) {
-                        allPlots.addAll(array);
-                    }
-                }
-                int size = allPlots.size();
-                int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
-                if (radius < minimumRadius) {
-                    MainUtil.sendMessage(player, "RADIUS TOO SMALL");
-                    return false;
-                }
-                List<PlotId> toMove = new ArrayList<>(getPlots(allPlots, radius));
-                final List<PlotId> free = new ArrayList<>();
-                PlotId start = new PlotId(0, 0);
-                while (start.x <= minimumRadius && start.y <= minimumRadius) {
-                    Plot plot = area.getPlotAbs(start);
-                    if (plot != null && !plot.hasOwner()) {
-                        free.add(plot.getId());
-                    }
-                    start = Auto.getNextPlotId(start, 1);
-                }
-                if (free.isEmpty() || toMove.isEmpty()) {
-                    MainUtil.sendMessage(player, "NO FREE PLOTS FOUND");
-                    return false;
-                }
-                MainUtil.sendMessage(player, "TASK STARTED...");
-                Runnable run = new Runnable() {
-                    @Override public void run() {
-                        if (!Condense.TASK) {
-                            MainUtil.sendMessage(player, "TASK CANCELLED.");
-                        }
-                        if (allPlots.isEmpty()) {
-                            Condense.TASK = false;
-                            MainUtil.sendMessage(player,
-                                "TASK COMPLETE. PLEASE VERIFY THAT NO NEW PLOTS HAVE BEEN CLAIMED DURING TASK.");
-                            return;
-                        }
-                        final Runnable task = this;
-                        final Plot origin = allPlots.remove(0);
-                        int i = 0;
-                        while (free.size() > i) {
-                            final Plot possible = origin.getArea().getPlotAbs(free.get(i));
-                            if (possible.hasOwner()) {
-                                free.remove(i);
-                                continue;
-                            }
-                            i++;
-                            final AtomicBoolean result = new AtomicBoolean(false);
-                            result.set(origin.move(possible, () -> {
-                                if (result.get()) {
-                                    MainUtil.sendMessage(player,
-                                        "Moving: " + origin + " -> " + possible);
-                                    TaskManager.runTaskLater(task, 1);
-                                }
-                            }, false));
-                            if (result.get()) {
-                                break;
-                            }
-                        }
-                        if (free.isEmpty()) {
-                            Condense.TASK = false;
-                            MainUtil.sendMessage(player, "TASK FAILED. NO FREE PLOTS FOUND!");
-                            return;
-                        }
-                        if (i >= free.size()) {
-                            MainUtil.sendMessage(player, "SKIPPING COMPLEX PLOT: " + origin);
-                        }
-                    }
-                };
-                Condense.TASK = true;
-                TaskManager.runTaskAsync(run);
-                return true;
-            }
-            case "stop":
-                if (!Condense.TASK) {
-                    MainUtil.sendMessage(player, "TASK ALREADY STOPPED");
-                    return false;
-                }
-                Condense.TASK = false;
-                MainUtil.sendMessage(player, "TASK STOPPED");
-                return true;
-            case "info":
-                if (args.length == 2) {
-                    MainUtil.sendMessage(player,
-                        "/plot condense " + area.toString() + " info <radius>");
-                    return false;
-                }
-                if (!MathMan.isInteger(args[2])) {
-                    MainUtil.sendMessage(player, "INVALID RADIUS");
-                    return false;
-                }
-                int radius = Integer.parseInt(args[2]);
-                Collection<Plot> plots = area.getPlots();
-                int size = plots.size();
-                int minimumRadius = (int) Math.ceil(Math.sqrt(size) / 2 + 1);
-                if (radius < minimumRadius) {
-                    MainUtil.sendMessage(player, "RADIUS TOO SMALL");
-                    return false;
-                }
-                int maxMove = getPlots(plots, minimumRadius).size();
-                int userMove = getPlots(plots, radius).size();
-                MainUtil.sendMessage(player, "=== DEFAULT EVAL ===");
-                MainUtil.sendMessage(player, "MINIMUM RADIUS: " + minimumRadius);
-                MainUtil.sendMessage(player, "MAXIMUM MOVES: " + maxMove);
-                MainUtil.sendMessage(player, "=== INPUT EVAL ===");
-                MainUtil.sendMessage(player, "INPUT RADIUS: " + radius);
-                MainUtil.sendMessage(player, "ESTIMATED MOVES: " + userMove);
-                MainUtil.sendMessage(player,
-                    "ESTIMATED TIME: No idea, times will drastically change based on the system performance and load");
-                MainUtil.sendMessage(player, "&e - Radius is measured in plot width");
-                return true;
-        }
-        MainUtil.sendMessage(player,
-            "/plot condense " + area.worldname + " <start|stop|info> [radius]");
-        return false;
-    }
-
-    public Set<PlotId> getPlots(Collection<Plot> plots, int radius) {
-        HashSet<PlotId> outside = new HashSet<>();
-        for (Plot plot : plots) {
-            if (plot.getId().x > radius || plot.getId().x < -radius || plot.getId().y > radius
-                || plot.getId().y < -radius) {
-                outside.add(plot.getId());
-            }
-        }
-        return outside;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
deleted file mode 100644
index b33bd4dab..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.CmdInstance;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-@CommandDeclaration(command = "confirm", permission = "plots.use",
-    description = "Confirm an action", category = CommandCategory.INFO) public class Confirm
-    extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        CmdInstance command = CmdConfirm.getPending(player);
-        if (command == null) {
-            MainUtil.sendMessage(player, C.FAILED_CONFIRM);
-            return false;
-        }
-        CmdConfirm.removePending(player);
-        if ((System.currentTimeMillis() - command.timestamp)
-            > Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS * 1000) {
-            MainUtil.sendMessage(player, C.EXPIRED_CONFIRM);
-            return false;
-        }
-        TaskManager.runTask(command.command);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
deleted file mode 100644
index 68bf8c786..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-@CommandDeclaration(command = "continue",
-    description = "Continue a plot that was previously marked as done",
-    permission = "plots.continue", category = CommandCategory.SETTINGS,
-    requiredType = RequiredType.NONE) public class Continue extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Plot plot = player.getCurrentPlot();
-        if ((plot == null) || !plot.hasOwner()) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (!plot.hasFlag(Flags.DONE)) {
-            MainUtil.sendMessage(player, C.DONE_NOT_DONE);
-            return false;
-        }
-        int size = plot.getConnectedPlots().size();
-        if (Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
-            < player.getPlotCount() + size)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_ADMIN_COMMAND_CONTINUE);
-            return false;
-        }
-        if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-            return false;
-        }
-        plot.removeFlag(Flags.DONE);
-        MainUtil.sendMessage(player, C.DONE_REMOVED);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
deleted file mode 100644
index 8303ef042..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-@CommandDeclaration(command = "copy", permission = "plots.copy", aliases = {"copypaste"},
-    category = CommandCategory.CLAIMING, description = "Copy a plot", usage = "/plot copy <X;Z>",
-    requiredType = RequiredType.NONE) public class Copy extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        Plot plot1 = loc.getPlotAbs();
-        if (plot1 == null) {
-            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot1.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (args.length != 1) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
-        if (plot2 == null) {
-            return false;
-        }
-        if (plot1.equals(plot2)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        if (!plot1.getArea().isCompatible(plot2.getArea())) {
-            C.PLOTWORLD_INCOMPATIBLE.send(player);
-            return false;
-        }
-        if (plot1.copy(plot2, new Runnable() {
-            @Override public void run() {
-                MainUtil.sendMessage(player, C.COPY_SUCCESS);
-            }
-        })) {
-            return true;
-        } else {
-            MainUtil.sendMessage(player, C.REQUIRES_UNOWNED);
-            return false;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
deleted file mode 100644
index acc47a64e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-@CommandDeclaration(command = "createroadschematic", aliases = {"crs"},
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
-    permission = "plots.createroadschematic",
-    description = "Add a road schematic to your world using the roads around your current plot",
-    usage = "/plot createroadschematic") public class CreateRoadSchematic extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!(loc.getPlotArea() instanceof HybridPlotWorld)) {
-            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
-        HybridUtils.manager.setupRoadSchematic(plot);
-        MainUtil.sendMessage(player,
-            "$1Saved new road schematic. To test the road, fly to a few other plots and use /plot debugroadregen");
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
deleted file mode 100644
index e94850121..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.database.MySQL;
-import com.github.intellectualsites.plotsquared.plot.database.SQLManager;
-import com.github.intellectualsites.plotsquared.plot.database.SQLite;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.io.File;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-@CommandDeclaration(command = "database", aliases = {"convert"},
-    category = CommandCategory.ADMINISTRATION, permission = "plots.database",
-    description = "Convert/Backup Storage", requiredType = RequiredType.CONSOLE,
-    usage = "/plot database [area] <sqlite|mysql|import>") public class Database
-    extends SubCommand {
-
-    public static void insertPlots(final SQLManager manager, final List<Plot> plots,
-        final PlotPlayer player) {
-        TaskManager.runTaskAsync(() -> {
-            try {
-                ArrayList<Plot> ps = new ArrayList<>(plots);
-                MainUtil.sendMessage(player, "&6Starting...");
-                manager.createPlotsAndData(ps, () -> {
-                    MainUtil.sendMessage(player, "&6Database conversion finished!");
-                    manager.close();
-                });
-            } catch (Exception e) {
-                MainUtil
-                    .sendMessage(player, "Failed to insert plot objects, see stacktrace for info");
-                e.printStackTrace();
-            }
-        });
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length < 1) {
-            MainUtil.sendMessage(player, "/plot database [area] <sqlite|mysql|import>");
-            return false;
-        }
-        List<Plot> plots;
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        if (area != null) {
-            plots = PlotSquared.get().sortPlotsByTemp(area.getPlots());
-            args = Arrays.copyOfRange(args, 1, args.length);
-        } else {
-            plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots());
-        }
-        if (args.length < 1) {
-            MainUtil.sendMessage(player, "/plot database [world] <sqlite|mysql|import>");
-            MainUtil.sendMessage(player, "[arg] indicates an optional argument");
-            return false;
-        }
-        try {
-            com.github.intellectualsites.plotsquared.plot.database.Database implementation;
-            String prefix = "";
-            switch (args[0].toLowerCase()) {
-                case "import":
-                    if (args.length < 2) {
-                        MainUtil
-                            .sendMessage(player, "/plot database import <sqlite file> [prefix]");
-                        return false;
-                    }
-                    File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-                        args[1].endsWith(".db") ? args[1] : args[1] + ".db");
-                    if (!file.exists()) {
-                        MainUtil.sendMessage(player, "&6Database does not exist: " + file);
-                        return false;
-                    }
-                    MainUtil.sendMessage(player, "&6Starting...");
-                    implementation = new SQLite(file);
-                    SQLManager manager =
-                        new SQLManager(implementation, args.length == 3 ? args[2] : "", true);
-                    HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
-                    plots = new ArrayList<>();
-                    for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
-                        String areaname = entry.getKey();
-                        PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
-                        if (pa != null) {
-                            for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                                Plot plot = entry2.getValue();
-                                if (pa.getOwnedPlotAbs(plot.getId()) != null) {
-                                    if (pa instanceof SinglePlotArea) {
-                                        Plot newPlot = pa.getNextFreePlot(null, plot.getId());
-                                        if (newPlot != null) {
-                                            PlotId newId = newPlot.getId();
-                                            PlotId id = plot.getId();
-                                            File worldFile =
-                                                new File(PlotSquared.imp().getWorldContainer(),
-                                                    id.toCommaSeparatedString());
-                                            if (worldFile.exists()) {
-                                                File newFile =
-                                                    new File(PlotSquared.imp().getWorldContainer(),
-                                                        newId.toCommaSeparatedString());
-                                                worldFile.renameTo(newFile);
-                                            }
-                                            id.x = newId.x;
-                                            id.y = newId.y;
-                                            id.recalculateHash();
-                                            plot.setArea(pa);
-                                            plots.add(plot);
-                                            continue;
-                                        }
-                                    }
-                                    MainUtil.sendMessage(player,
-                                        "Skipping duplicate plot: " + plot + " | id=" + plot.temp);
-                                    continue;
-                                }
-                                plot.setArea(pa);
-                                plots.add(plot);
-                            }
-                        } else {
-                            HashMap<PlotId, Plot> plotmap = PlotSquared.get().plots_tmp
-                                .computeIfAbsent(areaname, k -> new HashMap<>());
-                            plotmap.putAll(entry.getValue());
-                        }
-                    }
-                    DBFunc.createPlotsAndData(plots,
-                        () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
-                    return true;
-                case "mysql":
-                    if (args.length < 6) {
-                        return MainUtil.sendMessage(player,
-                            "/plot database mysql [host] [port] [username] [password] [database] {prefix}");
-                    }
-                    String host = args[1];
-                    String port = args[2];
-                    String username = args[3];
-                    String password = args[4];
-                    String database = args[5];
-                    if (args.length > 6) {
-                        prefix = args[6];
-                    }
-                    implementation = new MySQL(host, port, database, username, password);
-                    break;
-                case "sqlite":
-                    if (args.length < 2) {
-                        return MainUtil.sendMessage(player, "/plot database sqlite [file]");
-                    }
-                    File sqliteFile =
-                        MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), args[1] + ".db");
-                    implementation = new SQLite(sqliteFile);
-                    break;
-                default:
-                    return MainUtil.sendMessage(player, "/plot database [sqlite/mysql]");
-            }
-            try {
-                SQLManager manager = new SQLManager(implementation, prefix, true);
-                Database.insertPlots(manager, plots, player);
-                return true;
-            } catch (ClassNotFoundException | SQLException e) {
-                MainUtil.sendMessage(player, "$1Failed to save plots, read stacktrace for info");
-                MainUtil.sendMessage(player,
-                    "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-                e.printStackTrace();
-                MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
-                MainUtil
-                    .sendMessage(player, "$1Please make sure you are using the correct arguments!");
-                return false;
-            }
-        } catch (ClassNotFoundException | SQLException e) {
-            MainUtil.sendMessage(player, "$1Failed to open connection, read stacktrace for info");
-            MainUtil.sendMessage(player,
-                "&d==== Here is an ugly stacktrace, if you are interested in those things ===");
-            e.printStackTrace();
-            MainUtil.sendMessage(player, "&d==== End of stacktrace ====");
-            MainUtil.sendMessage(player, "$1Please make sure you are using the correct arguments!");
-            return false;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
deleted file mode 100644
index 28594982c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-@CommandDeclaration(command = "debug", category = CommandCategory.DEBUG,
-    description = "Show debug information", usage = "/plot debug [msg]", permission = "plots.admin")
-public class Debug extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) {
-            StringBuilder msg = new StringBuilder();
-            for (C caption : C.values()) {
-                msg.append(caption.s()).append("\n");
-            }
-            MainUtil.sendMessage(player, msg.toString());
-            return true;
-        }
-        StringBuilder information = new StringBuilder();
-        String header = C.DEBUG_HEADER.s();
-        String line = C.DEBUG_LINE.s();
-        String section = C.DEBUG_SECTION.s();
-        information.append(header);
-        information.append(getSection(section, "PlotArea"));
-        information.append(
-            getLine(line, "Plot Worlds", StringMan.join(PlotSquared.get().getPlotAreas(), ", ")));
-        information.append(getLine(line, "Owned Plots", PlotSquared.get().getPlots().size()));
-        information.append(getSection(section, "Messages"));
-        information.append(getLine(line, "Total Messages", C.values().length));
-        information.append(getLine(line, "View all captions", "/plot debug msg"));
-        MainUtil.sendMessage(player, information.toString());
-        return true;
-    }
-
-    private String getSection(String line, String val) {
-        return line.replaceAll("%val%", val) + "\n";
-    }
-
-    private String getLine(String line, String var, Object val) {
-        return line.replaceAll("%var%", var).replaceAll("%val%", "" + val) + "\n";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
deleted file mode 100644
index cbfacfae6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
-@CommandDeclaration(command = "debugallowunsafe",
-    description = "Allow unsafe actions until toggled off", usage = "/plot debugallowunsafe",
-    category = CommandCategory.DEBUG, requiredType = RequiredType.NONE,
-    permission = "plots.debugallowunsafe") public class DebugAllowUnsafe extends SubCommand {
-
-    public static final List<UUID> unsafeAllowed = new ArrayList<>();
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-
-        if (unsafeAllowed.contains(player.getUUID())) {
-            unsafeAllowed.remove(player.getUUID());
-            sendMessage(player, C.DEBUGALLOWUNSAFE_OFF);
-        } else {
-            unsafeAllowed.add(player.getUUID());
-            sendMessage(player, C.DEBUGALLOWUNSAFE_ON);
-        }
-        return true;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
deleted file mode 100644
index 01a344369..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import com.google.common.collect.BiMap;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.UUID;
-
-@CommandDeclaration(command = "debugclaimtest", description =
-    "If you accidentally delete your database, this command will attempt to restore all plots based on the data from plot signs. "
-        + "Execution time may vary", category = CommandCategory.DEBUG,
-    requiredType = RequiredType.CONSOLE, permission = "plots.debugclaimtest")
-public class DebugClaimTest extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length < 3) {
-            return !MainUtil.sendMessage(null,
-                "If you accidentally delete your database, this command will attempt to restore all plots based on the data from the "
-                    + "plot signs. \n\n&cMissing world arg /plot debugclaimtest {world} {PlotId min} {PlotId max}");
-        }
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
-            C.NOT_VALID_PLOT_WORLD.send(player, args[0]);
-            return false;
-        }
-        PlotId min, max;
-        try {
-            args[1].split(";");
-            args[2].split(";");
-            min = PlotId.fromString(args[1]);
-            max = PlotId.fromString(args[2]);
-        } catch (Exception ignored) {
-            return !MainUtil.sendMessage(player,
-                "&cInvalid min/max values. &7The values are to Plot IDs in the format &cX;Y &7where X;Y are the plot coords\nThe conversion "
-                    + "will only check the plots in the selected area.");
-        }
-        MainUtil.sendMessage(player,
-            "&3Sign Block&8->&3Plot&8: &7Beginning sign to plot conversion. This may take a while...");
-        MainUtil.sendMessage(player,
-            "&3Sign Block&8->&3Plot&8: Found an excess of 250,000 chunks. Limiting search radius... (~3.8 min)");
-        PlotManager manager = area.getPlotManager();
-        ArrayList<Plot> plots = new ArrayList<>();
-        for (PlotId id : MainUtil.getPlotSelectionIds(min, max)) {
-            Plot plot = area.getPlotAbs(id);
-            if (plot.hasOwner()) {
-                MainUtil.sendMessage(player, " - &cDB Already contains: " + plot.getId());
-                continue;
-            }
-            Location loc = manager.getSignLoc(area, plot);
-            ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
-            boolean result = ChunkManager.manager.loadChunk(area.worldname, chunk, false);
-            if (!result) {
-                continue;
-            }
-            String[] lines = WorldUtil.IMP.getSign(loc);
-            if (lines != null) {
-                String line = lines[2];
-                if (line != null && line.length() > 2) {
-                    line = line.substring(2);
-                    BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
-                    UUID uuid = map.get(new StringWrapper(line));
-                    if (uuid == null) {
-                        for (Map.Entry<StringWrapper, UUID> stringWrapperUUIDEntry : map
-                            .entrySet()) {
-                            if (stringWrapperUUIDEntry.getKey().value.toLowerCase()
-                                .startsWith(line.toLowerCase())) {
-                                uuid = stringWrapperUUIDEntry.getValue();
-                                break;
-                            }
-                        }
-                    }
-                    if (uuid == null) {
-                        uuid = UUIDHandler.getUUID(line, null);
-                    }
-                    if (uuid != null) {
-                        MainUtil
-                            .sendMessage(player, " - &aFound plot: " + plot.getId() + " : " + line);
-                        plot.setOwner(uuid);
-                        plots.add(plot);
-                    } else {
-                        MainUtil.sendMessage(player,
-                            " - &cInvalid PlayerName: " + plot.getId() + " : " + line);
-                    }
-                }
-            }
-        }
-        if (!plots.isEmpty()) {
-            MainUtil.sendMessage(player,
-                "&3Sign Block&8->&3Plot&8: &7Updating '" + plots.size() + "' plots!");
-            DBFunc.createPlotsAndData(plots, new Runnable() {
-                @Override public void run() {
-                    MainUtil.sendMessage(player, "&6Database update finished!");
-                }
-            });
-            for (Plot plot : plots) {
-                plot.create();
-            }
-            MainUtil.sendMessage(player, "&3Sign Block&8->&3Plot&8: &7Complete!");
-        } else {
-            MainUtil.sendMessage(player, "No plots were found for the given search.");
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
deleted file mode 100644
index 01cd1fefc..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
+++ /dev/null
@@ -1,429 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.listener.WEManager;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
-import com.google.common.io.Files;
-
-import javax.script.*;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.sql.Timestamp;
-import java.util.*;
-
-@CommandDeclaration(command = "debugexec", permission = "plots.admin",
-    description = "Mutli-purpose debug command", aliases = {"exec", "$"},
-    category = CommandCategory.DEBUG) public class DebugExec extends SubCommand {
-    private ScriptEngine engine;
-    private Bindings scope;
-
-    public DebugExec() {
-        try {
-            if (PlotSquared.get() != null) {
-                File file = new File(PlotSquared.get().IMP.getDirectory(),
-                    Settings.Paths.SCRIPTS + File.separator + "start.js");
-                if (file.exists()) {
-                    init();
-                    String script = StringMan.join(Files.readLines(new File(new File(
-                            PlotSquared.get().IMP.getDirectory() + File.separator
-                                + Settings.Paths.SCRIPTS), "start.js"), StandardCharsets.UTF_8),
-                        System.getProperty("line.separator"));
-                    this.scope.put("THIS", this);
-                    this.scope.put("PlotPlayer", ConsolePlayer.getConsole());
-                    this.engine.eval(script, this.scope);
-                }
-            }
-        } catch (IOException | ScriptException ignored) {
-            ignored.printStackTrace();
-        }
-    }
-
-    public ScriptEngine getEngine() {
-        if (this.engine == null) {
-            init();
-        }
-        return this.engine;
-    }
-
-    public Bindings getScope() {
-        return this.scope;
-    }
-
-    public void init() {
-        if (this.engine != null) {
-            return;
-        }
-        this.engine = new ScriptEngineManager(null).getEngineByName("nashorn");
-        if (this.engine == null) {
-            this.engine = new ScriptEngineManager(null).getEngineByName("JavaScript");
-        }
-        ScriptContext context = new SimpleScriptContext();
-        this.scope = context.getBindings(ScriptContext.ENGINE_SCOPE);
-
-        // stuff
-        this.scope.put("MainUtil", new MainUtil());
-        this.scope.put("Settings", new Settings());
-        this.scope.put("StringMan", new StringMan());
-        this.scope.put("MathMan", new MathMan());
-        this.scope.put("FlagManager", new FlagManager());
-
-        // Classes
-        this.scope.put("Location", Location.class);
-        this.scope.put("PlotBlock", PlotBlock.class);
-        this.scope.put("Plot", Plot.class);
-        this.scope.put("PlotId", PlotId.class);
-        this.scope.put("Runnable", Runnable.class);
-        this.scope.put("RunnableVal", RunnableVal.class);
-
-        // Instances
-        this.scope.put("PS", PlotSquared.get());
-        this.scope.put("GlobalBlockQueue", GlobalBlockQueue.IMP);
-        this.scope.put("ExpireManager", ExpireManager.IMP);
-        if (PlotSquared.get().worldedit != null) {
-            this.scope.put("WEManager", new WEManager());
-        }
-        this.scope.put("TaskManager", TaskManager.IMP);
-        this.scope.put("TitleManager", AbstractTitle.TITLE_CLASS);
-        this.scope.put("ConsolePlayer", ConsolePlayer.getConsole());
-        this.scope.put("SchematicHandler", SchematicHandler.manager);
-        this.scope.put("ChunkManager", ChunkManager.manager);
-        this.scope.put("BlockManager", WorldUtil.IMP);
-        this.scope.put("SetupUtils", SetupUtils.manager);
-        this.scope.put("EventUtil", EventUtil.manager);
-        this.scope.put("EconHandler", EconHandler.manager);
-        this.scope.put("UUIDHandler", UUIDHandler.implementation);
-        this.scope.put("DBFunc", DBFunc.dbManager);
-        this.scope.put("HybridUtils", HybridUtils.manager);
-        this.scope.put("IMP", PlotSquared.get().IMP);
-        this.scope.put("MainCommand", MainCommand.getInstance());
-
-        // enums
-        for (Enum<?> value : C.values()) {
-            this.scope.put("C_" + value.name(), value);
-        }
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        List<String> allowed_params = Arrays
-            .asList("analyze", "calibrate-analysis", "remove-flag", "stop-expire", "start-expire",
-                "seen", "list-scripts", "start-rgar", "stop-rgar", "help", "addcmd", "runasync",
-                "run", "allcmd", "all");
-        if (args.length > 0) {
-            String arg = args[0].toLowerCase();
-            String script;
-            boolean async = false;
-            switch (arg) {
-                case "analyze": {
-                    Plot plot = player.getCurrentPlot();
-                    if (plot == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_PLOT);
-                        return false;
-                    }
-                    PlotAnalysis analysis = plot.getComplexity(null);
-                    if (analysis != null) {
-                        MainUtil.sendMessage(player, "Changes/column: " + analysis.changes / 1.0);
-                        return true;
-                    }
-                    MainUtil.sendMessage(player, "$1Starting task...");
-                    HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>() {
-                        @Override public void run(PlotAnalysis value) {
-                            MainUtil.sendMessage(player,
-                                "$1Done: $2Use $3/plot debugexec analyze$2 for more information");
-                        }
-                    });
-                    return true;
-                }
-                case "calibrate-analysis":
-                    if (args.length != 2) {
-                        MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                            "/plot debugexec analyze <threshold>");
-                        MainUtil.sendMessage(player,
-                            "$1<threshold> $2= $1The percentage of plots you want to clear (100 clears 100% of plots so no point calibrating "
-                                + "it)");
-                        return false;
-                    }
-                    double threshold;
-                    try {
-                        threshold = Integer.parseInt(args[1]) / 100d;
-                    } catch (NumberFormatException ignored) {
-                        MainUtil.sendMessage(player, "$2Invalid threshold: " + args[1]);
-                        MainUtil.sendMessage(player,
-                            "$1<threshold> $2= $1The percentage of plots you want to clear as a number between 0 - 100");
-                        return false;
-                    }
-                    PlotAnalysis.calcOptimalModifiers(() -> MainUtil
-                        .sendMessage(player, "$1Thank you for calibrating plot expiry"), threshold);
-                    return true;
-                case "stop-expire":
-                    if (ExpireManager.IMP == null || !ExpireManager.IMP.cancelTask()) {
-                        return MainUtil.sendMessage(player, "Task already halted");
-                    }
-                    return MainUtil.sendMessage(player, "Cancelled task.");
-                case "remove-flag":
-                    if (args.length != 2) {
-                        MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                            "/plot debugexec remove-flag <flag>");
-                        return false;
-                    }
-                    String flag = args[1];
-                    for (Plot plot : PlotSquared.get().getBasePlots()) {
-                        Flag<?> flag1 = FlagManager.getFlag(flag);
-                        if (plot.getFlag(flag1).isPresent()) {
-                            plot.removeFlag(flag1);
-                        }
-                    }
-                    return MainUtil.sendMessage(player, "Cleared flag: " + flag);
-                case "start-rgar": {
-                    if (args.length != 2) {
-                        MainUtil.sendMessage(player,
-                            "&cInvalid syntax: /plot debugexec start-rgar <world>");
-                        return false;
-                    }
-                    PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
-                    if (area == null) {
-                        MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[1]);
-                        return false;
-                    }
-                    boolean result;
-                    if (HybridUtils.regions != null) {
-                        result =
-                            HybridUtils.manager.scheduleRoadUpdate(area, HybridUtils.regions, 0);
-                    } else {
-                        result = HybridUtils.manager.scheduleRoadUpdate(area, 0);
-                    }
-                    if (!result) {
-                        MainUtil.sendMessage(player,
-                            "&cCannot schedule mass schematic update! (Is one already in progress?)");
-                        return false;
-                    }
-                    return true;
-                }
-                case "stop-rgar":
-                    if (!HybridUtils.UPDATE) {
-                        MainUtil.sendMessage(player, "&cTask not running!");
-                        return false;
-                    }
-                    HybridUtils.UPDATE = false;
-                    MainUtil.sendMessage(player, "&cCancelling task... (Please wait)");
-                    return true;
-                case "start-expire":
-                    if (ExpireManager.IMP == null) {
-                        ExpireManager.IMP = new ExpireManager();
-                    }
-                    if (ExpireManager.IMP.runAutomatedTask()) {
-                        return MainUtil.sendMessage(player, "Started plot expiry task");
-                    } else {
-                        return MainUtil.sendMessage(player, "Plot expiry task already started");
-                    }
-                case "seen":
-                    if (args.length != 2) {
-                        return MainUtil.sendMessage(player, "Use /plot debugexec seen <player>");
-                    }
-                    UUID uuid = UUIDHandler.getUUID(args[1], null);
-                    if (uuid == null) {
-                        return MainUtil.sendMessage(player, "Player not found: " + args[1]);
-                    }
-                    OfflinePlotPlayer op = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
-                    if (op == null || op.getLastPlayed() == 0) {
-                        return MainUtil
-                            .sendMessage(player, "Player hasn't connected before: " + args[1]);
-                    }
-                    Timestamp stamp = new Timestamp(op.getLastPlayed());
-                    Date date = new Date(stamp.getTime());
-                    MainUtil.sendMessage(player, "PLAYER: " + args[1]);
-                    MainUtil.sendMessage(player, "UUID: " + uuid);
-                    MainUtil.sendMessage(player, "Object: " + date.toGMTString());
-                    MainUtil.sendMessage(player, "GMT: " + date.toGMTString());
-                    MainUtil.sendMessage(player, "Local: " + date.toLocaleString());
-                    return true;
-                case "h":
-                case "he":
-                case "?":
-                case "help":
-                    MainUtil.sendMessage(player,
-                        "Possible sub commands: /plot debugexec <" + StringMan
-                            .join(allowed_params, "|") + ">");
-                    return false;
-                case "addcmd":
-                    try {
-                        final String cmd = StringMan.join(Files.readLines(MainUtil.getFile(new File(
-                                PlotSquared.get().IMP.getDirectory() + File.separator
-                                    + Settings.Paths.SCRIPTS), args[1]), StandardCharsets.UTF_8),
-                            System.getProperty("line.separator"));
-                        new Command(MainCommand.getInstance(), true, args[1].split("\\.")[0], null,
-                            RequiredType.NONE, CommandCategory.DEBUG) {
-                            @Override public void execute(PlotPlayer player, String[] args,
-                                RunnableVal3<Command, Runnable, Runnable> confirm,
-                                RunnableVal2<Command, CommandResult> whenDone) {
-                                try {
-                                    DebugExec.this.scope.put("PlotPlayer", player);
-                                    DebugExec.this.scope.put("args", args);
-                                    DebugExec.this.engine.eval(cmd, DebugExec.this.scope);
-                                } catch (ScriptException e) {
-                                    e.printStackTrace();
-                                    MainUtil.sendMessage(player, C.COMMAND_WENT_WRONG);
-                                }
-                            }
-                        };
-                        return true;
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        MainUtil
-                            .sendMessage(player, C.COMMAND_SYNTAX, "/plot debugexec addcmd <file>");
-                        return false;
-                    }
-                case "runasync":
-                    async = true;
-                case "run":
-                    try {
-                        script = StringMan.join(Files.readLines(MainUtil.getFile(new File(
-                                PlotSquared.get().IMP.getDirectory() + File.separator
-                                    + Settings.Paths.SCRIPTS), args[1]), StandardCharsets.UTF_8),
-                            System.getProperty("line.separator"));
-                        if (args.length > 2) {
-                            HashMap<String, String> replacements = new HashMap<>();
-                            for (int i = 2; i < args.length; i++) {
-                                replacements.put("%s" + (i - 2), args[i]);
-                            }
-                            script = StringMan.replaceFromMap(script, replacements);
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        return false;
-                    }
-                    break;
-                case "list-scripts":
-                    String path = PlotSquared.get().IMP.getDirectory() + File.separator
-                        + Settings.Paths.SCRIPTS;
-                    File folder = new File(path);
-                    File[] filesArray = folder.listFiles();
-
-                    int page;
-                    switch (args.length) {
-                        case 1:
-                            page = 0;
-                            break;
-                        case 2:
-                            if (MathMan.isInteger(args[1])) {
-                                page = Integer.parseInt(args[1]) - 1;
-                                break;
-                            }
-                        default:
-                            C.COMMAND_SYNTAX.send(player, "/plot debugexec list-scripts [#]");
-                            return false;
-                    }
-
-                    List<File> allFiles = Arrays.asList(filesArray);
-                    paginate(player, allFiles, 8, page,
-                        new RunnableVal3<Integer, File, PlotMessage>() {
-
-                            @Override public void run(Integer i, File file, PlotMessage message) {
-                                String name = file.getName();
-                                message.text("[").color("$3").text(String.valueOf(i)).color("$1")
-                                    .text("]").color("$3").text(' ' + name).color("$1");
-                            }
-                        }, "/plot debugexec list-scripts", "List of scripts");
-                    return true;
-                case "allcmd":
-                    if (args.length < 3) {
-                        C.COMMAND_SYNTAX
-                            .send(player, "/plot debugexec allcmd <condition> <command>");
-                        return false;
-                    }
-                    long start = System.currentTimeMillis();
-                    Command cmd = MainCommand.getInstance().getCommand(args[3]);
-                    String[] params = Arrays.copyOfRange(args, 4, args.length);
-                    if ("true".equals(args[1])) {
-                        Location loc = player.getMeta(PlotPlayer.META_LOCATION);
-                        Plot plot = player.getMeta(PlotPlayer.META_LAST_PLOT);
-                        for (Plot current : PlotSquared.get().getBasePlots()) {
-                            player.setMeta(PlotPlayer.META_LOCATION, current.getBottomAbs());
-                            player.setMeta(PlotPlayer.META_LAST_PLOT, current);
-                            cmd.execute(player, params, null, null);
-                        }
-                        if (loc == null) {
-                            player.deleteMeta(PlotPlayer.META_LOCATION);
-                        } else {
-                            player.setMeta(PlotPlayer.META_LOCATION, loc);
-                        }
-                        if (plot == null) {
-                            player.deleteMeta(PlotPlayer.META_LAST_PLOT);
-                        } else {
-                            player.setMeta(PlotPlayer.META_LAST_PLOT, plot);
-                        }
-                        player.sendMessage("&c> " + (System.currentTimeMillis() - start));
-                        return true;
-                    }
-                    init();
-                    this.scope.put("_2", params);
-                    this.scope.put("_3", cmd);
-                    script =
-                        "_1=PS.getBasePlots().iterator();while(_1.hasNext()){plot=_1.next();if("
-                            + args[1]
-                            + "){PlotPlayer.setMeta(\"location\",plot.getBottomAbs());PlotPlayer.setMeta(\"lastplot\",plot);_3.onCommand"
-                            + "(PlotPlayer,_2)}}";
-
-                    break;
-                case "all":
-                    if (args.length < 3) {
-                        C.COMMAND_SYNTAX.send(player, "/plot debugexec all <condition> <code>");
-                        return false;
-                    }
-                    script =
-                        "_1=PS.getBasePlots().iterator();while(_1.hasNext()){plot=_1.next();if("
-                            + args[1] + "){" + StringMan
-                            .join(Arrays.copyOfRange(args, 2, args.length), " ") + "}}";
-
-                    break;
-                default:
-                    script = StringMan.join(args, " ");
-            }
-            if (!(player instanceof ConsolePlayer)) {
-                MainUtil.sendMessage(player, C.NOT_CONSOLE);
-                return false;
-            }
-            init();
-            this.scope.put("PlotPlayer", player);
-            PlotSquared.debug("> " + script);
-            try {
-                if (async) {
-                    final String toExec = script;
-                    TaskManager.runTaskAsync(() -> {
-                        long start = System.currentTimeMillis();
-                        Object result = null;
-                        try {
-                            result = DebugExec.this.engine.eval(toExec, DebugExec.this.scope);
-                        } catch (ScriptException e) {
-                            e.printStackTrace();
-                        }
-                        PlotSquared
-                            .log("> " + (System.currentTimeMillis() - start) + "ms -> " + result);
-                    });
-                } else {
-                    long start = System.currentTimeMillis();
-                    Object result = this.engine.eval(script, this.scope);
-                    PlotSquared
-                        .log("> " + (System.currentTimeMillis() - start) + "ms -> " + result);
-                }
-                return true;
-            } catch (ScriptException e) {
-                e.printStackTrace();
-                return false;
-            }
-        }
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
deleted file mode 100644
index da1e27e61..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-@CommandDeclaration(command = "debugfixflags", usage = "/plot debugfixflags <world>",
-    permission = "plots.debugfixflags", description = "Attempt to fix all flags for a world",
-    requiredType = RequiredType.CONSOLE, category = CommandCategory.DEBUG)
-public class DebugFixFlags extends SubCommand {
-
-    public DebugFixFlags() {
-        super(Argument.String);
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[0]);
-            return false;
-        }
-        MainUtil.sendMessage(player, "&8--- &6Starting task &8 ---");
-        for (Plot plot : area.getPlots()) {
-            HashMap<Flag<?>, Object> flags = plot.getFlags();
-            Iterator<Entry<Flag<?>, Object>> i = flags.entrySet().iterator();
-            boolean changed = false;
-            while (i.hasNext()) {
-                if (i.next().getKey() == null) {
-                    changed = true;
-                    i.remove();
-                }
-            }
-            if (changed) {
-                DBFunc.setFlags(plot, plot.getFlags());
-            }
-        }
-        MainUtil.sendMessage(player, "&aDone!");
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
deleted file mode 100644
index ddffaf744..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import com.google.common.base.Charsets;
-
-import java.io.File;
-import java.util.UUID;
-
-@CommandDeclaration(command = "debugimportworlds", permission = "plots.admin",
-    description = "Import worlds by player name", requiredType = RequiredType.CONSOLE,
-    category = CommandCategory.TELEPORT) public class DebugImportWorlds extends Command {
-    public DebugImportWorlds() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        // UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8))
-        PlotAreaManager pam = PlotSquared.get().getPlotAreaManager();
-        if (!(pam instanceof SinglePlotAreaManager)) {
-            player.sendMessage("Must be a single plot area!");
-            return;
-        }
-        SinglePlotArea area = ((SinglePlotAreaManager) pam).getArea();
-        PlotId id = new PlotId(0, 0);
-        File container = PlotSquared.imp().getWorldContainer();
-        for (File folder : container.listFiles()) {
-            String name = folder.getName();
-            if (!WorldUtil.IMP.isWorld(name) && PlotId.fromString(name) == null) {
-                UUID uuid = UUIDHandler.getUUID(name, null);
-                if (uuid == null) {
-                    uuid =
-                        UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8));
-                }
-                while (new File(container, id.toCommaSeparatedString()).exists()) {
-                    id = Auto.getNextPlotId(id, 1);
-                }
-                File newDir = new File(container, id.toCommaSeparatedString());
-                if (folder.renameTo(newDir)) {
-                    area.getPlot(id).setOwner(uuid);
-                }
-            }
-        }
-        player.sendMessage("Done!");
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java
deleted file mode 100644
index f12ce8d1e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugLoadTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-@CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest",
-    description = "This debug command will force the reload of all plots in the DB",
-    usage = "/plot debugloadtest", category = CommandCategory.DEBUG,
-    requiredType = RequiredType.CONSOLE) public class DebugLoadTest extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        PlotSquared.get().plots_tmp = DBFunc.getPlots();
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
deleted file mode 100644
index eedba15cf..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.IncendoPaster;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import lombok.NonNull;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-@CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste",
-    description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your latest.log to https://incendo.org",
-    permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste
-    extends SubCommand {
-
-    private static String readFile(@NonNull final File file) throws IOException {
-        final StringBuilder content = new StringBuilder();
-        final List<String> lines = new ArrayList<>();
-        try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
-            content.append(lines.get(i)).append("\n");
-        }
-        return content.toString();
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        TaskManager.runTaskAsync(() -> {
-            try {
-                final IncendoPaster incendoPaster = new IncendoPaster("plotsquared");
-
-                StringBuilder b = new StringBuilder();
-                b.append(
-                    "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
-                        + "problem\n\n");
-                b.append("# Server Information\n");
-                b.append("server.version: ").append(PlotSquared.get().IMP.getServerImplementation())
-                    .append("\n");
-                b.append("online_mode: ").append(UUIDHandler.getUUIDWrapper()).append(';')
-                    .append(!Settings.UUID.OFFLINE).append('\n');
-                b.append("plugins:");
-                for (String id : PlotSquared.get().IMP.getPluginIds()) {
-                    String[] split = id.split(":");
-                    String[] split2 = split[0].split(";");
-                    String enabled = split.length == 2 ? split[1] : "unknown";
-                    String name = split2[0];
-                    String version = split2.length == 2 ? split2[1] : "unknown";
-                    b.append("\n  ").append(name).append(":\n    ").append("version: '")
-                        .append(version).append('\'').append("\n    enabled: ").append(enabled);
-                }
-                b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
-                Runtime runtime = Runtime.getRuntime();
-                b.append("memory.free: ").append(runtime.freeMemory()).append('\n');
-                b.append("memory.max: ").append(runtime.maxMemory()).append('\n');
-                b.append("java.specification.version: '")
-                    .append(System.getProperty("java.specification.version")).append("'\n");
-                b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n");
-                b.append("java.version: '").append(System.getProperty("java.version"))
-                    .append("'\n");
-                b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n");
-                b.append("os.name: '").append(System.getProperty("os.name")).append("'\n");
-                b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n");
-                b.append("# Okay :D Great. You are now ready to create your bug report!");
-                b.append(
-                    "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
-                b.append("\n# or via our Discord at https://discord.gg/ngZCzbU");
-
-                incendoPaster.addFile(new IncendoPaster.PasteFile("information", b.toString()));
-
-                try {
-                    final File logFile =
-                        new File(PlotSquared.get().IMP.getDirectory(), "../../logs/latest.log");
-                    if (Files.size(logFile.toPath()) > 14_000_000) {
-                        throw new IOException("Too big...");
-                    }
-                    incendoPaster
-                        .addFile(new IncendoPaster.PasteFile("latest.log", readFile(logFile)));
-                } catch (IOException ignored) {
-                    MainUtil
-                        .sendMessage(player, "&clatest.log is too big to be pasted, will ignore");
-                }
-
-                try {
-                    incendoPaster.addFile(new IncendoPaster.PasteFile("settings.yml",
-                        readFile(PlotSquared.get().configFile)));
-                } catch (final IllegalArgumentException ignored) {
-                    MainUtil.sendMessage(player, "&cSkipping settings.yml because it's empty");
-                }
-                try {
-                    incendoPaster.addFile(new IncendoPaster.PasteFile("worlds.yml",
-                        readFile(PlotSquared.get().worldsFile)));
-                } catch (final IllegalArgumentException ignored) {
-                    MainUtil.sendMessage(player, "&cSkipping worlds.yml because it's empty");
-                }
-                try {
-                    incendoPaster.addFile(new IncendoPaster.PasteFile("PlotSquared.use_THIS.yml",
-                        readFile(PlotSquared.get().translationFile)));
-                } catch (final IllegalArgumentException ignored) {
-                    MainUtil.sendMessage(player,
-                        "&cSkipping PlotSquared.use_THIS.yml because it's empty");
-                }
-
-                try {
-                    final String rawResponse = incendoPaster.upload();
-                    final JsonObject jsonObject =
-                        new JsonParser().parse(rawResponse).getAsJsonObject();
-
-                    if (jsonObject.has("created")) {
-                        final String pasteId = jsonObject.get("paste_id").getAsString();
-                        final String link =
-                            String.format("https://incendo.org/paste/view/%s", pasteId);
-                        player.sendMessage(C.DEBUG_REPORT_CREATED.s().replace("%url%", link));
-                    } else {
-                        final String responseMessage = jsonObject.get("response").getAsString();
-                        MainUtil.sendMessage(player, String
-                            .format("&cFailed to create the debug paste: %s", responseMessage));
-                    }
-                } catch (final Throwable throwable) {
-                    throwable.printStackTrace();
-                    MainUtil.sendMessage(player,
-                        "&cFailed to create the debug paste: " + throwable.getMessage());
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
deleted file mode 100644
index 84489e88b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-@CommandDeclaration(command = "debugroadregen", usage = "/plot debugroadregen",
-    requiredType = RequiredType.NONE,
-    description = "Regenerate all roads based on the road schematic",
-    category = CommandCategory.DEBUG, permission = "plots.debugroadregen")
-public class DebugRoadRegen extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        PlotArea plotArea = loc.getPlotArea();
-        if (!(plotArea instanceof HybridPlotWorld)) {
-            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
-        Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            C.NOT_IN_PLOT.send(player);
-        } else if (plot.isMerged()) {
-            C.REQUIRES_UNMERGED.send(player);
-        } else {
-            HybridPlotManager manager = (HybridPlotManager) plotArea.getPlotManager();
-            manager.createRoadEast(plotArea, plot);
-            manager.createRoadSouth(plotArea, plot);
-            manager.createRoadSouthEast(plotArea, plot);
-            MainUtil.sendMessage(player, "&6Regenerating plot south/east roads: " + plot.getId()
-                + "\n&6 - Result: &aSuccess");
-            MainUtil.sendMessage(player, "&cTo regenerate all roads: /plot regenallroads");
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
deleted file mode 100644
index fbbc3267c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-import java.util.ArrayList;
-
-@CommandDeclaration(command = "debugsavetest", permission = "plots.debugsavetest",
-    category = CommandCategory.DEBUG, requiredType = RequiredType.CONSOLE,
-    usage = "/plot debugsavetest",
-    description = "This command will force the recreation of all plots in the DB")
-public class DebugSaveTest extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        ArrayList<Plot> plots = new ArrayList<Plot>();
-        plots.addAll(PlotSquared.get().getPlots());
-        MainUtil.sendMessage(player, "&6Starting `DEBUGSAVETEST`");
-        DBFunc.createPlotsAndData(plots, new Runnable() {
-            @Override public void run() {
-                MainUtil.sendMessage(player, "&6Database sync finished!");
-            }
-        });
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
deleted file mode 100644
index b399f5752..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-
-@CommandDeclaration(command = "delete", permission = "plots.delete",
-    description = "Delete the plot you stand on", usage = "/plot delete",
-    aliases = {"dispose", "del"}, category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE, confirmation = true) public class Delete extends SubCommand {
-
-    // Note: To delete a specific plot use /plot <plot> delete
-    // The syntax also works with any command: /plot <plot> <command>
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        final Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            return !sendMessage(player, C.PLOT_UNOWNED);
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DELETE)) {
-            return !sendMessage(player, C.NO_PLOT_PERMS);
-        }
-        final PlotArea plotArea = plot.getArea();
-        final java.util.Set<Plot> plots = plot.getConnectedPlots();
-        final int currentPlots =
-            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(loc.getWorld());
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (plot.getRunning() > 0) {
-                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-                    return;
-                }
-                final long start = System.currentTimeMillis();
-                boolean result = plot.deletePlot(new Runnable() {
-                    @Override public void run() {
-                        plot.removeRunning();
-                        if ((EconHandler.manager != null) && plotArea.USE_ECONOMY) {
-                            Expression<Double> valueExr = plotArea.PRICES.get("sell");
-                            double value = plots.size() * valueExr.evaluate((double) currentPlots);
-                            if (value > 0d) {
-                                EconHandler.manager.depositMoney(player, value);
-                                sendMessage(player, C.ADDED_BALANCE, String.valueOf(value));
-                            }
-                        }
-                        MainUtil.sendMessage(player, C.DELETING_DONE,
-                            System.currentTimeMillis() - start);
-                    }
-                });
-                if (result) {
-                    plot.addRunning();
-                } else {
-                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-                }
-            }
-        };
-        if (hasConfirmation(player)) {
-            CmdConfirm.addPending(player, getCommandString() + ' ' + plot.getId(), run);
-        } else {
-            TaskManager.runTask(run);
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
deleted file mode 100644
index e586f0656..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "deny", aliases = {"d", "ban"},
-    description = "Deny a user from a plot", usage = "/plot deny <player>",
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Deny
-    extends SubCommand {
-
-    public Deny() {
-        super(Argument.PlayerName);
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DENY)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return true;
-        }
-        Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-        if (uuids.isEmpty()) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
-            return false;
-        }
-        Iterator<UUID> iter = uuids.iterator();
-        while (iter.hasNext()) {
-            UUID uuid = iter.next();
-            if (uuid == DBFunc.EVERYONE && !(
-                Permissions.hasPermission(player, C.PERMISSION_DENY_EVERYONE) || Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DENY))) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
-                continue;
-            }
-            if (plot.isOwner(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
-                return false;
-            }
-
-            if (plot.getDenied().contains(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
-                return false;
-            }
-            if (uuid != DBFunc.EVERYONE) {
-                plot.removeMember(uuid);
-                plot.removeTrusted(uuid);
-            }
-            plot.addDenied(uuid);
-            EventUtil.manager.callDenied(player, plot, uuid, true);
-            if (!uuid.equals(DBFunc.EVERYONE)) {
-                handleKick(UUIDHandler.getPlayer(uuid), plot);
-            } else {
-                for (PlotPlayer plotPlayer : plot.getPlayersInPlot()) {
-                    handleKick(plotPlayer, plot);
-                }
-            }
-        }
-        if (!uuids.isEmpty()) {
-            MainUtil.sendMessage(player, C.DENIED_ADDED);
-        }
-        return true;
-    }
-
-    private void handleKick(PlotPlayer player, Plot plot) {
-        if (player == null) {
-            return;
-        }
-        if (!plot.equals(player.getCurrentPlot())) {
-            return;
-        }
-        if (player.hasPermission("plots.admin.entry.denied")) {
-            return;
-        }
-        if (player.getGameMode() == PlotGameMode.SPECTATOR) {
-            player.stopSpectating();
-        }
-        Location loc = player.getLocation();
-        Location spawn = WorldUtil.IMP.getSpawn(loc.getWorld());
-        MainUtil.sendMessage(player, C.YOU_GOT_DENIED);
-        if (plot.equals(spawn.getPlot())) {
-            Location newSpawn =
-                WorldUtil.IMP.getSpawn(PlotSquared.get().getPlotAreaManager().getAllWorlds()[0]);
-            if (plot.equals(newSpawn.getPlot())) {
-                // Kick from server if you can't be teleported to spawn
-                player.kick(C.YOU_GOT_DENIED.s());
-            } else {
-                player.teleport(newSpawn);
-            }
-        } else {
-            player.teleport(spawn);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
deleted file mode 100644
index 687eef002..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-@CommandDeclaration(command = "setdescription", permission = "plots.set.desc",
-    description = "Set the plot description", usage = "/plot desc <description>",
-    aliases = {"desc", "setdesc", "setd", "description"}, category = CommandCategory.SETTINGS,
-    requiredType = RequiredType.NONE) public class Desc extends SetCommand {
-
-    @Override public boolean set(PlotPlayer player, Plot plot, String desc) {
-        if (desc.isEmpty()) {
-            plot.removeFlag(Flags.DESCRIPTION);
-            MainUtil.sendMessage(player, C.DESC_UNSET);
-            return true;
-        }
-        boolean result = FlagManager.addPlotFlag(plot, Flags.DESCRIPTION, desc);
-        if (!result) {
-            MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
-            return false;
-        }
-        MainUtil.sendMessage(player, C.DESC_SET);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
deleted file mode 100644
index a37c187cc..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
-
-@CommandDeclaration(command = "done", aliases = {"submit"}, description = "Mark a plot as done",
-    permission = "plots.done", category = CommandCategory.SETTINGS,
-    requiredType = RequiredType.NONE) public class Done extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        final Plot plot = loc.getPlotAbs();
-        if ((plot == null) || !plot.hasOwner()) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DONE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (plot.hasFlag(Flags.DONE)) {
-            MainUtil.sendMessage(player, C.DONE_ALREADY_DONE);
-            return false;
-        }
-        if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-            return false;
-        }
-        plot.addRunning();
-        MainUtil.sendMessage(player, C.GENERATING_LINK);
-        final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
-        if (ExpireManager.IMP == null || doneRequirements == null) {
-            finish(plot, player, true);
-            plot.removeRunning();
-        } else {
-            HybridUtils.manager.analyzePlot(plot, new RunnableVal<PlotAnalysis>() {
-                @Override public void run(PlotAnalysis value) {
-                    plot.removeRunning();
-                    boolean result =
-                        value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
-                    finish(plot, player, result);
-                }
-            });
-        }
-        return true;
-    }
-
-    private void finish(Plot plot, PlotPlayer pp, boolean success) {
-        if (success) {
-            long flagValue = System.currentTimeMillis() / 1000;
-            plot.setFlag(Flags.DONE, flagValue);
-            MainUtil.sendMessage(pp, C.DONE_SUCCESS);
-        } else {
-            MainUtil.sendMessage(pp, C.DONE_INSUFFICIENT_COMPLEXITY);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
deleted file mode 100644
index 7dd7b7acd..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.sk89q.jnbt.CompoundTag;
-
-import java.net.URL;
-
-@CommandDeclaration(usage = "/plot download [schematic|world]", command = "download",
-    aliases = {"dl"}, category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE,
-    description = "Download your plot", permission = "plots.download") public class Download
-    extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        String world = player.getLocation().getWorld();
-        if (!PlotSquared.get().hasPlotArea(world)) {
-            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
-        final Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && (!plot.getFlag(Flags.DONE).isPresent()))
-            && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) {
-            MainUtil.sendMessage(player, C.DONE_NOT_DONE);
-            return false;
-        }
-        if ((!plot.isOwner(player.getUUID())) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-            return false;
-        }
-        if (args.length == 0 || (args.length == 1 && StringMan
-            .isEqualIgnoreCaseToAny(args[0], "sch", "schem", "schematic"))) {
-            if (plot.getVolume() > Integer.MAX_VALUE) {
-                C.SCHEMATIC_TOO_LARGE.send(player);
-                return false;
-            }
-            plot.addRunning();
-            SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
-                @Override public void run(CompoundTag value) {
-                    plot.removeRunning();
-                    SchematicHandler.manager.upload(value, null, null, new RunnableVal<URL>() {
-                        @Override public void run(URL url) {
-                            if (url == null) {
-                                MainUtil.sendMessage(player, C.GENERATING_LINK_FAILED);
-                                return;
-                            }
-                            MainUtil.sendMessage(player, url.toString());
-                        }
-                    });
-                }
-            });
-        } else if (args.length == 1 && StringMan
-            .isEqualIgnoreCaseToAny(args[0], "mcr", "world", "mca")) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_DOWNLOAD_WORLD)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_DOWNLOAD_WORLD);
-                return false;
-            }
-            MainUtil.sendMessage(player, "&cNote: The `.mca` files are 512x512");
-            plot.addRunning();
-            WorldUtil.IMP.saveWorld(world);
-            WorldUtil.IMP.upload(plot, null, null, new RunnableVal<URL>() {
-                @Override public void run(URL url) {
-                    plot.removeRunning();
-                    if (url == null) {
-                        MainUtil.sendMessage(player, C.GENERATING_LINK_FAILED);
-                        return;
-                    }
-                    MainUtil.sendMessage(player, url.toString());
-                }
-            });
-        } else {
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        MainUtil.sendMessage(player, C.GENERATING_LINK);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
deleted file mode 100644
index 9d0435c07..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.*;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.util.*;
-
-@CommandDeclaration(command = "setflag", aliases = {"f", "flag", "setf", "setflag"},
-    usage = "/plot flag <set|remove|add|list|info> <flag> <value>", description = "Set plot flags",
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE,
-    permission = "plots.flag") public class FlagCmd extends SubCommand {
-
-    private boolean checkPermValue(PlotPlayer player, Flag flag, String key, String value) {
-        key = key.toLowerCase();
-        value = value.toLowerCase();
-        String perm = C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase());
-        if (flag instanceof IntegerFlag && MathMan.isInteger(value)) {
-            try {
-                int numeric = Integer.parseInt(value);
-                perm = perm.substring(0, perm.length() - value.length() - 1);
-                if (numeric > 0) {
-                    int checkRange = PlotSquared.get().getPlatform().equalsIgnoreCase("bukkit") ?
-                        numeric :
-                        Settings.Limit.MAX_PLOTS;
-                    final boolean result = player.hasPermissionRange(perm, checkRange) >= numeric;
-                    if (!result) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_SET_FLAG_KEY_VALUE
-                                .f(key.toLowerCase(), value.toLowerCase()));
-                    }
-                    return result;
-                }
-
-            } catch (NumberFormatException ignore) {
-            }
-        } else if (flag instanceof PlotBlockListFlag) {
-            final PlotBlockListFlag blockListFlag = (PlotBlockListFlag) flag;
-            final HashSet<PlotBlock> parsedBlocks = blockListFlag.parseValue(value);
-            for (final PlotBlock block : parsedBlocks) {
-                final String permission = C.PERMISSION_SET_FLAG_KEY_VALUE
-                    .f(key.toLowerCase(), block.getRawId().toString().toLowerCase());
-                final boolean result = Permissions.hasPermission(player, permission);
-                if (!result) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
-                    return false;
-                }
-            }
-            return true;
-        }
-        final boolean result = Permissions.hasPermission(player, perm);
-        if (!result) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION,
-                C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
-        }
-        return result;
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-
-        /*
-         *  plot flag set fly true
-         *  plot flag remove fly
-         *  plot flag remove use 1,3
-         *  plot flag add use 2,4
-         *  plot flag list
-         */
-        if (args.length == 0) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
-            return false;
-        }
-        Location loc = player.getLocation();
-        Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
-            return false;
-        }
-        if (!plot.hasOwner()) {
-            sendMessage(player, C.PLOT_NOT_CLAIMED);
-            return false;
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_SET_FLAG_OTHER)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_OTHER);
-            return false;
-        }
-        Flag<?> flag = null;
-        if (args.length > 1) {
-            flag = FlagManager.getFlag(args[1]);
-            if (flag == null || flag.isReserved()) {
-                boolean suggested = false;
-                try {
-                    StringComparison<Flag<?>> stringComparison =
-                        new StringComparison<>(args[1], Flags.getFlags());
-                    String best = stringComparison.getBestMatch();
-                    if (best != null) {
-                        MainUtil.sendMessage(player, C.NOT_VALID_FLAG_SUGGESTED, best);
-                        suggested = true;
-                    }
-                } catch (final Exception ignored) { /* Happens sometimes because of mean code */ }
-                if (!suggested) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
-                }
-                return false;
-            }
-        }
-        switch (args[0].toLowerCase()) {
-            case "info": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SET_FLAG)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.info");
-                    return false;
-                }
-                if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
-                    return false;
-                }
-                // flag key
-                MainUtil.sendMessage(player, C.FLAG_KEY, flag.getName());
-                // flag type
-                MainUtil.sendMessage(player, C.FLAG_TYPE, flag.getClass().getSimpleName());
-                // Flag type description
-                MainUtil.sendMessage(player, C.FLAG_DESC, flag.getValueDescription());
-                return true;
-            }
-            case "set": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SET_FLAG)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG);
-                    return false;
-                }
-                if (args.length < 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag set <flag> <value>");
-                    return false;
-                }
-                String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                if (!checkPermValue(player, flag, args[1], value)) {
-                    return false;
-                }
-                Object parsed = flag.parseValue(value);
-                if (parsed == null) {
-                    MainUtil.sendMessage(player, "&c" + flag.getValueDescription());
-                    return false;
-                }
-                boolean result = plot.setFlag(flag, parsed);
-                if (!result) {
-                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
-                    return false;
-                }
-                MainUtil.sendMessage(player, C.FLAG_ADDED);
-                return true;
-            }
-            case "remove": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_REMOVE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_REMOVE);
-                    return false;
-                }
-                if (args.length != 2 && args.length != 3) {
-                    MainUtil
-                        .sendMessage(player, C.COMMAND_SYNTAX, "/plot flag remove <flag> [values]");
-                    return false;
-                }
-                if (!Permissions
-                    .hasPermission(player, C.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()))) {
-                    if (args.length != 3) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()));
-                        return false;
-                    }
-                    for (String entry : args[2].split(",")) {
-                        if (!checkPermValue(player, flag, args[1], entry)) {
-                            return false;
-                        }
-                    }
-                }
-                if (args.length == 3 && flag instanceof ListFlag) {
-                    String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                    Optional<? extends Collection> flag1 =
-                        plot.getFlag((Flag<? extends Collection<?>>) flag);
-                    if (flag1.isPresent()) {
-                        boolean o = flag1.get().removeAll((Collection) flag.parseValue(value));
-                        if (o) {
-                            if (flag1.get().isEmpty()) {
-                                final boolean result = plot.removeFlag(flag);
-                                if (result) {
-                                    MainUtil.sendMessage(player, C.FLAG_REMOVED);
-                                } else {
-                                    MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
-                                }
-                                return true;
-                            } else {
-                                MainUtil.sendMessage(player, C.FLAG_REMOVED);
-                            }
-                        } else {
-                            MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
-                            return false;
-                        }
-                    }
-                    DBFunc.setFlags(plot, plot.getFlags());
-                    return true;
-                } else {
-                    boolean result = plot.removeFlag(flag);
-                    if (!result) {
-                        MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
-                        return false;
-                    }
-                }
-                if (flag == Flags.TIME) {
-                    player.setTime(Long.MAX_VALUE);
-                } else if (flag == Flags.WEATHER) {
-                    player.setWeather(PlotWeather.RESET);
-                }
-                MainUtil.sendMessage(player, C.FLAG_REMOVED);
-                return true;
-            }
-            case "add":
-                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_ADD)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_ADD);
-                    return false;
-                }
-                if (args.length < 3) {
-                    MainUtil
-                        .sendMessage(player, C.COMMAND_SYNTAX, "/plot flag add <flag> <values>");
-                    return false;
-                }
-                for (String entry : args[2].split(",")) {
-                    if (!checkPermValue(player, flag, args[1], entry)) {
-                        return false;
-                    }
-                }
-                String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
-                Object parsed = flag.parseValue(value);
-                if (parsed == null) {
-                    MainUtil.sendMessage(player, "&c" + flag.getValueDescription());
-                    return false;
-                }
-                Object val = parsed;
-                if (flag instanceof ListFlag) {
-                    Optional<? extends Collection> flag1 =
-                        plot.getFlag((Flag<? extends Collection<?>>) flag);
-                    if (flag1.isPresent()) {
-                        boolean o = flag1.get().addAll((Collection) parsed);
-                        if (o) {
-                            MainUtil.sendMessage(player, C.FLAG_ADDED);
-                            val = flag1.get();
-                        } else {
-                            MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
-                            return false;
-                        }
-                    }
-                }
-                boolean result = plot.setFlag(flag, val);
-                if (!result) {
-                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
-                    return false;
-                }
-                MainUtil.sendMessage(player, C.FLAG_ADDED);
-                return true;
-            case "list":
-                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_LIST)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_LIST);
-                    return false;
-                }
-                if (args.length > 1) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
-                    return false;
-                }
-                HashMap<String, ArrayList<String>> flags = new HashMap<>();
-                for (Flag<?> flag1 : Flags.getFlags()) {
-                    String type = flag1.getClass().getSimpleName();
-                    if (!flags.containsKey(type)) {
-                        flags.put(type, new ArrayList<>());
-                    }
-                    flags.get(type).add(flag1.getName());
-                }
-                StringBuilder message = new StringBuilder();
-                String prefix = "";
-                for (Map.Entry<String, ArrayList<String>> entry : flags.entrySet()) {
-                    String category = entry.getKey();
-                    List<String> flagNames = entry.getValue();
-                    Collections.sort(flagNames);
-                    message.append(prefix).append("&6").append(category).append(": &7")
-                        .append(StringMan.join(flagNames, ", "));
-                    prefix = "\n";
-                }
-                MainUtil.sendMessage(player, message.toString());
-                return true;
-        }
-        MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
deleted file mode 100644
index 5a69479b5..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class GenerateDocs {
-
-    public static void main(String[] args) {
-        new WE_Anywhere();
-        List<Command> commands = MainCommand.getInstance().getCommands();
-        GenerateDocs.log("### Want to document some commands?");
-        GenerateDocs.log(" - This page is automatically generated");
-        GenerateDocs
-            .log(" - Fork the project and add a javadoc comment to one of the command classes");
-        GenerateDocs.log(" - Then do a pull request and it will be added to this page");
-        GenerateDocs.log("");
-        GenerateDocs.log("# Contents");
-        for (CommandCategory category : CommandCategory.values()) {
-            GenerateDocs.log("###### " + category.name());
-            for (Command command : MainCommand.getInstance().getCommands(category, null)) {
-                GenerateDocs.log(" - [/plot " + command.getId()
-                    + "](https://github.com/IntellectualSites/PlotSquared/wiki/Commands#" + command
-                    .getId() + ")    ");
-            }
-            GenerateDocs.log("");
-        }
-        GenerateDocs.log("# Commands");
-        for (Command command : commands) {
-            GenerateDocs.printCommand(command);
-        }
-    }
-
-    public static void printCommand(Command command) {
-        try {
-            String clazz = command.getClass().getSimpleName();
-            String name = command.getId();
-
-            // Header
-            String source =
-                "https://github.com/IntellectualSites/PlotSquared/tree/master/Core/src/main/java/com/intellectualcrafters/plot/commands/"
-                    + clazz + ".java";
-            GenerateDocs.log("## [" + name.toUpperCase() + "](" + source + ")    ");
-
-            File file = new File(
-                "Core/src/main/java/com/intellectualcrafters/plot/commands/" + clazz + ".java");
-            List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
-            List<String> perms = GenerateDocs.getPerms(name, lines);
-            List<String> usages = GenerateDocs.getUsage(name, lines);
-            String comment = GenerateDocs.getComments(lines);
-
-            GenerateDocs.log("#### Description");
-            GenerateDocs.log('`' + command.getDescription() + '`');
-            if (!comment.isEmpty()) {
-                GenerateDocs.log("##### Comments");
-                GenerateDocs.log("``` java");
-                GenerateDocs.log(comment);
-                GenerateDocs.log("```");
-            }
-
-            GenerateDocs.log("#### Usage    ");
-            String mainUsage = command.getUsage().replaceAll("\\{label\\}", "plot");
-            if (!usages.isEmpty() && !usages.get(0).equalsIgnoreCase(mainUsage)) {
-                GenerateDocs.log("##### Primary    ");
-                GenerateDocs.log(" - `" + mainUsage + "`    ");
-                GenerateDocs.log("");
-                GenerateDocs.log("##### Other    ");
-                GenerateDocs.log(" - `" + StringMan.join(usages, "`\n - `") + "`    ");
-                GenerateDocs.log("");
-            } else {
-                GenerateDocs.log('`' + mainUsage + "`    ");
-            }
-
-            if (command.getRequiredType() != RequiredType.NONE) {
-                GenerateDocs.log("#### Required callers");
-                GenerateDocs.log('`' + command.getRequiredType().name() + '`');
-            }
-
-            List<String> aliases = command.getAliases();
-            if (!aliases.isEmpty()) {
-                GenerateDocs.log("#### Aliases");
-                GenerateDocs.log('`' + StringMan.getString(command.getAliases()) + '`');
-            }
-
-            GenerateDocs.log("#### Permissions");
-            if (!perms.isEmpty()) {
-                GenerateDocs.log("##### Primary");
-                GenerateDocs.log(" - `" + command.getPermission() + "`    ");
-                GenerateDocs.log("");
-                GenerateDocs.log("##### Other");
-                GenerateDocs.log(" - `" + StringMan.join(perms, "`\n - `") + '`');
-                GenerateDocs.log("");
-            } else {
-                GenerateDocs.log('`' + command.getPermission() + "`    ");
-            }
-            GenerateDocs.log("***");
-            GenerateDocs.log("");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static List<String> getUsage(String cmd, List<String> lines) {
-        Pattern p = Pattern.compile("\"([^\"]*)\"");
-        HashSet<String> usages = new HashSet<>();
-        for (String line : lines) {
-            if (line.contains("COMMAND_SYNTAX") && !line.contains("getUsage()")) {
-                Matcher m = p.matcher(line);
-                String prefix = "";
-                StringBuilder usage = new StringBuilder();
-                while (m.find()) {
-                    String match = m.group(1);
-                    usage.append(prefix).append(match);
-                    prefix = " <arg> ";
-                }
-                if (usage.length() != 0) {
-                    usages.add(usage.toString().trim().replaceAll("  ", " ")
-                        .replaceAll("\\{label\\}", "plot"));
-                }
-            }
-        }
-        return new ArrayList<>(usages);
-    }
-
-    public static List<String> getPerms(String cmd, List<String> lines) {
-        HashSet<String> perms = new HashSet<>();
-        Pattern p = Pattern.compile("\"([^\"]*)\"");
-        Pattern p2 = Pattern.compile("C.PERMISSION_\\s*(\\w+)");
-        String last = null;
-        for (String line : lines) {
-
-            Matcher m2 = p2.matcher(line);
-            while (m2.find()) {
-                perms.add(C.valueOf("PERMISSION_" + m2.group(1)).s());
-            }
-            if (line.contains("Permissions.hasPermission(")) {
-                String[] split = line.split("Permissions.hasPermission");
-                split = Arrays.copyOfRange(split, 1, split.length);
-                for (String method : split) {
-                    String perm = method.split("[,|)]")[1].trim();
-                    if (!perm.equalsIgnoreCase(perm)) {
-                        if (perm.startsWith("C.")) {
-                            perm = C.valueOf(perm.split("\\.")[1]).s();
-                        } else {
-                            continue;
-                        }
-                    } else {
-                        perm = perm.substring(1, perm.length() - 1);
-                    }
-                    perms.add(perm);
-                }
-                Matcher m = p.matcher(line);
-                while (m.find()) {
-                    String perm = m.group(1);
-                    if (perm.endsWith(".")) {
-                        perm += "<arg>";
-                    }
-                    if (perm.startsWith(".")) {
-                        perms.remove(last);
-                        perms.add(last + perm);
-                    } else if (perm.contains(".")) {
-                        last = perm;
-                        perms.add(perm);
-                    }
-                }
-            } else if (line.contains("Permissions.hasPermissionRange")) {
-                String[] split = line.split("Permissions.hasPermissionRange");
-                split = Arrays.copyOfRange(split, 1, split.length);
-                for (String method : split) {
-                    String perm = method.split("[,|)]")[1].trim();
-                    if (!perm.equalsIgnoreCase(perm)) {
-                        if (perm.startsWith("C.")) {
-                            perm = C.valueOf(perm.split("\\.")[1]).s();
-                        } else {
-                            continue;
-                        }
-                    } else {
-                        perm = perm.substring(1, perm.length() - 1);
-                    }
-                    perms.add(perm + ".<#>");
-                }
-            }
-        }
-        switch (cmd.toLowerCase()) {
-            case "auto":
-            case "claim":
-                perms.add("plots.plot.<#>");
-                break;
-        }
-        return new ArrayList<>(perms);
-    }
-
-    public static String getComments(List<String> lines) {
-        StringBuilder result = new StringBuilder();
-        for (String line : lines) {
-            line = line.trim();
-            if (line.startsWith("/** ") || line.startsWith("*/ ") || line.startsWith("* ")) {
-                line =
-                    line.replaceAll("/[*][*] ", "").replaceAll("[*]/ ", "").replaceAll("[*] ", "")
-                        .trim();
-                result.append(line + '\n');
-            }
-        }
-        return result.toString().trim();
-    }
-
-    public static void log(String s) {
-        System.out.println(s);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
deleted file mode 100644
index d29bd76bb..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.UUID;
-
-@CommandDeclaration(command = "grant", category = CommandCategory.CLAIMING,
-    usage = "/plot grant <check|add> [player]", permission = "plots.grant",
-    requiredType = RequiredType.NONE) public class Grant extends Command {
-
-    public Grant() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        checkTrue(args.length >= 1 && args.length <= 2, C.COMMAND_SYNTAX, getUsage());
-        final String arg0 = args[0].toLowerCase();
-        switch (arg0) {
-            case "add":
-            case "check":
-                if (!Permissions.hasPermission(player, C.PERMISSION_GRANT.f(arg0))) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_GRANT.f(arg0));
-                    return;
-                }
-                if (args.length > 2) {
-                    break;
-                }
-                final UUID uuid =
-                    args.length == 2 ? UUIDHandler.getUUIDFromString(args[1]) : player.getUUID();
-                if (uuid == null) {
-                    C.INVALID_PLAYER.send(player, args[1]);
-                    return;
-                }
-                MainUtil.getPersistentMeta(uuid, "grantedPlots", new RunnableVal<byte[]>() {
-                    @Override public void run(byte[] array) {
-                        if (arg0.equals("check")) { // check
-                            int granted =
-                                array == null ? 0 : ByteArrayUtilities.bytesToInteger(array);
-                            C.GRANTED_PLOTS.send(player, granted);
-                        } else { // add
-                            int amount =
-                                1 + (array == null ? 0 : ByteArrayUtilities.bytesToInteger(array));
-                            boolean replace = array != null;
-                            String key = "grantedPlots";
-                            byte[] rawData = ByteArrayUtilities.integerToBytes(amount);
-                            PlotPlayer online = UUIDHandler.getPlayer(uuid);
-                            if (online != null) {
-                                online.setPersistentMeta(key, rawData);
-                            } else {
-                                DBFunc.addPersistentMeta(uuid, key, rawData, replace);
-                            }
-                        }
-                    }
-                });
-        }
-        C.COMMAND_SYNTAX.send(player, getUsage());
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
deleted file mode 100644
index ff697953c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.helpmenu.HelpMenu;
-
-@CommandDeclaration(command = "help", description = "Get this help menu", aliases = {"he", "?"},
-    category = CommandCategory.INFO, usage = "help [category|#]", permission = "plots.use")
-public class Help extends Command {
-    public Help(Command parent) {
-        super(parent, true);
-    }
-
-    @Override public boolean canExecute(PlotPlayer player, boolean message) {
-        return true;
-    }
-
-    @Override public void execute(PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        switch (args.length) {
-            case 0:
-                displayHelp(player, null, 0);
-                return;
-            case 1:
-                if (MathMan.isInteger(args[0])) {
-                    try {
-                        displayHelp(player, null, Integer.parseInt(args[0]));
-                    } catch (NumberFormatException ignored) {
-                        displayHelp(player, null, 1);
-                    }
-                } else {
-                    displayHelp(player, args[0], 1);
-                }
-                return;
-            case 2:
-                if (MathMan.isInteger(args[1])) {
-                    try {
-                        displayHelp(player, args[0], Integer.parseInt(args[1]));
-                    } catch (NumberFormatException ignored) {
-                        displayHelp(player, args[0], 1);
-                    }
-                }
-                return;
-            default:
-                C.COMMAND_SYNTAX.send(player, getUsage());
-        }
-    }
-
-    public void displayHelp(PlotPlayer player, String cat, int page) {
-        CommandCategory catEnum = null;
-        if (cat != null) {
-            if (!StringMan.isEqualIgnoreCase(cat, "all")) {
-                for (CommandCategory c : CommandCategory.values()) {
-                    if (StringMan.isEqualIgnoreCaseToAny(cat, c.name(), c.toString())) {
-                        catEnum = c;
-                        cat = c.name();
-                        break;
-                    }
-                }
-                if (catEnum == null) {
-                    cat = null;
-                }
-            }
-        }
-        if (cat == null && page == 0) {
-            StringBuilder builder = new StringBuilder();
-            builder.append(C.HELP_HEADER.s());
-            for (CommandCategory c : CommandCategory.values()) {
-                builder.append("\n" + StringMan
-                    .replaceAll(C.HELP_INFO_ITEM.s(), "%category%", c.toString().toLowerCase(),
-                        "%category_desc%", c.toString()));
-            }
-            builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
-                .replaceAll("%category_desc%", "Display all commands"));
-            builder.append("\n" + C.HELP_FOOTER.s());
-            MainUtil.sendMessage(player, builder.toString(), false);
-            return;
-        }
-        page--;
-        new HelpMenu(player).setCategory(catEnum).getCommands().generateMaxPages()
-            .generatePage(page, getParent().toString()).render();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
deleted file mode 100644
index 908e35afc..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-import com.github.intellectualsites.plotsquared.plot.util.CommentManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-@CommandDeclaration(command = "inbox", description = "Review the comments for a plot",
-    usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox",
-    category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Inbox
-    extends SubCommand {
-
-    public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
-        if (oldComments == null || oldComments.isEmpty()) {
-            MainUtil.sendMessage(player, C.INBOX_EMPTY);
-            return;
-        }
-        PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
-        if (page < 0) {
-            page = 0;
-        }
-        // Get the total pages
-        // int totalPages = ((int) Math.ceil(12 *
-        int totalPages = (int) Math.ceil(comments.length / 12);
-        if (page > totalPages) {
-            page = totalPages;
-        }
-        // Only display 12 per page
-        int max = page * 12 + 12;
-        if (max > comments.length) {
-            max = comments.length;
-        }
-        StringBuilder string = new StringBuilder();
-        string.append(StringMan
-            .replaceAll(C.COMMENT_LIST_HEADER_PAGED.s(), "%amount%", comments.length, "%cur",
-                page + 1, "%max", totalPages + 1, "%word", "all") + '\n');
-
-        // This might work xD
-        for (int x = page * 12; x < max; x++) {
-            PlotComment comment = comments[x];
-            String color;
-            if (player.getName().equals(comment.senderName)) {
-                color = "&a";
-            } else {
-                color = "&7";
-            }
-            string.append("&8[&7#").append(x + 1).append("&8][&7").append(comment.world).append(';')
-                .append(comment.id).append("&8][&6").append(comment.senderName).append("&8]")
-                .append(color).append(comment.comment).append('\n');
-        }
-        MainUtil.sendMessage(player, string.toString());
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        final Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            sendMessage(player, C.NOT_IN_PLOT);
-            return false;
-        }
-        if (!plot.hasOwner()) {
-            sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        if (args.length == 0) {
-            sendMessage(player, C.COMMAND_SYNTAX,
-                "/plot inbox [inbox] [delete <index>|clear|page]");
-            for (final CommentInbox inbox : CommentManager.inboxes.values()) {
-                if (inbox.canRead(plot, player)) {
-                    if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-                        @Override public void run(List<PlotComment> value) {
-                            if (value != null) {
-                                int total = 0;
-                                int unread = 0;
-                                for (PlotComment comment : value) {
-                                    total++;
-                                    if (comment.timestamp > CommentManager
-                                        .getTimestamp(player, inbox.toString())) {
-                                        unread++;
-                                    }
-                                }
-                                if (total != 0) {
-                                    String color;
-                                    if (unread > 0) {
-                                        color = "&c";
-                                    } else {
-                                        color = "";
-                                    }
-                                    sendMessage(player, C.INBOX_ITEM,
-                                        color + inbox.toString() + " (" + total + '/' + unread
-                                            + ')');
-                                    return;
-                                }
-                            }
-                            sendMessage(player, C.INBOX_ITEM, inbox.toString());
-                        }
-                    })) {
-                        sendMessage(player, C.INBOX_ITEM, inbox.toString());
-                    }
-                }
-            }
-            return false;
-        }
-        final CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
-        if (inbox == null) {
-            sendMessage(player, C.INVALID_INBOX,
-                StringMan.join(CommentManager.inboxes.keySet(), ", "));
-            return false;
-        }
-        player.setMeta("inbox:" + inbox.toString(), System.currentTimeMillis());
-        final int page;
-        if (args.length > 1) {
-            switch (args[1].toLowerCase()) {
-                case "delete":
-                    if (!inbox.canModify(plot, player)) {
-                        sendMessage(player, C.NO_PERM_INBOX_MODIFY);
-                        return false;
-                    }
-                    if (args.length != 3) {
-                        sendMessage(player, C.COMMAND_SYNTAX,
-                            "/plot inbox " + inbox.toString() + " delete <index>");
-                    }
-                    final int index;
-                    try {
-                        index = Integer.parseInt(args[2]);
-                        if (index < 1) {
-                            sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
-                            return false;
-                        }
-                    } catch (NumberFormatException ignored) {
-                        sendMessage(player, C.COMMAND_SYNTAX,
-                            "/plot inbox " + inbox.toString() + " delete <index>");
-                        return false;
-                    }
-
-                    if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-                        @Override public void run(List<PlotComment> value) {
-                            if (index > value.size()) {
-                                sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
-                                return;
-                            }
-                            PlotComment comment = value.get(index - 1);
-                            inbox.removeComment(plot, comment);
-                            plot.getSettings().removeComment(comment);
-                            MainUtil.sendMessage(player, C.COMMENT_REMOVED, comment.comment);
-                        }
-                    })) {
-                        sendMessage(player, C.NOT_IN_PLOT);
-                        return false;
-                    }
-                    return true;
-                case "clear":
-                    if (!inbox.canModify(plot, player)) {
-                        sendMessage(player, C.NO_PERM_INBOX_MODIFY);
-                    }
-                    inbox.clearInbox(plot);
-                    Optional<ArrayList<PlotComment>> comments =
-                        plot.getSettings().getComments(inbox.toString());
-                    comments
-                        .ifPresent(plotComments -> plot.getSettings().removeComments(plotComments));
-                    MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
-                    return true;
-                default:
-                    try {
-                        page = Integer.parseInt(args[1]);
-                    } catch (NumberFormatException ignored) {
-                        sendMessage(player, C.COMMAND_SYNTAX,
-                            "/plot inbox [inbox] [delete <index>|clear|page]");
-                        return false;
-                    }
-            }
-        } else {
-            page = 1;
-        }
-        if (!inbox.canRead(plot, player)) {
-            sendMessage(player, C.NO_PERM_INBOX);
-            return false;
-        }
-        if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-            @Override public void run(List<PlotComment> value) {
-                displayComments(player, value, page);
-            }
-        })) {
-            sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
deleted file mode 100644
index 6241e1d51..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-
-import java.util.UUID;
-
-@CommandDeclaration(command = "info", aliases = "i", description = "Display plot info",
-    usage = "/plot info <id>", category = CommandCategory.INFO) public class Info
-    extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Plot plot;
-        String arg;
-        if (args.length > 0) {
-            arg = args[0];
-            switch (arg) {
-                case "trusted":
-                case "alias":
-                case "inv":
-                case "biome":
-                case "denied":
-                case "flags":
-                case "id":
-                case "size":
-                case "members":
-                case "seen":
-                case "owner":
-                case "rating":
-                    plot = MainUtil.getPlotFromString(player, null, false);
-                    break;
-                default:
-                    plot = MainUtil.getPlotFromString(player, arg, false);
-                    if (args.length == 2) {
-                        arg = args[1];
-                    } else {
-                        arg = null;
-                    }
-                    break;
-            }
-            if (plot == null) {
-                plot = player.getCurrentPlot();
-            }
-        } else {
-            arg = null;
-            plot = player.getCurrentPlot();
-        }
-        if (plot == null) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT.s());
-            return false;
-        }
-        if (arg != null) {
-            if (args.length == 1) {
-                args = new String[0];
-            } else {
-                args = new String[] {args[1]};
-            }
-        }
-        if (args.length == 1 && args[0].equalsIgnoreCase("inv")) {
-            PlotInventory inv = new PlotInventory(player) {
-                @Override public boolean onClick(int index) {
-                    // TODO InfoInventory not implemented yet!!!!!!!!
-                    // See plot rating or musicsubcommand on examples
-                    return false;
-                }
-            };
-            UUID uuid = player.getUUID();
-            String name = MainUtil.getName(plot.owner);
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cPlot Info",
-                "&cID: &6" + plot.getId().toString(), "&cOwner: &6" + name,
-                "&cAlias: &6" + plot.getAlias(),
-                "&cBiome: &6" + plot.getBiome().replaceAll("_", "").toLowerCase(),
-                "&cCan Build: &6" + plot.isAdded(uuid),
-                "&cSeen: &6" + MainUtil.secToTime((int) (ExpireManager.IMP.getAge(plot) / 1000)),
-                "&cIs Denied: &6" + plot.isDenied(uuid)));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cTrusted",
-                "&cAmount: &6" + plot.getTrusted().size(),
-                "&8Click to view a list of the trusted users"));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cMembers",
-                "&cAmount: &6" + plot.getMembers().size(),
-                "&8Click to view a list of plot members"));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cDenied", "&cDenied",
-                "&cAmount: &6" + plot.getDenied().size(),
-                "&8Click to view a list of denied players"));
-            inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cFlags", "&cFlags",
-                "&cAmount: &6" + plot.getFlags().size(), "&8Click to view a list of plot flags"));
-            inv.openInventory();
-            return true;
-        }
-        boolean hasOwner = plot.hasOwner();
-        // Wildcard player {added}
-        boolean containsEveryone = plot.getTrusted().contains(DBFunc.EVERYONE);
-        boolean trustedEveryone = plot.getMembers().contains(DBFunc.EVERYONE);
-        // Unclaimed?
-        if (!hasOwner && !containsEveryone && !trustedEveryone) {
-            MainUtil
-                .sendMessage(player, C.PLOT_INFO_UNCLAIMED, plot.getId().x + ";" + plot.getId().y);
-            return true;
-        }
-        String info = C.PLOT_INFO.s();
-        boolean full;
-        if (arg != null) {
-            info = getCaption(arg);
-            if (info == null) {
-                MainUtil.sendMessage(player,
-                    "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
-                        + "&aowner&7, &arating");
-                return false;
-            }
-            full = true;
-        } else {
-            full = false;
-        }
-        MainUtil.format(info, plot, player, full, new RunnableVal<String>() {
-            @Override public void run(String value) {
-                MainUtil.sendMessage(player,
-                    C.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + C.PLOT_INFO_FOOTER.s(), false);
-            }
-        });
-        return true;
-    }
-
-    private String getCaption(String string) {
-        switch (string) {
-            case "trusted":
-                return C.PLOT_INFO_TRUSTED.s();
-            case "alias":
-                return C.PLOT_INFO_ALIAS.s();
-            case "biome":
-                return C.PLOT_INFO_BIOME.s();
-            case "denied":
-                return C.PLOT_INFO_DENIED.s();
-            case "flags":
-                return C.PLOT_INFO_FLAGS.s();
-            case "id":
-                return C.PLOT_INFO_ID.s();
-            case "size":
-                return C.PLOT_INFO_SIZE.s();
-            case "members":
-                return C.PLOT_INFO_MEMBERS.s();
-            case "owner":
-                return C.PLOT_INFO_OWNER.s();
-            case "rating":
-                return C.PLOT_INFO_RATING.s();
-            case "seen":
-                return C.PLOT_INFO_SEEN.s();
-            default:
-                return null;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
deleted file mode 100644
index fc16db715..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "kick", aliases = {"k"}, description = "Kick a player from your plot",
-    permission = "plots.kick", usage = "/plot kick <player>", category = CommandCategory.TELEPORT,
-    requiredType = RequiredType.NONE) public class Kick extends SubCommand {
-
-    public Kick() {
-        super(Argument.PlayerName);
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlot();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_KICK)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-        if (uuids.isEmpty()) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
-            return false;
-        }
-        Set<PlotPlayer> players = new HashSet<>();
-        for (UUID uuid : uuids) {
-            if (uuid == DBFunc.EVERYONE) {
-                for (PlotPlayer pp : plot.getPlayersInPlot()) {
-                    if (pp == player || Permissions
-                        .hasPermission(pp, C.PERMISSION_ADMIN_ENTRY_DENIED)) {
-                        continue;
-                    }
-                    players.add(pp);
-                }
-                continue;
-            }
-            PlotPlayer pp = UUIDHandler.getPlayer(uuid);
-            if (pp != null) {
-                players.add(pp);
-            }
-        }
-        players.remove(player); // Don't ever kick the calling player
-        if (players.isEmpty()) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
-            return false;
-        }
-        for (PlotPlayer player2 : players) {
-            if (!plot.equals(player2.getCurrentPlot())) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
-                return false;
-            }
-            if (Permissions.hasPermission(player2, C.PERMISSION_ADMIN_ENTRY_DENIED)) {
-                C.CANNOT_KICK_PLAYER.send(player, player2.getName());
-                return false;
-            }
-            Location spawn = WorldUtil.IMP.getSpawn(location.getWorld());
-            C.YOU_GOT_KICKED.send(player2);
-            if (plot.equals(spawn.getPlot())) {
-                Location newSpawn = WorldUtil.IMP
-                    .getSpawn(PlotSquared.get().getPlotAreaManager().getAllWorlds()[0]);
-                if (plot.equals(newSpawn.getPlot())) {
-                    // Kick from server if you can't be teleported to spawn
-                    player2.kick(C.YOU_GOT_KICKED.s());
-                } else {
-                    player2.plotkick(newSpawn);
-                }
-            } else {
-                player2.plotkick(spawn);
-            }
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
deleted file mode 100644
index 5504ce777..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-import java.util.UUID;
-
-@CommandDeclaration(command = "leave",
-    description = "Removes self from being trusted or a member of the plot",
-    permission = "plots.leave", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE) public class Leave extends Command {
-    public Leave() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
-        checkTrue(plot.isAdded(player.getUUID()), C.NO_PLOT_PERMS);
-        checkTrue(args.length == 0, C.COMMAND_SYNTAX, getUsage());
-        if (plot.isOwner(player.getUUID())) {
-            checkTrue(plot.hasOwner(), C.ALREADY_OWNER);
-            // TODO setowner, other
-        } else {
-            UUID uuid = player.getUUID();
-            if (plot.isAdded(uuid)) {
-                if (plot.removeTrusted(uuid)) {
-                    EventUtil.manager.callTrusted(player, plot, uuid, false);
-                }
-                if (plot.removeMember(uuid)) {
-                    EventUtil.manager.callMember(player, plot, uuid, false);
-                }
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
-            } else {
-                MainUtil.sendMessage(player, C.REMOVED_PLAYERS, 1);
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
deleted file mode 100644
index 9df74d30b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ /dev/null
@@ -1,397 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared.SortType;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-
-import java.util.*;
-import java.util.Map.Entry;
-
-@CommandDeclaration(command = "list", aliases = {"l", "find", "search"}, description = "List plots",
-    permission = "plots.list", category = CommandCategory.INFO,
-    usage = "/plot list <forsale|mine|shared|world|top|all|unowned|unknown|player|world|done|fuzzy <search...>> [#]")
-public class ListCmd extends SubCommand {
-
-    private String[] getArgumentList(PlotPlayer player) {
-        List<String> args = new ArrayList<>();
-        if (EconHandler.manager != null && Permissions
-            .hasPermission(player, C.PERMISSION_LIST_FORSALE)) {
-            args.add("forsale");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_MINE)) {
-            args.add("mine");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_SHARED)) {
-            args.add("shared");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
-            args.add("world");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_TOP)) {
-            args.add("top");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_ALL)) {
-            args.add("all");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_UNOWNED)) {
-            args.add("unowned");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_UNKNOWN)) {
-            args.add("unknown");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_PLAYER)) {
-            args.add("<player>");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
-            args.add("<world>");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_DONE)) {
-            args.add("done");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_EXPIRED)) {
-            args.add("expired");
-        }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_FUZZY)) {
-            args.add("fuzzy <search...>");
-        }
-        return args.toArray(new String[args.size()]);
-    }
-
-    public void noArgs(PlotPlayer player) {
-        MainUtil.sendMessage(player,
-            C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + Arrays.toString(getArgumentList(player)));
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        if (args.length < 1) {
-            noArgs(player);
-            return false;
-        }
-        int page = 0;
-        if (args.length > 1) {
-            try {
-                page = Integer.parseInt(args[args.length - 1]);
-                --page;
-                if (page < 0) {
-                    page = 0;
-                }
-            } catch (NumberFormatException ignored) {
-                page = -1;
-            }
-        }
-
-        List<Plot> plots = null;
-
-        String world = player.getLocation().getWorld();
-        PlotArea area = player.getApplicablePlotArea();
-        String arg = args[0].toLowerCase();
-        boolean sort = true;
-        switch (arg) {
-            case "mine":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_MINE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_MINE);
-                    return false;
-                }
-                sort = false;
-                plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getBasePlots(player));
-                break;
-            case "shared":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_SHARED)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_SHARED);
-                    return false;
-                }
-                plots = new ArrayList<>();
-                for (Plot plot : PlotSquared.get().getPlots()) {
-                    if (plot.getTrusted().contains(player.getUUID()) || plot.getMembers()
-                        .contains(player.getUUID())) {
-                        plots.add(plot);
-                    }
-                }
-                break;
-            case "world":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_WORLD);
-                    return false;
-                }
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(world))) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_LIST_WORLD_NAME.f(world));
-                    return false;
-                }
-                plots = new ArrayList<>(PlotSquared.get().getPlots(world));
-                break;
-            case "expired":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_EXPIRED)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_EXPIRED);
-                    return false;
-                }
-                plots = ExpireManager.IMP == null ?
-                    new ArrayList<Plot>() :
-                    new ArrayList<>(ExpireManager.IMP.getPendingExpired());
-                break;
-            case "area":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_AREA)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_AREA);
-                    return false;
-                }
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(world))) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_LIST_WORLD_NAME.f(world));
-                    return false;
-                }
-                plots = area == null ? new ArrayList<Plot>() : new ArrayList<>(area.getPlots());
-                break;
-            case "all":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_ALL)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_ALL);
-                    return false;
-                }
-                plots = new ArrayList<>(PlotSquared.get().getPlots());
-                break;
-            case "done":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_DONE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_DONE);
-                    return false;
-                }
-                plots = new ArrayList<>();
-                for (Plot plot : PlotSquared.get().getPlots()) {
-                    Optional<String> flag = plot.getFlag(Flags.DONE);
-                    if (flag.isPresent()) {
-                        plots.add(plot);
-                    }
-                }
-                Collections.sort(plots, new Comparator<Plot>() {
-                    @Override public int compare(Plot a, Plot b) {
-                        String va = "" + a.getFlags().get(Flags.DONE);
-                        String vb = "" + b.getFlags().get(Flags.DONE);
-                        if (MathMan.isInteger(va)) {
-                            if (MathMan.isInteger(vb)) {
-                                return Integer.parseInt(vb) - Integer.parseInt(va);
-                            }
-                            return -1;
-                        }
-                        return 1;
-                    }
-                });
-                sort = false;
-                break;
-            case "top":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_TOP)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_TOP);
-                    return false;
-                }
-                plots = new ArrayList<>(PlotSquared.get().getPlots());
-                Collections.sort(plots, new Comparator<Plot>() {
-                    @Override public int compare(Plot p1, Plot p2) {
-                        double v1 = 0;
-                        int p1s = p1.getSettings().getRatings().size();
-                        int p2s = p2.getRatings().size();
-                        if (!p1.getSettings().getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                double av = entry.getValue().getAverageRating();
-                                v1 += av * av;
-                            }
-                            v1 /= p1s;
-                            v1 += p1s;
-                        }
-                        double v2 = 0;
-                        if (!p2.getSettings().getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                double av = entry.getValue().getAverageRating();
-                                v2 += av * av;
-                            }
-                            v2 /= p2s;
-                            v2 += p2s;
-                        }
-                        if (v2 == v1 && v2 != 0) {
-                            return p2s - p1s;
-                        }
-                        return (int) Math.signum(v2 - v1);
-                    }
-                });
-                sort = false;
-                break;
-            case "forsale":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_FORSALE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_FORSALE);
-                    return false;
-                }
-                if (EconHandler.manager == null) {
-                    break;
-                }
-                plots = new ArrayList<>();
-                for (Plot plot : PlotSquared.get().getPlots()) {
-                    Optional<Double> price = plot.getFlag(Flags.PRICE);
-                    if (price.isPresent()) {
-                        plots.add(plot);
-                    }
-                }
-                break;
-            case "unowned":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_UNOWNED)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_UNOWNED);
-                    return false;
-                }
-                plots = new ArrayList<>();
-                for (Plot plot : PlotSquared.get().getPlots()) {
-                    if (plot.owner == null) {
-                        plots.add(plot);
-                    }
-                }
-                break;
-            case "unknown":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_UNKNOWN)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_UNKNOWN);
-                    return false;
-                }
-                plots = new ArrayList<>();
-                for (Plot plot : PlotSquared.get().getPlots()) {
-                    if (plot.owner == null) {
-                        continue;
-                    }
-                    if (UUIDHandler.getName(plot.owner) == null) {
-                        plots.add(plot);
-                    }
-                }
-                break;
-            case "fuzzy":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_FUZZY)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_FUZZY);
-                    return false;
-                }
-                if (args.length < (page == -1 ? 2 : 3)) {
-                    C.COMMAND_SYNTAX.send(player, "/plot list fuzzy <search...> [#]");
-                    return false;
-                }
-                String term;
-                if (MathMan.isInteger(args[args.length - 1])) {
-                    term = StringMan.join(Arrays.copyOfRange(args, 1, args.length - 1), " ");
-                } else {
-                    term = StringMan.join(Arrays.copyOfRange(args, 1, args.length), " ");
-                }
-                plots = MainUtil.getPlotsBySearch(term);
-                sort = false;
-                break;
-            default:
-                if (PlotSquared.get().hasPlotArea(args[0])) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_WORLD);
-                        return false;
-                    }
-                    if (!Permissions
-                        .hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(args[0]))) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_LIST_WORLD_NAME.f(args[0]));
-                        return false;
-                    }
-                    plots = new ArrayList<>(PlotSquared.get().getPlots(args[0]));
-                    break;
-                }
-                UUID uuid = UUIDHandler.getUUID(args[0], null);
-                if (uuid == null) {
-                    try {
-                        uuid = UUID.fromString(args[0]);
-                    } catch (Exception ignored) {
-                    }
-                }
-                if (uuid != null) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_LIST_PLAYER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_PLAYER);
-                        return false;
-                    }
-                    sort = false;
-                    plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getPlots(uuid));
-                    break;
-                }
-        }
-
-        if (plots == null) {
-            sendMessage(player, C.DID_YOU_MEAN,
-                new StringComparison<>(args[0], new String[] {"mine", "shared", "world", "all"})
-                    .getBestMatch());
-            return false;
-        }
-
-        if (plots.isEmpty()) {
-            MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
-            return false;
-        }
-        displayPlots(player, plots, 12, page, area, args, sort);
-        return true;
-    }
-
-    public void displayPlots(final PlotPlayer player, List<Plot> plots, int pageSize, int page,
-        PlotArea area, String[] args, boolean sort) {
-        // Header
-        Iterator<Plot> iterator = plots.iterator();
-        while (iterator.hasNext()) {
-            if (!iterator.next().isBasePlot()) {
-                iterator.remove();
-            }
-        }
-        if (sort) {
-            plots = PlotSquared.get().sortPlots(plots, SortType.CREATION_DATE, area);
-        }
-        this.paginate(player, plots, pageSize, page,
-            new RunnableVal3<Integer, Plot, PlotMessage>() {
-                @Override public void run(Integer i, Plot plot, PlotMessage message) {
-                    String color;
-                    if (plot.owner == null) {
-                        color = "$3";
-                    } else if (plot.isOwner(player.getUUID())) {
-                        color = "$1";
-                    } else if (plot.isAdded(player.getUUID())) {
-                        color = "$4";
-                    } else if (plot.isDenied(player.getUUID())) {
-                        color = "$2";
-                    } else {
-                        color = "$1";
-                    }
-                    PlotMessage trusted = new PlotMessage().text(C.color(C.PLOT_INFO_TRUSTED.s()
-                        .replaceAll("%trusted%", MainUtil.getPlayerList(plot.getTrusted()))))
-                        .color("$1");
-                    PlotMessage members = new PlotMessage().text(C.color(C.PLOT_INFO_MEMBERS.s()
-                        .replaceAll("%members%", MainUtil.getPlayerList(plot.getMembers()))))
-                        .color("$1");
-                    String strFlags = StringMan.join(plot.getFlags().values(), ",");
-                    if (strFlags.isEmpty()) {
-                        strFlags = C.NONE.s();
-                    }
-                    PlotMessage flags = new PlotMessage()
-                        .text(C.color(C.PLOT_INFO_FLAGS.s().replaceAll("%flags%", strFlags)))
-                        .color("$1");
-                    message.text("[").color("$3").text(i + "")
-                        .command("/plot visit " + plot.getArea() + ";" + plot.getId())
-                        .tooltip("/plot visit " + plot.getArea() + ";" + plot.getId()).color("$1")
-                        .text("]").color("$3").text(" " + plot.toString())
-                        .tooltip(trusted, members, flags)
-                        .command("/plot info " + plot.getArea() + ";" + plot.getId()).color(color)
-                        .text(" - ").color("$2");
-                    String prefix = "";
-                    for (UUID uuid : plot.getOwners()) {
-                        String name = UUIDHandler.getName(uuid);
-                        if (name == null) {
-                            message = message.text(prefix).color("$4").text("unknown").color("$2")
-                                .tooltip(uuid.toString()).suggest(uuid.toString());
-                        } else {
-                            PlotPlayer pp = UUIDHandler.getPlayer(uuid);
-                            if (pp != null) {
-                                message = message.text(prefix).color("$4").text(name).color("$1")
-                                    .tooltip(new PlotMessage("Online").color("$4"));
-                            } else {
-                                message = message.text(prefix).color("$4").text(name).color("$1")
-                                    .tooltip(new PlotMessage("Offline").color("$3"));
-                            }
-                        }
-                        prefix = ", ";
-                    }
-                }
-            }, "/plot list " + args[0], C.PLOT_LIST_HEADER_PAGED.s());
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
deleted file mode 100644
index cc9106d28..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-@CommandDeclaration(command = "load", aliases = {"restore"}, category = CommandCategory.SCHEMATIC,
-    requiredType = RequiredType.NONE, description = "Load your plot", permission = "plots.load",
-    usage = "/plot load") public class Load extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        String world = player.getLocation().getWorld();
-        if (!PlotSquared.get().hasPlotArea(world)) {
-            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
-        final Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_LOAD)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-            return false;
-        }
-
-        if (args.length != 0) {
-            if (args.length == 1) {
-                List<String> schematics = player.getMeta("plot_schematics");
-                if (schematics == null) {
-                    // No schematics found:
-                    MainUtil.sendMessage(player, C.LOAD_NULL);
-                    return false;
-                }
-                String schem;
-                try {
-                    schem = schematics.get(Integer.parseInt(args[0]) - 1);
-                } catch (Exception ignored) {
-                    // use /plot load <index>
-                    MainUtil
-                        .sendMessage(player, C.NOT_VALID_NUMBER, "(1, " + schematics.size() + ')');
-                    return false;
-                }
-                final URL url;
-                try {
-                    url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schem);
-                } catch (MalformedURLException e) {
-                    e.printStackTrace();
-                    MainUtil.sendMessage(player, C.LOAD_FAILED);
-                    return false;
-                }
-                plot.addRunning();
-                MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
-                TaskManager.runTaskAsync(() -> {
-                    Schematic schematic = SchematicHandler.manager.getSchematic(url);
-                    if (schematic == null) {
-                        plot.removeRunning();
-                        sendMessage(player, C.SCHEMATIC_INVALID,
-                            "non-existent or not in gzip format");
-                        return;
-                    }
-                    PlotArea area = plot.getArea();
-                    SchematicHandler.manager
-                        .paste(schematic, plot, 0, area.MIN_BUILD_HEIGHT, 0, false,
-                            new RunnableVal<Boolean>() {
-                                @Override public void run(Boolean value) {
-                                    plot.removeRunning();
-                                    if (value) {
-                                        sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
-                                    } else {
-                                        sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
-                                    }
-                                }
-                            });
-                });
-                return true;
-            }
-            plot.removeRunning();
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot load <index>");
-            return false;
-        }
-
-        // list schematics
-
-        List<String> schematics = player.getMeta("plot_schematics");
-        if (schematics == null) {
-            plot.addRunning();
-            TaskManager.runTaskAsync(() -> {
-                List<String> schematics1 = SchematicHandler.manager.getSaves(player.getUUID());
-                plot.removeRunning();
-                if ((schematics1 == null) || schematics1.isEmpty()) {
-                    MainUtil.sendMessage(player, C.LOAD_FAILED);
-                    return;
-                }
-                player.setMeta("plot_schematics", schematics1);
-                displaySaves(player);
-            });
-        } else {
-            displaySaves(player);
-        }
-        return true;
-    }
-
-    public void displaySaves(PlotPlayer player) {
-        List<String> schematics = player.getMeta("plot_schematics");
-        for (int i = 0; i < Math.min(schematics.size(), 32); i++) {
-            try {
-                String schematic = schematics.get(i).split("\\.")[0];
-                String[] split = schematic.split("_");
-                if (split.length < 5) {
-                    continue;
-                }
-                String time =
-                    secToTime((System.currentTimeMillis() / 1000) - Long.parseLong(split[0]));
-                String world = split[1];
-                PlotId id = PlotId.fromString(split[2] + ';' + split[3]);
-                String size = split[4];
-                String color = "$4";
-                MainUtil.sendMessage(player,
-                    "$3[$2" + (i + 1) + "$3] " + color + time + "$3 | " + color + world + ';' + id
-                        + "$3 | " + color + size + 'x' + size);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        MainUtil.sendMessage(player, C.LOAD_LIST);
-    }
-
-    public String secToTime(long time) {
-        StringBuilder toreturn = new StringBuilder();
-        if (time >= 33868800) {
-            int years = (int) (time / 33868800);
-            time -= years * 33868800;
-            toreturn.append(years).append("y ");
-        }
-        if (time >= 604800) {
-            int weeks = (int) (time / 604800);
-            time -= weeks * 604800;
-            toreturn.append(weeks).append("w ");
-        }
-        if (time >= 86400) {
-            int days = (int) (time / 86400);
-            time -= days * 86400;
-            toreturn.append(days).append("d ");
-        }
-        if (time >= 3600) {
-            int hours = (int) (time / 3600);
-            time -= hours * 3600;
-            toreturn.append(hours).append("h ");
-        }
-        if (time >= 60) {
-            int minutes = (int) (time / 60);
-            time -= minutes * 60;
-            toreturn.append(minutes).append("m ");
-        }
-        if (toreturn.length() == 0 || (time > 0)) {
-            toreturn.append(time).append("s ");
-        }
-        return toreturn.toString().trim();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
deleted file mode 100644
index 0e1630e76..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
-import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-import java.util.Arrays;
-
-/**
- * PlotSquared command class.
- */
-@CommandDeclaration(command = "plot",
-    aliases = {"plots", "p", "plotsquared", "plot2", "p2", "ps", "2", "plotme", "plotz", "ap"})
-public class MainCommand extends Command {
-
-    private static MainCommand instance;
-    public Help help;
-    public Toggle toggle;
-
-    private MainCommand() {
-        super(null, true);
-        instance = this;
-    }
-
-    public static MainCommand getInstance() {
-        if (instance == null) {
-            instance = new MainCommand();
-            new Buy();
-            new Save();
-            new Load();
-            new Confirm();
-            new Template();
-            new Download();
-            new Template();
-            new Setup();
-            new Area();
-            new DebugSaveTest();
-            new DebugLoadTest();
-            new CreateRoadSchematic();
-            new DebugAllowUnsafe();
-            new RegenAllRoads();
-            new Claim();
-            new Auto();
-            new Visit();
-            new Set();
-            new Clear();
-            new Delete();
-            new Trust();
-            new Add();
-            new Leave();
-            new Deny();
-            new Remove();
-            new Info();
-            new Near();
-            new ListCmd();
-            new Debug();
-            new SchematicCmd();
-            new PluginCmd();
-            new Purge();
-            new Reload();
-            new Relight();
-            new Merge();
-            new DebugPaste();
-            new Unlink();
-            new Kick();
-            new Rate();
-            new DebugClaimTest();
-            new Inbox();
-            new Comment();
-            new Database();
-            new Swap();
-            new Music();
-            new DebugRoadRegen();
-            new Trust();
-            new DebugExec();
-            new FlagCmd();
-            new Target();
-            new DebugFixFlags();
-            new Move();
-            new Condense();
-            new Copy();
-            new Chat();
-            new Trim();
-            new Done();
-            new Continue();
-            new Middle();
-            new Grant();
-            // Set commands
-            new Owner();
-            new Desc();
-            new Biome();
-            new Alias();
-            new SetHome();
-            new Cluster();
-            new DebugImportWorlds();
-            // Referenced commands
-            instance.toggle = new Toggle();
-            instance.help = new Help(instance);
-        }
-        return instance;
-    }
-
-    public static boolean onCommand(final PlotPlayer player, String... args) {
-        if (args.length >= 1 && args[0].contains(":")) {
-            String[] split2 = args[0].split(":");
-            if (split2.length == 2) {
-                // Ref: c:v, this will push value to the last spot in the array
-                // ex. /p h:2 SomeUsername
-                // > /p h SomeUsername 2
-                String[] tmp = new String[args.length + 1];
-                tmp[0] = split2[0];
-                tmp[args.length] = split2[1];
-                if (args.length >= 2) {
-                    System.arraycopy(args, 1, tmp, 1, args.length - 1);
-                }
-                args = tmp;
-            }
-        }
-        try {
-            getInstance().execute(player, args, new RunnableVal3<Command, Runnable, Runnable>() {
-                @Override
-                public void run(final Command cmd, final Runnable success, final Runnable failure) {
-                    if (cmd.hasConfirmation(player)) {
-                        CmdConfirm.addPending(player, cmd.getUsage(), new Runnable() {
-                            @Override public void run() {
-                                if (EconHandler.manager != null) {
-                                    PlotArea area = player.getApplicablePlotArea();
-                                    if (area != null) {
-                                        Expression<Double> priceEval =
-                                            area.PRICES.get(cmd.getFullId());
-                                        Double price =
-                                            priceEval != null ? priceEval.evaluate(0d) : 0d;
-                                        if (price != null
-                                            && EconHandler.manager.getMoney(player) < price) {
-                                            if (failure != null) {
-                                                failure.run();
-                                            }
-                                            return;
-                                        }
-                                    }
-                                }
-                                if (success != null) {
-                                    success.run();
-                                }
-                            }
-                        });
-                        return;
-                    }
-                    if (EconHandler.manager != null) {
-                        PlotArea area = player.getApplicablePlotArea();
-                        if (area != null) {
-                            Expression<Double> priceEval = area.PRICES.get(cmd.getFullId());
-                            Double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
-                            if (price != 0d && EconHandler.manager.getMoney(player) < price) {
-                                if (failure != null) {
-                                    failure.run();
-                                }
-                                return;
-                            }
-                        }
-                    }
-                    if (success != null) {
-                        success.run();
-                    }
-                }
-            }, new RunnableVal2<Command, CommandResult>() {
-                @Override public void run(Command cmd, CommandResult result) {
-                    // Post command stuff!?
-                }
-            });
-        } catch (CommandException e) {
-            e.perform(player);
-        }
-        // Always true
-        return true;
-    }
-
-    @Deprecated
-    /**
-     * @Deprecated legacy
-     */ public void addCommand(SubCommand command) {
-        PlotSquared.debug("Command registration is now done during instantiation");
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        // Clear perm caching //
-        player.deleteMeta("perm");
-        // Optional command scope //
-        Location loc = null;
-        Plot plot = null;
-        boolean tp = false;
-        if (args.length >= 2) {
-            PlotArea area = player.getApplicablePlotArea();
-            Plot newPlot = Plot.fromString(area, args[0]);
-            if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
-                .equals(area) || Permissions.hasPermission(player, C.PERMISSION_ADMIN)) && !newPlot
-                .isDenied(player.getUUID())) {
-                Location newLoc = newPlot.getCenter();
-                if (player.canTeleport(newLoc)) {
-                    // Save meta
-                    loc = player.getMeta(PlotPlayer.META_LOCATION);
-                    plot = player.getMeta(PlotPlayer.META_LAST_PLOT);
-                    tp = true;
-                    // Set loc
-                    player.setMeta(PlotPlayer.META_LOCATION, newLoc);
-                    player.setMeta(PlotPlayer.META_LAST_PLOT, newPlot);
-                } else {
-                    C.BORDER.send(player);
-                }
-                // Trim command
-                args = Arrays.copyOfRange(args, 1, args.length);
-            }
-            if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') {
-                switch (args[0].substring(1)) {
-                    case "f":
-                        confirm = new RunnableVal3<Command, Runnable, Runnable>() {
-                            @Override
-                            public void run(Command cmd, Runnable success, Runnable failure) {
-                                if (EconHandler.manager != null) {
-                                    PlotArea area = player.getApplicablePlotArea();
-                                    if (area != null) {
-                                        Expression<Double> priceEval =
-                                            area.PRICES.get(cmd.getFullId());
-                                        Double price =
-                                            priceEval != null ? priceEval.evaluate(0d) : 0d;
-                                        if (price != 0d
-                                            && EconHandler.manager.getMoney(player) < price) {
-                                            if (failure != null) {
-                                                failure.run();
-                                            }
-                                            return;
-                                        }
-                                    }
-                                }
-                                if (success != null) {
-                                    success.run();
-                                }
-                            }
-                        };
-                        args = Arrays.copyOfRange(args, 1, args.length);
-                        break;
-                    default:
-                        C.INVALID_COMMAND_FLAG.send(player);
-                        return;
-                }
-            }
-        }
-        try {
-            super.execute(player, args, confirm, whenDone);
-        } catch (CommandException e) {
-            throw e;
-        } catch (Throwable e) {
-            e.printStackTrace();
-            String message = e.getLocalizedMessage();
-            if (message != null) {
-                C.ERROR.send(player, message);
-            } else {
-                C.ERROR.send(player);
-            }
-        }
-        // Reset command scope //
-        if (tp && !(player instanceof ConsolePlayer)) {
-            if (loc == null) {
-                player.deleteMeta(PlotPlayer.META_LOCATION);
-            } else {
-                player.setMeta(PlotPlayer.META_LOCATION, loc);
-            }
-            if (plot == null) {
-                player.deleteMeta(PlotPlayer.META_LAST_PLOT);
-            } else {
-                player.setMeta(PlotPlayer.META_LAST_PLOT, plot);
-            }
-        }
-    }
-
-    @Override public boolean canExecute(PlotPlayer player, boolean message) {
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
deleted file mode 100644
index 94152175e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.util.UUID;
-
-@CommandDeclaration(command = "merge", aliases = "m",
-    description = "Merge the plot you are standing on, with another plot",
-    permission = "plots.merge", usage = "/plot merge <all|n|e|s|w> [removeroads]",
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, confirmation = true)
-public class Merge extends SubCommand {
-
-    public static final String[] values = new String[] {"north", "east", "south", "west", "auto"};
-    public static final String[] aliases = new String[] {"n", "e", "s", "w", "all"};
-
-    public static String direction(float yaw) {
-        yaw = yaw / 90;
-        int i = Math.round(yaw);
-        switch (i) {
-            case -4:
-            case 0:
-            case 4:
-                return "SOUTH";
-            case -1:
-            case 3:
-                return "EAST";
-            case -2:
-            case 2:
-                return "NORTH";
-            case -3:
-            case 1:
-                return "WEST";
-            default:
-                return "";
-        }
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Location loc = player.getLocationFull();
-        final Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        UUID uuid = player.getUUID();
-        if (!plot.isOwner(uuid)) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_MERGE)) {
-                MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-                return false;
-            } else {
-                uuid = plot.guessOwner();
-            }
-        }
-        final PlotArea plotArea = plot.getArea();
-        Expression<Double> priceExr =
-            plotArea.PRICES.getOrDefault("merge", Expression.constant(0d));
-        final int size = plot.getConnectedPlots().size();
-        final double price = priceExr.evaluate((double) size);
-        if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d
-            && EconHandler.manager.getMoney(player) < price) {
-            sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
-            return false;
-        }
-        final int maxSize =
-            Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
-        if (size - 1 > maxSize) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.merge." + (size + 1));
-            return false;
-        }
-        int direction = -1;
-        if (args.length == 0) {
-            switch (direction(player.getLocationFull().getYaw())) {
-                case "NORTH":
-                    direction = 0;
-                    break;
-                case "EAST":
-                    direction = 1;
-                    break;
-                case "SOUTH":
-                    direction = 2;
-                    break;
-                case "WEST":
-                    direction = 3;
-                    break;
-            }
-        } else {
-            if ("all".equalsIgnoreCase(args[0]) || "auto".equalsIgnoreCase(args[0])) {
-                boolean terrain = true;
-                if (args.length == 2) {
-                    terrain = "true".equalsIgnoreCase(args[1]);
-                }
-                if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
-                    return true;
-                }
-                if (plot.autoMerge(-1, maxSize, uuid, terrain)) {
-                    if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
-                        EconHandler.manager.withdrawMoney(player, price);
-                        sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
-                    }
-                    MainUtil.sendMessage(player, C.SUCCESS_MERGE);
-                    return true;
-                }
-                MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
-                return false;
-
-            }
-            for (int i = 0; i < values.length; i++) {
-                if (args[0].equalsIgnoreCase(values[i]) || args[0].equalsIgnoreCase(aliases[i])) {
-                    direction = i;
-                    break;
-                }
-            }
-        }
-        if (direction == -1) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                "/plot merge <" + StringMan.join(values, "|") + "> [removeroads]");
-            MainUtil
-                .sendMessage(player, C.DIRECTION.s().replaceAll("%dir%", direction(loc.getYaw())));
-            return false;
-        }
-        final boolean terrain;
-        if (args.length == 2) {
-            terrain = "true".equalsIgnoreCase(args[1]);
-        } else {
-            terrain = true;
-        }
-        if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
-            return true;
-        }
-        if (plot.autoMerge(direction, maxSize - size, uuid, terrain)) {
-            if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
-                EconHandler.manager.withdrawMoney(player, price);
-                sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
-            }
-            MainUtil.sendMessage(player, C.SUCCESS_MERGE);
-            return true;
-        }
-        Plot adjacent = plot.getRelative(direction);
-        if (adjacent == null || !adjacent.hasOwner() || adjacent.getMerged((direction + 2) % 4)
-            || adjacent.isOwner(uuid)) {
-            MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
-            return false;
-        }
-        if (!Permissions.hasPermission(player, C.PERMISSION_MERGE_OTHER)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_OTHER);
-            return false;
-        }
-        java.util.Set<UUID> uuids = adjacent.getOwners();
-        boolean isOnline = false;
-        for (final UUID owner : uuids) {
-            final PlotPlayer accepter = UUIDHandler.getPlayer(owner);
-            if (accepter == null) {
-                continue;
-            }
-            isOnline = true;
-            final int dir = direction;
-            Runnable run = () -> {
-                MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED);
-                plot.autoMerge(dir, maxSize - size, owner, terrain);
-                PlotPlayer plotPlayer = UUIDHandler.getPlayer(player.getUUID());
-                if (plotPlayer == null) {
-                    sendMessage(accepter, C.MERGE_NOT_VALID);
-                    return;
-                }
-                if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
-                    if (EconHandler.manager.getMoney(player) < price) {
-                        sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
-                        return;
-                    }
-                    EconHandler.manager.withdrawMoney(player, price);
-                    sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
-                }
-                MainUtil.sendMessage(player, C.SUCCESS_MERGE);
-            };
-            if (hasConfirmation(player)) {
-                CmdConfirm.addPending(accepter,
-                    C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", player.getName()), run);
-            } else {
-                run.run();
-            }
-        }
-        if (!isOnline) {
-            MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
-            return false;
-        }
-        MainUtil.sendMessage(player, C.MERGE_REQUESTED);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
deleted file mode 100644
index f4f184cc1..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-/**
- * @author manuelgu, altered by Citymonstret
- */
-@CommandDeclaration(command = "middle", aliases = {"center", "centre"},
-    description = "Teleports you to the center of the plot", usage = "/plot middle",
-    category = CommandCategory.TELEPORT, requiredType = RequiredType.NONE) public class Middle
-    extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] arguments) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlot();
-        if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            return sendMessage(player, C.PLOT_UNOWNED);
-        }
-        player.teleport(plot.getCenter());
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
deleted file mode 100644
index 289a3c4a6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-@CommandDeclaration(usage = "/plot move <X;Z>", command = "move", description = "Move a plot",
-    aliases = {"debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE) public class Move extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        Plot plot1 = loc.getPlotAbs();
-        if (plot1 == null) {
-            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot1.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        boolean override = false;
-        if (args.length == 2 && args[1].equalsIgnoreCase("-f")) {
-            args = new String[] {args[0]};
-            override = true;
-        }
-        if (args.length != 1) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        Plot plot2;
-        if (area == null) {
-            plot2 = MainUtil.getPlotFromString(player, args[0], true);
-            if (plot2 == null) {
-                return false;
-            }
-        } else {
-            plot2 = area.getPlotAbs(plot1.getId());
-        }
-        if (plot1.equals(plot2)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
-            return false;
-        }
-        if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s()))) {
-            C.PLOTWORLD_INCOMPATIBLE.send(player);
-            return false;
-        }
-        if (plot1.move(plot2, () -> MainUtil.sendMessage(player, C.MOVE_SUCCESS), false)) {
-            return true;
-        } else {
-            MainUtil.sendMessage(player, C.REQUIRES_UNOWNED);
-            return false;
-        }
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
deleted file mode 100644
index b2e5170e5..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Locale;
-
-@CommandDeclaration(command = "music", permission = "plots.music",
-    description = "Play music in your plot", usage = "/plot music",
-    category = CommandCategory.APPEARANCE, requiredType = RequiredType.PLAYER) public class Music
-    extends SubCommand {
-
-    private static final Collection<String> DISCS = Arrays
-        .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
-            "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
-            "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait");
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        final Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.isAdded(player.getUUID())) {
-            sendMessage(player, C.NO_PLOT_PERMS);
-            return true;
-        }
-        PlotInventory inv = new PlotInventory(player, 2, "Plot Jukebox") {
-            @Override public boolean onClick(int index) {
-                PlotItemStack item = getItem(index);
-                if (item == null) {
-                    return true;
-                }
-                if (item.getPlotBlock().equalsAny(7, "bedrock")) {
-                    plot.removeFlag(Flags.MUSIC);
-                    C.FLAG_REMOVED.send(player);
-                } else if (item.name.toLowerCase(Locale.ENGLISH).contains("disc")) {
-                    plot.setFlag(Flags.MUSIC, item.getPlotBlock().getRawId());
-                    C.FLAG_ADDED.send(player);
-                } else {
-                    C.FLAG_NOT_ADDED.send(player);
-                }
-                return false;
-            }
-        };
-        int index = 0;
-
-        for (final String disc : DISCS) {
-            final String name = String.format("&r&6%s", disc);
-            final String[] lore = {"&r&aClick to play!"};
-            final PlotItemStack item = new PlotItemStack(disc, 1, name, lore);
-            inv.setItem(index++, item);
-        }
-
-        // Always add the cancel button
-        // if (player.getMeta("music") != null) {
-        String name = "&r&6Cancel music";
-        String[] lore = {"&r&cClick to cancel!"};
-        inv.setItem(index, new PlotItemStack("bedrock", 1, name, lore));
-        // }
-
-        inv.openInventory();
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
deleted file mode 100644
index c3e9c5f9e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-@CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players",
-    usage = "/plot near", category = CommandCategory.INFO) public class Near extends Command {
-    public Near() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        C.PLOT_NEAR.send(player, StringMan.join(plot.getPlayersInPlot(), ", "));
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
deleted file mode 100644
index 4095c15c9..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "setowner", permission = "plots.set.owner",
-    description = "Set the plot owner", usage = "/plot setowner <player>",
-    aliases = {"owner", "so", "seto"}, category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE, confirmation = true) public class Owner extends SetCommand {
-
-    @Override public boolean set(final PlotPlayer player, final Plot plot, String value) {
-        Set<Plot> plots = plot.getConnectedPlots();
-        UUID uuid = null;
-        String name = null;
-        if (value.length() == 36) {
-            try {
-                uuid = UUID.fromString(value);
-                name = MainUtil.getName(uuid);
-            } catch (Exception ignored) {
-            }
-        } else {
-            uuid = UUIDHandler.getUUID(value, null);
-            name = UUIDHandler.getName(uuid);
-            name = name == null ? value : name;
-        }
-        if (uuid == null || value.equalsIgnoreCase("-")) {
-            if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
-                .equalsIgnoreCase("-")) {
-                if (!Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
-                    return false;
-                }
-                Set<Plot> connected = plot.getConnectedPlots();
-                plot.unlinkPlot(false, false);
-                for (Plot current : connected) {
-                    current.unclaim();
-                    current.removeSign();
-                }
-                MainUtil.sendMessage(player, C.SET_OWNER);
-                return true;
-            }
-            C.INVALID_PLAYER.send(player, value);
-            return false;
-        }
-        final PlotPlayer other = UUIDHandler.getPlayer(uuid);
-        if (plot.isOwner(uuid)) {
-            C.ALREADY_OWNER.send(player, MainUtil.getName(uuid));
-            return false;
-        }
-        if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER)) {
-            if (other == null) {
-                C.INVALID_PLAYER_OFFLINE.send(player, value);
-                return false;
-            }
-            int size = plots.size();
-            int currentPlots = (Settings.Limit.GLOBAL ?
-                other.getPlotCount() :
-                other.getPlotCount(plot.getWorldName())) + size;
-            if (currentPlots > other.getAllowedPlots()) {
-                sendMessage(player, C.CANT_TRANSFER_MORE_PLOTS);
-                return false;
-            }
-        }
-        final String finalName = name;
-        final UUID finalUUID = uuid;
-        final boolean removeDenied = plot.isDenied(finalUUID);
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (plot.setOwner(finalUUID, player)) {
-                    if (removeDenied)
-                        plot.removeDenied(finalUUID);
-                    plot.setSign(finalName);
-                    MainUtil.sendMessage(player, C.SET_OWNER);
-                    if (other != null) {
-                        MainUtil
-                            .sendMessage(other, C.NOW_OWNER, plot.getArea() + ";" + plot.getId());
-                    }
-                } else
-                    MainUtil.sendMessage(player, C.SET_OWNER_CANCELLED);
-            }
-        };
-        if (hasConfirmation(player)) {
-            CmdConfirm.addPending(player, "/plot set owner " + value, run);
-        } else {
-            TaskManager.runTask(run);
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java
deleted file mode 100644
index 81047ec9b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/PluginCmd.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.json.JSONObject;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.HttpUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-@CommandDeclaration(command = "plugin", permission = "plots.use",
-    description = "Show plugin information", usage = "/plot plugin", aliases = "version",
-    category = CommandCategory.INFO) public class PluginCmd extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        TaskManager.IMP.taskAsync(new Runnable() {
-            @Override public void run() {
-                MainUtil.sendMessage(player, String.format(
-                    "$2>> $1&l" + PlotSquared.imp().getPluginName() + " $2($1Version$2: $1%s$2)",
-                    PlotSquared.get().getVersion()));
-                MainUtil.sendMessage(player,
-                    "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21");
-                MainUtil.sendMessage(player,
-                    "$2>> $1&lWiki$2: $1https://github.com/IntellectualCrafters/PlotSquared/wiki");
-                MainUtil.sendMessage(player,
-                    "$2>> $1&lNewest Version$2: $1" + getNewestVersionString());
-            }
-        });
-        return true;
-    }
-
-    public String getNewestVersionString() {
-        String str = HttpUtil
-            .readUrl("https://api.github.com/repos/IntellectualSites/PlotSquared/releases/latest");
-        JSONObject release = new JSONObject(str);
-        return release.getString("name");
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
deleted file mode 100644
index 8cd4d9e56..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-@CommandDeclaration(
-    usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false]",
-    command = "purge", permission = "plots.admin", description = "Purge all plots for a world",
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE,
-    confirmation = true) public class Purge extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length == 0) {
-            return false;
-        }
-
-        String world = null;
-        PlotArea area = null;
-        PlotId id = null;
-        UUID owner = null;
-        UUID added = null;
-        boolean unknown = false;
-        for (String arg : args) {
-            String[] split = arg.split(":");
-            if (split.length != 2) {
-                C.COMMAND_SYNTAX.send(player, getUsage());
-                return false;
-            }
-            switch (split[0].toLowerCase()) {
-                case "world":
-                case "w":
-                    world = split[1];
-                    break;
-                case "area":
-                case "a":
-                    area = PlotSquared.get().getPlotAreaByString(split[1]);
-                    if (area == null) {
-                        C.NOT_VALID_PLOT_WORLD.send(player, split[1]);
-                        return false;
-                    }
-                    break;
-                case "plotid":
-                case "id":
-                    id = PlotId.fromString(split[1]);
-                    if (id == null) {
-                        C.NOT_VALID_PLOT_ID.send(player, split[1]);
-                        return false;
-                    }
-                    break;
-                case "owner":
-                case "o":
-                    owner = UUIDHandler.getUUID(split[1], null);
-                    if (owner == null) {
-                        C.INVALID_PLAYER.send(player, split[1]);
-                        return false;
-                    }
-                    break;
-                case "shared":
-                case "s":
-                    added = UUIDHandler.getUUID(split[1], null);
-                    if (added == null) {
-                        C.INVALID_PLAYER.send(player, split[1]);
-                        return false;
-                    }
-                    break;
-                case "unknown":
-                case "?":
-                case "u":
-                    unknown = Boolean.parseBoolean(split[1]);
-                    break;
-                default:
-                    C.COMMAND_SYNTAX.send(player, getUsage());
-                    return false;
-            }
-        }
-        final HashSet<Plot> toDelete = new HashSet<>();
-        for (Plot plot : PlotSquared.get().getBasePlots()) {
-            if (world != null && !plot.getWorldName().equalsIgnoreCase(world)) {
-                continue;
-            }
-            if (area != null && !plot.getArea().equals(area)) {
-                continue;
-            }
-            if (id != null && !plot.getId().equals(id)) {
-                continue;
-            }
-            if (owner != null && !plot.isOwner(owner)) {
-                continue;
-            }
-            if (added != null && !plot.isAdded(added)) {
-                continue;
-            }
-            if (unknown && UUIDHandler.getName(plot.owner) != null) {
-                continue;
-            }
-            toDelete.addAll(plot.getConnectedPlots());
-        }
-        if (PlotSquared.get().plots_tmp != null) {
-            for (Entry<String, HashMap<PlotId, Plot>> entry : PlotSquared.get().plots_tmp
-                .entrySet()) {
-                String worldName = entry.getKey();
-                if (world != null && !world.equalsIgnoreCase(worldName)) {
-                    continue;
-                }
-                for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
-                    Plot plot = entry2.getValue();
-                    if (id != null && !plot.getId().equals(id)) {
-                        continue;
-                    }
-                    if (owner != null && !plot.isOwner(owner)) {
-                        continue;
-                    }
-                    if (added != null && !plot.isAdded(added)) {
-                        continue;
-                    }
-                    if (unknown && UUIDHandler.getName(plot.owner) != null) {
-                        continue;
-                    }
-                    toDelete.add(plot);
-                }
-            }
-        }
-        if (toDelete.isEmpty()) {
-            C.FOUND_NO_PLOTS.send(player);
-            return false;
-        }
-        String cmd =
-            "/plot purge " + StringMan.join(args, " ") + " (" + toDelete.size() + " plots)";
-        Runnable run = () -> {
-            PlotSquared.debug("Calculating plots to purge, please wait...");
-            HashSet<Integer> ids = new HashSet<>();
-            for (Plot plot : toDelete) {
-                if (plot.temp != Integer.MAX_VALUE) {
-                    ids.add(plot.temp);
-                    plot.getArea().removePlot(plot.getId());
-                    for (PlotPlayer pp : plot.getPlayersInPlot()) {
-                        PlotListener.plotEntry(pp, plot);
-                    }
-                    plot.removeSign();
-                }
-            }
-            DBFunc.purgeIds(ids);
-            C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
-        };
-        if (hasConfirmation(player)) {
-            CmdConfirm.addPending(player, cmd, run);
-        } else {
-            run.run();
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
deleted file mode 100644
index d8103e5b8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.UUID;
-
-@CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
-    usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
-    requiredType = RequiredType.NONE) public class Rate extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length == 1) {
-            switch (args[0].toLowerCase()) {
-                case "next": {
-                    ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getBasePlots());
-                    plots.sort((p1, p2) -> {
-                        double v1 = 0;
-                        if (!p1.getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                v1 -= 11 - entry.getValue().getAverageRating();
-                            }
-                        }
-                        double v2 = 0;
-                        if (!p2.getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                v2 -= 11 - entry.getValue().getAverageRating();
-                            }
-                        }
-                        if (v1 == v2) {
-                            return -0;
-                        }
-                        return v2 > v1 ? 1 : -1;
-                    });
-                    UUID uuid = player.getUUID();
-                    for (Plot p : plots) {
-                        if ((!Settings.Done.REQUIRED_FOR_RATINGS || p.hasFlag(Flags.DONE)) && p
-                            .isBasePlot() && (!p.getRatings().containsKey(uuid)) && !p
-                            .isAdded(uuid)) {
-                            p.teleportPlayer(player);
-                            MainUtil.sendMessage(player, C.RATE_THIS);
-                            return true;
-                        }
-                    }
-                    MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
-                    return false;
-                }
-                case "purge": {
-                    final Plot plot = player.getCurrentPlot();
-                    if (plot == null) {
-                        return !sendMessage(player, C.NOT_IN_PLOT);
-                    }
-                    if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_RATE, true)) {
-                        return false;
-                    }
-                    plot.clearRatings();
-                    C.RATINGS_PURGED.send(player);
-                    return true;
-                }
-            }
-        }
-        final Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            sendMessage(player, C.RATING_NOT_OWNED);
-            return false;
-        }
-        if (plot.isOwner(player.getUUID())) {
-            sendMessage(player, C.RATING_NOT_YOUR_OWN);
-            return false;
-        }
-        if (Settings.Done.REQUIRED_FOR_RATINGS && !plot.hasFlag(Flags.DONE)) {
-            sendMessage(player, C.RATING_NOT_DONE);
-            return false;
-        }
-        if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
-            final Runnable run = new Runnable() {
-                @Override public void run() {
-                    if (plot.getRatings().containsKey(player.getUUID())) {
-                        sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
-                        return;
-                    }
-                    final MutableInt index = new MutableInt(0);
-                    final MutableInt rating = new MutableInt(0);
-                    String title = Settings.Ratings.CATEGORIES.get(0);
-                    PlotInventory inventory = new PlotInventory(player, 1, title) {
-                        @Override public boolean onClick(int i) {
-                            rating.add((i + 1) * Math.pow(10, index.getValue()));
-                            index.increment();
-                            if (index.getValue() >= Settings.Ratings.CATEGORIES.size()) {
-                                int rV = rating.getValue();
-                                Rating result =
-                                    EventUtil.manager.callRating(this.player, plot, new Rating(rV));
-                                if (result != null) {
-                                    plot.addRating(this.player.getUUID(), result);
-                                    sendMessage(this.player, C.RATING_APPLIED,
-                                        plot.getId().toString());
-                                    if (Permissions
-                                        .hasPermission(this.player, C.PERMISSION_COMMENT)) {
-                                        Command command =
-                                            MainCommand.getInstance().getCommand(Comment.class);
-                                        if (command != null) {
-                                            MainUtil.sendMessage(this.player, C.COMMENT_THIS,
-                                                command.getUsage());
-                                        }
-                                    }
-                                }
-                                return false;
-                            }
-                            setTitle(Settings.Ratings.CATEGORIES.get(index.getValue()));
-                            return true;
-                        }
-                    };
-                    inventory.setItem(0, new PlotItemStack("minecraft:brown_wool", 0, "0/8"));
-                    inventory.setItem(1, new PlotItemStack(35, (short) 14, 1, "1/8"));
-                    inventory.setItem(2, new PlotItemStack(35, (short) 1, 2, "2/8"));
-                    inventory.setItem(3, new PlotItemStack(35, (short) 4, 3, "3/8"));
-                    inventory.setItem(4, new PlotItemStack(35, (short) 5, 4, "4/8"));
-                    inventory.setItem(5, new PlotItemStack(35, (short) 9, 5, "5/8"));
-                    inventory.setItem(6, new PlotItemStack(35, (short) 11, 6, "6/8"));
-                    inventory.setItem(7, new PlotItemStack(35, (short) 10, 7, "7/8"));
-                    inventory.setItem(8, new PlotItemStack(35, (short) 2, 8, "8/8"));
-                    inventory.openInventory();
-                }
-            };
-            if (plot.getSettings().ratings == null) {
-                if (!Settings.Enabled_Components.RATING_CACHE) {
-                    TaskManager.runTaskAsync(() -> {
-                        plot.getSettings().ratings = DBFunc.getRatings(plot);
-                        run.run();
-                    });
-                    return true;
-                }
-                plot.getSettings().ratings = new HashMap<>();
-            }
-            run.run();
-            return true;
-        }
-        if (args.length < 1) {
-            sendMessage(player, C.RATING_NOT_VALID);
-            return true;
-        }
-        String arg = args[0];
-        final int rating;
-        if (MathMan.isInteger(arg) && arg.length() < 3 && !arg.isEmpty()) {
-            rating = Integer.parseInt(arg);
-            if (rating > 10 || rating < 1) {
-                sendMessage(player, C.RATING_NOT_VALID);
-                return false;
-            }
-        } else {
-            sendMessage(player, C.RATING_NOT_VALID);
-            return false;
-        }
-        final UUID uuid = player.getUUID();
-        final Runnable run = () -> {
-            if (plot.getRatings().containsKey(uuid)) {
-                sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
-                return;
-            }
-            Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
-            if (result != null) {
-                plot.addRating(uuid, result);
-                sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
-            }
-        };
-        if (plot.getSettings().ratings == null) {
-            if (!Settings.Enabled_Components.RATING_CACHE) {
-                TaskManager.runTaskAsync(() -> {
-                    plot.getSettings().ratings = DBFunc.getRatings(plot);
-                    run.run();
-                });
-                return true;
-            }
-            plot.getSettings().ratings = new HashMap<>();
-        }
-        run.run();
-        return true;
-    }
-
-    private class MutableInt {
-
-        private int value;
-
-        MutableInt(int i) {
-            this.value = i;
-        }
-
-        void increment() {
-            this.value++;
-        }
-
-        void decrement() {
-            this.value--;
-        }
-
-        int getValue() {
-            return this.value;
-        }
-
-        void add(Number v) {
-            this.value += v.intValue();
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
deleted file mode 100644
index 9edf20a62..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-@CommandDeclaration(command = "regenallroads",
-    description = "Regenerate all roads in the map using the set road schematic",
-    aliases = {"rgar"}, usage = "/plot regenallroads <world> [height]",
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE,
-    permission = "plots.regenallroads") public class RegenAllRoads extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        int height = 0;
-        if (args.length == 2) {
-            try {
-                height = Integer.parseInt(args[1]);
-            } catch (NumberFormatException ignored) {
-                MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0, 256)");
-                MainUtil
-                    .sendMessage(player, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
-                return false;
-            }
-        } else if (args.length != 1) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
-            return false;
-        }
-        PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
-        if (area == null) {
-            C.NOT_VALID_PLOT_WORLD.send(player, args[0]);
-            return false;
-        }
-        String name = args[0];
-        PlotManager manager = area.getPlotManager();
-        if (!(manager instanceof HybridPlotManager)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
-            return false;
-        }
-        //Set<ChunkLoc> chunks = ChunkManager.manager.getChunkChunks(name);
-        MainUtil
-            .sendMessage(player, "&cIf no schematic is set, the following will not do anything");
-        MainUtil.sendMessage(player,
-            "&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic");
-        //MainUtil.sendMessage(player, "&6Potential chunks to update: &7" + (chunks.size() * 1024));
-        //MainUtil.sendMessage(player, "&6Estimated time: &7" + chunks.size() + " seconds");
-        boolean result = HybridUtils.manager.scheduleRoadUpdate(area, height);
-        if (!result) {
-            MainUtil.sendMessage(player,
-                "&cCannot schedule mass schematic update! (Is one already in progress?)");
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
deleted file mode 100644
index 79a87b887..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-
-import java.util.HashSet;
-
-@CommandDeclaration(command = "relight", description = "Relight your plot", usage = "/plot relight",
-    category = CommandCategory.DEBUG) public class Relight extends Command {
-    public Relight() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        final Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            C.NOT_IN_PLOT.send(player);
-            return;
-        }
-        HashSet<RegionWrapper> regions = plot.getRegions();
-        final LocalBlockQueue queue = plot.getArea().getQueue(false);
-        ChunkManager.chunkTask(plot, new RunnableVal<int[]>() {
-            @Override public void run(int[] value) {
-                queue.fixChunkLighting(value[0], value[1]);
-            }
-        }, new Runnable() {
-            @Override public void run() {
-                plot.refreshChunks();
-                C.SET_BLOCK_ACTION_FINISHED.send(player);
-            }
-        }, 5);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
deleted file mode 100644
index 71ee2e840..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.configuration.MemorySection;
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-import java.io.IOException;
-import java.util.Objects;
-
-@CommandDeclaration(command = "reload", aliases = "rl", permission = "plots.admin.command.reload",
-    description = "Reload translations and world settings", usage = "/plot reload",
-    category = CommandCategory.ADMINISTRATION) public class Reload extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        try {
-            // The following won't affect world generation, as that has to be
-            // loaded during startup unfortunately.
-            PlotSquared.get().setupConfigs();
-            C.load(PlotSquared.get().translationFile);
-            PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-                @Override public void run(PlotArea area) {
-                    ConfigurationSection worldSection = PlotSquared.get().worlds
-                        .getConfigurationSection("worlds." + area.worldname);
-                    if (worldSection == null) {
-                        return;
-                    }
-                    if (area.TYPE != 2 || !worldSection.contains("areas")) {
-                        area.saveConfiguration(worldSection);
-                        area.loadDefaultConfiguration(worldSection);
-                    } else {
-                        ConfigurationSection areaSection = worldSection.getConfigurationSection(
-                            "areas." + area.id + "-" + area.getMin() + "-" + area.getMax());
-                        YamlConfiguration clone = new YamlConfiguration();
-                        for (String key : areaSection.getKeys(true)) {
-                            if (areaSection.get(key) instanceof MemorySection) {
-                                continue;
-                            }
-                            if (!clone.contains(key)) {
-                                clone.set(key, areaSection.get(key));
-                            }
-                        }
-                        for (String key : worldSection.getKeys(true)) {
-                            if (worldSection.get(key) instanceof MemorySection) {
-                                continue;
-                            }
-                            if (!key.startsWith("areas") && !clone.contains(key)) {
-                                clone.set(key, worldSection.get(key));
-                            }
-                        }
-                        area.saveConfiguration(clone);
-                        // netSections is the combination of
-                        for (String key : clone.getKeys(true)) {
-                            if (clone.get(key) instanceof MemorySection) {
-                                continue;
-                            }
-                            if (!worldSection.contains(key)) {
-                                worldSection.set(key, clone.get(key));
-                            } else {
-                                Object value = worldSection.get(key);
-                                if (Objects.equals(value, clone.get(key))) {
-                                    areaSection.set(key, clone.get(key));
-                                }
-                            }
-                        }
-                        area.loadDefaultConfiguration(clone);
-                    }
-                }
-            });
-            PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-            MainUtil.sendMessage(player, C.RELOADED_CONFIGS);
-        } catch (IOException e) {
-            e.printStackTrace();
-            MainUtil.sendMessage(player, C.RELOAD_FAILED);
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
deleted file mode 100644
index bf027f20d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "remove", aliases = {"r", "untrust", "ut", "undeny", "unban", "ud"},
-    description = "Remove a player from a plot", usage = "/plot remove <player>",
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE,
-    permission = "plots.remove") public class Remove extends SubCommand {
-
-    public Remove() {
-        super(Argument.PlayerName);
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location location = player.getLocation();
-        Plot plot = location.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_REMOVE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return true;
-        }
-        int count = 0;
-        switch (args[0]) {
-            case "unknown": {
-                ArrayList<UUID> toRemove = new ArrayList<>();
-                HashSet<UUID> all = new HashSet<>();
-                all.addAll(plot.getMembers());
-                all.addAll(plot.getTrusted());
-                all.addAll(plot.getDenied());
-                for (UUID uuid : all) {
-                    if (UUIDHandler.getName(uuid) == null) {
-                        toRemove.add(uuid);
-                        count++;
-                    }
-                }
-                for (UUID uuid : toRemove) {
-                    plot.removeDenied(uuid);
-                    plot.removeTrusted(uuid);
-                    plot.removeMember(uuid);
-                }
-                break;
-            }
-            default:
-                Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-                if (!uuids.isEmpty()) {
-                    for (UUID uuid : uuids) {
-                        if (uuid == DBFunc.EVERYONE) {
-                            if (plot.removeTrusted(uuid)) {
-                                EventUtil.manager.callTrusted(player, plot, uuid, false);
-                                count++;
-                            } else if (plot.removeMember(uuid)) {
-                                EventUtil.manager.callMember(player, plot, uuid, false);
-                                count++;
-                            } else if (plot.removeDenied(uuid)) {
-                                EventUtil.manager.callDenied(player, plot, uuid, false);
-                                count++;
-                            }
-                        } else if (plot.getTrusted().contains(uuid)) {
-                            if (plot.removeTrusted(uuid)) {
-                                EventUtil.manager.callTrusted(player, plot, uuid, false);
-                                count++;
-                            }
-                        } else if (plot.getMembers().contains(uuid)) {
-                            if (plot.removeMember(uuid)) {
-                                EventUtil.manager.callMember(player, plot, uuid, false);
-                                count++;
-                            }
-                        } else if (plot.getDenied().contains(uuid)) {
-                            if (plot.removeDenied(uuid)) {
-                                EventUtil.manager.callDenied(player, plot, uuid, false);
-                                count++;
-                            }
-                        }
-                    }
-                }
-                break;
-        }
-        if (count == 0) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
-            return false;
-        } else {
-            MainUtil.sendMessage(player, C.REMOVED_PLAYERS, count + "");
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
deleted file mode 100644
index 3f13368de..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandCaller;
-
-public enum RequiredType {
-    CONSOLE, PLAYER, NONE;
-
-    public boolean allows(CommandCaller player) {
-        switch (this) {
-            case NONE:
-                return true;
-            default:
-                return this == player.getSuperCaller();
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
deleted file mode 100644
index aec9543ed..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.sk89q.jnbt.CompoundTag;
-
-import java.net.URL;
-import java.util.List;
-import java.util.UUID;
-
-@CommandDeclaration(command = "save", aliases = {"backup"}, description = "Save your plot",
-    category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE,
-    permission = "plots.save") public class Save extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        String world = player.getLocation().getWorld();
-        if (!PlotSquared.get().hasPlotArea(world)) {
-            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
-        }
-        final Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-            return false;
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SAVE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-            return false;
-        }
-        plot.addRunning();
-        SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
-            @Override public void run(final CompoundTag value) {
-                TaskManager.runTaskAsync(() -> {
-                    String time = (System.currentTimeMillis() / 1000) + "";
-                    Location[] corners = plot.getCorners();
-                    corners[0].setY(0);
-                    corners[1].setY(255);
-                    int size = (corners[1].getX() - corners[0].getX()) + 1;
-                    PlotId id = plot.getId();
-                    String world1 = plot.getArea().toString().replaceAll(";", "-")
-                        .replaceAll("[^A-Za-z0-9]", "");
-                    final String file = time + '_' + world1 + '_' + id.x + '_' + id.y + '_' + size;
-                    UUID uuid = player.getUUID();
-                    SchematicHandler.manager.upload(value, uuid, file, new RunnableVal<URL>() {
-                        @Override public void run(URL url) {
-                            plot.removeRunning();
-                            if (url == null) {
-                                MainUtil.sendMessage(player, C.SAVE_FAILED);
-                                return;
-                            }
-                            MainUtil.sendMessage(player, C.SAVE_SUCCESS);
-                            List<String> schematics = player.getMeta("plot_schematics");
-                            if (schematics != null) {
-                                schematics.add(file + ".schematic");
-                            }
-                        }
-                    });
-                });
-            }
-        });
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
deleted file mode 100644
index 110992543..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.UUID;
-
-@CommandDeclaration(command = "schematic", permission = "plots.schematic",
-    description = "Schematic command", aliases = {"sch", "schem"},
-    category = CommandCategory.SCHEMATIC, usage = "/plot schematic <arg...>")
-public class SchematicCmd extends SubCommand {
-
-    private boolean running = false;
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length < 1) {
-            sendMessage(player, C.SCHEMATIC_MISSING_ARG);
-            return true;
-        }
-        String arg = args[0].toLowerCase();
-        switch (arg) {
-            case "paste": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_PASTE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_PASTE);
-                    return false;
-                }
-                if (args.length < 2) {
-                    sendMessage(player, C.SCHEMATIC_MISSING_ARG);
-                    break;
-                }
-                Location loc = player.getLocation();
-                final Plot plot = loc.getPlotAbs();
-                if (plot == null) {
-                    return !sendMessage(player, C.NOT_IN_PLOT);
-                }
-                if (!plot.hasOwner()) {
-                    MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-                    return false;
-                }
-                if (!plot.isOwner(player.getUUID()) && !Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE)) {
-                    MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-                    return false;
-                }
-                if (this.running) {
-                    MainUtil.sendMessage(player, "&cTask is already running.");
-                    return false;
-                }
-                final String location = args[1];
-                this.running = true;
-                TaskManager.runTaskAsync(() -> {
-                    Schematic schematic = null;
-                    if (location.startsWith("url:")) {
-                        try {
-                            UUID uuid = UUID.fromString(location.substring(4));
-                            URL base = new URL(Settings.Web.URL);
-                            URL url = new URL(base, "uploads/" + uuid + ".schematic");
-                            schematic = SchematicHandler.manager.getSchematic(url);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            sendMessage(player, C.SCHEMATIC_INVALID,
-                                "non-existent url: " + location);
-                            SchematicCmd.this.running = false;
-                            return;
-                        }
-                    } else {
-                        try {
-                            schematic = SchematicHandler.manager.getSchematic(location);
-                        } catch (SchematicHandler.UnsupportedFormatException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                    if (schematic == null) {
-                        SchematicCmd.this.running = false;
-                        sendMessage(player, C.SCHEMATIC_INVALID,
-                            "non-existent or not in gzip format");
-                        return;
-                    }
-                    SchematicHandler.manager
-                        .paste(schematic, plot, 0, 1, 0, false, new RunnableVal<Boolean>() {
-                            @Override public void run(Boolean value) {
-                                SchematicCmd.this.running = false;
-                                if (value) {
-                                    sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
-                                } else {
-                                    sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
-                                }
-                            }
-                        });
-                });
-                break;
-            }
-            //            TODO test
-            //            case "test": {
-            //                if (!Permissions.hasPermission(plr, "plots.schematic.test")) {
-            //                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
-            //                    return false;
-            //                }
-            //                if (args.length < 2) {
-            //                    sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
-            //                    return false;
-            //                }
-            //                final Location loc = plr.getLocation();
-            //                final Plot plot = MainUtil.getPlot(loc);
-            //                if (plot == null) {
-            //                    sendMessage(plr, C.NOT_IN_PLOT);
-            //                    return false;
-            //                }
-            //                file = args[1];
-            //                schematic = SchematicHandler.manager.getSchematic(file);
-            //                if (schematic == null) {
-            //                    sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
-            //                    return false;
-            //                }
-            //                final int l1 = schematic.getSchematicDimension().getX();
-            //                final int l2 = schematic.getSchematicDimension().getZ();
-            //                final int length = MainUtil.getPlotWidth(loc.getWorld(), plot.id);
-            //                if ((l1 < length) || (l2 < length)) {
-            //                    sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
-            //                    break;
-            //                }
-            //                sendMessage(plr, C.SCHEMATIC_VALID);
-            //                break;
-            //            }
-            case "saveall":
-            case "exportall": {
-                if (!(player instanceof ConsolePlayer)) {
-                    MainUtil.sendMessage(player, C.NOT_CONSOLE);
-                    return false;
-                }
-                if (args.length != 2) {
-                    MainUtil.sendMessage(player,
-                        "&cNeed world argument. Use &7/plot sch exportall <area>");
-                    return false;
-                }
-                PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
-                if (area == null) {
-                    C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
-                    return false;
-                }
-                Collection<Plot> plots = area.getPlots();
-                if (plots.isEmpty()) {
-                    MainUtil
-                        .sendMessage(player, "&cInvalid world. Use &7/plot sch exportall <area>");
-                    return false;
-                }
-                boolean result = SchematicHandler.manager.exportAll(plots, null, null,
-                    () -> MainUtil.sendMessage(player, "&aFinished mass export"));
-                if (!result) {
-                    MainUtil.sendMessage(player, "&cTask is already running.");
-                    return false;
-                } else {
-                    MainUtil.sendMessage(player,
-                        "&3Plot&8->&3Schematic&8: &7Mass export has started. This may take a while.");
-                    MainUtil.sendMessage(player,
-                        "&3Plot&8->&3Schematic&8: &7Found &c" + plots.size() + "&7 plots...");
-                }
-                break;
-            }
-            case "export":
-            case "save":
-                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_SAVE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_SAVE);
-                    return false;
-                }
-                if (this.running) {
-                    MainUtil.sendMessage(player, "&cTask is already running.");
-                    return false;
-                }
-                Location location = player.getLocation();
-                Plot plot = location.getPlotAbs();
-                if (plot == null) {
-                    return !sendMessage(player, C.NOT_IN_PLOT);
-                }
-                if (!plot.hasOwner()) {
-                    MainUtil.sendMessage(player, C.PLOT_UNOWNED);
-                    return false;
-                }
-                if (!plot.isOwner(player.getUUID()) && !Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE)) {
-                    MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-                    return false;
-                }
-                location.getWorld();
-                Collection<Plot> plots = new ArrayList<>();
-                plots.add(plot);
-                boolean result = SchematicHandler.manager.exportAll(plots, null, null, () -> {
-                    MainUtil.sendMessage(player, "&aFinished export");
-                    SchematicCmd.this.running = false;
-                });
-                if (!result) {
-                    MainUtil.sendMessage(player, "&cTask is already running.");
-                    return false;
-                } else {
-                    MainUtil.sendMessage(player, "&7Starting export...");
-                }
-                break;
-            case "list": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_LIST)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_LIST);
-                    return false;
-                }
-                final String string =
-                    StringMan.join(SchematicHandler.manager.getShematicNames(), "$2, $1");
-                C.SCHEMATIC_LIST.send(player, string);
-            }
-            break;
-            default:
-                sendMessage(player, C.SCHEMATIC_MISSING_ARG);
-                break;
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
deleted file mode 100644
index 95166aa4a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration.UnknownBlockException;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-
-@CommandDeclaration(command = "set", description = "Set a plot value", aliases = {"s"},
-    usage = "/plot set <biome|alias|home|flag> <value...>", permission = "plots.set",
-    category = CommandCategory.APPEARANCE, requiredType = RequiredType.NONE) public class Set
-    extends SubCommand {
-
-    public static final String[] values = new String[] {"biome", "alias", "home", "flag"};
-    public static final String[] aliases = new String[] {"b", "w", "wf", "f", "a", "h", "fl"};
-
-    private final SetCommand component;
-
-    public Set() {
-        this.component = new SetCommand() {
-
-            @Override public String getId() {
-                return "set.component";
-            }
-
-            @Override public boolean set(PlotPlayer player, final Plot plot, String value) {
-                PlotArea plotArea = player.getLocation().getPlotArea();
-                PlotManager manager = player.getLocation().getPlotManager();
-                String[] components = manager.getPlotComponents(plotArea, plot.getId());
-                boolean allowUnsafe = DebugAllowUnsafe.unsafeAllowed.contains(player.getUUID());
-
-                String[] args = value.split(" ");
-                String material =
-                    StringMan.join(Arrays.copyOfRange(args, 1, args.length), ",").trim();
-
-                for (String component : components) {
-                    if (component.equalsIgnoreCase(args[0])) {
-                        if (!Permissions
-                            .hasPermission(player, C.PERMISSION_SET_COMPONENT.f(component))) {
-                            MainUtil.sendMessage(player, C.NO_PERMISSION,
-                                C.PERMISSION_SET_COMPONENT.f(component));
-                            return false;
-                        }
-                        // PlotBlock[] blocks;
-                        BlockBucket bucket;
-                        try {
-                            if (args.length < 2) {
-                                MainUtil.sendMessage(player, C.NEED_BLOCK);
-                                return true;
-                            }
-                            String[] split = material.split(",");
-                            // blocks = Configuration.BLOCKLIST.parseString(material);
-
-                            try {
-                                bucket = Configuration.BLOCK_BUCKET.parseString(material);
-                            } catch (final UnknownBlockException unknownBlockException) {
-                                final String unknownBlock = unknownBlockException.getUnknownValue();
-                                C.NOT_VALID_BLOCK.send(player, unknownBlock);
-                                StringComparison<PlotBlock>.ComparisonResult match =
-                                    WorldUtil.IMP.getClosestBlock(unknownBlock);
-                                if (match != null) {
-                                    final String found =
-                                        WorldUtil.IMP.getClosestMatchingName(match.best);
-                                    if (found != null) {
-                                        MainUtil.sendMessage(player, C.DID_YOU_MEAN,
-                                            found.toLowerCase());
-                                    }
-                                }
-                                return false;
-                            }
-
-                            if (!allowUnsafe) {
-                                for (final PlotBlock block : bucket.getBlocks()) {
-                                    if (!block.isAir() && !WorldUtil.IMP.isBlockSolid(block)) {
-                                        C.NOT_ALLOWED_BLOCK.send(player, block.toString());
-                                        return false;
-                                    }
-                                }
-                            }
-                        } catch (Exception ignored) {
-                            MainUtil.sendMessage(player, C.NOT_VALID_BLOCK, material);
-                            return false;
-                        }
-                        if (plot.getRunning() > 0) {
-                            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
-                            return false;
-                        }
-                        plot.addRunning();
-                        for (Plot current : plot.getConnectedPlots()) {
-                            current.setComponent(component, bucket);
-                        }
-                        MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
-                        GlobalBlockQueue.IMP.addTask(new Runnable() {
-                            @Override public void run() {
-                                plot.removeRunning();
-                            }
-                        });
-                        return true;
-                    }
-                }
-                return false;
-            }
-        };
-    }
-
-    public boolean noArgs(PlotPlayer player) {
-        ArrayList<String> newValues = new ArrayList<>();
-        newValues.addAll(Arrays.asList("biome", "alias", "home", "flag"));
-        Plot plot = player.getCurrentPlot();
-        if (plot != null) {
-            newValues.addAll(
-                Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
-        }
-        MainUtil.sendMessage(player, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan
-            .join(newValues, C.BLOCK_LIST_SEPARATER.formatted()));
-        return false;
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        if (args.length == 0) {
-            return noArgs(player);
-        }
-        Command cmd = MainCommand.getInstance().getCommand("set" + args[0]);
-        if (cmd != null) {
-            if (!Permissions.hasPermission(player, cmd.getPermission(), true)) {
-                return false;
-            }
-            cmd.execute(player, Arrays.copyOfRange(args, 1, args.length), null, null);
-            return true;
-        }
-        // Additional checks
-        Plot plot = player.getCurrentPlot();
-        if (plot == null) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
-            return false;
-        }
-        // components
-        HashSet<String> components = new HashSet<>(
-            Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
-        if (components.contains(args[0].toLowerCase())) {
-            return this.component.onCommand(player, Arrays.copyOfRange(args, 0, args.length));
-        }
-        // flag
-        Flag<?> flag = FlagManager.getFlag(args[0].toLowerCase());
-        if (Flags.getFlags().contains(flag)) {
-            StringBuilder a = new StringBuilder();
-            if (args.length > 1) {
-                for (int x = 1; x < args.length; x++) {
-                    a.append(" ").append(args[x]);
-                }
-            }
-            MainCommand.onCommand(player, ("flag set " + args[0] + a.toString()).split(" "));
-            return true;
-        }
-        return noArgs(player);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
deleted file mode 100644
index aaa1adfa2..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-public abstract class SetCommand extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                    C.PERMISSION_ADMIN_COMMAND.f(getFullId()));
-                MainUtil.sendMessage(player, C.PLOT_NOT_CLAIMED);
-                return false;
-            }
-        }
-        if (!plot.isOwner(player.getUUID())) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                    C.PERMISSION_ADMIN_COMMAND.f(getFullId()));
-                MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-                return false;
-            }
-        }
-        if (args.length == 0) {
-            return set(player, plot, "");
-        }
-        return set(player, plot, StringMan.join(args, " "));
-    }
-
-    public abstract boolean set(PlotPlayer player, Plot plot, String value);
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
deleted file mode 100644
index fc92cc550..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.BlockLoc;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-@CommandDeclaration(command = "sethome", permission = "plots.set.home",
-    description = "Set the plot home to your current position", usage = "/plot sethome [none]",
-    aliases = {"sh", "seth"}, category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE)
-public class SetHome extends SetCommand {
-
-    @Override public boolean set(PlotPlayer player, Plot plot, String value) {
-        switch (value.toLowerCase()) {
-            case "unset":
-            case "reset":
-            case "remove":
-            case "none": {
-                Plot base = plot.getBasePlot(false);
-                base.setHome(null);
-                return MainUtil.sendMessage(player, C.POSITION_UNSET);
-            }
-            case "":
-                Plot base = plot.getBasePlot(false);
-                Location bot = base.getBottomAbs();
-                Location loc = player.getLocationFull();
-                BlockLoc rel =
-                    new BlockLoc(loc.getX() - bot.getX(), loc.getY(), loc.getZ() - bot.getZ(),
-                        loc.getYaw(), loc.getPitch());
-                base.setHome(rel);
-                return MainUtil.sendMessage(player, C.POSITION_SET);
-            default:
-                MainUtil.sendMessage(player, C.HOME_ARGUMENT);
-                return false;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
deleted file mode 100644
index facea4952..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
+++ /dev/null
@@ -1,434 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
-import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import lombok.*;
-
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.Map.Entry;
-
-@CommandDeclaration(command = "setup", permission = "plots.admin.command.setup",
-    description = "Setup wizard for plot worlds", usage = "/plot setup", aliases = {"create"},
-    category = CommandCategory.ADMINISTRATION) public class Setup extends SubCommand {
-
-    public void displayGenerators(PlotPlayer player) {
-        StringBuilder message = new StringBuilder();
-        message.append("&6What generator do you want?");
-        for (Entry<String, GeneratorWrapper<?>> entry : SetupUtils.generators.entrySet()) {
-            if (entry.getKey().equals(PlotSquared.imp().getPluginName())) {
-                message.append("\n&8 - &2").append(entry.getKey()).append(" (Default Generator)");
-            } else if (entry.getValue().isFull()) {
-                message.append("\n&8 - &7").append(entry.getKey()).append(" (Plot Generator)");
-            } else {
-                message.append("\n&8 - &7").append(entry.getKey()).append(" (Unknown structure)");
-            }
-        }
-        MainUtil.sendMessage(player, message.toString());
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        // going through setup
-        SetupObject object = player.getMeta("setup");
-        if (object == null) {
-            object = new SetupObject();
-            player.setMeta("setup", object);
-            SetupUtils.manager.updateGenerators();
-            sendMessage(player, C.SETUP_INIT);
-            displayGenerators(player);
-            return false;
-        }
-        if (args.length == 1) {
-            if (args[0].equalsIgnoreCase("cancel")) {
-                player.deleteMeta("setup");
-                MainUtil.sendMessage(player, "&aCancelled setup");
-                return false;
-            }
-            if (args[0].equalsIgnoreCase("back")) {
-                if (object.setup_index > 0) {
-                    object.setup_index--;
-                    ConfigurationNode node = object.step[object.setup_index];
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, node.getDescription(),
-                        node.getType().getType(), String.valueOf(node.getDefaultValue()));
-                    return false;
-                } else if (object.current > 0) {
-                    object.current--;
-                }
-            }
-        }
-        int index = object.current;
-        switch (index) {
-            case 0:  // choose generator
-                if (args.length != 1 || !SetupUtils.generators.containsKey(args[0])) {
-                    String prefix = "\n&8 - &7";
-                    MainUtil.sendMessage(player,
-                        "&cYou must choose a generator!" + prefix + StringMan
-                            .join(SetupUtils.generators.keySet(), prefix)
-                            .replaceAll(PlotSquared.imp().getPluginName(),
-                                "&2" + PlotSquared.imp().getPluginName()));
-                    sendMessage(player, C.SETUP_INIT);
-                    return false;
-                }
-                object.setupGenerator = args[0];
-                object.current++;
-                String partial = "\n&8 - &7PARTIAL&8 - &7Vanilla with clusters of plots";
-                MainUtil.sendMessage(player,
-                    "&6What world type do you want?\n&8 - &2DEFAULT&8 - &7Standard plot generation"
-                        + "\n&8 - &7AUGMENTED&8 - &7Plot generation with terrain" + partial);
-                break;
-            case 1:  // choose world type
-                List<String> allTypes = Arrays.asList("default", "augmented", "partial");
-                List<String> allDesc = Arrays
-                    .asList("Standard plot generation", "Plot generation with vanilla terrain",
-                        "Vanilla with clusters of plots");
-                ArrayList<String> types = new ArrayList<>();
-                if (SetupUtils.generators.get(object.setupGenerator).isFull()) {
-                    types.add("default");
-                }
-                types.add("augmented");
-                types.add("partial");
-                if (args.length != 1 || !types.contains(args[0].toLowerCase())) {
-                    MainUtil.sendMessage(player, "&cYou must choose a world type!");
-                    for (String type : types) {
-                        int i = allTypes.indexOf(type);
-                        if (type.equals("default")) {
-                            MainUtil
-                                .sendMessage(player, "&8 - &2" + type + " &8-&7 " + allDesc.get(i));
-                        } else {
-                            MainUtil
-                                .sendMessage(player, "&8 - &7" + type + " &8-&7 " + allDesc.get(i));
-                        }
-                    }
-                    return false;
-                }
-                object.type = allTypes.indexOf(args[0].toLowerCase());
-                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
-                if (object.type == 0) {
-                    object.current = 6;
-                    if (object.step == null) {
-                        object.plotManager = object.setupGenerator;
-                        object.step =
-                            SetupUtils.generators.get(object.plotManager).getPlotGenerator()
-                                .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
-                                .getSettingNodes();
-                        SetupUtils.generators.get(object.plotManager).getPlotGenerator()
-                            .processSetup(object);
-                    }
-                    if (object.step.length == 0) {
-                        MainUtil.sendMessage(player, "&6What do you want your world to be called?");
-                        object.setup_index = 0;
-                        return true;
-                    }
-                    ConfigurationNode step = object.step[object.setup_index];
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
-                } else {
-                    if (gen.isFull()) {
-                        object.plotManager = object.setupGenerator;
-                        object.setupGenerator = null;
-                        object.step =
-                            SetupUtils.generators.get(object.plotManager).getPlotGenerator()
-                                .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
-                                .getSettingNodes();
-                        SetupUtils.generators.get(object.plotManager).getPlotGenerator()
-                            .processSetup(object);
-                    } else {
-                        object.plotManager = PlotSquared.imp().getPluginName();
-                        MainUtil.sendMessage(player,
-                            "&c[WARNING] The specified generator does not identify as BukkitPlotGenerator");
-                        MainUtil.sendMessage(player,
-                            "&7 - You may need to manually configure the other plugin");
-                        object.step =
-                            SetupUtils.generators.get(object.plotManager).getPlotGenerator()
-                                .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
-                                .getSettingNodes();
-                    }
-                    if (object.type == 2) {
-                        MainUtil.sendMessage(player, "What would you like this area called?");
-                        object.current++;
-                    } else {
-                        MainUtil.sendMessage(player, "&6What terrain would you like in plots?"
-                            + "\n&8 - &2NONE&8 - &7No terrain at all"
-                            + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
-                            + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
-                            + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
-                        object.current = 5;
-                    }
-                }
-                break;
-            case 2:  // area id
-                if (!StringMan.isAlphanumericUnd(args[0])) {
-                    MainUtil.sendMessage(player, "&cThe area id must be alphanumerical!");
-                    return false;
-                }
-                for (PlotArea area : PlotSquared.get().getPlotAreas()) {
-                    if (area.id != null && area.id.equalsIgnoreCase(args[0])) {
-                        MainUtil.sendMessage(player,
-                            "&cYou must choose an area id that is not in use!");
-                        return false;
-                    }
-                }
-                object.id = args[0];
-                object.current++;
-                MainUtil.sendMessage(player, "&6What should be the minimum Plot Id?");
-                break;
-            case 3:  // min
-                object.min = PlotId.fromString(args[0]);
-                if (object.min == null) {
-                    MainUtil.sendMessage(player, "&cYou must choose a valid minimum PlotId!");
-                    return false;
-                }
-                object.current++;
-                MainUtil.sendMessage(player, "&6What should be the maximum Plot Id?");
-                break;
-            case 4:
-                // max
-                PlotId id = PlotId.fromString(args[0]);
-                if (id == null) {
-                    MainUtil.sendMessage(player, "&cYou must choose a valid maximum PlotId!");
-                    return false;
-                }
-                if (id.x <= object.min.x || id.y <= object.min.y) {
-                    MainUtil
-                        .sendMessage(player, "&cThe max PlotId must be greater than the minimum!");
-                    return false;
-                }
-                object.max = id;
-                object.current++;
-                MainUtil.sendMessage(player, "&6What terrain would you like in plots?"
-                    + "\n&8 - &2NONE&8 - &7No terrain at all"
-                    + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
-                    + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
-                    + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
-                break;
-            case 5: { // Choose terrain
-                List<String> terrain = Arrays.asList("none", "ore", "road", "all");
-                if (args.length != 1 || !terrain.contains(args[0].toLowerCase())) {
-                    MainUtil.sendMessage(player,
-                        "&cYou must choose the terrain!" + "\n&8 - &2NONE&8 - &7No terrain at all"
-                            + "\n&8 - &7ORE&8 - &7Just some ore veins and trees"
-                            + "\n&8 - &7ROAD&8 - &7Terrain separated by roads"
-                            + "\n&8 - &7ALL&8 - &7Entirely vanilla generation");
-                    return false;
-                }
-                object.terrain = terrain.indexOf(args[0].toLowerCase());
-                object.current++;
-                if (object.step == null) {
-                    object.step = SetupUtils.generators.get(object.plotManager).getPlotGenerator()
-                        .getNewPlotArea("CheckingPlotSquaredGenerator", null, null, null)
-                        .getSettingNodes();
-                }
-                ConfigurationNode step = object.step[object.setup_index];
-                sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
-                    step.getType().getType(), String.valueOf(step.getDefaultValue()));
-                break;
-            }
-            case 6:  // world setup
-                if (object.setup_index == object.step.length) {
-                    MainUtil.sendMessage(player, "&6What do you want your world to be called?");
-                    object.setup_index = 0;
-                    object.current++;
-                    return true;
-                }
-                ConfigurationNode step = object.step[object.setup_index];
-                if (args.length < 1) {
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
-                    return false;
-                }
-
-                boolean valid = false;
-                try {
-                    valid = step.isValid(args[0]);
-                } catch (final Configuration.UnsafeBlockException e) {
-                    C.NOT_ALLOWED_BLOCK.send(player, e.getUnsafeBlock().toString());
-                }
-                if (valid) {
-                    sendMessage(player, C.SETUP_VALID_ARG, step.getConstant(), args[0]);
-                    step.setValue(args[0]);
-                    object.setup_index++;
-                    if (object.setup_index == object.step.length) {
-                        onCommand(player, args);
-                        return false;
-                    }
-                    step = object.step[object.setup_index];
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
-                    return false;
-                } else {
-                    sendMessage(player, C.SETUP_INVALID_ARG, args[0], step.getConstant());
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
-                    return false;
-                }
-            case 7:
-                if (args.length != 1) {
-                    MainUtil.sendMessage(player, "&cYou need to choose a world name!");
-                    return false;
-                }
-                if (WorldUtil.IMP.isWorld(args[0])) {
-                    if (PlotSquared.get().hasPlotArea(args[0])) {
-                        MainUtil.sendMessage(player, "&cThat world name is already taken!");
-                        return false;
-                    }
-                    MainUtil.sendMessage(player,
-                        "&cThe world you specified already exists. After restarting, new terrain will use "
-                            + PlotSquared.imp().getPluginName() + ", however you may need to "
-                            + "reset the world for it to generate correctly!");
-                }
-                object.world = args[0];
-                player.deleteMeta("setup");
-                String world;
-                if (object.setupManager == null) {
-                    world = SetupUtils.manager.setupWorld(object);
-                } else {
-                    world = object.setupManager.setupWorld(object);
-                }
-                try {
-                    player.teleport(WorldUtil.IMP.getSpawn(world));
-                } catch (Exception e) {
-                    player.sendMessage("&cAn error occurred. See console for more information");
-                    e.printStackTrace();
-                }
-                sendMessage(player, C.SETUP_FINISHED, object.world);
-        }
-        return false;
-    }
-
-    private static final class StepPickGenerator extends SetupStep {
-
-        @Getter private String generator;
-
-        public StepPickGenerator() {
-            super("generator");
-        }
-
-        @Override public Collection<PlotMessage> showDescriptionMessage() {
-            SetupUtils.manager.updateGenerators();
-            final List<PlotMessage> messages = new ArrayList<>();
-            messages.add(new PlotMessage("What generator do you want?").color("$6"));
-            for (Entry<String, GeneratorWrapper<?>> entry : SetupUtils.generators.entrySet()) {
-                final PlotMessage plotMessage = new PlotMessage(" - ").color("$8");
-                if (entry.getKey().equals(PlotSquared.imp().getPluginName())) {
-                    plotMessage.text(entry.getKey()).color("$8").tooltip("Select this generator")
-                        .color("$2").command("/plot setup generator " + entry.getKey())
-                        .text(" (Default Generator)").color("$7");
-                } else if (entry.getValue().isFull()) {
-                    plotMessage.text(entry.getKey()).color("$8").tooltip("Select this generator")
-                        .color("$7").command("/plot setup generator " + entry.getKey())
-                        .text(" (Plot Generator)").color("$7");
-                } else {
-                    plotMessage.text(entry.getKey()).color("$8").tooltip("Select this generator")
-                        .color("$7").command("/plot setup generator " + entry.getKey())
-                        .text(" (Unknown Structure)").color("$7");
-                }
-                messages.add(plotMessage);
-            }
-            return messages;
-        }
-
-        @Override public boolean parseInut(String input) {
-            this.generator = input.toLowerCase();
-            return true;
-        }
-
-        @Nullable @Override public String getDefault() {
-            return null;
-        }
-    }
-
-
-    private static final class StepWorldType extends SetupStep {
-
-        private static final Map<String, String> WORLD_TYPES = new HashMap<>();
-
-        static {
-            WORLD_TYPES.put("default", "Standard plot generation");
-            WORLD_TYPES.put("augmented", "Plot generation with vanilla terrain");
-            WORLD_TYPES.put("partial", "Vanilla clusters of plots");
-        }
-
-        @Getter private String worldType;
-
-        public StepWorldType() {
-            super("type");
-        }
-
-        @Override public Collection<PlotMessage> showDescriptionMessage() {
-            final List<PlotMessage> messages = new ArrayList<>();
-            messages.add(new PlotMessage("What world type do you want?").color("$6"));
-            for (final Map.Entry<String, String> worldType : WORLD_TYPES.entrySet()) {
-                messages.add(new PlotMessage(" - ").color("$8").text(worldType.getKey())
-                    .color(worldType.getKey().equals(getDefault()) ? "$2" : "$7")
-                    .tooltip("Select this world type")
-                    .command("/plot setup type " + worldType.getKey())
-                    .text(" (" + worldType.getValue() + ")").color("$7"));
-            }
-            return messages;
-        }
-
-        @Override public boolean parseInut(String input) {
-            if (!WORLD_TYPES.keySet().contains(input.toLowerCase())) {
-                return false;
-            }
-            this.worldType = input.toLowerCase();
-            return true;
-        }
-
-        @Override public String getDefault() {
-            return "default";
-        }
-    }
-
-
-    @ToString @EqualsAndHashCode(of = "uuid") @AllArgsConstructor
-    private static class SetupContext {
-
-        private final UUID uuid;
-
-        @Getter private String step;
-
-    }
-
-
-    @RequiredArgsConstructor(access = AccessLevel.PROTECTED)
-    private abstract static class SetupStep {
-
-        private final String stepName;
-
-        public abstract Collection<PlotMessage> showDescriptionMessage();
-
-        public abstract boolean parseInut(String input);
-
-        public final PlotMessage getUsage() {
-            return new PlotMessage("Usage: ").color("$1")
-                .text("/plot setup " + this.stepName + " <value>").color("$2").suggest(
-                    "/plot setup " + this.stepName + (this.getDefault() != null ?
-                        this.getDefault() :
-                        ""));
-        }
-
-        @Nullable public abstract String getDefault();
-
-        public void sendToPlayer(@NonNull final PlotPlayer plotPlayer) {
-            new PlotMessage("Setup Step: ").color("$6").text(this.stepName).color("$7")
-                .send(plotPlayer);
-            this.getUsage().send(plotPlayer);
-            this.showDescriptionMessage().forEach(plotMessage -> plotMessage.send(plotPlayer));
-            if (this.getDefault() != null) {
-                new PlotMessage("Default: ").color("$6").text(this.getDefault()).color("$7");
-            }
-        }
-
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
deleted file mode 100644
index 396185e29..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-
-/**
- * SubCommand class
- *
- * @Deprecated In favor of normal Command class
- * @see Command(Command, boolean)
- */
-public abstract class SubCommand extends Command {
-    public SubCommand() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    public SubCommand(Argument... arguments) {
-        this();
-        setRequiredArguments(arguments);
-    }
-
-    @Override public void execute(PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        onCommand(player, args);
-    }
-
-
-    public abstract boolean onCommand(PlotPlayer player, String[] args);
-
-    public boolean sendMessage(PlotPlayer player, C message, Object... args) {
-        message.send(player, args);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
deleted file mode 100644
index 80a96dfb6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-@CommandDeclaration(usage = "/plot swap <X;Z>", command = "swap", description = "Swap two plots",
-    aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE)
-public class Swap extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        Location loc = player.getLocation();
-        Plot plot1 = loc.getPlotAbs();
-        if (plot1 == null) {
-            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot1.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
-            return false;
-        }
-        if (args.length != 1) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
-        if (plot2 == null) {
-            return false;
-        }
-        if (plot1.equals(plot2)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
-            return false;
-        }
-        if (!plot1.getArea().isCompatible(plot2.getArea())) {
-            C.PLOTWORLD_INCOMPATIBLE.send(player);
-            return false;
-        }
-        if (plot1.move(plot2, new Runnable() {
-            @Override public void run() {
-                MainUtil.sendMessage(player, C.SWAP_SUCCESS);
-            }
-        }, true)) {
-            return true;
-        } else {
-            MainUtil.sendMessage(player, C.SWAP_OVERLAP);
-            return false;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
deleted file mode 100644
index 03879463a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-@CommandDeclaration(command = "target", usage = "/plot target <<plot>|nearest>",
-    description = "Target a plot with your compass", permission = "plots.target",
-    requiredType = RequiredType.PLAYER, category = CommandCategory.INFO) public class Target
-    extends SubCommand {
-
-    public Target() {
-        super(Argument.PlotID);
-    }
-
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        Location location = player.getLocation();
-        if (!location.isPlotArea()) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
-            return false;
-        }
-        Plot target = null;
-        if (StringMan.isEqualIgnoreCaseToAny(args[0], "near", "nearest")) {
-            int distance = Integer.MAX_VALUE;
-            for (Plot plot : PlotSquared.get().getPlots(location.getWorld())) {
-                double current = plot.getCenter().getEuclideanDistanceSquared(location);
-                if (current < distance) {
-                    distance = (int) current;
-                    target = plot;
-                }
-            }
-            if (target == null) {
-                MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
-                return false;
-            }
-        } else if ((target = MainUtil.getPlotFromString(player, args[0], true)) == null) {
-            return false;
-        }
-        player.setCompassTarget(target.getCenter());
-        MainUtil.sendMessage(player, C.COMPASS_TARGET);
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
deleted file mode 100644
index aed9c5ca6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-
-import java.io.*;
-import java.util.Set;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
-
-@CommandDeclaration(command = "template", permission = "plots.admin",
-    description = "Create or use a world template",
-    usage = "/plot template [import|export] <world> <template>",
-    category = CommandCategory.ADMINISTRATION) public class Template extends SubCommand {
-
-    public static boolean extractAllFiles(String world, String template) {
-        try {
-            File folder =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.TEMPLATES);
-            if (!folder.exists()) {
-                return false;
-            }
-            File input = new File(folder + File.separator + template + ".template");
-            File output = PlotSquared.get().IMP.getDirectory();
-            if (!output.exists()) {
-                output.mkdirs();
-            }
-            try (ZipInputStream zis = new ZipInputStream(new FileInputStream(input))) {
-                ZipEntry ze = zis.getNextEntry();
-                byte[] buffer = new byte[2048];
-                while (ze != null) {
-                    if (!ze.isDirectory()) {
-                        String name = ze.getName().replace('\\', File.separatorChar)
-                            .replace('/', File.separatorChar);
-                        File newFile = new File(
-                            (output + File.separator + name).replaceAll("__TEMP_DIR__", world));
-                        File parent = newFile.getParentFile();
-                        if (parent != null) {
-                            parent.mkdirs();
-                        }
-                        try (FileOutputStream fos = new FileOutputStream(newFile)) {
-                            int len;
-                            while ((len = zis.read(buffer)) > 0) {
-                                fos.write(buffer, 0, len);
-                            }
-                        }
-                    }
-                    ze = zis.getNextEntry();
-                }
-                zis.closeEntry();
-            }
-            return true;
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return false;
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public static byte[] getBytes(PlotArea plotArea) {
-        ConfigurationSection section =
-            PlotSquared.get().worlds.getConfigurationSection("worlds." + plotArea.worldname);
-        YamlConfiguration config = new YamlConfiguration();
-        String generator = SetupUtils.manager.getGenerator(plotArea);
-        if (generator != null) {
-            config.set("generator.plugin", generator);
-        }
-        for (String key : section.getKeys(true)) {
-            config.set(key, section.get(key));
-        }
-        return config.saveToString().getBytes();
-    }
-
-    public static void zipAll(String world, Set<FileBytes> files) throws IOException {
-        File output =
-            MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.TEMPLATES);
-        output.mkdirs();
-        try (FileOutputStream fos = new FileOutputStream(
-            output + File.separator + world + ".template");
-            ZipOutputStream zos = new ZipOutputStream(fos)) {
-
-            for (FileBytes file : files) {
-                ZipEntry ze = new ZipEntry(file.path);
-                zos.putNextEntry(ze);
-                zos.write(file.data);
-            }
-            zos.closeEntry();
-        }
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length != 2 && args.length != 3) {
-            if (args.length == 1) {
-                if (args[0].equalsIgnoreCase("export")) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot template export <world>");
-                    return true;
-                } else if (args[0].equalsIgnoreCase("import")) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                        "/plot template import <world> <template>");
-                    return true;
-                }
-            }
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                "/plot template <import|export> <world> [template]");
-            return true;
-        }
-        final String world = args[1];
-        switch (args[0].toLowerCase()) {
-            case "import": {
-                if (args.length != 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
-                        "/plot template import <world> <template>");
-                    return false;
-                }
-                if (PlotSquared.get().hasPlotArea(world)) {
-                    MainUtil.sendMessage(player, C.SETUP_WORLD_TAKEN, world);
-                    return false;
-                }
-                boolean result = extractAllFiles(world, args[2]);
-                if (!result) {
-                    MainUtil
-                        .sendMessage(player, "&cInvalid template file: " + args[2] + ".template");
-                    return false;
-                }
-                File worldFile = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-                    Settings.Paths.TEMPLATES + File.separator + "tmp-data.yml");
-                YamlConfiguration worldConfig = YamlConfiguration.loadConfiguration(worldFile);
-                PlotSquared.get().worlds.set("worlds." + world, worldConfig.get(""));
-                try {
-                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-                    PlotSquared.get().worlds.load(PlotSquared.get().worldsFile);
-                } catch (InvalidConfigurationException | IOException e) {
-                    e.printStackTrace();
-                }
-                String manager =
-                    worldConfig.getString("generator.plugin", PlotSquared.imp().getPluginName());
-                String generator = worldConfig.getString("generator.init", manager);
-                int type = worldConfig.getInt("generator.type");
-                int terrain = worldConfig.getInt("generator.terrain");
-
-                SetupObject setup = new SetupObject();
-                setup.plotManager = manager;
-                setup.setupGenerator = generator;
-                setup.type = type;
-                setup.terrain = terrain;
-                setup.step = new ConfigurationNode[0];
-                setup.world = world;
-                SetupUtils.manager.setupWorld(setup);
-                GlobalBlockQueue.IMP.addTask(new Runnable() {
-                    @Override public void run() {
-                        MainUtil.sendMessage(player, "Done!");
-                        player.teleport(WorldUtil.IMP.getSpawn(world));
-                    }
-                });
-                return true;
-            }
-            case "export":
-                if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot template export <world>");
-                    return false;
-                }
-                final PlotArea area = PlotSquared.get().getPlotAreaByString(world);
-                if (area == null) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
-                    return false;
-                }
-                final PlotManager manager = area.getPlotManager();
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        try {
-                            manager.exportTemplate(area);
-                        } catch (Exception e) { // Must recover from any exception thrown a third party template manager
-                            e.printStackTrace();
-                            MainUtil.sendMessage(player, "Failed: " + e.getMessage());
-                            return;
-                        }
-                        MainUtil.sendMessage(player, "Done!");
-                    }
-                });
-                return true;
-            default:
-                C.COMMAND_SYNTAX.send(player, getUsage());
-        }
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
deleted file mode 100644
index 4a324e879..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-@CommandDeclaration(command = "toggle", aliases = {"attribute"}, permission = "plots.use",
-    description = "Toggle per user settings", requiredType = RequiredType.NONE,
-    category = CommandCategory.SETTINGS) public class Toggle extends Command {
-    public Toggle() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @CommandDeclaration(command = "chatspy", aliases = {"spy"},
-        permission = "plots.admin.command.chat", description = "Toggle admin chat spying")
-    public void chatspy(Command command, PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        if (toggle(player, "chatspy")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
-        } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
-        }
-    }
-
-    @CommandDeclaration(command = "worldedit", aliases = {"we", "wea"},
-        permission = "plots.worldedit.bypass", description = "Toggle worldedit area restrictions")
-    public void worldedit(Command command, PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        if (toggle(player, "worldedit")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
-        } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
-        }
-    }
-
-    @CommandDeclaration(command = "chat", permission = "plots.toggle.chat",
-        description = "Toggle plot chat")
-    public void chat(Command command, PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        if (toggle(player, "chat")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
-        } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
-        }
-    }
-
-    @CommandDeclaration(command = "clear-confirmation",
-        permission = "plots.admin.command.autoclear", description = "Toggle autoclear confirmation")
-    public void clearConfirmation(Command command, PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        if (toggle(player, "ignoreExpireTask")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
-        } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
-        }
-    }
-
-    @CommandDeclaration(command = "titles", permission = "plots.toggle.titles",
-        description = "Toggle plot title messages")
-    public void titles(Command command, PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) {
-        PlotArea area = player.getApplicablePlotArea();
-        boolean chat = area == null ? false : area.PLOT_CHAT;
-        if (toggle(player, "disabletitles") != chat) {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
-        } else {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
-        }
-    }
-
-    public boolean toggle(PlotPlayer player, String key) {
-        if (player.getAttribute(key)) {
-            player.removeAttribute(key);
-            return true;
-        } else {
-            player.setAttribute(key);
-            return false;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
deleted file mode 100644
index f1a063dcb..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-@CommandDeclaration(command = "trim", permission = "plots.admin",
-    description = "Delete unmodified portions of your plotworld",
-    usage = "/plot trim <world> [regenerate]", requiredType = RequiredType.CONSOLE,
-    category = CommandCategory.ADMINISTRATION) public class Trim extends SubCommand {
-
-    public static ArrayList<Plot> expired = null;
-    private static volatile boolean TASK = false;
-
-    public static boolean getBulkRegions(final ArrayList<ChunkLoc> empty, final String world,
-        final Runnable whenDone) {
-        if (Trim.TASK) {
-            return false;
-        }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                String directory = world + File.separator + "region";
-                File folder = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
-                File[] regionFiles = folder.listFiles();
-                for (File file : regionFiles) {
-                    String name = file.getName();
-                    if (name.endsWith("mca")) {
-                        if (file.getTotalSpace() <= 8192) {
-                            checkMca(name);
-                        } else {
-                            Path path = Paths.get(file.getPath());
-                            try {
-                                BasicFileAttributes attr =
-                                    Files.readAttributes(path, BasicFileAttributes.class);
-                                long creation = attr.creationTime().toMillis();
-                                long modification = file.lastModified();
-                                long diff = Math.abs(creation - modification);
-                                if (diff < 10000) {
-                                    checkMca(name);
-                                }
-                            } catch (IOException ignored) {
-                            }
-                        }
-                    }
-                }
-                Trim.TASK = false;
-                TaskManager.runTaskAsync(whenDone);
-            }
-
-            private void checkMca(String name) {
-                try {
-                    String[] split = name.split("\\.");
-                    int x = Integer.parseInt(split[1]);
-                    int z = Integer.parseInt(split[2]);
-                    ChunkLoc loc = new ChunkLoc(x, z);
-                    empty.add(loc);
-                } catch (NumberFormatException ignored) {
-                    PlotSquared.debug("INVALID MCA: " + name);
-                }
-            }
-        });
-        Trim.TASK = true;
-        return true;
-    }
-
-    /**
-     * Runs the result task with the parameters (viable, nonViable).
-     *
-     * @param world  The world
-     * @param result (viable = .mcr to trim, nonViable = .mcr keep)
-     * @return
-     */
-    public static boolean getTrimRegions(String world,
-        final RunnableVal2<Set<ChunkLoc>, Set<ChunkLoc>> result) {
-        if (result == null) {
-            return false;
-        }
-        MainUtil.sendMessage(null, "Collecting region data...");
-        ArrayList<Plot> plots = new ArrayList<>();
-        plots.addAll(PlotSquared.get().getPlots(world));
-        if (ExpireManager.IMP != null) {
-            plots.removeAll(ExpireManager.IMP.getPendingExpired());
-        }
-        result.value1 = new HashSet<>(ChunkManager.manager.getChunkChunks(world));
-        result.value2 = new HashSet<>();
-        MainUtil.sendMessage(null, " - MCA #: " + result.value1.size());
-        MainUtil.sendMessage(null, " - CHUNKS: " + (result.value1.size() * 1024) + " (max)");
-        MainUtil.sendMessage(null, " - TIME ESTIMATE: 12 Parsecs");
-        TaskManager.objectTask(plots, new RunnableVal<Plot>() {
-            @Override public void run(Plot plot) {
-                Location pos1 = plot.getBottom();
-                Location pos2 = plot.getTop();
-                int ccx1 = pos1.getX() >> 9;
-                int ccz1 = pos1.getZ() >> 9;
-                int ccx2 = pos2.getX() >> 9;
-                int ccz2 = pos2.getZ() >> 9;
-                for (int x = ccx1; x <= ccx2; x++) {
-                    for (int z = ccz1; z <= ccz2; z++) {
-                        ChunkLoc loc = new ChunkLoc(x, z);
-                        if (result.value1.remove(loc)) {
-                            result.value2.add(loc);
-                        }
-                    }
-                }
-            }
-        }, result);
-        return true;
-    }
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        if (args.length == 0) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
-            return false;
-        }
-        final String world = args[0];
-        if (!WorldUtil.IMP.isWorld(world) || !PlotSquared.get().hasPlotArea(world)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_WORLD);
-            return false;
-        }
-        if (Trim.TASK) {
-            C.TRIM_IN_PROGRESS.send(player);
-            return false;
-        }
-        Trim.TASK = true;
-        final boolean regen = args.length == 2 && Boolean.parseBoolean(args[1]);
-        getTrimRegions(world, new RunnableVal2<Set<ChunkLoc>, Set<ChunkLoc>>() {
-            @Override public void run(Set<ChunkLoc> viable, final Set<ChunkLoc> nonViable) {
-                Runnable regenTask;
-                if (regen) {
-                    PlotSquared.log("Starting regen task:");
-                    PlotSquared.log(" - This is a VERY slow command");
-                    PlotSquared.log(" - It will say `Trim done!` when complete");
-                    regenTask = new Runnable() {
-                        @Override public void run() {
-                            if (nonViable.isEmpty()) {
-                                Trim.TASK = false;
-                                player.sendMessage("Trim done!");
-                                return;
-                            }
-                            Iterator<ChunkLoc> iterator = nonViable.iterator();
-                            ChunkLoc mcr = iterator.next();
-                            iterator.remove();
-                            int cbx = mcr.x << 5;
-                            int cbz = mcr.z << 5;
-                            // get all 1024 chunks
-                            HashSet<ChunkLoc> chunks = new HashSet<>();
-                            for (int x = cbx; x < cbx + 32; x++) {
-                                for (int z = cbz; z < cbz + 32; z++) {
-                                    ChunkLoc loc = new ChunkLoc(x, z);
-                                    chunks.add(loc);
-                                }
-                            }
-                            int bx = cbx << 4;
-                            int bz = cbz << 4;
-                            RegionWrapper region = new RegionWrapper(bx, bx + 511, bz, bz + 511);
-                            for (Plot plot : PlotSquared.get().getPlots(world)) {
-                                Location bot = plot.getBottomAbs();
-                                Location top = plot.getExtendedTopAbs();
-                                RegionWrapper plotReg =
-                                    new RegionWrapper(bot.getX(), top.getX(), bot.getZ(),
-                                        top.getZ());
-                                if (!region.intersects(plotReg)) {
-                                    continue;
-                                }
-                                for (int x = plotReg.minX >> 4; x <= plotReg.maxX >> 4; x++) {
-                                    for (int z = plotReg.minZ >> 4; z <= plotReg.maxZ >> 4; z++) {
-                                        ChunkLoc loc = new ChunkLoc(x, z);
-                                        chunks.remove(loc);
-                                    }
-                                }
-                            }
-                            final LocalBlockQueue queue =
-                                GlobalBlockQueue.IMP.getNewQueue(world, false);
-                            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
-                                @Override public void run(ChunkLoc value) {
-                                    queue.regenChunk(value.x, value.z);
-                                }
-                            }, this);
-                        }
-                    };
-                } else {
-                    regenTask = new Runnable() {
-                        @Override public void run() {
-                            Trim.TASK = false;
-                            player.sendMessage("Trim done!");
-                        }
-                    };
-                }
-                ChunkManager.manager.deleteRegionFiles(world, viable, regenTask);
-
-            }
-        });
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
deleted file mode 100644
index 6e6f0c5ab..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.UUID;
-
-@CommandDeclaration(command = "trust", aliases = {"t"}, requiredType = RequiredType.NONE,
-    usage = "/plot trust <player>",
-    description = "Allow a user to build in a plot while you are offline",
-    category = CommandCategory.SETTINGS) public class Trust extends Command {
-
-    public Trust() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
-        checkTrue(plot.isOwner(player.getUUID()) || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.NO_PLOT_PERMS);
-        checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
-        final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-        checkTrue(!uuids.isEmpty(), C.INVALID_PLAYER, args[0]);
-        Iterator<UUID> iter = uuids.iterator();
-        int size = plot.getTrusted().size() + plot.getMembers().size();
-        while (iter.hasNext()) {
-            UUID uuid = iter.next();
-            if (uuid == DBFunc.EVERYONE && !(
-                Permissions.hasPermission(player, C.PERMISSION_TRUST_EVERYONE) || Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST))) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
-                iter.remove();
-                continue;
-            }
-            if (plot.isOwner(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
-                iter.remove();
-                continue;
-            }
-            if (plot.getTrusted().contains(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
-                iter.remove();
-                continue;
-            }
-            size += plot.getMembers().contains(uuid) ? 0 : 1;
-        }
-        checkTrue(!uuids.isEmpty(), null);
-        checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
-        confirm.run(this, new Runnable() {
-            @Override // Success
-            public void run() {
-                for (UUID uuid : uuids) {
-                    if (uuid != DBFunc.EVERYONE) {
-                        if (!plot.removeMember(uuid)) {
-                            if (plot.getDenied().contains(uuid)) {
-                                plot.removeDenied(uuid);
-                            }
-                        }
-                    }
-                    plot.addTrusted(uuid);
-                    EventUtil.manager.callTrusted(player, plot, uuid, true);
-                    MainUtil.sendMessage(player, C.TRUSTED_ADDED);
-                }
-            }
-        }, null);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
deleted file mode 100644
index 19414ac90..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-
-@CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
-    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]",
-    requiredType = RequiredType.NONE, category = CommandCategory.SETTINGS, confirmation = true)
-public class Unlink extends SubCommand {
-
-    @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-
-        Location loc = player.getLocation();
-        final Plot plot = loc.getPlotAbs();
-        if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
-        }
-        if (!plot.hasOwner()) {
-            return !sendMessage(player, C.PLOT_UNOWNED);
-        }
-        if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_UNLINK)) {
-            return sendMessage(player, C.NO_PLOT_PERMS);
-        }
-        if (!plot.isMerged()) {
-            return sendMessage(player, C.UNLINK_IMPOSSIBLE);
-        }
-        final boolean createRoad;
-        if (args.length != 0) {
-            if (args.length != 1 || !StringMan.isEqualIgnoreCaseToAny(args[0], "true", "false")) {
-                C.COMMAND_SYNTAX.send(player, getUsage());
-                return false;
-            }
-            createRoad = Boolean.parseBoolean(args[0]);
-        } else {
-            createRoad = true;
-        }
-        Runnable runnable = new Runnable() {
-            @Override public void run() {
-                if (!plot.unlinkPlot(createRoad, createRoad)) {
-                    MainUtil.sendMessage(player, "&cUnlink has been cancelled");
-                    return;
-                }
-                MainUtil.sendMessage(player, C.UNLINK_SUCCESS);
-            }
-        };
-        if (hasConfirmation(player)) {
-            CmdConfirm.addPending(player, "/plot unlink " + plot.getId(), runnable);
-        } else {
-            TaskManager.runTask(runnable);
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
deleted file mode 100644
index 8f1e50f16..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.*;
-
-@CommandDeclaration(command = "visit", permission = "plots.visit",
-    description = "Visit someones plot", usage = "/plot visit [<player>|<alias>|<world>|<id>] [#]",
-    aliases = {"v", "tp", "teleport", "goto", "home", "h"}, requiredType = RequiredType.NONE,
-    category = CommandCategory.TELEPORT) public class Visit extends Command {
-
-    public Visit() {
-        super(MainCommand.getInstance(), true);
-    }
-
-    @Override public Collection<Command> tab(PlotPlayer player, String[] args, boolean space) {
-        return tabOf(player, args, space, getUsage());
-    }
-
-    @Override public void execute(final PlotPlayer player, String[] args,
-        RunnableVal3<Command, Runnable, Runnable> confirm,
-        final RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        if (args.length == 1 && args[0].contains(":")) {
-            args = args[0].split(":");
-        }
-        int page = Integer.MIN_VALUE;
-        Collection<Plot> unsorted = null;
-        PlotArea sortByArea = player.getApplicablePlotArea();
-        boolean shouldSortByArea = Settings.Teleport.PER_WORLD_VISIT;
-        switch (args.length) {
-            case 3:
-                if (!MathMan.isInteger(args[1])) {
-                    C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
-                    C.COMMAND_SYNTAX.send(player, getUsage());
-                    return;
-                }
-                page = Integer.parseInt(args[2]);
-            case 2:
-                if (page != Integer.MIN_VALUE || !MathMan.isInteger(args[1])) {
-                    sortByArea = PlotSquared.get().getPlotAreaByString(args[1]);
-                    if (sortByArea == null) {
-                        C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
-                        C.COMMAND_SYNTAX.send(player, getUsage());
-                        return;
-                    }
-                    UUID user = UUIDHandler.getUUIDFromString(args[0]);
-                    if (user == null) {
-                        C.COMMAND_SYNTAX.send(player, getUsage());
-                        return;
-                    }
-                    unsorted = PlotSquared.get().getBasePlots(user);
-                    shouldSortByArea = true;
-                    break;
-                }
-                page = Integer.parseInt(args[1]);
-            case 1:
-                UUID user = args[0].length() >= 2 ? UUIDHandler.getUUIDFromString(args[0]) : null;
-                if (user != null && !PlotSquared.get().hasPlot(user))
-                    user = null;
-                if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
-                    page = Integer.parseInt(args[0]);
-                    unsorted = PlotSquared.get().getBasePlots(player);
-                    break;
-                }
-                if (user != null) {
-                    unsorted = PlotSquared.get().getBasePlots(user);
-                } else {
-                    Plot plot = MainUtil.getPlotFromString(player, args[0], true);
-                    if (plot != null) {
-                        unsorted = Collections.singletonList(plot.getBasePlot(false));
-                    }
-                }
-                break;
-            case 0:
-                page = 1;
-                unsorted = PlotSquared.get().getPlots(player);
-                break;
-            default:
-
-        }
-        if (page == Integer.MIN_VALUE) {
-            page = 1;
-        }
-        if (unsorted == null || unsorted.isEmpty()) {
-            C.FOUND_NO_PLOTS.send(player);
-            return;
-        }
-        unsorted = new ArrayList<>(unsorted);
-        unsorted.removeIf(plot -> !plot.isBasePlot());
-        if (page < 1 || page > unsorted.size()) {
-            C.NOT_VALID_NUMBER.send(player, "(1, " + unsorted.size() + ")");
-            return;
-        }
-        List<Plot> plots;
-        if (shouldSortByArea) {
-            plots = PlotSquared.get()
-                .sortPlots(unsorted, PlotSquared.SortType.CREATION_DATE, sortByArea);
-        } else {
-            plots = PlotSquared.get().sortPlotsByTemp(unsorted);
-        }
-        final Plot plot = plots.get(page - 1);
-        if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_UNOWNED)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_UNOWNED);
-                return;
-            }
-        } else if (plot.isOwner(player.getUUID())) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_OWNED) && !Permissions
-                .hasPermission(player, C.PERMISSION_HOME)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_OWNED);
-                return;
-            }
-        } else if (plot.isAdded(player.getUUID())) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_SHARED)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_SHARED);
-                return;
-            }
-        } else {
-            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_OTHER)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_OTHER);
-                return;
-            }
-        }
-        confirm.run(this, () -> {
-            if (plot.teleportPlayer(player)) {
-                whenDone.run(Visit.this, CommandResult.SUCCESS);
-            } else {
-                whenDone.run(Visit.this, CommandResult.FAILURE);
-            }
-        }, () -> whenDone.run(Visit.this, CommandResult.FAILURE));
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java
deleted file mode 100644
index bd18e3886..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/WE_Anywhere.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.commands;
-
-import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-@CommandDeclaration(command = "weanywhere", permission = "plots.worldedit.bypass",
-    description = "Force bypass of WorldEdit", aliases = {"wea"}, usage = "/plot weanywhere",
-    requiredType = RequiredType.NONE, category = CommandCategory.ADMINISTRATION) @Deprecated
-public class WE_Anywhere extends SubCommand {
-
-    @Override public boolean onCommand(PlotPlayer player, String[] arguments) {
-        MainCommand.getInstance().toggle.worldedit(this, player, new String[0], null, null);
-        return true;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
deleted file mode 100644
index d3045c568..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
+++ /dev/null
@@ -1,1070 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.config;
-
-import com.github.intellectualsites.plotsquared.commands.CommandCaller;
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
-/**
- * Captions class.
- */
-public enum C {
-
-    /*
-     * Static flags
-     */
-    FLAG_USE("use", "static.flags"), FLAG_BREAK("break", "static.flags"), FLAG_PLACE("place",
-        "static.flags"), FLAG_PVP("pvp", "static.flags"), FLAG_HANGING_PLACE("hanging-place",
-        "static.flags"), FLAG_HANGING_BREAK("hanging-break", "static.flags"), FLAG_HANGING_INTERACT(
-        "hanging-interact", "static.flags"), FLAG_MISC_INTERACT("misc-interact",
-        "static.flags"), FLAG_MISC_BREAK("misc-break", "static.flags"), FLAG_MISC_PLACE(
-        "misc-place", "static.flags"), FLAG_VEHICLE_BREAK("vehicle-break",
-        "static.flags"), FLAG_HOSTILE_INTERACT("hostile-interact",
-        "static.flags"), FLAG_DEVICE_INTERACT("device-interact",
-        "static.flags"), FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"), FLAG_VEHICLE_USE(
-        "vehicle-use", "static.flags"), FLAG_VEHICLE_PLACE("vehicle-place",
-        "static.flags"), FLAG_PLAYER_INTERACT("player-interact",
-        "static.flags"), FLAG_TAMED_INTERACT("tamed-interact",
-        "static.flags"), FLAG_DISABLE_PHYSICS("disable-physics", "static.flags"), FLAG_MOB_PLACE(
-        "mob-place", "static.flags"), /*
-     * Static permission
-     */
-    PERMISSION_STAR("*", "static.permissions"), PERMISSION_ADMIN("plots.admin",
-        "static.permissions"), PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned",
-        "static.permissions"), PERMISSION_PROJECTILE_OTHER("plots.projectile.other",
-        "static.permissions"), PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS(
-        "plots.admin.interact.blockedcommands", "static.permissions"), PERMISSION_WORLDEDIT_BYPASS(
-        "plots.worldedit.bypass", "static.permissions"), PERMISSION_PLOT_TOGGLE_TITLES(
-        "plots.toggle.titles", "static.permissions"), PERMISSION_PLOT_TOGGLE_CHAT(
-        "plots.toggle.chat", "static.permissions"), PERMISSION_ADMIN_EXIT_DENIED(
-        "plots.admin.exit.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_DENIED(
-        "plots.admin.entry.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_FORCEFIELD(
-        "plots.admin.entry.forcefield", "static.permissions"), PERMISSION_COMMANDS_CHAT(
-        "plots.admin.command.chat", "static.permissions"), PERMISSION_MERGE_OTHER(
-        "plots.merge.other", "static.permissions"), PERMISSION_MERGE_KEEPROAD(
-        "plots.merge.keeproad", "static.permissions"), PERMISSION_ADMIN_DESTROY_UNOWNED(
-        "plots.admin.destroy.unowned", "static.permissions"), PERMISSION_ADMIN_DESTROY_GROUNDLEVEL(
-        "plots.admin.destroy.groundlevel", "static.permissions"), PERMISSION_ADMIN_DESTROY_OTHER(
-        "plots.admin.destroy.other", "static.permissions"), PERMISSION_ADMIN_DESTROY_ROAD(
-        "plots.admin.destroy.road", "static.permissions"), PERMISSION_ADMIN_BUILD_ROAD(
-        "plots.admin.build.road", "static.permissions"), PERMISSION_ADMIN_BUILD_UNOWNED(
-        "plots.admin.build.unowned", "static.permissions"), PERMISSION_ADMIN_BUILD_OTHER(
-        "plots.admin.build.other", "static.permissions"), PERMISSION_ADMIN_INTERACT_ROAD(
-        "plots.admin.interact.road", "static.permissions"), PERMISSION_ADMIN_INTERACT_UNOWNED(
-        "plots.admin.interact.unowned", "static.permissions"), PERMISSION_ADMIN_INTERACT_OTHER(
-        "plots.admin.interact.other", "static.permissions"), PERMISSION_ADMIN_BUILD_HEIGHTLIMIT(
-        "plots.admin.build.heightlimit", "static.permissions"), PERMISSION_ADMIN_UPDATE(
-        "plots.admin.command.update", "static.permissions"), PERMISSION_ADMIN_COMMAND_RATE(
-        "plots.admin.command.rate", "static.permissions"), PERMISSION_ADMIN_COMMAND_TRUST(
-        "plots.admin.command.trust", "static.permissions"), PERMISSION_TRUST_EVERYONE(
-        "plots.trust.everyone", "static.permissions"), PERMISSION_AREA_CREATE("plots.area.create",
-        "static.permissions"), PERMISSION_AREA_INFO("plots.area.info",
-        "static.permissions"), PERMISSION_AREA_LIST("plots.area.list",
-        "static.permissions"), PERMISSION_AREA_REGEN("plots.area.regen",
-        "static.permissions"), PERMISSION_AREA_TP("plots.area.tp",
-        "static.permissions"), PERMISSION_AUTO_MEGA("plots.auto.mega",
-        "static.permissions"), PERMISSION_CLAIM_SCHEMATIC("plots.claim.%s0",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC("plots.admin.command.schematic",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_CLEAR("plots.admin.command.clear",
-        "static.permissions"), PERMISSION_CONTINUE("plots.continue",
-        "static.permissions"), PERMISSION_CLUSTER_LIST("plots.cluster.list",
-        "static.permissions"), PERMISSION_CLUSTER_CREATE("plots.cluster.create",
-        "static.permissions"), PERMISSION_CLUSTER_CREATE_OTHER("plots.cluster.create.other",
-        "static.permissions"), PERMISSION_CLUSTER_SIZE("plots.cluster.size",
-        "static.permissions"), PERMISSION_CLUSTER_DELETE("plots.cluster.delete",
-        "static.permissions"), PERMISSION_CLUSTER_DELETE_OTHER("plots.cluster.delete.other",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE("plots.cluster.resize",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE_OTHER("plots.cluster.resize.other",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE_SHRINK("plots.cluster.resize.shrink",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE_EXPAND("plots.cluster.resize.expand",
-        "static.permissions"), PERMISSION_CLUSTER("plots.cluster",
-        "static.permissions"), PERMISSION_CLUSTER_INVITE("plots.cluster.invite",
-        "static.permissions"), PERMISSION_CLUSTER_INVITE_OTHER("plots.cluster.invite.other",
-        "static.permissions"), PERMISSION_CLUSTER_KICK("plots.cluster.kick",
-        "static.permissions"), PERMISSION_CLUSTER_KICK_OTHER("plots.cluster.kick.other",
-        "static.permissions"), PERMISSION_CLUSTER_LEAVE("plots.cluster.leave",
-        "static.permissions"), PERMISSION_CLUSTER_HELPERS("plots.cluster.helpers",
-        "static.permissions"), PERMISSION_CLUSTER_TP("plots.cluster.tp",
-        "static.permissions"), PERMISSION_CLUSTER_TP_OTHER("plots.cluster.tp.other",
-        "static.permissions"), PERMISSION_CLUSTER_INFO("plots.cluster.info",
-        "static.permissions"), PERMISSION_CLUSTER_SETHOME("plots.cluster.sethome",
-        "static.permissions"), PERMISSION_CLUSTER_SETHOME_OTHER("plots.cluster.sethome.other",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_CONTINUE("plots.admin.command.continue",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DELETE("plots.admin.command.delete",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DENY("plots.admin.command.deny",
-        "static.permissions"), PERMISSION_DENY_EVERYONE("plots.deny.everyone",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DONE("plots.admin.command.done",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DOWNLOAD("plots.admin.command.download",
-        "static.permissions"), PERMISSION_DOWNLOAD_WORLD("plots.download.world",
-        "static.permissions"), PERMISSION_SET_FLAG_OTHER("plots.set.flag.other",
-        "static.permissions"), PERMISSION_SET_FLAG("plots.set.flag",
-        "static.permissions"), PERMISSION_SET_FLAG_KEY("plots.set.flag.%s0",
-        "static.permissions"), PERMISSION_SET_FLAG_KEY_VALUE("plots.set.flag.%s0.%s1",
-        "static.permissions"), PERMISSION_FLAG_REMOVE("plots.flag.remove",
-        "static.permissions"), PERMISSION_FLAG_ADD("plots.flag.add",
-        "static.permissions"), PERMISSION_FLAG_LIST("plots.flag.list",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_KICK("plots.admin.command.kick",
-        "static.permissions"), PERMISSION_GRANT("plots.grant.%s0",
-        "static.permissions"), PERMISSION_LIST_FORSALE("plots.list.forsale",
-        "static.permissions"), PERMISSION_LIST_MINE("plots.list.mine",
-        "static.permissions"), PERMISSION_LIST_SHARED("plots.list.shared",
-        "static.permissions"), PERMISSION_LIST_WORLD("plots.list.world",
-        "static.permissions"), PERMISSION_LIST_WORLD_NAME("plots.list.world.%s0",
-        "static.permissions"), PERMISSION_LIST_TOP("plots.list.top",
-        "static.permissions"), PERMISSION_LIST_ALL("plots.list.all",
-        "static.permissions"), PERMISSION_LIST_UNOWNED("plots.list.unowned",
-        "static.permissions"), PERMISSION_LIST_UNKNOWN("plots.list.unknown",
-        "static.permissions"), PERMISSION_LIST_PLAYER("plots.list.player",
-        "static.permissions"), PERMISSION_LIST_DONE("plots.list.done",
-        "static.permissions"), PERMISSION_LIST_EXPIRED("plots.list.expired",
-        "static.permissions"), PERMISSION_LIST_FUZZY("plots.list.fuzzy",
-        "static.permissions"), PERMISSION_LIST_AREA("plots.list.area",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_LOAD("plots.admin.command.load",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SETOWNER("plots.admin.command.setowner",
-        "static.permissions"), PERMISSION_COMMENT("plots.comment",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_REMOVE("plots.admin.command.remove",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SAVE("plots.admin.command.save",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE(
-        "plots.admin.command.schematic.paste", "static.permissions"), PERMISSION_SCHEMATIC_PASTE(
-        "plots.schematic.paste", "static.permissions"), PERMISSION_SCHEMATIC_LIST(
-        "plots.schematic.list", "static.permissions"),
-
-    PERMISSION_SCHEMATIC_SAVE("plots.schematic.save",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE(
-        "plots.admin.command.schematic.save", "static.permissions"),
-
-    PERMISSION_SET_COMPONENT("plots.set.%s0", "static.permissions"), PERMISSION_ADMIN_COMMAND(
-        "plots.admin.command.%s0", "static.permissions"),
-
-    PERMISSION_ADMIN_COMMAND_UNLINK("plots.admin.command.unlink",
-        "static.permissions"), PERMISSION_VISIT_UNOWNED("plots.visit.unowned",
-        "static.permissions"),
-
-    PERMISSION_VISIT_OWNED("plots.visit.owned", "static.permissions"), PERMISSION_SHARED(
-        "plots.visit.shared", "static.permissions"),
-
-    PERMISSION_VISIT_OTHER("plots.visit.other", "static.permissions"), PERMISSION_HOME("plots.home",
-        "static.permissions"),
-
-    PERMISSION_ALIAS_SET_OBSOLETE("plots.set.alias",
-        "static.permissions"), // Note this is for backwards compatibility
-
-    PERMISSION_ALIAS_SET("plots.alias.set", "static.permissions"), PERMISSION_ALIAS_REMOVE(
-        "plots.alias.remove", "static.permissions"),
-
-    /*
-     * Static console
-     */
-    CONSOLE_JAVA_OUTDATED(
-        "&cYour version of java is outdated. It is highly recommended that you update to Java 8 as it increases performance "
-            + "and security. %s0 will require Java 8 in a future update.",
-        "static.console"), CONSOLE_PLEASE_ENABLE_METRICS(
-        "&dPlease enable metrics for %s0. Using metrics improves plugin stability, performance, and features. "
-            + "Bug fixes and new features are influenced on metrics.", "static.console"), /*
-     * Confirm
-     */
-
-    EXPIRED_CONFIRM("$2Confirmation has expired, please run the command again!",
-        "Confirm"), FAILED_CONFIRM("$2You have no pending actions to confirm!", "Confirm"),
-
-    REQUIRES_CONFIRM(
-        "$2Are you sure you wish to execute: $1%s$2?&-$2This cannot be undone! If you are sure: $1/plot confirm",
-        "Confirm"), /*
-     * Move
-     */
-
-    MOVE_SUCCESS("$4Successfully moved plot.", "Move"), COPY_SUCCESS("$4Successfully copied plot.",
-        "Move"),
-
-    REQUIRES_UNOWNED("$2The location specified is already occupied.", "Move"), /*
-     * Area Create
-     */
-
-    REQUIRES_UNMERGED("$2The plot cannot be merged", "debug"),
-
-    SET_ATTRIBUTE("$4Successfully set %s0 set to %s1", "Set"), /*
-     * Web
-     */
-
-    GENERATING_LINK("$1Processing plot...", "Web"), GENERATING_LINK_FAILED(
-        "$2Failed to generate download link!", "Web"),
-
-    SAVE_FAILED("$2Failed to save", "Web"), LOAD_NULL(
-        "$2Please use $4/plot load $2to get a list of schematics", "Web"),
-
-    LOAD_FAILED("$2Failed to load schematic", "Web"), LOAD_LIST(
-        "$2To load a schematic, use $1/plot load #", "Web"),
-
-    SAVE_SUCCESS("$1Successfully saved!", "Web"), /*
-     * Compass
-     */
-
-    COMPASS_TARGET("$4Successfully targeted plot with compass", "Compass"), /*
-     * Cluster
-     */
-
-    CLUSTER_AVAILABLE_ARGS(
-        "$1The following sub commands are available: $4list$2, $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, "
-            + "$4members$2, $4info$2, $4tp$2, $4sethome", "Cluster"), CLUSTER_LIST_HEADING(
-        "$2There are $1%s$2 clusters in this world", "Cluster"),
-
-    CLUSTER_LIST_ELEMENT("$2 - $1%s&-", "Cluster"), CLUSTER_INTERSECTION(
-        "$2The proposed area overlaps with: %s0", "Cluster"),
-
-    CLUSTER_OUTSIDE("$2The proposed area is outside the plot area: %s0", "Cluster"), CLUSTER_ADDED(
-        "$4Successfully created the cluster.", "Cluster"),
-
-    CLUSTER_DELETED("$4Successfully deleted the cluster.", "Cluster"), CLUSTER_RESIZED(
-        "$4Successfully resized the cluster.", "Cluster"),
-
-    CLUSTER_ADDED_USER("$4Successfully added user to the cluster.", "Cluster"), CANNOT_KICK_PLAYER(
-        "$2You cannot kick that player", "Cluster"),
-
-    CLUSTER_INVITED("$1You have been invited to the following cluster: $2%s",
-        "Cluster"), CLUSTER_REMOVED("$1You have been removed from cluster: $2%s", "Cluster"),
-
-    CLUSTER_KICKED_USER("$4Successfully kicked the user", "Cluster"), INVALID_CLUSTER(
-        "$1Invalid cluster name: $2%s", "Cluster"),
-
-    CLUSTER_NOT_ADDED("$2That player was not added to the plot cluster",
-        "Cluster"), CLUSTER_CANNOT_LEAVE("$1You must delete or transfer ownership before leaving",
-        "Cluster"),
-
-    CLUSTER_ADDED_HELPER("$4Successfully added a helper to the cluster",
-        "Cluster"), CLUSTER_REMOVED_HELPER("$4Successfully removed a helper from the cluster",
-        "Cluster"),
-
-    CLUSTER_REGENERATED("$4Successfully started cluster regeneration",
-        "Cluster"), CLUSTER_TELEPORTING("$4Teleporting...", "Cluster"),
-
-    CLUSTER_INFO(
-        "$1Current cluster: $2%id%&-$1Name: $2%name%&-$1Owner: $2%owner%&-$1Size: $2%size%&-$1Rights: $2%rights%",
-        "Cluster"), /*
-     * Border
-     */
-
-    BORDER("$2You are outside the current map border", "Border"), /*
-     * Unclaim
-     */
-
-    UNCLAIM_SUCCESS("$4You successfully unclaimed the plot.", "Unclaim"), UNCLAIM_FAILED(
-        "$2Could not unclaim the plot", "Unclaim"), /*
-     * WorldEdit masks
-     */
-
-    WORLDEDIT_DELAYED("$2Please wait while we process your WorldEdit action...",
-        "WorldEdit Masks"), WORLDEDIT_RUN("$2Apologies for the delay. Now executing: %s",
-        "WorldEdit Masks"),
-
-    REQUIRE_SELECTION_IN_MASK(
-        "$2%s of your selection is not within your plot mask. You can only make edits within your plot.",
-        "WorldEdit Masks"), WORLDEDIT_VOLUME(
-        "$2You cannot select a volume of %current%. The maximum volume you can modify is %max%.",
-        "WorldEdit Masks"),
-
-    WORLDEDIT_ITERATIONS(
-        "$2You cannot iterate %current% times. The maximum number of iterations allowed is %max%.",
-        "WorldEdit Masks"), WORLDEDIT_UNSAFE("$2Access to that command has been blocked",
-        "WorldEdit Masks"),
-
-    WORLDEDIT_BYPASS("$2&oTo bypass your restrictions use $4/plot wea",
-        "WorldEdit Masks"), WORLDEDIT_BYPASSED("$2Currently bypassing WorldEdit restriction.",
-        "WorldEdit Masks"),
-
-    WORLDEDIT_UNMASKED("$1Your WorldEdit is now unrestricted.",
-        "WorldEdit Masks"), WORLDEDIT_RESTRICTED("$1Your WorldEdit is now restricted.",
-        "WorldEdit Masks"),
-
-    GAMEMODE_WAS_BYPASSED("$1You bypassed the GameMode ($2{gamemode}$1) $1set for $2{plot}",
-        "GameMode"), HEIGHT_LIMIT("$1This plot area has a height limit of $2{limit}",
-        "Height Limit"), /*
-     * Records
-     */
-
-    RECORD_PLAY("$2%player $2started playing record $1%name", "Records"), NOTIFY_ENTER(
-        "$2%player $2entered your plot ($1%plot$2)", "Records"),
-
-    NOTIFY_LEAVE("$2%player $2left your plot ($1%plot$2)", "Records"), /*
-     * Swap
-     */
-
-    SWAP_OVERLAP("$2The proposed areas are not allowed to overlap", "Swap"), SWAP_DIMENSIONS(
-        "$2The proposed areas must have comparable dimensions", "Swap"),
-
-    SWAP_SYNTAX("$2/plot swap <id>", "Swap"), SWAP_SUCCESS("$4Successfully swapped plots", "Swap"),
-
-    STARTED_SWAP("$2Started plot swap task. You will be notified when it finishes", "Swap"), /*
-     * Comment
-     */
-
-    INBOX_NOTIFICATION("%s unread messages. Use /plot inbox", "Comment"), NOT_VALID_INBOX_INDEX(
-        "$2No comment at index %s", "Comment"),
-
-    INBOX_ITEM("$2 - $4%s", "Comment"), COMMENT_SYNTAX("$2Use /plot comment [X;Z] <%s> <comment>",
-        "Comment"),
-
-    INVALID_INBOX("$2That is not a valid inbox.&-$1Accepted values: %s", "Comment"), NO_PERM_INBOX(
-        "$2You do not have permission for that inbox", "Comment"),
-
-    NO_PERM_INBOX_MODIFY("$2You do not have permission to modify that inbox",
-        "Comment"), NO_PLOT_INBOX("$2You must stand in or supply a plot argument", "Comment"),
-
-    COMMENT_REMOVED("$4Successfully deleted comment/s:n$2 - '$3%s$2'", "Comment"), COMMENT_ADDED(
-        "$4A comment has been left", "Comment"),
-
-    COMMENT_HEADER("$2&m---------&r $1Comments $2&m---------&r", "Comment"), INBOX_EMPTY(
-        "$2No comments", "Comment"), /*
-     * Console
-     */
-
-    NOT_CONSOLE("$2For safety reasons, this command can only be executed by console.",
-        "Console"), IS_CONSOLE("$2This command can only be executed by a player.", "Console"),
-
-    /*
-    Inventory
-     */
-    INVENTORY_USAGE("&cUsage: &6{usage}", "Inventory"), INVENTORY_DESC("&cDescription: &6{desc}",
-        "Inventory"),
-
-    INVENTORY_CATEGORY("&cCategory: &6{category}", "Inventory"),
-
-    /*
-     * Clipboard
-     */
-    CLIPBOARD_SET(
-        "$2The current plot is now copied to your clipboard, use $1/plot paste$2 to paste it",
-        "Clipboard"), PASTED(
-        "$4The plot selection was successfully pasted. It has been cleared from your clipboard.",
-        "Clipboard"),
-
-    PASTE_FAILED("$2Failed to paste the selection. Reason: $2%s", "Clipboard"), NO_CLIPBOARD(
-        "$2You don't have a selection in your clipboard", "Clipboard"),
-
-    CLIPBOARD_INFO(
-        "$2Current Selection - Plot ID: $1%id$2, Width: $1%width$2, Total Blocks: $1%total$2",
-        "Clipboard"), /*
-     * Toggle
-     */
-
-    TOGGLE_ENABLED("$2Enabled setting: %s", "Toggle"), TOGGLE_DISABLED("$2Disabled setting: %s",
-        "Toggle"),
-
-    COMMAND_BLOCKED("$2That command is not allowed in this plot", "Blocked Command"), /*
-     * Done
-     */
-
-    DONE_ALREADY_DONE("$2This plot is already marked as done", "Done"), DONE_NOT_DONE(
-        "$2This plot is not marked as done.", "Done"),
-
-    DONE_INSUFFICIENT_COMPLEXITY(
-        "$2This plot is too simple. Please add more detail before using this command.",
-        "Done"), DONE_SUCCESS("$1Successfully marked this plot as done.", "Done"),
-
-    DONE_REMOVED("$1You may now continue building in this plot.", "Done"), /*
-     * Ratings
-     */
-
-    RATINGS_PURGED("$2Purged ratings for this plot", "Ratings"), RATING_NOT_VALID(
-        "$2You need to specify a number between 1 and 10", "Ratings"),
-
-    RATING_ALREADY_EXISTS("$2You have already rated plot $2%s", "Ratings"), RATING_APPLIED(
-        "$4You successfully rated plot $2%s", "Ratings"),
-
-    RATING_NOT_YOUR_OWN("$2You cannot rate your own plot", "Ratings"), RATING_NOT_DONE(
-        "$2You can only rate finished plots.", "Ratings"),
-
-    RATING_NOT_OWNED("$2You cannot rate a plot that is not claimed by anyone", "Ratings"), /*
-     * Tutorial
-     */
-
-    RATE_THIS("$2Rate this plot!", "Tutorial"), COMMENT_THIS(
-        "$2Leave some feedback on this plot: %s", "Tutorial"), /*
-     * Economy Stuff
-     */
-
-    ECON_DISABLED("$2Economy is not enabled", "Economy"), CANNOT_AFFORD_PLOT(
-        "$2You cannot afford to buy this plot. It costs $1%s", "Economy"),
-
-    NOT_FOR_SALE("$2This plot is not for sale", "Economy"), CANNOT_BUY_OWN(
-        "$2You cannot buy your own plot", "Economy"),
-
-    PLOT_SOLD("$4Your plot; $1%s0$4, has been sold to $1%s1$4 for $1$%s2",
-        "Economy"), CANNOT_AFFORD_MERGE("$2You cannot afford to merge the plots. It costs $1%s",
-        "Economy"),
-
-    ADDED_BALANCE("$1%s $2has been added to your balance", "Economy"), REMOVED_BALANCE(
-        "$1%s $2has been taken from your balance", "Economy"),
-
-    REMOVED_GRANTED_PLOT("$2You used %s plot grant(s), you've got $1%s $2left", "Economy"), /*
-     * Setup Stuff
-     */
-
-    SETUP_INIT("$1Usage: $2/plot setup <value>", "Setup"), SETUP_STEP(
-        "$3[$1Step %s0$3] $1%s1 $2- $1Expecting: $2%s2 $1Default: $2%s3", "Setup"),
-
-    SETUP_INVALID_ARG(
-        "$2%s0 is not a valid argument for step %s1. To cancel setup use: $1/plot setup cancel",
-        "Setup"), SETUP_VALID_ARG("$2Value $1%s0 $2set to %s1", "Setup"),
-
-    SETUP_FINISHED(
-        "$4You should have been teleported to the created world. Otherwise you will need to set the generator manually using the bukkit.yml or "
-            + "your chosen world management plugin.", "Setup"), SETUP_WORLD_TAKEN(
-        "$2%s is already a world", "Setup"),
-
-    SETUP_MISSING_WORLD(
-        "$2You need to specify a world name ($1/plot setup &l<world>$1 <generator>$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 -"
-            + " $1/plot setup back&-$2 - $1/plot setup cancel", "Setup"), SETUP_MISSING_GENERATOR(
-        "$2You need to specify a generator ($1/plot setup <world> &l<generator>&r$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - "
-            + "$1/plot setup back&-$2 - $1/plot setup cancel", "Setup"),
-
-    SETUP_INVALID_GENERATOR("$2Invalid generator. Possible options: %s", "Setup"), /*
-     * Schematic Stuff
-     */
-
-    SCHEMATIC_TOO_LARGE("$2The plot is too large for this action!",
-        "Schematics"), SCHEMATIC_MISSING_ARG(
-        "$2You need to specify an argument. Possible values: $1test <name>$2 , $1save$2 , $1paste $2, $1exportall$2, $1list",
-        "Schematics"),
-
-    SCHEMATIC_INVALID("$2That is not a valid schematic. Reason: $2%s",
-        "Schematics"), SCHEMATIC_VALID("$2That is a valid schematic", "Schematics"),
-
-    SCHEMATIC_PASTE_FAILED("$2Failed to paste the schematic",
-        "Schematics"), SCHEMATIC_PASTE_SUCCESS("$4The schematic pasted successfully", "Schematics"),
-
-    SCHEMATIC_LIST("$4Saved Schematics: $1%s", "Schematics"),
-
-    /*
-     * Title Stuff
-     */
-    TITLE_ENTERED_PLOT("$1Plot: %world%;%x%;%z%", "Titles"), TITLE_ENTERED_PLOT_SUB("$4Owned by %s",
-        "Titles"),
-
-    PREFIX_GREETING("$1%id%$2> ", "Titles"), PREFIX_FAREWELL("$1%id%$2> ", "Titles"), /*
-     * Core Stuff
-     */
-
-    TASK_START("Starting task...", "Core"), PREFIX("$3[$1P2$3] $2", "Core"),
-
-    ENABLED("$1%s0 is now enabled", "Core"), /*
-     * Reload
-     */
-
-    RELOADED_CONFIGS("$1Translations and world settings have been reloaded",
-        "Reload"), RELOAD_FAILED("$2Failed to reload file configurations", "Reload"),
-    /*
-     * BarAPI
-     */
-
-    DESC_SET("$2Plot description set", "Desc"), DESC_UNSET("$2Plot description unset", "Desc"),
-
-    MISSING_DESC("$2You need to specify a description", "Desc"),
-
-    /*
-     * Alias
-     */
-    ALIAS_SET_TO("$2Plot alias set to $1%alias%", "Alias"), ALIAS_REMOVED("$2Plot alias removed",
-        "Alias"),
-
-    MISSING_ALIAS("$2You need to specify an alias", "Alias"), ALIAS_TOO_LONG(
-        "$2The alias must be < 50 characters in length", "Alias"),
-
-    ALIAS_IS_TAKEN("$2That alias is already taken", "Alias"), /*
-     * Position
-     */
-
-    MISSING_POSITION("$2You need to specify a position. Possible values: $1none",
-        "Position"), POSITION_SET("$1Home position set to your current location", "Position"),
-
-    POSITION_UNSET("$1Home position reset to the default location", "Position"), HOME_ARGUMENT(
-        "$2Use /plot set home [none]", "Position"),
-
-    INVALID_POSITION("$2That is not a valid position value", "Position"), /*
-     * Cap
-     */
-
-    ENTITY_CAP("$2You are not allowed to spawn more mobs", "cap"), /*
-     * Time
-     */
-
-    TIME_FORMAT("$1%hours%, %min%, %sec%", "Time"), /*
-     * Permission
-     */
-
-    NO_SCHEMATIC_PERMISSION("$2You don't have the permission required to use schematic $1%s",
-        "Permission"), NO_PERMISSION("$2You are lacking the permission node: $1%s", "Permission"),
-
-    NO_PERMISSION_EVENT("$2You are lacking the permission node: $1%s", "Permission"), NO_PLOT_PERMS(
-        "$2You must be the plot owner to perform this action", "Permission"),
-
-    CANT_CLAIM_MORE_PLOTS("$2You can't claim more plots.", "Permission"), CANT_CLAIM_MORE_CLUSTERS(
-        "$2You can't claim more clusters.", "Permission"),
-
-    CANT_TRANSFER_MORE_PLOTS("$2You can't send more plots to that user",
-        "Permission"), CANT_CLAIM_MORE_PLOTS_NUM("$2You can't claim more than $1%s $2plots at once",
-        "Permission"),
-
-    YOU_BE_DENIED("$2You are not allowed to enter this plot", "Permission"),
-
-    /*
-     * Merge
-     */
-    MERGE_NOT_VALID("$2This merge request is no longer valid.", "Merge"), MERGE_ACCEPTED(
-        "$2The merge request has been accepted", "Merge"),
-
-    SUCCESS_MERGE("$2Plots have been merged!", "Merge"), MERGE_REQUESTED(
-        "$2Successfully sent a merge request", "Merge"),
-
-    MERGE_REQUEST_CONFIRM("Merge request from %s", "Permission"), NO_PERM_MERGE(
-        "$2You are not the owner of the plot: $1%plot%", "Merge"),
-
-    NO_AVAILABLE_AUTOMERGE(
-        "$2You do not own any adjacent plots in the specified direction or are not allowed to merge to the required size.",
-        "Merge"), UNLINK_REQUIRED("$2An unlink is required to do this.", "Merge"),
-
-    UNLINK_IMPOSSIBLE("$2You can only unlink a mega-plot", "Merge"), UNLINK_SUCCESS(
-        "$2Successfully unlinked plots.", "Merge"), /*
-     * CommandConfig
-     */
-
-    NOT_VALID_SUBCOMMAND("$2That is not a valid subcommand", "CommandConfig"), DID_YOU_MEAN(
-        "$2Did you mean: $1%s", "CommandConfig"),
-
-    NAME_LITTLE("$2%s0 name is too short, $1%s1$2<$1%s3", "CommandConfig"), NO_COMMANDS(
-        "$2I'm sorry, but you're not permitted to use any subcommands.", "CommandConfig"),
-
-    SUBCOMMAND_SET_OPTIONS_HEADER("$2Possible Values: ", "CommandConfig"), COMMAND_SYNTAX(
-        "$1Usage: $2%s", "CommandConfig"), /*
-     * Player not found
-     */
-
-    INVALID_PLAYER_WAIT("$2Player not found: $1%s$2, fetching it. Try again soon.",
-        "Errors"), INVALID_PLAYER("$2Player not found: $1%s$2.", "Errors"),
-
-    INVALID_PLAYER_OFFLINE("$2The player must be online: $1%s.", "Errors"), /*
-     * Command flag
-     */
-
-    INVALID_COMMAND_FLAG("$2Invalid command flag: %s0", "Errors"), /*
-     * Unknown Error
-     */
-
-    ERROR("$2An error occurred: %s",
-        "Errors"), // SETTINGS_PASTE_UPLOADED("$2settings.yml was uploaded to: $1%url%", "Paste"),
-
-    // LATEST_LOG_UPLOADED("$2latest.log was uploaded to: $1%url%", "Paste"),
-    DEBUG_REPORT_CREATED("$1Uploaded a full debug to: $1%url%", "Paste"), /*
-     *
-     */
-
-    COMMAND_WENT_WRONG("$2Something went wrong when executing that command...", "Errors"), /*
-     * purge
-     */
-
-    PURGE_SUCCESS("$4Successfully purged %s plots", "Purge"), /*
-     * trim
-     */
-
-    TRIM_IN_PROGRESS("A world trim task is already in progress!",
-        "Trim"), NOT_VALID_HYBRID_PLOT_WORLD(
-        "The hybrid plot manager is required to perform this action", "Trim"), /*
-     * No <plot>
-     */
-
-    NO_FREE_PLOTS("$2There are no free plots available", "Errors"), NOT_IN_PLOT(
-        "$2You're not in a plot", "Errors"),
-
-    NOT_LOADED("$2The plot could not be loaded", "Errors"), NOT_IN_CLUSTER(
-        "$2You must be within a plot cluster to perform that action", "Errors"),
-
-    NOT_IN_PLOT_WORLD("$2You're not in a plot area", "Errors"), PLOTWORLD_INCOMPATIBLE(
-        "$2The two worlds must be compatible", "Errors"),
-
-    NOT_VALID_WORLD("$2That is not a valid world (case sensitive)", "Errors"), NOT_VALID_PLOT_WORLD(
-        "$2That is not a valid plot area (case sensitive)", "Errors"),
-
-    NO_PLOTS("$2You don't have any plots", "Errors"), /*
-     * Block List
-     */
-
-    BLOCK_LIST_SEPARATER("$1,$2 ", "Block List"), /*
-     * Biome
-     */
-
-    NEED_BIOME("$2You need to specify a valid biome.", "Biome"), BIOME_SET_TO(
-        "$2Plot biome set to $2", "Biome"), /*
-     * Teleport / Entry
-     */
-
-    TELEPORTED_TO_PLOT("$1You have been teleported", "Teleport"), TELEPORTED_TO_ROAD(
-        "$2You got teleported to the road", "Teleport"),
-
-    TELEPORT_IN_SECONDS("$1Teleporting in %s seconds. Do not move...", "Teleport"), TELEPORT_FAILED(
-        "$2Teleportation cancelled due to movement or damage", "Teleport"), /*
-     * Set Block
-     */
-
-    SET_BLOCK_ACTION_FINISHED("$1The last setblock action is now finished.", "Set Block"),
-
-    /*
-    AllowUnsafe
-     */
-    DEBUGALLOWUNSAFE_ON("$2Unsafe actions allowed", "unsafe"), DEBUGALLOWUNSAFE_OFF(
-        "$2Unsafe actions disabled", "unsafe"), /*
-     * Debug
-     */
-
-    DEBUG_HEADER("$1Debug Information&-", "Debug"), DEBUG_SECTION("$2>> $1&l%val%", "Debug"),
-
-    DEBUG_LINE("$2>> $1%var%$2:$1 %val%&-", "Debug"), /*
-     * Invalid
-     */
-
-    NOT_VALID_DATA("$2That's not a valid data id.", "Invalid"), NOT_VALID_BLOCK(
-        "$2That's not a valid block: %s", "Invalid"),
-
-    NOT_ALLOWED_BLOCK("$2That block is not allowed: %s", "Invalid"), NOT_VALID_NUMBER(
-        "$2That's not a valid number within the range: %s", "Invalid"),
-
-    NOT_VALID_PLOT_ID("$2That's not a valid plot id.", "Invalid"), PLOT_ID_FORM(
-        "$2The plot id must be in the form: $1X;Y $2e.g. $1-5;7", "Invalid"),
-
-    NOT_YOUR_PLOT("$2That is not your plot.", "Invalid"), NO_SUCH_PLOT("$2There is no such plot",
-        "Invalid"),
-
-    PLAYER_HAS_NOT_BEEN_ON("$2That player hasn't been in the plotworld", "Invalid"), FOUND_NO_PLOTS(
-        "$2Found no plots with your search query", "Invalid"),
-
-    FOUND_NO_PLOTS_FOR_PLAYER("$2No plots found for player: %s", "Invalid"), /*
-     * Camera
-     */
-
-    CAMERA_STARTED("$2You have entered camera mode for plot $1%s", "Camera"), CAMERA_STOPPED(
-        "$2You are no longer in camera mode", "Camera"), /*
-     * Need
-     */
-
-    NEED_PLOT_NUMBER("$2You've got to specify a plot number or alias", "Need"), NEED_BLOCK(
-        "$2You've got to specify a block", "Need"),
-
-    NEED_PLOT_ID("$2You've got to specify a plot id.", "Need"), NEED_PLOT_WORLD(
-        "$2You've got to specify a plot area.", "Need"),
-
-    NEED_USER("$2You need to specify a username", "Need"), /*
-     * Near
-     */
-
-    PLOT_NEAR("$1Players: %s0", "Near"), /*
-     * Info
-     */
-
-    NONE("None", "Info"), NOW("Now", "Info"),
-
-    NEVER("Never", "Info"), UNKNOWN("Unknown", "Info"),
-
-    EVERYONE("Everyone", "Info"), PLOT_UNOWNED(
-        "$2The current plot must have an owner to perform this action", "Info"),
-
-    PLOT_INFO_UNCLAIMED("$2Plot $1%s$2 is not yet claimed", "Info"), PLOT_INFO_HEADER(
-        "$3&m---------&r $1INFO $3&m---------", false, "Info"),
-
-    PLOT_INFO("$1ID: $2%id%$1&-" + "$1Alias: $2%alias%$1&-" + "$1Owner: $2%owner%$1&-"
-        + "$1Biome: $2%biome%$1&-" + "$1Can Build: $2%build%$1&-" + "$1Rating: $2%rating%&-"
-        + "$1Seen: $2%seen%&-" + "$1Trusted: $2%trusted%$1&-" + "$1Members: $2%members%$1&-"
-        + "$1Denied: $2%denied%$1&-" + "$1Flags: $2%flags%", "Info"), PLOT_INFO_FOOTER(
-        "$3&m---------&r $1INFO $3&m---------", false, "Info"),
-
-    PLOT_INFO_TRUSTED("$1Trusted:$2 %trusted%", "Info"), PLOT_INFO_MEMBERS("$1Members:$2 %members%",
-        "Info"),
-
-    PLOT_INFO_DENIED("$1Denied:$2 %denied%", "Info"), PLOT_INFO_FLAGS("$1Flags:$2 %flags%", "Info"),
-
-    PLOT_INFO_BIOME("$1Biome:$2 %biome%", "Info"), PLOT_INFO_RATING("$1Rating:$2 %rating%", "Info"),
-
-    PLOT_INFO_OWNER("$1Owner:$2 %owner%", "Info"), PLOT_INFO_ID("$1ID:$2 %id%", "Info"),
-
-    PLOT_INFO_ALIAS("$1Alias:$2 %alias%", "Info"), PLOT_INFO_SIZE("$1Size:$2 %size%", "Info"),
-
-    PLOT_INFO_SEEN("$1Seen:$2 %seen%", "Info"), PLOT_USER_LIST(" $1%user%$2,", "Info"),
-
-    PLOT_FLAG_LIST("$1%s0:%s1$2", "Info"), INFO_SYNTAX_CONSOLE("$2/plot info X;Y", "Info"), /*
-     * Generating
-     */
-
-    GENERATING_COMPONENT("$1Started generating component from your settings", "Working"), /*
-     * Clearing
-     */
-
-    CLEARING_PLOT("$2Clearing plot async.", "Working"), CLEARING_DONE(
-        "$4Clear completed! Took %sms.", "Working"),
-
-    DELETING_DONE("$4Delete completed! Took %sms.", "Working"), /*
-     * Claiming
-     */
-
-    PLOT_NOT_CLAIMED("$2Plot not claimed", "Working"), PLOT_IS_CLAIMED(
-        "$2This plot is already claimed", "Working"),
-
-    CLAIMED("$4You successfully claimed the plot", "Working"), /*
-     * List
-     */
-
-    COMMENT_LIST_HEADER_PAGED("$2(Page $1%cur$2/$1%max$2) $1List of %amount% comments",
-        "List"), CLICKABLE(" (interactive)", "List"),
-
-    AREA_LIST_HEADER_PAGED("$2(Page $1%cur$2/$1%max$2) $1List of %amount% areas",
-        "List"), PLOT_LIST_HEADER_PAGED("$2(Page $1%cur$2/$1%max$2) $1List of %amount% plots",
-        "List"),
-
-    PLOT_LIST_HEADER("$1List of %word% plots", "List"), PLOT_LIST_ITEM(
-        "$2>> $1%id$2:$1%world $2- $1%owner", "List"),
-
-    PLOT_LIST_ITEM_ORDERED("$2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner",
-        "List"), PLOT_LIST_FOOTER("$2>> $1%word% a total of $2%num% $1claimed %plot%.", "List"), /*
-     * Left
-     */
-
-    LEFT_PLOT("$2You left a plot", "Left"), /*
-     * Wait
-     */
-
-    WAIT_FOR_TIMER(
-        "$2A setblock timer is bound to either the current plot or you. Please wait for it to finish",
-        "Errors"), /*
-     * Chat
-     */
-
-    PLOT_CHAT_SPY_FORMAT("$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%",
-        "Chat"), PLOT_CHAT_FORMAT("$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%", "Chat"),
-
-    PLOT_CHAT_FORCED("$2This world forces everyone to use plot chat.", "Chat"), PLOT_CHAT_ON(
-        "$4Plot chat enabled.", "Chat"),
-
-    PLOT_CHAT_OFF("$4Plot chat disabled.", "Chat"), /*
-     * Denied
-     */
-
-    DENIED_REMOVED("$4You successfully undenied the player from this plot", "Deny"), DENIED_ADDED(
-        "$4You successfully denied the player from this plot", "Deny"),
-
-    DENIED_NEED_ARGUMENT(
-        "$2Arguments are missing. $1/plot denied add <name> $2or $1/plot denied remove <name>",
-        "Deny"), WAS_NOT_DENIED("$2That player was not denied on this plot", "Deny"),
-
-    YOU_GOT_DENIED(
-        "$4You are denied from the plot you were previously on, and got teleported to spawn",
-        "Deny"), /*
-     * Kick
-     */
-
-    YOU_GOT_KICKED("$4You got kicked!", "Kick"), /*
-     * Rain
-     */
-
-    NEED_ON_OFF("$2You need to specify a value. Possible values: $1on$2, $1off",
-        "Rain"), SETTING_UPDATED("$4You successfully updated the setting", "Rain"), /*
-     * Flag
-     */
-
-    FLAG_KEY("$2Key: %s", "Flag"), FLAG_TYPE("$2Type: %s", "Flag"),
-
-    FLAG_DESC("$2Desc: %s", "Flag"), NOT_VALID_FLAG("$2That is not a valid flag", "Flag"),
-
-    NOT_VALID_FLAG_SUGGESTED("$2That is not a valid flag. Did you mean: $1%s",
-        "Flag"), NOT_VALID_VALUE("$2Flag values must be alphanumerical", "Flag"),
-
-    FLAG_NOT_IN_PLOT("$2The plot does not have that flag", "Flag"), FLAG_NOT_REMOVED(
-        "$2The flag could not be removed", "Flag"),
-
-    FLAG_NOT_ADDED("$2The flag could not be added", "Flag"), FLAG_REMOVED(
-        "$4Successfully removed flag", "Flag"),
-
-    FLAG_ADDED("$4Successfully added flag", "Flag"), FLAG_TUTORIAL_USAGE(
-        "$1Have an admin set the flag: $2%s", "CommandConfig"), /*
-     * Trusted
-     */
-
-    TRUSTED_ADDED("$4You successfully trusted a user to the plot", "Trusted"), TRUSTED_REMOVED(
-        "$4You successfully removed a trusted user from the plot", "Trusted"),
-
-    WAS_NOT_ADDED("$2That player was not trusted on this plot", "Trusted"), PLOT_REMOVED_USER(
-        "$1Plot %s of which you were added to has been deleted due to owner inactivity",
-        "Trusted"), /*
-     * Member
-     */
-
-    REMOVED_PLAYERS("$2Removed %s players from this plot.", "Member"), ALREADY_OWNER(
-        "$2That user is already the plot owner: %s0", "Member"),
-
-    ALREADY_ADDED("$2That user is already added to that category: %s0", "Member"), MEMBER_ADDED(
-        "$4That user can now build while the plot owner is online", "Member"),
-
-    MEMBER_REMOVED("$1You successfully removed a user from the plot",
-        "Member"), MEMBER_WAS_NOT_ADDED("$2That player was not added as a user on this plot",
-        "Member"),
-
-    PLOT_MAX_MEMBERS("$2You are not allowed to add any more players to this plot", "Member"), /*
-     * Set Owner
-     */
-
-    SET_OWNER("$4You successfully set the plot owner", "Owner"), SET_OWNER_CANCELLED(
-        "$2The setowner action was cancelled", "Owner"),
-
-    NOW_OWNER("$4You are now owner of plot %s", "Owner"), /*
-     * Signs
-     */
-
-    OWNER_SIGN_LINE_1("$1ID: $1%id%", "Signs"), OWNER_SIGN_LINE_2("$1Owner:", "Signs"),
-
-    OWNER_SIGN_LINE_3("$2%plr%", "Signs"), OWNER_SIGN_LINE_4("$3Claimed", "Signs"), /*
-     * Help
-     */
-
-    HELP_HEADER("$3&m---------&r $1Plot\u00B2 Help $3&m---------", "Help"), HELP_PAGE_HEADER(
-        "$1Category: $2%category%$2,$1 Page: $2%current%$3/$2%max%$2", "Help"),
-
-    HELP_FOOTER("$3&m---------&r $1Plot\u00B2 Help $3&m---------", "Help"),
-
-    HELP_INFO_ITEM("$1/plot help %category% $3- $2%category_desc%", "Help"), HELP_ITEM(
-        "$1%usage% [%alias%]&- $3- $2%desc%&-", "Help"),
-
-    BUCKET_ENTRIES_IGNORED(
-        "$2Total bucket values add up to 1 or more. Blocks without a spcified chance will be ignored",
-        "Generator_Bucket"),
-
-    /*
-     * Direction
-     */
-
-    DIRECTION("$1Current direction: %dir%", "Help"), /*
-     * Grant
-     */
-
-    GRANTED_PLOTS("$1Result: $2%s $1grants left", "Grants"), GRANTED_PLOT(
-        "$1You granted %s0 plot to $2%s1", "Grants"),
-
-    GRANTED_PLOT_FAILED("$1Grant failed: $2%s", "Grants"), /*
-     * Custom
-     */
-
-    /**
-     * Legacy Configuration Conversion
-     */
-    LEGACY_CONFIG_FOUND("A legacy configuration file was detected. Conversion will be attempted.",
-        "LegacyConfig"), LEGACY_CONFIG_BACKUP(
-        "A copy of worlds.yml $1have been saved in the file worlds.yml.old$1.",
-        "LegacyConfig"), LEGACY_CONFIG_REPLACED("> %s has been replaced with %s",
-        "LegacyConfig"), LEGACY_CONFIG_DONE(
-        "The conversion has finished. PlotSquared will now be disabled and the new configuration file will"
-            + " be used at next startup. Please review the new worlds.yml file. "
-            + "Please note that schematics will not be converted, as we are now using WorldEdit to handle schematics. "
-            + "You need to re-generate the schematics.",
-        "LegacyConfig"), LEGACY_CONFIG_CONVERSION_FAILED(
-        "Failed to convert the legacy configuration file. See stack trace for information.",
-        "LegacyConfig"),
-
-    CUSTOM_STRING("-", "-");
-
-    public static final HashMap<String, String> replacements = new HashMap<>();
-
-    /**
-     * Default.
-     */
-    private final String def;
-    /**
-     * What locale category should this translation fall under.
-     */
-    private final String category;
-    /**
-     * Should the string be prefixed.
-     */
-    private final boolean prefix;
-    /**
-     * Translated.
-     */
-    private String s;
-
-    /**
-     * Constructor.
-     *
-     * @param def    default
-     * @param prefix use prefix
-     */
-    C(String def, boolean prefix, String category) {
-        this.def = def;
-        this.s = def;
-        this.prefix = prefix;
-        this.category = category.toLowerCase();
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param def default
-     */
-    C(String def, String category) {
-        this(def, true, category.toLowerCase());
-    }
-
-    public static String format(String m, Object... args) {
-        if (args.length == 0) {
-            return m;
-        }
-        Map<String, String> map = new LinkedHashMap<>();
-        if (args.length > 0) {
-            for (int i = args.length - 1; i >= 0; i--) {
-                String arg = "" + args[i];
-                if (arg == null || arg.isEmpty()) {
-                    map.put("%s" + i, "");
-                } else {
-                    arg = C.color(arg);
-                    map.put("%s" + i, arg);
-                }
-                if (i == 0) {
-                    map.put("%s", arg);
-                }
-            }
-        }
-        m = StringMan.replaceFromMap(m, map);
-        return m;
-    }
-
-    public static String format(C caption, Object... args) {
-        if (caption.usePrefix() && caption.s.length() > 0) {
-            return C.PREFIX.s() + format(caption.s, args);
-        } else {
-            return format(caption.s, args);
-        }
-    }
-
-    public static String color(String string) {
-        return StringMan.replaceFromMap(string, replacements);
-    }
-
-    public static void load(File file) {
-        try {
-            if (!file.exists()) {
-                file.getParentFile().mkdirs();
-                file.createNewFile();
-            }
-            YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
-            Set<String> keys = yml.getKeys(true);
-            EnumSet<C> allEnums = EnumSet.allOf(C.class);
-            HashSet<String> allNames = new HashSet<>();
-            HashSet<String> categories = new HashSet<>();
-            HashSet<String> toRemove = new HashSet<>();
-            for (C caption : allEnums) {
-                allNames.add(caption.name());
-                categories.add(caption.category.toLowerCase());
-            }
-            HashSet<C> captions = new HashSet<>();
-            boolean changed = false;
-            for (String key : keys) {
-                if (!yml.isString(key)) {
-                    if (!categories.contains(key)) {
-                        toRemove.add(key);
-                    }
-                    continue;
-                }
-                String[] split = key.split("\\.");
-                String node = split[split.length - 1].toUpperCase();
-                C caption;
-                if (allNames.contains(node)) {
-                    caption = valueOf(node);
-                } else {
-                    caption = null;
-                }
-                if (caption != null) {
-                    if (caption.category.startsWith("static")) {
-                        continue;
-                    }
-                    String value = yml.getString(key);
-                    if (!split[0].equalsIgnoreCase(caption.category)) {
-                        changed = true;
-                        yml.set(key, null);
-                        yml.set(caption.category + '.' + caption.name().toLowerCase(), value);
-                    }
-                    captions.add(caption);
-                    caption.s = value;
-                } else {
-                    toRemove.add(key);
-                }
-            }
-            for (String remove : toRemove) {
-                changed = true;
-                yml.set(remove, null);
-            }
-            ConfigurationSection config = PlotSquared.get().style.getConfigurationSection("color");
-            Set<String> styles = config.getKeys(false);
-            // HashMap<String, String> replacements = new HashMap<>();
-            replacements.clear();
-            for (String style : styles) {
-                replacements.put('$' + style, '\u00A7' + config.getString(style));
-            }
-            for (char letter : "1234567890abcdefklmnor".toCharArray()) {
-                replacements.put("&" + letter, "\u00a7" + letter);
-            }
-            replacements.put("\\\\n", "\n");
-            replacements.put("\\n", "\n");
-            replacements.put("&-", "\n");
-            for (C caption : allEnums) {
-                if (!captions.contains(caption)) {
-                    if (caption.getCategory().startsWith("static")) {
-                        continue;
-                    }
-                    changed = true;
-                    yml.set(caption.category + '.' + caption.name().toLowerCase(), caption.def);
-                }
-                caption.s = StringMan.replaceFromMap(caption.s, replacements);
-            }
-            if (changed) {
-                yml.save(file);
-            }
-        } catch (IOException | IllegalArgumentException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public String f(final Object... args) {
-        return format(s(), args);
-    }
-
-    @Override public String toString() {
-        return this.s;
-    }
-
-    public String s() {
-        return this.s;
-    }
-
-    public boolean usePrefix() {
-        return this.prefix;
-    }
-
-    public String formatted() {
-        return StringMan.replaceFromMap(s(), replacements);
-    }
-
-    public String getCategory() {
-        return this.category;
-    }
-
-    public void send(CommandCaller caller, String... args) {
-        send(caller, (Object[]) args);
-    }
-
-    public void send(CommandCaller caller, Object... args) {
-        String msg = format(this, args);
-        if (caller == null) {
-            PlotSquared.log(msg);
-        } else {
-            caller.sendMessage(msg);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
deleted file mode 100644
index 82992e265..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
+++ /dev/null
@@ -1,440 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.config;
-
-import com.github.intellectualsites.plotsquared.configuration.MemorySection;
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.lang.invoke.MethodHandles;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.*;
-
-public class Config {
-
-    /**
-     * Get the value for a node<br>
-     * Probably throws some error if you try to get a non existent key
-     *
-     * @param key
-     * @param root
-     * @param <T>
-     * @return
-     */
-    public static <T> T get(String key, Class root) {
-        String[] split = key.split("\\.");
-        Object instance = getInstance(split, root);
-        if (instance != null) {
-            Field field = getField(split, instance);
-            if (field != null) {
-                try {
-                    return (T) field.get(instance);
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        PlotSquared.debug("Failed to get config option: " + key);
-        return null;
-    }
-
-    /**
-     * Set the value of a specific node<br>
-     * Probably throws some error if you supply non existing keys or invalid values
-     *
-     * @param key   config node
-     * @param value value
-     * @param root
-     */
-    public static void set(String key, Object value, Class root) {
-        String[] split = key.split("\\.");
-        Object instance = getInstance(split, root);
-        if (instance != null) {
-            Field field = getField(split, instance);
-            if (field != null) {
-                try {
-                    if (field.getAnnotation(Final.class) != null) {
-                        return;
-                    }
-                    if (field.getType() == String.class && !(value instanceof String)) {
-                        value = value + "";
-                    }
-                    field.set(instance, value);
-                    return;
-                } catch (Throwable e) {
-                    PlotSquared.debug(
-                        "Invalid configuration value: " + key + ": " + value + " in " + root
-                            .getSimpleName());
-                    e.printStackTrace();
-                }
-            }
-        }
-        PlotSquared.debug("Failed to set config option: " + key + ": " + value + " | " + instance);
-    }
-
-    public static boolean load(File file, Class root) {
-        if (!file.exists()) {
-            return false;
-        }
-        YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
-        for (String key : yml.getKeys(true)) {
-            Object value = yml.get(key);
-            if (value instanceof MemorySection) {
-                continue;
-            }
-            set(key, value, root);
-        }
-        return true;
-    }
-
-    /**
-     * Set all values in the file (load first to avoid overwriting)
-     *
-     * @param file
-     * @param root
-     */
-    public static void save(File file, Class root) {
-        try {
-            if (!file.exists()) {
-                file.getParentFile().mkdirs();
-                file.createNewFile();
-            }
-            PrintWriter writer = new PrintWriter(file);
-            Object instance = root.newInstance();
-            save(writer, root, instance, 0);
-            writer.close();
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Get the static fields in a section.
-     *
-     * @param clazz
-     * @return
-     */
-    public static Map<String, Object> getFields(Class clazz) {
-        HashMap<String, Object> map = new HashMap<>();
-        for (Field field : clazz.getFields()) {
-            if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {
-                try {
-                    map.put(toNodeName(field.getName()), field.get(null));
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return map;
-    }
-
-    private static String toYamlString(Object value, String spacing) {
-        if (value instanceof List) {
-            Collection<?> listValue = (Collection<?>) value;
-            if (listValue.isEmpty()) {
-                return "[]";
-            }
-            StringBuilder m = new StringBuilder();
-            for (Object obj : listValue) {
-                m.append(System.lineSeparator() + spacing + "- " + toYamlString(obj, spacing));
-            }
-            return m.toString();
-        }
-        if (value instanceof String) {
-            String stringValue = (String) value;
-            if (stringValue.isEmpty()) {
-                return "''";
-            }
-            return "\"" + stringValue + "\"";
-        }
-        return value != null ? value.toString() : "null";
-    }
-
-    private static void save(PrintWriter writer, Class clazz, Object instance, int indent) {
-        try {
-            String lineSeparator = System.lineSeparator();
-            String spacing = StringMan.repeat(" ", indent);
-            for (Field field : clazz.getFields()) {
-                if (field.getAnnotation(Ignore.class) != null) {
-                    continue;
-                }
-                Comment comment = field.getAnnotation(Comment.class);
-                if (comment != null) {
-                    for (String commentLine : comment.value()) {
-                        writer.write(spacing + "# " + commentLine + lineSeparator);
-                    }
-                }
-                Create create = field.getAnnotation(Create.class);
-                if (create != null) {
-                    Object value = field.get(instance);
-                    if (value == null && field.getType() != ConfigBlock.class) {
-                        setAccessible(field);
-                        Class<?>[] classes = clazz.getDeclaredClasses();
-                        for (Class current : classes) {
-                            if (StringMan.isEqual(current.getSimpleName(), field.getName())) {
-                                field.set(instance, current.newInstance());
-                                break;
-                            }
-                        }
-                    }
-                    continue;
-                } else {
-                    writer.write(spacing + toNodeName(field.getName() + ": ") + toYamlString(
-                        field.get(instance), spacing) + lineSeparator);
-                }
-            }
-            for (Class<?> current : clazz.getClasses()) {
-                if (current.isInterface() || current.getAnnotation(Ignore.class) != null) {
-                    continue;
-                }
-                if (indent == 0) {
-                    writer.write(lineSeparator);
-                }
-                Comment comment = current.getAnnotation(Comment.class);
-                if (comment != null) {
-                    for (String commentLine : comment.value()) {
-                        writer.write(spacing + "# " + commentLine + lineSeparator);
-                    }
-                }
-                writer.write(spacing + toNodeName(current.getSimpleName()) + ":" + lineSeparator);
-                BlockName blockNames = current.getAnnotation(BlockName.class);
-                if (blockNames != null) {
-                    Field instanceField =
-                        clazz.getDeclaredField(toFieldName(current.getSimpleName()));
-                    setAccessible(instanceField);
-                    ConfigBlock value = (ConfigBlock) instanceField.get(instance);
-                    if (value == null) {
-                        value = new ConfigBlock();
-                        instanceField.set(instance, value);
-                        for (String blockName : blockNames.value()) {
-                            value.put(blockName, current.newInstance());
-                        }
-                    }
-                    // Save each instance
-                    for (Map.Entry<String, Object> entry : ((Map<String, Object>) value.getRaw())
-                        .entrySet()) {
-                        String key = entry.getKey();
-                        writer.write(spacing + "  " + toNodeName(key) + ":" + lineSeparator);
-                        save(writer, current, entry.getValue(), indent + 4);
-                    }
-                    continue;
-                } else {
-                    save(writer, current, current.newInstance(), indent + 2);
-                }
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Get the field for a specific config node.
-     *
-     * @param split the node (split by period)
-     * @param root
-     * @return
-     */
-    private static Field getField(String[] split, Class root) {
-        Object instance = getInstance(split, root);
-        if (instance == null) {
-            return null;
-        }
-        return getField(split, instance);
-    }
-
-    /**
-     * Get the field for a specific config node and instance<br>
-     * Note: As expiry can have multiple blocks there will be multiple instances
-     *
-     * @param split    the node (split by period)
-     * @param instance the instance
-     * @return
-     */
-    private static Field getField(String[] split, Object instance) {
-        try {
-            Field field = instance.getClass().getField(toFieldName(split[split.length - 1]));
-            setAccessible(field);
-            return field;
-        } catch (Throwable e) {
-            PlotSquared.debug(
-                "Invalid config field: " + StringMan.join(split, ".") + " for " + toNodeName(
-                    instance.getClass().getSimpleName()));
-            return null;
-        }
-    }
-
-    /**
-     * Get the instance for a specific config node.
-     *
-     * @param split the node (split by period)
-     * @param root
-     * @return The instance or null
-     */
-    private static Object getInstance(String[] split, Class root) {
-        try {
-            Class<?> clazz = root == null ? MethodHandles.lookup().lookupClass() : root;
-            Object instance = clazz.newInstance();
-            while (split.length > 0) {
-                switch (split.length) {
-                    case 1:
-                        return instance;
-                    default:
-                        Class found = null;
-                        Class<?>[] classes = clazz.getDeclaredClasses();
-                        for (Class current : classes) {
-                            if (current.getSimpleName().equalsIgnoreCase(toFieldName(split[0]))) {
-                                found = current;
-                                break;
-                            }
-                        }
-                        try {
-                            Field instanceField = clazz.getDeclaredField(toFieldName(split[0]));
-                            setAccessible(instanceField);
-                            if (instanceField.getType() != ConfigBlock.class) {
-                                Object value = instanceField.get(instance);
-                                if (value == null) {
-                                    value = found.newInstance();
-                                    instanceField.set(instance, value);
-                                }
-                                clazz = found;
-                                instance = value;
-                                split = Arrays.copyOfRange(split, 1, split.length);
-                                continue;
-                            }
-                            ConfigBlock value = (ConfigBlock) instanceField.get(instance);
-                            if (value == null) {
-                                value = new ConfigBlock();
-                                instanceField.set(instance, value);
-                            }
-                            instance = value.get(split[1]);
-                            if (instance == null) {
-                                instance = found.newInstance();
-                                value.put(split[1], instance);
-                            }
-                            clazz = found;
-                            split = Arrays.copyOfRange(split, 2, split.length);
-                            continue;
-                        } catch (NoSuchFieldException ignore) {
-                        }
-                        if (found != null) {
-                            split = Arrays.copyOfRange(split, 1, split.length);
-                            clazz = found;
-                            instance = clazz.newInstance();
-                            continue;
-                        }
-                        return null;
-                }
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * Translate a node to a java field name.
-     *
-     * @param node
-     * @return
-     */
-    private static String toFieldName(String node) {
-        return node.toUpperCase().replaceAll("-", "_");
-    }
-
-    /**
-     * Translate a field to a config node.
-     *
-     * @param field
-     * @return
-     */
-    private static String toNodeName(String field) {
-        return field.toLowerCase().replace("_", "-");
-    }
-
-    /**
-     * Set some field to be accessible.
-     *
-     * @param field
-     * @throws NoSuchFieldException
-     * @throws IllegalAccessException
-     */
-    private static void setAccessible(Field field)
-        throws NoSuchFieldException, IllegalAccessException {
-        field.setAccessible(true);
-        Field modifiersField = Field.class.getDeclaredField("modifiers");
-        modifiersField.setAccessible(true);
-        modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-    }
-
-    /**
-     * Indicates that a field should be instantiated / created.
-     */
-    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) public @interface Create {
-    }
-
-
-    /**
-     * Indicates that a field cannot be modified.
-     */
-    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD}) public @interface Final {
-    }
-
-
-    /**
-     * Creates a comment.
-     */
-    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
-    public @interface Comment {
-        String[] value();
-    }
-
-
-    /**
-     * The names of any default blocks.
-     */
-    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
-    public @interface BlockName {
-        String[] value();
-    }
-
-
-    /**
-     * Any field or class with is not part of the config.
-     */
-    @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.TYPE})
-    public @interface Ignore {
-    }
-
-
-    @Ignore // This is not part of the config
-    public static class ConfigBlock<T> {
-
-        private HashMap<String, T> INSTANCES = new HashMap<>();
-
-        public T get(String key) {
-            return INSTANCES.get(key);
-        }
-
-        public void put(String key, T value) {
-            INSTANCES.put(key, value);
-        }
-
-        public Collection<T> getInstances() {
-            return INSTANCES.values();
-        }
-
-        public Collection<String> getSections() {
-            return INSTANCES.keySet();
-        }
-
-        private Map<String, T> getRaw() {
-            return INSTANCES;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
deleted file mode 100644
index 3d636e0dd..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.config;
-
-import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import lombok.Getter;
-import lombok.NonNull;
-
-/**
- * Main Configuration Utility
- */
-public class Configuration {
-
-    public static final SettingValue<Integer> INTEGER = new SettingValue<Integer>("INTEGER") {
-        @Override public boolean validateValue(String string) {
-            try {
-                Integer.parseInt(string);
-                return true;
-            } catch (NumberFormatException ignored) {
-                return false;
-            }
-        }
-
-        @Override public Integer parseString(String string) {
-            return Integer.parseInt(string);
-        }
-    };
-    public static final SettingValue<Boolean> BOOLEAN = new SettingValue<Boolean>("BOOLEAN") {
-        @Override public boolean validateValue(String string) {
-            //noinspection ResultOfMethodCallIgnored
-            Boolean.parseBoolean(string);
-            return true;
-        }
-
-        @Override public Boolean parseString(String string) {
-            return Boolean.parseBoolean(string);
-        }
-    };
-    public static final SettingValue<String> BIOME = new SettingValue<String>("BIOME") {
-        @Override public boolean validateValue(String string) {
-            try {
-                int biome = WorldUtil.IMP.getBiomeFromString(string.toUpperCase());
-                return biome != -1;
-            } catch (Exception ignored) {
-                return false;
-            }
-        }
-
-        @Override public String parseString(String string) {
-            if (validateValue(string)) {
-                return string.toUpperCase();
-            }
-            return "FOREST";
-        }
-    };
-
-    public static final SettingValue<BlockBucket> BLOCK_BUCKET =
-        new SettingValue<BlockBucket>("BLOCK_BUCKET") {
-            @Override public BlockBucket parseString(final String string) {
-                if (string == null || string.isEmpty()) {
-                    return new BlockBucket();
-                }
-                final BlockBucket blockBucket = new BlockBucket();
-                final String[] parts = string.split(",");
-                for (final String part : parts) {
-                    String block;
-                    int chance = -1;
-
-                    if (part.contains(":")) {
-                        final String[] innerParts = part.split(":");
-                        if (innerParts.length > 1) {
-                            chance = Integer.parseInt(innerParts[1]);
-                        }
-                        block = innerParts[0];
-                    } else {
-                        block = part;
-                    }
-                    final StringComparison<PlotBlock>.ComparisonResult value =
-                        WorldUtil.IMP.getClosestBlock(block);
-                    if (value == null) {
-                        throw new UnknownBlockException(block);
-                    } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir()
-                        && !WorldUtil.IMP.isBlockSolid(value.best)) {
-                        throw new UnsafeBlockException(value.best);
-                    }
-                    blockBucket.addBlock(value.best, chance);
-                }
-                blockBucket.compile(); // Pre-compile :D
-                return blockBucket;
-            }
-
-            @Override public boolean validateValue(final String string) {
-                try {
-                    if (string == null || string.isEmpty()) {
-                        return false;
-                    }
-                    final String[] parts = string.split(",");
-                    for (final String part : parts) {
-                        String block;
-                        if (part.contains(":")) {
-                            final String[] innerParts = part.split(":");
-                            if (innerParts.length > 1) {
-                                final int chance = Integer.parseInt(innerParts[1]);
-                                if (chance < 1 || chance > 100) {
-                                    return false;
-                                }
-                            }
-                            block = innerParts[0];
-                        } else {
-                            block = part;
-                        }
-                        StringComparison<PlotBlock>.ComparisonResult value =
-                            WorldUtil.IMP.getClosestBlock(block);
-                        if (value == null || value.match > 1) {
-                            return false;
-                        } else if (Settings.Enabled_Components.PREVENT_UNSAFE && !value.best.isAir()
-                            && !WorldUtil.IMP.isBlockSolid(value.best)) {
-                            throw new UnsafeBlockException(value.best);
-                        }
-                    }
-                } catch (final Throwable exception) {
-                    return false;
-                }
-                return true;
-            }
-        };
-
-
-    public static final class UnknownBlockException extends IllegalArgumentException {
-
-        @Getter private final String unknownValue;
-
-        UnknownBlockException(@NonNull final String unknownValue) {
-            super(String.format("\"%s\" is not a valid block", unknownValue));
-            this.unknownValue = unknownValue;
-        }
-
-    }
-
-
-    /**
-     * Create your own SettingValue object to make the management of plotworld configuration easier
-     */
-    public abstract static class SettingValue<T> {
-
-        private final String type;
-
-        SettingValue(String type) {
-            this.type = type;
-        }
-
-        public String getType() {
-            return this.type;
-        }
-
-        public abstract T parseString(String string);
-
-        public abstract boolean validateValue(String string);
-    }
-
-
-    public static final class UnsafeBlockException extends IllegalArgumentException {
-
-        @Getter private final PlotBlock unsafeBlock;
-
-        UnsafeBlockException(@NonNull final PlotBlock unsafeBlock) {
-            super(String.format("%s is not a valid block", unsafeBlock));
-            this.unsafeBlock = unsafeBlock;
-        }
-
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java
deleted file mode 100644
index 31539d5c2..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.config;
-
-import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Configuration Node.
- */
-public class ConfigurationNode {
-
-    private final String constant;
-    private final Object defaultValue;
-    private final String description;
-    private final Configuration.SettingValue type;
-    private Object value;
-
-    public ConfigurationNode(String constant, Object defaultValue, String description,
-        Configuration.SettingValue type) {
-        this.constant = constant;
-        this.defaultValue = defaultValue;
-        this.description = description;
-        this.value = defaultValue;
-        this.type = type;
-    }
-
-    public Configuration.SettingValue getType() {
-        return this.type;
-    }
-
-    public boolean isValid(String string) {
-        try {
-            Object result = this.type.parseString(string);
-            return result != null;
-        } catch (Exception e) {
-            if (e instanceof Configuration.UnknownBlockException) {
-                throw e;
-            }
-            return false;
-        }
-    }
-
-    public boolean setValue(String string) {
-        if (!this.type.validateValue(string)) {
-            return false;
-        }
-        this.value = this.type.parseString(string);
-        return true;
-    }
-
-    public Object getValue() {
-        if (this.value instanceof String[]) {
-            return Arrays.asList((String[]) this.value);
-        }
-        if (this.value instanceof Object[]) {
-            List<String> values = new ArrayList<>();
-            for (Object value : (Object[]) this.value) {
-                values.add(value.toString());
-            }
-            return values;
-        }
-        if (this.value instanceof BlockBucket) {
-            return this.value.toString();
-        }
-        if (this.value instanceof PlotBlock) {
-            return this.value.toString();
-        }
-        return this.value;
-    }
-
-    public String getConstant() {
-        return this.constant;
-    }
-
-    public Object getDefaultValue() {
-        if (this.defaultValue instanceof Object[]) {
-            return StringMan.join((Object[]) this.defaultValue, ",");
-        }
-        return this.defaultValue;
-    }
-
-    public String getDescription() {
-        return this.description;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
deleted file mode 100644
index 1f7f6a88d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.config;
-
-import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class Settings extends Config {
-
-    /*
-    START OF CONFIGURATION SECTION:
-    NOTE: Fields are saved in declaration order, classes in reverse order
-     */
-
-    @Comment("These first 7 aren't configurable") // This is a comment
-    @Final // Indicates that this value isn't configurable
-    public static final String ISSUES = "https://github.com/IntellectualSites/PlotSquared/issues";
-    @Final public static final String SUGGESTION =
-        "https://github.com/IntellectualSites/PlotSquaredSuggestions";
-    @Final public static final String WIKI =
-        "https://github.com/IntellectualSites/PlotSquared/wiki";
-    @Final public static String DATE; // These values are set from P2 before loading
-    @Final public static String BUILD; // These values are set from P2 before loading
-    @Final public static String COMMIT; // These values are set from P2 before loading
-    @Final public static String PLATFORM; // These values are set from P2 before loading
-
-    @Comment("Show additional information in console") public static boolean DEBUG = true;
-    @Comment({"The big annoying text that appears when you enter a plot",
-        "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"})
-    public static boolean TITLES = true;
-
-    @Create // This value will be generated automatically
-    public static ConfigBlock<Auto_Clear> AUTO_CLEAR = null;
-    // A ConfigBlock is a section that can have multiple instances e.g. multiple expiry tasks
-
-    public static void save(File file) {
-        save(file, Settings.class);
-    }
-
-    public static void load(File file) {
-        load(file, Settings.class);
-    }
-
-    public static boolean convertLegacy(File file) {
-        if (!file.exists()) {
-            return false;
-        }
-        YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
-
-        // Protection
-        Redstone.DISABLE_OFFLINE = config.getBoolean("protection.redstone.disable-offline");
-        Redstone.DISABLE_UNOCCUPIED = config
-            .getBoolean("protection.redstone.disable-unoccupied", Redstone.DISABLE_UNOCCUPIED);
-
-        // UUID
-        UUID.USE_SQLUUIDHANDLER =
-            config.getBoolean("uuid.use_sqluuidhandler", UUID.USE_SQLUUIDHANDLER);
-        UUID.OFFLINE = config.getBoolean("UUID.offline", UUID.OFFLINE);
-        UUID.FORCE_LOWERCASE = config.getBoolean("UUID.force-lowercase", UUID.FORCE_LOWERCASE);
-
-        // Mob stuff
-        Enabled_Components.KILL_ROAD_MOBS =
-            config.getBoolean("kill_road_mobs", Enabled_Components.KILL_ROAD_MOBS);
-        Enabled_Components.KILL_ROAD_VEHICLES =
-            config.getBoolean("kill_road_vehicles", Enabled_Components.KILL_ROAD_VEHICLES);
-
-        // Clearing + Expiry
-        //FAST_CLEAR = config.getBoolean("clear.fastmode");
-        Enabled_Components.PLOT_EXPIRY =
-            config.getBoolean("clear.auto.enabled", Enabled_Components.PLOT_EXPIRY);
-        if (Enabled_Components.PLOT_EXPIRY) {
-            Enabled_Components.BAN_DELETER = config.getBoolean("clear.on.ban");
-            AUTO_CLEAR = new ConfigBlock<>();
-            AUTO_CLEAR.put("task1", new Auto_Clear());
-            Auto_Clear task = AUTO_CLEAR.get("task1");
-            task.CALIBRATION = new Auto_Clear.CALIBRATION();
-
-            task.DAYS = config.getInt("clear.auto.days", task.DAYS);
-            task.THRESHOLD = config.getInt("clear.auto.threshold", task.THRESHOLD);
-            task.CONFIRMATION = config.getBoolean("clear.auto.confirmation", task.CONFIRMATION);
-            task.CALIBRATION.CHANGES =
-                config.getInt("clear.auto.calibration.changes", task.CALIBRATION.CHANGES);
-            task.CALIBRATION.FACES =
-                config.getInt("clear.auto.calibration.faces", task.CALIBRATION.FACES);
-            task.CALIBRATION.DATA =
-                config.getInt("clear.auto.calibration.data", task.CALIBRATION.DATA);
-            task.CALIBRATION.AIR =
-                config.getInt("clear.auto.calibration.air", task.CALIBRATION.AIR);
-            task.CALIBRATION.VARIETY =
-                config.getInt("clear.auto.calibration.variety", task.CALIBRATION.VARIETY);
-            task.CALIBRATION.CHANGES_SD =
-                config.getInt("clear.auto.calibration.changes_sd", task.CALIBRATION.CHANGES_SD);
-            task.CALIBRATION.FACES_SD =
-                config.getInt("clear.auto.calibration.faces_sd", task.CALIBRATION.FACES_SD);
-            task.CALIBRATION.DATA_SD =
-                config.getInt("clear.auto.calibration.data_sd", task.CALIBRATION.DATA_SD);
-            task.CALIBRATION.AIR_SD =
-                config.getInt("clear.auto.calibration.air_sd", task.CALIBRATION.AIR_SD);
-            task.CALIBRATION.VARIETY_SD =
-                config.getInt("clear.auto.calibration.variety_sd", task.CALIBRATION.VARIETY_SD);
-        }
-
-        // Done
-        Done.REQUIRED_FOR_RATINGS =
-            config.getBoolean("approval.ratings.check-done", Done.REQUIRED_FOR_RATINGS);
-        Done.COUNTS_TOWARDS_LIMIT =
-            config.getBoolean("approval.done.counts-towards-limit", Done.COUNTS_TOWARDS_LIMIT);
-        Done.RESTRICT_BUILDING =
-            config.getBoolean("approval.done.restrict-building", Done.RESTRICT_BUILDING);
-        Done.REQUIRED_FOR_DOWNLOAD =
-            config.getBoolean("approval.done.required-for-download", Done.REQUIRED_FOR_DOWNLOAD);
-
-        // Schematics
-        Paths.SCHEMATICS = config.getString("schematics.save_path", Paths.SCHEMATICS);
-
-        // Web
-        Web.URL = config.getString("web.url", Web.URL);
-
-        // Caching
-        Enabled_Components.PERMISSION_CACHE =
-            config.getBoolean("cache.permissions", Enabled_Components.PERMISSION_CACHE);
-        Enabled_Components.RATING_CACHE =
-            config.getBoolean("cache.ratings", Enabled_Components.RATING_CACHE);
-
-        // Rating system
-        Ratings.CATEGORIES = config.contains("ratings.categories") ?
-            config.getStringList("ratings.categories") :
-            Ratings.CATEGORIES;
-
-        // Titles
-        TITLES = config.getBoolean("titles", TITLES);
-
-        // Teleportation
-        Teleport.DELAY = config.getInt("teleport.delay", Teleport.DELAY);
-        Teleport.ON_LOGIN = config.getBoolean("teleport.on_login", Teleport.ON_LOGIN);
-        Teleport.ON_DEATH = config.getBoolean("teleport.on_death", Teleport.ON_DEATH);
-
-        // WorldEdit
-        //WE_ALLOW_HELPER = config.getBoolean("worldedit.enable-for-helpers");
-
-        // Chunk processor
-        Enabled_Components.CHUNK_PROCESSOR =
-            config.getBoolean("chunk-processor.enabled", Enabled_Components.CHUNK_PROCESSOR);
-        Chunk_Processor.AUTO_TRIM =
-            config.getBoolean("chunk-processor.auto-unload", Chunk_Processor.AUTO_TRIM);
-        Chunk_Processor.MAX_TILES =
-            config.getInt("chunk-processor.max-blockstates", Chunk_Processor.MAX_TILES);
-        Chunk_Processor.MAX_ENTITIES =
-            config.getInt("chunk-processor.max-entities", Chunk_Processor.MAX_ENTITIES);
-        Chunk_Processor.DISABLE_PHYSICS =
-            config.getBoolean("chunk-processor.disable-physics", Chunk_Processor.DISABLE_PHYSICS);
-
-        // Comments
-        Enabled_Components.COMMENT_NOTIFIER = config
-            .getBoolean("comments.notifications.enabled", Enabled_Components.COMMENT_NOTIFIER);
-
-        // Plot limits
-        Claim.MAX_AUTO_AREA = config.getInt("claim.max-auto-area", Claim.MAX_AUTO_AREA);
-        Limit.MAX_PLOTS = config.getInt("max_plots", Limit.MAX_PLOTS);
-        Limit.GLOBAL = config.getBoolean("global_limit", Limit.GLOBAL);
-
-        // Misc
-        DEBUG = config.getBoolean("debug", DEBUG);
-        Chat.CONSOLE_COLOR = config.getBoolean("console.color", Chat.CONSOLE_COLOR);
-        Chat.INTERACTIVE = config.getBoolean("chat.fancy", Chat.INTERACTIVE);
-
-        Enabled_Components.METRICS = config.getBoolean("metrics", Enabled_Components.METRICS);
-        Enabled_Components.UPDATER =
-            config.getBoolean("update-notifications", Enabled_Components.UPDATER);
-        Enabled_Components.DATABASE_PURGER =
-            config.getBoolean("auto-purge", Enabled_Components.DATABASE_PURGER);
-        return true;
-    }
-
-    @Comment("This is an auto clearing task called `task1`") @BlockName("task1")
-    // The name for the default block
-    public static final class Auto_Clear extends ConfigBlock {
-        @Create // This value has to be generated since an instance isn't static
-        public CALIBRATION CALIBRATION = null;
-        public int THRESHOLD = 1;
-        public int REQUIRED_PLOTS = -1;
-        public boolean CONFIRMATION = true;
-        public int DAYS = 7;
-        public int SKIP_ACCOUNT_AGE_DAYS = -1;
-        public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
-
-
-        @Comment("See: https://github.com/IntellectualSites/PlotSquared/wiki/Plot-analysis")
-        public static final class CALIBRATION {
-            public int VARIETY = 0;
-            public int VARIETY_SD = 0;
-            public int CHANGES = 0;
-            public int CHANGES_SD = 1;
-            public int FACES = 0;
-            public int FACES_SD = 0;
-            public int DATA_SD = 0;
-            public int AIR = 0;
-            public int AIR_SD = 0;
-            public int DATA = 0;
-        }
-    }
-
-
-    public static class Chunk_Processor {
-        @Comment("Auto trim will not save chunks which aren't claimed") public static boolean
-            AUTO_TRIM = false;
-        @Comment("Max tile entities per chunk") public static int MAX_TILES = 4096;
-        @Comment("Max entities per chunk") public static int MAX_ENTITIES = 512;
-        @Comment("Disable block physics") public static boolean DISABLE_PHYSICS = false;
-    }
-
-
-    public static class UUID {
-        @Comment("Force using offline UUIDs (it usually detects the right mode)")
-        public static boolean OFFLINE = false;
-        @Comment("Force using lowercase UUIDs") public static boolean FORCE_LOWERCASE = false;
-        @Comment("Use a database to store UUID/name info") public static boolean
-            USE_SQLUUIDHANDLER = false;
-        @Ignore public static boolean NATIVE_UUID_PROVIDER = false;
-    }
-
-
-    @Comment("General settings") public static final class General {
-        @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
-    }
-
-
-    @Comment("Schematic Settings") public static final class Schematics {
-        @Comment(
-            "Whether schematic based generation should paste schematic on top of plots, or from Y=1")
-        public static boolean PASTE_ON_TOP = true;
-    }
-
-
-    @Comment("Configure the paths that will be used") public static final class Paths {
-        public static String SCHEMATICS = "schematics";
-        public static String SCRIPTS = "scripts";
-        public static String TEMPLATES = "templates";
-        public static String TRANSLATIONS = "translations";
-    }
-
-
-    public static class Web {
-        @Comment({"The web interface for schematics", " - All schematics are anonymous and private",
-            " - Downloads can be deleted by the user",
-            " - Supports plot uploads, downloads and saves",}) public static String URL =
-            "https://empcraft.com/plots/";
-        @Comment({"The web interface for assets", " - All schematics are organized and public",
-            " - Assets can be searched, selected and downloaded",}) public static String ASSETS =
-            "https://empcraft.com/assetpack/";
-
-    }
-
-
-    public static final class Done {
-        @Comment("Require a done plot to download") public static boolean REQUIRED_FOR_DOWNLOAD =
-            false;
-        @Comment("Only done plots can be rated") public static boolean REQUIRED_FOR_RATINGS = false;
-        @Comment("Restrict building when a plot is done") public static boolean RESTRICT_BUILDING =
-            false;
-        @Comment("The limit being how many plots a player can claim") public static boolean
-            COUNTS_TOWARDS_LIMIT = true;
-    }
-
-
-    public static final class Chat {
-        @Comment("Sometimes console color doesn't work, you can disable it here")
-        public static boolean CONSOLE_COLOR = true;
-        @Comment("Should chat be interactive") public static boolean INTERACTIVE = true;
-    }
-
-
-    @Comment("Relating to how many plots someone can claim  ") public static final class Limit {
-        @Comment("Should the limit be global (over multiple worlds)") public static boolean GLOBAL =
-            false;
-        @Comment("The range of permissions to check e.g. plots.plot.127") public static int
-            MAX_PLOTS = 127;
-    }
-
-
-    public static final class Confirmation {
-        @Comment("Teleport to your plot on death") public static int CONFIRMATION_TIMEOUT_SECONDS =
-            20;
-    }
-
-
-    public static final class Teleport {
-        @Comment("Teleport to your plot on death") public static boolean ON_DEATH = false;
-        @Comment("Teleport to your plot on login") public static boolean ON_LOGIN = false;
-        @Comment("Add a teleportation delay to all commands") public static int DELAY = 0;
-        @Comment("The visit command is ordered by world instead of globally") public static boolean
-            PER_WORLD_VISIT = false;
-    }
-
-
-    public static final class Redstone {
-        @Comment("Disable redstone in unoccupied plots") public static boolean DISABLE_UNOCCUPIED =
-            false;
-        @Comment("Disable redstone when all owners/trusted/members are offline")
-        public static boolean DISABLE_OFFLINE = false;
-        @Comment(
-            "Detect and cancel invalid pistons on the edge of plots (e.g. placed with WorldEdit)")
-        public static boolean DETECT_INVALID_EDGE_PISTONS = false;
-    }
-
-
-    public static final class Claim {
-        @Comment("The max plots claimed in a single `/plot auto <size>` command") public static int
-            MAX_AUTO_AREA = 4;
-    }
-
-
-    public static final class Ratings {
-        public static List<String> CATEGORIES = new ArrayList<>();
-    }
-
-
-    @Comment(
-        {"Enable or disable part of the plugin", "Note: A cache will use some memory if enabled"})
-    public static final class Enabled_Components { // Group the following values into a new config section
-        @Comment("The database stores all the plots") public static boolean DATABASE = true;
-        @Comment("Events are needed to track a lot of things") public static boolean EVENTS = true;
-        @Comment("Commands are used to interact with the plugin") public static boolean COMMANDS =
-            true;
-        @Comment("The UUID cacher is used to resolve player names") public static boolean
-            UUID_CACHE = true;
-        @Comment("The plugin auto updater") public static boolean UPDATER = true;
-        @Comment("Stores user metadata in a database") public static boolean PERSISTENT_META = true;
-        @Comment("Optimizes permission checks") public static boolean PERMISSION_CACHE = true;
-        @Comment("Optimizes block changing code") public static boolean BLOCK_CACHE = true;
-        @Comment("Getting a rating won't need the database") public static boolean RATING_CACHE =
-            true;
-        @Comment("Allow WorldEdit to be restricted to plots") public static boolean
-            WORLDEDIT_RESTRICTIONS = true;
-        @Comment("Allow economy to be used") public static boolean ECONOMY = true;
-        @Comment("Send anonymous usage statistics. Bukkit only setting.") public static boolean
-            METRICS = true;
-        @Comment("Expiry will clear old or simplistic plots") public static boolean PLOT_EXPIRY =
-            false;
-        @Comment("Processes chunks (trimming, or entity/tile limits) ") public static boolean
-            CHUNK_PROCESSOR = false;
-        @Comment("Kill mobs on roads") public static boolean KILL_ROAD_MOBS = false;
-        @Comment("Kill items on roads") public static boolean KILL_ROAD_ITEMS = false;
-        @Comment("Kill vehicles on roads") public static boolean KILL_ROAD_VEHICLES = false;
-        @Comment("Notify a player of any missed comments upon plot entry") public static boolean
-            COMMENT_NOTIFIER = false;
-        @Comment("Let player's claim entire worlds with PlotSquared") public static boolean WORLDS =
-            false;
-        @Comment("Actively purge invalid database entries") public static boolean DATABASE_PURGER =
-            false;
-        @Comment("Delete plots when a player is banned") public static boolean BAN_DELETER = false;
-        @Comment("Prevent possibly unsafe blocks from being used in plot components")
-        public static boolean PREVENT_UNSAFE = true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java
deleted file mode 100644
index 962e0468f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.config;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class Storage extends Config {
-
-    public static String PREFIX = "";
-
-    public static void save(File file) {
-        save(file, Storage.class);
-    }
-
-    public static void load(File file) {
-        load(file, Storage.class);
-    }
-
-    @Comment("MySQL section") public static final class MySQL {
-        @Comment("Should MySQL be used?") public static boolean USE = false;
-        public static String HOST = "localhost";
-        public static String PORT = "3306";
-        public static String USER = "root";
-        public static String PASSWORD = "password";
-        public static String DATABASE = "plot_db";
-
-        @Comment("Set additional properties: https://goo.gl/wngtN8") public static List<String>
-            PROPERTIES = new ArrayList<>(Collections.singletonList("useSSL=false"));
-    }
-
-
-    @Comment("SQLite section") public static final class SQLite {
-        @Comment("Should SQLite be used?") public static boolean USE = true;
-        @Comment("The file to use") public static String DB = "storage";
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
deleted file mode 100644
index e5341103d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-
-import java.util.*;
-
-public interface AbstractDB {
-
-    /**
-     * The UUID that will count as EVERYONE.
-     */
-    UUID everyone = UUID.fromString("1-1-3-3-7");
-
-    /**
-     * Set Plot owner.
-     *
-     * @param plot the plot
-     * @param uuid the uuid of the new owner
-     */
-    void setOwner(Plot plot, UUID uuid);
-
-    /**
-     * Create all settings, and create default helpers, trusted + denied lists.
-     *
-     * @param plots    Plots for which the default table entries should be created
-     * @param whenDone the task to run when the method is finished executing
-     */
-    void createPlotsAndData(List<Plot> plots, Runnable whenDone);
-
-    /**
-     * Create a plot.
-     *
-     * @param plot the plot to create
-     */
-    void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure);
-
-    /**
-     * Create tables.
-     *
-     * @throws Exception If the database manager is unable to create the tables
-     */
-    void createTables() throws Exception;
-
-    /**
-     * Delete a plot.
-     *
-     * @param plot the plot to delete
-     */
-    void delete(Plot plot);
-
-    void deleteSettings(Plot plot);
-
-    void deleteHelpers(Plot plot);
-
-    void deleteTrusted(Plot plot);
-
-    /**
-     * Remove all denied players from the plot.
-     *
-     * @param plot the plot
-     */
-    void deleteDenied(Plot plot);
-
-    /**
-     * Delete all comments from the plot.
-     *
-     * @param plot the plot
-     */
-    void deleteComments(Plot plot);
-
-    void deleteRatings(Plot plot);
-
-    void delete(PlotCluster cluster);
-
-    void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete);
-
-    void removePersistentMeta(UUID uuid, String key);
-
-    void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result);
-
-    /**
-     * Create the plot settings.
-     *
-     * @param id   the plot entry id
-     * @param plot the plot
-     */
-    void createPlotSettings(int id, Plot plot);
-
-    /**
-     * Get the table entry ID.
-     *
-     * @param plot the plot
-     * @return {@code Integer} = Plot Entry Id
-     */
-    int getId(Plot plot);
-
-    /**
-     * Get the id of a given plot cluster.
-     *
-     * @param cluster PlotCluster Object
-     * @return Integer = Cluster Entry Id
-     */
-    int getClusterId(PlotCluster cluster);
-
-    /**
-     * @return A linked HashMap containing all plots
-     */
-    HashMap<String, HashMap<PlotId, Plot>> getPlots();
-
-    /**
-     * @param toValidate
-     */
-    void validateAllPlots(Set<Plot> toValidate);
-
-    /**
-     * @return A HashMap containing all plot clusters
-     */
-    HashMap<String, Set<PlotCluster>> getClusters();
-
-    /**
-     * Set the merged status for a plot.
-     *
-     * @param plot   The plot to set the merged status of
-     * @param merged boolean[]
-     */
-    void setMerged(Plot plot, boolean[] merged);
-
-    /**
-     * Swap the settings, helpers etc. of two plots.
-     *
-     * @param plot1 Plot1
-     * @param plot2 Plot2
-     */
-    void swapPlots(Plot plot1, Plot plot2);
-
-    /**
-     * Set plot flags.
-     *
-     * @param plot  Plot Object
-     * @param flags flags to set
-     */
-    void setFlags(Plot plot, HashMap<Flag<?>, Object> flags);
-
-    /**
-     * Rename a cluster to the given name.
-     *
-     * @param cluster the cluster to rename
-     * @param name    the new cluster name
-     */
-    void setClusterName(PlotCluster cluster, String name);
-
-    /**
-     * Set the plot alias.
-     *
-     * @param plot  Plot for which the alias should be set
-     * @param alias Plot Alias
-     */
-    void setAlias(Plot plot, String alias);
-
-    /**
-     * Purge a plot.
-     *
-     * @param uniqueIds list of plot id (db) to be purged
-     */
-    void purgeIds(Set<Integer> uniqueIds);
-
-    /**
-     * Purge a whole world.
-     *
-     * @param area    World in which the plots should be purged
-     * @param plotIds the {@code PlotId}s of {@code Plot}s to purge
-     */
-    void purge(PlotArea area, Set<PlotId> plotIds);
-
-    /**
-     * Set the plot home position.
-     *
-     * @param plot     the plot
-     * @param position the position of plot home
-     */
-    void setPosition(Plot plot, String position);
-
-    /**
-     * @param cluster
-     * @param position
-     */
-    void setPosition(PlotCluster cluster, String position);
-
-    /**
-     * Remove the specified player from the trust list of the specified plot.
-     *
-     * @param plot the plot
-     * @param uuid the uuid of the player to remove
-     */
-    void removeTrusted(Plot plot, UUID uuid);
-
-    /**
-     * @param cluster PlotCluster Object
-     * @param uuid    Player that should be removed
-     */
-    void removeHelper(PlotCluster cluster, UUID uuid);
-
-    /**
-     * @param plot the plot
-     * @param uuid Player that should be removed
-     */
-    void removeMember(Plot plot, UUID uuid);
-
-    /**
-     * @param cluster
-     * @param uuid
-     */
-    void removeInvited(PlotCluster cluster, UUID uuid);
-
-    /**
-     * @param plot Plot Object
-     * @param uuid Player that should be removed
-     */
-    void setTrusted(Plot plot, UUID uuid);
-
-    /**
-     * @param cluster PlotCluster Object
-     * @param uuid    Player that should be removed
-     */
-    void setHelper(PlotCluster cluster, UUID uuid);
-
-    /**
-     * @param plot Plot Object
-     * @param uuid Player that should be added
-     */
-    void setMember(Plot plot, UUID uuid);
-
-    /**
-     * @param cluster
-     * @param uuid
-     */
-    void setInvited(PlotCluster cluster, UUID uuid);
-
-    /**
-     * Remove the specified player from the denied list of the specified plot.
-     *
-     * @param plot the plot
-     * @param uuid the uuid of the player to remove
-     */
-    void removeDenied(Plot plot, UUID uuid);
-
-    /**
-     * Deny the specified player from the given plot.
-     *
-     * @param plot the plot
-     * @param uuid the uuid of the player to deny
-     */
-    void setDenied(Plot plot, UUID uuid);
-
-    /**
-     * Get the ratings from the specified plot.
-     *
-     * @param plot the plot
-     * @return the plot ratings (pre-calculated)
-     */
-    HashMap<UUID, Integer> getRatings(Plot plot);
-
-    /**
-     * Set a rating for a plot.
-     *
-     * @param plot
-     * @param rater
-     * @param value
-     */
-    void setRating(Plot plot, UUID rater, int value);
-
-    /**
-     * Remove the specified comment from the given plot.
-     *
-     * @param plot    the plot
-     * @param comment the comment to remove
-     */
-    void removeComment(Plot plot, PlotComment comment);
-
-    /**
-     * Clear the specified inbox on the given plot.
-     *
-     * @param plot  the plot
-     * @param inbox the inbox to clear
-     */
-    void clearInbox(Plot plot, String inbox);
-
-    /**
-     * Add the specified comment to the given plot.
-     *
-     * @param plot    the plot
-     * @param comment the comment to add
-     */
-    void setComment(Plot plot, PlotComment comment);
-
-    /**
-     * Get Plot Comments.
-     *
-     * @param plot The Plot to get comments from
-     */
-    void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone);
-
-    void createPlotAndSettings(Plot plot, Runnable whenDone);
-
-    void createCluster(PlotCluster cluster);
-
-    void resizeCluster(PlotCluster current, PlotId min, PlotId max);
-
-    void movePlot(Plot originalPlot, Plot newPlot);
-
-    /**
-     * Replace a old uuid with a new one in the database.
-     *
-     * <ul>
-     * <li> Useful for replacing a few uuids (not the entire database).</li>
-     * <li>or entire conversion, the uuidconvert command scales better.</li>
-     * </ul>
-     *
-     * @param old
-     * @param now
-     */
-    void replaceUUID(UUID old, UUID now);
-
-    /**
-     * Don't use this method unless you want to ruin someone's server.
-     *
-     * @return true if the tables were deleted, false when an error is encountered
-     */
-    boolean deleteTables();
-
-    /**
-     * Close the database. Generally not recommended to be used by add-ons.
-     */
-    void close();
-
-    void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max);
-
-    void updateTables(int[] oldVersion);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
deleted file mode 100644
index 1127a6ed2..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
+++ /dev/null
@@ -1,495 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.*;
-
-/**
- * Database Functions
- * - These functions do not update the local plot objects and only make changes to the DB
- */
-@SuppressWarnings("deprecation") public class DBFunc {
-    /**
-     * The "global" uuid.
-     */
-    // TODO: Use this instead. public static final UUID EVERYONE = UUID.fromString("4aa2aaa4-c06b-485c-bc58-186aa1780d9b");
-    public static final UUID EVERYONE = UUID.fromString("1-1-3-3-7");
-
-    /**
-     * Abstract Database Manager
-     */
-    public static AbstractDB dbManager;
-
-    public static void updateTables(int[] oldVersion) {
-        if (dbManager != null) {
-            dbManager.updateTables(oldVersion);
-        }
-    }
-
-    public static void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete) {
-        if (dbManager != null) {
-            dbManager.addPersistentMeta(uuid, key, meta, delete);
-        }
-    }
-
-    public static void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result) {
-        if (dbManager != null) {
-            dbManager.getPersistentMeta(uuid, result);
-        }
-    }
-
-    public static void removePersistentMeta(UUID uuid, String key) {
-        if (dbManager != null) {
-            dbManager.removePersistentMeta(uuid, key);
-        }
-    }
-
-    public static void swapPlots(Plot plot1, Plot plot2) {
-        if (dbManager != null) {
-            dbManager.swapPlots(plot1, plot2);
-        }
-    }
-
-    public static boolean deleteTables() {
-        return dbManager != null && dbManager.deleteTables();
-    }
-
-    public static void movePlot(Plot originalPlot, Plot newPlot) {
-        if (originalPlot.temp == -1 || newPlot.temp == -1) {
-            return;
-        }
-        DBFunc.dbManager.movePlot(originalPlot, newPlot);
-    }
-
-    public static void validatePlots(Set<Plot> plots) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.validateAllPlots(plots);
-    }
-
-    /**
-     * Check if a {@link ResultSet} contains a column.
-     *
-     * @param resultSet
-     * @param name
-     * @return
-     */
-    public static boolean hasColumn(ResultSet resultSet, String name) {
-        try {
-            ResultSetMetaData meta = resultSet.getMetaData();
-            int count = meta.getColumnCount();
-            for (int x = 1; x <= count; x++) {
-                if (name.equals(meta.getColumnName(x))) {
-                    return true;
-                }
-            }
-            return false;
-        } catch (SQLException ignored) {
-            return false;
-        }
-    }
-
-    /**
-     * Set the owner of a plot
-     *
-     * @param plot Plot Object
-     * @param uuid New Owner
-     */
-    public static void setOwner(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setOwner(plot, uuid);
-    }
-
-    /**
-     * Create all settings + (trusted, denied, members)
-     *
-     * @param plots List containing all plot objects
-     */
-    public static void createPlotsAndData(List<Plot> plots, Runnable whenDone) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.createPlotsAndData(plots, whenDone);
-    }
-
-    public static void createPlotSafe(final Plot plot, final Runnable success,
-        final Runnable failure) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.createPlotSafe(plot, success, failure);
-    }
-
-    /**
-     * Create a plot.
-     *
-     * @param plot Plot to create
-     */
-    public static void createPlotAndSettings(Plot plot, Runnable whenDone) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.createPlotAndSettings(plot, whenDone);
-    }
-
-    /**
-     * Create tables.
-     *
-     * @throws Exception
-     */
-    public static void createTables() throws Exception {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.createTables();
-    }
-
-    /**
-     * Delete a plot.
-     *
-     * @param plot Plot to delete
-     */
-    public static void delete(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.delete(plot);
-        plot.temp = -1;
-    }
-
-    /**
-     * Delete the ratings for a plot.
-     *
-     * @param plot
-     */
-    public static void deleteRatings(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.deleteRatings(plot);
-    }
-
-    /**
-     * Delete the trusted list for a plot.
-     *
-     * @param plot
-     */
-    public static void deleteTrusted(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.deleteHelpers(plot);
-    }
-
-    /**
-     * Delete the members list for a plot.
-     *
-     * @param plot
-     */
-    public static void deleteMembers(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.deleteTrusted(plot);
-    }
-
-    /**
-     * Delete the denied list for a plot.
-     *
-     * @param plot
-     */
-    public static void deleteDenied(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.deleteDenied(plot);
-    }
-
-    /**
-     * Delete the comments in a plot.
-     *
-     * @param plot
-     */
-    public static void deleteComments(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.deleteComments(plot);
-    }
-
-    /**
-     * Deleting settings will
-     * 1) Delete any settings (flags and such) associated with the plot
-     * 2) Prevent any local changes to the plot from saving properly to the db
-     * <p>
-     * This shouldn't ever be needed
-     *
-     * @param plot
-     */
-    public static void deleteSettings(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.deleteSettings(plot);
-    }
-
-    public static void delete(PlotCluster toDelete) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.delete(toDelete);
-    }
-
-    /**
-     * Create plot settings.
-     *
-     * @param id   Plot ID
-     * @param plot Plot Object
-     */
-    public static void createPlotSettings(int id, Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.createPlotSettings(id, plot);
-    }
-
-    /**
-     * Get a plot id.
-     *
-     * @param plot Plot Object
-     * @return ID
-     */
-    public static int getId(Plot plot) {
-        if (dbManager == null) {
-            return 0;
-        }
-        return DBFunc.dbManager.getId(plot);
-    }
-
-    /**
-     * @return Plots
-     */
-    public static HashMap<String, HashMap<PlotId, Plot>> getPlots() {
-        if (dbManager == null) {
-            return new HashMap<>();
-        }
-        return DBFunc.dbManager.getPlots();
-    }
-
-    public static void setMerged(Plot plot, boolean[] merged) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setMerged(plot, merged);
-    }
-
-    public static void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setFlags(plot, flags);
-    }
-
-    public static void setAlias(Plot plot, String alias) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setAlias(plot, alias);
-    }
-
-    public static void purgeIds(Set<Integer> uniqueIds) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.purgeIds(uniqueIds);
-    }
-
-    public static void purge(PlotArea area, Set<PlotId> plotIds) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.purge(area, plotIds);
-    }
-
-    public static void setPosition(Plot plot, String position) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setPosition(plot, position);
-    }
-
-    public static void removeComment(Plot plot, PlotComment comment) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.removeComment(plot, comment);
-    }
-
-    public static void clearInbox(Plot plot, String inbox) {
-        if (plot != null && plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.clearInbox(plot, inbox);
-    }
-
-    public static void setComment(Plot plot, PlotComment comment) {
-        if (plot != null && plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setComment(plot, comment);
-    }
-
-    public static void getComments(Plot plot, String inbox,
-        RunnableVal<List<PlotComment>> whenDone) {
-        if (plot != null && plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.getComments(plot, inbox, whenDone);
-    }
-
-    public static void removeTrusted(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.removeTrusted(plot, uuid);
-    }
-
-    public static void removeHelper(PlotCluster cluster, UUID uuid) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.removeHelper(cluster, uuid);
-    }
-
-    public static void createCluster(PlotCluster cluster) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.createCluster(cluster);
-    }
-
-    public static void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.resizeCluster(current, min, max);
-    }
-
-    public static void removeMember(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.removeMember(plot, uuid);
-    }
-
-    public static void removeInvited(PlotCluster cluster, UUID uuid) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.removeInvited(cluster, uuid);
-    }
-
-    public static void setTrusted(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setTrusted(plot, uuid);
-    }
-
-    public static void setHelper(PlotCluster cluster, UUID uuid) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setHelper(cluster, uuid);
-    }
-
-    public static void setMember(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setMember(plot, uuid);
-    }
-
-    public static void setInvited(PlotCluster cluster, UUID uuid) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setInvited(cluster, uuid);
-    }
-
-    public static void removeDenied(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.removeDenied(plot, uuid);
-    }
-
-    public static void setDenied(Plot plot, UUID uuid) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setDenied(plot, uuid);
-    }
-
-    public static HashMap<UUID, Integer> getRatings(Plot plot) {
-        if (plot.temp == -1 || dbManager == null) {
-            return new HashMap<>(0);
-        }
-        return DBFunc.dbManager.getRatings(plot);
-    }
-
-    public static void setRating(Plot plot, UUID rater, int value) {
-        if (plot.temp == -1 || dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setRating(plot, rater, value);
-    }
-
-    public static HashMap<String, Set<PlotCluster>> getClusters() {
-        if (dbManager == null) {
-            return new HashMap<>();
-        }
-        return DBFunc.dbManager.getClusters();
-    }
-
-    public static void setPosition(PlotCluster cluster, String position) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setPosition(cluster, position);
-    }
-
-    public static void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.replaceWorld(oldWorld, newWorld, min, max);
-    }
-
-    /**
-     * Replace all occurrences of a uuid in the database with another one
-     *
-     * @param old
-     * @param now
-     */
-    public static void replaceUUID(UUID old, UUID now) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.replaceUUID(old, now);
-    }
-
-    public static void close() {
-        if (dbManager != null) {
-            DBFunc.dbManager.close();
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
deleted file mode 100644
index 8626a1a24..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-/**
- * Abstract Database class, serves as a base for any connection method (MySQL, SQLite, etc.)
- *
- * @author -_Husky_-
- * @author tips48
- */
-public interface Database {
-
-    Connection forceConnection() throws SQLException, ClassNotFoundException;
-
-    /**
-     * Opens a connection with the database.
-     *
-     * @return Opened connection
-     * @throws SQLException           if the connection can not be opened
-     * @throws ClassNotFoundException if the driver cannot be found
-     */
-    Connection openConnection() throws SQLException, ClassNotFoundException;
-
-    /**
-     * Checks if a connection is open with the database.
-     *
-     * @return true if the connection is open
-     * @throws SQLException if the connection cannot be checked
-     */
-    boolean checkConnection() throws SQLException;
-
-    /**
-     * Gets the connection with the database.
-     *
-     * @return Connection with the database, null if none
-     */
-    Connection getConnection();
-
-    /**
-     * Closes the connection with the database.
-     *
-     * @return true if successful
-     * @throws SQLException if the connection cannot be closed
-     */
-    boolean closeConnection() throws SQLException;
-
-    /**
-     * Executes a SQL Query.
-     * If the connection is closed, it will be opened.
-     *
-     * @param query Query to be run
-     * @return the results of the query
-     * @throws SQLException           If the query cannot be executed
-     * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
-     */
-    ResultSet querySQL(String query) throws SQLException, ClassNotFoundException;
-
-    /**
-     * Executes an Update SQL Query.
-     * See {@link Statement#executeUpdate(String)}.
-     * If the connection is closed, it will be opened.
-     *
-     * @param query Query to be run
-     * @return Result Code, see {@link Statement#executeUpdate(String)}
-     * @throws SQLException           If the query cannot be executed
-     * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
-     */
-    int updateSQL(String query) throws SQLException, ClassNotFoundException;
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
deleted file mode 100644
index 4a0e655c5..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.plot.config.Storage;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.sql.*;
-
-/**
- * Connects to and uses a MySQL database
- *
- * @author -_Husky_-
- * @author tips48
- */
-public class MySQL implements Database {
-
-    private final String user;
-    private final String database;
-    private final String password;
-    private final String port;
-    private final String hostname;
-    private Connection connection;
-
-    /**
-     * Creates a new MySQL instance.
-     *
-     * @param hostname Name of the host
-     * @param port     Port number
-     * @param database Database name
-     * @param username Username
-     * @param password Password
-     */
-    public MySQL(String hostname, String port, String database, String username, String password) {
-        this.hostname = hostname;
-        this.port = port;
-        this.database = database;
-        this.user = username;
-        this.password = password;
-        this.connection = null;
-    }
-
-    @Override public Connection forceConnection() throws SQLException {
-        this.connection = DriverManager.getConnection(
-            "jdbc:mysql://" + this.hostname + ':' + this.port + '/' + this.database + "?"
-                + StringMan.join(Storage.MySQL.PROPERTIES, "&"), this.user, this.password);
-        return this.connection;
-    }
-
-    @Override public Connection openConnection() throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            return this.connection;
-        }
-        return forceConnection();
-    }
-
-    @Override public boolean checkConnection() throws SQLException {
-        return (this.connection != null) && !this.connection.isClosed();
-    }
-
-    @Override public Connection getConnection() {
-        return this.connection;
-    }
-
-    @Override public boolean closeConnection() throws SQLException {
-        if (this.connection == null) {
-            return false;
-        }
-        this.connection.close();
-        this.connection = null;
-        return true;
-    }
-
-    @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            openConnection();
-        }
-        try (Statement statement = this.connection.createStatement()) {
-            return statement.executeQuery(query);
-        }
-    }
-
-    @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            openConnection();
-        }
-        try (Statement statement = this.connection.createStatement()) {
-            return statement.executeUpdate(query);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
deleted file mode 100644
index 3e197a16d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ /dev/null
@@ -1,3082 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.config.Storage;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.StringFlag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.google.common.base.Charsets;
-
-import javax.annotation.Nonnull;
-import java.sql.*;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-
-
-@SuppressWarnings("SqlDialectInspection") public class SQLManager implements AbstractDB {
-
-    // Public final
-    public final String SET_OWNER;
-    public final String GET_ALL_PLOTS;
-    public final String CREATE_PLOTS;
-    public final String CREATE_SETTINGS;
-    public final String CREATE_TIERS;
-    public final String CREATE_PLOT;
-    public final String CREATE_PLOT_SAFE;
-    public final String CREATE_CLUSTER;
-    private final String prefix;
-    // Private Final
-    private final Database database;
-    private final boolean mySQL;
-    /**
-     * important tasks
-     */
-    public volatile Queue<Runnable> globalTasks;
-    /**
-     * Notify tasks
-     */
-    public volatile Queue<Runnable> notifyTasks;
-    /**
-     * plot plot_denied plot_helpers plot_trusted plot_comments plot_settings plot_rating
-     */
-    public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
-    /**
-     * player_meta
-     */
-    public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
-    /**
-     * cluster cluster_helpers cluster_invited cluster_settings
-     */
-    public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
-    // Private
-    private Connection connection;
-    private boolean closed = false;
-
-    /**
-     * Constructor
-     *
-     * @param p prefix
-     */
-    public SQLManager(final Database database, String p, boolean debug)
-        throws SQLException, ClassNotFoundException {
-        // Private final
-        this.database = database;
-        this.connection = database.openConnection();
-        this.mySQL = database instanceof MySQL;
-        this.globalTasks = new ConcurrentLinkedQueue<>();
-        this.notifyTasks = new ConcurrentLinkedQueue<>();
-        this.plotTasks = new ConcurrentHashMap<>();
-        this.playerTasks = new ConcurrentHashMap<>();
-        this.clusterTasks = new ConcurrentHashMap<>();
-        this.prefix = p;
-        this.SET_OWNER = "UPDATE `" + this.prefix
-            + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
-        this.GET_ALL_PLOTS =
-            "SELECT `id`, `plot_id_x`, `plot_id_z`, `world` FROM `" + this.prefix + "plot`";
-        this.CREATE_PLOTS = "INSERT INTO `" + this.prefix
-            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) values ";
-        this.CREATE_SETTINGS =
-            "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
-        this.CREATE_TIERS =
-            "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
-        this.CREATE_PLOT = "INSERT INTO `" + this.prefix
-            + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
-
-        if (mySQL) {
-            this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
-                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
-                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
-        } else {
-            this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
-                + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
-                + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
-        }
-        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
-            + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
-        try {
-            createTables();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        TaskManager.runTaskAsync(() -> {
-            long last = System.currentTimeMillis();
-            while (true) {
-                if (SQLManager.this.closed) {
-                    break;
-                }
-                boolean hasTask =
-                    !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
-                        || !clusterTasks.isEmpty();
-                if (hasTask) {
-                    if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
-                        || !isValid()) {
-                        last = System.currentTimeMillis();
-                        reconnect();
-                    }
-                    if (!sendBatch()) {
-                        try {
-                            if (!getNotifyTasks().isEmpty()) {
-                                for (Runnable task : getNotifyTasks()) {
-                                    TaskManager.runTask(task);
-                                }
-                                getNotifyTasks().clear();
-                            }
-                            Thread.sleep(50);
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                } else {
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        });
-    }
-
-    public boolean isValid() {
-        try {
-            if (connection.isClosed()) {
-                return false;
-            }
-        } catch (SQLException e) {
-            return false;
-        }
-        try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
-            stmt.executeQuery();
-            return true;
-        } catch (Throwable e) {
-            return false;
-        }
-    }
-
-    public void reconnect() {
-        try {
-            close();
-            SQLManager.this.closed = false;
-            SQLManager.this.connection = database.forceConnection();
-        } catch (SQLException | ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public synchronized Queue<Runnable> getGlobalTasks() {
-        return this.globalTasks;
-    }
-
-    public synchronized Queue<Runnable> getNotifyTasks() {
-        return this.notifyTasks;
-    }
-
-    public synchronized void addPlotTask(@Nonnull Plot plot, UniqueStatement task) {
-        Queue<UniqueStatement> tasks =
-            this.plotTasks.computeIfAbsent(plot, plot1 -> new ConcurrentLinkedQueue<>());
-        if (task == null) {
-            task = new UniqueStatement(String.valueOf(plot.hashCode())) {
-
-                @Override public PreparedStatement get() {
-                    return null;
-                }
-
-                @Override public void set(PreparedStatement stmt) {
-                }
-
-                @Override public void addBatch(PreparedStatement statement) {
-                }
-
-                @Override public void execute(PreparedStatement statement) {
-                }
-
-            };
-        }
-        tasks.add(task);
-    }
-
-    public synchronized void addPlayerTask(UUID uuid, UniqueStatement task) {
-        if (uuid == null) {
-            return;
-        }
-        Queue<UniqueStatement> tasks =
-            this.playerTasks.computeIfAbsent(uuid, uuid1 -> new ConcurrentLinkedQueue<>());
-        if (task == null) {
-            task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
-
-                @Override public PreparedStatement get() {
-                    return null;
-                }
-
-                @Override public void set(PreparedStatement stmt) {
-                }
-
-                @Override public void addBatch(PreparedStatement statement) {
-                }
-
-                @Override public void execute(PreparedStatement statement) {
-                }
-
-            };
-        }
-        tasks.add(task);
-    }
-
-    public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
-        Queue<UniqueStatement> tasks = this.clusterTasks
-            .computeIfAbsent(cluster, plotCluster -> new ConcurrentLinkedQueue<>());
-        if (task == null) {
-            task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
-
-                @Override public PreparedStatement get() {
-                    return null;
-                }
-
-                @Override public void set(PreparedStatement stmt) {
-                }
-
-                @Override public void addBatch(PreparedStatement statement) {
-                }
-
-                @Override public void execute(PreparedStatement statement) {
-                }
-
-            };
-        }
-        tasks.add(task);
-    }
-
-    public synchronized void addGlobalTask(Runnable task) {
-        getGlobalTasks().add(task);
-    }
-
-    public synchronized void addNotifyTask(Runnable task) {
-        if (task != null) {
-            getNotifyTasks().add(task);
-        }
-    }
-
-    public boolean sendBatch() {
-        try {
-            if (!getGlobalTasks().isEmpty()) {
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                Runnable task = getGlobalTasks().remove();
-                if (task != null) {
-                    try {
-                        task.run();
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                commit();
-                return true;
-            }
-            int count = -1;
-            if (!this.plotTasks.isEmpty()) {
-                count = 0;
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement statement = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
-                    this.plotTasks.entrySet().iterator();
-                while (iter.hasNext()) {
-                    try {
-                        Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
-                        Plot plot = entry.getKey();
-                        Queue<UniqueStatement> tasks = entry.getValue();
-                        if (tasks.isEmpty()) {
-                            iter.remove();
-                            continue;
-                        }
-                        task = tasks.remove();
-                        count++;
-                        if (task != null) {
-                            if (task.method == null || !task.method.equals(method)
-                                || statement == null) {
-                                if (statement != null) {
-                                    lastTask.execute(statement);
-                                    statement.close();
-                                }
-                                method = task.method;
-                                statement = task.get();
-                            }
-                            task.set(statement);
-                            task.addBatch(statement);
-                            try {
-                                if (statement.isClosed()) {
-                                    statement = null;
-                                }
-                            } catch (AbstractMethodError ignore) {
-                            }
-                        }
-                        lastTask = task;
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                if (statement != null && task != null) {
-                    task.execute(statement);
-                    statement.close();
-                }
-            }
-            if (!this.playerTasks.isEmpty()) {
-                count = 0;
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement statement = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                for (Entry<UUID, Queue<UniqueStatement>> entry : this.playerTasks.entrySet()) {
-                    try {
-                        UUID uuid = entry.getKey();
-                        if (this.playerTasks.get(uuid).isEmpty()) {
-                            this.playerTasks.remove(uuid);
-                            continue;
-                        }
-                        task = this.playerTasks.get(uuid).remove();
-                        count++;
-                        if (task != null) {
-                            if (task.method == null || !task.method.equals(method)) {
-                                if (statement != null) {
-                                    lastTask.execute(statement);
-                                    statement.close();
-                                }
-                                method = task.method;
-                                statement = task.get();
-                            }
-                            task.set(statement);
-                            task.addBatch(statement);
-                        }
-                        lastTask = task;
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                if (statement != null && task != null) {
-                    task.execute(statement);
-                    statement.close();
-                }
-            }
-            if (!this.clusterTasks.isEmpty()) {
-                count = 0;
-                if (this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(false);
-                }
-                String method = null;
-                PreparedStatement statement = null;
-                UniqueStatement task = null;
-                UniqueStatement lastTask = null;
-                for (Entry<PlotCluster, Queue<UniqueStatement>> entry : this.clusterTasks
-                    .entrySet()) {
-                    try {
-                        PlotCluster cluster = entry.getKey();
-                        if (this.clusterTasks.get(cluster).isEmpty()) {
-                            this.clusterTasks.remove(cluster);
-                            continue;
-                        }
-                        task = this.clusterTasks.get(cluster).remove();
-                        count++;
-                        if (task != null) {
-                            if (task.method == null || !task.method.equals(method)) {
-                                if (statement != null) {
-                                    lastTask.execute(statement);
-                                    statement.close();
-                                }
-                                method = task.method;
-                                statement = task.get();
-                            }
-                            task.set(statement);
-                            task.addBatch(statement);
-                        }
-                        lastTask = task;
-                    } catch (Throwable e) {
-                        PlotSquared.debug("============ DATABASE ERROR ============");
-                        PlotSquared.debug("There was an error updating the database.");
-                        PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
-                        e.printStackTrace();
-                        PlotSquared.debug("========================================");
-                    }
-                }
-                if (statement != null && task != null) {
-                    task.execute(statement);
-                    statement.close();
-                }
-            }
-            if (count > 0) {
-                commit();
-                return true;
-            }
-            if (count != -1) {
-                if (!this.connection.getAutoCommit()) {
-                    this.connection.setAutoCommit(true);
-                }
-            }
-            if (!this.clusterTasks.isEmpty()) {
-                this.clusterTasks.clear();
-            }
-            if (!this.plotTasks.isEmpty()) {
-                this.plotTasks.clear();
-            }
-        } catch (Throwable e) {
-            PlotSquared.debug("============ DATABASE ERROR ============");
-            PlotSquared.debug("There was an error updating the database.");
-            PlotSquared.debug(" - It will be corrected on shutdown");
-            PlotSquared.debug("========================================");
-            e.printStackTrace();
-            PlotSquared.debug("========================================");
-        }
-        return false;
-    }
-
-    public Connection getConnection() {
-        return this.connection;
-    }
-
-    /**
-     * Set Plot owner
-     *
-     * @param plot Plot Object
-     * @param uuid Owner UUID
-     */
-    @Override public void setOwner(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setOwner") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, uuid.toString());
-                statement.setInt(2, plot.getId().x);
-                statement.setInt(3, plot.getId().y);
-                statement.setString(4, plot.getArea().toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.SET_OWNER);
-            }
-        });
-    }
-
-    @Override public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
-        addGlobalTask(() -> {
-            try {
-                // Create the plots
-                createPlots(myList, () -> {
-                    try {
-                        // Creating datastructures
-                        HashMap<PlotId, Plot> plotMap = new HashMap<>();
-                        for (Plot plot : myList) {
-                            plotMap.put(plot.getId(), plot);
-                        }
-                        ArrayList<SettingsPair> settings = new ArrayList<>();
-                        final ArrayList<UUIDPair> helpers = new ArrayList<>();
-                        final ArrayList<UUIDPair> trusted = new ArrayList<>();
-                        final ArrayList<UUIDPair> denied = new ArrayList<>();
-
-                        // Populating structures
-                        try (PreparedStatement stmt = SQLManager.this.connection
-                            .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
-                            ResultSet result = stmt.executeQuery()) {
-                            while (result.next()) {
-                                int id = result.getInt("id");
-                                int x = result.getInt("plot_id_x");
-                                int y = result.getInt("plot_id_z");
-                                PlotId plotId = new PlotId(x, y);
-                                Plot plot = plotMap.get(plotId);
-                                if (plot != null) {
-                                    settings.add(new SettingsPair(id, plot.getSettings()));
-                                    for (UUID uuid : plot.getDenied()) {
-                                        denied.add(new UUIDPair(id, uuid));
-                                    }
-                                    for (UUID uuid : plot.getMembers()) {
-                                        trusted.add(new UUIDPair(id, uuid));
-                                    }
-                                    for (UUID uuid : plot.getTrusted()) {
-                                        helpers.add(new UUIDPair(id, uuid));
-                                    }
-                                }
-                            }
-                        }
-                        createSettings(settings, () -> createTiers(helpers, "helpers",
-                            () -> createTiers(trusted, "trusted",
-                                () -> createTiers(denied, "denied", () -> {
-                                    try {
-                                        SQLManager.this.connection.commit();
-                                    } catch (SQLException e) {
-                                        e.printStackTrace();
-                                    }
-                                    if (whenDone != null) {
-                                        whenDone.run();
-                                    }
-                                }))));
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                        try {
-                            SQLManager.this.connection.commit();
-                        } catch (SQLException e1) {
-                            e1.printStackTrace();
-                        }
-                    }
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
-                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                try {
-                    SQLManager.this.connection.commit();
-                } catch (SQLException e1) {
-                    e1.printStackTrace();
-                }
-            }
-        });
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param myList list of plots to be created
-     */
-    public void createTiers(ArrayList<UUIDPair> myList, final String tier, Runnable whenDone) {
-        StmtMod<UUIDPair> mod = new StmtMod<UUIDPair>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, SQLManager.this.CREATE_TIERS.replaceAll("%tier%", tier),
-                    2);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size,
-                    "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
-                        + "` SELECT ? AS `plot_plot_id`, ? AS `user_uuid`", 2);
-            }
-
-            @Override public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix + "plot_" + tier
-                    + "` (`plot_plot_id`, `user_uuid`) VALUES(?,?)";
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, UUIDPair pair)
-                throws SQLException {
-                stmt.setInt(i * 2 + 1, pair.id);
-                stmt.setString(i * 2 + 2, pair.uuid.toString());
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, UUIDPair pair)
-                throws SQLException {
-                stmt.setInt(i * 2 + 1, pair.id);
-                stmt.setString(i * 2 + 2, pair.uuid.toString());
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, UUIDPair pair)
-                throws SQLException {
-                stmt.setInt(1, pair.id);
-                stmt.setString(2, pair.uuid.toString());
-            }
-        };
-        setBulk(myList, mod, whenDone);
-    }
-
-    /**
-     * Create a plot
-     *
-     * @param myList list of plots to be created
-     */
-    public void createPlots(List<Plot> myList, Runnable whenDone) {
-        StmtMod<Plot> mod = new StmtMod<Plot>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, SQLManager.this.CREATE_PLOTS, 5);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot` SELECT ? AS `id`, ? AS `plot_id_x`, ? AS `plot_id_z`, ? AS `owner`, ? AS `world`, ? AS `timestamp` ",
-                    6);
-            }
-
-            @Override public String getCreateSQL() {
-                return SQLManager.this.CREATE_PLOT;
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, Plot plot)
-                throws SQLException {
-                stmt.setInt(i * 5 + 1, plot.getId().x);
-                stmt.setInt(i * 5 + 2, plot.getId().y);
-                try {
-                    stmt.setString(i * 5 + 3, plot.owner.toString());
-                } catch (SQLException ignored) {
-                    stmt.setString(i * 5 + 3, everyone.toString());
-                }
-                stmt.setString(i * 5 + 4, plot.getArea().toString());
-                stmt.setTimestamp(i * 5 + 5, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, Plot plot)
-                throws SQLException {
-                stmt.setNull(i * 6 + 1, 4);
-                stmt.setInt(i * 6 + 2, plot.getId().x);
-                stmt.setInt(i * 6 + 3, plot.getId().y);
-                try {
-                    stmt.setString(i * 6 + 4, plot.owner.toString());
-                } catch (SQLException ignored) {
-                    stmt.setString(i * 6 + 4, everyone.toString());
-                }
-                stmt.setString(i * 6 + 5, plot.getArea().toString());
-                stmt.setTimestamp(i * 6 + 6, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, Plot plot) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-
-            }
-        };
-        setBulk(myList, mod, whenDone);
-    }
-
-    public <T> void setBulk(List<T> objList, StmtMod<T> mod, Runnable whenDone) {
-        int size = objList.size();
-        if (size == 0) {
-            if (whenDone != null) {
-                whenDone.run();
-            }
-            return;
-        }
-        int packet;
-        if (this.mySQL) {
-            packet = Math.min(size, 5000);
-        } else {
-            packet = Math.min(size, 50);
-        }
-        int amount = size / packet;
-        try {
-            int count = 0;
-            PreparedStatement preparedStmt = null;
-            int last = -1;
-            for (int j = 0; j <= amount; j++) {
-                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                if (subList.isEmpty()) {
-                    break;
-                }
-                String statement;
-                if (last == -1) {
-                    last = subList.size();
-                    statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                if (subList.size() != last || count % 5000 == 0 && count > 0) {
-                    preparedStmt.executeBatch();
-                    preparedStmt.close();
-                    statement = mod.getCreateMySQL(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                for (int i = 0; i < subList.size(); i++) {
-                    count++;
-                    T obj = subList.get(i);
-                    mod.setMySQL(preparedStmt, i, obj);
-                }
-                last = subList.size();
-                preparedStmt.addBatch();
-            }
-            PlotSquared.debug(
-                "&aBatch 1: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-            preparedStmt.executeBatch();
-            preparedStmt.clearParameters();
-            preparedStmt.close();
-            if (whenDone != null) {
-                whenDone.run();
-            }
-            return;
-        } catch (SQLException e) {
-            if (this.mySQL) {
-                e.printStackTrace();
-                PlotSquared.debug("&cERROR 1:  | " + objList.get(0).getClass().getCanonicalName());
-            }
-        }
-        try {
-            int count = 0;
-            PreparedStatement preparedStmt = null;
-            int last = -1;
-            for (int j = 0; j <= amount; j++) {
-                List<T> subList = objList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                if (subList.isEmpty()) {
-                    break;
-                }
-                String statement;
-                if (last == -1) {
-                    last = subList.size();
-                    statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                if (subList.size() != last || count % 5000 == 0 && count > 0) {
-                    preparedStmt.executeBatch();
-                    preparedStmt.clearParameters();
-                    statement = mod.getCreateSQLite(subList.size());
-                    preparedStmt = this.connection.prepareStatement(statement);
-                }
-                for (int i = 0; i < subList.size(); i++) {
-                    count++;
-                    T obj = subList.get(i);
-                    mod.setSQLite(preparedStmt, i, obj);
-                }
-                last = subList.size();
-                preparedStmt.addBatch();
-            }
-            PlotSquared.debug(
-                "&aBatch 2: " + count + " | " + objList.get(0).getClass().getCanonicalName());
-            preparedStmt.executeBatch();
-            preparedStmt.clearParameters();
-            preparedStmt.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-            PlotSquared.debug("&cERROR 2:  | " + objList.get(0).getClass().getCanonicalName());
-            PlotSquared.debug("&6[WARN] Could not bulk save!");
-            try (PreparedStatement preparedStmt = this.connection
-                .prepareStatement(mod.getCreateSQL())) {
-                for (T obj : objList) {
-                    mod.setSQL(preparedStmt, obj);
-                    preparedStmt.addBatch();
-                }
-                PlotSquared.debug("&aBatch 3");
-                preparedStmt.executeBatch();
-            } catch (SQLException e3) {
-                e3.printStackTrace();
-                PlotSquared.debug("&c[ERROR] Failed to save all!");
-            }
-        }
-        if (whenDone != null) {
-            whenDone.run();
-        }
-    }
-
-    public void createSettings(final ArrayList<SettingsPair> myList, final Runnable whenDone) {
-        final StmtMod<SettingsPair> mod = new StmtMod<SettingsPair>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, "INSERT INTO `" + SQLManager.this.prefix
-                    + "plot_settings`(`plot_plot_id`,`biome`,`rain`,`custom_time`,`time`,`deny_entry`,`alias`,`flags`,`merged`,"
-                    + "`position`) VALUES ", 10);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
-                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position`",
-                    10);
-            }
-
-            @Override public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix
-                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
-            }
-
-            @Override public void setMySQL(PreparedStatement statement, int i, SettingsPair pair)
-                throws SQLException {
-                statement.setInt(i * 10 + 1, pair.id); // id
-                statement.setNull(i * 10 + 2, 4); // biome
-                statement.setNull(i * 10 + 3, 4); // rain
-                statement.setNull(i * 10 + 4, 4); // custom_time
-                statement.setNull(i * 10 + 5, 4); // time
-                statement.setNull(i * 10 + 6, 4); // deny_entry
-                if (pair.settings.getAlias().isEmpty()) {
-                    statement.setNull(i * 10 + 7, 4);
-                } else {
-                    statement.setString(i * 10 + 7, pair.settings.getAlias());
-                }
-                StringBuilder flag_string = new StringBuilder();
-                int k = 0;
-                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
-                    if (k != 0) {
-                        flag_string.append(',');
-                    }
-                    flag_string.append(flag.getKey().getName()).append(':').append(
-                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
-                            .replaceAll(",", "´"));
-                    k++;
-                }
-                statement.setString(i * 10 + 8, flag_string.toString());
-                boolean[] merged = pair.settings.getMerged();
-                int hash = MainUtil.hash(merged);
-                statement.setInt(i * 10 + 9, hash);
-                BlockLoc loc = pair.settings.getPosition();
-                String position;
-                if (loc.y == 0) {
-                    position = "DEFAULT";
-                } else {
-                    position = loc.x + "," + loc.y + ',' + loc.z;
-                }
-                statement.setString(i * 10 + 10, position);
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, SettingsPair pair)
-                throws SQLException {
-                stmt.setInt(i * 10 + 1, pair.id); // id
-                stmt.setNull(i * 10 + 2, 4); // biome
-                stmt.setNull(i * 10 + 3, 4); // rain
-                stmt.setNull(i * 10 + 4, 4); // custom_time
-                stmt.setNull(i * 10 + 5, 4); // time
-                stmt.setNull(i * 10 + 6, 4); // deny_entry
-                if (pair.settings.getAlias().isEmpty()) {
-                    stmt.setNull(i * 10 + 7, 4);
-                } else {
-                    stmt.setString(i * 10 + 7, pair.settings.getAlias());
-                }
-                StringBuilder flag_string = new StringBuilder();
-                int k = 0;
-                for (Entry<Flag<?>, ?> flag : pair.settings.flags.entrySet()) {
-                    if (k != 0) {
-                        flag_string.append(',');
-                    }
-                    flag_string.append(flag.getKey().getName()).append(':').append(
-                        flag.getKey().valueToString(flag.getValue()).replaceAll(":", "¯")
-                            .replaceAll(",", "´"));
-                    k++;
-                }
-                stmt.setString(i * 10 + 8, flag_string.toString());
-                boolean[] merged = pair.settings.getMerged();
-                int n = 0;
-                for (int j = 0; j < 4; ++j) {
-                    n = (n << 1) + (merged[j] ? 1 : 0);
-                }
-                stmt.setInt(i * 10 + 9, n);
-                BlockLoc loc = pair.settings.getPosition();
-                String position;
-                if (loc.y == 0) {
-                    position = "DEFAULT";
-                } else {
-                    position = loc.x + "," + loc.y + ',' + loc.z;
-                }
-                stmt.setString(i * 10 + 10, position);
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, SettingsPair pair)
-                throws SQLException {
-                stmt.setInt(1, pair.id);
-            }
-        };
-        addGlobalTask(() -> setBulk(myList, mod, whenDone));
-    }
-
-    public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
-        final StmtMod<Integer> mod = new StmtMod<Integer>() {
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(size, SQLManager.this.CREATE_SETTINGS, 1);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateSQLite(size, "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings` SELECT ? AS `plot_plot_id`, ? AS `biome`, ? AS `rain`, ? AS `custom_time`, ? AS `time`, ? AS "
-                        + "`deny_entry`, ? AS `alias`, ? AS `flags`, ? AS `merged`, ? AS `position` ",
-                    10);
-            }
-
-            @Override public String getCreateSQL() {
-                return "INSERT INTO `" + SQLManager.this.prefix
-                    + "plot_settings`(`plot_plot_id`) VALUES(?)";
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, Integer id)
-                throws SQLException {
-                stmt.setInt(i + 1, id);
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, Integer id)
-                throws SQLException {
-                stmt.setInt(i * 10 + 1, id);
-                stmt.setNull(i * 10 + 2, 4);
-                stmt.setNull(i * 10 + 3, 4);
-                stmt.setNull(i * 10 + 4, 4);
-                stmt.setNull(i * 10 + 5, 4);
-                stmt.setNull(i * 10 + 6, 4);
-                stmt.setNull(i * 10 + 7, 4);
-                stmt.setNull(i * 10 + 8, 4);
-                stmt.setNull(i * 10 + 9, 4);
-                stmt.setString(i * 10 + 10, "DEFAULT");
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, Integer id) throws SQLException {
-                stmt.setInt(1, id);
-            }
-        };
-        addGlobalTask(() -> setBulk(myList, mod, whenDone));
-    }
-
-    public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
-        final long timestamp = plot.getTimestamp();
-        addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-                stmt.setString(6, plot.getArea().toString());
-                stmt.setInt(7, plot.getId().x);
-                stmt.setInt(8, plot.getId().y);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_PLOT_SAFE,
-                    Statement.RETURN_GENERATED_KEYS);
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                int inserted = statement.executeUpdate();
-                if (inserted > 0) {
-                    try (ResultSet keys = statement.getGeneratedKeys()) {
-                        if (keys.next()) {
-                            plot.temp = keys.getInt(1);
-                            addPlotTask(plot, new UniqueStatement(
-                                "createPlotAndSettings_settings_" + plot.hashCode()) {
-                                @Override public void set(PreparedStatement stmt)
-                                    throws SQLException {
-                                    stmt.setInt(1, getId(plot));
-                                }
-
-                                @Override public PreparedStatement get() throws SQLException {
-                                    return SQLManager.this.connection.prepareStatement(
-                                        "INSERT INTO `" + SQLManager.this.prefix
-                                            + "plot_settings`(`plot_plot_id`) VALUES(?)");
-                                }
-                            });
-                            if (success != null) {
-                                addNotifyTask(success);
-                            }
-                            return;
-                        }
-                    }
-                }
-                if (failure != null) {
-                    failure.run();
-                }
-            }
-        });
-    }
-
-    public void commit() {
-        if (this.closed) {
-            return;
-        }
-        try {
-            if (!this.connection.getAutoCommit()) {
-                this.connection.commit();
-                this.connection.setAutoCommit(true);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
-        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection
-                    .prepareStatement(SQLManager.this.CREATE_PLOT, Statement.RETURN_GENERATED_KEYS);
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
-                    if (keys.next()) {
-                        plot.temp = keys.getInt(1);
-                    }
-                }
-            }
-        });
-        addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
-            }
-        });
-        addNotifyTask(whenDone);
-    }
-
-    /**
-     * Create tables.
-     */
-    @Override public void createTables() throws SQLException {
-        String[] tables =
-            new String[] {"plot", "plot_denied", "plot_helpers", "plot_comments", "plot_trusted",
-                "plot_rating", "plot_settings", "cluster", "player_meta"};
-        DatabaseMetaData meta = this.connection.getMetaData();
-        int create = 0;
-        for (String s : tables) {
-            ResultSet set = meta.getTables(null, null, this.prefix + s, new String[] {"TABLE"});
-            //            ResultSet set = meta.getTables(null, null, prefix + s, null);
-            if (!set.next()) {
-                create++;
-            }
-            set.close();
-        }
-        if (create == 0) {
-            return;
-        }
-        boolean addConstraint = create == tables.length;
-        PlotSquared.debug("Creating tables");
-        try (Statement stmt = this.connection.createStatement()) {
-            if (this.mySQL) {
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
-                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
-                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
-                    + "PRIMARY KEY (`id`)"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_helpers` ("
-                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                    + "`comment` VARCHAR(40) NOT NULL," + "`inbox` VARCHAR(40) NOT NULL,"
-                    + "`timestamp` INT(11) NOT NULL," + "`sender` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_trusted` ("
-                    + "`plot_plot_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
-                    + "  `plot_plot_id` INT(11) NOT NULL,"
-                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
-                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
-                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`plot_plot_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_rating` ( `plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL) ENGINE=InnoDB "
-                    + "DEFAULT CHARSET=utf8");
-                if (addConstraint) {
-                    stmt.addBatch("ALTER TABLE `" + this.prefix + "plot_settings` ADD CONSTRAINT `"
-                        + this.prefix
-                        + "plot_settings_ibfk_1` FOREIGN KEY (`plot_plot_id`) REFERENCES `"
-                        + this.prefix + "plot` (`id`) ON DELETE CASCADE");
-                }
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
-                    + "`id` INT(11) NOT NULL AUTO_INCREMENT," + "`pos1_x` INT(11) NOT NULL,"
-                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
-                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,"
-                    + "PRIMARY KEY (`id`)"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=0");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_helpers` ("
-                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_invited` ("
-                    + "`cluster_id` INT(11) NOT NULL," + "`user_uuid` VARCHAR(40) NOT NULL"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
-                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
-                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
-                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`cluster_id`)" + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
-                    + " `meta_id` INT(11) NOT NULL AUTO_INCREMENT,"
-                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
-                    + " `value` blob NOT NULL," + " PRIMARY KEY (`meta_id`)"
-                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-            } else {
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot` ("
-                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`plot_id_x` INT(11) NOT NULL,"
-                    + "`plot_id_z` INT(11) NOT NULL," + "`owner` VARCHAR(45) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_denied` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_helpers` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_trusted` (`plot_plot_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                    + "`comment` VARCHAR(40) NOT NULL,"
-                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
-                    + "`sender` VARCHAR(40) NOT NULL" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_settings` ("
-                    + "  `plot_plot_id` INT(11) NOT NULL,"
-                    + "  `biome` VARCHAR(45) DEFAULT 'FOREST'," + "  `rain` INT(1) DEFAULT 0,"
-                    + "  `custom_time` TINYINT(1) DEFAULT '0'," + "  `time` INT(11) DEFAULT '8000',"
-                    + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`plot_plot_id`)" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "plot_rating` (`plot_plot_id` INT(11) NOT NULL, `rating` INT(2) NOT NULL, `player` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster` ("
-                    + "`id` INTEGER PRIMARY KEY AUTOINCREMENT," + "`pos1_x` INT(11) NOT NULL,"
-                    + "`pos1_z` INT(11) NOT NULL," + "`pos2_x` INT(11) NOT NULL,"
-                    + "`pos2_z` INT(11) NOT NULL," + "`owner` VARCHAR(40) NOT NULL,"
-                    + "`world` VARCHAR(45) NOT NULL,"
-                    + "`timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "cluster_helpers` (`cluster_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix
-                    + "cluster_invited` (`cluster_id` INT(11) NOT NULL,"
-                    + "`user_uuid` VARCHAR(40) NOT NULL)");
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "cluster_settings` ("
-                    + "  `cluster_id` INT(11) NOT NULL," + "  `biome` VARCHAR(45) DEFAULT 'FOREST',"
-                    + "  `rain` INT(1) DEFAULT 0," + "  `custom_time` TINYINT(1) DEFAULT '0',"
-                    + "  `time` INT(11) DEFAULT '8000'," + "  `deny_entry` TINYINT(1) DEFAULT '0',"
-                    + "  `alias` VARCHAR(50) DEFAULT NULL," + "  `flags` VARCHAR(512) DEFAULT NULL,"
-                    + "  `merged` INT(11) DEFAULT NULL,"
-                    + "  `position` VARCHAR(50) NOT NULL DEFAULT 'DEFAULT',"
-                    + "  PRIMARY KEY (`cluster_id`)" + ')');
-                stmt.addBatch("CREATE TABLE IF NOT EXISTS `" + this.prefix + "player_meta` ("
-                    + " `meta_id` INTEGER PRIMARY KEY AUTOINCREMENT,"
-                    + " `uuid` VARCHAR(40) NOT NULL," + " `key` VARCHAR(32) NOT NULL,"
-                    + " `value` blob NOT NULL" + ')');
-            }
-            stmt.executeBatch();
-            stmt.clearBatch();
-        }
-    }
-
-    @Override public void deleteSettings(final Plot plot) {
-        addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_settings` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteHelpers(final Plot plot) {
-        if (plot.getTrusted().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_helpers` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteTrusted(final Plot plot) {
-        if (plot.getMembers().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_trusted` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteDenied(final Plot plot) {
-        if (plot.getDenied().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_denied` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteComments(final Plot plot) {
-        addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, plot.getArea().toString());
-                stmt.setInt(2, plot.hashCode());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_comments` WHERE `world` = ? AND `hashcode` = ?");
-            }
-        });
-    }
-
-    @Override public void deleteRatings(final Plot plot) {
-        if (Settings.Enabled_Components.RATING_CACHE && plot.getSettings().getRatings().isEmpty()) {
-            return;
-        }
-        addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_rating` WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Delete a plot.
-     */
-    @Override public void delete(final Plot plot) {
-        PlotSquared.debug(
-            "Deleting plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
-                + plot.owner + " Index: " + plot.temp);
-        deleteSettings(plot);
-        deleteDenied(plot);
-        deleteHelpers(plot);
-        deleteTrusted(plot);
-        deleteComments(plot);
-        deleteRatings(plot);
-        addPlotTask(plot, new UniqueStatement("delete_plot") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Create plot settings
-     */
-    @Override public void createPlotSettings(final int id, Plot plot) {
-        PlotSquared.debug(
-            "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
-                + plot.owner + " Index: " + id);
-        addPlotTask(plot, new UniqueStatement("createPlotSettings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_settings`(`plot_plot_id`) VALUES(?)");
-            }
-        });
-    }
-
-    @Override public int getClusterId(PlotCluster cluster) {
-        if (cluster.temp > 0) {
-            return cluster.temp;
-        }
-        try {
-            commit();
-            if (cluster.temp > 0) {
-                return cluster.temp;
-            }
-            int c_id;
-            try (PreparedStatement stmt = this.connection.prepareStatement(
-                "SELECT `id` FROM `" + this.prefix
-                    + "cluster` WHERE `pos1_x` = ? AND `pos1_z` = ? AND `pos2_x` = ? AND `pos2_z` = ? AND `world` = ? ORDER BY `timestamp` ASC")) {
-                stmt.setInt(1, cluster.getP1().x);
-                stmt.setInt(2, cluster.getP1().y);
-                stmt.setInt(3, cluster.getP2().x);
-                stmt.setInt(4, cluster.getP2().y);
-                stmt.setString(5, cluster.area.toString());
-                try (ResultSet resultSet = stmt.executeQuery()) {
-                    c_id = Integer.MAX_VALUE;
-                    while (resultSet.next()) {
-                        c_id = resultSet.getInt("id");
-                    }
-                }
-            }
-            if (c_id == Integer.MAX_VALUE || c_id == 0) {
-                if (cluster.temp > 0) {
-                    return cluster.temp;
-                }
-                throw new SQLException("Cluster does not exist in database");
-            }
-            cluster.temp = c_id;
-            return c_id;
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override public int getId(Plot plot) {
-        if (plot.temp > 0) {
-            return plot.temp;
-        }
-        try {
-            commit();
-            if (plot.temp > 0) {
-                return plot.temp;
-            }
-            int id;
-            try (PreparedStatement statement = this.connection.prepareStatement(
-                "SELECT `id` FROM `" + this.prefix
-                    + "plot` WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND world = ? ORDER BY `timestamp` ASC")) {
-                statement.setInt(1, plot.getId().x);
-                statement.setInt(2, plot.getId().y);
-                statement.setString(3, plot.getArea().toString());
-                try (ResultSet resultSet = statement.executeQuery()) {
-                    id = Integer.MAX_VALUE;
-                    while (resultSet.next()) {
-                        id = resultSet.getInt("id");
-                    }
-                }
-            }
-            if (id == Integer.MAX_VALUE || id == 0) {
-                if (plot.temp > 0) {
-                    return plot.temp;
-                }
-                throw new SQLException("Plot does not exist in database");
-            }
-            plot.temp = id;
-            return id;
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    @Override public void updateTables(int[] oldVersion) {
-        try {
-            if (this.mySQL && !PlotSquared.get().checkVersion(oldVersion, 3, 3, 2)) {
-                try (Statement stmt = this.connection.createStatement()) {
-                    stmt.executeUpdate(
-                        "ALTER TABLE `" + this.prefix + "plots` DROP INDEX `unique_alias`");
-                } catch (SQLException ignored) {
-                }
-            }
-            DatabaseMetaData data = this.connection.getMetaData();
-            ResultSet rs =
-                data.getColumns(null, null, this.prefix + "plot_comments", "plot_plot_id");
-            if (rs.next()) {
-                rs.close();
-                rs = data.getColumns(null, null, this.prefix + "plot_comments", "hashcode");
-                if (!rs.next()) {
-                    rs.close();
-                    try (Statement statement = this.connection.createStatement()) {
-                        statement.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-                        if (Storage.MySQL.USE) {
-                            statement.addBatch(
-                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                                    + "`comment` VARCHAR(40) NOT NULL,"
-                                    + "`inbox` VARCHAR(40) NOT NULL,"
-                                    + "`timestamp` INT(11) NOT NULL,"
-                                    + "`sender` VARCHAR(40) NOT NULL"
-                                    + ") ENGINE=InnoDB DEFAULT CHARSET=utf8");
-                        } else {
-                            statement.addBatch(
-                                "CREATE TABLE IF NOT EXISTS `" + this.prefix + "plot_comments` ("
-                                    + "`world` VARCHAR(40) NOT NULL, `hashcode` INT(11) NOT NULL,"
-                                    + "`comment` VARCHAR(40) NOT NULL,"
-                                    + "`inbox` VARCHAR(40) NOT NULL, `timestamp` INT(11) NOT NULL,"
-                                    + "`sender` VARCHAR(40) NOT NULL" + ')');
-                        }
-                        statement.executeBatch();
-                    } catch (SQLException ignored) {
-                        try (Statement statement = this.connection.createStatement()) {
-                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
-                                + "plot_comments` ADD `inbox` VARCHAR(11) DEFAULT `public`");
-                            statement.addBatch("ALTER IGNORE TABLE `" + this.prefix
-                                + "plot_comments` ADD `timestamp` INT(11) DEFAULT 0");
-                            statement.addBatch("ALTER TABLE `" + this.prefix + "plot` DROP `tier`");
-                            statement.executeBatch();
-                        }
-                    }
-                }
-            }
-            rs.close();
-            rs = data.getColumns(null, null, this.prefix + "plot_denied", "plot_plot_id");
-            if (rs.next()) {
-                try (Statement statement = this.connection.createStatement()) {
-                    statement.executeUpdate("DELETE FROM `" + this.prefix
-                        + "plot_denied` WHERE `plot_plot_id` NOT IN (SELECT `id` FROM `"
-                        + this.prefix + "plot`)");
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-
-                rs.close();
-                try (Statement statement = this.connection.createStatement()) {
-                    for (String table : new String[] {"plot_denied", "plot_helpers",
-                        "plot_trusted"}) {
-                        ResultSet result = statement.executeQuery(
-                            "SELECT plot_plot_id, user_uuid, COUNT(*) FROM " + this.prefix + table
-                                + " GROUP BY plot_plot_id, user_uuid HAVING COUNT(*) > 1");
-                        if (result.next()) {
-                            PlotSquared.debug("BACKING UP: " + this.prefix + table);
-                            result.close();
-                            statement.executeUpdate(
-                                "CREATE TABLE " + this.prefix + table + "_tmp AS SELECT * FROM "
-                                    + this.prefix + table + " GROUP BY plot_plot_id, user_uuid");
-                            statement.executeUpdate("DROP TABLE " + this.prefix + table);
-                            statement.executeUpdate(
-                                "CREATE TABLE " + this.prefix + table + " AS SELECT * FROM "
-                                    + this.prefix + table + "_tmp");
-                            statement.executeUpdate("DROP TABLE " + this.prefix + table + "_tmp");
-                            PlotSquared.debug("RESTORING: " + this.prefix + table);
-                        }
-                    }
-                } catch (SQLException e2) {
-                    e2.printStackTrace();
-                }
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public void deleteRows(ArrayList<Integer> rowIds, final String table, final String column) {
-        setBulk(rowIds, new StmtMod<Integer>() {
-
-            @Override public String getCreateMySQL(int size) {
-                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
-                    size);
-            }
-
-            @Override public String getCreateSQLite(int size) {
-                return getCreateMySQL(1, "DELETE FROM `" + table + "` WHERE `" + column + "` IN ",
-                    size);
-            }
-
-            @Override public String getCreateSQL() {
-                return "DELETE FROM `" + table + "` WHERE `" + column + "` = ?";
-            }
-
-            @Override public void setMySQL(PreparedStatement stmt, int i, Integer obj)
-                throws SQLException {
-                stmt.setInt(i + 1, obj);
-            }
-
-            @Override public void setSQLite(PreparedStatement stmt, int i, Integer obj)
-                throws SQLException {
-                stmt.setInt(i + 1, obj);
-            }
-
-            @Override public void setSQL(PreparedStatement stmt, Integer obj) throws SQLException {
-                stmt.setInt(1, obj);
-            }
-        }, null);
-    }
-
-    /**
-     * Load all plots, helpers, denied, trusted, and every setting from DB into a {@link HashMap}.
-     */
-    @Override public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
-        HashMap<String, HashMap<PlotId, Plot>> newPlots = new HashMap<>();
-        HashMap<Integer, Plot> plots = new HashMap<>();
-        try {
-            HashSet<String> areas = new HashSet<>();
-            if (PlotSquared.get().worlds.contains("worlds")) {
-                ConfigurationSection worldSection =
-                    PlotSquared.get().worlds.getConfigurationSection("worlds");
-                if (worldSection != null) {
-                    for (String worldKey : worldSection.getKeys(false)) {
-                        areas.add(worldKey);
-                        ConfigurationSection areaSection =
-                            worldSection.getConfigurationSection(worldKey + ".areas");
-                        if (areaSection != null) {
-                            areaSection.getKeys(false).forEach(s -> {
-                                String[] split = s.split("(?<![;])-");
-                                if (split.length == 3) {
-                                    areas.add(worldKey + ';' + split[0]);
-                                }
-                            });
-                        }
-                    }
-                }
-            }
-            HashMap<String, UUID> uuids = new HashMap<>();
-            HashMap<String, AtomicInteger> noExist = new HashMap<>();
-
-            /*
-             * Getting plots
-             */
-            try (Statement statement = this.connection.createStatement()) {
-                int id;
-                String owner;
-                UUID user;
-                try (ResultSet resultSet = statement.executeQuery(
-                    "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
-                        + this.prefix + "plot`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (resultSet.next()) {
-                        PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
-                            resultSet.getInt("plot_id_z"));
-                        id = resultSet.getInt("id");
-                        String areaid = resultSet.getString("world");
-                        if (!areas.contains(areaid)) {
-                            if (Settings.Enabled_Components.DATABASE_PURGER) {
-                                toDelete.add(id);
-                                continue;
-                            } else {
-                                AtomicInteger value = noExist.get(areaid);
-                                if (value != null) {
-                                    value.incrementAndGet();
-                                } else {
-                                    noExist.put(areaid, new AtomicInteger(1));
-                                }
-                            }
-                        }
-                        owner = resultSet.getString("owner");
-                        user = uuids.computeIfAbsent(owner, s -> {
-                            try {
-                                return UUID.fromString(s);
-                            } catch (IllegalArgumentException ignored) {
-                                if (Settings.UUID.FORCE_LOWERCASE) {
-                                    return UUID.nameUUIDFromBytes(
-                                        ("OfflinePlayer:" + s.toLowerCase())
-                                            .getBytes(Charsets.UTF_8));
-                                } else {
-                                    return UUID.nameUUIDFromBytes(
-                                        ("OfflinePlayer:" + s).getBytes(Charsets.UTF_8));
-                                }
-                            }
-                        });
-                        long time;
-                        try {
-                            Timestamp timestamp = resultSet.getTimestamp("timestamp");
-                            time = timestamp.getTime();
-                        } catch (SQLException exception) {
-                            String parsable = resultSet.getString("timestamp");
-                            try {
-                                time = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(parsable)
-                                    .getTime();
-                            } catch (ParseException e) {
-                                PlotSquared.debug(
-                                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
-                                        + plot_id + ") (" + parsable + ")");
-                                time = System.currentTimeMillis() + id;
-                            }
-                        }
-                        Plot plot = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
-                            new HashSet<>(), "", null, null, null,
-                            new boolean[] {false, false, false, false}, time, id);
-                        HashMap<PlotId, Plot> map = newPlots.get(areaid);
-                        if (map != null) {
-                            Plot last = map.put(plot.getId(), plot);
-                            if (last != null) {
-                                if (Settings.Enabled_Components.DATABASE_PURGER) {
-                                    toDelete.add(last.temp);
-                                } else {
-                                    PlotSquared.debug(
-                                        "&cPLOT #" + id + "(" + last + ") in `" + this.prefix
-                                            + "plot` is a duplicate. Delete this plot or set `database-purger: true` in the settings.yml.");
-                                }
-                            }
-                        } else {
-                            map = new HashMap<>();
-                            newPlots.put(areaid, map);
-                            map.put(plot.getId(), plot);
-                        }
-                        plots.put(id, plot);
-                    }
-                    deleteRows(toDelete, this.prefix + "plot", "id");
-                }
-                if (Settings.Enabled_Components.RATING_CACHE) {
-                    try (ResultSet r = statement.executeQuery(
-                        "SELECT `plot_plot_id`, `player`, `rating` FROM `" + this.prefix
-                            + "plot_rating`")) {
-                        ArrayList<Integer> toDelete = new ArrayList<>();
-                        while (r.next()) {
-                            id = r.getInt("plot_plot_id");
-                            owner = r.getString("player");
-                            user = uuids.computeIfAbsent(owner, UUID::fromString);
-                            Plot plot = plots.get(id);
-                            if (plot != null) {
-                                plot.getSettings().getRatings().put(user, r.getInt("rating"));
-                            } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                                toDelete.add(id);
-                            } else {
-                                PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                    + ") in `plot_rating` does not exist. Create this plot or set `database-purger: true` in the "
-                                    + "settings.yml.");
-                            }
-                        }
-                        deleteRows(toDelete, this.prefix + "plot_rating", "plot_plot_id");
-                    }
-                }
-
-                /*
-                 * Getting helpers
-                 */
-                try (ResultSet r = statement.executeQuery(
-                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_helpers`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        owner = r.getString("user_uuid");
-                        user = uuids.computeIfAbsent(owner, UUID::fromString);
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plot.getTrusted().add(user);
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                + ") in `plot_helpers` does not exist. Create this plot or set `database-purger: true` in the settings"
-                                + ".yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_helpers", "plot_plot_id");
-                }
-
-                /*
-                 * Getting trusted
-                 */
-                try (ResultSet r = statement.executeQuery(
-                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_trusted`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        owner = r.getString("user_uuid");
-                        user = uuids.computeIfAbsent(owner, UUID::fromString);
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plot.getMembers().add(user);
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                + ") in `plot_trusted` does not exist. Create this plot or set `database-purger: true` in the settings"
-                                + ".yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_trusted", "plot_plot_id");
-                }
-
-                /*
-                 * Getting denied
-                 */
-                try (ResultSet r = statement.executeQuery(
-                    "SELECT `user_uuid`, `plot_plot_id` FROM `" + this.prefix + "plot_denied`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (r.next()) {
-                        id = r.getInt("plot_plot_id");
-                        owner = r.getString("user_uuid");
-                        user = uuids.computeIfAbsent(owner, UUID::fromString);
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plot.getDenied().add(user);
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY " + id
-                                + " in `plot_denied` does not exist. Create this plot or set `database-purger: true` in the settings.yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_denied", "plot_plot_id");
-                }
-
-                try (ResultSet resultSet = statement
-                    .executeQuery("SELECT * FROM `" + this.prefix + "plot_settings`")) {
-                    ArrayList<Integer> toDelete = new ArrayList<>();
-                    while (resultSet.next()) {
-                        id = resultSet.getInt("plot_plot_id");
-                        Plot plot = plots.get(id);
-                        if (plot != null) {
-                            plots.remove(id);
-                            String alias = resultSet.getString("alias");
-                            if (alias != null) {
-                                plot.getSettings().setAlias(alias);
-                            }
-                            String pos = resultSet.getString("position");
-                            switch (pos.toLowerCase()) {
-                                case "":
-                                case "default":
-                                case "0,0,0":
-                                case "center":
-                                    break;
-                                default:
-                                    try {
-                                        plot.getSettings().setPosition(BlockLoc.fromString(pos));
-                                    } catch (Exception ignored) {
-                                    }
-                            }
-                            int m = resultSet.getInt("merged");
-                            boolean[] merged = new boolean[4];
-                            for (int i = 0; i < 4; i++) {
-                                merged[3 - i] = (m & 1 << i) != 0;
-                            }
-                            plot.getSettings().setMerged(merged);
-                            String[] flags_string;
-                            String myflags = resultSet.getString("flags");
-                            if (myflags == null || myflags.isEmpty()) {
-                                flags_string = new String[] {};
-                            } else {
-                                flags_string = myflags.split(",");
-                            }
-                            HashMap<Flag<?>, Object> flags = new HashMap<>();
-                            boolean exception = false;
-                            for (String element : flags_string) {
-                                if (element.contains(":")) {
-                                    String[] split = element.split(":");
-                                    try {
-                                        String flag_str =
-                                            split[1].replaceAll("¯", ":").replaceAll("\u00B4", ",");
-                                        Flag<?> flag = FlagManager.getOrCreateFlag(split[0]);
-                                        flags.put(flag, flag.parseValue(flag_str));
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                        exception = true;
-                                    }
-                                } else {
-                                    element =
-                                        element.replaceAll("\u00AF", ":").replaceAll("\u00B4", ",");
-                                    if (StringMan
-                                        .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
-                                        Flag flag = FlagManager.getOrCreateFlag(element);
-                                        if (flag == null) {
-                                            flag = new StringFlag(element) {
-                                                @Override public String getValueDescription() {
-                                                    return "Generic Filler Flag";
-                                                }
-                                            };
-                                        }
-                                        flags.put(flag, flag.parseValue(""));
-                                    } else {
-                                        PlotSquared.debug("INVALID FLAG: " + element);
-                                    }
-                                }
-                            }
-                            if (exception) {
-                                PlotSquared.debug("&cPlot #" + id + "(" + plot + ") | " + plot
-                                    + " had an invalid flag. A fix has been attempted.");
-                                PlotSquared.debug("&c" + myflags);
-                                this.setFlags(plot, flags);
-                            }
-                            plot.getSettings().flags = flags;
-                        } else if (Settings.Enabled_Components.DATABASE_PURGER) {
-                            toDelete.add(id);
-                        } else {
-                            PlotSquared.debug("&cENTRY #" + id + "(" + plot
-                                + ") in `plot_settings` does not exist. Create this plot or set `database-purger: true` in the settings"
-                                + ".yml.");
-                        }
-                    }
-                    deleteRows(toDelete, this.prefix + "plot_settings", "plot_plot_id");
-                }
-            }
-            if (!plots.entrySet().isEmpty()) {
-                createEmptySettings(new ArrayList<>(plots.keySet()), null);
-                for (Entry<Integer, Plot> entry : plots.entrySet()) {
-                    entry.getValue().getSettings();
-                }
-            }
-            boolean invalidPlot = false;
-            for (Entry<String, AtomicInteger> entry : noExist.entrySet()) {
-                String worldName = entry.getKey();
-                invalidPlot = true;
-                PlotSquared.debug("&c[WARNING] Found " + entry.getValue().intValue()
-                    + " plots in DB for non existent world; '" + worldName + "'.");
-            }
-            if (invalidPlot) {
-                PlotSquared.debug(
-                    "&c[WARNING] - Please create the world/s or remove the plots using the purge command");
-            }
-        } catch (SQLException e) {
-            PlotSquared.debug("&7[WARN] Failed to load plots.");
-            e.printStackTrace();
-        }
-        return newPlots;
-    }
-
-    @Override public void setMerged(final Plot plot, final boolean[] merged) {
-        plot.getSettings().setMerged(merged);
-        addPlotTask(plot, new UniqueStatement("setMerged") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                int hash = MainUtil.hash(merged);
-                stmt.setInt(1, hash);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `merged` = ? WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void swapPlots(Plot plot1, Plot plot2) {
-        final int id1 = getId(plot1);
-        final int id2 = getId(plot2);
-        final PlotId pos1 = plot1.getId();
-        final PlotId pos2 = plot2.getId();
-        addPlotTask(plot1, new UniqueStatement("swapPlots") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos2.x);
-                stmt.setInt(2, pos2.y);
-                stmt.setInt(3, id1);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-        addPlotTask(plot2, new UniqueStatement("swapPlots") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, id2);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ? WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override public void movePlot(final Plot original, final Plot newPlot) {
-        addPlotTask(original, new UniqueStatement("movePlot") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, newPlot.getId().x);
-                stmt.setInt(2, newPlot.getId().y);
-                stmt.setString(3, newPlot.getArea().toString());
-                stmt.setInt(4, getId(original));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `plot_id_x` = ?, `plot_id_z` = ?, `world` = ? WHERE `id` = ?");
-            }
-        });
-        addPlotTask(newPlot, null);
-    }
-
-    @Override public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
-        final String flag_string = FlagManager.toString(flags);
-        addPlotTask(plot, new UniqueStatement("setFlags") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `flags` = ? WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void setAlias(final Plot plot, final String alias) {
-        addPlotTask(plot, new UniqueStatement("setAlias") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, alias);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `alias` = ?  WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    /**
-     * Purge all plots with the following database IDs
-     */
-    @Override public void purgeIds(final Set<Integer> uniqueIds) {
-        addGlobalTask(() -> {
-            if (!uniqueIds.isEmpty()) {
-                try {
-                    ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
-                    String stmt_prefix = "";
-                    int size = uniqueIdsList.size();
-                    int packet = 990;
-                    int amount = size / packet;
-                    int count = 0;
-                    int last = -1;
-                    for (int j = 0; j <= amount; j++) {
-                        PlotSquared.debug("Purging " + (j * packet) + " / " + size);
-                        List<Integer> subList =
-                            uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                        if (subList.isEmpty()) {
-                            break;
-                        }
-                        StringBuilder idstr2 = new StringBuilder();
-                        stmt_prefix = "";
-                        for (Integer id : subList) {
-                            idstr2.append(stmt_prefix).append(id);
-                            stmt_prefix = " OR `id` = ";
-                        }
-                        stmt_prefix = "";
-                        StringBuilder idstr = new StringBuilder();
-                        for (Integer id : subList) {
-                            idstr.append(stmt_prefix).append(id);
-                            stmt_prefix = " OR `plot_plot_id` = ";
-                        }
-                        PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_denied` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_settings` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
-                                + idstr2);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        commit();
-                    }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
-                    return;
-                }
-            }
-            PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
-        });
-    }
-
-    @Override public void purge(final PlotArea area, final Set<PlotId> plots) {
-        addGlobalTask(() -> {
-            try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
-                    + "plot` WHERE `world` = ?")) {
-                stmt.setString(1, area.toString());
-                Set<Integer> ids;
-                try (ResultSet r = stmt.executeQuery()) {
-                    ids = new HashSet<>();
-                    while (r.next()) {
-                        PlotId plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-                        if (plots.contains(plot_id)) {
-                            ids.add(r.getInt("id"));
-                        }
-                    }
-                }
-                purgeIds(ids);
-            } catch (SQLException e) {
-                e.printStackTrace();
-                PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
-            }
-            for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
-                PlotId plotId = iterator.next();
-                iterator.remove();
-                PlotId id = new PlotId(plotId.x, plotId.y);
-                area.removePlot(id);
-            }
-        });
-    }
-
-    @Override public void setPosition(final Plot plot, final String position) {
-        addPlotTask(plot, new UniqueStatement("setPosition") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position == null ? "" : position);
-                stmt.setInt(2, getId(plot));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot_settings` SET `position` = ?  WHERE `plot_plot_id` = ?");
-            }
-        });
-    }
-
-    @Override public void removeComment(final Plot plot, final PlotComment comment) {
-        addPlotTask(plot, new UniqueStatement("removeComment") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.getArea().toString());
-                    statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, comment.comment);
-                    statement.setString(4, comment.inbox);
-                    statement.setString(5, comment.senderName);
-                } else {
-                    statement.setString(1, comment.comment);
-                    statement.setString(2, comment.inbox);
-                    statement.setString(3, comment.senderName);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "DELETE FROM `" + SQLManager.this.prefix
-                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `comment` = ? AND `inbox` = ? AND `sender` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_comments` WHERE `comment` = ? AND `inbox` = ? AND `sender` = ?");
-            }
-        });
-    }
-
-    @Override public void clearInbox(final Plot plot, final String inbox) {
-        addPlotTask(plot, new UniqueStatement("clearInbox") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.getArea().toString());
-                    statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, inbox);
-                } else {
-                    statement.setString(1, inbox);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "DELETE FROM `" + SQLManager.this.prefix
-                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix + "plot_comments` `inbox` = ?");
-            }
-        });
-    }
-
-    @Override public void getComments(final Plot plot, final String inbox,
-        final RunnableVal<List<PlotComment>> whenDone) {
-        addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                if (plot != null) {
-                    statement.setString(1, plot.getArea().toString());
-                    statement.setInt(2, plot.getId().hashCode());
-                    statement.setString(3, inbox);
-                } else {
-                    statement.setString(1, inbox);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (plot != null) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "SELECT * FROM `" + SQLManager.this.prefix
-                            + "plot_comments` WHERE `world` = ? AND `hashcode` = ? AND `inbox` = ?");
-                }
-                return SQLManager.this.connection.prepareStatement(
-                    "SELECT * FROM `" + SQLManager.this.prefix
-                        + "plot_comments` WHERE `inbox` = ?");
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                ArrayList<PlotComment> comments = new ArrayList<>();
-                try (ResultSet set = statement.executeQuery()) {
-                    while (set.next()) {
-                        String sender = set.getString("sender");
-                        String world = set.getString("world");
-                        int hash = set.getInt("hashcode");
-                        PlotId id;
-                        if (hash != 0) {
-                            id = PlotId.unpair(hash);
-                        } else {
-                            id = null;
-                        }
-                        String msg = set.getString("comment");
-                        long timestamp = set.getInt("timestamp") * 1000;
-                        PlotComment comment =
-                            new PlotComment(world, id, msg, sender, inbox, timestamp);
-                        comments.add(comment);
-                        whenDone.value = comments;
-                    }
-                }
-                TaskManager.runTask(whenDone);
-            }
-        });
-    }
-
-    @Override public void setComment(final Plot plot, final PlotComment comment) {
-        addPlotTask(plot, new UniqueStatement("setComment") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setString(1, plot.getArea().toString());
-                statement.setInt(2, plot.getId().hashCode());
-                statement.setString(3, comment.comment);
-                statement.setString(4, comment.inbox);
-                statement.setInt(5, (int) (comment.timestamp / 1000));
-                statement.setString(6, comment.senderName);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_comments` (`world`, `hashcode`, `comment`, `inbox`, `timestamp`, `sender`) VALUES(?,?,?,?,?,?)");
-            }
-        });
-    }
-
-    @Override public void removeTrusted(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeTrusted") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_helpers` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void removeMember(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeMember") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_trusted` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setTrusted(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setTrusted") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_helpers` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public void setMember(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setMember") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_trusted` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public void removeDenied(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("removeDenied") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "plot_denied` WHERE `plot_plot_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setDenied(final Plot plot, final UUID uuid) {
-        addPlotTask(plot, new UniqueStatement("setDenied") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_denied` (`plot_plot_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public HashMap<UUID, Integer> getRatings(Plot plot) {
-        HashMap<UUID, Integer> map = new HashMap<>();
-        try (PreparedStatement statement = this.connection.prepareStatement(
-            "SELECT `rating`, `player` FROM `" + this.prefix
-                + "plot_rating` WHERE `plot_plot_id` = ? ")) {
-            statement.setInt(1, getId(plot));
-            try (ResultSet resultSet = statement.executeQuery()) {
-                while (resultSet.next()) {
-                    UUID uuid = UUID.fromString(resultSet.getString("player"));
-                    int rating = resultSet.getInt("rating");
-                    map.put(uuid, rating);
-                }
-            }
-        } catch (SQLException e) {
-            PlotSquared
-                .debug("&7[WARN] Failed to fetch rating for plot " + plot.getId().toString());
-            e.printStackTrace();
-        }
-        return map;
-    }
-
-    @Override public void setRating(final Plot plot, final UUID rater, final int value) {
-        addPlotTask(plot, new UniqueStatement("setRating") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getId(plot));
-                statement.setInt(2, value);
-                statement.setString(3, rater.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "plot_rating` (`plot_plot_id`, `rating`, `player`) VALUES(?,?,?)");
-            }
-        });
-    }
-
-    @Override public void delete(PlotCluster cluster) {
-        final int id = getClusterId(cluster);
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_settings` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_helpers` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_invited` WHERE `cluster_id` = ?");
-            }
-        });
-        addClusterTask(cluster, new UniqueStatement("delete_cluster") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix + "cluster` WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
-        final boolean replace) {
-        addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                if (replace) {
-                    stmt.setBytes(1, meta);
-                    stmt.setString(2, uuid.toString());
-                    stmt.setString(3, key);
-                } else {
-                    stmt.setString(1, uuid.toString());
-                    stmt.setString(2, key);
-                    stmt.setBytes(3, meta);
-                }
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                if (replace) {
-                    return SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "player_meta` SET `value` = ? WHERE `uuid` = ? AND `key` = ?");
-                } else {
-                    return SQLManager.this.connection.prepareStatement(
-                        "INSERT INTO `" + SQLManager.this.prefix
-                            + "player_meta`(`uuid`, `key`, `value`) VALUES(?, ? ,?)");
-                }
-            }
-        });
-    }
-
-    @Override public void removePersistentMeta(final UUID uuid, final String key) {
-        addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, uuid.toString());
-                stmt.setString(2, key);
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "player_meta` WHERE `uuid` = ? AND `key` = ?");
-            }
-        });
-    }
-
-    @Override
-    public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
-        addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "SELECT * FROM `" + SQLManager.this.prefix
-                        + "player_meta` WHERE `uuid` = ? ORDER BY `meta_id` ASC");
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                ResultSet resultSet = statement.executeQuery();
-
-                final Map<String, byte[]> metaMap = new HashMap<>();
-
-                while (resultSet.next()) {
-                    String key = resultSet.getString("key");
-                    byte[] bytes = resultSet.getBytes("value");
-                    metaMap.put(key, bytes);
-                }
-
-                resultSet.close();
-                TaskManager.runTaskAsync(() -> result.run(metaMap));
-            }
-
-        });
-    }
-
-    @Override public HashMap<String, Set<PlotCluster>> getClusters() {
-        LinkedHashMap<String, Set<PlotCluster>> newClusters = new LinkedHashMap<>();
-        HashMap<Integer, PlotCluster> clusters = new HashMap<>();
-        try {
-            HashSet<String> areas = new HashSet<>();
-            if (PlotSquared.get().worlds.contains("worlds")) {
-                ConfigurationSection worldSection =
-                    PlotSquared.get().worlds.getConfigurationSection("worlds");
-                if (worldSection != null) {
-                    for (String worldKey : worldSection.getKeys(false)) {
-                        areas.add(worldKey);
-                        ConfigurationSection areaSection =
-                            worldSection.getConfigurationSection(worldKey + ".areas");
-                        if (areaSection != null) {
-                            for (String areaKey : areaSection.getKeys(false)) {
-                                String[] split = areaKey.split("(?<![;])-");
-                                if (split.length == 3) {
-                                    areas.add(worldKey + ';' + split[0]);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            HashMap<String, UUID> uuids = new HashMap<>();
-            HashMap<String, Integer> noExist = new HashMap<>();
-            /*
-             * Getting clusters
-             */
-            try (Statement stmt = this.connection.createStatement()) {
-                ResultSet resultSet =
-                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster`");
-                PlotCluster cluster;
-                String owner;
-                UUID user;
-                int id;
-                while (resultSet.next()) {
-                    PlotId pos1 =
-                        new PlotId(resultSet.getInt("pos1_x"), resultSet.getInt("pos1_z"));
-                    PlotId pos2 =
-                        new PlotId(resultSet.getInt("pos2_x"), resultSet.getInt("pos2_z"));
-                    id = resultSet.getInt("id");
-                    String areaid = resultSet.getString("world");
-                    if (!areas.contains(areaid)) {
-                        if (noExist.containsKey(areaid)) {
-                            noExist.put(areaid, noExist.get(areaid) + 1);
-                        } else {
-                            noExist.put(areaid, 1);
-                        }
-                    }
-                    owner = resultSet.getString("owner");
-                    user = uuids.computeIfAbsent(owner, UUID::fromString);
-                    cluster = new PlotCluster(null, pos1, pos2, user, id);
-                    clusters.put(id, cluster);
-                    Set<PlotCluster> set =
-                        newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
-                    set.add(cluster);
-                }
-                //Getting helpers
-                resultSet = stmt.executeQuery(
-                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_helpers`");
-                while (resultSet.next()) {
-                    id = resultSet.getInt("cluster_id");
-                    owner = resultSet.getString("user_uuid");
-                    user = uuids.computeIfAbsent(owner, UUID::fromString);
-                    cluster = clusters.get(id);
-                    if (cluster != null) {
-                        cluster.helpers.add(user);
-                    } else {
-                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                            + ") in cluster_helpers does not exist. Please create the cluster or remove this entry.");
-                    }
-                }
-                // Getting invited
-                resultSet = stmt.executeQuery(
-                    "SELECT `user_uuid`, `cluster_id` FROM `" + this.prefix + "cluster_invited`");
-                while (resultSet.next()) {
-                    id = resultSet.getInt("cluster_id");
-                    owner = resultSet.getString("user_uuid");
-                    user = uuids.computeIfAbsent(owner, UUID::fromString);
-                    cluster = clusters.get(id);
-                    if (cluster != null) {
-                        cluster.invited.add(user);
-                    } else {
-                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                            + ") in cluster_invited does not exist. Please create the cluster or remove this entry.");
-                    }
-                }
-                resultSet =
-                    stmt.executeQuery("SELECT * FROM `" + this.prefix + "cluster_settings`");
-                while (resultSet.next()) {
-                    id = resultSet.getInt("cluster_id");
-                    cluster = clusters.get(id);
-                    if (cluster != null) {
-                        String alias = resultSet.getString("alias");
-                        if (alias != null) {
-                            cluster.settings.setAlias(alias);
-                        }
-                        String pos = resultSet.getString("position");
-                        switch (pos.toLowerCase()) {
-                            case "":
-                            case "default":
-                            case "0,0,0":
-                            case "center":
-                                break;
-                            default:
-                                try {
-                                    BlockLoc loc = BlockLoc.fromString(pos);
-                                    cluster.settings.setPosition(loc);
-                                } catch (Exception ignored) {
-                                }
-                        }
-                        int m = resultSet.getInt("merged");
-                        boolean[] merged = new boolean[4];
-                        for (int i = 0; i < 4; i++) {
-                            merged[3 - i] = (m & 1 << i) != 0;
-                        }
-                        cluster.settings.setMerged(merged);
-                        String[] flags_string;
-                        String myflags = resultSet.getString("flags");
-                        if (myflags == null || myflags.isEmpty()) {
-                            flags_string = new String[] {};
-                        } else {
-                            flags_string = myflags.split(",");
-                        }
-                        HashMap<Flag<?>, Object> flags = new HashMap<>();
-                        for (String element : flags_string) {
-                            if (element.contains(":")) {
-                                String[] split = element.split(":");
-                                String flag_str =
-                                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
-                                Flag flag = FlagManager.getOrCreateFlag(split[0]);
-                                if (flag == null) {
-                                    flag = new StringFlag(split[0]) {
-                                        @Override public String getValueDescription() {
-                                            return "Generic Filler Flag";
-                                        }
-                                    };
-                                }
-                                flags.put(flag, flag.parseValue(flag_str));
-                            } else {
-                                Flag flag = FlagManager.getOrCreateFlag(element);
-                                if (flag == null) {
-                                    flag = new StringFlag(element) {
-                                        @Override public String getValueDescription() {
-                                            return "Generic Filler Flag";
-                                        }
-                                    };
-                                }
-                                flags.put(flag, flag.parseValue(""));
-                            }
-                        }
-                        cluster.settings.flags = flags;
-                    } else {
-                        PlotSquared.debug("&cCluster #" + id + "(" + cluster
-                            + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
-                    }
-                }
-                resultSet.close();
-            }
-            boolean invalidPlot = false;
-            for (Entry<String, Integer> entry : noExist.entrySet()) {
-                String a = entry.getKey();
-                invalidPlot = true;
-                PlotSquared.debug("&c[WARNING] Found " + noExist.get(a)
-                    + " clusters in DB for non existent area; '" + a + "'.");
-            }
-            if (invalidPlot) {
-                PlotSquared.debug(
-                    "&c[WARNING] - Please create the world/s or remove the clusters using the purge command");
-            }
-        } catch (SQLException e) {
-            PlotSquared.debug("&7[WARN] Failed to load clusters.");
-            e.printStackTrace();
-        }
-        return newClusters;
-    }
-
-    @Override public void setClusterName(final PlotCluster cluster, final String name) {
-        addClusterTask(cluster, new UniqueStatement("setClusterName") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, name);
-                stmt.setInt(2, getClusterId(cluster));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster_settings` SET `alias` = ?  WHERE `cluster_id` = ?");
-            }
-        });
-        cluster.settings.setAlias(name);
-    }
-
-    @Override public void removeHelper(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("removeHelper") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_helpers` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setHelper(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("setHelper") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "cluster_helpers` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public void createCluster(final PlotCluster cluster) {
-        addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, cluster.getP1().x);
-                stmt.setInt(2, cluster.getP1().y);
-                stmt.setInt(3, cluster.getP2().x);
-                stmt.setInt(4, cluster.getP2().y);
-                stmt.setString(5, cluster.owner.toString());
-                stmt.setString(6, cluster.area.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(SQLManager.this.CREATE_CLUSTER,
-                    Statement.RETURN_GENERATED_KEYS);
-            }
-
-            @Override public void execute(PreparedStatement statement) {
-            }
-
-            @Override public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
-                    if (keys.next()) {
-                        cluster.temp = keys.getInt(1);
-                    }
-                }
-            }
-        });
-        addClusterTask(cluster,
-            new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
-                @Override public void set(PreparedStatement stmt) throws SQLException {
-                    stmt.setInt(1, getClusterId(cluster));
-                    stmt.setString(2, cluster.getAlias());
-                }
-
-                @Override public PreparedStatement get() throws SQLException {
-                    return SQLManager.this.connection.prepareStatement(
-                        "INSERT INTO `" + SQLManager.this.prefix
-                            + "cluster_settings`(`cluster_id`, `alias`) VALUES(?, ?)");
-                }
-            });
-    }
-
-    @Override public void resizeCluster(final PlotCluster current, PlotId min, PlotId max) {
-        final PlotId pos1 = new PlotId(current.getP1().x, current.getP1().y);
-        final PlotId pos2 = new PlotId(current.getP2().x, current.getP2().y);
-        current.setP1(min);
-        current.setP2(max);
-
-        addClusterTask(current, new UniqueStatement("resizeCluster") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, pos2.x);
-                stmt.setInt(4, pos2.y);
-                stmt.setInt(5, getClusterId(current));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster` SET `pos1_x` = ?, `pos1_z` = ?, `pos2_x` = ?, `pos2_z` = ?  WHERE `id` = ?");
-            }
-        });
-    }
-
-    @Override public void setPosition(final PlotCluster cluster, final String position) {
-        addClusterTask(cluster, new UniqueStatement("setPosition") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position);
-                stmt.setInt(2, getClusterId(cluster));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster_settings` SET `position` = ?  WHERE `cluster_id` = ?");
-            }
-        });
-    }
-
-    @Override public void removeInvited(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("removeInvited") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "DELETE FROM `" + SQLManager.this.prefix
-                        + "cluster_invited` WHERE `cluster_id` = ? AND `user_uuid` = ?");
-            }
-        });
-    }
-
-    @Override public void setInvited(final PlotCluster cluster, final UUID uuid) {
-        addClusterTask(cluster, new UniqueStatement("setInvited") {
-            @Override public void set(PreparedStatement statement) throws SQLException {
-                statement.setInt(1, getClusterId(cluster));
-                statement.setString(2, uuid.toString());
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "INSERT INTO `" + SQLManager.this.prefix
-                        + "cluster_invited` (`cluster_id`, `user_uuid`) VALUES(?,?)");
-            }
-        });
-    }
-
-    @Override public boolean deleteTables() {
-        try (Statement stmt = this.connection.createStatement();
-            PreparedStatement statement = this.connection
-                .prepareStatement("DROP TABLE `" + this.prefix + "plot`")) {
-            close();
-            this.closed = false;
-            SQLManager.this.connection = this.database.forceConnection();
-            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_invited`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster_helpers`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "cluster`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_rating`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_settings`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_comments`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_trusted`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_helpers`");
-            stmt.addBatch("DROP TABLE `" + this.prefix + "plot_denied`");
-            stmt.executeBatch();
-            stmt.clearBatch();
-            statement.executeUpdate();
-        } catch (ClassNotFoundException | SQLException e) {
-            e.printStackTrace();
-
-        }
-        return true;
-    }
-
-    @Override public void validateAllPlots(Set<Plot> toValidate) {
-        if (!isValid()) {
-            reconnect();
-        }
-        PlotSquared.debug(
-            "$1All DB transactions during this session are being validated (This may take a while if corrections need to be made)");
-        commit();
-        while (true) {
-            if (!sendBatch()) {
-                break;
-            }
-        }
-        try {
-            if (this.connection.getAutoCommit()) {
-                this.connection.setAutoCommit(false);
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-        HashMap<String, HashMap<PlotId, Plot>> database = getPlots();
-        ArrayList<Plot> toCreate = new ArrayList<>();
-        for (Plot plot : toValidate) {
-            if (plot.temp == -1) {
-                continue;
-            }
-            HashMap<PlotId, Plot> worldPlots = database.get(plot.getArea().toString());
-            if (worldPlots == null) {
-                PlotSquared.debug("&8 - &7Creating plot (1): " + plot);
-                toCreate.add(plot);
-                continue;
-            }
-            Plot dataPlot = worldPlots.remove(plot.getId());
-            if (dataPlot == null) {
-                PlotSquared.debug("&8 - &7Creating plot (2): " + plot);
-                toCreate.add(plot);
-                continue;
-            }
-            // owner
-            if (!plot.owner.equals(dataPlot.owner)) {
-                PlotSquared
-                    .debug("&8 - &7Setting owner: " + plot + " -> " + MainUtil.getName(plot.owner));
-                setOwner(plot, plot.owner);
-            }
-            // trusted
-            if (!plot.getTrusted().equals(dataPlot.getTrusted())) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getTrusted().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getTrusted().clone();
-                toRemove.removeAll(plot.getTrusted());
-                toAdd.removeAll(dataPlot.getTrusted());
-                PlotSquared.debug(
-                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " trusted for: "
-                        + plot);
-                if (!toRemove.isEmpty()) {
-                    for (UUID uuid : toRemove) {
-                        removeTrusted(plot, uuid);
-                    }
-                }
-                if (!toAdd.isEmpty()) {
-                    for (UUID uuid : toAdd) {
-                        setTrusted(plot, uuid);
-                    }
-                }
-            }
-            if (!plot.getMembers().equals(dataPlot.getMembers())) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getMembers().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getMembers().clone();
-                toRemove.removeAll(plot.getMembers());
-                toAdd.removeAll(dataPlot.getMembers());
-                PlotSquared.debug(
-                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " members for: "
-                        + plot);
-                if (!toRemove.isEmpty()) {
-                    for (UUID uuid : toRemove) {
-                        removeMember(plot, uuid);
-                    }
-                }
-                if (!toAdd.isEmpty()) {
-                    for (UUID uuid : toAdd) {
-                        setMember(plot, uuid);
-                    }
-                }
-            }
-            if (!plot.getDenied().equals(dataPlot.getDenied())) {
-                HashSet<UUID> toAdd = (HashSet<UUID>) plot.getDenied().clone();
-                HashSet<UUID> toRemove = (HashSet<UUID>) dataPlot.getDenied().clone();
-                toRemove.removeAll(plot.getDenied());
-                toAdd.removeAll(dataPlot.getDenied());
-                PlotSquared.debug(
-                    "&8 - &7Correcting " + (toAdd.size() + toRemove.size()) + " denied for: "
-                        + plot);
-                if (!toRemove.isEmpty()) {
-                    for (UUID uuid : toRemove) {
-                        removeDenied(plot, uuid);
-                    }
-                }
-                if (!toAdd.isEmpty()) {
-                    for (UUID uuid : toAdd) {
-                        setDenied(plot, uuid);
-                    }
-                }
-            }
-            boolean[] pm = plot.getMerged();
-            boolean[] dm = dataPlot.getMerged();
-            if (pm[0] != dm[0] || pm[1] != dm[1]) {
-                PlotSquared.debug("&8 - &7Correcting merge for: " + plot);
-                setMerged(dataPlot, plot.getMerged());
-            }
-            HashMap<Flag<?>, Object> pf = plot.getFlags();
-            HashMap<Flag<?>, Object> df = dataPlot.getFlags();
-            if (!pf.isEmpty() && !df.isEmpty()) {
-                if (pf.size() != df.size() || !StringMan
-                    .isEqual(StringMan.joinOrdered(pf.values(), ","),
-                        StringMan.joinOrdered(df.values(), ","))) {
-                    PlotSquared.debug("&8 - &7Correcting flags for: " + plot);
-                    setFlags(plot, pf);
-                }
-            }
-        }
-
-        for (Entry<String, HashMap<PlotId, Plot>> entry : database.entrySet()) {
-            HashMap<PlotId, Plot> map = entry.getValue();
-            if (!map.isEmpty()) {
-                for (Entry<PlotId, Plot> entry2 : map.entrySet()) {
-                    PlotSquared.debug("$1Plot was deleted: " + entry2.getValue().toString()
-                        + "// TODO implement this when sure safe");
-                }
-            }
-        }
-        commit();
-    }
-
-    @Override
-    public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
-        final PlotId max) {
-        addGlobalTask(() -> {
-            if (min == null) {
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `world` = ? WHERE `world` = ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster` SET `world` = ? WHERE `world` = ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            } else {
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.setInt(3, min.x);
-                    stmt.setInt(4, max.x);
-                    stmt.setInt(5, min.y);
-                    stmt.setInt(6, max.y);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.setInt(3, max.x);
-                    stmt.setInt(4, max.y);
-                    stmt.setInt(5, min.x);
-                    stmt.setInt(6, min.y);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            }
-        });
-    }
-
-    @Override public void replaceUUID(final UUID old, final UUID now) {
-        addGlobalTask(() -> {
-            try (Statement stmt = SQLManager.this.connection.createStatement()) {
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
-                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now.toString()
-                        + "' WHERE `owner` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '" + now
-                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '" + now
-                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '" + now
-                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-    @Override public void close() {
-        try {
-            this.closed = true;
-            this.connection.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public abstract class UniqueStatement {
-
-        public final String method;
-
-        public UniqueStatement(String method) {
-            this.method = method;
-        }
-
-        public void addBatch(PreparedStatement statement) throws SQLException {
-            statement.addBatch();
-        }
-
-        public void execute(PreparedStatement statement) throws SQLException {
-            statement.executeBatch();
-        }
-
-        public abstract PreparedStatement get() throws SQLException;
-
-        public abstract void set(PreparedStatement stmt) throws SQLException;
-    }
-
-
-    private class UUIDPair {
-
-        public final int id;
-        public final UUID uuid;
-
-        public UUIDPair(int id, UUID uuid) {
-            this.id = id;
-            this.uuid = uuid;
-        }
-    }
-
-
-    private class SettingsPair {
-
-        public final int id;
-        public final PlotSettings settings;
-
-        public SettingsPair(int id, PlotSettings settings) {
-            this.id = id;
-            this.settings = settings;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
deleted file mode 100644
index d42b1d67b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.*;
-
-/**
- * Connects to and uses a SQLite database.
- */
-public class SQLite implements Database {
-
-    private final String dbLocation;
-    private Connection connection;
-
-    /**
-     * Creates a new SQLite instance
-     *
-     * @param dbLocation Location of the Database (Must end in .db)
-     */
-    public SQLite(File dbLocation) {
-        this.dbLocation = dbLocation.getAbsolutePath();
-    }
-
-    @Override public Connection openConnection() throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            return this.connection;
-        }
-        if (!PlotSquared.get().IMP.getDirectory().exists()) {
-            PlotSquared.get().IMP.getDirectory().mkdirs();
-        }
-        File file = new File(this.dbLocation);
-        if (!file.exists()) {
-            try {
-                file.createNewFile();
-            } catch (IOException ignored) {
-                PlotSquared.debug("&cUnable to create database!");
-            }
-        }
-        Class.forName("org.sqlite.JDBC");
-        this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation);
-        return this.connection;
-    }
-
-    @Override public boolean checkConnection() throws SQLException {
-        return (this.connection != null) && !this.connection.isClosed();
-    }
-
-    @Override public Connection getConnection() {
-        return this.connection;
-    }
-
-    @Override public boolean closeConnection() throws SQLException {
-        if (this.connection == null) {
-            return false;
-        }
-        this.connection.close();
-        this.connection = null;
-        return true;
-    }
-
-    @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            openConnection();
-        }
-        try (Statement statement = this.connection.createStatement()) {
-            return statement.executeQuery(query);
-        }
-    }
-
-    @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException {
-        if (checkConnection()) {
-            openConnection();
-        }
-        try (Statement statement = this.connection.createStatement()) {
-            return statement.executeUpdate(query);
-        }
-    }
-
-    @Override public Connection forceConnection() throws SQLException, ClassNotFoundException {
-        Class.forName("org.sqlite.JDBC");
-        this.connection = DriverManager.getConnection("jdbc:sqlite:" + this.dbLocation);
-        return this.connection;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
deleted file mode 100644
index 2f3b5217f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-
-public abstract class StmtMod<T> {
-
-    public abstract String getCreateMySQL(int size);
-
-    public String getCreateMySQL(int size, String query, int params) {
-        StringBuilder statement = new StringBuilder(query);
-        for (int i = 0; i < size - 1; i++) {
-            statement.append('(').append(StringMan.repeat(",?", params).substring(1)).append("),");
-        }
-        statement.append('(').append(StringMan.repeat(",?", params).substring(1)).append(')');
-        return statement.toString();
-    }
-
-    public String getCreateSQLite(int size, String query, int params) {
-        StringBuilder statement = new StringBuilder(query);
-        String modParams = StringMan.repeat(",?", params).substring(1);
-        for (int i = 0; i < size - 1; i++) {
-            statement.append("UNION SELECT ").append(modParams).append(' ');
-        }
-        return statement.toString();
-    }
-
-    public abstract String getCreateSQLite(int size);
-
-    public abstract String getCreateSQL();
-
-    public abstract void setMySQL(PreparedStatement stmt, int i, T obj) throws SQLException;
-
-    public abstract void setSQLite(PreparedStatement stmt, int i, T obj) throws SQLException;
-
-    public abstract void setSQL(PreparedStatement stmt, T obj) throws SQLException;
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
deleted file mode 100644
index a492c9c0f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/BooleanFlag.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-
-public class BooleanFlag extends Flag<Boolean> {
-
-    public BooleanFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return value + "";
-    }
-
-    @Override public Boolean parseValue(String value) {
-        switch (value.toLowerCase()) {
-            case "1":
-            case "yes":
-            case "allow":
-            case "true":
-                return true;
-            case "0":
-            case "no":
-            case "deny":
-            case "false":
-                return false;
-            default:
-                return null;
-        }
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a boolean (true|false)";
-    }
-
-    public boolean isTrue(Plot plot) {
-        Boolean value = FlagManager.getPlotFlagRaw(plot, this);
-        return Boolean.TRUE == value;
-    }
-
-    public boolean isFalse(Plot plot) {
-        Boolean value = FlagManager.getPlotFlagRaw(plot, this);
-        return Boolean.FALSE == value;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
deleted file mode 100644
index 9b46a2cde..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/DoubleFlag.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-public class DoubleFlag extends Flag<Double> {
-
-    public DoubleFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return value.toString();
-    }
-
-    @Override public Double parseValue(String value) {
-        try {
-            return Double.parseDouble(value);
-        } catch (NumberFormatException ignored) {
-            return null;
-        }
-
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a number.";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
deleted file mode 100644
index 3ba6b2457..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/EnumFlag.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.Arrays;
-import java.util.HashSet;
-
-public class EnumFlag extends Flag<String> {
-    private final HashSet<String> values;
-
-    public EnumFlag(String name, String... values) {
-        super(name);
-        this.values = new HashSet<>(Arrays.asList(values));
-    }
-
-    @Override public String valueToString(Object value) {
-        return value.toString();
-    }
-
-    @Override public String parseValue(String value) {
-        value = value.toLowerCase();
-        if (values.contains(value)) {
-            return value;
-        }
-        return null;
-    }
-
-    @Override public String getValueDescription() {
-        return "Must be one of: " + StringMan.getString(values);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
deleted file mode 100644
index 3b247d87a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flag.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
-
-public abstract class Flag<V> implements StringComparison.StringComparable {
-
-    private final String name;
-    private boolean reserved = false;
-
-    /**
-     * Flag object used to store basic information for a Plot. Flags are a
-     * key/value pair. For a flag to be usable by a player, you need to
-     * register it with PlotSquared.
-     *
-     * @param name the flag name
-     */
-    public Flag(String name) {
-        this.name = name;
-    }
-
-    public Flag<V> reserve() {
-        this.reserved = true;
-        return this;
-    }
-
-    public boolean isReserved() {
-        return this.reserved;
-    }
-
-    public void unreserve() {
-        this.reserved = false;
-    }
-
-    public void register() {
-        Flags.registerFlag(this);
-    }
-
-    public abstract String valueToString(Object value);
-
-    @Override public final String toString() {
-        return "Flag { name='" + getName() + "'}";
-    }
-
-    public abstract V parseValue(String value);
-
-    public abstract String getValueDescription();
-
-    public final String getName() {
-        return this.name;
-    }
-
-    public boolean isSet(Plot plot) {
-        return FlagManager.getPlotFlagRaw(plot, this) != null;
-    }
-
-    @Override public String getComparableString() {
-        return getName();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
deleted file mode 100644
index 1bac3e526..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.google.common.collect.ImmutableSet;
-
-import java.util.*;
-
-/**
- * Flag Manager Utility.
- */
-public class FlagManager {
-
-    public static <V> Optional<V> getPlotFlag(Plot plot, Flag<V> key) {
-        V value = FlagManager.getPlotFlagRaw(plot, key);
-        return Optional.ofNullable(value);
-    }
-
-    /**
-     * Reserve a flag so that it cannot be set by players.
-     *
-     * @param flag the flag to reserve
-     * @return false if the flag was already reserved, otherwise true
-     */
-    public static boolean reserveFlag(Flag<?> flag) {
-        if (flag.isReserved()) {
-            return false;
-        }
-        flag.reserve();
-        return true;
-    }
-
-    /**
-     * Check if a flag is reserved.
-     *
-     * @param flag the flag to check
-     * @return true if the flag is reserved, false otherwise
-     */
-    public static boolean isReserved(Flag<?> flag) {
-        return flag.isReserved();
-    }
-
-    /**
-     * Get an immutable set of reserved flags.
-     *
-     * @return a set of reserved flags
-     */
-    public static Set<Flag<?>> getReservedFlags() {
-        ImmutableSet.Builder<Flag<?>> reserved = ImmutableSet.builder();
-        for (Flag flag : Flags.getFlags()) {
-            if (flag.isReserved()) {
-                reserved.add(flag);
-            }
-        }
-        return reserved.build();
-    }
-
-    /**
-     * Unreserve a flag.
-     *
-     * @param flag the flag to unreserve
-     * @return true if the flag was unreserved
-     */
-    public static boolean unreserveFlag(Flag<?> flag) {
-        if (flag.isReserved()) {
-            flag.unreserve();
-            return true;
-        }
-        return false;
-    }
-
-    public static String toString(HashMap<Flag<?>, Object> flags) {
-        StringBuilder flag_string = new StringBuilder();
-        int i = 0;
-        for (Map.Entry<Flag<?>, Object> entry : flags.entrySet()) {
-            try {
-                Flag flag = entry.getKey();
-                if (i != 0) {
-                    flag_string.append(',');
-                }
-                flag_string.append(
-                    flag.getName() + ':' + flag.valueToString(entry.getValue()).replaceAll(":", "¯")
-                        .replaceAll(",", "´"));
-                i++;
-            } catch (Exception e) {
-                PlotSquared
-                    .debug("Failed to parse flag: " + entry.getKey() + "->" + entry.getValue());
-                e.printStackTrace();
-            }
-        }
-        return flag_string.toString();
-    }
-
-    public static <V> V getSettingFlag(PlotArea area, PlotSettings settings, Flag<V> id) {
-        Object value;
-        if (settings.flags.isEmpty() || ((value = settings.flags.get(id)) == null)) {
-            if (area == null || area.DEFAULT_FLAGS.isEmpty()) {
-                return null;
-            }
-            return (V) area.DEFAULT_FLAGS.get(id);
-        }
-        return (V) value;
-    }
-
-    /**
-     * Returns the raw flag<br>
-     * - Faster
-     * - You should not modify the flag
-     *
-     * @param plot
-     * @param flag
-     * @return
-     */
-    @SuppressWarnings("deprecation") public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
-        if (plot.owner == null) {
-            return null;
-        }
-        return getSettingFlag(plot.getArea(), plot.getSettings(), flag);
-    }
-
-    /**
-     * Add a flag to a plot.
-     *
-     * @param origin
-     * @param flag
-     * @param value
-     */
-    public static <V> boolean addPlotFlag(Plot origin, Flag<V> flag, Object value) {
-        boolean result = EventUtil.manager.callFlagAdd(flag, origin);
-        if (!result) {
-            return false;
-        }
-        for (Plot plot : origin.getConnectedPlots()) {
-            plot.getFlags().put(flag, value);
-            plot.reEnter(); //TODO fix this so FlagTest will run during compile
-            DBFunc.setFlags(plot, plot.getFlags());
-        }
-        return true;
-    }
-
-    /**
-     * Returns a map of the {@link Flag}s and their values for the specified plot.
-     *
-     * @param plot the plot
-     * @return a map of the flags and values for the plot, returns an empty map for unowned plots
-     */
-    public static Map<Flag<?>, Object> getPlotFlags(Plot plot) {
-        if (!plot.hasOwner()) {
-            return Collections.emptyMap();
-        }
-        return getSettingFlags(plot.getArea(), plot.getSettings());
-    }
-
-    public static HashMap<Flag<?>, Object> getPlotFlags(PlotArea area, PlotSettings settings,
-        boolean ignorePluginflags) {
-        HashMap<Flag<?>, Object> flags = null;
-        if (area != null && !area.DEFAULT_FLAGS.isEmpty()) {
-            flags = new HashMap<>(area.DEFAULT_FLAGS.size());
-            flags.putAll(area.DEFAULT_FLAGS);
-        }
-        if (ignorePluginflags) {
-            if (flags == null) {
-                flags = new HashMap<>(settings.flags.size());
-            }
-            for (Map.Entry<Flag<?>, Object> flag : settings.flags.entrySet()) {
-                if (flag.getKey().isReserved()) {
-                    continue;
-                }
-                flags.put(flag.getKey(), flag.getValue());
-            }
-            return flags;
-        } else if (flags == null) {
-            return settings.flags;
-        } else {
-            flags.putAll(settings.flags);
-        }
-        return flags;
-    }
-
-    public static Map<Flag<?>, Object> getSettingFlags(PlotArea area, PlotSettings settings) {
-        return getPlotFlags(area, settings, false);
-    }
-
-    /**
-     * Removes a flag from a certain plot.
-     *
-     * @param origin the plot to remove the flag from
-     * @param id     the flag to remove
-     * @return true if the plot contained the flag and was removed successfully
-     */
-    public static boolean removePlotFlag(Plot origin, Flag<?> id) {
-        for (Plot plot : origin.getConnectedPlots()) {
-            Object value = plot.getFlags().remove(id);
-            if (value == null) {
-                return false;
-            }
-            if (plot == origin) {
-                boolean result = EventUtil.manager.callFlagRemove(id, plot, value);
-                if (!result) {
-                    plot.getFlags().put(id, value);
-                    return false;
-                }
-            }
-            plot.reEnter();
-            DBFunc.setFlags(plot, plot.getFlags());
-        }
-        return true;
-    }
-
-    public static void setPlotFlags(Plot origin, HashMap<Flag<?>, Object> flags) {
-        for (Plot plot : origin.getConnectedPlots()) {
-            if (flags != null && !flags.isEmpty()) {
-                plot.getFlags().clear();
-                for (Map.Entry<Flag<?>, Object> flag : flags.entrySet()) {
-                    plot.getFlags().put(flag.getKey(), flag.getValue());
-                }
-            } else if (plot.getFlags().isEmpty()) {
-                return;
-            } else {
-                plot.getFlags().clear();
-            }
-            plot.reEnter();
-            DBFunc.setFlags(plot, plot.getFlags());
-        }
-    }
-
-    /**
-     * Get a list of registered {@link Flag} objects based on player permissions.
-     *
-     * @param player the player
-     * @return a list of flags the specified player can use
-     */
-    public static List<Flag> getFlags(PlotPlayer player) {
-        List<Flag> returnFlags = new ArrayList<>();
-        for (Flag flag : Flags.getFlags()) {
-            if (Permissions
-                .hasPermission(player, "plots.set.flag." + flag.getName().toLowerCase())) {
-                returnFlags.add(flag);
-            }
-        }
-        return returnFlags;
-    }
-
-    /**
-     * Get a {@link Flag} specified by the specified {@code String}.
-     *
-     * @param string the flag name
-     * @return the {@code Flag} object defined by the {@code String}
-     */
-    public static Flag<?> getFlag(String string) {
-        return Flags.getFlag(string);
-    }
-
-    public static Flag<?> getFlag(String string, boolean ignoreReserved) {
-        Flag<?> flag = Flags.getFlag(string);
-        if (!ignoreReserved && flag != null && flag.isReserved()) {
-            return null;
-        }
-        return flag;
-    }
-
-    public static Flag<?> getOrCreateFlag(String string) {
-        Flag<?> flag = Flags.getFlag(string);
-        if (flag == null) {
-            flag = new StringFlag(string) {
-                @Override public String getValueDescription() {
-                    return "Generic Filler Flag";
-                }
-            };
-            flag.register();
-        }
-        return flag;
-    }
-
-
-    public static Map<Flag<?>, Object> parseFlags(List<String> flagStrings) {
-        HashMap<Flag<?>, Object> map = new HashMap<>();
-
-        for (String key : flagStrings) {
-            String[] split;
-            if (key.contains(";")) {
-                split = key.split(";");
-            } else {
-                split = key.split(":");
-            }
-            Flag<?> flag = getOrCreateFlag(split[0]);
-            Object value = flag.parseValue(split[1]);
-            map.put(flag, value);
-        }
-
-        return map;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
deleted file mode 100644
index 6b86a890a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-
-public final class Flags {
-
-    public static final StringFlag MUSIC = new StringFlag("music");
-    public static final StringFlag DESCRIPTION = new StringFlag("description");
-    public static final IntegerListFlag ANALYSIS =
-        (IntegerListFlag) new IntegerListFlag("analysis").reserve();
-    public static final StringFlag GREETING = new StringFlag("greeting");
-    public static final StringFlag FAREWELL = new StringFlag("farewell");
-    public static final IntervalFlag FEED = new IntervalFlag("feed");
-    public static final IntervalFlag HEAL = new IntervalFlag("heal");
-    public static final GameModeFlag GAMEMODE = new GameModeFlag("gamemode");
-    public static final GameModeFlag GUEST_GAMEMODE = new GameModeFlag("guest-gamemode");
-    public static final StringFlag DONE = (StringFlag) new StringFlag("done").reserve();
-    public static final BooleanFlag REDSTONE = new BooleanFlag("redstone");
-    public static final BooleanFlag FLY = new BooleanFlag("fly");
-    public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave");
-    public static final BooleanFlag TITLES = new BooleanFlag("titles");
-    public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter");
-    public static final LongFlag TIME = new LongFlag("time");
-    public static final PlotWeatherFlag WEATHER = new PlotWeatherFlag("weather");
-    public static final DoubleFlag PRICE = new DoubleFlag("price") {
-        @Override public Double parseValue(String input) {
-            Double value = super.parseValue(input);
-            return value != null && value > 0 ? value : null;
-        }
-
-        @Override public String getValueDescription() {
-            return "Flag value must be a positive number.";
-        }
-    };
-    public static final BooleanFlag EXPLOSION = new BooleanFlag("explosion");
-    public static final BooleanFlag GRASS_GROW = new BooleanFlag("grass-grow");
-    public static final BooleanFlag VINE_GROW = new BooleanFlag("vine-grow");
-    public static final BooleanFlag MYCEL_GROW = new BooleanFlag("mycel-grow");
-    public static final BooleanFlag DISABLE_PHYSICS = new BooleanFlag("disable-physics");
-    public static final BooleanFlag LIQUID_FLOW = new BooleanFlag("liquid-flow");
-    public static final BooleanFlag SNOW_MELT = new BooleanFlag("snow-melt");
-    public static final BooleanFlag SNOW_FORM = new BooleanFlag("snow-form");
-    public static final BooleanFlag ICE_MELT = new BooleanFlag("ice-melt");
-    public static final BooleanFlag FIRE_SPREAD = new BooleanFlag("fire-spread");
-    public static final BooleanFlag BLOCK_BURN = new BooleanFlag("block-burn");
-    public static final BooleanFlag ICE_FORM = new BooleanFlag("ice-form");
-    public static final BooleanFlag BLOCK_IGNITION = new BooleanFlag("block-ignition");
-    public static final BooleanFlag SOIL_DRY = new BooleanFlag("soil-dry");
-    public static final StringListFlag BLOCKED_CMDS = new StringListFlag("blocked-cmds");
-    public static final PlotBlockListFlag USE = new PlotBlockListFlag("use");
-    public static final PlotBlockListFlag BREAK = new PlotBlockListFlag("break");
-    public static final PlotBlockListFlag PLACE = new PlotBlockListFlag("place");
-    public static final BooleanFlag DEVICE_INTERACT = new BooleanFlag("device-interact");
-    public static final BooleanFlag VEHICLE_BREAK = new BooleanFlag("vehicle-break");
-    public static final BooleanFlag VEHICLE_PLACE = new BooleanFlag("vehicle-place");
-    public static final BooleanFlag VEHICLE_USE = new BooleanFlag("vehicle-use");
-    public static final BooleanFlag HANGING_BREAK = new BooleanFlag("hanging-break");
-    public static final BooleanFlag HANGING_PLACE = new BooleanFlag("hanging-place");
-    public static final BooleanFlag HANGING_INTERACT = new BooleanFlag("hanging-interact");
-    public static final BooleanFlag MISC_PLACE = new BooleanFlag("misc-place");
-    public static final BooleanFlag MISC_BREAK = new BooleanFlag("misc-break");
-    public static final BooleanFlag MISC_INTERACT = new BooleanFlag("misc-interact");
-    public static final BooleanFlag VILLAGER_INTERACT = new BooleanFlag("villager-interact");
-    public static final BooleanFlag PLAYER_INTERACT = new BooleanFlag("player-interact");
-    public static final BooleanFlag TAMED_ATTACK = new BooleanFlag("tamed-attack");
-    public static final BooleanFlag TAMED_INTERACT = new BooleanFlag("tamed-interact");
-    public static final BooleanFlag ANIMAL_ATTACK = new BooleanFlag("animal-attack");
-    public static final BooleanFlag ANIMAL_INTERACT = new BooleanFlag("animal-interact");
-    public static final BooleanFlag HOSTILE_ATTACK = new BooleanFlag("hostile-attack");
-    public static final BooleanFlag HOSTILE_INTERACT = new BooleanFlag("hostile-interact");
-    public static final BooleanFlag MOB_PLACE = new BooleanFlag("mob-place");
-    public static final BooleanFlag MOB_BREAK = new BooleanFlag("mob-break");
-    public static final BooleanFlag FORCEFIELD = new BooleanFlag("forcefield");
-    public static final BooleanFlag INVINCIBLE = new BooleanFlag("invincible");
-    public static final BooleanFlag ITEM_DROP = new BooleanFlag("item-drop");
-    public static final BooleanFlag INSTABREAK = new BooleanFlag("instabreak");
-    public static final BooleanFlag DROP_PROTECTION = new BooleanFlag("drop-protection");
-    public static final BooleanFlag PVP = new BooleanFlag("pvp");
-    public static final BooleanFlag PVE = new BooleanFlag("pve");
-    public static final BooleanFlag NO_WORLDEDIT = new BooleanFlag("no-worldedit");
-    public static final IntegerFlag MISC_CAP = new IntegerFlag("misc-cap");
-    public static final IntegerFlag ENTITY_CAP = new IntegerFlag("entity-cap");
-    public static final IntegerFlag MOB_CAP = new IntegerFlag("mob-cap");
-    public static final IntegerFlag ANIMAL_CAP = new IntegerFlag("animal-cap");
-    public static final IntegerFlag HOSTILE_CAP = new IntegerFlag("hostile-cap");
-    public static final IntegerFlag VEHICLE_CAP = new IntegerFlag("vehicle-cap");
-    public static final Flag<?> KEEP = new Flag("keep") {
-        @Override public String valueToString(Object value) {
-            return value.toString();
-        }
-
-        @Override public Object parseValue(String value) {
-            if (MathMan.isInteger(value)) {
-                return Long.parseLong(value);
-            }
-            switch (value.toLowerCase()) {
-                case "true":
-                    return true;
-                case "false":
-                    return false;
-                default:
-                    return MainUtil.timeToSec(value) * 1000 + System.currentTimeMillis();
-            }
-        }
-
-        @Override public String getValueDescription() {
-            return "Flag value must a timestamp or a boolean";
-        }
-    };
-    public static final BooleanFlag SLEEP = new BooleanFlag("sleep");
-    public static final TeleportDenyFlag DENY_TELEPORT = new TeleportDenyFlag("deny-teleport");
-    public static final BooleanFlag DENY_EXIT = new BooleanFlag("deny-exit");
-
-
-    private static final HashMap<String, Flag<?>> flags;
-
-    static {
-        flags = new HashMap<>();
-        try {
-            for (Field field : Flags.class.getFields()) {
-                String fieldName = field.getName().replace("_", "-").toLowerCase();
-                Object fieldValue = field.get(null);
-                if (!(fieldValue instanceof Flag)) {
-                    continue;
-                }
-                Flag flag = (Flag) fieldValue;
-                if (!flag.getName().equals(fieldName)) {
-                    PlotSquared.debug(
-                        Flags.class + "Field doesn't match: " + fieldName + " != " + flag
-                            .getName());
-                }
-                flags.put(flag.getName(), flag);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Get an immutable collection of registered flags.
-     *
-     * @return a collection of registered flags.
-     */
-    public static Collection<Flag<?>> getFlags() {
-        return Collections.unmodifiableCollection(flags.values());
-    }
-
-    public static Flag<?> getFlag(String flag) {
-        return flags.get(flag);
-    }
-
-    public static void registerFlag(final Flag<?> flag) {
-        final Flag<?> duplicate = flags.put(flag.getName(), flag);
-        if (duplicate != null) {
-            PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-                @Override public void run(PlotArea value) {
-                    Object remove;
-                    if (value.DEFAULT_FLAGS.containsKey(duplicate)) {
-                        remove = value.DEFAULT_FLAGS.remove(duplicate);
-                        try {
-                            if (remove instanceof Collection
-                                && remove.getClass().getMethod("toString").getDeclaringClass()
-                                == Object.class) {
-                                value.DEFAULT_FLAGS.put(flag,
-                                    flag.parseValue(StringMan.join((Collection) remove, ',')));
-                            } else {
-                                value.DEFAULT_FLAGS.put(flag, flag.parseValue("" + remove));
-                            }
-                        } catch (NoSuchMethodException neverHappens) {
-                            neverHappens.printStackTrace();
-                        }
-                    }
-                }
-            });
-            PlotSquared.get().foreachPlotRaw(new RunnableVal<Plot>() {
-                @Override public void run(Plot value) {
-                    if (value.getFlags().containsKey(duplicate)) {
-                        Object remove = value.getFlags().remove(duplicate);
-                        try {
-                            if (remove instanceof Collection
-                                && remove.getClass().getMethod("toString").getDeclaringClass()
-                                == Object.class) {
-                                value.getFlags().put(flag,
-                                    flag.parseValue(StringMan.join((Collection) remove, ',')));
-                            } else {
-                                value.getFlags().put(flag, flag.parseValue("" + remove));
-                            }
-                        } catch (NoSuchMethodException neverHappens) {
-                            neverHappens.printStackTrace();
-                        }
-                    }
-                }
-            });
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
deleted file mode 100644
index 3467171f2..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
-
-public class GameModeFlag extends Flag<PlotGameMode> {
-
-    public GameModeFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return ((PlotGameMode) value).getName();
-    }
-
-    @Override public PlotGameMode parseValue(String value) {
-        switch (value.toLowerCase()) {
-            case "survival":
-            case "s":
-            case "0":
-                return PlotGameMode.SURVIVAL;
-            case "creative":
-            case "c":
-            case "1":
-                return PlotGameMode.CREATIVE;
-            case "adventure":
-            case "a":
-            case "2":
-                return PlotGameMode.ADVENTURE;
-            case "spectator":
-            case "3":
-                return PlotGameMode.SPECTATOR;
-            default:
-                return PlotGameMode.NOT_SET;
-        }
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a gamemode: 'survival', 'creative', 'adventure' or 'spectator'";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
deleted file mode 100644
index 2cafed4d1..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerFlag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-
-public class IntegerFlag extends Flag<Integer> {
-
-    public IntegerFlag(String name) {
-        super(name);
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a whole number";
-    }
-
-    @Override public String valueToString(Object value) {
-        return value.toString();
-    }
-
-    @Override public Integer parseValue(String value) {
-        try {
-            return Integer.parseInt(value);
-        } catch (NumberFormatException ignored) {
-            return null;
-        }
-    }
-
-    public boolean isEqual(Plot plot, int value) {
-        Integer existing = FlagManager.getPlotFlagRaw(plot, this);
-        return existing != null && existing == value;
-    }
-
-    public boolean isMore(Plot plot, int value) {
-        Integer existing = FlagManager.getPlotFlagRaw(plot, this);
-        return existing != null && existing > value;
-    }
-
-    public boolean isLess(Plot plot, int value) {
-        Integer existing = FlagManager.getPlotFlagRaw(plot, this);
-        return existing != null && existing < value;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
deleted file mode 100644
index e46071b86..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntegerListFlag.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class IntegerListFlag extends ListFlag<List<Integer>> {
-
-    public IntegerListFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return StringMan.join((List<Integer>) value, ",");
-    }
-
-    @Override public List<Integer> parseValue(String value) {
-        String[] split = value.split(",");
-        ArrayList<Integer> numbers = new ArrayList<>();
-        for (String element : split) {
-            numbers.add(Integer.parseInt(element));
-        }
-        return numbers;
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be an integer list";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
deleted file mode 100644
index ab7100cb6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-public class IntervalFlag extends Flag<Integer[]> {
-
-    public IntervalFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        Integer[] value1 = (Integer[]) value;
-        return value1[0] + " " + value1[1];
-    }
-
-    @Override public Integer[] parseValue(String value) {
-        int seconds;
-        int amount;
-        String[] values = value.split(" ");
-        if (values.length < 2) {
-            seconds = 1;
-            try {
-                amount = Integer.parseInt(values[0]);
-            } catch (NumberFormatException ignored) {
-                return null;
-            }
-        } else if (values.length == 2) {
-            try {
-                amount = Integer.parseInt(values[0]);
-                seconds = Integer.parseInt(values[1]);
-            } catch (NumberFormatException ignored) {
-                return null;
-            }
-        } else {
-            return null;
-        }
-        return new Integer[] {amount, seconds};
-    }
-
-    @Override public String getValueDescription() {
-        return "Value(s) must be numeric. /plot set flag <flag> <interval> [amount]";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java
deleted file mode 100644
index 518c3df11..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/ListFlag.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-
-import java.util.Collection;
-
-public abstract class ListFlag<V extends Collection<?>> extends Flag<V> {
-
-    public ListFlag(String name) {
-        super(name);
-    }
-
-    public boolean contains(Plot plot, Object value) {
-        V existing = plot.getFlag(this, null);
-        return existing != null && existing.contains(value);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
deleted file mode 100644
index 464780af8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/LongFlag.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-public class LongFlag extends Flag<Long> {
-
-    public LongFlag(String name) {
-        super(name);
-    }
-
-    @Override public Long parseValue(String value) {
-        try {
-            return Long.parseLong(value);
-        } catch (IllegalArgumentException ignored) {
-            return null;
-        }
-    }
-
-    @Override public String valueToString(Object value) {
-        return value.toString();
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a whole number (large numbers allowed)";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
deleted file mode 100644
index 56cd0e901..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotBlockListFlag.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.HashSet;
-
-public class PlotBlockListFlag extends ListFlag<HashSet<PlotBlock>> {
-
-    public PlotBlockListFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return StringMan.join((HashSet<PlotBlock>) value, ",");
-    }
-
-    @Override public HashSet<PlotBlock> parseValue(final String value) {
-        final HashSet<PlotBlock> list = new HashSet<>();
-        for (final String item : value.split(",")) {
-            final PlotBlock block = PlotSquared.get().IMP.getLegacyMappings().fromAny(item);
-            if (block != null) {
-                list.add(block);
-            }
-        }
-        return list;
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a block list";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
deleted file mode 100644
index e6f93ee2d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/PlotWeatherFlag.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
-
-public class PlotWeatherFlag extends Flag<PlotWeather> {
-
-    public PlotWeatherFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return value.toString();
-    }
-
-    @Override public PlotWeather parseValue(String value) {
-        switch (value.toLowerCase()) {
-            case "rain":
-            case "storm":
-            case "on":
-            case "lightning":
-            case "thunder":
-                return PlotWeather.RAIN;
-            case "clear":
-            case "off":
-            case "sun":
-                return PlotWeather.CLEAR;
-            default:
-                return PlotWeather.RESET;
-        }
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag must be a weather: 'rain' or 'sun'";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
deleted file mode 100644
index 36a68f66b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringFlag.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-
-public class StringFlag extends Flag<String> {
-
-    public StringFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return value.toString();
-    }
-
-    @Override public String parseValue(String value) {
-        return value;
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be alphanumeric. Some special characters are allowed.";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
deleted file mode 100644
index 8f02a3801..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/StringListFlag.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class StringListFlag extends ListFlag<List<String>> {
-
-    public StringListFlag(String name) {
-        super(name);
-    }
-
-    @Override public String valueToString(Object value) {
-        return StringMan.join((List<String>) value, ",");
-    }
-
-    @Override public List<String> parseValue(String value) {
-        return new ArrayList<>(Arrays.asList(value.split(",")));
-    }
-
-    @Override public String getValueDescription() {
-        return "Flag value must be a string list";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
deleted file mode 100644
index b24f14faf..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.flag;
-
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-public class TeleportDenyFlag extends EnumFlag {
-    public TeleportDenyFlag(String name) {
-        super(name, "trusted", "members", "nonmembers", "nontrusted", "nonowners");
-    }
-
-    public boolean allowsTeleport(PlotPlayer player, Plot plot) {
-        String value = plot.getFlag(this, null);
-        if (value == null || !plot.hasOwner()) {
-            return true;
-        }
-        boolean result;
-        switch (plot.getFlag(this, null)) {
-            case "trusted":
-                result = !plot.getTrusted().contains(player.getUUID());
-                break;
-            case "members":
-                result = !plot.getMembers().contains(player.getUUID());
-                break;
-            case "nonmembers":
-                result = !plot.isAdded(player.getUUID());
-                break;
-            case "nontrusted":
-                result = !plot.getTrusted().contains(player.getUUID()) && !plot
-                    .isOwner(player.getUUID());
-                break;
-            case "nonowners":
-                result = !plot.isOwner(player.getUUID());
-                break;
-            default:
-                return true;
-        }
-        return result || player.hasPermission("plots.admin.entry.denied");
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
deleted file mode 100644
index 1d18cbdcd..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
-
-import java.util.Set;
-
-public class AugmentedUtils {
-
-    private static boolean enabled = true;
-
-    public static void bypass(boolean bypass, Runnable run) {
-        enabled = bypass;
-        run.run();
-        enabled = true;
-    }
-
-    public static boolean generate(final String world, final int cx, final int cz,
-        LocalBlockQueue queue) {
-        if (!enabled) {
-            return false;
-        }
-
-        final int bx = cx << 4;
-        final int bz = cz << 4;
-        RegionWrapper region = new RegionWrapper(bx, bx + 15, bz, bz + 15);
-        Set<PlotArea> areas = PlotSquared.get().getPlotAreas(world, region);
-        if (areas.isEmpty()) {
-            return false;
-        }
-        boolean toReturn = false;
-        for (final PlotArea area : areas) {
-            if (area.TYPE == 0) {
-                return false;
-            }
-            if (area.TERRAIN == 3) {
-                continue;
-            }
-            IndependentPlotGenerator generator = area.getGenerator();
-            if (generator == null) {
-                continue;
-            }
-            // Mask
-            if (queue == null) {
-                queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
-            }
-            LocalBlockQueue primaryMask;
-            // coords
-            int bxx;
-            int bzz;
-            int txx;
-            int tzz;
-            // gen
-            if (area.TYPE == 2) {
-                bxx = Math.max(0, area.getRegion().minX - bx);
-                bzz = Math.max(0, area.getRegion().minZ - bz);
-                txx = Math.min(15, area.getRegion().maxX - bx);
-                tzz = Math.min(15, area.getRegion().maxZ - bz);
-                primaryMask = new DelegateLocalBlockQueue(queue) {
-                    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-                        if (area.contains(x, z)) {
-                            return super.setBlock(x, y, z, id);
-                        }
-                        return false;
-                    }
-
-                    @Override public boolean setBiome(int x, int z, String biome) {
-                        if (area.contains(x, z)) {
-                            return super.setBiome(x, z, biome);
-                        }
-                        return false;
-                    }
-                };
-            } else {
-                bxx = bzz = 0;
-                txx = tzz = 15;
-                primaryMask = queue;
-            }
-            LocalBlockQueue secondaryMask;
-            PlotBlock air = StringPlotBlock.EVERYTHING;
-            if (area.TERRAIN == 2) {
-                PlotManager manager = area.getPlotManager();
-                final boolean[][] canPlace = new boolean[16][16];
-                boolean has = false;
-                for (int x = bxx; x <= txx; x++) {
-                    for (int z = bzz; z <= tzz; z++) {
-                        int rx = x + bx;
-                        int rz = z + bz;
-                        boolean can = manager.getPlotId(area, rx, 0, rz) == null;
-                        if (can) {
-                            for (int y = 1; y < 128; y++) {
-                                queue.setBlock(rx, y, rz, air);
-                            }
-                            canPlace[x][z] = can;
-                            has = true;
-                        }
-                    }
-                }
-                if (!has) {
-                    continue;
-                }
-                toReturn = true;
-                secondaryMask = new DelegateLocalBlockQueue(primaryMask) {
-                    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-                        if (canPlace[x - bx][z - bz]) {
-                            return super.setBlock(x, y, z, id);
-                        }
-                        return false;
-                    }
-
-                    @Override public boolean setBiome(int x, int y, String biome) {
-                        return super.setBiome(x, y, biome);
-                    }
-                };
-            } else {
-                secondaryMask = primaryMask;
-                for (int x = bxx; x <= txx; x++) {
-                    for (int z = bzz; z <= tzz; z++) {
-                        for (int y = 1; y < 128; y++) {
-                            queue.setBlock(bx + x, y, bz + z, air);
-                        }
-                    }
-                }
-                toReturn = true;
-            }
-            ScopedLocalBlockQueue scoped =
-                new ScopedLocalBlockQueue(secondaryMask, new Location(area.worldname, bx, 0, bz),
-                    new Location(area.worldname, bx + 15, 255, bz + 15));
-            generator.generateChunk(scoped, area);
-            generator.populateChunk(scoped, area);
-        }
-        if (queue != null) {
-            queue.flush();
-        }
-        return toReturn;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
deleted file mode 100644
index a553140b2..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ /dev/null
@@ -1,467 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-
-import java.util.List;
-
-/**
- * A plot manager with square plots which tessellate on a square grid with the following sections: ROAD, WALL, BORDER (wall), PLOT, FLOOR (plot).
- */
-public class ClassicPlotManager extends SquarePlotManager {
-
-    @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
-        BlockBucket blocks) {
-        switch (component) {
-            case "floor":
-                setFloor(plotArea, plotId, blocks);
-                return true;
-            case "wall":
-                setWallFilling(plotArea, plotId, blocks);
-                return true;
-            case "all":
-                setAll(plotArea, plotId, blocks);
-                return true;
-            case "air":
-                setAir(plotArea, plotId, blocks);
-                return true;
-            case "main":
-                setMain(plotArea, plotId, blocks);
-                return true;
-            case "middle":
-                setMiddle(plotArea, plotId, blocks);
-                return true;
-            case "outline":
-                setOutline(plotArea, plotId, blocks);
-                return true;
-            case "border":
-                setWall(plotArea, plotId, blocks);
-                return true;
-        }
-        return false;
-    }
-
-    @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        setWallFilling(dpw, plot.getId(), dpw.WALL_FILLING);
-        setWall(dpw, plot.getId(), dpw.WALL_BLOCK);
-        GlobalBlockQueue.IMP.addTask(whenDone);
-        return true;
-    }
-
-    public boolean setFloor(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        if (plot.isBasePlot()) {
-            ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-            for (RegionWrapper region : plot.getRegions()) {
-                Location pos1 =
-                    new Location(plotArea.worldname, region.minX, dpw.PLOT_HEIGHT, region.minZ);
-                Location pos2 =
-                    new Location(plotArea.worldname, region.maxX, dpw.PLOT_HEIGHT, region.maxZ);
-                queue.setCuboid(pos1, pos2, blocks);
-            }
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setAll(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
-        if (!plot.isBasePlot()) {
-            return false;
-        }
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
-        for (RegionWrapper region : plot.getRegions()) {
-            Location pos1 = new Location(plotArea.worldname, region.minX, 1, region.minZ);
-            Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
-            queue.setCuboid(pos1, pos2, blocks);
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setAir(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
-        if (!plot.isBasePlot()) {
-            return false;
-        }
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
-        for (RegionWrapper region : plot.getRegions()) {
-            Location pos1 =
-                new Location(plotArea.worldname, region.minX, dpw.PLOT_HEIGHT + 1, region.minZ);
-            Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
-            queue.setCuboid(pos1, pos2, blocks);
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setMain(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
-        if (!plot.isBasePlot()) {
-            return false;
-        }
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        for (RegionWrapper region : plot.getRegions()) {
-            Location pos1 = new Location(plotArea.worldname, region.minX, 1, region.minZ);
-            Location pos2 =
-                new Location(plotArea.worldname, region.maxX, dpw.PLOT_HEIGHT - 1, region.maxZ);
-            queue.setCuboid(pos1, pos2, blocks);
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setMiddle(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
-        if (!plot.isBasePlot()) {
-            return false;
-        }
-        Location[] corners = plot.getCorners();
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-
-        int x = MathMan.average(corners[0].getX(), corners[1].getX());
-        int z = MathMan.average(corners[0].getZ(), corners[1].getZ());
-        queue.setBlock(x, dpw.PLOT_HEIGHT, z, blocks.getBlock());
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setOutline(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        if (dpw.ROAD_WIDTH == 0) {
-            return false;
-        }
-        Plot plot = plotArea.getPlotAbs(plotId);
-        Location bottom = plot.getBottomAbs();
-        Location top = plot.getExtendedTopAbs();
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
-        if (!plot.getMerged(0)) {
-            int z = bottom.getZ();
-            for (int x = bottom.getX(); x <= top.getX(); x++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        if (!plot.getMerged(3)) {
-            int x = bottom.getX();
-            for (int z = bottom.getZ(); z <= top.getZ(); z++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-
-        if (!plot.getMerged(2)) {
-            int z = top.getZ();
-            for (int x = bottom.getX(); x <= top.getX(); x++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        if (!plot.getMerged(1)) {
-            int x = top.getX();
-            for (int z = bottom.getZ(); z <= top.getZ(); z++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        if (plot.isBasePlot()) {
-            for (RegionWrapper region : plot.getRegions()) {
-                Location pos1 = new Location(plotArea.worldname, region.minX, maxY, region.minZ);
-                Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
-                queue.setCuboid(pos1, pos2, blocks);
-            }
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setWallFilling(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        if (dpw.ROAD_WIDTH == 0) {
-            return false;
-        }
-        Plot plot = plotArea.getPlotAbs(plotId);
-        Location bot = plot.getExtendedBottomAbs()
-            .subtract(plot.getMerged(3) ? 0 : 1, 0, plot.getMerged(0) ? 0 : 1);
-        Location top = plot.getExtendedTopAbs().add(1, 0, 1);
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        if (!plot.getMerged(0)) {
-            int z = bot.getZ();
-            for (int x = bot.getX(); x < top.getX(); x++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        if (!plot.getMerged(3)) {
-            int x = bot.getX();
-            for (int z = bot.getZ(); z < top.getZ(); z++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        if (!plot.getMerged(2)) {
-            int z = top.getZ();
-            for (int x = bot.getX(); x < top.getX() + (plot.getMerged(1) ? 0 : 1); x++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        if (!plot.getMerged(1)) {
-            int x = top.getX();
-            for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(2) ? 0 : 1); z++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
-                    queue.setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    public boolean setWall(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        if (dpw.ROAD_WIDTH == 0) {
-            return false;
-        }
-        Plot plot = plotArea.getPlotAbs(plotId);
-        Location bot = plot.getExtendedBottomAbs()
-            .subtract(plot.getMerged(3) ? 0 : 1, 0, plot.getMerged(0) ? 0 : 1);
-        Location top = plot.getExtendedTopAbs().add(1, 0, 1);
-        PseudoRandom random = new PseudoRandom();
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int y = dpw.WALL_HEIGHT + 1;
-        if (!plot.getMerged(0)) {
-            int z = bot.getZ();
-            for (int x = bot.getX(); x < top.getX(); x++) {
-                queue.setBlock(x, y, z, blocks.getBlock());
-            }
-        }
-        if (!plot.getMerged(3)) {
-            int x = bot.getX();
-            for (int z = bot.getZ(); z < top.getZ(); z++) {
-                queue.setBlock(x, y, z, blocks.getBlock());
-            }
-        }
-        if (!plot.getMerged(2)) {
-            int z = top.getZ();
-            for (int x = bot.getX(); x < top.getX() + (plot.getMerged(1) ? 0 : 1); x++) {
-                queue.setBlock(x, y, z, blocks.getBlock());
-            }
-        }
-        if (!plot.getMerged(1)) {
-            int x = top.getX();
-            for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(2) ? 0 : 1); z++) {
-                queue.setBlock(x, y, z, blocks.getBlock());
-            }
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    /**
-     * PLOT MERGING.
-     */
-    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
-        int sx = pos2.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
-        int sz = pos1.getZ() - 2;
-        int ez = pos2.getZ() + 2;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
-        queue.setCuboid(
-            new Location(plotArea.worldname, sx, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1,
-                sz + 1), new Location(plotArea.worldname, ex, maxY, ez - 1),
-            PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 0, sz + 1),
-            new Location(plotArea.worldname, ex, 0, ez - 1), PlotBlock.get((short) 7, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz + 1),
-            new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT, ez - 1), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT + 1, sz + 1),
-            new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT + 1, ez - 1), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, ex, 1, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT, ez - 1), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT + 1, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT + 1, ez - 1), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
-        queue.enqueue();
-        return true;
-    }
-
-    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
-        int sz = pos2.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
-        int sx = pos1.getX() - 2;
-        int ex = pos2.getX() + 2;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(
-            new Location(plotArea.worldname, sx + 1, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1,
-                sz),
-            new Location(plotArea.worldname, ex - 1, plotArea.getPlotManager().getWorldHeight(),
-                ez), PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 0, sz),
-            new Location(plotArea.worldname, ex - 1, 0, ez), PlotBlock.get((short) 7, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT, sz), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.WALL_HEIGHT + 1, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT + 1, sz), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, ez),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT, ez), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.WALL_HEIGHT + 1, ez),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT + 1, ez), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
-        queue.enqueue();
-        return true;
-    }
-
-    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
-        int sx = pos2.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
-        int sz = pos2.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.ROAD_HEIGHT + 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.getPlotManager().getWorldHeight(), ez - 1),
-            PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 0, sz + 1),
-            new Location(plotArea.worldname, ex - 1, 0, ez - 1),
-            PlotBlock.get((short) 7, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
-        queue.enqueue();
-        return true;
-    }
-
-    @Override public boolean removeRoadEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
-        int sx = pos2.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
-        int sz = pos1.getZ() - 1;
-        int ez = pos2.getZ() + 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(
-            new Location(plotArea.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1,
-                sz),
-            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
-            PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.PLOT_HEIGHT - 1, ez - 1), dpw.MAIN_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.PLOT_HEIGHT, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.PLOT_HEIGHT, ez - 1), dpw.TOP_BLOCK);
-        queue.enqueue();
-        return true;
-    }
-
-    @Override public boolean removeRoadSouth(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
-        int sz = pos2.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
-        int sx = pos1.getX() - 1;
-        int ex = pos2.getX() + 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(
-            new Location(plotArea.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1,
-                sz),
-            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
-            PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.PLOT_HEIGHT - 1, ez), dpw.MAIN_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.PLOT_HEIGHT, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.PLOT_HEIGHT, ez), dpw.TOP_BLOCK);
-        queue.enqueue();
-        return true;
-    }
-
-    @Override public boolean removeRoadSouthEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location location = getPlotTopLocAbs(dpw, plot.getId());
-        int sx = location.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
-        int sz = location.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.ROAD_HEIGHT + 1, sz),
-            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
-            PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz),
-            new Location(plotArea.worldname, ex, dpw.ROAD_HEIGHT - 1, ez), dpw.MAIN_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.ROAD_HEIGHT, sz),
-            new Location(plotArea.worldname, ex, dpw.ROAD_HEIGHT, ez), dpw.TOP_BLOCK);
-        queue.enqueue();
-        return true;
-    }
-
-    /**
-     * Finishing off plot merging by adding in the walls surrounding the plot (OPTIONAL)(UNFINISHED).
-     */
-    @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
-        final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        plotIds.forEach(id -> setWall(plotArea, id, block));
-        return true;
-    }
-
-    @Override public boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
-        final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        plotIds.forEach(id -> setWall(plotArea, id, block));
-        return true;
-    }
-
-    @Override public boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
-        return true;
-    }
-
-    @Override public boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
-        return true;
-    }
-
-    @Override public boolean claimPlot(PlotArea plotArea, Plot plot) {
-        final BlockBucket claim = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        setWall(plotArea, plot.getId(), claim);
-        return true;
-    }
-
-    @Override public String[] getPlotComponents(PlotArea plotArea, PlotId plotId) {
-        return new String[] {"main", "floor", "air", "all", "border", "wall", "outline", "middle"};
-    }
-
-    /**
-     * Remove sign for a plot.
-     */
-    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        plot = plot.getBasePlot(false);
-        Location bot = plot.getBottomAbs();
-        return new Location(plotArea.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1,
-            bot.getZ() - 2);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
deleted file mode 100644
index 755f694d6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-
-import javax.annotation.Nonnull;
-import java.lang.reflect.Field;
-import java.util.Locale;
-
-@SuppressWarnings("WeakerAccess") public abstract class ClassicPlotWorld extends SquarePlotWorld {
-
-    public int ROAD_HEIGHT = 62;
-    public int PLOT_HEIGHT = 62;
-    public int WALL_HEIGHT = 62;
-    public BlockBucket MAIN_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone"));
-    // new PlotBlock[] {PlotBlock.get("stone")};
-    public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass_block"));
-    //new PlotBlock[] {PlotBlock.get("grass")};
-    public BlockBucket WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone_slab"));
-    // PlotBlock.get((short) 44, (byte) 0);
-    public BlockBucket CLAIMED_WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("sandstone_slab"));
-    // PlotBlock.get((short) 44, (byte) 1);
-    public BlockBucket WALL_FILLING = BlockBucket.withSingle(PlotBlock.get("stone"));
-    //PlotBlock.get((short) 1, (byte) 0);
-    public BlockBucket ROAD_BLOCK = BlockBucket.withSingle(PlotBlock.get("quartz_block"));
-    // PlotBlock.get((short) 155, (byte) 0);
-    public boolean PLOT_BEDROCK = true;
-
-    public ClassicPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
-        PlotId min, PlotId max) {
-        super(worldName, id, generator, min, max);
-    }
-
-    /**
-     * CONFIG NODE | DEFAULT VALUE | DESCRIPTION | CONFIGURATION TYPE | REQUIRED FOR INITIAL SETUP.
-     * <p>
-     * <p>Set the last boolean to false if you do not check a specific config node to be set while using the setup
-     * command - this may be useful if a config value can be changed at a later date, and has no impact on the actual
-     * world generation</p>
-     */
-    @Nonnull @Override public ConfigurationNode[] getSettingNodes() {
-        return new ConfigurationNode[] {
-            new ConfigurationNode("plot.height", this.PLOT_HEIGHT, "Plot height",
-                Configuration.INTEGER),
-            new ConfigurationNode("plot.size", this.PLOT_WIDTH, "Plot width",
-                Configuration.INTEGER),
-            new ConfigurationNode("plot.filling", this.MAIN_BLOCK, "Plot block",
-                Configuration.BLOCK_BUCKET),
-            new ConfigurationNode("plot.floor", this.TOP_BLOCK, "Plot floor block",
-                Configuration.BLOCK_BUCKET),
-            new ConfigurationNode("wall.block", this.WALL_BLOCK, "Top wall block",
-                Configuration.BLOCK_BUCKET),
-            new ConfigurationNode("wall.block_claimed", this.CLAIMED_WALL_BLOCK,
-                "Wall block (claimed)", Configuration.BLOCK_BUCKET),
-            new ConfigurationNode("road.width", this.ROAD_WIDTH, "Road width",
-                Configuration.INTEGER),
-            new ConfigurationNode("road.height", this.ROAD_HEIGHT, "Road height",
-                Configuration.INTEGER),
-            new ConfigurationNode("road.block", this.ROAD_BLOCK, "Road block",
-                Configuration.BLOCK_BUCKET),
-            new ConfigurationNode("wall.filling", this.WALL_FILLING, "Wall filling block",
-                Configuration.BLOCK_BUCKET),
-            new ConfigurationNode("wall.height", this.WALL_HEIGHT, "Wall height",
-                Configuration.INTEGER),
-            new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, "Plot bedrock generation",
-                Configuration.BOOLEAN)};
-    }
-
-    /**
-     * This method is called when a world loads. Make sure you set all your constants here. You are provided with the
-     * configuration section for that specific world.
-     */
-    @Override public void loadConfiguration(ConfigurationSection config) {
-        super.loadConfiguration(config);
-        this.PLOT_BEDROCK = config.getBoolean("plot.bedrock");
-        this.PLOT_HEIGHT = Math.min(255, config.getInt("plot.height"));
-        this.MAIN_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("plot.filling"));
-        this.TOP_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("plot.floor"));
-        this.WALL_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("wall.block"));
-        this.ROAD_HEIGHT = Math.min(255, config.getInt("road.height"));
-        this.ROAD_BLOCK = Configuration.BLOCK_BUCKET.parseString(config.getString("road.block"));
-        this.WALL_FILLING =
-            Configuration.BLOCK_BUCKET.parseString(config.getString("wall.filling"));
-        this.WALL_HEIGHT = Math.min(254, config.getInt("wall.height"));
-        this.CLAIMED_WALL_BLOCK =
-            Configuration.BLOCK_BUCKET.parseString(config.getString("wall.block_claimed"));
-
-        // Dump world settings
-        if (Settings.DEBUG) {
-            PlotSquared.debug(String
-                .format("- Dumping settings for ClassicPlotWorld with name %s", this.worldname));
-            final Field[] fields = this.getClass().getFields();
-            for (final Field field : fields) {
-                final String name = field.getName().toLowerCase(Locale.ENGLISH);
-                if (name.equalsIgnoreCase("g_sch")) {
-                    continue;
-                }
-                Object value;
-                try {
-                    final boolean accessible = field.isAccessible();
-                    field.setAccessible(true);
-                    value = field.get(this);
-                    field.setAccessible(accessible);
-                } catch (final IllegalAccessException e) {
-                    value = String.format("Failed to parse: %s", e.getMessage());
-                }
-                PlotSquared.debug(String.format("-- %s = %s", name, value));
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java
deleted file mode 100644
index ec5f971fc..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GeneratorWrapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-
-public interface GeneratorWrapper<T> {
-
-    IndependentPlotGenerator getPlotGenerator();
-
-    T getPlatformGenerator();
-
-    void augment(PlotArea area);
-
-    boolean isFull();
-
-    @Override String toString();
-
-    @Override boolean equals(Object obj);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
deleted file mode 100644
index 4ea841c3c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
-
-/**
- * A plot manager where plots tessellate in a grid formation symmetrical about x=z.
- */
-public abstract class GridPlotManager extends PlotManager {
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
deleted file mode 100644
index 34dbef203..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-
-public abstract class GridPlotWorld extends PlotArea {
-
-    public short SIZE;
-
-    public GridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
-        PlotId min, PlotId max) {
-        super(worldName, id, generator, min, max);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
deleted file mode 100644
index f2098036d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-import java.util.HashMap;
-
-public class HybridGen extends IndependentPlotGenerator {
-
-    @Override public String getName() {
-        return PlotSquared.imp().getPluginName();
-    }
-
-    private void placeSchem(HybridPlotWorld world, ScopedLocalBlockQueue result, short relativeX,
-        short relativeZ, int x, int z, boolean isRoad) {
-        int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
-        if (isRoad || Settings.Schematics.PASTE_ON_TOP) {
-            minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
-        } else {
-            minY = 1;
-        }
-        BaseBlock[] blocks = world.G_SCH.get(MathMan.pair(relativeX, relativeZ));
-        if (blocks != null) {
-            for (int y = 0; y < blocks.length; y++) {
-                if (blocks[y] != null) {
-                    result.setBlock(x, minY + y, z, blocks[y]);
-                }
-            }
-        }
-    }
-
-    @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
-        BlockBucket[][] blockBuckets = new BlockBucket[16][];
-        HybridPlotWorld hpw = (HybridPlotWorld) settings;
-        // Bedrock
-        if (hpw.PLOT_BEDROCK) {
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
-                    blockBuckets[0][(z << 4) | x] =
-                        BlockBucket.withSingle(PlotBlock.get("bedrock"));
-                }
-            }
-        }
-        for (short x = 0; x < 16; x++) {
-            for (short z = 0; z < 16; z++) {
-                for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
-                    int layer = y >> 4;
-                    if (blockBuckets[layer] == null) {
-                        blockBuckets[layer] = new BlockBucket[4096];
-                    }
-                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
-                }
-                int layer = hpw.PLOT_HEIGHT >> 4;
-                if (blockBuckets[layer] == null) {
-                    blockBuckets[layer] = new BlockBucket[4096];
-                }
-                blockBuckets[layer][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
-            }
-        }
-        return blockBuckets;
-    }
-
-    @Override public void generateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
-        HybridPlotWorld hpw = (HybridPlotWorld) settings;
-        // Biome
-        result.fillBiome(hpw.PLOT_BIOME);
-        // Bedrock
-        if (hpw.PLOT_BEDROCK) {
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
-                    result.setBlock(x, 0, z, PlotBlock.get("bedrock"));
-                }
-            }
-        }
-        // Coords
-        Location min = result.getMin();
-        int bx = (min.getX()) - hpw.ROAD_OFFSET_X;
-        int bz = (min.getZ()) - hpw.ROAD_OFFSET_Z;
-        short rbx;
-        if (bx < 0) {
-            rbx = (short) (hpw.SIZE + (bx % hpw.SIZE));
-        } else {
-            rbx = (short) (bx % hpw.SIZE);
-        }
-        short rbz;
-        if (bz < 0) {
-            rbz = (short) (hpw.SIZE + (bz % hpw.SIZE));
-        } else {
-            rbz = (short) (bz % hpw.SIZE);
-        }
-        short[] rx = new short[16];
-        boolean[] gx = new boolean[16];
-        boolean[] wx = new boolean[16];
-        for (short i = 0; i < 16; i++) {
-            short v = (short) (rbx + i);
-            if (v >= hpw.SIZE) {
-                v -= hpw.SIZE;
-            }
-            rx[i] = v;
-            if (hpw.ROAD_WIDTH != 0) {
-                gx[i] = v < hpw.PATH_WIDTH_LOWER || v > hpw.PATH_WIDTH_UPPER;
-                wx[i] = v == hpw.PATH_WIDTH_LOWER || v == hpw.PATH_WIDTH_UPPER;
-            }
-        }
-        short[] rz = new short[16];
-        boolean[] gz = new boolean[16];
-        boolean[] wz = new boolean[16];
-        for (short i = 0; i < 16; i++) {
-            short v = (short) (rbz + i);
-            if (v >= hpw.SIZE) {
-                v -= hpw.SIZE;
-            }
-            rz[i] = v;
-            if (hpw.ROAD_WIDTH != 0) {
-                gz[i] = v < hpw.PATH_WIDTH_LOWER || v > hpw.PATH_WIDTH_UPPER;
-                wz[i] = v == hpw.PATH_WIDTH_LOWER || v == hpw.PATH_WIDTH_UPPER;
-            }
-        }
-        // generation
-        HashMap<Integer, BaseBlock[]> sch = hpw.G_SCH;
-        for (short x = 0; x < 16; x++) {
-            if (gx[x]) {
-                for (short z = 0; z < 16; z++) {
-                    // Road
-                    for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
-                        result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
-                    }
-                    if (hpw.ROAD_SCHEMATIC_ENABLED) {
-                        placeSchem(hpw, result, rx[x], rz[z], x, z, true);
-                    }
-                }
-            } else if (wx[x]) {
-                for (short z = 0; z < 16; z++) {
-                    if (gz[z]) {
-                        // road
-                        for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
-                            result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
-                        }
-                        if (hpw.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
-                        }
-                    } else {
-                        // wall
-                        for (int y = 1; y <= hpw.WALL_HEIGHT; y++) {
-                            result.setBlock(x, y, z, hpw.WALL_FILLING.getBlock());
-                        }
-                        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-                            result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
-                        } else {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
-                        }
-                    }
-                }
-            } else {
-                for (short z = 0; z < 16; z++) {
-                    if (gz[z]) {
-                        // road
-                        for (int y = 1; y <= hpw.ROAD_HEIGHT; y++) {
-                            result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
-                        }
-                        if (hpw.ROAD_SCHEMATIC_ENABLED) {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
-                        }
-                    } else if (wz[z]) {
-                        // wall
-                        for (int y = 1; y <= hpw.WALL_HEIGHT; y++) {
-                            result.setBlock(x, y, z, hpw.WALL_FILLING.getBlock());
-                        }
-                        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-                            result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
-                        } else {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z, true);
-                        }
-                    } else {
-                        // plot
-                        for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
-                            result.setBlock(x, y, z, hpw.MAIN_BLOCK.getBlock());
-                        }
-                        result.setBlock(x, hpw.PLOT_HEIGHT, z, hpw.TOP_BLOCK.getBlock());
-                        if (hpw.PLOT_SCHEMATIC) {
-                            placeSchem(hpw, result, rx[x], rz[z], x, z, false);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-/*    @Override public boolean populateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
-        HybridPlotWorld hpw = (HybridPlotWorld) settings;
-        if (hpw.G_SCH_STATE != null) {
-            Location min = result.getMin();
-            int cx = min.getX() >> 4;
-            int cz = min.getZ() >> 4;
-            int p1x = cx << 4;
-            int p1z = cz << 4;
-            int bx = p1x - hpw.ROAD_OFFSET_X;
-            int bz = p1z - hpw.ROAD_OFFSET_Z;
-            short rbx;
-            if (bx < 0) {
-                rbx = (short) (hpw.SIZE + (bx % hpw.SIZE));
-            } else {
-                rbx = (short) (bx % hpw.SIZE);
-            }
-            short rbz;
-            if (bz < 0) {
-                rbz = (short) (hpw.SIZE + (bz % hpw.SIZE));
-            } else {
-                rbz = (short) (bz % hpw.SIZE);
-            }
-            short[] rx = new short[16];
-            for (short i = 0; i < 16; i++) {
-                short v = (short) (rbx + i);
-                if (v >= hpw.SIZE) {
-                    v -= hpw.SIZE;
-                }
-                rx[i] = v;
-            }
-            short[] rz = new short[16];
-            for (short i = 0; i < 16; i++) {
-                short v = (short) (rbz + i);
-                if (v >= hpw.SIZE) {
-                    v -= hpw.SIZE;
-                }
-                rz[i] = v;
-            }
-            LocalBlockQueue queue = null;
-            for (short x = 0; x < 16; x++) {
-                for (short z = 0; z < 16; z++) {
-                    int pair = MathMan.pair(rx[x], rz[z]);
-                    HashMap<Integer, CompoundTag> map = hpw.G_SCH_STATE.get(pair);
-                    if (map != null) {
-                        for (Entry<Integer, CompoundTag> entry : map.entrySet()) {
-                            if (queue == null) {
-                                queue = GlobalBlockQueue.IMP.getNewQueue(hpw.worldname, false);
-                            }
-                            CompoundTag tag = entry.getValue();
-                            SchematicHandler.manager
-                                .restoreTile(queue, tag, p1x + x, entry.getKey(), p1z + z);
-                        }
-                    }
-                }
-            }
-            if (queue != null) {
-                queue.flush();
-            }
-        }
-        return false;
-    }*/
-
-    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
-        return new HybridPlotWorld(world, id, this, min, max);
-    }
-
-    @Override public PlotManager getNewPlotManager() {
-        return new HybridPlotManager();
-    }
-
-    @Override public void initialize(PlotArea area) {
-        // All initialization is done in the PlotArea class
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
deleted file mode 100644
index 1f6429dbd..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.commands.Template;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Collections;
-import java.util.HashSet;
-
-public class HybridPlotManager extends ClassicPlotManager {
-
-    public static boolean REGENERATIVE_CLEAR = true;
-
-    @Override public void exportTemplate(PlotArea plotArea) throws IOException {
-        HashSet<FileBytes> files = new HashSet<>(Collections.singletonList(
-            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml",
-                Template.getBytes(plotArea))));
-        String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator
-            + plotArea.worldname + File.separator;
-        String newDir =
-            "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__"
-                + File.separator;
-        try {
-            File sideroad =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "sideroad.schematic");
-            if (sideroad.exists()) {
-                files.add(new FileBytes(newDir + "sideroad.schematic",
-                    Files.readAllBytes(sideroad.toPath())));
-            }
-            File intersection =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "intersection.schematic");
-            if (intersection.exists()) {
-                files.add(new FileBytes(newDir + "intersection.schematic",
-                    Files.readAllBytes(intersection.toPath())));
-            }
-            File plot =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "plot.schematic");
-            if (plot.exists()) {
-                files.add(
-                    new FileBytes(newDir + "plot.schematic", Files.readAllBytes(plot.toPath())));
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        Template.zipAll(plotArea.worldname, files);
-    }
-
-    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
-        super.createRoadEast(plotArea, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
-        PlotId id = plot.getId();
-        PlotId id2 = new PlotId(id.x + 1, id.y);
-        Location bot = getPlotBottomLocAbs(hpw, id2);
-        Location top = getPlotTopLocAbs(hpw, id);
-        Location pos1 = new Location(plotArea.worldname, top.getX() + 1, 0, bot.getZ() - 1);
-        Location pos2 =
-            new Location(plotArea.worldname, bot.getX(), Math.min(getWorldHeight(), 255),
-                top.getZ() + 1);
-        MainUtil.resetBiome(plotArea, pos1, pos2);
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-            return true;
-        }
-        LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2, true);
-        queue.enqueue();
-        return true;
-    }
-
-    private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
-        Location pos2, boolean clear) {
-        int size = hpw.SIZE;
-        int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
-        for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-            short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
-            if (absX < 0) {
-                absX += size;
-            }
-            for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                short absZ = (short) ((z - hpw.ROAD_OFFSET_Z) % size);
-                if (absZ < 0) {
-                    absZ += size;
-                }
-                BaseBlock[] blocks = hpw.G_SCH.get(MathMan.pair(absX, absZ));
-                if (blocks != null) {
-                    for (int y = 0; y < blocks.length; y++) {
-                        if (blocks[y] != null) {
-                            queue.setBlock(x, minY + y, z, blocks[y]);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
-        super.createRoadSouth(plotArea, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
-        PlotId id = plot.getId();
-        PlotId id2 = new PlotId(id.x, id.y + 1);
-        Location bot = getPlotBottomLocAbs(hpw, id2);
-        Location top = getPlotTopLocAbs(hpw, id);
-        Location pos1 = new Location(plotArea.worldname, bot.getX() - 1, 0, top.getZ() + 1);
-        Location pos2 =
-            new Location(plotArea.worldname, top.getX() + 1, Math.min(getWorldHeight(), 255),
-                bot.getZ());
-        MainUtil.resetBiome(plotArea, pos1, pos2);
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
-            return true;
-        }
-        LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2, true);
-        queue.enqueue();
-        return true;
-    }
-
-    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
-        super.createRoadSouthEast(plotArea, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
-        PlotId id = plot.getId();
-        PlotId id2 = new PlotId(id.x + 1, id.y + 1);
-        Location pos1 = getPlotTopLocAbs(hpw, id).add(1, 0, 1);
-        Location pos2 = getPlotBottomLocAbs(hpw, id2);
-        pos1.setY(0);
-        pos2.setY(Math.min(getWorldHeight(), 255));
-        LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2, true);
-        if (hpw.ROAD_SCHEMATIC_ENABLED) {
-            createSchemAbs(hpw, queue, pos1, pos2, true);
-        }
-        queue.enqueue();
-        return true;
-    }
-
-    /**
-     * <p>Clearing the plot needs to only consider removing the blocks - This implementation has used the setCuboidAsync
-     * function, as it is fast, and uses NMS code - It also makes use of the fact that deleting chunks is a lot faster
-     * than block updates This code is very messy, but you don't need to do something quite as complex unless you happen
-     * to have 512x512 sized plots. </p>
-     */
-    @Override public boolean clearPlot(final PlotArea plotArea, Plot plot,
-        final Runnable whenDone) {
-        final String world = plotArea.worldname;
-        final HybridPlotWorld dpw = (HybridPlotWorld) plotArea;
-        Location pos1 = plot.getBottomAbs();
-        Location pos2 = plot.getExtendedTopAbs();
-        // If augmented
-        final boolean canRegen =
-            (plotArea.TYPE == 0) && (plotArea.TERRAIN == 0) && REGENERATIVE_CLEAR;
-        // The component blocks
-        final BlockBucket plotfloor = dpw.TOP_BLOCK;
-        final BlockBucket filling = dpw.MAIN_BLOCK;
-        final PlotBlock bedrock;
-        if (dpw.PLOT_BEDROCK) {
-            bedrock = PlotBlock.get((short) 7, (byte) 0);
-        } else {
-            bedrock = PlotBlock.get((short) 0, (byte) 0);
-        }
-        final PlotBlock air = PlotBlock.get((short) 0, (byte) 0);
-        final String biome = dpw.PLOT_BIOME;
-        final LocalBlockQueue queue = plotArea.getQueue(false);
-        ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-            @Override public void run(int[] value) {
-                // If the chunk isn't near the edge and it isn't an augmented world we can just regen the whole chunk
-                if (canRegen && (value[6] == 0)) {
-                    queue.regenChunk(value[0], value[1]);
-                    return;
-                }
-                ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                // Otherwise we need to set each component, as we don't want to regenerate the road or other plots that share the same chunk //
-                ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                // Set the biome
-                MainUtil.setBiome(world, value[2], value[3], value[4], value[5], biome);
-                // These two locations are for each component (e.g. bedrock, main block, floor, air)
-                Location bot = new Location(world, value[2], 0, value[3]);
-                Location top = new Location(world, value[4], 1, value[5]);
-                queue.setCuboid(bot, top, bedrock);
-                // Each component has a different layer
-                bot.setY(1);
-                top.setY(dpw.PLOT_HEIGHT);
-                queue.setCuboid(bot, top, filling);
-                bot.setY(dpw.PLOT_HEIGHT);
-                top.setY(dpw.PLOT_HEIGHT + 1);
-                queue.setCuboid(bot, top, plotfloor);
-                bot.setY(dpw.PLOT_HEIGHT + 1);
-                top.setY(getWorldHeight());
-                queue.setCuboid(bot, top, air);
-                // And finally set the schematic, the y value is unimportant for this function
-                pastePlotSchematic(dpw, queue, bot, top);
-            }
-        }, new Runnable() {
-            @Override public void run() {
-                queue.enqueue();
-                // And notify whatever called this when plot clearing is done
-                GlobalBlockQueue.IMP.addTask(whenDone);
-            }
-        }, 10);
-        return true;
-    }
-
-    public void pastePlotSchematic(HybridPlotWorld plotWorld, LocalBlockQueue queue, Location l1,
-        Location l2) {
-        if (!plotWorld.PLOT_SCHEMATIC) {
-            return;
-        }
-        createSchemAbs(plotWorld, queue, l1, l2, false);
-    }
-
-    /**
-     * Remove sign for a plot.
-     */
-    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
-        HybridPlotWorld dpw = (HybridPlotWorld) plotArea;
-        return dpw.getSignLocation(plot);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
deleted file mode 100644
index 53a9d6891..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.CompoundTagBuilder;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
-import com.sk89q.worldedit.internal.helper.MCDirections;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.math.Vector3;
-import com.sk89q.worldedit.math.transform.AffineTransform;
-import com.sk89q.worldedit.util.Direction;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-import java.io.File;
-import java.util.HashMap;
-
-public class HybridPlotWorld extends ClassicPlotWorld {
-
-    private static AffineTransform transform = new AffineTransform().rotateY(90);
-    public boolean ROAD_SCHEMATIC_ENABLED;
-    public boolean PLOT_SCHEMATIC = false;
-    public short PATH_WIDTH_LOWER;
-    public short PATH_WIDTH_UPPER;
-    public HashMap<Integer, BaseBlock[]> G_SCH;
-    private Location SIGN_LOCATION;
-
-    public HybridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
-        PlotId min, PlotId max) {
-        super(worldName, id, generator, min, max);
-    }
-
-    public static byte wrap(byte data, int start) {
-        if ((data >= start) && (data < (start + 4))) {
-            data = (byte) ((((data - start) + 2) & 3) + start);
-        }
-        return data;
-    }
-
-    public static byte wrap2(byte data, int start) {
-        if ((data >= start) && (data < (start + 2))) {
-            data = (byte) ((((data - start) + 1) & 1) + start);
-        }
-        return data;
-    }
-
-    // FIXME depends on block ids
-    // Possibly make abstract?
-    public static BaseBlock rotate(BaseBlock id) {
-
-        CompoundTag tag = id.getNbtData();
-
-        if (tag != null) {
-            // Handle blocks which store their rotation in NBT
-            if (tag.containsKey("Rot")) {
-                int rot = tag.asInt("Rot");
-
-                Direction direction = MCDirections.fromRotation(rot);
-
-                if (direction != null) {
-                    Vector3 vector = transform.apply(direction.toVector())
-                        .subtract(transform.apply(Vector3.ZERO)).normalize();
-                    Direction newDirection = Direction.findClosest(vector,
-                        Direction.Flag.CARDINAL | Direction.Flag.ORDINAL
-                            | Direction.Flag.SECONDARY_ORDINAL);
-
-                    if (newDirection != null) {
-                        CompoundTagBuilder builder = tag.createBuilder();
-
-                        builder.putByte("Rot", (byte) MCDirections.toRotation(newDirection));
-
-                        id.setNbtData(builder.build());
-                    }
-                }
-            }
-        }
-        return BlockTransformExtent.transform(id, transform);
-    }
-
-    public Location getSignLocation(Plot plot) {
-        plot = plot.getBasePlot(false);
-        Location bot = plot.getBottomAbs();
-        if (SIGN_LOCATION == null) {
-            bot.setY(ROAD_HEIGHT + 1);
-            return bot.add(-1, 0, -2);
-        } else {
-            bot.setY(0);
-            Location loc =
-                bot.add(SIGN_LOCATION.getX(), SIGN_LOCATION.getY(), SIGN_LOCATION.getZ());
-            return loc;
-        }
-    }
-
-    /**
-     * <p>This method is called when a world loads. Make sure you set all your constants here. You are provided with the
-     * configuration section for that specific world.</p>
-     */
-    @Override public void loadConfiguration(ConfigurationSection config) {
-        super.loadConfiguration(config);
-        if ((this.ROAD_WIDTH & 1) == 0) {
-            this.PATH_WIDTH_LOWER = (short) (Math.floor(this.ROAD_WIDTH / 2) - 1);
-        } else {
-            this.PATH_WIDTH_LOWER = (short) Math.floor(this.ROAD_WIDTH / 2);
-        }
-        if (this.ROAD_WIDTH == 0) {
-            this.PATH_WIDTH_UPPER = (short) (this.SIZE + 1);
-        } else {
-            this.PATH_WIDTH_UPPER = (short) (this.PATH_WIDTH_LOWER + this.PLOT_WIDTH + 1);
-        }
-        try {
-            setupSchematics();
-        } catch (Exception ignored) {
-            PlotSquared.debug("&c - road schematics are disabled for this world.");
-        }
-    }
-
-    @Override public boolean isCompatible(PlotArea plotArea) {
-        if (!(plotArea instanceof SquarePlotWorld)) {
-            return false;
-        }
-        return ((SquarePlotWorld) plotArea).PLOT_WIDTH == this.PLOT_WIDTH;
-    }
-
-    public void setupSchematics() throws SchematicHandler.UnsupportedFormatException {
-        this.G_SCH = new HashMap<>();
-        File schematic1File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
-        File schematic2File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic");
-        File schem3File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic");
-        Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File);
-        Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File);
-        Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File);
-        int shift = this.ROAD_WIDTH / 2;
-        int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1;
-        int minY = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
-        if (schematic3 != null) {
-            this.PLOT_SCHEMATIC = true;
-            BlockArrayClipboard blockArrayClipboard3 = schematic3.getClipboard();
-
-            BlockVector3 d3 = blockArrayClipboard3.getDimensions();
-            short w3 = (short) d3.getX();
-            short l3 = (short) d3.getZ();
-            short h3 = (short) d3.getY();
-            if (w3 > PLOT_WIDTH || h3 > PLOT_WIDTH) {
-                this.ROAD_SCHEMATIC_ENABLED = true;
-            }
-            int centerShiftZ;
-            if (l3 < this.PLOT_WIDTH) {
-                centerShiftZ = (this.PLOT_WIDTH - l3) / 2;
-            } else {
-                centerShiftZ = (PLOT_WIDTH - l3) / 2;
-            }
-            int centerShiftX;
-            if (w3 < this.PLOT_WIDTH) {
-                centerShiftX = (this.PLOT_WIDTH - w3) / 2;
-            } else {
-                centerShiftX = (PLOT_WIDTH - w3) / 2;
-            }
-
-            int startY = minY - PLOT_HEIGHT;
-
-            for (short x = 0; x < w3; x++) {
-                for (short z = 0; z < l3; z++) {
-                    for (short y = 0; y < h3; y++) {
-                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x, y, z));
-                        if (!id.getBlockType().getMaterial().isAir()) {
-                            addOverlayBlock((short) (x + shift + oddshift + centerShiftX),
-                                (short) (y + startY), (short) (z + shift + oddshift + centerShiftZ),
-                                id, false, h3);
-                        }
-                    }
-                }
-            }
-/*            HashMap<BlockLoc, CompoundTag> items = schematic3.getTiles();
-            if (!items.isEmpty()) {
-                this.G_SCH_STATE = new HashMap<>();
-                outer:
-                for (Map.Entry<BlockLoc, CompoundTag> entry : items.entrySet()) {
-                    BlockLoc loc = entry.getKey();
-                    short x = (short) (loc.x + shift + oddshift + centerShiftX);
-                    short z = (short) (loc.z + shift + oddshift + centerShiftZ);
-                    short y = (short) (loc.y + this.PLOT_HEIGHT);
-                    int pair = MathMan.pair(x, z);
-                    HashMap<Integer, CompoundTag> existing = this.G_SCH_STATE.get(pair);
-                    if (existing == null) {
-                        existing = new HashMap<>();
-                        this.G_SCH_STATE.put(pair, existing);
-                    }
-                    existing.put((int) y, entry.getValue());
-
-                    CompoundTag tag = entry.getValue();
-                    Map<String, Tag> map = ReflectionUtils.getMap(tag.getValue());
-                    for (int i = 1; i <= 4; i++) {
-                        String ln = tag.getString("Line" + i);
-                        if (ln == null || ln.length() > 11)
-                            continue outer;
-                    }
-                    SIGN_LOCATION =
-                        new Location(worldname, loc.x + centerShiftX, this.PLOT_HEIGHT + loc.y,
-                            loc.z + centerShiftZ);
-                    ALLOW_SIGNS = true;
-                    continue outer;
-                }
-            }*/
-        }
-        if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
-            PlotSquared.debug(C.PREFIX + "&3 - schematic: &7false");
-            return;
-        }
-        this.ROAD_SCHEMATIC_ENABLED = true;
-        // Do not populate road if using schematic population
-        // TODO: What? this.ROAD_BLOCK = BlockBucket.empty(); // PlotBlock.getEmptyData(this.ROAD_BLOCK); // PlotBlock.get(this.ROAD_BLOCK.id, (byte) 0);
-
-        BlockArrayClipboard blockArrayClipboard1 = schematic1.getClipboard();
-        BlockArrayClipboard blockArrayClipboard2 = schematic2.getClipboard();
-
-        BlockVector3 d1 = blockArrayClipboard1.getDimensions();
-        short w1 = (short) d1.getX();
-        short l1 = (short) d1.getZ();
-        short h1 = (short) d1.getY();
-        BlockVector3 d2 = blockArrayClipboard2.getDimensions();
-        short w2 = (short) d2.getX();
-        short l2 = (short) d2.getZ();
-        short h2 = (short) d2.getY();
-        int startY = minY - ROAD_HEIGHT;
-        for (short x = 0; x < w1; x++) {
-            for (short z = 0; z < l1; z++) {
-                for (short y = 0; y < h1; y++) {
-                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x, y, z));
-                    if (!id.getBlockType().getMaterial().isAir()) {
-                        addOverlayBlock((short) (x - shift), (short) (y + startY),
-                            (short) (z + shift + oddshift), id, false, h1);
-                        addOverlayBlock((short) (z + shift + oddshift), (short) (y + startY),
-                            (short) (shift - x + (oddshift - 1)), id, true, h1);
-                    }
-                }
-            }
-        }
-        for (short x = 0; x < w2; x++) {
-            for (short z = 0; z < l2; z++) {
-                for (short y = 0; y < h2; y++) {
-                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x, y, z));
-                    if (!id.getBlockType().getMaterial().isAir()) {
-                        addOverlayBlock((short) (x - shift), (short) (y + startY),
-                            (short) (z - shift), id, false, h2);
-                    }
-                }
-            }
-        }
-    }
-
-    public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate,
-        int height) {
-        if (z < 0) {
-            z += this.SIZE;
-        } else if (z >= this.SIZE) {
-            z -= this.SIZE;
-        }
-        if (x < 0) {
-            x += this.SIZE;
-        } else if (x >= this.SIZE) {
-            x -= this.SIZE;
-        }
-        if (rotate) {
-            id = rotate(id);
-        }
-        int pair = MathMan.pair(x, z);
-        BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
-        existing[y] = id;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
deleted file mode 100644
index 4d46205ad..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ /dev/null
@@ -1,381 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.listener.WEExtent;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-import java.io.File;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public abstract class HybridUtils {
-
-    public static HybridUtils manager;
-    public static Set<ChunkLoc> regions;
-    public static Set<ChunkLoc> chunks = new HashSet<>();
-    public static PlotArea area;
-    public static boolean UPDATE = false;
-
-    public abstract void analyzeRegion(String world, RegionWrapper region,
-        RunnableVal<PlotAnalysis> whenDone);
-
-    public void analyzePlot(final Plot origin, final RunnableVal<PlotAnalysis> whenDone) {
-        final ArrayDeque<RegionWrapper> zones = new ArrayDeque<>(origin.getRegions());
-        final ArrayList<PlotAnalysis> analysis = new ArrayList<>();
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (zones.isEmpty()) {
-                    if (!analysis.isEmpty()) {
-                        whenDone.value = new PlotAnalysis();
-                        for (PlotAnalysis data : analysis) {
-                            whenDone.value.air += data.air;
-                            whenDone.value.air_sd += data.air_sd;
-                            whenDone.value.changes += data.changes;
-                            whenDone.value.changes_sd += data.changes_sd;
-                            whenDone.value.data += data.data;
-                            whenDone.value.data_sd += data.data_sd;
-                            whenDone.value.faces += data.faces;
-                            whenDone.value.faces_sd += data.faces_sd;
-                            whenDone.value.variety += data.variety;
-                            whenDone.value.variety_sd += data.variety_sd;
-                        }
-                        whenDone.value.air /= analysis.size();
-                        whenDone.value.air_sd /= analysis.size();
-                        whenDone.value.changes /= analysis.size();
-                        whenDone.value.changes_sd /= analysis.size();
-                        whenDone.value.data /= analysis.size();
-                        whenDone.value.data_sd /= analysis.size();
-                        whenDone.value.faces /= analysis.size();
-                        whenDone.value.faces_sd /= analysis.size();
-                        whenDone.value.variety /= analysis.size();
-                        whenDone.value.variety_sd /= analysis.size();
-                    } else {
-                        whenDone.value = analysis.get(0);
-                    }
-                    List<Integer> result = new ArrayList<>();
-                    result.add(whenDone.value.changes);
-                    result.add(whenDone.value.faces);
-                    result.add(whenDone.value.data);
-                    result.add(whenDone.value.air);
-                    result.add(whenDone.value.variety);
-
-                    result.add(whenDone.value.changes_sd);
-                    result.add(whenDone.value.faces_sd);
-                    result.add(whenDone.value.data_sd);
-                    result.add(whenDone.value.air_sd);
-                    result.add(whenDone.value.variety_sd);
-                    FlagManager.addPlotFlag(origin, Flags.ANALYSIS, result);
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = zones.poll();
-                final Runnable task = this;
-                analyzeRegion(origin.getWorldName(), region, new RunnableVal<PlotAnalysis>() {
-                    @Override public void run(PlotAnalysis value) {
-                        analysis.add(value);
-                        TaskManager.runTaskLater(task, 1);
-                    }
-                });
-            }
-        };
-        run.run();
-    }
-
-    public int checkModified(LocalBlockQueue queue, int x1, int x2, int y1, int y2, int z1, int z2,
-        PlotBlock[] blocks) {
-        int count = 0;
-        for (int y = y1; y <= y2; y++) {
-            for (int x = x1; x <= x2; x++) {
-                for (int z = z1; z <= z2; z++) {
-                    PlotBlock block = queue.getBlock(x, y, z);
-                    boolean same = false;
-                    for (PlotBlock p : blocks) {
-                        if (WorldUtil.IMP.isBlockSame(block, p)) {
-                            same = true;
-                            break;
-                        }
-                    }
-                    if (!same) {
-                        count++;
-                    }
-                }
-            }
-        }
-        return count;
-    }
-
-    public final ArrayList<ChunkLoc> getChunks(ChunkLoc region) {
-        ArrayList<ChunkLoc> chunks = new ArrayList<>();
-        int sx = region.x << 5;
-        int sz = region.z << 5;
-        for (int x = sx; x < sx + 32; x++) {
-            for (int z = sz; z < sz + 32; z++) {
-                chunks.add(new ChunkLoc(x, z));
-            }
-        }
-        return chunks;
-    }
-
-    public boolean scheduleRoadUpdate(PlotArea area, int extend) {
-        if (HybridUtils.UPDATE) {
-            return false;
-        }
-        HybridUtils.UPDATE = true;
-        Set<ChunkLoc> regions = ChunkManager.manager.getChunkChunks(area.worldname);
-        return scheduleRoadUpdate(area, regions, extend);
-    }
-
-    public boolean scheduleRoadUpdate(final PlotArea area, Set<ChunkLoc> rgs, final int extend) {
-        HybridUtils.regions = rgs;
-        HybridUtils.area = area;
-        chunks = new HashSet<>();
-        final AtomicInteger count = new AtomicInteger(0);
-        TaskManager.runTask(new Runnable() {
-            @Override public void run() {
-                if (!UPDATE) {
-                    Iterator<ChunkLoc> iter = chunks.iterator();
-                    while (iter.hasNext()) {
-                        ChunkLoc chunk = iter.next();
-                        iter.remove();
-                        regenerateRoad(area, chunk, extend);
-                        ChunkManager.manager.unloadChunk(area.worldname, chunk, true, true);
-                    }
-                    PlotSquared.debug("&cCancelled road task");
-                    return;
-                }
-                count.incrementAndGet();
-                if (count.intValue() % 20 == 0) {
-                    PlotSquared.debug("PROGRESS: " + 100 * (2048 - chunks.size()) / 2048 + "%");
-                }
-                if (regions.isEmpty() && chunks.isEmpty()) {
-                    HybridUtils.UPDATE = false;
-                    PlotSquared.debug(C.PREFIX.s() + "Finished road conversion");
-                    // CANCEL TASK
-                } else {
-                    final Runnable task = this;
-                    TaskManager.runTaskAsync(() -> {
-                        try {
-                            if (chunks.size() < 1024) {
-                                if (!regions.isEmpty()) {
-                                    Iterator<ChunkLoc> iterator = regions.iterator();
-                                    ChunkLoc loc = iterator.next();
-                                    iterator.remove();
-                                    PlotSquared.debug("&3Updating .mcr: " + loc.x + ", " + loc.z
-                                        + " (aprrox 1024 chunks)");
-                                    PlotSquared.debug(" - Remaining: " + regions.size());
-                                    chunks.addAll(getChunks(loc));
-                                    System.gc();
-                                }
-                            }
-                            if (!chunks.isEmpty()) {
-                                TaskManager.IMP.sync(new RunnableVal<Object>() {
-                                    @Override public void run(Object value) {
-                                        long start = System.currentTimeMillis();
-                                        Iterator<ChunkLoc> iterator = chunks.iterator();
-                                        while (System.currentTimeMillis() - start < 20 && !chunks
-                                            .isEmpty()) {
-                                            final ChunkLoc chunk = iterator.next();
-                                            iterator.remove();
-                                            regenerateRoad(area, chunk, extend);
-                                        }
-                                    }
-                                });
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            Iterator<ChunkLoc> iterator = regions.iterator();
-                            ChunkLoc loc = iterator.next();
-                            iterator.remove();
-                            PlotSquared.debug(
-                                "&c[ERROR]&7 Could not update '" + area.worldname + "/region/r."
-                                    + loc.x + "." + loc.z + ".mca' (Corrupt chunk?)");
-                            int sx = loc.x << 5;
-                            int sz = loc.z << 5;
-                            for (int x = sx; x < sx + 32; x++) {
-                                for (int z = sz; z < sz + 32; z++) {
-                                    ChunkManager.manager
-                                        .unloadChunk(area.worldname, new ChunkLoc(x, z), true,
-                                            true);
-                                }
-                            }
-                            PlotSquared.debug("&d - Potentially skipping 1024 chunks");
-                            PlotSquared.debug("&d - TODO: recommend chunkster if corrupt");
-                        }
-                        GlobalBlockQueue.IMP.addTask(() -> TaskManager.runTaskLater(task, 20));
-                    });
-                }
-            }
-        });
-        return true;
-    }
-
-    public boolean setupRoadSchematic(Plot plot) {
-        final String world = plot.getWorldName();
-        final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
-        Location bot = plot.getBottomAbs().subtract(1, 0, 1);
-        Location top = plot.getTopAbs();
-        final HybridPlotWorld plotworld = (HybridPlotWorld) plot.getArea();
-        PlotManager plotManager = plotworld.getPlotManager();
-        int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
-        int sz = bot.getZ() + 1;
-        int sy = plotworld.ROAD_HEIGHT;
-        int ex = bot.getX();
-        int ez = top.getZ();
-        int ey = get_ey(plotManager, queue, sx, ex, sz, ez, sy);
-        int bz = sz - plotworld.ROAD_WIDTH;
-        int tz = sz - 1;
-        int ty = get_ey(plotManager, queue, sx, ex, bz, tz, sy);
-
-        Set<RegionWrapper> sideRoad =
-            new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ey, sz, ez)));
-        final Set<RegionWrapper> intersection =
-            new HashSet<>(Collections.singletonList(new RegionWrapper(sx, ex, sy, ty, bz, tz)));
-
-        final String dir =
-            "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.getArea()
-                .toString() + File.separator;
-        SchematicHandler.manager.getCompoundTag(world, sideRoad, new RunnableVal<CompoundTag>() {
-            @Override public void run(CompoundTag value) {
-                SchematicHandler.manager.save(value, dir + "sideroad.schematic");
-                SchematicHandler.manager
-                    .getCompoundTag(world, intersection, new RunnableVal<CompoundTag>() {
-                        @Override public void run(CompoundTag value) {
-                            SchematicHandler.manager.save(value, dir + "intersection.schematic");
-                            plotworld.ROAD_SCHEMATIC_ENABLED = true;
-                            try {
-                                plotworld.setupSchematics();
-                            } catch (SchematicHandler.UnsupportedFormatException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    });
-            }
-        });
-        return true;
-    }
-
-    public int get_ey(final PlotManager pm, LocalBlockQueue queue, int sx, int ex, int sz, int ez,
-        int sy) {
-        int ey = sy;
-        for (int x = sx; x <= ex; x++) {
-            for (int z = sz; z <= ez; z++) {
-                for (int y = sy; y <= pm.getWorldHeight(); y++) {
-                    if (y > ey) {
-                        PlotBlock block = queue.getBlock(x, y, z);
-                        if (!block.isAir()) {
-                            ey = y;
-                        }
-                    }
-                }
-            }
-        }
-        return ey;
-    }
-
-    public boolean regenerateRoad(final PlotArea area, final ChunkLoc chunk, int extend) {
-        int x = chunk.x << 4;
-        int z = chunk.z << 4;
-        int ex = x + 15;
-        int ez = z + 15;
-        HybridPlotWorld plotWorld = (HybridPlotWorld) area;
-        if (!plotWorld.ROAD_SCHEMATIC_ENABLED) {
-            return false;
-        }
-        boolean toCheck = false;
-        if (plotWorld.TYPE == 2) {
-            boolean c1 = area.contains(x, z);
-            boolean c2 = area.contains(ex, ez);
-            if (!c1 && !c2) {
-                return false;
-            } else {
-                toCheck = c1 ^ c2;
-            }
-        }
-        PlotManager manager = area.getPlotManager();
-        PlotId id1 = manager.getPlotId(plotWorld, x, 0, z);
-        PlotId id2 = manager.getPlotId(plotWorld, ex, 0, ez);
-        x -= plotWorld.ROAD_OFFSET_X;
-        z -= plotWorld.ROAD_OFFSET_Z;
-        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(plotWorld.worldname, false);
-        if (id1 == null || id2 == null || id1 != id2) {
-            boolean result = ChunkManager.manager.loadChunk(area.worldname, chunk, false);
-            if (result) {
-                if (id1 != null) {
-                    Plot p1 = area.getPlotAbs(id1);
-                    if (p1 != null && p1.hasOwner() && p1.isMerged()) {
-                        toCheck = true;
-                    }
-                }
-                if (id2 != null && !toCheck) {
-                    Plot p2 = area.getPlotAbs(id2);
-                    if (p2 != null && p2.hasOwner() && p2.isMerged()) {
-                        toCheck = true;
-                    }
-                }
-                int size = plotWorld.SIZE;
-                for (int X = 0; X < 16; X++) {
-                    short absX = (short) ((x + X) % size);
-                    for (int Z = 0; Z < 16; Z++) {
-                        short absZ = (short) ((z + Z) % size);
-                        if (absX < 0) {
-                            absX += size;
-                        }
-                        if (absZ < 0) {
-                            absZ += size;
-                        }
-                        boolean condition;
-                        if (toCheck) {
-                            condition = manager
-                                .getPlotId(plotWorld, x + X + plotWorld.ROAD_OFFSET_X, 1,
-                                    z + Z + plotWorld.ROAD_OFFSET_Z) == null;
-                            //                            condition = MainUtil.isPlotRoad(new Location(plotworld.worldname, x + X, 1, z + Z));
-                        } else {
-                            boolean gx = absX > plotWorld.PATH_WIDTH_LOWER;
-                            boolean gz = absZ > plotWorld.PATH_WIDTH_LOWER;
-                            boolean lx = absX < plotWorld.PATH_WIDTH_UPPER;
-                            boolean lz = absZ < plotWorld.PATH_WIDTH_UPPER;
-                            condition = !gx || !gz || !lx || !lz;
-                        }
-                        if (condition) {
-                            BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                            int minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
-                            int maxY = Math.max(extend, blocks.length);
-                            if (blocks != null) {
-                                for (int y = 0; y < maxY; y++) {
-                                    if (y > blocks.length - 1) {
-                                        queue.setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y,
-                                            z + Z + plotWorld.ROAD_OFFSET_Z, WEExtent.AIRBASE);
-                                    } else {
-                                        BaseBlock block = blocks[y];
-                                        if (block != null) {
-                                            queue
-                                                .setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y,
-                                                    z + Z + plotWorld.ROAD_OFFSET_Z, block);
-                                        } else {
-                                            queue
-                                                .setBlock(x + X + plotWorld.ROAD_OFFSET_X, minY + y,
-                                                    z + Z + plotWorld.ROAD_OFFSET_Z,
-                                                    WEExtent.AIRBASE);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                queue.enqueue();
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
deleted file mode 100644
index e06d7208e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
-
-/**
- * This class allows for implementation independent world generation.
- * - Sponge/Bukkit API
- * Use the specify method to get the generator for that platform.
- */
-public abstract class IndependentPlotGenerator {
-
-    /**
-     * Get the name of this generator.
-     */
-    public abstract String getName();
-
-    /**
-     * Generates a 16x4096 array of BlockBuckets corresponding to the area settings to allow for plot analysis
-     *
-     * @param settings
-     * @return
-     */
-    public abstract BlockBucket[][] generateBlockBucketChunk(PlotArea settings);
-
-    /**
-     * Use the setBlock or setBiome method of the PlotChunk result parameter to make changes.
-     * The PlotArea settings is the same one this was initialized with.
-     * The PseudoRandom random is a fast random object.
-     *
-     * @param result
-     * @param settings
-     */
-    public abstract void generateChunk(ScopedLocalBlockQueue result, PlotArea settings);
-
-    public boolean populateChunk(ScopedLocalBlockQueue result, PlotArea setting) {
-        return false;
-    }
-
-    /**
-     * Return a new PlotArea object.
-     *
-     * @param world world name
-     * @param id    (May be null) Area name
-     * @param min   Min plot id (may be null)
-     * @param max   Max plot id (may be null)
-     * @return
-     */
-    public abstract PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max);
-
-    /**
-     * Return a new PlotManager object.
-     *
-     * @return
-     */
-    public abstract PlotManager getNewPlotManager();
-
-    /**
-     * If any additional setup options need to be changed before world creation.
-     * - e.g. If setup doesn't support some standard options
-     *
-     * @param setup
-     */
-    public void processSetup(SetupObject setup) {
-    }
-
-    /**
-     * It is preferred for the PlotArea object to do most of the initialization necessary.
-     *
-     * @param area
-     */
-    public abstract void initialize(PlotArea area);
-
-    /**
-     * Get the generator for your specific implementation (bukkit/sponge).<br>
-     * - e.g. YourIndependentGenerator.&lt;ChunkGenerator&gt;specify() - Would return a ChunkGenerator object<br>
-     *
-     * @param <T>
-     * @param <T>
-     * @return
-     */
-    public <T> GeneratorWrapper<T> specify(String world) {
-        return (GeneratorWrapper<T>) PlotSquared.get().IMP.wrapPlotGenerator(world, this);
-    }
-
-    @Override public String toString() {
-        return getName();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java
deleted file mode 100644
index 88c7f2557..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/PlotGenerator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
-import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
-
-public abstract class PlotGenerator<T> {
-
-    public final T generator;
-
-    public PlotGenerator(T generator) {
-        this.generator = generator;
-    }
-
-    public abstract void initialize(PlotArea plotArea);
-
-    /**
-     * TYPE = 2;
-     * new AugmentedPopulator(world, generator, cluster, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
-     * TYPE = 1
-     * new AugmentedPopulator(world, gen_class, null, plotWorld.TERRAIN == 2, plotWorld.TERRAIN != 2);
-     *
-     * @param area
-     */
-    public abstract void augment(PlotArea area);
-
-    public abstract PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max);
-
-    public abstract PlotManager getPlotManager();
-
-    public abstract boolean isFull();
-
-    public abstract String getName();
-
-    public abstract void processSetup(SetupObject object);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
deleted file mode 100644
index d65e4940e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-
-/**
- * A plot manager with a square grid layout, with square shaped plots.
- */
-public abstract class SquarePlotManager extends GridPlotManager {
-
-    @Override
-    public boolean clearPlot(PlotArea plotArea, final Plot plot, final Runnable whenDone) {
-        final HashSet<RegionWrapper> regions = plot.getRegions();
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    whenDone.run();
-                    return;
-                }
-                Iterator<RegionWrapper> iterator = regions.iterator();
-                RegionWrapper region = iterator.next();
-                iterator.remove();
-                Location pos1 =
-                    new Location(plot.getWorldName(), region.minX, region.minY, region.minZ);
-                Location pos2 =
-                    new Location(plot.getWorldName(), region.maxX, region.maxY, region.maxZ);
-                ChunkManager.manager.regenerateRegion(pos1, pos2, false, this);
-            }
-        };
-        run.run();
-        return true;
-    }
-
-    @Override public Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-        int px = plotId.x;
-        int pz = plotId.y;
-        int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - (int) Math
-            .floor(dpw.ROAD_WIDTH / 2) - 1;
-        int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - (int) Math
-            .floor(dpw.ROAD_WIDTH / 2) - 1;
-        return new Location(plotArea.worldname, x, Math.min(getWorldHeight(), 255), z);
-    }
-
-    @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-        if (dpw.ROAD_OFFSET_X != 0) {
-            x -= dpw.ROAD_OFFSET_X;
-        }
-        if (dpw.ROAD_OFFSET_Z != 0) {
-            z -= dpw.ROAD_OFFSET_Z;
-        }
-        int pathWidthLower;
-        int end;
-        if (dpw.ROAD_WIDTH == 0) {
-            pathWidthLower = -1;
-            end = dpw.PLOT_WIDTH;
-        } else {
-            if ((dpw.ROAD_WIDTH % 2) == 0) {
-                pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
-            } else {
-                pathWidthLower = dpw.ROAD_WIDTH / 2;
-            }
-            end = pathWidthLower + dpw.PLOT_WIDTH;
-        }
-        int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
-        int idx;
-        if (x < 0) {
-            idx = x / size;
-            x = size + (x % size);
-        } else {
-            idx = (x / size) + 1;
-            x = x % size;
-        }
-        int idz;
-        if (z < 0) {
-            idz = z / size;
-            z = size + (z % size);
-        } else {
-            idz = (z / size) + 1;
-            z = z % size;
-        }
-        if (z <= pathWidthLower || z > end || x <= pathWidthLower || x > end) {
-            return null;
-        } else {
-            return new PlotId(idx, idz);
-        }
-    }
-
-    public PlotId getNearestPlotId(PlotArea plotArea, int x, int y, int z) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-        if (dpw.ROAD_OFFSET_X != 0) {
-            x -= dpw.ROAD_OFFSET_X;
-        }
-        if (dpw.ROAD_OFFSET_Z != 0) {
-            z -= dpw.ROAD_OFFSET_Z;
-        }
-        int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
-        int idx;
-        if (x < 0) {
-            idx = x / size;
-        } else {
-            idx = (x / size) + 1;
-        }
-        int idz;
-        if (z < 0) {
-            idz = z / size;
-        } else {
-            idz = (z / size) + 1;
-        }
-        return new PlotId(idx, idz);
-    }
-
-    @Override public PlotId getPlotId(PlotArea plotArea, int x, int y, int z) {
-        try {
-            SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-            if (plotArea == null) {
-                return null;
-            }
-            x -= dpw.ROAD_OFFSET_X;
-            z -= dpw.ROAD_OFFSET_Z;
-            int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
-            int pathWidthLower;
-            int end;
-            if (dpw.ROAD_WIDTH == 0) {
-                pathWidthLower = -1;
-                end = dpw.PLOT_WIDTH;
-            } else {
-                if ((dpw.ROAD_WIDTH % 2) == 0) {
-                    pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
-                } else {
-                    pathWidthLower = dpw.ROAD_WIDTH / 2;
-                }
-                end = pathWidthLower + dpw.PLOT_WIDTH;
-            }
-            int dx;
-            int rx;
-            if (x < 0) {
-                dx = x / size;
-                rx = size + (x % size);
-            } else {
-                dx = (x / size) + 1;
-                rx = x % size;
-            }
-            int dz;
-            int rz;
-            if (z < 0) {
-                dz = z / size;
-                rz = size + (z % size);
-            } else {
-                dz = (z / size) + 1;
-                rz = z % size;
-            }
-            PlotId id = new PlotId(dx, dz);
-            boolean[] merged =
-                new boolean[] {rz <= pathWidthLower, rx > end, rz > end, rx <= pathWidthLower};
-            int hash = MainUtil.hash(merged);
-            // Not merged, and no need to check if it is
-            if (hash == 0) {
-                return id;
-            }
-            Plot plot = plotArea.getOwnedPlotAbs(id);
-            // Not merged, and standing on road
-            if (plot == null) {
-                return null;
-            }
-            switch (hash) {
-                case 8:
-                    // north
-                    return plot.getMerged(0) ? id : null;
-                case 4:
-                    // east
-                    return plot.getMerged(1) ? id : null;
-                case 2:
-                    // south
-                    return plot.getMerged(2) ? id : null;
-                case 1:
-                    // west
-                    return plot.getMerged(3) ? id : null;
-                case 12:
-                    // northest
-                    return plot.getMerged(4) ? id : null;
-                case 6:
-                    // southeast
-                    return plot.getMerged(5) ? id : null;
-                case 3:
-                    // southwest
-                    return plot.getMerged(6) ? id : null;
-                case 9:
-                    // northwest
-                    return plot.getMerged(7) ? id : null;
-            }
-            PlotSquared.debug("invalid location: " + Arrays.toString(merged));
-        } catch (Exception ignored) {
-            PlotSquared.debug(
-                "Invalid plot / road width in settings.yml for world: " + plotArea.worldname);
-        }
-        return null;
-    }
-
-    /**
-     * Get the bottom plot loc (some basic math).
-     */
-    @Override public Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-        int px = plotId.x;
-        int pz = plotId.y;
-        int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH
-            - (int) Math.floor(dpw.ROAD_WIDTH / 2);
-        int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH
-            - (int) Math.floor(dpw.ROAD_WIDTH / 2);
-        return new Location(plotArea.worldname, x, plotArea.MIN_BUILD_HEIGHT, z);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
deleted file mode 100644
index 5401d221a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.generator;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-
-public abstract class SquarePlotWorld extends GridPlotWorld {
-
-    public int PLOT_WIDTH = 42;
-    public int ROAD_WIDTH = 7;
-    public int ROAD_OFFSET_X = 0;
-    public int ROAD_OFFSET_Z = 0;
-
-    public SquarePlotWorld(String worldName, String id, IndependentPlotGenerator generator,
-        PlotId min, PlotId max) {
-        super(worldName, id, generator, min, max);
-    }
-
-    @Override public void loadConfiguration(ConfigurationSection config) {
-        if (!config.contains("plot.height")) {
-            PlotSquared.debug(" - &cConfiguration is null? (" + config.getCurrentPath() + ')');
-        }
-        this.PLOT_WIDTH = config.getInt("plot.size");
-        this.ROAD_WIDTH = config.getInt("road.width");
-        this.ROAD_OFFSET_X = config.getInt("road.offset.x");
-        this.ROAD_OFFSET_Z = config.getInt("road.offset.z");
-        this.SIZE = (short) (this.PLOT_WIDTH + this.ROAD_WIDTH);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java
deleted file mode 100644
index 5d0c86858..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ExtentWrapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-import com.sk89q.worldedit.extent.AbstractDelegateExtent;
-import com.sk89q.worldedit.extent.Extent;
-
-public class ExtentWrapper extends AbstractDelegateExtent {
-
-    protected ExtentWrapper(final Extent extent) {
-        super(extent);
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java
deleted file mode 100644
index 815f5ea43..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlayerBlockEventType.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-public enum PlayerBlockEventType {
-    // Non interactive
-    EAT, READ,
-
-    // Right click with monster egg
-    SPAWN_MOB,
-
-    // Dragon egg
-    TELEPORT_OBJECT,
-
-    // armor stands
-    PLACE_MISC, // blocks
-    PLACE_BLOCK, // paintings / item frames
-    PLACE_HANGING, // vehicles
-    PLACE_VEHICLE,
-
-    // armor stands
-    BREAK_MISC, // blocks
-    BREAK_BLOCK, // paintings / item frames
-    BREAK_HANGING, BREAK_VEHICLE,
-
-    // armor stands
-    INTERACT_MISC, // blocks
-    INTERACT_BLOCK, // vehicle
-    INTERACT_VEHICLE, // item frame / painting
-    INTERACT_HANGING,
-
-    // Pressure plate, tripwire etc
-    TRIGGER_PHYSICAL,
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
deleted file mode 100644
index ed8b42f57..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
-public class PlotListener {
-
-    public static boolean plotEntry(final PlotPlayer player, final Plot plot) {
-        if (plot.isDenied(player.getUUID()) && !Permissions
-            .hasPermission(player, "plots.admin.entry.denied")) {
-            return false;
-        }
-        Plot last = player.getMeta(PlotPlayer.META_LAST_PLOT);
-        if ((last != null) && !last.getId().equals(plot.getId())) {
-            plotExit(player, last);
-        }
-        if (ExpireManager.IMP != null) {
-            ExpireManager.IMP.handleEntry(player, plot);
-        }
-        player.setMeta(PlotPlayer.META_LAST_PLOT, plot);
-        EventUtil.manager.callEntry(player, plot);
-        if (plot.hasOwner()) {
-            Map<Flag<?>, Object> flags = FlagManager.getPlotFlags(plot);
-
-            boolean titles;
-            if (!plot.getArea().DEFAULT_FLAGS.isEmpty()) {
-                Boolean value = (Boolean) plot.getArea().DEFAULT_FLAGS.get(Flags.TITLES);
-                titles = value != null ? value : Settings.TITLES;
-            } else {
-                titles = Settings.TITLES;
-            }
-            final String greeting;
-            if (flags.isEmpty()) {
-                if (titles) {
-                    greeting = "";
-                } else {
-                    return true;
-                }
-            } else {
-                titles = plot.getFlag(Flags.TITLES, titles);
-                Optional<String> greetingFlag = plot.getFlag(Flags.GREETING);
-                if (greetingFlag.isPresent()) {
-                    greeting = greetingFlag.get();
-                    MainUtil.format(C.PREFIX_GREETING.s() + greeting, plot, player, false,
-                        new RunnableVal<String>() {
-                            @Override public void run(String value) {
-                                MainUtil.sendMessage(player, value);
-                            }
-                        });
-                } else {
-                    greeting = "";
-                }
-                Optional<Boolean> enter = plot.getFlag(Flags.NOTIFY_ENTER);
-                if (enter.isPresent() && enter.get()) {
-                    if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) {
-                        for (UUID uuid : plot.getOwners()) {
-                            PlotPlayer owner = UUIDHandler.getPlayer(uuid);
-                            if (owner != null && !owner.getUUID().equals(player.getUUID())) {
-                                MainUtil.sendMessage(owner,
-                                    C.NOTIFY_ENTER.s().replace("%player", player.getName())
-                                        .replace("%plot", plot.getId().toString()));
-                            }
-                        }
-                    }
-                }
-                Optional<Boolean> flyFlag = plot.getFlag(Flags.FLY);
-                if (flyFlag.isPresent()) {
-                    boolean flight = player.getFlight();
-                    PlotGameMode gamemode = player.getGameMode();
-                    if (flight != (gamemode == PlotGameMode.CREATIVE
-                        || gamemode == PlotGameMode.SPECTATOR)) {
-                        player.setPersistentMeta("flight",
-                            ByteArrayUtilities.booleanToBytes(player.getFlight()));
-                    }
-                    if (flyFlag.get() != player.getFlight()) {
-                        player.setFlight(flyFlag.get());
-                    }
-                }
-                Optional<PlotGameMode> gamemodeFlag = plot.getFlag(Flags.GAMEMODE);
-                if (gamemodeFlag.isPresent()) {
-                    if (player.getGameMode() != gamemodeFlag.get()) {
-                        if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) {
-                            player.setGameMode(gamemodeFlag.get());
-                        } else {
-                            MainUtil.sendMessage(player, StringMan
-                                .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.getId(),
-                                    "{gamemode}", gamemodeFlag.get()));
-                        }
-                    }
-                }
-                Optional<PlotGameMode> guestGamemodeFlag = plot.getFlag(Flags.GUEST_GAMEMODE);
-                if (guestGamemodeFlag.isPresent()) {
-                    if (player.getGameMode() != guestGamemodeFlag.get() && !plot
-                        .isAdded(player.getUUID())) {
-                        if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) {
-                            player.setGameMode(guestGamemodeFlag.get());
-                        } else {
-                            MainUtil.sendMessage(player, StringMan
-                                .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.getId(),
-                                    "{gamemode}", guestGamemodeFlag.get()));
-                        }
-                    }
-                }
-                Optional<Long> timeFlag = plot.getFlag(Flags.TIME);
-                if (timeFlag.isPresent()) {
-                    try {
-                        long time = timeFlag.get();
-                        player.setTime(time);
-                    } catch (Exception ignored) {
-                        FlagManager.removePlotFlag(plot, Flags.TIME);
-                    }
-                }
-                Optional<PlotWeather> weatherFlag = plot.getFlag(Flags.WEATHER);
-                weatherFlag.ifPresent(player::setWeather);
-                Optional<String> musicFlag = plot.getFlag(Flags.MUSIC);
-                if (musicFlag.isPresent()) {
-                    final String id = musicFlag.get();
-                    final PlotBlock block = PlotBlock.get(id);
-                    final String rawId = block.getRawId().toString();
-                    if (rawId.contains("disc") || PlotBlock.isEverything(block) || block.isAir()) {
-                        Location loc = player.getLocation();
-                        Location lastLoc = player.getMeta("music");
-                        if (lastLoc != null) {
-                            player.playMusic(lastLoc, PlotBlock.get("air"));
-                            if (PlotBlock.isEverything(block) || block.isAir()) {
-                                player.deleteMeta("music");
-                            }
-                        }
-                        if (!(PlotBlock.isEverything(block) || block.isAir())) {
-                            try {
-                                player.setMeta("music", loc);
-                                player.playMusic(loc, block);
-                            } catch (Exception ignored) {
-                            }
-                        }
-                    }
-                } else {
-                    Location lastLoc = player.getMeta("music");
-                    if (lastLoc != null) {
-                        player.deleteMeta("music");
-                        player.playMusic(lastLoc, PlotBlock.get("air"));
-                    }
-                }
-                CommentManager.sendTitle(player, plot);
-            }
-            if (titles) {
-                if (!C.TITLE_ENTERED_PLOT.s().isEmpty() || !C.TITLE_ENTERED_PLOT_SUB.s()
-                    .isEmpty()) {
-                    TaskManager.runTaskLaterAsync(() -> {
-                        Plot lastPlot = player.getMeta(PlotPlayer.META_LAST_PLOT);
-                        if ((lastPlot != null) && plot.getId().equals(lastPlot.getId())) {
-                            Map<String, String> replacements = new HashMap<>();
-                            replacements.put("%x%", String.valueOf(lastPlot.getId().x));
-                            replacements.put("%z%", lastPlot.getId().y + "");
-                            replacements.put("%world%", plot.getArea().toString());
-                            replacements.put("%greeting%", greeting);
-                            replacements.put("%alias", plot.toString());
-                            replacements.put("%s", MainUtil.getName(plot.owner));
-                            String main =
-                                StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
-                            String sub = StringMan
-                                .replaceFromMap(C.TITLE_ENTERED_PLOT_SUB.s(), replacements);
-                            AbstractTitle.sendTitle(player, main, sub);
-                        }
-                    }, 20);
-                }
-            }
-            return true;
-        }
-        return true;
-    }
-
-    public static boolean plotExit(final PlotPlayer player, Plot plot) {
-        Object previous = player.deleteMeta(PlotPlayer.META_LAST_PLOT);
-        EventUtil.manager.callLeave(player, plot);
-        if (plot.hasOwner()) {
-            PlotArea pw = plot.getArea();
-            if (pw == null) {
-                return true;
-            }
-            if (Flags.DENY_EXIT.isTrue(plot) && !player.getMeta("kick", false)) {
-                if (previous != null) {
-                    player.setMeta(PlotPlayer.META_LAST_PLOT, previous);
-                }
-                return false;
-            }
-            if (plot.getFlag(Flags.GAMEMODE).isPresent() || plot.getFlag(Flags.GUEST_GAMEMODE)
-                .isPresent()) {
-                if (player.getGameMode() != pw.GAMEMODE) {
-                    if (!Permissions.hasPermission(player, "plots.gamemode.bypass")) {
-                        player.setGameMode(pw.GAMEMODE);
-                    } else {
-                        MainUtil.sendMessage(player, StringMan
-                            .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.toString(),
-                                "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
-                    }
-                }
-            }
-            Optional<String> farewell = plot.getFlag(Flags.FAREWELL);
-            farewell.ifPresent(s -> MainUtil
-                .format(C.PREFIX_FAREWELL.s() + s, plot, player, false, new RunnableVal<String>() {
-                    @Override public void run(String value) {
-                        MainUtil.sendMessage(player, value);
-                    }
-                }));
-            Optional<Boolean> leave = plot.getFlag(Flags.NOTIFY_LEAVE);
-            if (leave.isPresent() && leave.get()) {
-                if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) {
-                    for (UUID uuid : plot.getOwners()) {
-                        PlotPlayer owner = UUIDHandler.getPlayer(uuid);
-                        if ((owner != null) && !owner.getUUID().equals(player.getUUID())) {
-                            MainUtil.sendMessage(owner,
-                                C.NOTIFY_LEAVE.s().replace("%player", player.getName())
-                                    .replace("%plot", plot.getId().toString()));
-                        }
-                    }
-                }
-            }
-            if (plot.getFlag(Flags.FLY).isPresent()) {
-                if (player.hasPersistentMeta("flight")) {
-                    player.setFlight(
-                        ByteArrayUtilities.bytesToBoolean(player.getPersistentMeta("flight")));
-                    player.removePersistentMeta("flight");
-                } else {
-                    PlotGameMode gameMode = player.getGameMode();
-                    if (gameMode == PlotGameMode.SURVIVAL || gameMode == PlotGameMode.ADVENTURE) {
-                        player.setFlight(false);
-                    } else if (!player.getFlight()) {
-                        player.setFlight(true);
-                    }
-                }
-            }
-            if (plot.getFlag(Flags.TIME).isPresent()) {
-                player.setTime(Long.MAX_VALUE);
-            }
-
-            if (plot.getFlag(Flags.WEATHER).isPresent()) {
-                player.setWeather(PlotWeather.CLEAR);
-            }
-
-            Location lastLoc = player.getMeta("music");
-            if (lastLoc != null) {
-                player.deleteMeta("music");
-                player.playMusic(lastLoc, PlotBlock.get("air"));
-            }
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
deleted file mode 100644
index 431c2c378..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extent.AbstractDelegateExtent;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.extent.NullExtent;
-import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.biome.BaseBiome;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-
-import java.lang.reflect.Field;
-import java.util.HashSet;
-
-public class ProcessedWEExtent extends AbstractDelegateExtent {
-
-    private final HashSet<RegionWrapper> mask;
-    private final String world;
-    private final int max;
-    int BScount = 0;
-    int Ecount = 0;
-    boolean BSblocked = false;
-    boolean Eblocked = false;
-    private int count;
-    private Extent parent;
-
-    public ProcessedWEExtent(String world, HashSet<RegionWrapper> mask, int max, Extent child,
-        Extent parent) {
-        super(child);
-        this.mask = mask;
-        this.world = world;
-        if (max == -1) {
-            max = Integer.MAX_VALUE;
-        }
-        this.max = max;
-        this.count = 0;
-        this.parent = parent;
-    }
-
-    @Override public BlockState getBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getBlock(location);
-        }
-        return WEExtent.AIRSTATE;
-    }
-
-    @Override public BaseBlock getFullBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getFullBlock(location);
-        }
-        return WEExtent.AIRBASE;
-    }
-
-    @Override public boolean setBlock(BlockVector3 location, BlockStateHolder block)
-        throws WorldEditException {
-        String id = block.getBlockType().getId();
-        switch (id) {
-            case "54":
-            case "130":
-            case "142":
-            case "27":
-            case "137":
-            case "52":
-            case "154":
-            case "84":
-            case "25":
-            case "144":
-            case "138":
-            case "176":
-            case "177":
-            case "63":
-            case "68":
-            case "323":
-            case "117":
-            case "116":
-            case "28":
-            case "66":
-            case "157":
-            case "61":
-            case "62":
-            case "140":
-            case "146":
-            case "149":
-            case "150":
-            case "158":
-            case "23":
-            case "123":
-            case "124":
-            case "29":
-            case "33":
-            case "151":
-            case "178":
-                if (this.BSblocked) {
-                    return false;
-                }
-                this.BScount++;
-                if (this.BScount > Settings.Chunk_Processor.MAX_TILES) {
-                    this.BSblocked = true;
-                    PlotSquared.debug(
-                        C.PREFIX + "&cdetected unsafe WorldEdit: " + location.getX() + ","
-                            + location.getZ());
-                }
-                if (WEManager
-                    .maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-                    if (this.count++ > this.max) {
-                        if (this.parent != null) {
-                            try {
-                                Field field =
-                                    AbstractDelegateExtent.class.getDeclaredField("extent");
-                                field.setAccessible(true);
-                                field.set(this.parent, new NullExtent());
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            this.parent = null;
-                        }
-                        return false;
-                    }
-                    return super.setBlock(location, block);
-                }
-                break;
-            default:
-                if (WEManager
-                    .maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-                    if (this.count++ > this.max) {
-                        if (this.parent != null) {
-                            try {
-                                Field field =
-                                    AbstractDelegateExtent.class.getDeclaredField("extent");
-                                field.setAccessible(true);
-                                field.set(this.parent, new NullExtent());
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
-                            this.parent = null;
-                        }
-                        return false;
-                    }
-                    super.setBlock(location, block);
-                }
-                return true;
-
-        }
-        return false;
-    }
-
-    @Override public Entity createEntity(Location location, BaseEntity entity) {
-        if (this.Eblocked) {
-            return null;
-        }
-        this.Ecount++;
-        if (this.Ecount > Settings.Chunk_Processor.MAX_ENTITIES) {
-            this.Eblocked = true;
-            PlotSquared.debug(
-                C.PREFIX + "&cdetected unsafe WorldEdit: " + location.getBlockX() + "," + location
-                    .getBlockZ());
-        }
-        if (WEManager.maskContains(this.mask, location.getBlockX(), location.getBlockY(),
-            location.getBlockZ())) {
-            return super.createEntity(location, entity);
-        }
-        return null;
-    }
-
-    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
-        return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
-            .setBiome(position, biome);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
deleted file mode 100644
index ac0503886..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extent.AbstractDelegateExtent;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.biome.BaseBiome;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import com.sk89q.worldedit.world.block.BlockState;
-import com.sk89q.worldedit.world.block.BlockStateHolder;
-import com.sk89q.worldedit.world.block.BlockTypes;
-
-import java.util.HashSet;
-
-public class WEExtent extends AbstractDelegateExtent {
-
-    public static BlockState AIRSTATE = BlockTypes.AIR.getDefaultState();
-    public static BaseBlock AIRBASE = BlockTypes.AIR.getDefaultState().toBaseBlock();
-    private final HashSet<RegionWrapper> mask;
-
-    public WEExtent(HashSet<RegionWrapper> mask, Extent extent) {
-        super(extent);
-        this.mask = mask;
-    }
-
-    @Override public boolean setBlock(BlockVector3 location, BlockStateHolder block)
-        throws WorldEditException {
-        return WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())
-            && super.setBlock(location, block);
-    }
-
-    @Override public Entity createEntity(Location location, BaseEntity entity) {
-        if (WEManager.maskContains(this.mask, location.getBlockX(), location.getBlockY(),
-            location.getBlockZ())) {
-            return super.createEntity(location, entity);
-        }
-        return null;
-    }
-
-    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
-        return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
-            .setBiome(position, biome);
-    }
-
-    @Override public BlockState getBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getBlock(location);
-        }
-        return AIRSTATE;
-    }
-
-    @Override public BaseBlock getFullBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getFullBlock(location);
-        }
-        return AIRBASE;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
deleted file mode 100644
index 0d80cab31..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-
-import java.util.HashSet;
-import java.util.UUID;
-
-public class WEManager {
-
-    public static boolean maskContains(HashSet<RegionWrapper> mask, int x, int y, int z) {
-        for (RegionWrapper region : mask) {
-            if (region.isIn(x, y, z)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean maskContains(HashSet<RegionWrapper> mask, int x, int z) {
-        for (RegionWrapper region : mask) {
-            if (region.isIn(x, z)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean maskContains(HashSet<RegionWrapper> mask, double dx, double dy,
-        double dz) {
-        int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
-        int y = Math.toIntExact(Math.round(dy - 0.5));
-        int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
-        for (RegionWrapper region : mask) {
-            if (region.isIn(x, y, z)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean maskContains(HashSet<RegionWrapper> mask, double dx, double dz) {
-        int x = Math.toIntExact(Math.round(dx >= 0 ? dx - 0.5 : dx + 0.5));
-        int z = Math.toIntExact(Math.round(dz >= 0 ? dz - 0.5 : dz + 0.5));
-        for (RegionWrapper region : mask) {
-            if (region.isIn(x, z)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static HashSet<RegionWrapper> getMask(PlotPlayer player) {
-        HashSet<RegionWrapper> regions = new HashSet<>();
-        UUID uuid = player.getUUID();
-        Location location = player.getLocation();
-        String world = location.getWorld();
-        if (!PlotSquared.get().hasPlotArea(world)) {
-            regions.add(new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
-                Integer.MAX_VALUE));
-            return regions;
-        }
-        PlotArea area = player.getApplicablePlotArea();
-        if (area == null) {
-            return regions;
-        }
-        boolean allowMember = player.hasPermission("plots.worldedit.member");
-        Plot plot = player.getCurrentPlot();
-        HashSet<RegionWrapper> allowed = new HashSet<>();
-        if (plot == null) {
-            plot = player.getMeta("WorldEditRegionPlot");
-        }
-        if (plot != null && (!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot)) && (
-            (allowMember && plot.isAdded(uuid)) || (!allowMember && (plot.isOwner(uuid)) || plot
-                .getTrusted().contains(uuid))) && !(Flags.NO_WORLDEDIT.isTrue(plot))) {
-            for (RegionWrapper region : plot.getRegions()) {
-                RegionWrapper copy =
-                    new RegionWrapper(region.minX, region.maxX, area.MIN_BUILD_HEIGHT,
-                        area.MAX_BUILD_HEIGHT, region.minZ, region.maxZ);
-                regions.add(copy);
-            }
-            player.setMeta("WorldEditRegionPlot", plot);
-        }
-        return regions;
-    }
-
-    public static boolean intersects(RegionWrapper region1, RegionWrapper region2) {
-        return region1.intersects(region2);
-    }
-
-    public static boolean regionContains(RegionWrapper selection, HashSet<RegionWrapper> mask) {
-        for (RegionWrapper region : mask) {
-            if (intersects(region, selection)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
deleted file mode 100644
index f86b9f53c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.listener;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.entity.Player;
-import com.sk89q.worldedit.event.extent.EditSessionEvent;
-import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.extent.NullExtent;
-import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.util.eventbus.EventHandler.Priority;
-import com.sk89q.worldedit.util.eventbus.Subscribe;
-import com.sk89q.worldedit.world.World;
-
-import java.util.HashSet;
-
-public class WESubscriber {
-
-    @Subscribe(priority = Priority.VERY_EARLY) public void onEditSession(EditSessionEvent event) {
-        WorldEdit worldedit = PlotSquared.get().worldedit;
-        if (worldedit == null) {
-            WorldEdit.getInstance().getEventBus().unregister(this);
-            return;
-        }
-        World worldObj = event.getWorld();
-        String world = worldObj.getName();
-        Actor actor = event.getActor();
-        if (actor != null && actor.isPlayer()) {
-            String name = actor.getName();
-            PlotPlayer pp = PlotPlayer.wrap(name);
-            HashSet<RegionWrapper> mask;
-            if (pp == null) {
-                Player player = (Player) actor;
-                Location loc = player.getLocation();
-                com.github.intellectualsites.plotsquared.plot.object.Location pLoc =
-                    new com.github.intellectualsites.plotsquared.plot.object.Location(
-                        player.getWorld().getName(), loc.getBlockX(), loc.getBlockX(),
-                        loc.getBlockZ());
-                Plot plot = pLoc.getPlot();
-                if (plot == null) {
-                    event.setExtent(new NullExtent());
-                    return;
-                }
-                mask = plot.getRegions();
-            } else if (pp.getAttribute("worldedit")) {
-                return;
-            } else {
-                mask = WEManager.getMask(pp);
-                if (mask.isEmpty()) {
-                    if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
-                        MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
-                    }
-                    if (PlotSquared.get().hasPlotArea(world)) {
-                        event.setExtent(new NullExtent());
-                    }
-                    return;
-                }
-            }
-            if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
-                if (PlotSquared.get().hasPlotArea(world)) {
-                    event.setExtent(
-                        new ProcessedWEExtent(world, mask, event.getMaxBlocks(), event.getExtent(),
-                            event.getExtent()));
-                }
-            } else if (PlotSquared.get().hasPlotArea(world)) {
-                event.setExtent(new WEExtent(mask, event.getExtent()));
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java
deleted file mode 100644
index ed925a135..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/DelegateLogger.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.logger;
-
-public class DelegateLogger implements ILogger {
-
-    private final ILogger parent;
-
-    public DelegateLogger(ILogger parent) {
-        this.parent = parent;
-    }
-
-    public ILogger getParent() {
-        return parent;
-    }
-
-    @Override public void log(String message) {
-        parent.log(message);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
deleted file mode 100644
index 29a45ac27..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.logger;
-
-@FunctionalInterface public interface ILogger {
-    void log(String message);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
deleted file mode 100644
index 3278b62d3..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.google.common.collect.ImmutableMap;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
-import java.util.*;
-import java.util.Map.Entry;
-
-/**
- * A block bucket is a container of block types, where each block
- * has a specified chance of being randomly picked
- */
-@EqualsAndHashCode @SuppressWarnings({"unused", "WeakerAccess"}) public final class BlockBucket
-    implements Iterable<PlotBlock>, ConfigurationSerializable {
-
-    private final Random random = new Random();
-    private final Map<Range, PlotBlock> ranges = new HashMap<>();
-    private final Map<PlotBlock, Integer> blocks;
-    private final BucketIterator bucketIterator = new BucketIterator();
-    private boolean compiled, singleItem;
-    private PlotBlock head;
-
-    public BlockBucket() {
-        this.blocks = new HashMap<>();
-    }
-
-    public static BlockBucket withSingle(@NonNull final PlotBlock block) {
-        final BlockBucket blockBucket = new BlockBucket();
-        blockBucket.addBlock(block, 100);
-        return blockBucket;
-    }
-
-    public static BlockBucket deserialize(@NonNull final Map<String, Object> map) {
-        if (!map.containsKey("blocks")) {
-            return null;
-        }
-        return Configuration.BLOCK_BUCKET.parseString(map.get("blocks").toString());
-    }
-
-    public void addBlock(@NonNull final PlotBlock block) {
-        this.addBlock(block, -1);
-    }
-
-    public void addBlock(@NonNull final PlotBlock block, final int chance) {
-        this.blocks.put(block, chance);
-        this.compiled = false;
-        if (head == null) {
-            head = block;
-        }
-    }
-
-    public boolean isEmpty() {
-        if (isCompiled()) {
-            return ranges.isEmpty();
-        }
-        return blocks.isEmpty();
-    }
-
-    /**
-     * Get all blocks that are configured in the bucket
-     *
-     * @return Immutable collection containing all blocks that can
-     * be found in the bucket
-     */
-    public Collection<PlotBlock> getBlocks() {
-        if (!isCompiled()) {
-            this.compile();
-        }
-        return Collections.unmodifiableCollection(this.ranges.values());
-    }
-
-    /**
-     * Get a collection containing a specified amount of randomly selected blocks
-     *
-     * @param count Number of blocks
-     * @return Immutable collection containing randomly selected blocks
-     */
-    public Collection<PlotBlock> getBlocks(final int count) {
-        return Arrays.asList(getBlockArray(count));
-    }
-
-    /**
-     * Get an array containing a specified amount of randomly selected blocks
-     *
-     * @param count Number of blocks
-     * @return Immutable collection containing randomly selected blocks
-     */
-    public PlotBlock[] getBlockArray(final int count) {
-        final PlotBlock[] blocks = new PlotBlock[count];
-        if (this.singleItem) {
-            Arrays.fill(blocks, 0, count, getBlock());
-        } else {
-            for (int i = 0; i < count; i++) {
-                blocks[i] = getBlock();
-            }
-        }
-        return blocks;
-    }
-
-    public boolean hasSingleItem() {
-        return this.singleItem;
-    }
-
-    public void compile() {
-        if (isCompiled()) {
-            return;
-        }
-
-        if (blocks.size() == 0) {
-            this.compiled = true;
-            return;
-        }
-
-        if (blocks.size() == 1) {
-            this.ranges.put(new Range(0, 100, true), blocks.keySet().toArray(new PlotBlock[1])[0]);
-            this.compiled = true;
-            this.singleItem = true;
-            return;
-        }
-
-        final Map<PlotBlock, Integer> temp = new HashMap<>(blocks.size());
-        final List<PlotBlock> unassigned = new ArrayList<>(blocks.size());
-
-        int sum = 0;
-        for (final Map.Entry<PlotBlock, Integer> entry : blocks.entrySet()) {
-            if (entry.getValue() == -1) {
-                unassigned.add(entry.getKey());
-            } else {
-                sum += entry.getValue();
-                temp.put(entry.getKey(), entry.getValue());
-            }
-        }
-        //
-        // If this doesn't amount to 100 add it up to exactly 100.
-        //
-        if (sum < 100) {
-            final int remaining = 100 - sum;
-            if (unassigned.isEmpty()) {
-                // If there are no unassigned values, we just add it to the first value
-                final Entry<PlotBlock, Integer> entry = temp.entrySet().iterator().next();
-                temp.put(entry.getKey(), (entry.getValue() + 1 + remaining));
-            } else {
-                final int perUnassigned = remaining / unassigned.size();
-                for (final PlotBlock block : unassigned) {
-                    temp.put(block, perUnassigned);
-                    sum += perUnassigned;
-                }
-                // Make sure there isn't a tiny difference remaining
-                if (sum < 100) {
-                    final int difference = 100 - sum;
-                    temp.put(unassigned.get(0), perUnassigned + difference);
-                    sum = 100;
-                }
-            }
-        } else if (!unassigned.isEmpty()) {
-            C.BUCKET_ENTRIES_IGNORED.send(ConsolePlayer.getConsole());
-        }
-        //
-        // If the sum adds up to more than 100, divide all values
-        //
-        if (sum > 100) {
-            final double ratio = 100D / sum;
-            for (final Map.Entry<PlotBlock, Integer> entry : blocks.entrySet()) {
-                if (entry.getValue() == -1) {
-                    continue;
-                }
-                temp.put(entry.getKey(), (int) (entry.getValue() * ratio));
-            }
-        } else {
-            temp.forEach(temp::put);
-        }
-        int start = 0;
-        for (final Map.Entry<PlotBlock, Integer> entry : temp.entrySet()) {
-            final int rangeStart = start;
-            final int rangeEnd = rangeStart + entry.getValue();
-            start = rangeEnd + 1;
-            final Range range =
-                new Range(rangeStart, rangeEnd, unassigned.contains(entry.getKey()));
-            this.ranges.put(range, entry.getKey());
-        }
-        this.blocks.clear();
-        this.compiled = true;
-    }
-
-    @Override public Iterator<PlotBlock> iterator() {
-        return this.bucketIterator;
-    }
-
-    public boolean isCompiled() {
-        return this.compiled;
-    }
-
-    /**
-     * Get a random block out of the bucket
-     *
-     * @return Randomly picked block (cased on specified rates)
-     */
-    public PlotBlock getBlock() {
-        if (!isCompiled()) {
-            this.compile();
-        }
-        if (this.isEmpty()) {
-            return StringPlotBlock.EVERYTHING;
-        } else if (this.hasSingleItem()) {
-            return this.head;
-        }
-        final int number = random.nextInt(101);
-        for (final Map.Entry<Range, PlotBlock> entry : ranges.entrySet()) {
-            if (entry.getKey().isInRange(number)) {
-                return entry.getValue();
-            }
-        }
-        // Didn't find a block? Try again
-        return getBlock();
-    }
-
-    @Override public String toString() {
-        if (!isCompiled()) {
-            compile();
-        }
-        final StringBuilder builder = new StringBuilder();
-        final Iterator<Entry<Range, PlotBlock>> iterator = this.ranges.entrySet().iterator();
-        while (iterator.hasNext()) {
-            final Entry<Range, PlotBlock> entry = iterator.next();
-            builder.append(entry.getValue().getRawId());
-            if (!entry.getKey().isAutomatic()) {
-                builder.append(":").append(entry.getKey().getWeight());
-            }
-            if (iterator.hasNext()) {
-                builder.append(",");
-            }
-        }
-        return builder.toString();
-    }
-
-    @Override public Map<String, Object> serialize() {
-        if (!isCompiled()) {
-            compile();
-        }
-        return ImmutableMap.of("blocks", this.toString());
-    }
-
-
-    @Getter @EqualsAndHashCode @RequiredArgsConstructor private final static class Range {
-
-        private final int min;
-        private final int max;
-        @Getter private final boolean automatic;
-
-        public int getWeight() {
-            return max - min;
-        }
-
-        public boolean isInRange(final int num) {
-            return num <= max && num >= min;
-        }
-    }
-
-
-    private final class BucketIterator implements Iterator<PlotBlock> {
-
-        @Override public boolean hasNext() {
-            return true;
-        }
-
-        @Override public PlotBlock next() {
-            return getBlock();
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java
deleted file mode 100644
index d170054a8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public class BlockLoc {
-
-    public final int x;
-    public final int y;
-    public final int z;
-
-    public final float yaw;
-    public final float pitch;
-
-    public BlockLoc(int x, int y, int z, float yaw, float pitch) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-
-        this.yaw = yaw;
-        this.pitch = pitch;
-    }
-
-    public BlockLoc(int x, int y, int z) {
-        this(x, y, z, 0f, 0f);
-    }
-
-    public static BlockLoc fromString(String string) {
-        String[] parts = string.split(",");
-
-        float yaw;
-        float pitch;
-        if (parts.length == 3) {
-            yaw = 0f;
-            pitch = 0f;
-        }
-        if (parts.length == 5) {
-            yaw = Float.parseFloat(parts[3]);
-            pitch = Float.parseFloat(parts[4]);
-        } else {
-            return new BlockLoc(0, 0, 0);
-        }
-        int x = Integer.parseInt(parts[0]);
-        int y = Integer.parseInt(parts[1]);
-        int z = Integer.parseInt(parts[2]);
-
-        return new BlockLoc(x, y, z, yaw, pitch);
-    }
-
-    @Override public int hashCode() {
-        int prime = 31;
-        int result = 1;
-        result = prime * result + this.x;
-        result = prime * result + this.y;
-        result = prime * result + this.z;
-        return result;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return this.x == 0 && this.y == 0 && this.z == 0;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        BlockLoc other = (BlockLoc) obj;
-        return this.x == other.x && this.y == other.y && this.z == other.z;
-    }
-
-    @Override public String toString() {
-        if (this.x == 0 && this.y == 0 && this.z == 0) {
-            return "";
-        }
-        return this.x + "," + this.y + ',' + this.z + ',' + this.yaw + ',' + this.pitch;
-
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java
deleted file mode 100644
index e125ca188..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockRegistry.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import lombok.Getter;
-import lombok.NonNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class BlockRegistry<T> {
-
-    @Getter private final Class<T> type;
-    private final Map<PlotBlock, T> map = new HashMap<>();
-
-    public BlockRegistry(@NonNull final Class<T> type, final T... preInitializedItems) {
-        this.type = type;
-        for (final T preInitializedItem : preInitializedItems) {
-            this.addMapping(getPlotBlock(preInitializedItem), preInitializedItem);
-        }
-    }
-
-    public final void addMapping(@NonNull final PlotBlock plotBlock, @NonNull final T t) {
-        if (map.containsKey(plotBlock)) {
-            return;
-        }
-        this.map.put(plotBlock, t);
-    }
-
-    public abstract PlotBlock getPlotBlock(final T item);
-
-    public final T getItem(final PlotBlock plotBlock) {
-        return this.map.get(plotBlock);
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java
deleted file mode 100644
index 2035a8811..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkLoc.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public class ChunkLoc {
-
-    public int x;
-    public int z;
-
-    public ChunkLoc(int x, int z) {
-        this.x = x;
-        this.z = z;
-    }
-
-    @Override public int hashCode() {
-        return (x << 16) | (z & 0xFFFF);
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        ChunkLoc other = (ChunkLoc) obj;
-        return (this.x == other.x) && (this.z == other.z);
-    }
-
-    @Override public String toString() {
-        return this.x + "," + this.z;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java
deleted file mode 100644
index e665ea752..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-public class ChunkWrapper {
-
-    public final int x;
-    public final int z;
-    public final String world;
-
-    public ChunkWrapper(String world, int x, int z) {
-        this.world = world;
-        this.x = x;
-        this.z = z;
-    }
-
-    @Override public int hashCode() {
-        return MathMan.pair((short) x, (short) z);
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (this.hashCode() != obj.hashCode()) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        ChunkWrapper other = (ChunkWrapper) obj;
-        return (this.x == other.x) && (this.z == other.z) && StringMan
-            .isEqual(this.world, other.world);
-    }
-
-    @Override public String toString() {
-        return this.world + ":" + this.x + "," + this.z;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java
deleted file mode 100644
index 27cb55216..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/CmdInstance.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public class CmdInstance {
-    public final Runnable command;
-    public final long timestamp;
-
-    public CmdInstance(final Runnable command) {
-        this.command = command;
-        timestamp = System.currentTimeMillis();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
deleted file mode 100644
index 18a0ce7bc..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
-import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
-
-import java.util.UUID;
-
-public class ConsolePlayer extends PlotPlayer {
-
-    private static ConsolePlayer instance;
-
-    private ConsolePlayer() {
-        PlotArea area = PlotSquared.get().getFirstPlotArea();
-        Location loc;
-        if (area != null) {
-            RegionWrapper region = area.getRegion();
-            loc = new Location(area.worldname, region.minX + region.maxX / 2, 0,
-                region.minZ + region.maxZ / 2);
-        } else {
-            loc = new Location("world", 0, 0, 0);
-        }
-        setMeta("location", loc);
-    }
-
-    public static ConsolePlayer getConsole() {
-        if (instance == null) {
-            instance = new ConsolePlayer();
-            instance.teleport(instance.getLocation());
-        }
-        return instance;
-    }
-
-    @Override public boolean canTeleport(Location loc) {
-        return true;
-    }
-
-    @Override public Location getLocation() {
-        return this.getMeta("location");
-    }
-
-    @Override public Location getLocationFull() {
-        return getLocation();
-    }
-
-    @Override public UUID getUUID() {
-        return DBFunc.EVERYONE;
-    }
-
-    @Override public long getLastPlayed() {
-        return 0;
-    }
-
-    @Override public boolean hasPermission(String permission) {
-        return true;
-    }
-
-    @Override public boolean isPermissionSet(String permission) {
-        return true;
-    }
-
-    @Override public void sendMessage(String message) {
-        PlotSquared.log(message);
-    }
-
-    @Override public void teleport(Location location) {
-        setMeta(PlotPlayer.META_LAST_PLOT, location.getPlot());
-        setMeta(PlotPlayer.META_LOCATION, location);
-    }
-
-    @Override public boolean isOnline() {
-        return true;
-    }
-
-    @Override public String getName() {
-        return "*";
-    }
-
-    @Override public void setCompassTarget(Location location) {
-    }
-
-    @Override public void setAttribute(String key) {
-    }
-
-    @Override public boolean getAttribute(String key) {
-        return false;
-    }
-
-    @Override public void removeAttribute(String key) {
-    }
-
-    @Override public RequiredType getSuperCaller() {
-        return RequiredType.CONSOLE;
-    }
-
-    @Override public void setWeather(PlotWeather weather) {
-    }
-
-    @Override public PlotGameMode getGameMode() {
-        return PlotGameMode.NOT_SET;
-    }
-
-    @Override public void setGameMode(PlotGameMode gameMode) {
-    }
-
-    @Override public void setTime(long time) {
-    }
-
-    @Override public boolean getFlight() {
-        return true;
-    }
-
-    @Override public void setFlight(boolean fly) {
-    }
-
-    @Override public void playMusic(Location location, PlotBlock id) {
-    }
-
-    @Override public void kick(String message) {
-    }
-
-    @Override public void stopSpectating() {
-    }
-
-    @Override public boolean isBanned() {
-        return false;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
deleted file mode 100644
index da9c2c09d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.commands.DebugExec;
-import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
-
-import javax.annotation.Nonnull;
-import javax.script.ScriptException;
-
-public abstract class Expression<T> {
-
-    @Nonnull public static <U> Expression<U> constant(final U value) {
-        return new Expression<U>() {
-            @Override public U evaluate(U arg) {
-                return value;
-            }
-        };
-    }
-
-    public static Expression<Double> linearDouble(final Double value) {
-        return new Expression<Double>() {
-            @Override public Double evaluate(Double arg) {
-                return (arg * value);
-            }
-        };
-    }
-
-    public static Expression<Double> doubleExpression(final String expression) {
-        try {
-            return constant(Double.parseDouble(expression));
-        } catch (NumberFormatException ignore) {
-        }
-        if (expression.endsWith("*{arg}")) {
-            try {
-                return linearDouble(
-                    Double.parseDouble(expression.substring(0, expression.length() - 6)));
-            } catch (NumberFormatException ignore) {
-            }
-        }
-        return new Expression<Double>() {
-            @Override public Double evaluate(Double arg) {
-                DebugExec exec = (DebugExec) MainCommand.getInstance().getCommand(DebugExec.class);
-                try {
-                    return (Double) exec.getEngine().eval(expression.replace("{arg}", "" + arg));
-                } catch (ScriptException e) {
-                    PlotSquared.debug("Invalid Expression: " + expression);
-                    e.printStackTrace();
-                }
-                return 0d;
-            }
-        };
-    }
-
-    public abstract T evaluate(T arg);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java
deleted file mode 100644
index d34521ee9..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/FileBytes.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public class FileBytes {
-
-    public final String path;
-    public final byte[] data;
-
-    public FileBytes(String path, byte[] data) {
-        this.path = path;
-        this.data = data;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java
deleted file mode 100644
index 3413bd235..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public abstract class LazyBlock {
-
-    public abstract StringPlotBlock getPlotBlock();
-
-    public String getId() {
-        return getPlotBlock().getItemId();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java
deleted file mode 100644
index 8487c44be..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public abstract class LazyResult<T> {
-
-    private T result;
-
-    public T get() {
-        return this.result;
-    }
-
-    public T getOrCreate() {
-        if (this.result == null) {
-            return this.result = create();
-        }
-        return this.result;
-    }
-
-    public abstract T create();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
deleted file mode 100644
index be551b372..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import lombok.Getter;
-
-public class LegacyPlotBlock extends PlotBlock {
-
-    public static final PlotBlock EVERYTHING = new LegacyPlotBlock((short) 0, (byte) 0);
-    public static final PlotBlock[] CACHE = new PlotBlock[65535];
-
-    static {
-        for (int i = 0; i < 65535; i++) {
-            short id = (short) (i >> 4);
-            byte data = (byte) (i & 15);
-            CACHE[i] = new LegacyPlotBlock(id, data);
-        }
-    }
-
-    @Getter public final short id;
-    @Getter public final byte data;
-
-    public LegacyPlotBlock(short id, byte data) {
-        this.id = id;
-        this.data = data;
-    }
-
-    @Override public Object getRawId() {
-        return this.id;
-    }
-
-    @Override public boolean isAir() {
-        return this.id == 0;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        LegacyPlotBlock other = (LegacyPlotBlock) obj;
-        return (this.id == other.id) && ((this.data == other.data) || (this.data == -1) || (
-            other.data == -1));
-    }
-
-    @Override public int hashCode() {
-        return this.id;
-    }
-
-    @Override public String toString() {
-        if (this.data == -1) {
-            return this.id + "";
-        }
-        return this.id + ":" + this.data;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
deleted file mode 100644
index d787d46e3..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.sk89q.worldedit.math.BlockVector3;
-import lombok.Getter;
-import lombok.Setter;
-
-public class Location implements Cloneable, Comparable<Location> {
-
-    @Getter private int x;
-    @Getter private int y;
-    @Getter private int z;
-    @Getter @Setter private float yaw;
-    @Getter @Setter private float pitch;
-    @Getter @Setter private String world;
-    @Getter private BlockVector3 blockVector3;
-
-    public Location(String world, int x, int y, int z, float yaw, float pitch) {
-        this.world = world;
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.yaw = yaw;
-        this.pitch = pitch;
-        this.blockVector3 = BlockVector3.at(x, y, z);
-    }
-
-    public Location() {
-        this.world = "";
-    }
-
-    public Location(String world, int x, int y, int z) {
-        this(world, x, y, z, 0f, 0f);
-    }
-
-    public void setX(int x) {
-        this.x = x;
-        this.blockVector3 = BlockVector3.at(x, y, z);
-    }
-
-    public void setY(int y) {
-        this.y = y;
-        this.blockVector3 = BlockVector3.at(x, y, z);
-    }
-
-    public void setZ(int z) {
-        this.z = z;
-        this.blockVector3 = BlockVector3.at(x, y, z);
-    }
-
-    public void setBlockVector3(BlockVector3 blockVector3) {
-        this.blockVector3 = blockVector3;
-        this.x = blockVector3.getX();
-        this.y = blockVector3.getY();
-        this.z = blockVector3.getZ();
-    }
-
-    @Override public Location clone() {
-        return new Location(this.world, this.x, this.y, this.z, this.yaw, this.pitch);
-    }
-
-    public PlotArea getPlotArea() {
-        return PlotSquared.get().getPlotAreaAbs(this);
-    }
-
-    public Plot getOwnedPlot() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
-        if (area != null) {
-            return area.getOwnedPlot(this);
-        } else {
-            return null;
-        }
-    }
-
-    public Plot getOwnedPlotAbs() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
-        if (area != null) {
-            return area.getOwnedPlotAbs(this);
-        } else {
-            return null;
-        }
-    }
-
-    public boolean isPlotArea() {
-        return PlotSquared.get().getPlotAreaAbs(this) != null;
-    }
-
-    public boolean isPlotRoad() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
-        return area != null && area.getPlotAbs(this) == null;
-    }
-
-    public boolean isUnownedPlotArea() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
-        return area != null && area.getOwnedPlotAbs(this) == null;
-    }
-
-    public PlotManager getPlotManager() {
-        PlotArea pa = getPlotArea();
-        if (pa != null) {
-            return pa.getPlotManager();
-        } else {
-            return null;
-        }
-    }
-
-    public Plot getPlotAbs() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
-        if (area != null) {
-            return area.getPlotAbs(this);
-        } else {
-            return null;
-        }
-    }
-
-    public Plot getPlot() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
-        if (area != null) {
-            return area.getPlot(this);
-        } else {
-            return null;
-        }
-    }
-
-    public ChunkLoc getChunkLoc() {
-        return new ChunkLoc(this.x >> 4, this.z >> 4);
-    }
-
-    public Location add(int x, int y, int z) {
-        this.x += x;
-        this.y += y;
-        this.z += z;
-        return this;
-    }
-
-    public double getEuclideanDistanceSquared(Location l2) {
-        double x = getX() - l2.getX();
-        double y = getY() - l2.getY();
-        double z = getZ() - l2.getZ();
-        return x * x + y * y + z * z;
-    }
-
-    public double getEuclideanDistance(Location l2) {
-        return Math.sqrt(getEuclideanDistanceSquared(l2));
-    }
-
-    public boolean isInSphere(Location origin, int radius) {
-        return getEuclideanDistanceSquared(origin) < radius * radius;
-    }
-
-    @Override public int hashCode() {
-        return MathMan.pair((short) this.x, (short) this.z) * 17 + this.y;
-    }
-
-    public boolean isInAABB(Location min, Location max) {
-        return this.x >= min.getX() && this.x <= max.getX() && this.y >= min.getY() && this.y <= max
-            .getY() && this.z >= min.getX() && this.z < max.getZ();
-    }
-
-    public void lookTowards(int x, int y) {
-        double l = this.x - x;
-        double c = Math.sqrt(l * l + 0.0);
-        if (Math.asin(0 / c) / Math.PI * 180 > 90) {
-            setYaw((float) (180 - -Math.asin(l / c) / Math.PI * 180));
-        } else {
-            setYaw((float) (-Math.asin(l / c) / Math.PI * 180));
-        }
-    }
-
-    public Location subtract(int x, int y, int z) {
-        this.x -= x;
-        this.y -= y;
-        this.z -= z;
-        return this;
-    }
-
-    @Override public boolean equals(Object o) {
-        if (o == null) {
-            return false;
-        }
-        if (!(o instanceof Location)) {
-            return false;
-        }
-        Location l = (Location) o;
-        return this.x == l.getX() && this.y == l.getY() && this.z == l.getZ() && this.world
-            .equals(l.getWorld()) && this.yaw == l.getYaw() && this.pitch == l.getPitch();
-    }
-
-    @Override public int compareTo(Location o) {
-        if (this.x == o.getX() && this.y == o.getY() || this.z == o.getZ()) {
-            return 0;
-        }
-        if (this.x < o.getX() && this.y < o.getY() && this.z < o.getZ()) {
-            return -1;
-        }
-        return 1;
-    }
-
-    @Override public String toString() {
-        return "\"plotsquaredlocation\":{\"x\":" + this.x + ",\"y\":" + this.y + ",\"z\":" + this.z
-            + ",\"yaw\":" + this.yaw + ",\"pitch\":" + this.pitch + ",\"world\":\"" + this.world
-            + "\"}";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
deleted file mode 100644
index 709a7cee6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import java.util.UUID;
-
-public interface OfflinePlotPlayer {
-
-    /**
-     * Get the {@code UUID} of this player
-     *
-     * @return the player {@link UUID}
-     */
-    UUID getUUID();
-
-    /**
-     * Get the time in milliseconds when the player was last seen online.
-     *
-     * @return the time in milliseconds when last online
-     */
-    long getLastPlayed();
-
-    /**
-     * Checks if this player is online.
-     *
-     * @return true if this player is online
-     */
-    boolean isOnline();
-
-    /**
-     * Get the name of this player.
-     *
-     * @return the player name
-     */
-    String getName();
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
deleted file mode 100644
index c31404cd5..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ /dev/null
@@ -1,2888 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.generator.SquarePlotWorld;
-import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
-import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.ImmutableSet;
-import com.sk89q.jnbt.CompoundTag;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.awt.geom.Area;
-import java.awt.geom.PathIterator;
-import java.awt.geom.Rectangle2D;
-import java.io.File;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * The plot class<br> [IMPORTANT] - Unclaimed plots will not have persistent information. - Any
- * information set/modified in an unclaimed object may not be reflected in other instances - Using
- * the `new` operator will create an unclaimed plot instance - Use the methods from the
- * PlotArea/PS/Location etc to get existing plots
- */
-public class Plot {
-
-    /**
-     * @deprecated raw access is deprecated
-     */
-    @Deprecated private static HashSet<Plot> connected_cache;
-    private static HashSet<RegionWrapper> regions_cache;
-    /**
-     * The {@link PlotId}.
-     */
-    private final PlotId id;
-    /**
-     * plot owner (Merged plots can have multiple owners) Direct access is Deprecated: use
-     * getOwners()
-     */
-    @Deprecated public UUID owner;
-    /**
-     * Has the plot changed since the last save cycle?
-     */
-    public boolean countsTowardsMax = true;
-    /**
-     * Represents whatever the database manager needs it to: <br> - A value of -1 usually indicates
-     * the plot will not be stored in the DB<br> - A value of 0 usually indicates that the DB manager
-     * hasn't set a value<br>
-     *
-     * @deprecated magical
-     */
-    @Deprecated public int temp;
-    /**
-     * Plot creation timestamp (not accurate if the plot was created before this was implemented)<br>
-     * - Milliseconds since the epoch<br>
-     */
-    private long timestamp;
-    /**
-     * List of trusted (with plot permissions).
-     */
-    private HashSet<UUID> trusted;
-    /**
-     * List of members users (with plot permissions).
-     */
-    private HashSet<UUID> members;
-    /**
-     * List of denied players.
-     */
-    private HashSet<UUID> denied;
-    /**
-     * External settings class. - Please favor the methods over direct access to this class<br> - The
-     * methods are more likely to be left unchanged from version changes<br>
-     */
-    private PlotSettings settings;
-    /**
-     * The {@link PlotArea}.
-     */
-    @Nonnull private PlotArea area;
-    /**
-     * Session only plot metadata (session is until the server stops)<br>
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @see FlagManager
-     */
-    private ConcurrentHashMap<String, Object> meta;
-    /**
-     * The cached origin plot. - The origin plot is used for plot grouping and relational data
-     */
-    private Plot origin;
-
-    /**
-     * Constructor for a new plot. (Only changes after plot.create() will be properly set in the
-     * database)
-     *
-     * @param area  the PlotArea where the plot is located
-     * @param id    the plot id
-     * @param owner the plot owner
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner) {
-        this.area = area;
-        this.id = id;
-        this.owner = owner;
-    }
-
-    /**
-     * Constructor for an unowned plot. (Only changes after plot.create() will be properly set in the
-     * database)
-     *
-     * @param area the PlotArea where the plot is located
-     * @param id   the plot id
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(@Nonnull PlotArea area, PlotId id) {
-        this.area = area;
-        this.id = id;
-    }
-
-    /**
-     * Constructor for a temporary plot (use -1 for temp)<br> The database will ignore any queries
-     * regarding temporary plots. Please note that some bulk plot management functions may still
-     * affect temporary plots (TODO: fix this)
-     *
-     * @param area  the PlotArea where the plot is located
-     * @param id    the plot id
-     * @param owner the owner of the plot
-     * @param temp  Represents whatever the database manager needs it to
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner, int temp) {
-        this.area = area;
-        this.id = id;
-        this.owner = owner;
-        this.temp = temp;
-    }
-
-    /**
-     * Constructor for a saved plots (Used by the database manager when plots are fetched)
-     *
-     * @param id      the plot id
-     * @param owner   the plot owner
-     * @param trusted the plot trusted players
-     * @param denied  the plot denied players
-     * @param merged  array giving merged plots
-     * @see Plot#getPlot(Location) for existing plots
-     */
-    public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
-        HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
-        @Nonnull PlotArea area, boolean[] merged, long timestamp, int temp) {
-        this.id = id;
-        this.area = area;
-        this.owner = owner;
-        this.settings = new PlotSettings();
-        this.members = members;
-        this.trusted = trusted;
-        this.denied = denied;
-        this.settings.setAlias(alias);
-        this.settings.setPosition(position);
-        this.settings.setMerged(merged);
-        if (flags != null) {
-            for (Flag flag : flags) {
-                this.settings.flags.put(flag, flag);
-            }
-        }
-        this.timestamp = timestamp;
-        this.temp = temp;
-    }
-
-    /**
-     * Get a plot from a string e.g. [area];[id]
-     *
-     * @param defaultArea If no area is specified
-     * @param string      plot id/area + id
-     * @return New or existing plot object
-     */
-    public static Plot fromString(PlotArea defaultArea, String string) {
-        String[] split = string.split(";|,");
-        if (split.length == 2) {
-            if (defaultArea != null) {
-                PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
-                return id != null ? defaultArea.getPlotAbs(id) : null;
-            }
-        } else if (split.length == 3) {
-            PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
-            if (pa != null) {
-                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
-                return pa.getPlotAbs(id);
-            }
-        } else if (split.length == 4) {
-            PlotArea pa = PlotSquared.get().getPlotArea(split[0], split[1]);
-            if (pa != null) {
-                PlotId id = PlotId.fromString(split[1] + ';' + split[2]);
-                return pa.getPlotAbs(id);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Return a new/cached plot object at a given location.
-     *
-     * @param location the location of the plot
-     * @return plot at location or null
-     * @see PlotPlayer#getCurrentPlot() if a player is expected here.
-     */
-    public static Plot getPlot(Location location) {
-        PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
-        if (pa != null) {
-            return pa.getPlot(location);
-        }
-        return null;
-    }
-
-    public String getWorldName() {
-        return area.worldname;
-    }
-
-    /**
-     * Session only plot metadata (session is until the server stops)<br>
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @param key   metadata key
-     * @param value metadata value
-     * @see FlagManager
-     */
-    public void setMeta(String key, Object value) {
-        if (this.meta == null) {
-            this.meta = new ConcurrentHashMap<>();
-        }
-        this.meta.put(key, value);
-    }
-
-    /**
-     * Get the metadata for a key<br>
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @param key metadata key to get value for
-     * @return Object value
-     */
-    public Object getMeta(String key) {
-        if (this.meta != null) {
-            return this.meta.get(key);
-        }
-        return null;
-    }
-
-    /**
-     * Delete the metadata for a key<br> - metadata is session only - deleting other plugin's metadata
-     * may cause issues
-     *
-     * @param key key to delete
-     */
-    public void deleteMeta(String key) {
-        if (this.meta != null) {
-            this.meta.remove(key);
-        }
-    }
-
-    /**
-     * Get the cluster this plot is associated with
-     *
-     * @return the PlotCluster object, or null
-     */
-    public PlotCluster getCluster() {
-        return this.getArea().getCluster(this.id);
-    }
-
-    /**
-     * Efficiently get the players currently inside this plot<br> - Will return an empty list if no
-     * players are in the plot<br> - Remember, you can cast a PlotPlayer to it's respective
-     * implementation (BukkitPlayer, SpongePlayer) to obtain the player object
-     *
-     * @return list of PlotPlayer(s) or an empty list
-     */
-    public List<PlotPlayer> getPlayersInPlot() {
-        ArrayList<PlotPlayer> players = new ArrayList<>();
-        for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-            PlotPlayer pp = entry.getValue();
-            if (this.equals(pp.getCurrentPlot())) {
-                players.add(pp);
-            }
-        }
-        return players;
-    }
-
-    /**
-     * Check if the plot has an owner.
-     *
-     * @return false if there is no owner
-     */
-    public boolean hasOwner() {
-        return this.owner != null;
-    }
-
-    /**
-     * Check if a UUID is a plot owner (merged plots may have multiple owners)
-     *
-     * @param uuid the player uuid
-     * @return if the provided uuid is the owner of the plot
-     */
-    public boolean isOwner(UUID uuid) {
-        if (uuid.equals(this.owner)) {
-            return true;
-        }
-        if (!isMerged()) {
-            return false;
-        }
-        Set<Plot> connected = getConnectedPlots();
-        for (Plot current : connected) {
-            if (uuid.equals(current.owner)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean isOwnerAbs(UUID uuid) {
-        return uuid.equals(this.owner);
-    }
-
-    /**
-     * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
-     *
-     * @return the plot owners
-     */
-    public Set<UUID> getOwners() {
-        if (this.owner == null) {
-            return ImmutableSet.of();
-        }
-        if (isMerged()) {
-            Set<Plot> plots = getConnectedPlots();
-            Plot[] array = plots.toArray(new Plot[0]);
-            ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
-            UUID last = this.owner;
-            owners.add(this.owner);
-            for (Plot current : array) {
-                if (last == null || current.owner.getMostSignificantBits() != last
-                    .getMostSignificantBits()) {
-                    owners.add(current.owner);
-                    last = current.owner;
-                }
-            }
-            return owners.build();
-        }
-        return ImmutableSet.of(this.owner);
-    }
-
-    /**
-     * Check if the player is either the owner or on the trusted/added list.
-     *
-     * @param uuid uuid to check
-     * @return true if the player is added/trusted or is the owner
-     */
-    public boolean isAdded(UUID uuid) {
-        if (this.owner == null || getDenied().contains(uuid)) {
-            return false;
-        }
-        if (isOwner(uuid)) {
-            return true;
-        }
-        if (getMembers().contains(uuid)) {
-            return isOnline();
-        }
-        if (getTrusted().contains(uuid) || getTrusted().contains(DBFunc.EVERYONE)) {
-            return true;
-        }
-        if (getMembers().contains(DBFunc.EVERYONE)) {
-            return isOnline();
-        }
-        return false;
-    }
-
-    /**
-     * Should the player be denied from entering.
-     *
-     * @param uuid uuid to check
-     * @return boolean false if the player is allowed to enter
-     */
-    public boolean isDenied(UUID uuid) {
-        return this.denied != null && (this.denied.contains(DBFunc.EVERYONE) && !this.isAdded(uuid)
-            || !this.isAdded(uuid) && this.denied.contains(uuid));
-    }
-
-    /**
-     * Get the {@link PlotId}.
-     */
-    @Nonnull public PlotId getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the plot world object for this plot<br> - The generic PlotArea object can be casted to its
-     * respective class for more control (e.g. HybridPlotWorld)
-     *
-     * @return PlotArea
-     */
-    @Nonnull public PlotArea getArea() {
-        return this.area;
-    }
-
-    /**
-     * Assign this plot to a plot area.<br> (Mostly used during startup when worlds are being
-     * created)<br> Note: Using this when it doesn't make sense will result in strange behavior
-     *
-     * @param area area to assign to
-     */
-    public void setArea(@Nonnull PlotArea area) {
-        if (this.getArea() == area) {
-            return;
-        }
-        this.area.removePlot(this.id);
-        this.area = area;
-        area.addPlot(this);
-    }
-
-    /**
-     * Get the plot manager object for this plot<br> - The generic PlotManager object can be casted to
-     * its respective class for more control (e.g. HybridPlotManager)
-     *
-     * @return PlotManager
-     */
-    public PlotManager getManager() {
-        return this.area.getPlotManager();
-    }
-
-    /**
-     * Get or create plot settings.
-     *
-     * @return PlotSettings
-     * @deprecated use equivalent plot method;
-     */
-    @Deprecated @Nonnull public PlotSettings getSettings() {
-        if (this.settings == null) {
-            this.settings = new PlotSettings();
-        }
-        return this.settings;
-    }
-
-    /**
-     * Returns true if the plot is not merged, or it is the base plot of multiple merged plots.
-     *
-     * @return Boolean
-     */
-    public boolean isBasePlot() {
-        return !this.isMerged() || this.equals(this.getBasePlot(false));
-    }
-
-    /**
-     * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
-     * - Merged plots need to be treated as a single plot for most purposes<br> - Some data such as
-     * home location needs to be associated with the group rather than each plot<br> - If the plot is
-     * not merged it will return itself.<br> - The result is cached locally
-     *
-     * @return base Plot
-     */
-    public Plot getBasePlot(boolean recalculate) {
-        if (this.origin != null && !recalculate) {
-            if (this.equals(this.origin)) {
-                return this;
-            }
-            return this.origin.getBasePlot(false);
-        }
-        if (!this.isMerged()) {
-            this.origin = this;
-            return this.origin;
-        }
-        this.origin = this;
-        PlotId min = this.id;
-        for (Plot plot : this.getConnectedPlots()) {
-            if (plot.id.y < min.y || plot.id.y == min.y && plot.id.x < min.x) {
-                this.origin = plot;
-                min = plot.id;
-            }
-        }
-        for (Plot plot : this.getConnectedPlots()) {
-            plot.origin = this.origin;
-        }
-        return this.origin;
-    }
-
-    /**
-     * Check if the plot is merged in any direction.
-     *
-     * @return is the plot merged or not
-     */
-    public boolean isMerged() {
-        return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
-            .getMerged(1) || getSettings().getMerged(3);
-    }
-
-    /**
-     * Get the timestamp of when the plot was created (unreliable)<br> - not accurate if the plot was
-     * created before this was implemented<br> - Milliseconds since the epoch<br>
-     *
-     * @return the creation date of the plot
-     */
-    public long getTimestamp() {
-        if (this.timestamp == 0) {
-            this.timestamp = System.currentTimeMillis();
-        }
-        return this.timestamp;
-    }
-
-    /**
-     * Get if the plot is merged in a direction<br> ------- Actual -------<br> 0 = north<br> 1 =
-     * east<br> 2 = south<br> 3 = west<br> ----- Artificial -----<br> 4 = north-east<br> 5 =
-     * south-east<br> 6 = south-west<br> 7 = north-west<br> ----------<br> Note: A plot that is merged
-     * north and east will not be merged northeast if the northeast plot is not part of the same
-     * group<br>
-     *
-     * @param direction direction to check for merged plot
-     * @return true if merged in that direction
-     */
-    public boolean getMerged(int direction) {
-        if (this.settings == null) {
-            return false;
-        }
-        switch (direction) {
-            case 0:
-            case 1:
-            case 2:
-            case 3:
-                return this.getSettings().getMerged(direction);
-            case 7:
-                int i = direction - 4;
-                int i2 = 0;
-                if (this.getSettings().getMerged(i2)) {
-                    if (this.getSettings().getMerged(i)) {
-                        if (this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2)) {
-                            if (this.area.getPlotAbs(this.id.getRelative(i2)).getMerged(i)) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-                return false;
-            case 4:
-            case 5:
-            case 6:
-                i = direction - 4;
-                i2 = direction - 3;
-                return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
-                    && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
-                    .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
-
-        }
-        return false;
-    }
-
-    /**
-     * Get the denied users.
-     *
-     * @return a set of denied users
-     */
-    public HashSet<UUID> getDenied() {
-        if (this.denied == null) {
-            this.denied = new HashSet<>();
-        }
-        return this.denied;
-    }
-
-    /**
-     * Set the denied users for this plot.
-     *
-     * @param uuids uuids to deny
-     */
-    public void setDenied(Set<UUID> uuids) {
-        boolean larger = uuids.size() > getDenied().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
-        intersection.retainAll(larger ? uuids : getDenied());
-        uuids.removeAll(intersection);
-        HashSet<UUID> toRemove = new HashSet<>(getDenied());
-        toRemove.removeAll(intersection);
-        for (UUID uuid : toRemove) {
-            removeDenied(uuid);
-        }
-        for (UUID uuid : uuids) {
-            addDenied(uuid);
-        }
-    }
-
-    /**
-     * Get the trusted users.
-     *
-     * @return a set of trusted users
-     */
-    public HashSet<UUID> getTrusted() {
-        if (this.trusted == null) {
-            this.trusted = new HashSet<>();
-        }
-        return this.trusted;
-    }
-
-    /**
-     * Set the trusted users for this plot.
-     *
-     * @param uuids uuids to trust
-     */
-    public void setTrusted(Set<UUID> uuids) {
-        boolean larger = uuids.size() > getTrusted().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getTrusted() : uuids);
-        intersection.retainAll(larger ? uuids : getTrusted());
-        uuids.removeAll(intersection);
-        HashSet<UUID> toRemove = new HashSet<>(getTrusted());
-        toRemove.removeAll(intersection);
-        for (UUID uuid : toRemove) {
-            removeTrusted(uuid);
-        }
-        for (UUID uuid : uuids) {
-            addTrusted(uuid);
-        }
-    }
-
-    /**
-     * Get the members
-     *
-     * @return a set of members
-     */
-    public HashSet<UUID> getMembers() {
-        if (this.members == null) {
-            this.members = new HashSet<>();
-        }
-        return this.members;
-    }
-
-    /**
-     * Set the members for this plot
-     *
-     * @param uuids uuids to set member status for
-     */
-    public void setMembers(Set<UUID> uuids) {
-        boolean larger = uuids.size() > getMembers().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getMembers() : uuids);
-        intersection.retainAll(larger ? uuids : getMembers());
-        uuids.removeAll(intersection);
-        HashSet<UUID> toRemove = new HashSet<>(getMembers());
-        toRemove.removeAll(intersection);
-        for (UUID uuid : toRemove) {
-            removeMember(uuid);
-        }
-        for (UUID uuid : uuids) {
-            addMember(uuid);
-        }
-    }
-
-    /**
-     * Deny someone (updates database as well)
-     *
-     * @param uuid the uuid of the player to deny.
-     */
-    public void addDenied(UUID uuid) {
-        for (Plot current : getConnectedPlots()) {
-            if (current.getDenied().add(uuid)) {
-                DBFunc.setDenied(current, uuid);
-            }
-        }
-    }
-
-    /**
-     * Add someone as a helper (updates database as well)
-     *
-     * @param uuid the uuid of the player to trust
-     */
-    public void addTrusted(UUID uuid) {
-        for (Plot current : getConnectedPlots()) {
-            if (current.getTrusted().add(uuid)) {
-                DBFunc.setTrusted(current, uuid);
-            }
-        }
-    }
-
-    /**
-     * Add someone as a trusted user (updates database as well)
-     *
-     * @param uuid the uuid of the player to add as a member
-     */
-    public void addMember(UUID uuid) {
-        for (Plot current : getConnectedPlots()) {
-            if (current.getMembers().add(uuid)) {
-                DBFunc.setMember(current, uuid);
-            }
-        }
-    }
-
-    /**
-     * Set the plot owner (and update the database)
-     *
-     * @param owner uuid to set as owner
-     */
-    public void setOwner(UUID owner) {
-        if (!hasOwner()) {
-            this.owner = owner;
-            create();
-            return;
-        }
-        if (!isMerged()) {
-            if (!this.owner.equals(owner)) {
-                this.owner = owner;
-                DBFunc.setOwner(this, owner);
-            }
-            return;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (!owner.equals(current.owner)) {
-                current.owner = owner;
-                DBFunc.setOwner(current, owner);
-            }
-        }
-    }
-
-    /**
-     * Set the plot owner (and update the database)
-     *
-     * @param owner     uuid to set as owner
-     * @param initiator player initiating set owner
-     * @return boolean
-     */
-    public boolean setOwner(UUID owner, PlotPlayer initiator) {
-        boolean result = EventUtil.manager
-            .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
-        if (!result) {
-            return false;
-        }
-        if (!hasOwner()) {
-            this.owner = owner;
-            create();
-            return true;
-        }
-        if (!isMerged()) {
-            if (!this.owner.equals(owner)) {
-                this.owner = owner;
-                DBFunc.setOwner(this, owner);
-            }
-            return true;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (!owner.equals(current.owner)) {
-                current.owner = owner;
-                DBFunc.setOwner(current, owner);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Clear a plot.
-     *
-     * @param whenDone A runnable to execute when clearing finishes, or null
-     * @see this#clear(boolean, boolean, Runnable)
-     * @see #deletePlot(Runnable) to clear and delete a plot
-     */
-    public void clear(Runnable whenDone) {
-        this.clear(false, false, whenDone);
-    }
-
-    public boolean clear(boolean checkRunning, final boolean isDelete, final Runnable whenDone) {
-        if (checkRunning && this.getRunning() != 0) {
-            return false;
-        }
-        if (isDelete) {
-            if (!EventUtil.manager.callDelete(this)) {
-                return false;
-            }
-        } else {
-            if (!EventUtil.manager.callClear(this)) {
-                return false;
-            }
-        }
-        final HashSet<RegionWrapper> regions = this.getRegions();
-        final Set<Plot> plots = this.getConnectedPlots();
-        final ArrayDeque<Plot> queue = new ArrayDeque<>(plots);
-        if (isDelete) {
-            this.removeSign();
-        }
-        this.unlinkPlot(true, !isDelete);
-        final PlotManager manager = this.area.getPlotManager();
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (queue.isEmpty()) {
-                    Runnable run = () -> {
-                        for (RegionWrapper region : regions) {
-                            Location[] corners = region.getCorners(getWorldName());
-                            ChunkManager.manager.clearAllEntities(corners[0], corners[1]);
-                        }
-                        TaskManager.runTask(whenDone);
-                    };
-                    for (Plot current : plots) {
-                        if (isDelete || current.owner == null) {
-                            manager.unclaimPlot(Plot.this.area, current, null);
-                        } else {
-                            manager.claimPlot(Plot.this.area, current);
-                        }
-                    }
-                    GlobalBlockQueue.IMP.addTask(run);
-                    return;
-                }
-                Plot current = queue.poll();
-                if (Plot.this.area.TERRAIN != 0) {
-                    ChunkManager.manager
-                        .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
-                    return;
-                }
-                manager.clearPlot(Plot.this.area, current, this);
-            }
-        };
-        run.run();
-        return true;
-    }
-
-    /**
-     * Set the biome for a plot asynchronously
-     *
-     * @param biome    The biome e.g. "forest"
-     * @param whenDone The task to run when finished, or null
-     */
-    public void setBiome(final String biome, final Runnable whenDone) {
-        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-        final int extendBiome;
-        if (area instanceof SquarePlotWorld) {
-            extendBiome = (((SquarePlotWorld) area).ROAD_WIDTH > 0) ? 1 : 0;
-        } else {
-            extendBiome = 0;
-        }
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    Plot.this.refreshChunks();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location pos1 = new Location(getWorldName(), region.minX - extendBiome, region.minY,
-                    region.minZ - extendBiome);
-                Location pos2 = new Location(getWorldName(), region.maxX + extendBiome, region.maxY,
-                    region.maxZ + extendBiome);
-                ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-                    @Override public void run(int[] value) {
-                        ChunkLoc loc = new ChunkLoc(value[0], value[1]);
-                        ChunkManager.manager.loadChunk(getWorldName(), loc, false);
-                        MainUtil.setBiome(getWorldName(), value[2], value[3], value[4], value[5],
-                            biome);
-                        ChunkManager.manager.unloadChunk(getWorldName(), loc, true, true);
-                    }
-                }, this, 5);
-
-            }
-        };
-        run.run();
-    }
-
-    /**
-     * Unlink the plot and all connected plots.
-     *
-     * @param createSign whether to recreate signs
-     * @param createRoad whether to recreate road
-     * @return success/!cancelled
-     */
-    public boolean unlinkPlot(boolean createRoad, boolean createSign) {
-        if (!this.isMerged()) {
-            return false;
-        }
-        final Set<Plot> plots = this.getConnectedPlots();
-        ArrayList<PlotId> ids = new ArrayList<>(plots.size());
-        for (Plot current : plots) {
-            current.setHome(null);
-            ids.add(current.getId());
-        }
-        boolean result = EventUtil.manager.callUnlink(this.area, ids);
-        if (!result) {
-            return false;
-        }
-        this.clearRatings();
-        if (createSign) {
-            this.removeSign();
-        }
-        PlotManager manager = this.area.getPlotManager();
-        if (createRoad) {
-            manager.startPlotUnlink(this.area, ids);
-        }
-        if (this.area.TERRAIN != 3 && createRoad) {
-            for (Plot current : plots) {
-                if (current.getMerged(1)) {
-                    manager.createRoadEast(current.area, current);
-                    if (current.getMerged(2)) {
-                        manager.createRoadSouth(current.area, current);
-                        if (current.getMerged(5)) {
-                            manager.createRoadSouthEast(current.area, current);
-                        }
-                    }
-                } else if (current.getMerged(2)) {
-                    manager.createRoadSouth(current.area, current);
-                }
-            }
-        }
-        for (Plot current : plots) {
-            boolean[] merged = new boolean[] {false, false, false, false};
-            current.setMerged(merged);
-        }
-        if (createSign) {
-            GlobalBlockQueue.IMP.addTask(() -> {
-                for (Plot current : plots) {
-                    current.setSign(MainUtil.getName(current.owner));
-                }
-            });
-        }
-        if (createRoad) {
-            manager.finishPlotUnlink(this.area, ids);
-        }
-        return true;
-    }
-
-    /**
-     * Set the sign for a plot to a specific name
-     *
-     * @param name name
-     */
-    public void setSign(final String name) {
-        if (!isLoaded()) {
-            return;
-        }
-        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-            TaskManager.runTask(() -> Plot.this.setSign(name));
-            return;
-        }
-        if (name == null) {
-            PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
-            return;
-        }
-        PlotManager manager = this.area.getPlotManager();
-        if (this.area.ALLOW_SIGNS) {
-            Location loc = manager.getSignLoc(this.area, this);
-            String id = this.id.x + ";" + this.id.y;
-            String[] lines = new String[] {C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
-                C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-                C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-                C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
-            WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
-        }
-    }
-
-    protected boolean isLoaded() {
-        return WorldUtil.IMP.isWorld(getWorldName());
-    }
-
-    /**
-     * This will return null if the plot hasn't been analyzed
-     *
-     * @return analysis of plot
-     */
-    public PlotAnalysis getComplexity(Settings.Auto_Clear settings) {
-        return PlotAnalysis.getAnalysis(this, settings);
-    }
-
-    public void analyze(RunnableVal<PlotAnalysis> whenDone) {
-        PlotAnalysis.analyzePlot(this, whenDone);
-    }
-
-    /**
-     * Set a flag for this plot
-     *
-     * @param flag  Flag to set
-     * @param value Flag value
-     */
-    public <V> boolean setFlag(Flag<V> flag, Object value) {
-        if (flag == Flags.KEEP && ExpireManager.IMP != null) {
-            ExpireManager.IMP.updateExpired(this);
-        }
-        return FlagManager.addPlotFlag(this, flag, value);
-    }
-
-    /**
-     * Remove a flag from this plot
-     *
-     * @param flag the flag to remove
-     * @return success
-     */
-    public boolean removeFlag(Flag<?> flag) {
-        return FlagManager.removePlotFlag(this, flag);
-    }
-
-    /**
-     * Get the flag for a given key
-     *
-     * @param key Flag to get value for
-     */
-    public <V> Optional<V> getFlag(Flag<V> key) {
-        return FlagManager.getPlotFlag(this, key);
-    }
-
-    /**
-     * Get the flag for a given key
-     *
-     * @param key          the flag
-     * @param defaultValue if the key is null, the value to return
-     */
-    public <V> V getFlag(Flag<V> key, V defaultValue) {
-        V value = FlagManager.getPlotFlagRaw(this, key);
-        if (value == null) {
-            return defaultValue;
-        } else {
-            return value;
-        }
-    }
-
-    /**
-     * Delete a plot (use null for the runnable if you don't need to be notified on completion)
-     *
-     * @see PlotSquared#removePlot(Plot, boolean)
-     * @see #clear(Runnable) to simply clear a plot
-     */
-    public boolean deletePlot(final Runnable whenDone) {
-        if (!this.hasOwner()) {
-            return false;
-        }
-        final Set<Plot> plots = this.getConnectedPlots();
-        this.clear(false, true, () -> {
-            for (Plot current : plots) {
-                current.unclaim();
-            }
-            TaskManager.runTask(whenDone);
-        });
-        return true;
-    }
-
-    /**
-     * Count the entities in a plot
-     *
-     * @return array of entity counts
-     * @see ChunkManager#countEntities(Plot) 0 = Entity 1 = Animal 2 = Monster 3 = Mob 4 = Boat 5 =
-     * Misc
-     */
-    public int[] countEntities() {
-        int[] count = new int[6];
-        for (Plot current : this.getConnectedPlots()) {
-            int[] result = ChunkManager.manager.countEntities(current);
-            count[0] += result[0];
-            count[1] += result[1];
-            count[2] += result[2];
-            count[3] += result[3];
-            count[4] += result[4];
-            count[5] += result[5];
-        }
-        return count;
-    }
-
-    /**
-     * Returns true if a previous task was running
-     *
-     * @return true if a previous task is running
-     */
-    public int addRunning() {
-        int value = this.getRunning();
-        for (Plot plot : this.getConnectedPlots()) {
-            plot.setMeta("running", value + 1);
-        }
-        return value;
-    }
-
-    /**
-     * Decrement the number of tracked tasks this plot is running<br> - Used to track/limit the number
-     * of things a player can do on the plot at once
-     *
-     * @return previous number of tasks (int)
-     */
-    public int removeRunning() {
-        int value = this.getRunning();
-        if (value < 2) {
-            for (Plot plot : this.getConnectedPlots()) {
-                plot.deleteMeta("running");
-            }
-        } else {
-            for (Plot plot : this.getConnectedPlots()) {
-                plot.setMeta("running", value - 1);
-            }
-        }
-        return value;
-    }
-
-    /**
-     * Get the number of tracked running tasks for this plot<br> - Used to track/limit the number of
-     * things a player can do on the plot at once
-     *
-     * @return number of tasks (int)
-     */
-    public int getRunning() {
-        Integer value = (Integer) this.getMeta("running");
-        return value == null ? 0 : value;
-    }
-
-    /**
-     * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in
-     * unclaimed plot objects.
-     *
-     * @return false if the Plot has no owner, otherwise true.
-     */
-    public boolean unclaim() {
-        if (this.owner == null) {
-            return false;
-        }
-        for (Plot current : getConnectedPlots()) {
-            List<PlotPlayer> players = current.getPlayersInPlot();
-            for (PlotPlayer pp : players) {
-                PlotListener.plotExit(pp, current);
-            }
-            getArea().removePlot(getId());
-            DBFunc.delete(current);
-            current.owner = null;
-            current.settings = null;
-            for (PlotPlayer pp : players) {
-                PlotListener.plotEntry(pp, current);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Unlink a plot and remove the roads
-     *
-     * @return true if plot was linked
-     * @see this#unlinkPlot(boolean, boolean)
-     */
-    public boolean unlink() {
-        return this.unlinkPlot(true, true);
-    }
-
-    public Location getCenter() {
-        Location[] corners = getCorners();
-        Location top = corners[0];
-        Location bot = corners[1];
-        Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
-            MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
-        if (!isLoaded()) {
-            return loc;
-        }
-        int y =
-            isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
-        if (area.ALLOW_SIGNS) {
-            y = Math.max(y, getManager().getSignLoc(area, this).getY());
-        }
-        loc.setY(1 + y);
-        return loc;
-    }
-
-    public Location getSide() {
-        RegionWrapper largest = getLargestRegion();
-        int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
-        int z = largest.minZ - 1;
-        PlotManager manager = getManager();
-        int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
-        if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
-            y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
-        }
-        return new Location(getWorldName(), x, y + 1, z);
-    }
-
-    /**
-     * Return the home location for the plot
-     *
-     * @return Home location
-     */
-    public Location getHome() {
-        BlockLoc home = this.getPosition();
-        if (home == null || home.x == 0 && home.z == 0) {
-            return this.getDefaultHome(true);
-        } else {
-            Location bot = this.getBottomAbs();
-            Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
-                bot.getZ() + home.z, home.yaw, home.pitch);
-            if (!isLoaded()) {
-                return loc;
-            }
-            if (!WorldUtil.IMP.getBlock(loc).isAir()) {
-                loc.setY(Math.max(
-                    1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
-                    bot.getY()));
-            }
-            return loc;
-        }
-    }
-
-    /**
-     * Set the home location
-     *
-     * @param location location to set as home
-     */
-    public void setHome(BlockLoc location) {
-        Plot plot = this.getBasePlot(false);
-        if (location != null && new BlockLoc(0, 0, 0).equals(location)) {
-            return;
-        }
-        plot.getSettings().setPosition(location);
-        if (location != null) {
-            DBFunc.setPosition(plot, plot.getSettings().getPosition().toString());
-            return;
-        }
-        DBFunc.setPosition(plot, null);
-    }
-
-    /**
-     * Get the default home location for a plot<br> - Ignores any home location set for that specific
-     * plot
-     *
-     * @return Location
-     */
-    public Location getDefaultHome() {
-        return getDefaultHome(false);
-    }
-
-    public Location getDefaultHome(boolean member) {
-        Plot plot = this.getBasePlot(false);
-        PlotLoc loc = member ? area.DEFAULT_HOME : area.NONMEMBER_HOME;
-        if (loc != null) {
-            int x;
-            int z;
-            if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
-                // center
-                RegionWrapper largest = plot.getLargestRegion();
-                x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
-                z = (largest.maxZ >> 1) - (largest.minZ >> 1) + largest.minZ;
-            } else {
-                // specific
-                Location bot = plot.getBottomAbs();
-                x = bot.getX() + loc.x;
-                z = bot.getZ() + loc.z;
-            }
-            int y = loc.y < 1 ?
-                (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
-                loc.y;
-            PlotSquared.log("Getting home with Y " + y);
-            return new Location(plot.getWorldName(), x, y, z);
-        }
-        // Side
-        return plot.getSide();
-    }
-
-    public double getVolume() {
-        double count = 0;
-        for (RegionWrapper region : getRegions()) {
-            count +=
-                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
-                    * 256;
-        }
-        return count;
-    }
-
-    /**
-     * Get the average rating of the plot. This is the value displayed in /plot info
-     *
-     * @return average rating as double
-     */
-    public double getAverageRating() {
-        double sum = 0;
-        Collection<Rating> ratings = this.getRatings().values();
-        for (Rating rating : ratings) {
-            sum += rating.getAverageRating();
-        }
-        return sum / ratings.size();
-    }
-
-    /**
-     * Set a rating for a user<br> - If the user has already rated, the following will return false
-     *
-     * @param uuid   uuid of rater
-     * @param rating rating
-     * @return success
-     */
-    public boolean addRating(UUID uuid, Rating rating) {
-        Plot base = this.getBasePlot(false);
-        PlotSettings baseSettings = base.getSettings();
-        if (baseSettings.getRatings().containsKey(uuid)) {
-            return false;
-        }
-        int aggregate = rating.getAggregate();
-        baseSettings.getRatings().put(uuid, aggregate);
-        DBFunc.setRating(base, uuid, aggregate);
-        return true;
-    }
-
-    /**
-     * Clear the ratings for this plot
-     */
-    public void clearRatings() {
-        Plot base = this.getBasePlot(false);
-        PlotSettings baseSettings = base.getSettings();
-        if (baseSettings.ratings != null && !baseSettings.getRatings().isEmpty()) {
-            DBFunc.deleteRatings(base);
-            baseSettings.ratings = null;
-        }
-    }
-
-    /**
-     * Get the ratings associated with a plot<br> - The rating object may contain multiple categories
-     *
-     * @return Map of user who rated to the rating
-     */
-    public HashMap<UUID, Rating> getRatings() {
-        Plot base = this.getBasePlot(false);
-        HashMap<UUID, Rating> map = new HashMap<>();
-        if (!base.hasRatings()) {
-            return map;
-        }
-        for (Entry<UUID, Integer> entry : base.getSettings().getRatings().entrySet()) {
-            map.put(entry.getKey(), new Rating(entry.getValue()));
-        }
-        return map;
-    }
-
-    public boolean hasRatings() {
-        Plot base = this.getBasePlot(false);
-        return base.settings != null && base.settings.ratings != null;
-    }
-
-    /**
-     * Resend all chunks inside the plot to nearby players<br> This should not need to be called
-     */
-    public void refreshChunks() {
-        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
-        HashSet<ChunkLoc> chunks = new HashSet<>();
-        for (RegionWrapper region : Plot.this.getRegions()) {
-            for (int x = region.minX >> 4; x <= region.maxX >> 4; x++) {
-                for (int z = region.minZ >> 4; z <= region.maxZ >> 4; z++) {
-                    if (chunks.add(new ChunkLoc(x, z))) {
-                        queue.refreshChunk(x, z);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Remove the plot sign if it is set.
-     */
-    public void removeSign() {
-        PlotManager manager = this.area.getPlotManager();
-        if (!this.area.ALLOW_SIGNS) {
-            return;
-        }
-        Location loc = manager.getSignLoc(this.area, this);
-        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
-        queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
-        queue.flush();
-    }
-
-    /**
-     * Set the plot sign if plot signs are enabled.
-     */
-    public void setSign() {
-        if (this.owner == null) {
-            this.setSign("unknown");
-            return;
-        }
-        this.setSign(UUIDHandler.getName(this.owner));
-    }
-
-    /**
-     * Register a plot and create it in the database<br> - The plot will not be created if the owner
-     * is null<br> - Any setting from before plot creation will not be saved until the server is
-     * stopped properly. i.e. Set any values/options after plot creation.
-     *
-     * @return true if plot was created successfully
-     */
-    public boolean create() {
-        return this.create(this.owner, true);
-    }
-
-    public boolean claim(final PlotPlayer player, boolean teleport, String schematic) {
-        if (!canClaim(player)) {
-            return false;
-        }
-        return claim(player, teleport, schematic, true);
-    }
-
-    public boolean claim(final PlotPlayer player, boolean teleport, String schematic,
-        boolean updateDB) {
-        boolean result = EventUtil.manager.callClaim(player, this, false);
-        if (updateDB) {
-            if (!result || (!create(player.getUUID(), true))) {
-                return false;
-            }
-        } else {
-            area.addPlot(this);
-        }
-        setSign(player.getName());
-        MainUtil.sendMessage(player, C.CLAIMED);
-        if (teleport) {
-            teleportPlayer(player);
-        }
-        PlotArea plotworld = getArea();
-        if (plotworld.SCHEMATIC_ON_CLAIM) {
-            Schematic sch;
-            try {
-                if (schematic == null || schematic.isEmpty()) {
-                    sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-                } else {
-                    sch = SchematicHandler.manager.getSchematic(schematic);
-                    if (sch == null) {
-                        sch = SchematicHandler.manager.getSchematic(plotworld.SCHEMATIC_FILE);
-                    }
-                }
-            } catch (SchematicHandler.UnsupportedFormatException e) {
-                e.printStackTrace();
-                return true;
-            }
-            SchematicHandler.manager.paste(sch, this, 0, 1, 0, Settings.Schematics.PASTE_ON_TOP,
-                new RunnableVal<Boolean>() {
-                    @Override public void run(Boolean value) {
-                        if (value) {
-                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
-                        } else {
-                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
-                        }
-                    }
-                });
-        }
-        plotworld.getPlotManager().claimPlot(plotworld, this);
-        return true;
-    }
-
-    /**
-     * Register a plot and create it in the database<br> - The plot will not be created if the owner
-     * is null<br> - Any setting from before plot creation will not be saved until the server is
-     * stopped properly. i.e. Set any values/options after plot creation.
-     *
-     * @param uuid   the uuid of the plot owner
-     * @param notify notify
-     * @return true if plot was created successfully
-     */
-    public boolean create(final UUID uuid, final boolean notify) {
-        if (uuid == null) {
-            throw new IllegalArgumentException("UUID cannot be null");
-        }
-        this.owner = uuid;
-        Plot existing = this.area.getOwnedPlotAbs(this.id);
-        if (existing != null) {
-            throw new IllegalStateException("Plot already exists!");
-        }
-        if (notify) {
-            Integer meta = (Integer) this.area.getMeta("worldBorder");
-            if (meta != null) {
-                this.updateWorldBorder();
-            }
-        }
-        connected_cache = null;
-        regions_cache = null;
-        this.getTrusted().clear();
-        this.getMembers().clear();
-        this.getDenied().clear();
-        this.settings = new PlotSettings();
-        if (this.area.addPlot(this)) {
-            DBFunc.createPlotAndSettings(this, () -> {
-                PlotArea plotworld = Plot.this.area;
-                if (notify && plotworld.AUTO_MERGE) {
-                    Plot.this.autoMerge(-1, Integer.MAX_VALUE, uuid, true);
-                }
-            });
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Set components such as border, wall, floor. (components are generator specific)
-     */
-    public boolean setComponent(String component, String blocks) {
-        BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
-        return !(parsed == null || parsed.isEmpty()) && this.setComponent(component, parsed);
-    }
-
-    /**
-     * Retrieve the biome of the plot.
-     *
-     * @return the name of the biome
-     */
-    public String getBiome() {
-        Location loc = this.getCenter();
-        return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
-    }
-
-    /**
-     * Return the top location for the plot.
-     */
-    public Location getTopAbs() {
-        Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
-        top.setWorld(getWorldName());
-        return top;
-    }
-
-    /**
-     * Return the bottom location for the plot.
-     */
-    public Location getBottomAbs() {
-        Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
-        loc.setWorld(getWorldName());
-        return loc;
-    }
-
-    /**
-     * Swap the settings for two plots.
-     *
-     * @param plot     the plot to swap data with
-     * @param whenDone the task to run at the end of this method.
-     */
-    public boolean swapData(Plot plot, Runnable whenDone) {
-        if (this.owner == null) {
-            if (plot != null && plot.hasOwner()) {
-                plot.moveData(this, whenDone);
-                return true;
-            }
-            return false;
-        }
-        if (plot == null || plot.owner == null) {
-            this.moveData(plot, whenDone);
-            return true;
-        }
-        // Swap cached
-        PlotId temp = new PlotId(this.getId().x, this.getId().y);
-        this.getId().x = plot.getId().x;
-        this.getId().y = plot.getId().y;
-        plot.getId().x = temp.x;
-        plot.getId().y = temp.y;
-        this.area.removePlot(this.getId());
-        plot.area.removePlot(plot.getId());
-        this.getId().recalculateHash();
-        plot.getId().recalculateHash();
-        this.area.addPlotAbs(this);
-        plot.area.addPlotAbs(plot);
-        // Swap database
-        DBFunc.swapPlots(plot, this);
-        TaskManager.runTaskLater(whenDone, 1);
-        return true;
-    }
-
-    /**
-     * Move the settings for a plot.
-     *
-     * @param plot the plot to move
-     */
-    public boolean moveData(Plot plot, Runnable whenDone) {
-        if (this.owner == null) {
-            PlotSquared.debug(plot + " is unowned (single)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        if (plot.hasOwner()) {
-            PlotSquared.debug(plot + " is unowned (multi)");
-            TaskManager.runTask(whenDone);
-            return false;
-        }
-        this.area.removePlot(this.id);
-        this.getId().x = plot.getId().x;
-        this.getId().y = plot.getId().y;
-        this.getId().recalculateHash();
-        this.area.addPlotAbs(this);
-        DBFunc.movePlot(this, plot);
-        TaskManager.runTaskLater(whenDone, 1);
-        return true;
-    }
-
-    /**
-     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like
-     * each plot treated as a small plot use getPlotTopLocAbs(...)
-     *
-     * @return Location top of mega plot
-     */
-    public Location getExtendedTopAbs() {
-        Location top = this.getTopAbs();
-        if (!this.isMerged()) {
-            return top;
-        }
-        if (this.getMerged(2)) {
-            top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
-        }
-        if (this.getMerged(1)) {
-            top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
-        }
-        return top;
-    }
-
-    /**
-     * Gets the bottom location for a plot.<br> - Does not respect mega plots<br> - Merged plots, only
-     * the road will be considered part of the plot<br>
-     *
-     * @return Location bottom of mega plot
-     */
-    public Location getExtendedBottomAbs() {
-        Location bot = this.getBottomAbs();
-        if (!this.isMerged()) {
-            return bot;
-        }
-        if (this.getMerged(0)) {
-            bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
-        }
-        if (this.getMerged(3)) {
-            bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
-        }
-        return bot;
-    }
-
-    /**
-     * Returns the top and bottom location.<br> - If the plot is not connected, it will return its own
-     * corners<br> - the returned locations will not necessarily correspond to claimed plots if the
-     * connected plots do not form a rectangular shape
-     *
-     * @return new Location[] { bottom, top }
-     * @deprecated as merged plots no longer need to be rectangular
-     */
-    @Deprecated public Location[] getCorners() {
-        if (!this.isMerged()) {
-            return new Location[] {this.getBottomAbs(), this.getTopAbs()};
-        }
-        return MainUtil.getCorners(this.getWorldName(), this.getRegions());
-    }
-
-    /**
-     * Remove the east road section of a plot<br> - Used when a plot is merged<br>
-     */
-    public void removeRoadEast() {
-        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-            if (this.area.TERRAIN == 3) {
-                return;
-            }
-            Plot other = this.getRelative(1);
-            Location bot = other.getBottomAbs();
-            Location top = this.getTopAbs();
-            Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
-            Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
-            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-        } else {
-            this.area.getPlotManager().removeRoadEast(this.area, this);
-        }
-    }
-
-    /**
-     * @deprecated in favor of getCorners()[0];<br>
-     */
-    // Won't remove as suggestion also points to deprecated method
-    @Deprecated public Location getBottom() {
-        return this.getCorners()[0];
-    }
-
-    /**
-     * @return the top corner of the plot
-     * @deprecated in favor of getCorners()[1];
-     */
-    // Won't remove as suggestion also points to deprecated method
-    @Deprecated public Location getTop() {
-        return this.getCorners()[1];
-    }
-
-    /**
-     * Swap the plot contents and settings with another location<br> - The destination must correspond
-     * to a valid plot of equal dimensions
-     *
-     * @param destination The other plot to swap with
-     * @param whenDone    A task to run when finished, or null
-     * @return boolean if swap was successful
-     * @see ChunkManager#swap(Location, Location, Location, Location, Runnable) to swap terrain
-     * @see this#swapData(Plot, Runnable) to swap plot settings
-     * @see this#swapData(Plot, Runnable)
-     */
-    public boolean swap(Plot destination, Runnable whenDone) {
-        return this.move(destination, whenDone, true);
-    }
-
-    /**
-     * Move the plot to an empty location<br> - The location must be empty
-     *
-     * @param destination Where to move the plot
-     * @param whenDone    A task to run when done, or null
-     * @return if the move was successful
-     */
-    public boolean move(Plot destination, Runnable whenDone) {
-        return this.move(destination, whenDone, false);
-    }
-
-    /**
-     * Get plot display name.
-     *
-     * @return alias if set, else id
-     */
-    @Override public String toString() {
-        if (this.settings != null && this.settings.getAlias().length() > 1) {
-            return this.settings.getAlias();
-        }
-        return this.area + ";" + this.id.x + ";" + this.id.y;
-    }
-
-
-    /**
-     * Remove a denied player (use DBFunc as well)<br> Using the * uuid will remove all users
-     */
-    public boolean removeDenied(UUID uuid) {
-        if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
-            boolean result = false;
-            for (UUID other : new HashSet<>(getDenied())) {
-                result = rmvDenied(other) || result;
-            }
-            return result;
-        }
-        return rmvDenied(uuid);
-    }
-
-    private boolean rmvDenied(UUID uuid) {
-        for (Plot current : this.getConnectedPlots()) {
-            if (current.getDenied().remove(uuid)) {
-                DBFunc.removeDenied(current, uuid);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Remove a helper (use DBFunc as well)<br> Using the * uuid will remove all users
-     */
-    public boolean removeTrusted(UUID uuid) {
-        if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
-            boolean result = false;
-            for (UUID other : new HashSet<>(getTrusted())) {
-                result = rmvTrusted(other) || result;
-            }
-            return result;
-        }
-        return rmvTrusted(uuid);
-    }
-
-    private boolean rmvTrusted(UUID uuid) {
-        for (Plot plot : this.getConnectedPlots()) {
-            if (plot.getTrusted().remove(uuid)) {
-                DBFunc.removeTrusted(plot, uuid);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Remove a trusted user (use DBFunc as well)<br> Using the * uuid will remove all users
-     */
-    public boolean removeMember(UUID uuid) {
-        if (this.members == null) {
-            return false;
-        }
-        if (uuid == DBFunc.EVERYONE && !members.contains(uuid)) {
-            boolean result = false;
-            for (UUID other : new HashSet<>(this.members)) {
-                result = rmvMember(other) || result;
-            }
-            return result;
-        }
-        return rmvMember(uuid);
-    }
-
-    private boolean rmvMember(UUID uuid) {
-        for (Plot current : this.getConnectedPlots()) {
-            if (current.getMembers().remove(uuid)) {
-                DBFunc.removeMember(current, uuid);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Export the plot as a schematic to the configured output directory.
-     */
-    public void export(final RunnableVal<Boolean> whenDone) {
-        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
-            @Override public void run(final CompoundTag value) {
-                if (value == null) {
-                    if (whenDone != null) {
-                        whenDone.value = false;
-                        TaskManager.runTask(whenDone);
-                    }
-                } else {
-                    TaskManager.runTaskAsync(() -> {
-                        String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
-                            .getName(Plot.this.owner);
-                        boolean result = SchematicHandler.manager.save(value,
-                            Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
-                        if (whenDone != null) {
-                            whenDone.value = result;
-                            TaskManager.runTask(whenDone);
-                        }
-                    });
-                }
-            }
-        });
-    }
-
-    /**
-     * Upload the plot as a schematic to the configured web interface.
-     *
-     * @param whenDone value will be null if uploading fails
-     */
-    public void upload(final RunnableVal<URL> whenDone) {
-        SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
-            @Override public void run(CompoundTag value) {
-                SchematicHandler.manager.upload(value, null, null, whenDone);
-            }
-        });
-    }
-
-    /**
-     * Upload this plot as a world file<br> - The mca files are each 512x512, so depending on the plot
-     * size it may also download adjacent plots<br> - Works best when (plot width + road width) % 512
-     * == 0<br>
-     *
-     * @see WorldUtil
-     */
-    public void uploadWorld(RunnableVal<URL> whenDone) {
-        WorldUtil.IMP.upload(this, null, null, whenDone);
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (this.getClass() != obj.getClass()) {
-            return false;
-        }
-        Plot other = (Plot) obj;
-        return this.hashCode() == other.hashCode() && this.id.equals(other.id)
-            && this.area == other.area;
-    }
-
-    /**
-     * Get the plot hashcode<br> Note: The hashcode is unique if:<br> - Plots are in the same
-     * world<br> - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
-     *
-     * @return integer.
-     */
-    @Override public int hashCode() {
-        return this.id.hashCode();
-    }
-
-    /**
-     * Get the flags specific to this plot<br> - Does not take default flags into account<br>
-     */
-    public HashMap<Flag<?>, Object> getFlags() {
-        return this.getSettings().flags;
-    }
-
-    /**
-     * Set a flag for this plot.
-     */
-    public void setFlags(HashMap<Flag<?>, Object> flags) {
-        FlagManager.setPlotFlags(this, flags);
-    }
-
-    /**
-     * Get the plot alias. - Returns an empty string if no alias is set
-     *
-     * @return The plot alias
-     */
-    public String getAlias() {
-        if (this.settings == null) {
-            return "";
-        }
-        return this.settings.getAlias();
-    }
-
-    /**
-     * Set the plot alias.
-     *
-     * @param alias The alias
-     */
-    public void setAlias(String alias) {
-        for (Plot current : this.getConnectedPlots()) {
-            String name = this.getSettings().getAlias();
-            if (alias == null) {
-                alias = "";
-            }
-            if (name.equals(alias)) {
-                return;
-            }
-            current.getSettings().setAlias(alias);
-            DBFunc.setAlias(current, alias);
-        }
-    }
-
-    /**
-     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> ----------<br> 0 =
-     * north<br> 1 = east<br> 2 = south<br> 3 = west<br> ----------<br>
-     */
-    private void setMerged(int direction, boolean value) {
-        if (this.getSettings().setMerged(direction, value)) {
-            if (value) {
-                Plot other = this.getRelative(direction).getBasePlot(false);
-                if (!other.equals(this.getBasePlot(false))) {
-                    Plot base = other.id.y < this.id.y
-                        || other.id.y == this.id.y && other.id.x < this.id.x ? other : this.origin;
-                    this.origin.origin = base;
-                    other.origin = base;
-                    this.origin = base;
-                    connected_cache = null;
-                }
-            } else {
-                if (this.origin != null) {
-                    this.origin.origin = null;
-                    this.origin = null;
-                }
-                connected_cache = null;
-            }
-            DBFunc.setMerged(this, this.getSettings().getMerged());
-            regions_cache = null;
-        }
-    }
-
-    /**
-     * Get the merged array.
-     *
-     * @return boolean [ north, east, south, west ]
-     */
-    public boolean[] getMerged() {
-        return this.getSettings().getMerged();
-    }
-
-    /**
-     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> Get if the plot is
-     * merged in a direction<br> ----------<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
-     * ----------<br> Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
-     */
-    public void setMerged(boolean[] merged) {
-        this.getSettings().setMerged(merged);
-        DBFunc.setMerged(this, merged);
-        clearCache();
-    }
-
-    private void clearCache() {
-        connected_cache = null;
-        regions_cache = null;
-        if (this.origin != null) {
-            this.origin.origin = null;
-            this.origin = null;
-        }
-    }
-
-    /**
-     * Get the set home location or 0,0,0 if no location is set<br> - Does not take the default home
-     * location into account
-     *
-     * @see #getHome()
-     */
-    public BlockLoc getPosition() {
-        return this.getSettings().getPosition();
-    }
-
-    /**
-     * Check if a plot can be claimed by the provided player.
-     *
-     * @param player the claiming player
-     */
-    public boolean canClaim(@Nullable PlotPlayer player) {
-        PlotCluster cluster = this.getCluster();
-        if (cluster != null && player != null) {
-            if (!cluster.isAdded(player.getUUID()) && !Permissions
-                .hasPermission(player, "plots.admin.command.claim")) {
-                return false;
-            }
-        }
-        return this.guessOwner() == null && !isMerged();
-    }
-
-    /**
-     * Guess the owner of a plot either by the value in memory, or the sign data<br> Note: Recovering
-     * from sign information is useful if e.g. PlotMe conversion wasn't successful
-     *
-     * @return UUID
-     */
-    public UUID guessOwner() {
-        if (this.hasOwner()) {
-            return this.owner;
-        }
-        if (!this.area.ALLOW_SIGNS) {
-            return null;
-        }
-        try {
-            final Location loc = this.getManager().getSignLoc(this.area, this);
-            String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
-                @Override public void run(String[] value) {
-                    ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
-                    this.value = WorldUtil.IMP.getSign(loc);
-                }
-            });
-            if (lines == null) {
-                return null;
-            }
-            loop:
-            for (int i = 4; i > 0; i--) {
-                String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
-                int index = caption.indexOf("%plr%");
-                if (index < 0) {
-                    continue;
-                }
-                String line = lines[i - 1];
-                if (line.length() <= index) {
-                    return null;
-                }
-                String name = line.substring(index);
-                if (name.isEmpty()) {
-                    return null;
-                }
-                UUID owner = UUIDHandler.getUUID(name, null);
-                if (owner != null) {
-                    this.owner = owner;
-                    break;
-                }
-                if (lines[i - 1].length() == 15) {
-                    BiMap<StringWrapper, UUID> map = UUIDHandler.getUuidMap();
-                    for (Entry<StringWrapper, UUID> entry : map.entrySet()) {
-                        String key = entry.getKey().value;
-                        if (key.length() > name.length() && key.startsWith(name)) {
-                            this.owner = entry.getValue();
-                            break loop;
-                        }
-                    }
-                }
-                this.owner = UUID.nameUUIDFromBytes(
-                    ("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
-                break;
-            }
-            if (this.hasOwner()) {
-                this.create();
-            }
-            return this.owner;
-        } catch (IllegalArgumentException ignored) {
-            return null;
-        }
-    }
-
-    /**
-     * Remove the south road section of a plot<br> - Used when a plot is merged<br>
-     */
-    public void removeRoadSouth() {
-        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-            if (this.area.TERRAIN == 3) {
-                return;
-            }
-            Plot other = this.getRelative(2);
-            Location bot = other.getBottomAbs();
-            Location top = this.getTopAbs();
-            Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
-            Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
-            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-        } else {
-            this.getManager().removeRoadSouth(this.area, this);
-        }
-    }
-
-    /**
-     * Auto merge a plot in a specific direction<br>
-     *
-     * @param dir         The direction to merge<br> -1 = All directions<br> 0 = north<br> 1 = east<br> 2 =
-     *                    south<br> 3 = west<br>
-     * @param max         The max number of merges to do
-     * @param uuid        The UUID it is allowed to merge with
-     * @param removeRoads Whether to remove roads
-     * @return true if a merge takes place
-     */
-    public boolean autoMerge(int dir, int max, UUID uuid, boolean removeRoads) {
-        if (this.owner == null) {
-            return false;
-        }
-        if (!EventUtil.manager.callMerge(this, dir, max)) {
-            return false;
-        }
-        HashSet<Plot> visited = new HashSet<>();
-        HashSet<PlotId> merged = new HashSet<>();
-        Set<Plot> connected = this.getConnectedPlots();
-        for (Plot current : connected) {
-            merged.add(current.getId());
-        }
-        ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
-        Plot current;
-        boolean toReturn = false;
-        while ((current = frontier.poll()) != null && max >= 0) {
-            if (visited.contains(current)) {
-                continue;
-            }
-            visited.add(current);
-            Set<Plot> plots;
-            if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
-                Plot other = current.getRelative(0);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-            if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
-                Plot other = current.getRelative(1);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-            if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
-                Plot other = current.getRelative(2);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-            if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
-                Plot other = current.getRelative(3);
-                if (other != null && other.isOwner(uuid) && (
-                    other.getBasePlot(false).equals(current.getBasePlot(false))
-                        || (plots = other.getConnectedPlots()).size() <= max && frontier
-                        .addAll(plots) && (max -= plots.size()) != -1)) {
-                    current.mergePlot(other, removeRoads);
-                    merged.add(current.getId());
-                    merged.add(other.getId());
-                    toReturn = true;
-                }
-            }
-        }
-        if (removeRoads && toReturn) {
-            ArrayList<PlotId> ids = new ArrayList<>(merged);
-            this.getManager().finishPlotMerge(this.area, ids);
-        }
-        return toReturn;
-    }
-
-    /**
-     * Merge the plot settings<br> - Used when a plot is merged<br>
-     */
-    public void mergeData(Plot b) {
-        HashMap<Flag<?>, Object> flags1 = this.getFlags();
-        HashMap<Flag<?>, Object> flags2 = b.getFlags();
-        if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
-            boolean greater = flags1.size() > flags2.size();
-            if (greater) {
-                flags1.putAll(flags2);
-            } else {
-                flags2.putAll(flags1);
-            }
-            HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
-            this.setFlags(net);
-            b.setFlags(net);
-        }
-        if (!this.getAlias().isEmpty()) {
-            b.setAlias(this.getAlias());
-        } else if (!b.getAlias().isEmpty()) {
-            this.setAlias(b.getAlias());
-        }
-        for (UUID uuid : this.getTrusted()) {
-            b.addTrusted(uuid);
-        }
-        for (UUID uuid : b.getTrusted()) {
-            this.addTrusted(uuid);
-        }
-        for (UUID uuid : this.getMembers()) {
-            b.addMember(uuid);
-        }
-        for (UUID uuid : b.getMembers()) {
-            this.addMember(uuid);
-        }
-
-        for (UUID uuid : this.getDenied()) {
-            b.addDenied(uuid);
-        }
-        for (UUID uuid : b.getDenied()) {
-            this.addDenied(uuid);
-        }
-    }
-
-    /**
-     * Remove the SE road (only effects terrain)
-     */
-    public void removeRoadSouthEast() {
-        if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
-            if (this.area.TERRAIN == 3) {
-                return;
-            }
-            Plot other = this.getRelative(1, 1);
-            Location pos1 = this.getTopAbs().add(1, 0, 1);
-            Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
-            pos1.setY(0);
-            pos2.setY(256);
-            ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
-        } else {
-            this.area.getPlotManager().removeRoadSouthEast(this.area, this);
-        }
-    }
-
-    /**
-     * Get the plot in a relative location<br> Note: May be null if the partial plot area does not
-     * include the relative location
-     *
-     * @return Plot
-     */
-    public Plot getRelative(int x, int y) {
-        return this.area.getPlotAbs(this.id.getRelative(x, y));
-    }
-
-    public Plot getRelative(PlotArea area, int x, int y) {
-        return area.getPlotAbs(this.id.getRelative(x, y));
-    }
-
-    /**
-     * Get the plot in a relative direction<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
-     * Note: May be null if the partial plot area does not include the relative location
-     */
-    public Plot getRelative(int direction) {
-        return this.area.getPlotAbs(this.id.getRelative(direction));
-    }
-
-    /**
-     * Get a set of plots connected (and including) this plot<br> - This result is cached globally
-     */
-    public Set<Plot> getConnectedPlots() {
-        if (this.settings == null || !this.isMerged()) {
-            return Collections.singleton(this);
-        }
-        boolean[] merged = this.getMerged();
-        int hash = MainUtil.hash(merged);
-        if (hash == 0) {
-            return Collections.singleton(this);
-        }
-        if (connected_cache != null && connected_cache.contains(this)) {
-            return connected_cache;
-        }
-        regions_cache = null;
-
-        HashSet<Plot> tmpSet = new HashSet<>();
-        ArrayDeque<Plot> frontier = new ArrayDeque<>();
-        HashSet<Object> queuecache = new HashSet<>();
-        tmpSet.add(this);
-        Plot tmp;
-        if (merged[0]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(0));
-            if (!tmp.getMerged(2)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(2, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(0, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (merged[1]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(1));
-            if (!tmp.getMerged(3)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(3, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(1, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (merged[2]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(2));
-            if (!tmp.getMerged(0)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(0, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(2, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        if (merged[3]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(3));
-            if (!tmp.getMerged(1)) {
-                // invalid merge
-                PlotSquared.debug("Fixing invalid merge: " + this);
-                if (tmp.isOwnerAbs(this.owner)) {
-                    tmp.getSettings().setMerged(1, true);
-                    DBFunc.setMerged(tmp, tmp.getSettings().getMerged());
-                } else {
-                    this.getSettings().setMerged(3, false);
-                    DBFunc.setMerged(this, this.getSettings().getMerged());
-                }
-            }
-            queuecache.add(tmp);
-            frontier.add(tmp);
-        }
-        Plot current;
-        while ((current = frontier.poll()) != null) {
-            if (current.owner == null || current.settings == null) {
-                // Invalid plot
-                // merged onto unclaimed plot
-                PlotSquared
-                    .debug("Ignoring invalid merged plot: " + current + " | " + current.owner);
-                continue;
-            }
-            tmpSet.add(current);
-            queuecache.remove(current);
-            merged = current.getMerged();
-            if (merged[0]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(0));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (merged[1]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(1));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (merged[2]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(2));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-            if (merged[3]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(3));
-                if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
-                    queuecache.add(tmp);
-                    frontier.add(tmp);
-                }
-            }
-        }
-        connected_cache = tmpSet;
-        return tmpSet;
-    }
-
-    /**
-     * This will combine each plot into effective rectangular regions<br> - This result is cached
-     * globally<br> - Useful for handling non rectangular shapes
-     */
-    public HashSet<RegionWrapper> getRegions() {
-        if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
-            return regions_cache;
-        }
-        if (!this.isMerged()) {
-            Location pos1 = this.getBottomAbs();
-            Location pos2 = this.getTopAbs();
-            connected_cache = new HashSet<>(Collections.singletonList(this));
-            regions_cache = new HashSet<>(1);
-            regions_cache.add(
-                new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
-                    pos2.getZ()));
-            return regions_cache;
-        }
-        Set<Plot> plots = this.getConnectedPlots();
-        HashSet<RegionWrapper> regions = regions_cache = new HashSet<>();
-        HashSet<PlotId> visited = new HashSet<>();
-        for (Plot current : plots) {
-            if (visited.contains(current.getId())) {
-                continue;
-            }
-            boolean merge = true;
-            PlotId bot = new PlotId(current.getId().x, current.getId().y);
-            PlotId top = new PlotId(current.getId().x, current.getId().y);
-            while (merge) {
-                merge = false;
-                ArrayList<PlotId> ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, bot.y - 1),
-                    new PlotId(top.x, bot.y - 1));
-                boolean tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    bot.y--;
-                }
-                ids = MainUtil.getPlotSelectionIds(new PlotId(top.x + 1, bot.y),
-                    new PlotId(top.x + 1, top.y));
-                tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    top.x++;
-                }
-                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x, top.y + 1),
-                    new PlotId(top.x, top.y + 1));
-                tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    top.y++;
-                }
-                ids = MainUtil.getPlotSelectionIds(new PlotId(bot.x - 1, bot.y),
-                    new PlotId(bot.x - 1, top.y));
-                tmp = true;
-                for (PlotId id : ids) {
-                    Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
-                        tmp = false;
-                    }
-                }
-                if (tmp) {
-                    merge = true;
-                    bot.x--;
-                }
-            }
-            Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
-            Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
-            visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
-            for (int x = bot.x; x <= top.x; x++) {
-                Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
-                if (plot.getMerged(2)) {
-                    // south wedge
-                    Location toploc = plot.getExtendedTopAbs();
-                    Location botabs = plot.getBottomAbs();
-                    Location topabs = plot.getTopAbs();
-                    regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
-                        toploc.getZ()));
-                    if (plot.getMerged(5)) {
-                        regions.add(
-                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
-                                toploc.getZ()));
-                        // intersection
-                    }
-                }
-            }
-
-            for (int y = bot.y; y <= top.y; y++) {
-                Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
-                if (plot.getMerged(1)) {
-                    // east wedge
-                    Location toploc = plot.getExtendedTopAbs();
-                    Location botabs = plot.getBottomAbs();
-                    Location topabs = plot.getTopAbs();
-                    regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
-                        topabs.getZ()));
-                    if (plot.getMerged(5)) {
-                        regions.add(
-                            new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
-                                toploc.getZ()));
-                        // intersection
-                    }
-                }
-            }
-            regions.add(
-                new RegionWrapper(gbotabs.getX(), gtopabs.getX(), gbotabs.getZ(), gtopabs.getZ()));
-        }
-        return regions;
-    }
-
-    /**
-     * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular
-     * shapes)
-     */
-    public RegionWrapper getLargestRegion() {
-        HashSet<RegionWrapper> regions = this.getRegions();
-        RegionWrapper max = null;
-        double area = Double.NEGATIVE_INFINITY;
-        for (RegionWrapper region : regions) {
-            double current =
-                (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1);
-            if (current > area) {
-                max = region;
-                area = current;
-            }
-        }
-        return max;
-    }
-
-    /**
-     * Do the plot entry tasks for each player in the plot<br> - Usually called when the plot state
-     * changes (unclaimed/claimed/flag change etc)
-     */
-    public void reEnter() {
-        TaskManager.runTaskLater(() -> {
-            for (PlotPlayer pp : Plot.this.getPlayersInPlot()) {
-                PlotListener.plotExit(pp, Plot.this);
-                PlotListener.plotEntry(pp, Plot.this);
-            }
-        }, 1);
-    }
-
-    /**
-     * Get all the corners of the plot (supports non-rectangular shapes).
-     *
-     * @return A list of the plot corners
-     */
-    public List<Location> getAllCorners() {
-        Area area = new Area();
-        for (RegionWrapper region : this.getRegions()) {
-            Rectangle2D rect = new Rectangle2D.Double(region.minX - 0.6, region.minZ - 0.6,
-                region.maxX - region.minX + 1.2, region.maxZ - region.minZ + 1.2);
-            Area rectArea = new Area(rect);
-            area.add(rectArea);
-        }
-        List<Location> locs = new ArrayList<>();
-        double[] coords = new double[6];
-        for (PathIterator pi = area.getPathIterator(null); !pi.isDone(); pi.next()) {
-            int type = pi.currentSegment(coords);
-            int x = (int) MathMan.inverseRound(coords[0]);
-            int z = (int) MathMan.inverseRound(coords[1]);
-            if (type != 4) {
-                locs.add(new Location(this.getWorldName(), x, 0, z));
-            }
-        }
-        return locs;
-    }
-
-    /**
-     * Teleport a player to a plot and send them the teleport message.
-     *
-     * @param player the player
-     * @return if the teleport succeeded
-     */
-    public boolean teleportPlayer(final PlotPlayer player) {
-        Plot plot = this.getBasePlot(false);
-        boolean result = EventUtil.manager.callTeleport(player, player.getLocation(), plot);
-        if (result) {
-            final Location location;
-            if (this.area.HOME_ALLOW_NONMEMBER || plot.isAdded(player.getUUID())) {
-                location = this.getHome();
-            } else {
-                location = this.getDefaultHome(false);
-            }
-            if (Settings.Teleport.DELAY == 0 || Permissions
-                .hasPermission(player, "plots.teleport.delay.bypass")) {
-                MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
-                player.teleport(location);
-                return true;
-            }
-            MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
-            final String name = player.getName();
-            TaskManager.TELEPORT_QUEUE.add(name);
-            TaskManager.runTaskLater(() -> {
-                if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
-                    MainUtil.sendMessage(player, C.TELEPORT_FAILED);
-                    return;
-                }
-                TaskManager.TELEPORT_QUEUE.remove(name);
-                if (player.isOnline()) {
-                    MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
-                    player.teleport(location);
-                }
-            }, Settings.Teleport.DELAY * 20);
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isOnline() {
-        if (this.owner == null) {
-            return false;
-        }
-        if (!isMerged()) {
-            return UUIDHandler.getPlayer(this.owner) != null;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (current.hasOwner() && UUIDHandler.getPlayer(current.owner) != null) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set a component for a plot to the provided blocks<br> - E.g. floor, wall, border etc.<br> - The
-     * available components depend on the generator being used<br>
-     */
-    public boolean setComponent(String component, BlockBucket blocks) {
-        if (StringMan
-            .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
-            EventUtil.manager.callComponentSet(this, component);
-        }
-        return this.getManager().setComponent(this.area, this.getId(), component, blocks);
-    }
-
-    public int getDistanceFromOrigin() {
-        Location bot = getManager().getPlotBottomLocAbs(this.area, id);
-        Location top = getManager().getPlotTopLocAbs(this.area, id);
-        return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
-            Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
-    }
-
-    /**
-     * Expand the world border to include the provided plot (if applicable).
-     */
-    public void updateWorldBorder() {
-        if (this.owner == null) {
-            return;
-        }
-        int border = this.area.getBorder();
-        if (border == Integer.MAX_VALUE) {
-            return;
-        }
-        int max = getDistanceFromOrigin();
-        if (max > border) {
-            this.area.setMeta("worldBorder", max);
-        }
-    }
-
-    /**
-     * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other
-     * <br> - saves to DB
-     */
-    public void mergePlot(Plot lesserPlot, boolean removeRoads) {
-        Plot greaterPlot = this;
-        if (lesserPlot.getId().x == greaterPlot.getId().x) {
-            if (lesserPlot.getId().y > greaterPlot.getId().y) {
-                Plot tmp = lesserPlot;
-                lesserPlot = greaterPlot;
-                greaterPlot = tmp;
-            }
-            if (!lesserPlot.getMerged(2)) {
-                lesserPlot.clearRatings();
-                greaterPlot.clearRatings();
-                lesserPlot.setMerged(2, true);
-                greaterPlot.setMerged(0, true);
-                lesserPlot.mergeData(greaterPlot);
-                if (removeRoads) {
-                    lesserPlot.removeRoadSouth();
-                    Plot diagonal = greaterPlot.getRelative(1);
-                    if (diagonal.getMerged(7)) {
-                        lesserPlot.removeRoadSouthEast();
-                    }
-                    Plot below = greaterPlot.getRelative(3);
-                    if (below.getMerged(4)) {
-                        below.getRelative(0).removeRoadSouthEast();
-                    }
-                }
-            }
-        } else {
-            if (lesserPlot.getId().x > greaterPlot.getId().x) {
-                Plot tmp = lesserPlot;
-                lesserPlot = greaterPlot;
-                greaterPlot = tmp;
-            }
-            if (!lesserPlot.getMerged(1)) {
-                lesserPlot.clearRatings();
-                greaterPlot.clearRatings();
-                lesserPlot.setMerged(1, true);
-                greaterPlot.setMerged(3, true);
-                lesserPlot.mergeData(greaterPlot);
-                if (removeRoads) {
-                    Plot diagonal = greaterPlot.getRelative(2);
-                    if (diagonal.getMerged(7)) {
-                        lesserPlot.removeRoadSouthEast();
-                    }
-                    lesserPlot.removeRoadEast();
-                }
-                Plot below = greaterPlot.getRelative(0);
-                if (below.getMerged(6)) {
-                    below.getRelative(3).removeRoadSouthEast();
-                }
-            }
-        }
-    }
-
-    /**
-     * Move a plot physically, as well as the corresponding settings.
-     *
-     * @param destination Plot moved to
-     * @param whenDone    task when done
-     * @param allowSwap   whether to swap plots
-     * @return success
-     */
-    public boolean move(final Plot destination, final Runnable whenDone, boolean allowSwap) {
-        final PlotId offset = new PlotId(destination.getId().x - this.getId().x,
-            destination.getId().y - this.getId().y);
-        Location db = destination.getBottomAbs();
-        Location ob = this.getBottomAbs();
-        final int offsetX = db.getX() - ob.getX();
-        final int offsetZ = db.getZ() - ob.getZ();
-        if (this.owner == null) {
-            TaskManager.runTaskLater(whenDone, 1);
-            return false;
-        }
-        boolean occupied = false;
-        Set<Plot> plots = this.getConnectedPlots();
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            if (other.hasOwner()) {
-                if (!allowSwap) {
-                    TaskManager.runTaskLater(whenDone, 1);
-                    return false;
-                }
-                occupied = true;
-            } else {
-                plot.removeSign();
-            }
-        }
-        // world border
-        destination.updateWorldBorder();
-        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-        // move / swap data
-        final PlotArea originArea = getArea();
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            plot.swapData(other, null);
-        }
-        // copy terrain
-        Runnable move = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    Plot plot = destination.getRelative(0, 0);
-                    for (Plot current : plot.getConnectedPlots()) {
-                        getManager().claimPlot(current.getArea(), current);
-                        Plot originPlot = originArea.getPlotAbs(
-                            new PlotId(current.id.x - offset.x, current.id.y - offset.y));
-                        originPlot.getManager().unclaimPlot(originArea, originPlot, null);
-                    }
-                    plot.setSign();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                final Runnable task = this;
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                final Location pos1 = corners[0];
-                final Location pos2 = corners[1];
-                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-                newPos.setWorld(destination.getWorldName());
-                ChunkManager.manager.copyRegion(pos1, pos2, newPos,
-                    () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
-            }
-        };
-        Runnable swap = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                Location pos1 = corners[0];
-                Location pos2 = corners[1];
-                Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
-                Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
-                pos3.setWorld(destination.getWorldName());
-                pos4.setWorld(destination.getWorldName());
-                ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
-            }
-        };
-        if (occupied) {
-            swap.run();
-        } else {
-            move.run();
-        }
-        return true;
-    }
-
-    /**
-     * Copy a plot to a location, both physically and the settings
-     */
-    public boolean copy(final Plot destination, final Runnable whenDone) {
-        PlotId offset = new PlotId(destination.getId().x - this.getId().x,
-            destination.getId().y - this.getId().y);
-        Location db = destination.getBottomAbs();
-        Location ob = this.getBottomAbs();
-        final int offsetX = db.getX() - ob.getX();
-        final int offsetZ = db.getZ() - ob.getZ();
-        if (this.owner == null) {
-            TaskManager.runTaskLater(whenDone, 1);
-            return false;
-        }
-        Set<Plot> plots = this.getConnectedPlots();
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            if (other.hasOwner()) {
-                TaskManager.runTaskLater(whenDone, 1);
-                return false;
-            }
-        }
-        // world border
-        destination.updateWorldBorder();
-        // copy data
-        for (Plot plot : plots) {
-            Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            other.create(plot.owner, false);
-            if (!plot.getFlags().isEmpty()) {
-                other.getSettings().flags = plot.getFlags();
-                DBFunc.setFlags(other, plot.getFlags());
-            }
-            if (plot.isMerged()) {
-                other.setMerged(plot.getMerged());
-            }
-            if (plot.members != null && !plot.members.isEmpty()) {
-                other.members = plot.members;
-                for (UUID member : plot.members) {
-                    DBFunc.setMember(other, member);
-                }
-            }
-            if (plot.trusted != null && !plot.trusted.isEmpty()) {
-                other.trusted = plot.trusted;
-                for (UUID trusted : plot.trusted) {
-                    DBFunc.setTrusted(other, trusted);
-                }
-            }
-            if (plot.denied != null && !plot.denied.isEmpty()) {
-                other.denied = plot.denied;
-                for (UUID denied : plot.denied) {
-                    DBFunc.setDenied(other, denied);
-                }
-            }
-        }
-        // copy terrain
-        final ArrayDeque<RegionWrapper> regions = new ArrayDeque<>(this.getRegions());
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    for (Plot current : getConnectedPlots()) {
-                        destination.getManager().claimPlot(destination.getArea(), destination);
-                    }
-                    destination.setSign();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                Location pos1 = corners[0];
-                Location pos2 = corners[1];
-                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-                newPos.setWorld(destination.getWorldName());
-                ChunkManager.manager.copyRegion(pos1, pos2, newPos, this);
-            }
-        };
-        run.run();
-        return true;
-    }
-
-    public boolean hasFlag(Flag<?> flag) {
-        return getFlags().containsKey(flag);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
deleted file mode 100644
index 00a30e22d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ /dev/null
@@ -1,961 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author Jesse Boyd, Alexander Söderberg
- */
-public abstract class PlotArea {
-
-    public final String worldname;
-    public final String id;
-    public final PlotManager manager;
-    public final int worldhash;
-    protected final ConcurrentHashMap<PlotId, Plot> plots = new ConcurrentHashMap<>();
-    private final PlotId min;
-    private final PlotId max;
-    private final IndependentPlotGenerator generator;
-    private final BlockBucket[][] blockBucketChunk;
-    public int MAX_PLOT_MEMBERS = 128;
-    public boolean AUTO_MERGE = false;
-    public boolean ALLOW_SIGNS = true;
-    public boolean MISC_SPAWN_UNOWNED = false;
-    public boolean MOB_SPAWNING = false;
-    public boolean MOB_SPAWNER_SPAWNING = false;
-    public String PLOT_BIOME = "FOREST";
-    public boolean PLOT_CHAT = false;
-    public boolean SCHEMATIC_CLAIM_SPECIFY = false;
-    public boolean SCHEMATIC_ON_CLAIM = false;
-    public String SCHEMATIC_FILE = "null";
-    public List<String> SCHEMATICS = null;
-    public Map<Flag<?>, Object> DEFAULT_FLAGS;
-    public boolean USE_ECONOMY = false;
-    public Map<String, Expression<Double>> PRICES = new HashMap<>();
-    public boolean SPAWN_EGGS = false;
-    public boolean SPAWN_CUSTOM = true;
-    public boolean SPAWN_BREEDING = false;
-    public boolean WORLD_BORDER = false;
-    public int TYPE = 0;
-    public int TERRAIN = 0;
-    public boolean HOME_ALLOW_NONMEMBER = false;
-    public PlotLoc NONMEMBER_HOME;
-    public PlotLoc DEFAULT_HOME;
-    public int MAX_BUILD_HEIGHT = 256;
-    public int MIN_BUILD_HEIGHT = 1;
-    public PlotGameMode GAMEMODE = PlotGameMode.CREATIVE;
-    private int hash;
-    private RegionWrapper region;
-    private ConcurrentHashMap<String, Object> meta;
-    private QuadMap<PlotCluster> clusters;
-
-    public PlotArea(@Nonnull final String worldName, @Nullable final String id,
-        @Nullable IndependentPlotGenerator generator, @Nullable final PlotId min,
-        @Nullable final PlotId max) {
-        this.worldname = worldName;
-        this.id = id;
-        this.manager = generator != null ? generator.getNewPlotManager() : null;
-        this.generator = generator;
-        if (min == null || max == null) {
-            if (min != max) {
-                throw new IllegalArgumentException(
-                    "None of the ids can be null for this constructor");
-            }
-            this.min = null;
-            this.max = null;
-        } else {
-            this.min = min;
-            this.max = max;
-        }
-        this.worldhash = worldName.hashCode();
-        if (Settings.Enabled_Components.PLOT_EXPIRY && generator != null) {
-            blockBucketChunk = generator.generateBlockBucketChunk(this);
-        } else {
-            blockBucketChunk = null;
-        }
-    }
-
-    /**
-     * Create a new PlotArea object with no functionality/information.
-     * - Mainly used during startup before worlds are created as a temporary object
-     */
-    public static PlotArea createGeneric(@Nonnull final String world) {
-        return new PlotArea(world, null, null, null, null) {
-            @Override public void loadConfiguration(ConfigurationSection config) {
-            }
-
-            @Override public ConfigurationNode[] getSettingNodes() {
-                return null;
-            }
-        };
-    }
-
-    public LocalBlockQueue getQueue(final boolean autoQueue) {
-        return GlobalBlockQueue.IMP.getNewQueue(worldname, autoQueue);
-    }
-
-    /**
-     * Get an array of BlockBuckets corresponding to a chunk of a plot
-     *
-     * @return BlockBucket[][]
-     */
-    public BlockBucket[][] getBlockBucketChunk() {
-        if (blockBucketChunk != null) {
-            return blockBucketChunk;
-        }
-        if (generator != null) {
-            return generator.generateBlockBucketChunk(this);
-        }
-        return null;
-    }
-
-    /**
-     * Returns the region for this PlotArea or a RegionWrapper encompassing
-     * the whole world if none exists.
-     *
-     * @return RegionWrapper
-     */
-    public RegionWrapper getRegion() {
-        this.region = getRegionAbs();
-        if (this.region == null) {
-            return new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
-                Integer.MAX_VALUE);
-        }
-        return this.region;
-    }
-
-    /**
-     * Returns the region for this PlotArea.
-     *
-     * @return RegionWrapper or null if no applicable region
-     */
-    private RegionWrapper getRegionAbs() {
-        if (this.region == null) {
-            if (this.min != null) {
-                Location bot = getPlotManager().getPlotBottomLocAbs(this, this.min);
-                Location top = getPlotManager().getPlotTopLocAbs(this, this.max);
-                this.region = new RegionWrapper(bot.getX() - 1, top.getX() + 1, bot.getZ() - 1,
-                    top.getZ() + 1);
-            }
-        }
-        return this.region;
-    }
-
-    /**
-     * Returns the minimum value of a {@link PlotId}.
-     *
-     * @return the minimum value for a {@link PlotId}
-     */
-    public PlotId getMin() {
-        return this.min == null ? new PlotId(Integer.MIN_VALUE, Integer.MIN_VALUE) : this.min;
-    }
-
-    /**
-     * Returns the max PlotId.
-     *
-     * @return the maximum value for a {@link PlotId}
-     */
-    public PlotId getMax() {
-        return this.max == null ? new PlotId(Integer.MAX_VALUE, Integer.MAX_VALUE) : this.max;
-    }
-
-    /**
-     * Get the implementation independent generator for this area.
-     *
-     * @return the {@link IndependentPlotGenerator}
-     */
-    public IndependentPlotGenerator getGenerator() {
-        return this.generator;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || getClass() != obj.getClass()) {
-            return false;
-        }
-        PlotArea plotarea = (PlotArea) obj;
-        return this.worldhash == plotarea.worldhash && this.worldname.equals(plotarea.worldname)
-            && StringMan.isEqual(this.id, plotarea.id);
-    }
-
-    public Set<PlotCluster> getClusters() {
-        return this.clusters == null ? new HashSet<>() : this.clusters.getAll();
-    }
-
-    /**
-     * Check if a PlotArea is compatible (move/copy etc).
-     *
-     * @param plotArea the {@code PlotArea} to compare
-     * @return true if both areas are compatible
-     */
-    public boolean isCompatible(PlotArea plotArea) {
-        ConfigurationSection section = PlotSquared.get().worlds.getConfigurationSection("worlds");
-        for (ConfigurationNode setting : plotArea.getSettingNodes()) {
-            Object constant = section.get(plotArea.worldname + '.' + setting.getConstant());
-            if (constant == null || !constant
-                .equals(section.get(this.worldname + '.' + setting.getConstant()))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * When a world is created, the following method will be called for each.
-     *
-     * @param config Configuration Section
-     */
-    public void loadDefaultConfiguration(ConfigurationSection config) {
-        if ((this.min != null || this.max != null) && !(this instanceof GridPlotWorld)) {
-            throw new IllegalArgumentException("Must extend GridPlotWorld to provide");
-        }
-        if (config.contains("generator.terrain")) {
-            this.TERRAIN = config.getInt("generator.terrain");
-            this.TYPE = config.getInt("generator.type");
-        }
-        this.MOB_SPAWNING = config.getBoolean("natural_mob_spawning");
-        this.MISC_SPAWN_UNOWNED = config.getBoolean("misc_spawn_unowned");
-        this.MOB_SPAWNER_SPAWNING = config.getBoolean("mob_spawner_spawning");
-        this.AUTO_MERGE = config.getBoolean("plot.auto_merge");
-        this.MAX_PLOT_MEMBERS = config.getInt("limits.max-members");
-        this.ALLOW_SIGNS = config.getBoolean("plot.create_signs");
-        this.PLOT_BIOME = Configuration.BIOME.parseString(config.getString("plot.biome"));
-        this.SCHEMATIC_ON_CLAIM = config.getBoolean("schematic.on_claim");
-        this.SCHEMATIC_FILE = config.getString("schematic.file");
-        this.SCHEMATIC_CLAIM_SPECIFY = config.getBoolean("schematic.specify_on_claim");
-        this.SCHEMATICS = config.getStringList("schematic.schematics");
-        this.USE_ECONOMY = config.getBoolean("economy.use") && EconHandler.getEconHandler() != null;
-        ConfigurationSection priceSection = config.getConfigurationSection("economy.prices");
-        if (this.USE_ECONOMY) {
-            this.PRICES = new HashMap<>();
-            for (String key : priceSection.getKeys(false)) {
-                this.PRICES.put(key, Expression.doubleExpression(priceSection.getString(key)));
-            }
-        }
-        this.PLOT_CHAT = config.getBoolean("chat.enabled");
-        this.WORLD_BORDER = config.getBoolean("world.border");
-        this.MAX_BUILD_HEIGHT = config.getInt("world.max_height");
-        this.MIN_BUILD_HEIGHT = config.getInt("world.min_height");
-
-        switch (config.getString("world.gamemode").toLowerCase()) {
-            case "survival":
-            case "s":
-            case "0":
-                this.GAMEMODE = PlotGameMode.SURVIVAL;
-                break;
-            case "creative":
-            case "c":
-            case "1":
-                this.GAMEMODE = PlotGameMode.CREATIVE;
-                break;
-            case "adventure":
-            case "a":
-            case "2":
-                this.GAMEMODE = PlotGameMode.ADVENTURE;
-                break;
-            case "spectator":
-            case "3":
-                this.GAMEMODE = PlotGameMode.SPECTATOR;
-                break;
-            default:
-                this.GAMEMODE = PlotGameMode.NOT_SET;
-                break;
-        }
-
-        String homeNonMembers = config.getString("home.nonmembers");
-        String homeDefault = config.getString("home.default");
-        this.DEFAULT_HOME = PlotLoc.fromString(homeDefault);
-        this.HOME_ALLOW_NONMEMBER = homeNonMembers.equalsIgnoreCase(homeDefault);
-        if (this.HOME_ALLOW_NONMEMBER) {
-            this.NONMEMBER_HOME = DEFAULT_HOME;
-        } else {
-            this.NONMEMBER_HOME = PlotLoc.fromString(homeNonMembers);
-        }
-
-        if ("side".equalsIgnoreCase(homeDefault)) {
-            this.DEFAULT_HOME = null;
-        } else if (StringMan.isEqualIgnoreCaseToAny(homeDefault, "center", "middle")) {
-            this.DEFAULT_HOME = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
-        } else {
-            try {
-                /*String[] split = homeDefault.split(",");
-                this.DEFAULT_HOME =
-                    new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));*/
-                this.DEFAULT_HOME = PlotLoc.fromString(homeDefault);
-            } catch (NumberFormatException ignored) {
-                this.DEFAULT_HOME = null;
-            }
-        }
-
-        List<String> flags = config.getStringList("flags.default");
-        if (flags.isEmpty()) {
-            flags = config.getStringList("flags");
-            if (flags.isEmpty()) {
-                flags = new ArrayList<>();
-                ConfigurationSection section = config.getConfigurationSection("flags");
-                Set<String> keys = section.getKeys(false);
-                for (String key : keys) {
-                    if (!"default".equals(key)) {
-                        flags.add(key + ';' + section.get(key));
-                    }
-                }
-            }
-        }
-        try {
-            this.DEFAULT_FLAGS = FlagManager.parseFlags(flags);
-        } catch (Exception e) {
-            e.printStackTrace();
-            PlotSquared.debug("&cInvalid default flags for " + this.worldname + ": " + StringMan
-                .join(flags, ","));
-            this.DEFAULT_FLAGS = new HashMap<>();
-        }
-        this.SPAWN_EGGS = config.getBoolean("event.spawn.egg");
-        this.SPAWN_CUSTOM = config.getBoolean("event.spawn.custom");
-        this.SPAWN_BREEDING = config.getBoolean("event.spawn.breeding");
-        loadConfiguration(config);
-    }
-
-    public abstract void loadConfiguration(ConfigurationSection config);
-
-    /**
-     * Saving core PlotArea settings.
-     *
-     * @param config Configuration Section
-     */
-    public void saveConfiguration(ConfigurationSection config) {
-        HashMap<String, Object> options = new HashMap<>();
-        options.put("natural_mob_spawning", this.MOB_SPAWNING);
-        options.put("misc_spawn_unowned", this.MISC_SPAWN_UNOWNED);
-        options.put("mob_spawner_spawning", this.MOB_SPAWNER_SPAWNING);
-        options.put("plot.auto_merge", this.AUTO_MERGE);
-        options.put("plot.create_signs", this.ALLOW_SIGNS);
-        options.put("plot.biome", "FOREST");
-        options.put("schematic.on_claim", this.SCHEMATIC_ON_CLAIM);
-        options.put("schematic.file", this.SCHEMATIC_FILE);
-        options.put("schematic.specify_on_claim", this.SCHEMATIC_CLAIM_SPECIFY);
-        options.put("schematic.schematics", this.SCHEMATICS);
-        options.put("economy.use", this.USE_ECONOMY);
-        options.put("economy.prices.claim", 100);
-        options.put("economy.prices.merge", 100);
-        options.put("economy.prices.sell", 100);
-        options.put("chat.enabled", this.PLOT_CHAT);
-        options.put("flags.default", null);
-        options.put("event.spawn.egg", this.SPAWN_EGGS);
-        options.put("event.spawn.custom", this.SPAWN_CUSTOM);
-        options.put("event.spawn.breeding", this.SPAWN_BREEDING);
-        options.put("world.border", this.WORLD_BORDER);
-        options.put("limits.max-members", this.MAX_PLOT_MEMBERS);
-        options.put("home.default", "side");
-        String position = config.getString("home.nonmembers",
-            config.getBoolean("home.allow-nonmembers", false) ?
-                config.getString("home.default", "side") :
-                "side");
-        options.put("home.nonmembers", position);
-        options.put("world.max_height", this.MAX_BUILD_HEIGHT);
-        options.put("world.min_height", this.MIN_BUILD_HEIGHT);
-        options.put("world.gamemode", this.GAMEMODE.name().toLowerCase());
-
-        if (this.TYPE != 0) {
-            options.put("generator.terrain", this.TERRAIN);
-            options.put("generator.type", this.TYPE);
-        }
-        ConfigurationNode[] settings = getSettingNodes();
-        /*
-         * Saving generator specific settings
-         */
-        for (ConfigurationNode setting : settings) {
-            options.put(setting.getConstant(), setting.getValue());
-        }
-        for (Entry<String, Object> stringObjectEntry : options.entrySet()) {
-            if (!config.contains(stringObjectEntry.getKey())) {
-                config.set(stringObjectEntry.getKey(), stringObjectEntry.getValue());
-            }
-        }
-        if (!config.contains("flags")) {
-            config.set("flags.use",
-                "63,64,68,69,71,77,96,143,167,193,194,195,196,197,77,143,69,70,72,147,148,107,183,184,185,186,187,132");
-        }
-    }
-
-    @Nonnull @Override public String toString() {
-        if (this.id == null) {
-            return this.worldname;
-        } else {
-            return this.worldname + ";" + this.id;
-        }
-    }
-
-    @Override public int hashCode() {
-        if (this.hash != 0) {
-            return this.hash;
-        }
-        return this.hash = toString().hashCode();
-    }
-
-    /**
-     * Used for the <b>/plot setup</b> command Return null if you do not want to support this feature
-     *
-     * @return ConfigurationNode[]
-     */
-    public abstract ConfigurationNode[] getSettingNodes();
-
-    /**
-     * Gets the {@code Plot} at a location.
-     *
-     * @param location the location
-     * @return the {@code Plot} or null if none exists
-     */
-    @Nullable public Plot getPlotAbs(@Nonnull final Location location) {
-        final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
-        if (pid == null) {
-            return null;
-        }
-        return getPlotAbs(pid);
-    }
-
-    /**
-     * Gets the base plot at a location.
-     *
-     * @param location the location
-     * @return base Plot
-     */
-    @Nullable public Plot getPlot(@Nonnull final Location location) {
-        final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
-        if (pid == null) {
-            return null;
-        }
-        return getPlot(pid);
-    }
-
-    /**
-     * Get the owned base plot at a location.
-     *
-     * @param location the location
-     * @return the base plot or null
-     */
-    @Nullable public Plot getOwnedPlot(@Nonnull final Location location) {
-        final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
-        if (pid == null) {
-            return null;
-        }
-        Plot plot = this.plots.get(pid);
-        return plot == null ? null : plot.getBasePlot(false);
-    }
-
-    /**
-     * Get the owned plot at a location.
-     *
-     * @param location the location
-     * @return Plot or null
-     */
-    @Nullable public Plot getOwnedPlotAbs(@Nonnull final Location location) {
-        final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
-        if (pid == null) {
-            return null;
-        }
-        return this.plots.get(pid);
-    }
-
-    /**
-     * Get the owned Plot at a PlotId.
-     *
-     * @param id the {@code PlotId}
-     * @return the plot or null
-     */
-    @Nullable public Plot getOwnedPlotAbs(@Nonnull final PlotId id) {
-        return this.plots.get(id);
-    }
-
-    @Nullable public Plot getOwnedPlot(@Nonnull final PlotId id) {
-        Plot plot = this.plots.get(id);
-        return plot == null ? null : plot.getBasePlot(false);
-    }
-
-    public boolean contains(final int x, final int z) {
-        return this.TYPE != 2 || getRegionAbs().isIn(x, z);
-    }
-
-    public boolean contains(@Nonnull final PlotId id) {
-        return this.min == null || (id.x >= this.min.x && id.x <= this.max.x && id.y >= this.min.y
-            && id.y <= this.max.y);
-    }
-
-    public boolean contains(@Nonnull final Location location) {
-        return StringMan.isEqual(location.getWorld(), this.worldname) && (getRegionAbs() == null
-            || this.region.isIn(location.getX(), location.getZ()));
-    }
-
-    @Nonnull Set<Plot> getPlotsAbs(final UUID uuid) {
-        if (uuid == null) {
-            return Collections.emptySet();
-        }
-        final HashSet<Plot> myPlots = new HashSet<>();
-        foreachPlotAbs(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (uuid.equals(value.owner)) {
-                    myPlots.add(value);
-                }
-            }
-        });
-        return myPlots;
-    }
-
-    @Nonnull public Set<Plot> getPlots(@Nonnull final UUID uuid) {
-        final Set<Plot> myplots = new HashSet<>();
-        for (final Plot plot : getPlots()) {
-            if (plot.isBasePlot() && plot.isOwner(uuid)) {
-                myplots.add(plot);
-            }
-        }
-        return myplots;
-    }
-
-    public Set<Plot> getPlots(@Nonnull final PlotPlayer player) {
-        return getPlots(player.getUUID());
-    }
-
-    /**
-     * A collection of the claimed plots in this {@code PlotArea}.
-     *
-     * @return a collection of claimed plots
-     */
-    public Collection<Plot> getPlots() {
-        return this.plots.values();
-    }
-
-    public int getPlotCount(@Nonnull final UUID uuid) {
-        if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-            int count = 0;
-            for (Plot plot : getPlotsAbs(uuid)) {
-                if (!plot.hasFlag(Flags.DONE)) {
-                    count++;
-                }
-            }
-            return count;
-        }
-        return getPlotsAbs(uuid).size();
-    }
-
-    public boolean hasPlot(@Nonnull final UUID uuid) {
-        for (Entry<PlotId, Plot> entry : this.plots.entrySet()) {
-            if (entry.getValue().isOwner(uuid))
-                return true;
-        }
-        return false;
-    }
-
-    public int getPlotCount(@Nullable final PlotPlayer player) {
-        return player != null ? getPlotCount(player.getUUID()) : 0;
-    }
-
-    @Nullable public Plot getPlotAbs(@Nonnull final PlotId id) {
-        Plot plot = getOwnedPlotAbs(id);
-        if (plot == null) {
-            if (this.min != null && (id.x < this.min.x || id.x > this.max.x || id.y < this.min.y
-                || id.y > this.max.y)) {
-                return null;
-            }
-            return new Plot(this, id);
-        }
-        return plot;
-    }
-
-    @Nullable public Plot getPlot(@Nonnull final PlotId id) {
-        final Plot plot = getOwnedPlotAbs(id);
-        if (plot == null) {
-            if (this.min != null && (id.x < this.min.x || id.x > this.max.x || id.y < this.min.y
-                || id.y > this.max.y)) {
-                return null;
-            }
-            return new Plot(this, id);
-        }
-        return plot.getBasePlot(false);
-    }
-
-    /**
-     * Retrieves the number of claimed plot in the {@code PlotArea}.
-     *
-     * @return the number of claimed plots
-     */
-    public int getPlotCount() {
-        return this.plots.size();
-    }
-
-    @Nullable public PlotCluster getCluster(@Nonnull final Location location) {
-        final Plot plot = getPlot(location);
-        if (plot == null) {
-            return null;
-        }
-        return this.clusters != null ? this.clusters.get(plot.getId().x, plot.getId().y) : null;
-    }
-
-    @Nullable public PlotCluster getFirstIntersectingCluster(@Nonnull final PlotId pos1,
-        @Nonnull final PlotId pos2) {
-        if (this.clusters == null) {
-            return null;
-        }
-        for (PlotCluster cluster : this.clusters.getAll()) {
-            if (cluster.intersects(pos1, pos2)) {
-                return cluster;
-            }
-        }
-        return null;
-    }
-
-    @Nullable PlotCluster getCluster(@Nonnull final PlotId id) {
-        return this.clusters != null ? this.clusters.get(id.x, id.y) : null;
-    }
-
-    public PlotManager getPlotManager() {
-        return this.manager;
-    }
-
-    /**
-     * Session only plot metadata (session is until the server stops).
-     * <br>
-     * For persistent metadata use the flag system
-     *
-     * @see FlagManager
-     */
-    public void setMeta(@Nonnull final String key, @Nullable final Object value) {
-        if (this.meta == null) {
-            this.meta = new ConcurrentHashMap<>();
-        }
-        this.meta.put(key, value);
-    }
-
-    @Nullable public <T> T getMeta(@Nullable final String key, @Nullable final T def) {
-        final Object v = getMeta(key);
-        return v == null ? def : (T) v;
-    }
-
-    /**
-     * Get the metadata for a key<br>
-     * <br>
-     * For persistent metadata use the flag system
-     */
-    @Nullable public Object getMeta(@Nonnull final String key) {
-        if (this.meta != null) {
-            return this.meta.get(key);
-        }
-        return null;
-    }
-
-    @SuppressWarnings("unused") @Nonnull public Set<Plot> getBasePlots() {
-        final HashSet<Plot> myPlots = new HashSet<>(getPlots());
-        myPlots.removeIf(plot -> !plot.isBasePlot());
-        return myPlots;
-    }
-
-    private void foreachPlotAbs(@Nonnull final RunnableVal<Plot> run) {
-        for (final Entry<PlotId, Plot> entry : this.plots.entrySet()) {
-            run.run(entry.getValue());
-        }
-    }
-
-    public void foreachBasePlot(@Nonnull final RunnableVal<Plot> run) {
-        for (final Plot plot : getPlots()) {
-            if (plot.isBasePlot()) {
-                run.run(plot);
-            }
-        }
-    }
-
-    @Nonnull public Map<PlotId, Plot> getPlotsRaw() {
-        return this.plots;
-    }
-
-    @Nonnull public Set<Entry<PlotId, Plot>> getPlotEntries() {
-        return this.plots.entrySet();
-    }
-
-    public boolean addPlot(@Nonnull final Plot plot) {
-        for (PlotPlayer pp : plot.getPlayersInPlot()) {
-            pp.setMeta(PlotPlayer.META_LAST_PLOT, plot);
-        }
-        return this.plots.put(plot.getId(), plot) == null;
-    }
-
-    public Plot getNextFreePlot(final PlotPlayer player, @Nullable PlotId start) {
-        int plots;
-        PlotId center;
-        PlotId min = getMin();
-        PlotId max = getMax();
-        if (TYPE == 2) {
-            center = new PlotId(MathMan.average(min.x, max.x), MathMan.average(min.y, max.y));
-            plots = Math.max(max.x - min.x, max.y - min.y) + 1;
-            if (start != null)
-                start = new PlotId(start.x - center.x, start.y - center.y);
-        } else {
-            center = new PlotId(0, 0);
-            plots = Integer.MAX_VALUE;
-        }
-        PlotId currentId;
-        for (int i = 0; i < plots; i++) {
-            if (start == null) {
-                start = getMeta("lastPlot", new PlotId(0, 0));
-            } else {
-                start = start.getNextId(1);
-            }
-            if (start == null) {
-                PlotSquared.debug("NPE possible in getNextFreePlot");
-            }
-            currentId = new PlotId(center.x + start.x, center.y + start.y);
-            Plot plot = getPlotAbs(currentId);
-            if (plot != null && plot.canClaim(player)) {
-                setMeta("lastPlot", currentId);
-                return plot;
-            }
-        }
-        return null;
-    }
-
-    public boolean addPlotIfAbsent(@Nonnull final Plot plot) {
-        if (this.plots.putIfAbsent(plot.getId(), plot) == null) {
-            for (PlotPlayer pp : plot.getPlayersInPlot()) {
-                pp.setMeta(PlotPlayer.META_LAST_PLOT, plot);
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public boolean addPlotAbs(@Nonnull final Plot plot) {
-        return this.plots.put(plot.getId(), plot) == null;
-    }
-
-    /**
-     * Get the plot border distance for a world<br>
-     *
-     * @return The border distance or Integer.MAX_VALUE if no border is set
-     */
-    public int getBorder() {
-        final Integer meta = (Integer) getMeta("worldBorder");
-        if (meta != null) {
-            int border = meta + 1;
-            if (border == 0) {
-                return Integer.MAX_VALUE;
-            } else {
-                return border;
-            }
-        }
-        return Integer.MAX_VALUE;
-    }
-
-    /**
-     * Setup the plot border for a world (usually done when the world is created).
-     */
-    public void setupBorder() {
-        if (!this.WORLD_BORDER) {
-            return;
-        }
-        final Integer meta = (Integer) getMeta("worldBorder");
-        if (meta == null) {
-            setMeta("worldBorder", 1);
-        }
-        for (final Plot plot : getPlots()) {
-            plot.updateWorldBorder();
-        }
-    }
-
-    /**
-     * Delete the metadata for a key.
-     * - metadata is session only
-     * - deleting other plugin's metadata may cause issues
-     *
-     * @param key Meta data key
-     */
-    public void deleteMeta(@Nonnull final String key) {
-        if (this.meta != null) {
-            this.meta.remove(key);
-        }
-    }
-
-    public boolean canClaim(@Nullable final PlotPlayer player, @Nonnull final PlotId pos1,
-        @Nonnull final PlotId pos2) {
-        if (pos1.x == pos2.x && pos1.y == pos2.y) {
-            if (getOwnedPlot(pos1) != null) {
-                return false;
-            }
-            final Plot plot = getPlotAbs(pos1);
-            if (plot == null) {
-                return false;
-            }
-            return plot.canClaim(player);
-        }
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                final PlotId id = new PlotId(x, y);
-                final Plot plot = getPlotAbs(id);
-                if (plot == null) {
-                    return false;
-                }
-                if (!plot.canClaim(player)) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    public boolean removePlot(@Nonnull final PlotId id) {
-        return this.plots.remove(id) != null;
-    }
-
-    public boolean mergePlots(@Nonnull final List<PlotId> plotIds, final boolean removeRoads) {
-        if (plotIds.size() < 2) {
-            return false;
-        }
-
-        final PlotId pos1 = plotIds.get(0);
-        final PlotId pos2 = plotIds.get(plotIds.size() - 1);
-        final PlotManager manager = getPlotManager();
-
-        final boolean result = EventUtil.manager.callAutoMerge(getPlotAbs(pos1), plotIds);
-        if (!result) {
-            return false;
-        }
-
-        final Set<UUID> trusted = new HashSet<>();
-        final Set<UUID> members = new HashSet<>();
-        final Set<UUID> denied = new HashSet<>();
-
-        manager.startPlotMerge(this, plotIds);
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                PlotId id = new PlotId(x, y);
-                Plot plot = getPlotAbs(id);
-                trusted.addAll(plot.getTrusted());
-                members.addAll(plot.getMembers());
-                denied.addAll(plot.getDenied());
-                if (removeRoads) {
-                    plot.removeSign();
-                }
-            }
-        }
-        members.removeAll(trusted);
-        denied.removeAll(trusted);
-        denied.removeAll(members);
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                final boolean lx = x < pos2.x;
-                final boolean ly = y < pos2.y;
-                final PlotId id = new PlotId(x, y);
-                final Plot plot = getPlotAbs(id);
-
-                plot.setTrusted(trusted);
-                plot.setMembers(members);
-                plot.setDenied(denied);
-
-                Plot plot2;
-                if (lx) {
-                    if (ly) {
-                        if (!plot.getMerged(1) || !plot.getMerged(2)) {
-                            if (removeRoads) {
-                                plot.removeRoadSouthEast();
-                            }
-                        }
-                    }
-                    if (!plot.getMerged(1)) {
-                        plot2 = plot.getRelative(1, 0);
-                        plot.mergePlot(plot2, removeRoads);
-                    }
-                }
-                if (ly) {
-                    if (!plot.getMerged(2)) {
-                        plot2 = plot.getRelative(0, 1);
-                        plot.mergePlot(plot2, removeRoads);
-                    }
-                }
-            }
-        }
-        manager.finishPlotMerge(this, plotIds);
-        return true;
-    }
-
-    /**
-     * Get a set of owned plots within a selection (chooses the best algorithm based on selection size.
-     * i.e. A selection of billions of plots will work fine
-     *
-     * @param pos1 first corner of selection
-     * @param pos2 second corner of selection
-     * @return the plots in the selection which are owned
-     */
-    public Set<Plot> getPlotSelectionOwned(@Nonnull final PlotId pos1, @Nonnull final PlotId pos2) {
-        final int size = (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
-        final Set<Plot> result = new HashSet<>();
-        if (size < 16 || size < getPlotCount()) {
-            for (final PlotId pid : MainUtil.getPlotSelectionIds(pos1, pos2)) {
-                final Plot plot = getPlotAbs(pid);
-                if (plot.hasOwner()) {
-                    if (plot.getId().x > pos1.x || plot.getId().y > pos1.y
-                        || plot.getId().x < pos2.x || plot.getId().y < pos2.y) {
-                        result.add(plot);
-                    }
-                }
-            }
-        } else {
-            for (final Plot plot : getPlots()) {
-                if (plot.getId().x > pos1.x || plot.getId().y > pos1.y || plot.getId().x < pos2.x
-                    || plot.getId().y < pos2.y) {
-                    result.add(plot);
-                }
-            }
-        }
-        return result;
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    public void removeCluster(@Nullable final PlotCluster plotCluster) {
-        if (this.clusters == null) {
-            throw new IllegalAccessError("Clusters not enabled!");
-        }
-        this.clusters.remove(plotCluster);
-    }
-
-    public void addCluster(@Nullable final PlotCluster plotCluster) {
-        if (this.clusters == null) {
-            this.clusters = new QuadMap<PlotCluster>(Integer.MAX_VALUE, 0, 0, 62) {
-                @Override public RegionWrapper getRegion(PlotCluster value) {
-                    return new RegionWrapper(value.getP1().x, value.getP2().x, value.getP1().y,
-                        value.getP2().y);
-                }
-            };
-        }
-        this.clusters.add(plotCluster);
-    }
-
-    @Nullable public PlotCluster getCluster(final String string) {
-        for (PlotCluster cluster : getClusters()) {
-            if (cluster.getName().equalsIgnoreCase(string)) {
-                return cluster;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
deleted file mode 100644
index 79521908e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.google.common.collect.ImmutableMap;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import lombok.NonNull;
-
-import java.util.Collection;
-import java.util.Map;
-
-public abstract class PlotBlock implements ConfigurationSerializable {
-
-    private static Class<?> conversionType;
-    private static BlockRegistry blockRegistry;
-
-    protected PlotBlock() {
-    }
-
-    public static boolean isEverything(@NonNull final PlotBlock block) {
-        return block.equals(LegacyPlotBlock.EVERYTHING) || block.equals(StringPlotBlock.EVERYTHING);
-    }
-
-    public static boolean containsEverything(@NonNull final Collection<PlotBlock> blocks) {
-        for (final PlotBlock block : blocks) {
-            if (isEverything(block)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static PlotBlock get(char combinedId) {
-        switch (combinedId) {
-            case 0:
-                return null;
-            case 1:
-                return get(0, 0);
-            default:
-                return get(combinedId >> 4, combinedId & 15);
-        }
-    }
-
-    public static PlotBlock deserialize(@NonNull final Map<String, Object> map) {
-        if (map.containsKey("material")) {
-            final Object object = map.get("material");
-            return get(object.toString());
-        }
-        return null;
-    }
-
-    public static StringPlotBlock get(@NonNull final String itemId) {
-        if (Settings.Enabled_Components.BLOCK_CACHE) {
-            return StringPlotBlock.getOrAdd(itemId);
-        }
-        return new StringPlotBlock(itemId);
-    }
-
-    public static PlotBlock get(int id, int data) {
-        return Settings.Enabled_Components.BLOCK_CACHE && data > 0 ?
-            LegacyPlotBlock.CACHE[(id << 4) + data] :
-            new LegacyPlotBlock((short) id, (byte) data);
-    }
-
-    public static PlotBlock getEmptyData(@NonNull final PlotBlock plotBlock) {
-        if (plotBlock instanceof StringPlotBlock) {
-            return plotBlock;
-        }
-        return get(((LegacyPlotBlock) plotBlock).getId(), (byte) 0);
-    }
-
-    public static PlotBlock get(@NonNull final BaseBlock baseBlock) {
-        StringPlotBlock plotBlock = get(baseBlock.getBlockType().getId());
-        plotBlock.setBaseBlock(baseBlock);
-        return plotBlock;
-    }
-
-    public static PlotBlock get(@NonNull final Object type) {
-        if (blockRegistry == null) {
-            blockRegistry = PlotSquared.imp().getBlockRegistry();
-            if (blockRegistry == null) {
-                throw new UnsupportedOperationException(
-                    "The PlotSquared implementation has not registered a custom block registry."
-                        + " This method can't be used.");
-            }
-            conversionType = blockRegistry.getType();
-        }
-        if (!type.getClass().equals(conversionType)) {
-            throw new UnsupportedOperationException(
-                "The PlotSquared implementation has not registered a block registry for this object type");
-        }
-        return blockRegistry.getPlotBlock(type);
-    }
-
-    @Override public Map<String, Object> serialize() {
-        return ImmutableMap.of("material", this.getRawId());
-    }
-
-    public <T> T to(@NonNull final Class<T> clazz) {
-        if (blockRegistry == null) {
-            blockRegistry = PlotSquared.imp().getBlockRegistry();
-            if (blockRegistry == null) {
-                throw new UnsupportedOperationException(
-                    "The PlotSquared implementation has not registered a custom block registry."
-                        + " This method can't be used.");
-            }
-            conversionType = blockRegistry.getType();
-        }
-        if (!clazz.equals(conversionType)) {
-            throw new UnsupportedOperationException(
-                "The PlotSquared implementation has not registered a block registry for this object type");
-        }
-        return clazz.cast(blockRegistry.getItem(this));
-    }
-
-    public abstract boolean isAir();
-
-    public final boolean equalsAny(final int id, @NonNull final String stringId) {
-        if (this instanceof StringPlotBlock) {
-            final StringPlotBlock stringPlotBlock = (StringPlotBlock) this;
-            return stringPlotBlock.idEquals(stringId);
-        }
-        final LegacyPlotBlock legacyPlotBlock = (LegacyPlotBlock) this;
-        return legacyPlotBlock.id == id;
-    }
-
-    @Override public abstract boolean equals(Object obj);
-
-    @Override public abstract int hashCode();
-
-    @Override public abstract String toString();
-
-    public abstract Object getRawId();
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
deleted file mode 100644
index ed9ca5fd8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import lombok.Getter;
-
-import javax.annotation.Nonnull;
-import java.util.HashSet;
-import java.util.UUID;
-
-public class PlotCluster {
-    public PlotArea area;
-    @Nonnull @Getter public PlotSettings settings;
-    public UUID owner;
-    public HashSet<UUID> helpers = new HashSet<>();
-    public HashSet<UUID> invited = new HashSet<>();
-    public int temp;
-    @Nonnull private PlotId pos1;
-    @Nonnull private PlotId pos2;
-    private RegionWrapper region;
-
-    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, @Nonnull PlotId pos2, UUID owner) {
-        this.area = area;
-        this.pos1 = pos1;
-        this.pos2 = pos2;
-        this.owner = owner;
-        this.settings = new PlotSettings();
-        this.temp = -1;
-        setRegion();
-    }
-
-    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, PlotId pos2, UUID owner, int temp) {
-        this.area = area;
-        this.pos1 = pos1;
-        this.pos2 = pos2;
-        this.owner = owner;
-        this.settings = new PlotSettings();
-        this.temp = temp;
-        setRegion();
-    }
-
-    public PlotId getP1() {
-        return this.pos1;
-    }
-
-    public void setP1(PlotId id) {
-        this.pos1 = id;
-        setRegion();
-    }
-
-    public PlotId getP2() {
-        return this.pos2;
-    }
-
-    public void setP2(PlotId id) {
-        this.pos2 = id;
-        setRegion();
-    }
-
-    private void setRegion() {
-        this.region = new RegionWrapper(this.pos1.x, this.pos2.x, this.pos1.y, this.pos2.y);
-    }
-
-    public RegionWrapper getRegion() {
-        return this.region;
-    }
-
-    public boolean isOwner(UUID uuid) {
-        return uuid.equals(owner);
-    }
-
-    public boolean isAdded(UUID uuid) {
-        return this.owner.equals(uuid) || this.invited.contains(uuid) || this.invited
-            .contains(DBFunc.EVERYONE) || this.helpers.contains(uuid) || this.helpers
-            .contains(DBFunc.EVERYONE);
-    }
-
-    public boolean hasHelperRights(UUID uuid) {
-        return this.owner.equals(uuid) || this.helpers.contains(uuid) || this.helpers
-            .contains(DBFunc.EVERYONE);
-    }
-
-    public String getName() {
-        return this.settings.getAlias();
-    }
-
-    public void setName(String name) {
-        this.settings.setAlias(name);
-    }
-
-    public String getAlias() {
-        return this.settings.getAlias();
-    }
-
-    /**
-     * Get the area (in plots).
-     *
-     * @return
-     */
-    public int getArea() {
-        return (1 + this.pos2.x - this.pos1.x) * (1 + this.pos2.y - this.pos1.y);
-    }
-
-    public void setArea(PlotArea plotArea) {
-        if (this.area != null) {
-            this.area.removeCluster(this);
-        }
-        this.area = plotArea;
-        plotArea.addCluster(this);
-    }
-
-    @Override public int hashCode() {
-        return this.pos1.hashCode();
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PlotCluster other = (PlotCluster) obj;
-        return this.pos1.equals(other.pos1) && this.pos2.equals(other.pos2) && this.area
-            .equals(other.area);
-    }
-
-    @Override public String toString() {
-        return this.area + ";" + this.pos1.x + ";" + this.pos1.y + ";" + this.pos2.x + ";"
-            + this.pos2.y;
-    }
-
-    public Location getHome() {
-        BlockLoc home = this.settings.getPosition();
-        Location toReturn;
-        if (home.y == 0) {
-            // default pos
-            Plot center = getCenterPlot();
-            toReturn = center.getHome();
-            if (toReturn.getY() == 0) {
-                PlotManager manager = this.area.getPlotManager();
-                Location loc = manager.getSignLoc(this.area, center);
-                toReturn.setY(loc.getY());
-            }
-        } else {
-            toReturn = getClusterBottom().add(home.x, home.y, home.z);
-        }
-        int max = MainUtil.getHeighestBlock(this.area.worldname, toReturn.getX(), toReturn.getZ());
-        if (max > toReturn.getY()) {
-            toReturn.setY(1 + max);
-        }
-        return toReturn;
-    }
-
-    public PlotId getCenterPlotId() {
-        PlotId bot = getP1();
-        PlotId top = getP2();
-        return new PlotId((bot.x + top.x) / 2, (bot.y + top.y) / 2);
-    }
-
-    public Plot getCenterPlot() {
-        return this.area.getPlotAbs(getCenterPlotId());
-    }
-
-    public Location getClusterBottom() {
-        PlotManager manager = this.area.getPlotManager();
-        return manager.getPlotBottomLocAbs(this.area, getP1());
-    }
-
-    public Location getClusterTop() {
-        PlotManager manager = this.area.getPlotManager();
-        return manager.getPlotTopLocAbs(this.area, getP2());
-    }
-
-    public boolean intersects(PlotId pos1, PlotId pos2) {
-        return pos1.x <= this.pos2.x && pos2.x >= this.pos1.x && pos1.y <= this.pos2.y
-            && pos2.y >= this.pos1.y;
-    }
-
-    public boolean contains(PlotId id) {
-        return this.pos1.x <= id.x && this.pos1.y <= id.y && this.pos2.x >= id.x
-            && this.pos2.y >= id.y;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java
deleted file mode 100644
index 09759c09d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public abstract class PlotFilter {
-    public boolean allowsArea(final PlotArea area) {
-        return true;
-    }
-
-    public boolean allowsPlot(final Plot plot) {
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java
deleted file mode 100644
index 4faa17b76..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import java.util.Set;
-import java.util.UUID;
-
-public class PlotHandler {
-    public static boolean sameOwners(final Plot plot1, final Plot plot2) {
-        if (plot1.owner == null || plot2.owner == null) {
-            return false;
-        }
-        final Set<UUID> owners = plot1.getOwners();
-        for (UUID owner : owners) {
-            if (plot2.isOwner(owner)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
deleted file mode 100644
index 113495512..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import javax.annotation.Nullable;
-
-public class PlotId {
-    /**
-     * x value
-     */
-    public int x;
-    /**
-     * y value
-     */
-    public int y;
-    private int hash;
-
-    /**
-     * PlotId class (PlotId x,y values do not correspond to Block locations)
-     *
-     * @param x The plot x coordinate
-     * @param y The plot y coordinate
-     */
-    public PlotId(int x, int y) {
-        this.x = x;
-        this.y = y;
-    }
-
-    /**
-     * Get a Plot Id based on a string
-     *
-     * @param string to create id from
-     * @return null if the string is invalid
-     */
-    public static PlotId fromString(String string) {
-        if (string == null) {
-            return null;
-        }
-        String[] parts = string.split("[;|,]");
-        if (parts.length < 2) {
-            return null;
-        }
-        int x;
-        int y;
-        try {
-            x = Integer.parseInt(parts[0]);
-            y = Integer.parseInt(parts[1]);
-        } catch (NumberFormatException ignored) {
-            return null;
-        }
-        return new PlotId(x, y);
-    }
-
-    public static PlotId of(@Nullable Plot plot) {
-        return plot != null ? plot.getId() : null;
-    }
-
-    /**
-     * Get the PlotId from the HashCode<br>
-     * Note: Only accurate for small x,z values (short)
-     *
-     * @param hash
-     * @return
-     */
-    public static PlotId unpair(int hash) {
-        return new PlotId(hash >> 16, hash & 0xFFFF);
-    }
-
-    public PlotId getNextId(int step) {
-        int absX = Math.abs(x);
-        int absY = Math.abs(y);
-        if (absX > absY) {
-            if (x > 0) {
-                return new PlotId(x, y + 1);
-            } else {
-                return new PlotId(x, y - 1);
-            }
-        } else if (absY > absX) {
-            if (y > 0) {
-                return new PlotId(x - 1, y);
-            } else {
-                return new PlotId(x + 1, y);
-            }
-        } else {
-            if (x == y && x > 0) {
-                return new PlotId(x, y + step);
-            }
-            if (x == absX) {
-                return new PlotId(x, y + 1);
-            }
-            if (y == absY) {
-                return new PlotId(x, y - 1);
-            }
-            return new PlotId(x + 1, y);
-        }
-    }
-
-    /**
-     * Get the PlotId in a relative direction
-     * 0 = north<br>
-     * 1 = east<br>
-     * 2 = south<br>
-     * 3 = west<br>
-     *
-     * @param direction
-     * @return PlotId
-     */
-    public PlotId getRelative(int direction) {
-        switch (direction) {
-            case 0:
-                return new PlotId(this.x, this.y - 1);
-            case 1:
-                return new PlotId(this.x + 1, this.y);
-            case 2:
-                return new PlotId(this.x, this.y + 1);
-            case 3:
-                return new PlotId(this.x - 1, this.y);
-        }
-        return this;
-    }
-
-    /**
-     * Get the PlotId in a relative location
-     *
-     * @param x
-     * @param y
-     * @return PlotId
-     */
-    public PlotId getRelative(int x, int y) {
-        return new PlotId(this.x + x, this.y + y);
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (this.hashCode() != obj.hashCode()) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PlotId other = (PlotId) obj;
-        return this.x == other.x && this.y == other.y;
-    }
-
-    /**
-     * e.g.
-     * 5;-6
-     *
-     * @return
-     */
-    @Override public String toString() {
-        return this.x + ";" + this.y;
-    }
-
-    public String toCommaSeparatedString() {
-        return this.x + "," + this.y;
-    }
-
-
-
-    /**
-     * The PlotId object caches the hashcode for faster mapping/fetching/sorting<br>
-     * - Recalculation is required if the x/y values change
-     * TODO maybe make x/y values private and add this to the mutators
-     */
-    public void recalculateHash() {
-        this.hash = 0;
-        hashCode();
-    }
-
-    @Override public int hashCode() {
-        if (this.hash == 0) {
-            this.hash = (this.x << 16) | (this.y & 0xFFFF);
-        }
-        return this.hash;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
deleted file mode 100644
index 5280d6459..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.util.InventoryUtil;
-import lombok.NonNull;
-
-public class PlotInventory {
-
-    private static final String META_KEY = "inventory";
-    public final PlotPlayer player;
-    public final int size;
-    private final PlotItemStack[] items;
-    private String title;
-    private boolean open = false;
-    public PlotInventory(PlotPlayer player) {
-        this.size = 4;
-        this.title = null;
-        this.player = player;
-        this.items = InventoryUtil.manager.getItems(player);
-    }
-    public PlotInventory(PlotPlayer player, int size, String name) {
-        this.size = size;
-        this.title = name == null ? "" : name;
-        this.player = player;
-        this.items = new PlotItemStack[size * 9];
-    }
-
-    public static boolean hasPlotInventoryOpen(@NonNull final PlotPlayer plotPlayer) {
-        return getOpenPlotInventory(plotPlayer) != null;
-    }
-
-    public static PlotInventory getOpenPlotInventory(@NonNull final PlotPlayer plotPlayer) {
-        return plotPlayer.getMeta(META_KEY, null);
-    }
-
-    public static void setPlotInventoryOpen(@NonNull final PlotPlayer plotPlayer,
-        @NonNull final PlotInventory plotInventory) {
-        plotPlayer.setMeta(META_KEY, plotInventory);
-    }
-
-    public static void removePlotInventoryOpen(@NonNull final PlotPlayer plotPlayer) {
-        plotPlayer.deleteMeta(META_KEY);
-    }
-
-    public boolean onClick(int index) {
-        return true;
-    }
-
-    public void openInventory() {
-        if (this.title == null) {
-            return;
-        }
-        if (hasPlotInventoryOpen(player)) {
-            PlotSquared.debug(String.format("Failed to open plot inventory for %s "
-                + "because the player already has an open plot inventory", player.getName()));
-        } else {
-            this.open = true;
-            setPlotInventoryOpen(player, this);
-            InventoryUtil.manager.open(this);
-        }
-    }
-
-    public void close() {
-        if (this.title == null) {
-            return;
-        }
-        removePlotInventoryOpen(player);
-        InventoryUtil.manager.close(this);
-        this.open = false;
-    }
-
-    public void setItem(int index, PlotItemStack item) {
-        this.items[index] = item;
-        InventoryUtil.manager.setItem(this, index, item);
-    }
-
-    public PlotItemStack getItem(int index) {
-        if ((index < 0) || (index >= this.items.length)) {
-            return null;
-        }
-        return this.items[index];
-    }
-
-    public PlotItemStack[] getItems() {
-        return this.items;
-    }
-
-    public String getTitle() {
-        return this.title;
-    }
-
-    public void setTitle(String title) {
-        if (title == null) {
-            return;
-        }
-        boolean tmp = this.open;
-        close();
-        this.title = title;
-        if (tmp) {
-            openInventory();
-        }
-    }
-
-    public boolean isOpen() {
-        return this.open;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java
deleted file mode 100644
index c0a9d93d0..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import lombok.Getter;
-
-public class PlotItemStack {
-
-    public final int amount;
-    public final String name;
-    public final String[] lore;
-    @Getter private final PlotBlock plotBlock;
-
-    /**
-     * @param id     Legacy numerical item ID
-     * @param data   Legacy numerical item data
-     * @param amount Amount of items in the stack
-     * @param name   The display name of the item stack
-     * @param lore   The item stack lore
-     * @deprecated Use {@link PlotItemStack(String, int, String, String...)}
-     */
-    @Deprecated public PlotItemStack(final int id, final short data, final int amount,
-        final String name, final String... lore) {
-        this.amount = amount;
-        this.name = name;
-        this.lore = lore;
-        this.plotBlock = PlotBlock.get(id, data);
-    }
-
-    /**
-     * @param id     String ID
-     * @param amount Amount of items in the stack
-     * @param name   The display name of the item stack
-     * @param lore   The item stack lore
-     */
-    public PlotItemStack(final String id, final int amount, final String name,
-        final String... lore) {
-        StringComparison<PlotBlock>.ComparisonResult match = WorldUtil.IMP.getClosestBlock(id);
-        this.plotBlock = match.best;
-        this.amount = amount;
-        this.name = name;
-        this.lore = lore;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
deleted file mode 100644
index e1254a8db..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-public class PlotLoc {
-
-    public int x;
-    public int y;
-    public int z;
-
-    public PlotLoc(int x, int z) {
-        this.x = x;
-        this.y = -1;
-        this.z = z;
-    }
-
-    public PlotLoc(int x, int y, int z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    public static PlotLoc fromString(String input) {
-        if ("side".equalsIgnoreCase(input)) {
-            return null;
-        } else if (StringMan.isEqualIgnoreCaseToAny(input, "center", "middle")) {
-            return new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
-        } else {
-            try {
-                String[] split = input.split(",");
-                if (split.length == 2) {
-                    return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]));
-                } else if (split.length == 3) {
-                    return new PlotLoc(Integer.parseInt(split[0]), Integer.parseInt(split[1]),
-                        Integer.parseInt(split[2]));
-                } else {
-                    throw new IllegalArgumentException(
-                        String.format("Unable to deserialize: %s", input));
-                }
-            } catch (NumberFormatException ignored) {
-                return null;
-            }
-        }
-    }
-
-    @Override public int hashCode() {
-        int prime = 31;
-        int result = 1;
-        result = (prime * result) + this.x;
-        result = (prime * result) + this.y;
-        result = (prime * result) + this.z;
-        return result;
-    }
-
-    @Override public String toString() {
-        if (this.y == -1) {
-            return String.format("%d,%d", x, z);
-        }
-        return String.format("%d,%d,%d", x, y, z);
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PlotLoc other = (PlotLoc) obj;
-        return (this.x == other.x) && (this.y == other.y) && (this.z == other.z);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
deleted file mode 100644
index 0e99ce00a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.commands.Template;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-
-public abstract class PlotManager {
-
-    /*
-     * Plot locations (methods with Abs in them will not need to consider mega
-     * plots).
-     */
-    public abstract PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z);
-
-    public abstract PlotId getPlotId(PlotArea plotArea, int x, int y, int z);
-
-    // If you have a circular plot, just return the corner if it were a square
-    public abstract Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId);
-
-    // the same applies here
-    public abstract Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId);
-
-    /*
-     * Plot clearing (return false if you do not support some method)
-     */
-    public abstract boolean clearPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
-
-    public abstract boolean claimPlot(PlotArea plotArea, Plot plot);
-
-    public abstract boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
-
-    public abstract Location getSignLoc(PlotArea plotArea, Plot plot);
-
-    /*
-     * Plot set functions (return false if you do not support the specific set
-     * method).
-     */
-    public abstract String[] getPlotComponents(PlotArea plotArea, PlotId plotId);
-
-    public abstract boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
-        BlockBucket blocks);
-
-    /*
-     * PLOT MERGING (return false if your generator does not support plot
-     * merging).
-     */
-    public abstract boolean createRoadEast(PlotArea plotArea, Plot plot);
-
-    public abstract boolean createRoadSouth(PlotArea plotArea, Plot plot);
-
-    public abstract boolean createRoadSouthEast(PlotArea plotArea, Plot plot);
-
-    public abstract boolean removeRoadEast(PlotArea plotArea, Plot plot);
-
-    public abstract boolean removeRoadSouth(PlotArea plotArea, Plot plot);
-
-    public abstract boolean removeRoadSouthEast(PlotArea plotArea, Plot plot);
-
-    public abstract boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds);
-
-    public abstract boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds);
-
-    public abstract boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds);
-
-    public abstract boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds);
-
-    public void exportTemplate(PlotArea plotArea) throws IOException {
-        HashSet<FileBytes> files = new HashSet<>(Collections.singletonList(
-            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml",
-                Template.getBytes(plotArea))));
-        Template.zipAll(plotArea.worldname, files);
-    }
-
-    public int getWorldHeight() {
-        return 255;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
deleted file mode 100644
index 6db234de3..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager;
-import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
-
-public class PlotMessage {
-
-    private Object builder;
-
-    public PlotMessage() {
-        try {
-            reset(ChatManager.manager);
-        } catch (Throwable e) {
-            assert PlotSquared.imp() != null;
-            PlotSquared.debug(
-                PlotSquared.imp().getPluginName() + " doesn't support fancy chat for " + PlotSquared
-                    .get().IMP.getServerVersion());
-            ChatManager.manager = new PlainChatManager();
-            reset(ChatManager.manager);
-        }
-    }
-
-    public PlotMessage(String text) {
-        this();
-        text(text);
-    }
-
-    public <T> T $(ChatManager<T> manager) {
-        return (T) this.builder;
-    }
-
-    public <T> T reset(ChatManager<T> manager) {
-        return (T) (this.builder = manager.builder());
-    }
-
-    public PlotMessage text(String text) {
-        ChatManager.manager.text(this, text);
-        return this;
-    }
-
-    public PlotMessage tooltip(PlotMessage... tooltip) {
-        ChatManager.manager.tooltip(this, tooltip);
-        return this;
-    }
-
-    public PlotMessage tooltip(String tooltip) {
-        return tooltip(new PlotMessage(tooltip));
-    }
-
-    public PlotMessage command(String command) {
-        ChatManager.manager.command(this, command);
-        return this;
-    }
-
-    public PlotMessage suggest(String command) {
-        ChatManager.manager.suggest(this, command);
-        return this;
-    }
-
-    public PlotMessage color(String color) {
-        ChatManager.manager.color(this, C.color(color));
-        return this;
-    }
-
-    public void send(PlotPlayer player) {
-        ChatManager.manager.send(this, player);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
deleted file mode 100644
index 2fc42059f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ /dev/null
@@ -1,648 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.commands.CommandCaller;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
-import com.github.intellectualsites.plotsquared.plot.util.*;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-import lombok.NonNull;
-
-import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * The abstract class supporting {@code BukkitPlayer} and {@code SpongePlayer}.
- */
-public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
-
-    public static final String META_LAST_PLOT = "lastplot";
-    public static final String META_LOCATION = "location";
-    private static final Map<Class, PlotPlayerConverter> converters = new HashMap<>();
-    private Map<String, byte[]> metaMap = new HashMap<>();
-    /**
-     * The metadata map.
-     */
-    private ConcurrentHashMap<String, Object> meta;
-
-    public static <T> PlotPlayer from(@NonNull final T object) {
-        if (!converters.containsKey(object.getClass())) {
-            throw new IllegalArgumentException(String
-                .format("There is no registered PlotPlayer converter for type %s",
-                    object.getClass().getSimpleName()));
-        }
-        return converters.get(object.getClass()).convert(object);
-    }
-
-    public static <T> void registerConverter(@NonNull final Class<T> clazz,
-        final PlotPlayerConverter<T> converter) {
-        converters.put(clazz, converter);
-    }
-
-    /**
-     * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's
-     * already cached)<br> - Accepts sponge/bukkit Player (online) - Accepts player name (online) -
-     * Accepts UUID - Accepts bukkit OfflinePlayer (offline)
-     */
-    public static PlotPlayer wrap(Object player) {
-        return PlotSquared.get().IMP.wrapPlayer(player);
-    }
-
-    /**
-     * Get the cached PlotPlayer from a username<br> - This will return null if the player has not
-     * finished logging in or is not online
-     */
-    public static PlotPlayer get(String name) {
-        return UUIDHandler.getPlayer(name);
-    }
-
-    /**
-     * Set some session only metadata for this player.
-     */
-    public void setMeta(String key, Object value) {
-        if (value == null) {
-            deleteMeta(key);
-        } else {
-            if (this.meta == null) {
-                this.meta = new ConcurrentHashMap<>();
-            }
-            this.meta.put(key, value);
-        }
-    }
-
-    /**
-     * Get the session metadata for a key.
-     *
-     * @param key the name of the metadata key
-     * @param <T> the object type to return
-     * @return the value assigned to the key or null if it does not exist
-     */
-    public <T> T getMeta(String key) {
-        if (this.meta != null) {
-            return (T) this.meta.get(key);
-        }
-        return null;
-    }
-
-    public <T> T getMeta(String key, T defaultValue) {
-        T meta = getMeta(key);
-        if (meta == null) {
-            return defaultValue;
-        }
-        return meta;
-    }
-
-    /**
-     * Delete the metadata for a key. - metadata is session only - deleting other plugin's metadata
-     * may cause issues
-     */
-    public Object deleteMeta(String key) {
-        return this.meta == null ? null : this.meta.remove(key);
-    }
-
-    /**
-     * This player's name.
-     *
-     * @return the name of the player
-     */
-    @Override public String toString() {
-        return getName();
-    }
-
-    /**
-     * Get this player's current plot.
-     *
-     * @return the plot the player is standing on or null if standing on a road or not in a {@link
-     * PlotArea}
-     */
-    public Plot getCurrentPlot() {
-        Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
-        if (value == null && !Settings.Enabled_Components.EVENTS) {
-            return getLocation().getPlot();
-        }
-        return value;
-    }
-
-    /**
-     * Get the total number of allowed plots Possibly relevant: (To increment the player's allowed
-     * plots, see the example script on the wiki)
-     *
-     * @return number of allowed plots within the scope (globally, or in the player's current world as
-     * defined in the settings.yml)
-     */
-    public int getAllowedPlots() {
-        return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
-    }
-
-    /**
-     * Get the total number of allowed clusters
-     *
-     * @return number of allowed clusters within the scope (globally, or in the player's current world
-     * as defined in the settings.yml)
-     */
-    public int getAllowedClusters() {
-        return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
-    }
-
-    public int hasPermissionRange(String stub, int range) {
-        if (hasPermission(C.PERMISSION_ADMIN.s())) {
-            return Integer.MAX_VALUE;
-        }
-        String[] nodes = stub.split("\\.");
-        StringBuilder n = new StringBuilder();
-        for (int i = 0; i < (nodes.length - 1); i++) {
-            n.append(nodes[i]).append(".");
-            if (!stub.equals(n + C.PERMISSION_STAR.s())) {
-                if (hasPermission(n + C.PERMISSION_STAR.s())) {
-                    return Integer.MAX_VALUE;
-                }
-            }
-        }
-        if (hasPermission(stub + ".*")) {
-            return Integer.MAX_VALUE;
-        }
-        for (int i = range; i > 0; i--) {
-            if (hasPermission(stub + "." + i)) {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-    /**
-     * Get the number of plots this player owns.
-     *
-     * @return number of plots within the scope (globally, or in the player's current world as defined
-     * in the settings.yml)
-     * @see #getPlotCount(String);
-     * @see #getPlots()
-     */
-    public int getPlotCount() {
-        if (!Settings.Limit.GLOBAL) {
-            return getPlotCount(getLocation().getWorld());
-        }
-        final AtomicInteger count = new AtomicInteger(0);
-        final UUID uuid = getUUID();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-                    for (Plot plot : value.getPlotsAbs(uuid)) {
-                        if (!plot.hasFlag(Flags.DONE)) {
-                            count.incrementAndGet();
-                        }
-                    }
-                } else {
-                    count.addAndGet(value.getPlotsAbs(uuid).size());
-                }
-            }
-        });
-        return count.get();
-    }
-
-    public int getClusterCount() {
-        if (!Settings.Limit.GLOBAL) {
-            return getClusterCount(getLocation().getWorld());
-        }
-        final AtomicInteger count = new AtomicInteger(0);
-        final UUID uuid = getUUID();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (PlotCluster cluster : value.getClusters()) {
-                    if (cluster.isOwner(getUUID())) {
-                        count.incrementAndGet();
-                    }
-                }
-            }
-        });
-        return count.get();
-    }
-
-    /**
-     * Get the number of plots this player owns in the world.
-     *
-     * @param world the name of the plotworld to check.
-     */
-    public int getPlotCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
-            if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-                for (Plot plot : area.getPlotsAbs(uuid)) {
-                    if (!plot.getFlag(Flags.DONE).isPresent()) {
-                        count++;
-                    }
-                }
-            } else {
-                count += area.getPlotsAbs(uuid).size();
-            }
-        }
-        return count;
-    }
-
-    public int getClusterCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
-            for (PlotCluster cluster : area.getClusters()) {
-                if (cluster.isOwner(getUUID())) {
-                    count++;
-                }
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Get a {@code Set} of plots owned by this player.
-     *
-     * @return a {@code Set} of plots owned by the player
-     * @see PlotSquared for more searching functions
-     * @see #getPlotCount() for the number of plots
-     */
-    public Set<Plot> getPlots() {
-        return PlotSquared.get().getPlots(this);
-    }
-
-    /**
-     * Return the PlotArea this player is currently in, or null.
-     */
-    public PlotArea getPlotAreaAbs() {
-        return PlotSquared.get().getPlotAreaAbs(getLocation());
-    }
-
-    public PlotArea getApplicablePlotArea() {
-        return PlotSquared.get().getApplicablePlotArea(getLocation());
-    }
-
-    @Override public RequiredType getSuperCaller() {
-        return RequiredType.PLAYER;
-    }
-
-    /**
-     * Get this player's last recorded location or null if they don't any plot relevant location.
-     *
-     * @return The location
-     */
-    public Location getLocation() {
-        Location location = getMeta("location");
-        if (location != null) {
-            return location;
-        }
-        return getLocationFull();
-    }
-
-    /////////////// PLAYER META ///////////////
-
-    ////////////// PARTIALLY IMPLEMENTED ///////////
-
-    /**
-     * Get this player's full location (including yaw/pitch)
-     */
-    public abstract Location getLocationFull();
-
-    ////////////////////////////////////////////////
-
-    /**
-     * Get this player's UUID. === !IMPORTANT ===<br> The UUID is dependent on the mode chosen in the
-     * settings.yml and may not be the same as Bukkit has (especially if using an old version of
-     * Bukkit that does not support UUIDs)
-     *
-     * @return UUID
-     */
-    @Override public abstract UUID getUUID();
-
-    public boolean canTeleport(Location loc) {
-        Location current = getLocationFull();
-        teleport(loc);
-        boolean result = true;
-        if (!getLocation().equals(loc)) {
-            result = false;
-        }
-        teleport(current);
-        return result;
-    }
-
-    /**
-     * Teleport this player to a location.
-     *
-     * @param location the target location
-     */
-    public abstract void teleport(Location location);
-
-    /**
-     * Kick this player to a location
-     *
-     * @param location the target location
-     */
-    public void plotkick(Location location) {
-        setMeta("kick", true);
-        teleport(location);
-        deleteMeta("kick");
-    }
-
-    /**
-     * Set this compass target.
-     *
-     * @param location the target location
-     */
-    public abstract void setCompassTarget(Location location);
-
-    /**
-     * Set player data that will persist restarts. - Please note that this is not intended to store
-     * large values - For session only data use meta
-     */
-    public void setAttribute(String key) {
-        setPersistentMeta("attrib_" + key, new byte[] {(byte) 1});
-    }
-
-    /**
-     * Retrieves the attribute of this player.
-     *
-     * @return the attribute will be either true or false
-     */
-    public boolean getAttribute(String key) {
-        if (!hasPersistentMeta("attrib_" + key)) {
-            return false;
-        }
-        return getPersistentMeta("attrib_" + key)[0] == 1;
-    }
-
-    /**
-     * Remove an attribute from a player.
-     */
-    public void removeAttribute(String key) {
-        removePersistentMeta("attrib_" + key);
-    }
-
-    /**
-     * Sets the local weather for this Player.
-     *
-     * @param weather the weather visible to the player
-     */
-    public abstract void setWeather(PlotWeather weather);
-
-    /**
-     * Get this player's gamemode.
-     *
-     * @return the gamemode of the player.
-     */
-    public abstract PlotGameMode getGameMode();
-
-    /**
-     * Set this player's gameMode.
-     *
-     * @param gameMode the gamemode to set
-     */
-    public abstract void setGameMode(PlotGameMode gameMode);
-
-    /**
-     * Set this player's local time (ticks).
-     *
-     * @param time the time visible to the player
-     */
-    public abstract void setTime(long time);
-
-    public abstract boolean getFlight();
-
-    /**
-     * Set this player's fly mode.
-     *
-     * @param fly if the player can fly
-     */
-    public abstract void setFlight(boolean fly);
-
-    /**
-     * Play music at a location for this player.
-     *
-     * @param location where to play the music
-     * @param id       the record item id
-     */
-    public abstract void playMusic(Location location, PlotBlock id);
-
-    /**
-     * Check if this player is banned.
-     *
-     * @return true if the player is banned, false otherwise.
-     */
-    public abstract boolean isBanned();
-
-    /**
-     * Kick this player from the game.
-     *
-     * @param message the reason for the kick
-     */
-    public abstract void kick(String message);
-
-    /**
-     * Called when this player quits.
-     */
-    public void unregister() {
-        Plot plot = getCurrentPlot();
-        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
-            .getArea() instanceof SinglePlotArea) {
-            PlotId id = plot.getId();
-            int x = id.x;
-            int z = id.y;
-            ByteBuffer buffer = ByteBuffer.allocate(13);
-            buffer.putShort((short) x);
-            buffer.putShort((short) z);
-            Location loc = getLocation();
-            buffer.putInt(loc.getX());
-            buffer.put((byte) loc.getY());
-            buffer.putInt(loc.getZ());
-            setPersistentMeta("quitLoc", buffer.array());
-        } else if (hasPersistentMeta("quitLoc")) {
-            removePersistentMeta("quitLoc");
-        }
-        if (plot != null) {
-            EventUtil.manager.callLeave(this, plot);
-        }
-        if (Settings.Enabled_Components.BAN_DELETER && isBanned()) {
-            for (Plot owned : getPlots()) {
-                owned.deletePlot(null);
-                PlotSquared.debug(String
-                    .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
-                        owned.getId(), getName()));
-            }
-        }
-        String name = getName();
-        if (ExpireManager.IMP != null) {
-            ExpireManager.IMP.storeDate(getUUID(), System.currentTimeMillis());
-        }
-        UUIDHandler.getPlayers().remove(name);
-        PlotSquared.get().IMP.unregister(this);
-    }
-
-    /**
-     * Get the amount of clusters this player owns in the specific world.
-     */
-    public int getPlayerClusterCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
-            if (uuid.equals(cluster.owner)) {
-                count += cluster.getArea();
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Get the amount of clusters this player owns.
-     *
-     * @return the number of clusters this player owns
-     */
-    public int getPlayerClusterCount() {
-        final AtomicInteger count = new AtomicInteger();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                count.addAndGet(value.getClusters().size());
-            }
-        });
-        return count.get();
-    }
-
-    /**
-     * Return a {@code Set} of all plots this player owns in a certain world.
-     *
-     * @param world the world to retrieve plots from
-     * @return a {@code Set} of plots this player owns in the provided world
-     */
-    public Set<Plot> getPlots(String world) {
-        UUID uuid = getUUID();
-        HashSet<Plot> plots = new HashSet<>();
-        for (Plot plot : PlotSquared.get().getPlots(world)) {
-            if (plot.isOwner(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return plots;
-    }
-
-    public void populatePersistentMetaMap() {
-        if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.getPersistentMeta(getUUID(), new RunnableVal<Map<String, byte[]>>() {
-                @Override public void run(Map<String, byte[]> value) {
-                    try {
-                        PlotPlayer.this.metaMap = value;
-                        if (!value.isEmpty()) {
-                            if (Settings.Enabled_Components.PERSISTENT_META) {
-                                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
-                                if (manager instanceof SinglePlotAreaManager) {
-                                    PlotArea area = ((SinglePlotAreaManager) manager).getArea();
-                                    byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
-                                    if (arr != null) {
-                                        removePersistentMeta("quitLoc");
-
-                                        if (getMeta("teleportOnLogin", true)) {
-                                            ByteBuffer quitWorld = ByteBuffer.wrap(arr);
-                                            final int plotX = quitWorld.getShort();
-                                            final int plotZ = quitWorld.getShort();
-                                            PlotId id = new PlotId(plotX, plotZ);
-                                            int x = quitWorld.getInt();
-                                            int y = quitWorld.get() & 0xFF;
-                                            int z = quitWorld.getInt();
-                                            Plot plot = area.getOwnedPlot(id);
-                                            if (plot != null) {
-                                                final Location loc =
-                                                    new Location(plot.getWorldName(), x, y, z);
-                                                if (plot.isLoaded()) {
-                                                    TaskManager.runTask(() -> {
-                                                        if (getMeta("teleportOnLogin", true)) {
-                                                            teleport(loc);
-                                                            sendMessage(C.TELEPORTED_TO_PLOT.f()
-                                                                + " (quitLoc) (" + plotX + ","
-                                                                + plotZ + ")");
-                                                        }
-                                                    });
-                                                } else if (!PlotSquared.get()
-                                                    .isMainThread(Thread.currentThread())) {
-                                                    if (getMeta("teleportOnLogin", true)) {
-                                                        if (plot.teleportPlayer(PlotPlayer.this)) {
-                                                            TaskManager.runTask(() -> {
-                                                                if (getMeta("teleportOnLogin",
-                                                                    true)) {
-                                                                    teleport(loc);
-                                                                    sendMessage(
-                                                                        C.TELEPORTED_TO_PLOT.f()
-                                                                            + " (quitLoc-unloaded) ("
-                                                                            + plotX + "," + plotZ
-                                                                            + ")");
-                                                                }
-                                                            });
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-    }
-
-    public byte[] getPersistentMeta(String key) {
-        return this.metaMap.get(key);
-    }
-
-    public void removePersistentMeta(String key) {
-        if (this.metaMap.containsKey(key)) {
-            this.metaMap.remove(key);
-        }
-        if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.removePersistentMeta(getUUID(), key);
-        }
-    }
-
-    public void setPersistentMeta(String key, byte[] value) {
-        boolean delete = hasPersistentMeta(key);
-        this.metaMap.put(key, value);
-        if (Settings.Enabled_Components.PERSISTENT_META) {
-            DBFunc.addPersistentMeta(getUUID(), key, value, delete);
-        }
-    }
-
-    public boolean hasPersistentMeta(String key) {
-        return this.metaMap.containsKey(key);
-    }
-
-    public abstract void stopSpectating();
-
-    /**
-     * The amount of money this Player has.
-     */
-    public double getMoney() {
-        return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
-    }
-
-    public void withdraw(double amount) {
-        if (EconHandler.manager != null) {
-            EconHandler.manager.withdrawMoney(this, amount);
-        }
-    }
-
-    public void deposit(double amount) {
-        if (EconHandler.manager != null) {
-            EconHandler.manager.depositMoney(this, amount);
-        }
-    }
-
-    public interface PlotPlayerConverter<BaseObject> {
-
-        PlotPlayer convert(BaseObject object);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
deleted file mode 100644
index 2ccaa47a8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-
-import java.util.*;
-
-/**
- * Generic settings class.
- * - Does not keep a reference to a parent class
- * - Direct changes here will not occur in the db (Use the parent plot object for that)
- */
-public class PlotSettings {
-
-    /**
-     * Merged plots.
-     *
-     * @deprecated Raw access
-     */
-    @Deprecated public boolean[] merged = new boolean[] {false, false, false, false};
-    /**
-     * Plot alias.
-     *
-     * @deprecated Raw access
-     */
-    @Deprecated public String alias = "";
-    /**
-     * Comments.
-     *
-     * @deprecated Raw access
-     */
-    @Deprecated public List<PlotComment> comments = null;
-
-    /**
-     * The ratings for a plot.
-     *
-     * @deprecated Raw access
-     */
-    @Deprecated public HashMap<UUID, Integer> ratings;
-
-    /**
-     * Flags.
-     *
-     * @deprecated Raw access. Not compatible with PlotClusters.
-     */
-    @Deprecated public HashMap<Flag<?>, Object> flags = new HashMap<>();
-    /**
-     * Home Position.
-     *
-     * @deprecated Raw access
-     */
-    @Deprecated private BlockLoc position;
-
-    /**
-     * <b>Check if the plot is merged in a direction</b><br> 0 = North<br> 1 = East<br> 2 = South<br> 3 = West<br>
-     *
-     * @param direction Direction to check
-     * @return boolean merged
-     */
-    public boolean getMerged(int direction) {
-        return this.merged[direction];
-    }
-
-    /**
-     * Returns true if the plot is merged (i.e. if it's a mega plot)
-     */
-    public boolean isMerged() {
-        return this.merged[0] || this.merged[1] || this.merged[2] || this.merged[3];
-    }
-
-    public boolean[] getMerged() {
-        return this.merged;
-    }
-
-    public void setMerged(boolean[] merged) {
-        this.merged = merged;
-    }
-
-    public Map<UUID, Integer> getRatings() {
-        if (this.ratings == null) {
-            this.ratings = new HashMap<>();
-
-        }
-        return this.ratings;
-    }
-
-    boolean setMerged(int direction, boolean merged) {
-        if (this.merged[direction] != merged) {
-            this.merged[direction] = merged;
-            return true;
-        }
-        return false;
-    }
-
-    public BlockLoc getPosition() {
-        if (this.position == null) {
-            return new BlockLoc(0, 0, 0);
-        }
-        return this.position;
-    }
-
-    public void setPosition(BlockLoc position) {
-        if (position != null && position.x == 0 && position.y == 0 && position.z == 0) {
-            position = null;
-        }
-        this.position = position;
-    }
-
-    public String getAlias() {
-        return this.alias;
-    }
-
-    /**
-     * Set the plot alias.
-     *
-     * @param alias alias to be used
-     */
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-    public String getJoinMessage(PlotArea area) {
-        if (flags.containsKey(Flags.GREETING)) {
-            return (String) flags.get(Flags.GREETING);
-        } else {
-            return "";
-        }
-    }
-
-    /**
-     * Get the "farewell" flag value.
-     *
-     * @param plotArea The PlotArea
-     * @return Farewell flag
-     */
-    public String getLeaveMessage(PlotArea plotArea) {
-        if (flags.containsKey(Flags.FAREWELL)) {
-            return (String) flags.get(Flags.FAREWELL);
-        } else {
-            return "";
-        }
-    }
-
-    //todo need a plot method
-    public Optional<ArrayList<PlotComment>> getComments(String inbox) {
-        ArrayList<PlotComment> c = new ArrayList<>();
-        if (this.comments == null) {
-            return Optional.empty();
-        }
-        for (PlotComment comment : this.comments) {
-            if (comment.inbox.equals(inbox)) {
-                c.add(comment);
-            }
-        }
-        return Optional.of(c);
-    }
-
-    //todo need a plot method
-    public void setComments(List<PlotComment> comments) {
-        this.comments = comments;
-    }
-
-    //todo need a plot method
-    public void removeComment(PlotComment comment) {
-        if (this.comments.contains(comment)) {
-            this.comments.remove(comment);
-        }
-    }
-
-    //todo need a plot method
-    public void removeComments(List<PlotComment> comments) {
-        for (PlotComment comment : comments) {
-            removeComment(comment);
-        }
-    }
-
-    //todo need a plot method
-    public void addComment(PlotComment comment) {
-        if (this.comments == null) {
-            this.comments = new ArrayList<>();
-        }
-        this.comments.add(comment);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java
deleted file mode 100644
index 490f8c926..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public class PseudoRandom {
-
-    public static final PseudoRandom random = new PseudoRandom();
-
-    public long state = System.nanoTime();
-
-    public long nextLong() {
-        long a = this.state;
-        this.state = xorShift64(a);
-        return a;
-    }
-
-    public long xorShift64(long a) {
-        a ^= a << 21;
-        a ^= a >>> 35;
-        a ^= a << 4;
-        return a;
-    }
-
-    public int random(int n) {
-        if (n == 1) {
-            return 0;
-        }
-        long r = ((nextLong() >>> 32) * n) >> 32;
-        return (int) r;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
deleted file mode 100644
index 874b6155c..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map.Entry;
-
-public class Rating {
-    /**
-     * This is a map of the rating category to the rating value
-     */
-    private final HashMap<String, Integer> ratingMap;
-    private final int initial;
-    private boolean changed;
-
-    public Rating(int value) {
-        this.initial = value;
-        this.ratingMap = new HashMap<>();
-        if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
-            if (value < 10) {
-                for (String ratingCategory : Settings.Ratings.CATEGORIES) {
-                    this.ratingMap.put(ratingCategory, value);
-                }
-                this.changed = true;
-                return;
-            }
-            for (String ratingCategory : Settings.Ratings.CATEGORIES) {
-                this.ratingMap.put(ratingCategory, value % 10 - 1);
-                value = value / 10;
-            }
-        } else {
-            this.ratingMap.put(null, value);
-        }
-    }
-
-    public List<String> getCategories() {
-        if (this.ratingMap.size() == 1) {
-            return new ArrayList<>(0);
-        }
-        return new ArrayList<>(this.ratingMap.keySet());
-    }
-
-    public double getAverageRating() {
-        double total = 0;
-        for (Entry<String, Integer> entry : this.ratingMap.entrySet()) {
-            total += entry.getValue();
-        }
-        return total / this.ratingMap.size();
-    }
-
-    public Integer getRating(String category) {
-        return this.ratingMap.get(category);
-    }
-
-    public boolean setRating(String category, int value) {
-        this.changed = true;
-        if (!this.ratingMap.containsKey(category)) {
-            return false;
-        }
-        return this.ratingMap.put(category, value) != null;
-    }
-
-    public int getAggregate() {
-        if (!this.changed) {
-            return this.initial;
-        }
-        if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
-            int val = 0;
-            for (int i = 0; i < Settings.Ratings.CATEGORIES.size(); i++) {
-                val +=
-                    (i + 1) * Math.pow(10, this.ratingMap.get(Settings.Ratings.CATEGORIES.get(i)));
-            }
-            return val;
-        } else {
-            return this.ratingMap.get(null);
-        }
-
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java
deleted file mode 100644
index ced127a22..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RegionWrapper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public class RegionWrapper {
-    public final int minX;
-    public final int maxX;
-    public final int minY;
-    public final int maxY;
-    public final int minZ;
-    public final int maxZ;
-
-    public RegionWrapper(int minX, int maxX, int minZ, int maxZ) {
-        this.maxX = maxX;
-        this.minX = minX;
-        this.maxZ = maxZ;
-        this.minZ = minZ;
-        this.minY = 0;
-        this.maxY = 256;
-    }
-
-    public RegionWrapper(int minX, int maxX, int minY, int maxY, int minZ, int maxZ) {
-        this.maxX = maxX;
-        this.minX = minX;
-        this.maxZ = maxZ;
-        this.minZ = minZ;
-        this.minY = minY;
-        this.maxY = maxY;
-    }
-
-    public boolean isIn(int x, int y, int z) {
-        return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ
-            && y >= this.minY && y <= this.maxY;
-    }
-
-    public boolean isIn(int x, int z) {
-        return x >= this.minX && x <= this.maxX && z >= this.minZ && z <= this.maxZ;
-    }
-
-    public boolean intersects(RegionWrapper other) {
-        return other.minX <= this.maxX && other.maxX >= this.minX && other.minY <= this.maxY
-            && other.maxY >= this.minY;
-    }
-
-    @Override public int hashCode() {
-        return this.minX + 13 * this.maxX + 23 * this.minZ + 39 * this.maxZ;
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (obj == null) {
-            return false;
-        }
-        if (obj == this) {
-            return true;
-        }
-        if (obj instanceof RegionWrapper) {
-            RegionWrapper other = (RegionWrapper) obj;
-            return this.minX == other.minX && this.minZ == other.minZ && this.minY == other.minY
-                && this.maxX == other.maxX && this.maxZ == other.maxZ && this.maxY == other.maxY;
-        }
-        return false;
-    }
-
-    @Override public String toString() {
-        return this.minX + "->" + this.maxX + "," + this.minZ + "->" + this.maxZ;
-    }
-
-    public Location[] getCorners(String world) {
-        Location pos1 = new Location(world, this.minX, this.minY, this.minZ);
-        Location pos2 = new Location(world, this.maxX, this.maxY, this.maxZ);
-        return new Location[] {pos1, pos2};
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java
deleted file mode 100644
index 90074a63a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public abstract class RunnableVal<T> implements Runnable {
-    public T value;
-
-    public RunnableVal() {
-    }
-
-    public RunnableVal(T value) {
-        this.value = value;
-    }
-
-    @Override public void run() {
-        run(this.value);
-    }
-
-    public abstract void run(T value);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java
deleted file mode 100644
index ee46a417f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal2.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public abstract class RunnableVal2<T, U> implements Runnable {
-    public T value1;
-    public U value2;
-
-    public RunnableVal2() {
-    }
-
-    public RunnableVal2(T value1, U value2) {
-        this.value1 = value1;
-        this.value2 = value2;
-    }
-
-    @Override public void run() {
-        run(this.value1, this.value2);
-    }
-
-    public abstract void run(T value1, U value2);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java
deleted file mode 100644
index cb6b2a8be..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/RunnableVal3.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-public abstract class RunnableVal3<T, U, V> implements Runnable {
-    public T value1;
-    public U value2;
-    public V value3;
-
-    public RunnableVal3() {
-    }
-
-    public RunnableVal3(T value1, U value2, V value3) {
-        this.value1 = value1;
-        this.value2 = value2;
-        this.value3 = value3;
-    }
-
-    @Override public void run() {
-        run(value1, value2, value3);
-    }
-
-    public abstract void run(T value1, U value2, V value3);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java
deleted file mode 100644
index e203fa870..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-
-public class SetupObject {
-
-    /**
-     * Specify a SetupUtils object here to override the existing
-     */
-    public SetupUtils setupManager;
-
-    /**
-     * The current state
-     */
-    public int current = 0;
-
-    /**
-     * The index in generator specific settings
-     */
-    public int setup_index = 0;
-
-    /**
-     * The name of the world
-     */
-    public String world = null;
-
-    /**
-     * The name of the plot manager
-     */
-    public String plotManager = null;
-
-    /**
-     * The name of the generator to use for world creation
-     */
-    public String setupGenerator = null;
-
-    /**
-     * The management type (normal, augmented, partial)
-     */
-    public int type;
-
-    /**
-     * The terrain type
-     */
-    public int terrain;
-
-    /**
-     * Area ID (may be null)
-     */
-    public String id;
-
-    /**
-     * Minimum plot id (may be null)
-     */
-    public PlotId min;
-
-    /**
-     * Max plot id (may be null)
-     */
-    public PlotId max;
-
-    /**
-     * Generator specific configuration steps
-     */
-    public ConfigurationNode[] step = null;
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
deleted file mode 100644
index 7fcb07907..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-import com.sk89q.worldedit.world.block.BaseBlock;
-import lombok.Getter;
-import lombok.NonNull;
-import lombok.Setter;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-public class StringPlotBlock extends PlotBlock {
-
-    public static final PlotBlock EVERYTHING = new StringPlotBlock("air");
-    private static final Map<String, StringPlotBlock> STRING_PLOT_BLOCK_CACHE = new HashMap<>();
-    @Getter private final String nameSpace;
-    @Getter private final String itemId;
-    @Getter @Setter private BaseBlock baseBlock = null;
-    private boolean isForeign = false;
-
-    public StringPlotBlock(@NonNull final String nameSpace, @NonNull final String itemId) {
-        this.nameSpace = nameSpace.toLowerCase(Locale.ENGLISH);
-        this.itemId = itemId.toLowerCase(Locale.ENGLISH);
-        this.determineForeign();
-    }
-
-    public StringPlotBlock(@NonNull final String itemId) {
-        if (itemId.contains(":")) {
-            final String[] parts = itemId.split(":");
-            if (parts.length < 2) {
-                throw new IllegalArgumentException(String.format("Cannot parse \"%s\"", itemId));
-            }
-            this.nameSpace = parts[0].toLowerCase(Locale.ENGLISH);
-            this.itemId = parts[1].toLowerCase(Locale.ENGLISH);
-        } else {
-            this.nameSpace = "minecraft";
-            if (itemId.isEmpty()) {
-                this.itemId = "air";
-            } else {
-                this.itemId = itemId.toLowerCase(Locale.ENGLISH);
-            }
-        }
-        this.determineForeign();
-    }
-
-    public static StringPlotBlock getOrAdd(@NonNull final String itemId) {
-        // final String id = itemId.toLowerCase(Locale.ENGLISH);
-
-        StringPlotBlock plotBlock = STRING_PLOT_BLOCK_CACHE.get(itemId);
-        if (plotBlock == null) {
-            plotBlock = new StringPlotBlock(itemId);
-            STRING_PLOT_BLOCK_CACHE.put(itemId, plotBlock);
-        }
-
-        return plotBlock;
-    }
-
-    private void determineForeign() {
-        this.isForeign = !this.nameSpace.equals("minecraft");
-    }
-
-    @Override public String toString() {
-        return this.isForeign ? String.format("%s:%s", nameSpace, itemId) : itemId;
-    }
-
-    @Override public boolean isAir() {
-        return this.itemId.isEmpty() || this.itemId.equalsIgnoreCase("air");
-    }
-
-    @Override public int hashCode() {
-        return this.toString().hashCode();
-    }
-
-    public boolean idEquals(@NonNull final String id) {
-        return id.equalsIgnoreCase(this.itemId);
-    }
-
-    @Override public Object getRawId() {
-        return this.getItemId();
-    }
-
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        StringPlotBlock other = (StringPlotBlock) obj;
-        return other.nameSpace.equals(this.nameSpace) && other.itemId.equals(this.itemId);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
deleted file mode 100644
index e3f0031ba..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object;
-
-/**
-
- */
-public class StringWrapper {
-
-    public final String value;
-    private int hash;
-
-    /**
-     * Constructor
-     *
-     * @param value to wrap
-     */
-    public StringWrapper(String value) {
-        this.value = value;
-    }
-
-    /**
-     * Check if a wrapped string equals another one
-     *
-     * @param obj to compare
-     * @return true if obj equals the stored value
-     */
-    @Override public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            if (obj.getClass() == String.class) {
-                return obj.toString().equalsIgnoreCase(this.value);
-            }
-            return false;
-        }
-        if (obj.hashCode() != hashCode()) {
-            return false;
-        }
-        StringWrapper other = (StringWrapper) obj;
-        if ((other.value == null) || (this.value == null)) {
-            return false;
-        }
-        return other.value.equalsIgnoreCase(this.value);
-    }
-
-    /**
-     * Get the string value.
-     *
-     * @return string value
-     */
-    @Override public String toString() {
-        return this.value;
-    }
-
-    /**
-     * Get the hash value.
-     *
-     * @return has value
-     */
-    @Override public int hashCode() {
-        if (this.value == null) {
-            return 0;
-        }
-        if (this.hash == 0) {
-            this.hash = this.value.toLowerCase().hashCode();
-        }
-        return this.hash;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
deleted file mode 100644
index 0972a4449..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.chat;
-
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PlainChatManager extends ChatManager<List<StringBuilder>> {
-
-    @Override public List<StringBuilder> builder() {
-        return new ArrayList<>();
-    }
-
-    @Override public void color(PlotMessage message, String color) {
-        List<StringBuilder> parts = message.$(this);
-        parts.get(parts.size() - 1).insert(0, color);
-    }
-
-    @Override public void tooltip(PlotMessage message, PlotMessage... tooltips) {
-    }
-
-    @Override public void command(PlotMessage message, String command) {
-    }
-
-    @Override public void text(PlotMessage message, String text) {
-        message.$(this).add(new StringBuilder(C.color(text)));
-    }
-
-    @Override public void send(PlotMessage plotMessage, PlotPlayer player) {
-        StringBuilder built = new StringBuilder();
-        for (StringBuilder sb : plotMessage.$(this)) {
-            built.append(sb);
-        }
-        player.sendMessage(built.toString());
-    }
-
-    @Override public void suggest(PlotMessage plotMessage, String command) {
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java
deleted file mode 100644
index 30d9b1230..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/CommentInbox.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.comment;
-
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-
-import java.util.List;
-
-public abstract class CommentInbox {
-
-    @Override public abstract String toString();
-
-    public boolean canRead(Plot plot, PlotPlayer player) {
-        if (Permissions.hasPermission(player, "plots.inbox.read." + toString(), true)) {
-            if (plot.isOwner(player.getUUID()) || Permissions
-                .hasPermission(player, "plots.inbox.read." + toString() + ".other", true)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean canWrite(Plot plot, PlotPlayer player) {
-        if (plot == null) {
-            return Permissions.hasPermission(player, "plots.inbox.write." + toString(), true);
-        }
-        return Permissions.hasPermission(player, "plots.inbox.write." + toString(), true) && (
-            plot.isOwner(player.getUUID()) || Permissions
-                .hasPermission(player, "plots.inbox.write." + toString() + ".other", true));
-    }
-
-    public boolean canModify(Plot plot, PlotPlayer player) {
-        if (Permissions.hasPermission(player, "plots.inbox.modify." + toString(), true)) {
-            if (plot.isOwner(player.getUUID()) || Permissions
-                .hasPermission(player, "plots.inbox.modify." + toString() + ".other", true)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * <br>
-     * The `whenDone` parameter should be executed when it's done fetching the comments.
-     * The value should be set to List of comments
-     *
-     * @param plot
-     * @param whenDone
-     * @return
-     */
-    public abstract boolean getComments(Plot plot, RunnableVal<List<PlotComment>> whenDone);
-
-    public abstract boolean addComment(Plot plot, PlotComment comment);
-
-    public void removeComment(Plot plot, PlotComment comment) {
-        DBFunc.removeComment(plot, comment);
-    }
-
-    public void clearInbox(Plot plot) {
-        DBFunc.clearInbox(plot, toString());
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
deleted file mode 100644
index d3a80013e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.comment;
-
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public class InboxOwner extends CommentInbox {
-
-    @Override
-    public boolean getComments(final Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
-        Optional<ArrayList<PlotComment>> comments = plot.getSettings().getComments(toString());
-        if (comments.isPresent()) {
-            whenDone.value = comments.get();
-            TaskManager.runTask(whenDone);
-            return true;
-        }
-        DBFunc.getComments(plot, toString(), new RunnableVal<List<PlotComment>>() {
-            @Override public void run(List<PlotComment> value) {
-                whenDone.value = value;
-                if (value != null) {
-                    for (PlotComment comment : value) {
-                        plot.getSettings().addComment(comment);
-                    }
-                } else {
-                    plot.getSettings().setComments(new ArrayList<PlotComment>());
-                }
-                TaskManager.runTask(whenDone);
-            }
-        });
-        return true;
-    }
-
-    @Override public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot.owner == null) {
-            return false;
-        }
-        plot.getSettings().addComment(comment);
-        DBFunc.setComment(plot, comment);
-        return true;
-    }
-
-    @Override public String toString() {
-        return "owner";
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
deleted file mode 100644
index a14954e28..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.comment;
-
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-public class InboxPublic extends CommentInbox {
-
-    @Override
-    public boolean getComments(final Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
-        Optional<ArrayList<PlotComment>> comments = plot.getSettings().getComments(toString());
-        if (comments.isPresent()) {
-            whenDone.value = comments.get();
-            TaskManager.runTask(whenDone);
-            return true;
-        }
-        DBFunc.getComments(plot, toString(), new RunnableVal<List<PlotComment>>() {
-            @Override public void run(List<PlotComment> value) {
-                whenDone.value = value;
-                if (value != null) {
-                    for (PlotComment comment : value) {
-                        plot.getSettings().addComment(comment);
-                    }
-                }
-                TaskManager.runTask(whenDone);
-            }
-        });
-        return true;
-    }
-
-    @Override public boolean addComment(Plot plot, PlotComment comment) {
-        plot.getSettings().addComment(comment);
-        DBFunc.setComment(plot, comment);
-        return true;
-    }
-
-    @Override public String toString() {
-        return "public";
-    }
-
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
deleted file mode 100644
index 7c626d8e1..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.comment;
-
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.util.List;
-
-public class InboxReport extends CommentInbox {
-
-    @Override public boolean getComments(Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
-        DBFunc.getComments(null, toString(), new RunnableVal<List<PlotComment>>() {
-            @Override public void run(List<PlotComment> value) {
-                whenDone.value = value;
-                TaskManager.runTask(whenDone);
-            }
-        });
-        return true;
-    }
-
-    @Override public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot.owner == null) {
-            return false;
-        }
-        DBFunc.setComment(plot, comment);
-        return true;
-    }
-
-    @Override public String toString() {
-        return "report";
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java
deleted file mode 100644
index ada90457f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/PlotComment.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.comment;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-
-public class PlotComment {
-    public final String comment;
-    public final String inbox;
-    public final String senderName;
-    public final PlotId id;
-    public final String world;
-    public final long timestamp;
-
-    public PlotComment(String world, PlotId id, String comment, String senderName, String inbox,
-        long timestamp) {
-        this.world = world;
-        this.id = id;
-        this.comment = comment;
-        this.senderName = senderName;
-        this.inbox = inbox;
-        this.timestamp = timestamp;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java
deleted file mode 100644
index f558b5243..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/ItemType.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.schematic;
-
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
-
-public enum ItemType {
-    AIR("air", 0), STONE("stone", 1), GRANITE("stone", 1, 1), POLISHED_GRANITE("stone", 1,
-        2), DIORITE("stone", 1, 3), POLISHED_DIORITE("stone", 1, 4), ANDESITE("stone", 1,
-        5), POLISHED_ANDESITE("stone", 1, 6), GRASS("grass", 2), DIRT("dirt", 3), COARSE_DIRT(
-        "dirt", 3, 1), PODZOL("dirt", 3, 2), COBBLESTONE("cobblestone", 4), OAK_WOOD_PLANK("planks",
-        5), SPRUCE_WOOD_PLANK("planks", 5, 1), BIRCH_WOOD_PLANK("planks", 5, 2), JUNGLE_WOOD_PLANK(
-        "planks", 5, 3), ACACIA_WOOD_PLANK("planks", 5, 4), DARK_OAK_WOOD_PLANK("planks", 5,
-        5), OAK_SAPLING("sapling", 6), SPRUCE_SAPLING("sapling", 6, 1), BIRCH_SAPLING("sapling", 6,
-        2), JUNGLE_SAPLING("sapling", 6, 3), ACACIA_SAPLING("sapling", 6, 4), DARK_OAK_SAPLING(
-        "sapling", 6, 5), BEDROCK("bedrock", 7), FLOWING_WATER("flowing_water", 8), STILL_WATER(
-        "water", 9), FLOWING_LAVA("flowing_lava", 10), STILL_LAVA("lava", 11), SAND("sand",
-        12), RED_SAND("sand", 12, 1), GRAVEL("gravel", 13), GOLD_ORE("gold_ore", 14), IRON_ORE(
-        "iron_ore", 15), COAL_ORE("coal_ore", 16), OAK_WOOD("log", 17), SPRUCE_WOOD("log", 17,
-        1), BIRCH_WOOD("log", 17, 2), JUNGLE_WOOD("log", 17, 3), OAK_LEAVES("leaves",
-        18), SPRUCE_LEAVES("leaves", 18, 1), BIRCH_LEAVES("leaves", 18, 2), JUNGLE_LEAVES("leaves",
-        18, 3), SPONGE("sponge", 19), WET_SPONGE("sponge", 19, 1), GLASS("glass",
-        20), LAPIS_LAZULI_ORE("lapis_ore", 21), LAPIS_LAZULI_BLOCK("lapis_block", 22), DISPENSER(
-        "dispenser", 23), SANDSTONE("sandstone", 24), CHISELED_SANDSTONE("sandstone", 24,
-        1), SMOOTH_SANDSTONE("sandstone", 24, 2), NOTE_BLOCK("noteblock", 25), BED("bed",
-        26), POWERED_RAIL("golden_rail", 27), DETECTOR_RAIL("detector_rail", 28), STICKY_PISTON(
-        "sticky_piston", 29), COBWEB("web", 30), DEAD_SHRUB("tallgrass", 31), TALLGRASS("tallgrass",
-        31, 1), FERN("tallgrass", 31, 2), DEAD_SHRUB1("deadbush", 32), PISTON("piston",
-        33), PISTON_HEAD("piston_head", 34), WHITE_WOOL("wool", 35), ORANGE_WOOL("wool", 35,
-        1), MAGENTA_WOOL("wool", 35, 2), LIGHT_BLUE_WOOL("wool", 35, 3), YELLOW_WOOL("wool", 35,
-        4), LIME_WOOL("wool", 35, 5), PINK_WOOL("wool", 35, 6), GRAY_WOOL("wool", 35,
-        7), LIGHT_GRAY_WOOL("wool", 35, 8), CYAN_WOOL("wool", 35, 9), PURPLE_WOOL("wool", 35,
-        10), BLUE_WOOL("wool", 35, 11), BROWN_WOOL("wool", 35, 12), GREEN_WOOL("wool", 35,
-        13), RED_WOOL("wool", 35, 14), BLACK_WOOL("wool", 35, 15), DANDELION("yellow_flower",
-        37), POPPY("red_flower", 38), BLUE_ORCHID("red_flower", 38, 1), ALLIUM("red_flower", 38,
-        2), AZURE_BLUET("red_flower", 38, 3), RED_TULIP("red_flower", 38, 4), ORANGE_TULIP(
-        "red_flower", 38, 5), WHITE_TULIP("red_flower", 38, 6), PINK_TULIP("red_flower", 38,
-        7), OXEYE_DAISY("red_flower", 38, 8), BROWN_MUSHROOM("brown_mushroom", 39), RED_MUSHROOM(
-        "red_mushroom", 40), GOLD_BLOCK("gold_block", 41), IRON_BLOCK("iron_block",
-        42), DOUBLE_STONE_SLAB("double_stone_slab", 43), DOUBLE_SANDSTONE_SLAB("double_stone_slab",
-        43, 1), DOUBLE_WOODEN_SLAB("double_stone_slab", 43, 2), DOUBLE_COBBLESTONE_SLAB(
-        "double_stone_slab", 43, 3), DOUBLE_BRICK_SLAB("double_stone_slab", 43,
-        4), DOUBLE_STONE_BRICK_SLAB("double_stone_slab", 43, 5), DOUBLE_NETHER_BRICK_SLAB(
-        "double_stone_slab", 43, 6), DOUBLE_QUARTZ_SLAB("double_stone_slab", 43, 7), STONE_SLAB(
-        "stone_slab", 44), SANDSTONE_SLAB("stone_slab", 44, 1), WOODEN_SLAB("stone_slab", 44,
-        2), COBBLESTONE_SLAB("stone_slab", 44, 3), BRICK_SLAB("stone_slab", 44,
-        4), STONE_BRICK_SLAB("stone_slab", 44, 5), NETHER_BRICK_SLAB("stone_slab", 44,
-        6), QUARTZ_SLAB("stone_slab", 44, 7), BRICKS("brick_block", 45), TNT("tnt", 46), BOOKSHELF(
-        "bookshelf", 47), MOSS_STONE("mossy_cobblestone", 48), OBSIDIAN("obsidian", 49), TORCH(
-        "torch", 50), FIRE("fire", 51), MONSTER_SPAWNER("mob_spawner", 52), OAK_WOOD_STAIRS(
-        "oak_stairs", 53), CHEST("chest", 54), REDSTONE_WIRE("redstone_wire", 55), DIAMOND_ORE(
-        "diamond_ore", 56), DIAMOND_BLOCK("diamond_block", 57), CRAFTING_TABLE("crafting_table",
-        58), WHEAT_CROPS("wheat", 59), FARMLAND("farmland", 60), FURNACE("furnace",
-        61), BURNING_FURNACE("lit_furnace", 62), STANDING_SIGN_BLOCK("standing_sign",
-        63), OAK_DOOR_BLOCK("wooden_door", 64), LADDER("ladder", 65), RAIL("rail",
-        66), COBBLESTONE_STAIRS("stone_stairs", 67), WALL_MOUNTED_SIGN_BLOCK("wall_sign",
-        68), LEVER("lever", 69), STONE_PRESSURE_PLATE("stone_pressure_plate", 70), IRON_DOOR_BLOCK(
-        "iron_door", 71), WOODEN_PRESSURE_PLATE("wooden_pressure_plate", 72), REDSTONE_ORE(
-        "redstone_ore", 73), GLOWING_REDSTONE_ORE("lit_redstone_ore", 74), REDSTONE_TORCH_OFF(
-        "unlit_redstone_torch", 75), REDSTONE_TORCH_ON("redstone_torch", 76), STONE_BUTTON(
-        "stone_button", 77), SNOW("snow_layer", 78), ICE("ice", 79), SNOW_BLOCK("snow", 80), CACTUS(
-        "cactus", 81), CLAY("clay", 82), SUGAR_CANES("reeds", 83), JUKEBOX("jukebox",
-        84), OAK_FENCE("fence", 85), PUMPKIN("pumpkin", 86), NETHERRACK("netherrack",
-        87), SOUL_SAND("soul_sand", 88), GLOWSTONE("glowstone", 89), NETHER_PORTAL("portal",
-        90), JACK_OLANTERN("lit_pumpkin", 91), CAKE_BLOCK("cake", 92), REDSTONE_REPEATER_BLOCK_OFF(
-        "unpowered_repeater", 93), REDSTONE_REPEATER_BLOCK_ON("powered_repeater",
-        94), WHITE_STAINED_GLASS("stained_glass", 95), ORANGE_STAINED_GLASS("stained_glass", 95,
-        1), MAGENTA_STAINED_GLASS("stained_glass", 95, 2), LIGHT_BLUE_STAINED_GLASS("stained_glass",
-        95, 3), YELLOW_STAINED_GLASS("stained_glass", 95, 4), LIME_STAINED_GLASS("stained_glass",
-        95, 5), PINK_STAINED_GLASS("stained_glass", 95, 6), GRAY_STAINED_GLASS("stained_glass", 95,
-        7), LIGHT_GRAY_STAINED_GLASS("stained_glass", 95, 8), CYAN_STAINED_GLASS("stained_glass",
-        95, 9), PURPLE_STAINED_GLASS("stained_glass", 95, 10), BLUE_STAINED_GLASS("stained_glass",
-        95, 11), BROWN_STAINED_GLASS("stained_glass", 95, 12), GREEN_STAINED_GLASS("stained_glass",
-        95, 13), RED_STAINED_GLASS("stained_glass", 95, 14), BLACK_STAINED_GLASS("stained_glass",
-        95, 15), WOODEN_TRAPDOOR("trapdoor", 96), STONE_MONSTER_EGG("monster_egg",
-        97), COBBLESTONE_MONSTER_EGG("monster_egg", 97, 1), STONE_BRICK_MONSTER_EGG("monster_egg",
-        97, 2), MOSSY_STONE_BRICK_MONSTER_EGG("monster_egg", 97,
-        3), CRACKED_STONE_BRICK_MONSTER_EGG("monster_egg", 97, 4), CHISELED_STONE_BRICK_MONSTER_EGG(
-        "monster_egg", 97, 5), STONE_BRICKS("stonebrick", 98), MOSSY_STONE_BRICKS("stonebrick", 98,
-        1), CRACKED_STONE_BRICKS("stonebrick", 98, 2), CHISELED_STONE_BRICKS("stonebrick", 98,
-        3), RED_MUSHROOM_CAP("stonebrick", 99), BROWN_MUSHROOM_CAP("stonebrick", 100), IRON_BARS(
-        "iron_bars", 101), GLASS_PANE("glass_pane", 102), MELON_BLOCK("melon_block",
-        103), PUMPKIN_STEM("pumpkin_stem", 104), MELON_STEM("melon_stem", 105), VINES("vine",
-        106), OAK_FENCE_GATE("fence_gate", 107), BRICK_STAIRS("brick_stairs",
-        108), STONE_BRICK_STAIRS("stone_brick_stairs", 109), MYCELIUM("mycelium", 110), LILY_PAD(
-        "waterlily", 111), NETHER_BRICK("nether_brick", 112), NETHER_BRICK_FENCE(
-        "nether_brick_fence", 113), NETHER_BRICK_STAIRS("nether_brick_stairs", 114), NETHER_WART(
-        "nether_wart", 115), ENCHANTMENT_TABLE("enchanting_table", 116), BREWING_STAND(
-        "brewing_stand", 117), CAULDRON("cauldron", 118), END_PORTAL("end_portal",
-        119), END_PORTAL_FRAME("end_portal_frame", 120), END_STONE("end_stone", 121), DRAGON_EGG(
-        "dragon_egg", 122), REDSTONE_LAMP_INACTIVE("redstone_lamp", 123), REDSTONE_LAMP_ACTIVE(
-        "lit_redstone_lamp", 124), DOUBLE_OAK_WOOD_SLAB("double_wooden_slab",
-        125), DOUBLE_SPRUCE_WOOD_SLAB("double_wooden_slab", 125, 1), DOUBLE_BIRCH_WOOD_SLAB(
-        "double_wooden_slab", 125, 2), DOUBLE_JUNGLE_WOOD_SLAB("double_wooden_slab", 125,
-        3), DOUBLE_ACACIA_WOOD_SLAB("double_wooden_slab", 125, 4), DOUBLE_DARK_OAK_WOOD_SLAB(
-        "double_wooden_slab", 125, 5), OAK_WOOD_SLAB("wooden_slab", 126), SPRUCE_WOOD_SLAB(
-        "wooden_slab", 126, 1), BIRCH_WOOD_SLAB("wooden_slab", 126, 2), JUNGLE_WOOD_SLAB(
-        "wooden_slab", 126, 3), ACACIA_WOOD_SLAB("wooden_slab", 126, 4), DARK_OAK_WOOD_SLAB(
-        "wooden_slab", 126, 5), COCOA("cocoa", 127), SANDSTONE_STAIRS("sandstone_stairs",
-        128), EMERALD_ORE("emerald_ore", 129), ENDER_CHEST("ender_chest", 130), TRIPWIRE_HOOK(
-        "tripwire_hook", 131), TRIPWIRE("tripwire_hook", 132), EMERALD_BLOCK("emerald_block",
-        133), SPRUCE_WOOD_STAIRS("spruce_stairs", 134), BIRCH_WOOD_STAIRS("birch_stairs",
-        135), JUNGLE_WOOD_STAIRS("jungle_stairs", 136), COMMAND_BLOCK("command_block", 137), BEACON(
-        "beacon", 138), COBBLESTONE_WALL("cobblestone_wall", 139), MOSSY_COBBLESTONE_WALL(
-        "cobblestone_wall", 139, 1), FLOWER_POT("flower_pot", 140), CARROTS("carrots",
-        141), POTATOES("potatoes", 142), WOODEN_BUTTON("wooden_button", 143), MOB_HEAD("skull",
-        144), ANVIL("anvil", 145), TRAPPED_CHEST("trapped_chest",
-        146), WEIGHTED_PRESSURE_PLATE_LIGHT("light_weighted_pressure_plate",
-        147), WEIGHTED_PRESSURE_PLATE_HEAVY("heavy_weighted_pressure_plate",
-        148), REDSTONE_COMPARATOR_INACTIVE("unpowered_comparator", 149), REDSTONE_COMPARATOR_ACTIVE(
-        "powered_comparator", 150), DAYLIGHT_SENSOR("daylight_detector", 151), REDSTONE_BLOCK(
-        "redstone_block", 152), NETHER_QUARTZ_ORE("quartz_ore", 153), HOPPER("hopper",
-        154), QUARTZ_BLOCK("quartz_block", 155), CHISELED_QUARTZ_BLOCK("quartz_block", 155,
-        1), PILLAR_QUARTZ_BLOCK("quartz_block", 155, 2), QUARTZ_STAIRS("quartz_stairs",
-        156), ACTIVATOR_RAIL("activator_rail", 157), DROPPER("dropper", 158), WHITE_STAINED_CLAY(
-        "stained_hardened_clay", 159), ORANGE_STAINED_CLAY("stained_hardened_clay", 159,
-        1), MAGENTA_STAINED_CLAY("stained_hardened_clay", 159, 2), LIGHT_BLUE_STAINED_CLAY(
-        "stained_hardened_clay", 159, 3), YELLOW_STAINED_CLAY("stained_hardened_clay", 159,
-        4), LIME_STAINED_CLAY("stained_hardened_clay", 159, 5), PINK_STAINED_CLAY(
-        "stained_hardened_clay", 159, 6), GRAY_STAINED_CLAY("stained_hardened_clay", 159,
-        7), LIGHT_GRAY_STAINED_CLAY("stained_hardened_clay", 159, 8), CYAN_STAINED_CLAY(
-        "stained_hardened_clay", 159, 9), PURPLE_STAINED_CLAY("stained_hardened_clay", 159,
-        10), BLUE_STAINED_CLAY("stained_hardened_clay", 159, 11), BROWN_STAINED_CLAY(
-        "stained_hardened_clay", 159, 12), GREEN_STAINED_CLAY("stained_hardened_clay", 159,
-        13), RED_STAINED_CLAY("stained_hardened_clay", 159, 14), BLACK_STAINED_CLAY(
-        "stained_hardened_clay", 159, 15), WHITE_STAINED_GLASS_PANE("stained_glass_pane",
-        160), ORANGE_STAINED_GLASS_PANE("stained_glass_pane", 160, 1), MAGENTA_STAINED_GLASS_PANE(
-        "stained_glass_pane", 160, 2), LIGHT_BLUE_STAINED_GLASS_PANE("stained_glass_pane", 160,
-        3), YELLOW_STAINED_GLASS_PANE("stained_glass_pane", 160, 4), LIME_STAINED_GLASS_PANE(
-        "stained_glass_pane", 160, 5), PINK_STAINED_GLASS_PANE("stained_glass_pane", 160,
-        6), GRAY_STAINED_GLASS_PANE("stained_glass_pane", 160, 7), LIGHT_GRAY_STAINED_GLASS_PANE(
-        "stained_glass_pane", 160, 8), CYAN_STAINED_GLASS_PANE("stained_glass_pane", 160,
-        9), PURPLE_STAINED_GLASS_PANE("stained_glass_pane", 160, 10), BLUE_STAINED_GLASS_PANE(
-        "stained_glass_pane", 160, 11), BROWN_STAINED_GLASS_PANE("stained_glass_pane", 160,
-        12), GREEN_STAINED_GLASS_PANE("stained_glass_pane", 160, 13), RED_STAINED_GLASS_PANE(
-        "stained_glass_pane", 160, 14), BLACK_STAINED_GLASS_PANE("stained_glass_pane", 160,
-        15), ACACIA_LEAVES("leaves2", 161), DARK_OAK_LEAVES("leaves2", 161, 1), ACACIA_WOOD("log2",
-        162), DARK_OAK_WOOD("log2", 162, 1), ACACIA_WOOD_STAIRS("acacia_stairs",
-        163), DARK_OAK_WOOD_STAIRS("dark_oak_stairs", 164), SLIME_BLOCK("slime", 165), BARRIER(
-        "barrier", 166), IRON_TRAPDOOR("iron_trapdoor", 167), PRISMARINE("prismarine",
-        168), PRISMARINE_BRICKS("prismarine", 168, 1), DARK_PRISMARINE("prismarine", 168,
-        2), SEA_LANTERN("sea_lantern", 169), HAY_BALE("hay_block", 170), WHITE_CARPET("carpet",
-        171), ORANGE_CARPET("carpet", 171, 1), MAGENTA_CARPET("carpet", 171, 2), LIGHT_BLUE_CARPET(
-        "carpet", 171, 3), YELLOW_CARPET("carpet", 171, 4), LIME_CARPET("carpet", 171,
-        5), PINK_CARPET("carpet", 171, 6), GRAY_CARPET("carpet", 171, 7), LIGHT_GRAY_CARPET(
-        "carpet", 171, 8), CYAN_CARPET("carpet", 171, 9), PURPLE_CARPET("carpet", 171,
-        10), BLUE_CARPET("carpet", 171, 11), BROWN_CARPET("carpet", 171, 12), GREEN_CARPET("carpet",
-        171, 13), RED_CARPET("carpet", 171, 14), BLACK_CARPET("carpet", 171, 15), HARDENED_CLAY(
-        "hardened_clay", 172), BLOCK_OF_COAL("coal_block", 173), PACKED_ICE("packed_ice",
-        174), SUNFLOWER("double_plant", 175), LILAC("double_plant", 175, 1), DOUBLE_TALLGRASS(
-        "double_plant", 175, 2), LARGE_FERN("double_plant", 175, 3), ROSE_BUSH("double_plant", 175,
-        4), PEONY("double_plant", 175, 5), FREE_STANDING_BANNER("standing_banner",
-        176), WALL_MOUNTED_BANNER("wall_banner", 177), INVERTED_DAYLIGHT_SENSOR(
-        "daylight_detector_inverted", 178), RED_SANDSTONE("red_sandstone",
-        179), SMOOTH_RED_SANDSTONE("red_sandstone", 179, 1), CHISELED_RED_SANDSTONE("red_sandstone",
-        179, 2), RED_SANDSTONE_STAIRS("red_sandstone_stairs", 180), DOUBLE_RED_SANDSTONE_SLAB(
-        "stone_slab2", 181), RED_SANDSTONE_SLAB("double_stone_slab2", 182), SPRUCE_FENCE_GATE(
-        "spruce_fence_gate", 183), BIRCH_FENCE_GATE("birch_fence_gate", 184), JUNGLE_FENCE_GATE(
-        "jungle_fence_gate", 185), DARK_OAK_FENCE_GATE("dark_oak_fence_gate",
-        186), ACACIA_FENCE_GATE("acacia_fence_gate", 187), SPRUCE_FENCE("spruce_fence",
-        188), BIRCH_FENCE("birch_fence", 189), JUNGLE_FENCE("jungle_fence", 190), DARK_OAK_FENCE(
-        "dark_oak_fence", 191), ACACIA_FENCE("acacia_fence", 192), SPRUCE_DOOR_BLOCK("spruce_door",
-        193), BIRCH_DOOR_BLOCK("birch_door", 194), JUNGLE_DOOR_BLOCK("jungle_door",
-        195), ACACIA_DOOR_BLOCK("acacia_door", 196), DARK_OAK_DOOR_BLOCK("dark_oak_door",
-        197), IRON_SHOVEL("iron_shovel", 256), IRON_PICKAXE("iron_pickaxe", 257), IRON_AXE(
-        "iron_axe", 258), FLINT_AND_STEEL("flint_and_steel", 259), APPLE("apple", 260), BOW("bow",
-        261), ARROW("arrow", 262), COAL("coal", 263), CHARCOAL("coal", 263, 1), DIAMOND("diamond",
-        264), IRON_INGOT("iron_ingot", 265), GOLD_INGOT("gold_ingot", 266), IRON_SWORD("iron_sword",
-        267), WOODEN_SWORD("wooden_sword", 268), WOODEN_SHOVEL("wooden_shovel",
-        269), WOODEN_PICKAXE("wooden_pickaxe", 270), WOODEN_AXE("wooden_axe", 271), STONE_SWORD(
-        "stone_sword", 272), STONE_SHOVEL("stone_shovel", 273), STONE_PICKAXE("stone_pickaxe",
-        274), STONE_AXE("stone_axe", 275), DIAMOND_SWORD("diamond_sword", 276), DIAMOND_SHOVEL(
-        "diamond_shovel", 277), DIAMOND_PICKAXE("diamond_pickaxe", 278), DIAMOND_AXE("diamond_axe",
-        279), STICK("stick", 280), BOWL("bowl", 281), MUSHROOM_STEW("mushroom_stew",
-        282), GOLDEN_SWORD("golden_sword", 283), GOLDEN_SHOVEL("golden_shovel",
-        284), GOLDEN_PICKAXE("golden_pickaxe", 285), GOLDEN_AXE("golden_axe", 286), STRING("string",
-        287), FEATHER("feather", 288), GUNPOWDER("gunpowder", 289), WOODEN_HOE("wooden_hoe",
-        290), STONE_HOE("stone_hoe", 291), IRON_HOE("iron_hoe", 292), DIAMOND_HOE("diamond_hoe",
-        293), GOLDEN_HOE("golden_hoe", 294), WHEAT_SEEDS("wheat_seeds", 295), WHEAT("wheat",
-        296), BREAD("bread", 297), LEATHER_HELMET("leather_helmet", 298), LEATHER_TUNIC(
-        "leather_chestplate", 299), LEATHER_PANTS("leather_leggings", 300), LEATHER_BOOTS(
-        "leather_boots", 301), CHAINMAIL_HELMET("chainmail_helmet", 302), CHAINMAIL_CHESTPLATE(
-        "chainmail_chestplate", 303), CHAINMAIL_LEGGINGS("chainmail_leggings",
-        304), CHAINMAIL_BOOTS("chainmail_boots", 305), IRON_HELMET("iron_helmet",
-        306), IRON_CHESTPLATE("iron_chestplate", 307), IRON_LEGGINGS("iron_leggings",
-        308), IRON_BOOTS("iron_boots", 309), DIAMOND_HELMET("diamond_helmet",
-        310), DIAMOND_CHESTPLATE("diamond_chestplate", 311), DIAMOND_LEGGINGS("diamond_leggings",
-        312), DIAMOND_BOOTS("diamond_boots", 313), GOLDEN_HELMET("golden_helmet",
-        314), GOLDEN_CHESTPLATE("golden_chestplate", 315), GOLDEN_LEGGINGS("golden_leggings",
-        316), GOLDEN_BOOTS("golden_boots", 317), FLINT("flint_and_steel", 318), RAW_PORKCHOP(
-        "porkchop", 319), COOKED_PORKCHOP("cooked_porkchop", 320), PAINTING("painting",
-        321), GOLDEN_APPLE("golden_apple", 322), ENCHANTED_GOLDEN_APPLE("golden_apple", 322,
-        1), SIGN("sign", 323), OAK_DOOR("wooden_door", 324), BUCKET("bucket", 325), WATER_BUCKET(
-        "water_bucket", 326), LAVA_BUCKET("lava_bucket", 327), MINECART("minecart", 328), SADDLE(
-        "saddle", 329), IRON_DOOR("iron_door", 330), REDSTONE("redstone", 331), SNOWBALL("snowball",
-        332), BOAT("boat", 333), LEATHER("leather", 334), MILK_BUCKET("milk_bucket", 335), BRICK(
-        "brick", 336), CLAY1("clay_ball", 337), SUGAR_CANES1("reeds", 338), PAPER("paper",
-        339), BOOK("book", 340), SLIMEBALL("slime_ball", 341), MINECART_WITH_CHEST("chest_minecart",
-        342), MINECART_WITH_FURNACE("furnace_minecart", 343), EGG("egg", 344), COMPASS("compass",
-        345), FISHING_ROD("fishing_rod", 346), CLOCK("clock", 347), GLOWSTONE_DUST("glowstone_dust",
-        348), RAW_FISH("fish", 349), RAW_SALMON("fish", 349, 1), CLOWNFISH("fish", 349,
-        2), PUFFERFISH("fish", 349, 3), COOKED_FISH("cooked_fish", 350), COOKED_SALMON(
-        "cooked_fish", 350, 1), INK_SACK("dye", 351), ROSE_RED("dye", 351, 1), CACTUS_GREEN("dye",
-        351, 2), COCO_BEANS("dye", 351, 3), LAPIS_LAZULI("dye", 351, 4), PURPLE_DYE("dye", 351,
-        5), CYAN_DYE("dye", 351, 6), LIGHT_GRAY_DYE("dye", 351, 7), GRAY_DYE("dye", 351,
-        8), PINK_DYE("dye", 351, 9), LIME_DYE("dye", 351, 10), DANDELION_YELLOW("dye", 351,
-        11), LIGHT_BLUE_DYE("dye", 351, 12), MAGENTA_DYE("dye", 351, 13), ORANGE_DYE("dye", 351,
-        14), BONE_MEAL("dye", 351, 15), BONE("bone", 352), SUGAR("sugar", 353), CAKE("cake",
-        354), BED1("bed", 355), REDSTONE_REPEATER("repeater", 356), COOKIE("cookie", 357), MAP(
-        "filled_map", 358), SHEARS("shears", 359), MELON("melon", 360), PUMPKIN_SEEDS(
-        "pumpkin_seeds", 361), MELON_SEEDS("melon_seeds", 362), RAW_BEEF("beef", 363), STEAK(
-        "cooked_beef", 364), RAW_CHICKEN("chicken", 365), COOKED_CHICKEN("cooked_chicken",
-        366), ROTTEN_FLESH("rotten_flesh", 367), ENDER_PEARL("ender_pearl", 368), BLAZE_ROD(
-        "blaze_rod", 369), GHAST_TEAR("ghast_tear", 370), GOLD_NUGGET("gold_nugget",
-        371), NETHER_WART1("nether_wart", 372), POTION("potion", 373), GLASS_BOTTLE("glass_bottle",
-        374), SPIDER_EYE("spider_eye", 375), FERMENTED_SPIDER_EYE("fermented_spider_eye",
-        376), BLAZE_POWDER("blaze_powder", 377), MAGMA_CREAM("magma_cream", 378), BREWING_STAND1(
-        "brewing_stand", 379), CAULDRON1("cauldron", 380), EYE_OF_ENDER("ender_eye",
-        381), GLISTERING_MELON("speckled_melon", 382), SPAWN_CREEPER("spawn_egg", 383,
-        50), SPAWN_SKELETON("spawn_egg", 383, 51), SPAWN_SPIDER("spawn_egg", 383, 52), SPAWN_ZOMBIE(
-        "spawn_egg", 383, 54), SPAWN_SLIME("spawn_egg", 383, 55), SPAWN_GHAST("spawn_egg", 383,
-        56), SPAWN_PIGMAN("spawn_egg", 383, 57), SPAWN_ENDERMAN("spawn_egg", 383,
-        58), SPAWN_CAVE_SPIDER("spawn_egg", 383, 59), SPAWN_SILVERFISH("spawn_egg", 383,
-        60), SPAWN_BLAZE("spawn_egg", 383, 61), SPAWN_MAGMA_CUBE("spawn_egg", 383, 62), SPAWN_BAT(
-        "spawn_egg", 383, 65), SPAWN_WITCH("spawn_egg", 383, 66), SPAWN_ENDERMITE("spawn_egg", 383,
-        67), SPAWN_GUARDIAN("spawn_egg", 383, 68), SPAWN_PIG("spawn_egg", 383, 90), SPAWN_SHEEP(
-        "spawn_egg", 383, 91), SPAWN_COW("spawn_egg", 383, 92), SPAWN_CHICKEN("spawn_egg", 383,
-        93), SPAWN_SQUID("spawn_egg", 383, 94), SPAWN_WOLF("spawn_egg", 383, 95), SPAWN_MOOSHROOM(
-        "spawn_egg", 383, 96), SPAWN_OCELOT("spawn_egg", 383, 98), SPAWN_HORSE("spawn_egg", 383,
-        100), SPAWN_RABBIT("spawn_egg", 383, 101), SPAWN_VILLAGER("spawn_egg", 383,
-        120), BOTTLE_O_ENCHANTING("experience_bottle", 384), FIRE_CHARGE("fire_charge",
-        385), BOOK_AND_QUILL("writable_book", 386), WRITTEN_BOOK("written_book", 387), EMERALD(
-        "emerald", 388), ITEM_FRAME("item_frame", 389), FLOWER_POT1("flower_pot", 390), CARROT(
-        "carrot", 391), POTATO("potato", 392), BAKED_POTATO("baked_potato", 393), POISONOUS_POTATO(
-        "poisonous_potato", 394), EMPTY_MAP("map", 395), GOLDEN_CARROT("golden_carrot",
-        396), MOB_HEAD_SKELETON("skull", 397), MOB_HEAD_WITHER_SKELETON("skull", 397,
-        1), MOB_HEAD_ZOMBIE("skull", 397, 2), MOB_HEAD_HUMAN("skull", 397, 3), MOB_HEAD_CREEPER(
-        "skull", 397, 4), CARROT_ON_A_STICK("carrot_on_a_stick", 398), NETHER_STAR("nether_star",
-        399), PUMPKIN_PIE("pumpkin_pie", 400), FIREWORK_ROCKET("fireworks", 401), FIREWORK_STAR(
-        "firework_charge", 402), ENCHANTED_BOOK("enchanted_book", 403), REDSTONE_COMPARATOR(
-        "comparator", 404), NETHER_BRICK1("netherbrick", 405), NETHER_QUARTZ("quartz",
-        406), MINECART_WITH_TNT("tnt_minecart", 407), MINECART_WITH_HOPPER("hopper_minecart",
-        408), PRISMARINE_SHARD("prismarine_shard", 409), PRISMARINE_CRYSTALS("prismarine_crystals",
-        410), RAW_RABBIT("rabbit", 411), COOKED_RABBIT("cooked_rabbit", 412), RABBIT_STEW(
-        "rabbit_stew", 413), RABBITS_FOOT("rabbit_foot", 414), RABBIT_HIDE("rabbit_hide",
-        415), ARMOR_STAND("armor_stand", 416), IRON_HORSE_ARMOR("iron_horse_armor",
-        417), GOLDEN_HORSE_ARMOR("golden_horse_armor", 418), DIAMOND_HORSE_ARMOR(
-        "diamond_horse_armor", 419), LEAD("lead", 420), NAME_TAG("name_tag",
-        421), MINECART_WITH_COMMAND_BLOCK("command_block_minecart", 422), RAW_MUTTON("mutton",
-        423), COOKED_MUTTON("cooked_mutton", 424), BANNER("banner", 425), SPRUCE_DOOR("spruce_door",
-        427), BIRCH_DOOR("birch_door", 428), JUNGLE_DOOR("jungle_door", 429), ACACIA_DOOR(
-        "acacia_door", 430), DARK_OAK_DOOR("dark_oak_door", 431), DISC_13("record_13",
-        2256), CAT_DISC("record_cat", 2257), BLOCKS_DISC("record_blocks", 2258), CHIRP_DISC(
-        "record_chirp", 2259), FAR_DISC("record_far", 2260), MALL_DISC("record_mall",
-        2261), MELLOHI_DISC("record_mellohi", 2262), STAL_DISC("record_stal", 2263), STRAD_DISC(
-        "record_strad", 2264), WARD_DISC("record_ward", 2265), DISC_11("record_11",
-        2266), WAIT_DISC("record_wait", 2267), END_ROD("end_rod", 198), CHORUS_PLANT("chorus_plant",
-        199), CHORUS_FLOWER("chorus_flower", 200), PURPUR_BLOCK("purpur_block", 201), PURPUR_PILLAR(
-        "purpur_pillar", 202), PURPUR_STAIRS("purpur_stairs", 203), PURPUR_DOUBLE_SLAB(
-        "purpur_double_slab", 204), PURPUR_SLAB("purpur_slab", 205), END_BRICKS("end_bricks",
-        206), BEETROOTS("beetroots", 207), GRASS_PATH("grass_path", 208), END_GATEWAY("end_gateway",
-        209), REPEATING_COMMAND_BLOCK("repeating_command_block", 210), CHAIN_COMMAND_BLOCK(
-        "chain_command_block", 211), FROSTED_ICE("frosted_ice", 212), STRUCTURE_BLOCK(
-        "structure_block", 255);
-
-    private static final Map<String, Integer> ids = new HashMap<>();
-    private static final Map<String, Byte> datas = new HashMap<>();
-
-    static {
-        for (ItemType type : EnumSet.allOf(ItemType.class)) {
-            ids.put(type.name, type.id);
-            datas.put(type.name, type.data);
-        }
-    }
-
-    private final int id;
-    private final byte data;
-    private final String name;
-
-    ItemType(String name, int id) {
-        this.id = id;
-        this.data = 0;
-        this.name = name;
-    }
-
-    ItemType(String name, int id, int data) {
-        this.id = id;
-        this.data = (byte) data;
-        this.name = name;
-    }
-
-    public static int getId(String name) {
-        Integer value = ids.get(name);
-        if (value == null) {
-            return 0;
-        }
-        return value;
-    }
-
-    public static byte getData(String name) {
-        Byte value = datas.get(name);
-        if (value == null) {
-            return 0;
-        }
-        return value;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java
deleted file mode 100644
index 2b7e31295..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.schematic;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-
-public class PlotItem {
-
-    public final int x;
-    public final int y;
-    public final int z;
-    // public final short[] id;
-    // public final byte[] data;
-    public final PlotBlock[] types;
-    public final byte[] amount;
-
-    public PlotItem(short x, short y, short z, PlotBlock[] types, byte[] amount) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-        this.types = types;
-        this.amount = amount;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
deleted file mode 100644
index df20b3300..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.schematic;
-
-import com.sk89q.jnbt.NBTOutputStream;
-import com.sk89q.jnbt.Tag;
-import com.sk89q.worldedit.WorldEditException;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicWriter;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import lombok.Getter;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-public class Schematic {
-    // Lossy but fast
-    @Getter private final BlockArrayClipboard clipboard;
-    @Getter private Map<String, Tag> flags = new HashMap<>();
-
-    public Schematic(BlockArrayClipboard clip) {
-        this.clipboard = clip;
-    }
-
-    public void setFlags(Map<String, Tag> flags) {
-        this.flags = flags == null ? new HashMap<>() : flags;
-    }
-
-    public boolean setBlock(BlockVector3 position, BaseBlock block) throws WorldEditException {
-        if (clipboard.getRegion().contains(position)) {
-            BlockVector3 v = position.subtract(clipboard.getRegion().getMinimumPoint());
-            clipboard.setBlock(v, block);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public void save(File file) throws IOException {
-        SpongeSchematicWriter ssw =
-            new SpongeSchematicWriter(new NBTOutputStream(new FileOutputStream(file)));
-        ssw.write(clipboard);
-        ssw.close();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java
deleted file mode 100644
index a19404da2..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.schematic;
-
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extent.Extent;
-import com.sk89q.worldedit.util.Location;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-/**
- * An implementation of {@link Entity} that stores a {@link BaseEntity} with it.
- *
- * <p>Calls to {@link #getState()} return a clone.</p>
- */
-abstract class StoredEntity implements Entity {
-
-    private final Location location;
-    private final BaseEntity entity;
-
-    /**
-     * Create a new instance.
-     *
-     * @param location the location
-     * @param entity   the entity (which will be copied)
-     */
-    StoredEntity(Location location, BaseEntity entity) {
-        checkNotNull(location);
-        checkNotNull(entity);
-        this.location = location;
-        this.entity = new BaseEntity(entity);
-    }
-
-    /**
-     * Get the entity state. This is not a copy.
-     *
-     * @return the entity
-     */
-    BaseEntity getEntity() {
-        return entity;
-    }
-
-    @Override public BaseEntity getState() {
-        return new BaseEntity(entity);
-    }
-
-    @Override public Location getLocation() {
-        return location;
-    }
-
-    @Override public Extent getExtent() {
-        return location.getExtent();
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
deleted file mode 100644
index 900471193..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.stream;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class AbstractDelegateOutputStream extends OutputStream {
-
-    private final OutputStream parent;
-
-    public AbstractDelegateOutputStream(OutputStream os) {
-        this.parent = os;
-    }
-
-    @Override public void write(int b) throws IOException {
-        parent.write(b);
-    }
-
-    @Override public void write(byte[] b) throws IOException {
-        parent.write(b);
-    }
-
-    @Override public void flush() throws IOException {
-        parent.flush();
-    }
-
-    @Override public void close() throws IOException {
-        parent.close();
-    }
-}
-
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
deleted file mode 100644
index f53465b2a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap;
-
-import java.util.*;
-
-public class DefaultPlotAreaManager implements PlotAreaManager {
-
-    protected final PlotArea[] noPlotAreas = new PlotArea[0];
-    // All plot areas mapped by world
-    private final HashMap<String, PlotArea[]> plotAreaMap = new HashMap<>();
-    // All plot areas mapped by position
-    private final HashMap<String, QuadMap<PlotArea>> plotAreaGrid = new HashMap<>();
-    private final HashSet<Integer> plotAreaHashCheck = new HashSet<>();
-    // All plot areas
-    private PlotArea[] plotAreas = new PlotArea[0];
-    // Optimization if there are no hash collisions
-    private boolean plotAreaHasCollision = false;
-    private String[] worlds = new String[0];
-
-    @Override public PlotArea[] getAllPlotAreas() {
-        return plotAreas;
-    }
-
-    @Override public PlotArea getApplicablePlotArea(Location location) {
-        switch (this.plotAreas.length) {
-            case 0:
-                return null;
-            case 1:
-                return this.plotAreas[0];
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-                String world = location.getWorld();
-                int hash = world.hashCode();
-                for (PlotArea area : this.plotAreas) {
-                    if (hash == area.worldhash) {
-                        if (area.contains(location.getX(), location.getZ()) && (
-                            !this.plotAreaHasCollision || world.equals(area.worldname))) {
-                            return area;
-                        }
-                    }
-                }
-                return null;
-            default:
-                PlotArea[] areas = this.plotAreaMap.get(location.getWorld());
-                if (areas == null) {
-                    return null;
-                }
-                int y;
-                int x;
-                switch (areas.length) {
-                    case 1:
-                        return areas[0];
-                    case 2:
-                    case 3:
-                    case 4:
-                    case 5:
-                    case 6:
-                    case 7:
-                    case 8:
-                        x = location.getX();
-                        y = location.getY();
-                        for (PlotArea area : areas) {
-                            if (area.contains(x, y)) {
-                                return area;
-                            }
-                        }
-                        return null;
-                    default:
-                        QuadMap<PlotArea> search = this.plotAreaGrid.get(location.getWorld());
-                        return search.get(location.getX(), location.getZ());
-                }
-        }
-    }
-
-    @Override public void addPlotArea(PlotArea plotArea) {
-        HashSet<PlotArea> localAreas =
-            new HashSet<>(Arrays.asList(getPlotAreas(plotArea.worldname, null)));
-        HashSet<PlotArea> globalAreas = new HashSet<>(Arrays.asList(plotAreas));
-        localAreas.add(plotArea);
-        globalAreas.add(plotArea);
-        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
-        this.plotAreaMap.put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
-        QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
-        if (map == null) {
-            map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
-                @Override public RegionWrapper getRegion(PlotArea value) {
-                    return value.getRegion();
-                }
-            };
-            this.plotAreaGrid.put(plotArea.worldname, map);
-        }
-        map.add(plotArea);
-    }
-
-    @Override public void removePlotArea(PlotArea area) {
-        ArrayList<PlotArea> globalAreas = new ArrayList<>(Arrays.asList(plotAreas));
-        globalAreas.remove(area);
-        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
-        if (globalAreas.isEmpty()) {
-            this.plotAreaMap.remove(area.worldname);
-            this.plotAreaGrid.remove(area.worldname);
-        } else {
-            this.plotAreaMap.put(area.worldname, globalAreas.toArray(new PlotArea[0]));
-            this.plotAreaGrid.get(area.worldname).remove(area);
-        }
-    }
-
-    @Override public PlotArea getPlotArea(String world, String id) {
-        PlotArea[] areas = this.plotAreaMap.get(world);
-        if (areas == null) {
-            return null;
-        }
-        if (areas.length == 1) {
-            return areas[0];
-        } else if (id == null) {
-            return null;
-        }
-        for (PlotArea area : areas) {
-            if (StringMan.isEqual(id, area.id)) {
-                return area;
-            }
-        }
-        return null;
-    }
-
-    @Override public PlotArea getPlotArea(Location location) {
-        switch (this.plotAreas.length) {
-            case 0:
-                return null;
-            case 1:
-                PlotArea pa = this.plotAreas[0];
-                return pa.contains(location) ? pa : null;
-            case 2:
-            case 3:
-            case 4:
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-                String world = location.getWorld();
-                int hash = world.hashCode();
-                for (PlotArea area : this.plotAreas) {
-                    if (hash == area.worldhash) {
-                        if (area.contains(location.getX(), location.getZ()) && (
-                            !this.plotAreaHasCollision || world.equals(area.worldname))) {
-                            return area;
-                        }
-                    }
-                }
-                return null;
-            default:
-                PlotArea[] areas = this.plotAreaMap.get(location.getWorld());
-                if (areas == null) {
-                    return null;
-                }
-                int x;
-                int y;
-                switch (areas.length) {
-                    case 0:
-                        PlotArea a = areas[0];
-                        return a.contains(location.getX(), location.getZ()) ? a : null;
-                    case 2:
-                    case 3:
-                    case 4:
-                    case 5:
-                    case 6:
-                    case 7:
-                    case 8:
-                        x = location.getX();
-                        y = location.getY();
-                        for (PlotArea area : areas) {
-                            if (area.contains(x, y)) {
-                                return area;
-                            }
-                        }
-                        return null;
-                    default:
-                        QuadMap<PlotArea> search = this.plotAreaGrid.get(location.getWorld());
-                        return search.get(location.getX(), location.getZ());
-                }
-        }
-    }
-
-    @Override public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
-        if (region == null) {
-            PlotArea[] areas = this.plotAreaMap.get(world);
-            if (areas == null) {
-                return noPlotAreas;
-            }
-            return areas;
-        }
-        QuadMap<PlotArea> areas = this.plotAreaGrid.get(world);
-        if (areas == null) {
-            return noPlotAreas;
-        } else {
-            Set<PlotArea> found = areas.get(region);
-            return found.toArray(new PlotArea[0]);
-        }
-    }
-
-    @Override public void addWorld(String worldName) {
-        if (!this.plotAreaHasCollision && !this.plotAreaHashCheck.add(worldName.hashCode())) {
-            this.plotAreaHasCollision = true;
-        }
-        Set<String> tmp = new LinkedHashSet<>();
-        Collections.addAll(tmp, worlds);
-        tmp.add(worldName);
-        worlds = tmp.toArray(new String[0]);
-    }
-
-    @Override public void removeWorld(String worldName) {
-        Set<String> tmp = new LinkedHashSet<>();
-        Collections.addAll(tmp, worlds);
-        tmp.remove(worldName);
-        worlds = tmp.toArray(new String[0]);
-    }
-
-    @Override public String[] getAllWorlds() {
-        return worlds;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
deleted file mode 100644
index 7a59dab9d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-
-public interface PlotAreaManager {
-    PlotArea getApplicablePlotArea(Location location);
-
-    PlotArea getPlotArea(Location location);
-
-    PlotArea getPlotArea(String world, String id);
-
-    PlotArea[] getPlotAreas(String world, RegionWrapper region);
-
-    PlotArea[] getAllPlotAreas();
-
-    String[] getAllWorlds();
-
-    void addPlotArea(PlotArea area);
-
-    void removePlotArea(PlotArea area);
-
-    void addWorld(String worldName);
-
-    void removeWorld(String worldName);
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
deleted file mode 100644
index 5cf07cc14..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-
-import javax.annotation.Nonnull;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.UUID;
-
-public class SinglePlot extends Plot {
-    private HashSet<RegionWrapper> regions;
-
-    {
-        regions = new HashSet<>();
-        regions.add(new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
-            Integer.MAX_VALUE));
-    }
-
-    public SinglePlot(PlotArea area, PlotId id, UUID owner) {
-        super(area, id, owner);
-    }
-
-    public SinglePlot(PlotArea area, PlotId id) {
-        super(area, id);
-    }
-
-    public SinglePlot(PlotArea area, PlotId id, UUID owner, int temp) {
-        super(area, id, owner, temp);
-    }
-
-    public SinglePlot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
-        HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
-        PlotArea area, boolean[] merged, long timestamp, int temp) {
-        super(id, owner, trusted, members, denied, alias, position, flags, area, merged, timestamp,
-            temp);
-    }
-
-    @Override public String getWorldName() {
-        return getId().toCommaSeparatedString();
-    }
-
-    @Nonnull @Override public SinglePlotArea getArea() {
-        return (SinglePlotArea) super.getArea();
-    }
-
-    public boolean teleportPlayer(final PlotPlayer player) {
-        if (isLoaded()) {
-            return super.teleportPlayer(player);
-        } else {
-            C.NOT_LOADED.send(player);
-            return false;
-        }
-    }
-
-    @Override public Location getSide() {
-        return getCenter();
-    }
-
-    @Override protected boolean isLoaded() {
-        getArea().loadWorld(getId());
-        return super.isLoaded();
-    }
-
-    @Override public HashSet<RegionWrapper> getRegions() {
-        return regions;
-    }
-
-    // getCenter getSide getHome getDefaultHome getBiome
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
deleted file mode 100644
index 1cc49f682..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.config.Configuration;
-import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
-import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public class SinglePlotArea extends GridPlotWorld {
-
-    public boolean VOID = false;
-
-    public SinglePlotArea() {
-        super("*", null, new SingleWorldGenerator(), null, null);
-        this.ALLOW_SIGNS = false;
-        this.DEFAULT_HOME = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    }
-
-    @Override public void loadConfiguration(ConfigurationSection config) {
-        VOID = config.getBoolean("void", false);
-    }
-
-    public void loadWorld(final PlotId id) {
-        TaskManager.IMP.sync(new RunnableVal<Object>() {
-            @Override public void run(Object value) {
-                String worldName = id.toCommaSeparatedString();
-                if (WorldUtil.IMP.isWorld(worldName))
-                    return;
-                SetupObject setup = new SetupObject();
-                setup.plotManager = "PlotSquared:single";
-                setup.setupGenerator = "PlotSquared:single";
-                setup.type = 0;
-                setup.terrain = 0;
-                setup.step = new ConfigurationNode[0];
-                setup.world = worldName;
-                SetupUtils.manager.setupWorld(setup);
-            }
-        });
-        //        String worldName = plot.getWorldName();
-        //        World world = Bukkit.getWorld(worldName);
-        //        if (world != null) {
-        //            return world;
-        //        }
-        //        WorldCreator wc = new WorldCreator(worldName);
-        //        wc.generator("PlotSquared:single");
-        //        wc.environment(World.Environment.NORMAL);
-        //        wc.type(WorldType.FLAT);
-        //        return AsyncWorld.create(wc);
-    }
-
-
-
-    @Override public ConfigurationNode[] getSettingNodes() {
-        return new ConfigurationNode[] {
-            new ConfigurationNode("void", this.VOID, "Void world", Configuration.BOOLEAN)};
-    }
-
-    @Nullable @Override public Plot getOwnedPlot(@Nonnull final Location location) {
-        PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
-        Plot plot = this.plots.get(pid);
-        return plot == null ? null : plot.getBasePlot(false);
-    }
-
-    @Nullable @Override public Plot getOwnedPlotAbs(@Nonnull Location location) {
-        PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
-        return plots.get(pid);
-    }
-
-    @Nullable @Override public Plot getPlot(@Nonnull final Location location) {
-        PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
-        return getPlot(pid);
-    }
-
-    @Nullable @Override public Plot getPlotAbs(@Nonnull final Location location) {
-        final PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
-        return getPlotAbs(pid);
-    }
-
-    public boolean addPlot(@Nonnull Plot plot) {
-        plot = adapt(plot);
-        return super.addPlot(plot);
-    }
-
-    @Override public boolean addPlotAbs(@Nonnull Plot plot) {
-        plot = adapt(plot);
-        return super.addPlotAbs(plot);
-    }
-
-    @Override public boolean addPlotIfAbsent(@Nonnull Plot plot) {
-        plot = adapt(plot);
-        return super.addPlotIfAbsent(plot);
-    }
-
-    private Plot adapt(Plot p) {
-        if (p instanceof SinglePlot) {
-            return p;
-        }
-        PlotSettings s = p.getSettings();
-        p = new SinglePlot(p.getId(), p.owner, p.getTrusted(), p.getMembers(), p.getDenied(),
-            s.alias, s.getPosition(), null, this, s.merged, p.getTimestamp(), p.temp);
-        p.getSettings().flags = s.flags;
-        return p;
-    }
-
-    @Nullable public Plot getPlotAbs(@Nonnull final PlotId id) {
-        Plot plot = getOwnedPlotAbs(id);
-        if (plot == null) {
-            return new SinglePlot(this, id);
-        }
-        return plot;
-    }
-
-    @Nullable public Plot getPlot(@Nonnull PlotId id) {
-        // TODO
-        Plot plot = getOwnedPlotAbs(id);
-        if (plot == null) {
-            return new SinglePlot(this, id);
-        }
-        return plot.getBasePlot(false);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
deleted file mode 100644
index a3b398136..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-import com.github.intellectualsites.plotsquared.plot.util.ArrayUtil;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-
-public class SinglePlotAreaManager extends DefaultPlotAreaManager {
-    private final SinglePlotArea[] array;
-    private SinglePlotArea area;
-    private PlotArea[] all;
-
-    public SinglePlotAreaManager() {
-        this.area = new SinglePlotArea();
-        this.array = new SinglePlotArea[] {area};
-        this.all = new PlotArea[] {area};
-        SetupUtils.generators.put("PlotSquared:single",
-            new SingleWorldGenerator().specify("CheckingPlotSquaredGenerator"));
-    }
-
-    public SinglePlotArea getArea() {
-        return area;
-    }
-
-    public void setArea(SinglePlotArea area) {
-        this.area = area;
-        array[0] = area;
-        all = ArrayUtil.concatAll(super.getAllPlotAreas(), array);
-    }
-
-    public boolean isWorld(String id) {
-        int mode = 0;
-        char[] chars = id.toCharArray();
-        if (chars.length == 1 && chars[0] == '*') {
-            return true;
-        }
-        for (char c : chars) {
-            switch (mode) {
-                case 0:
-                    mode = 1;
-                    if (c == '-') {
-                        continue;
-                    }
-                case 1:
-                    if ((c <= '/') || (c >= ':')) {
-                        if (c == ';' || c == ',') {
-                            mode = 2;
-                            continue;
-                        }
-                        return false;
-                    } else {
-                        continue;
-                    }
-                case 2:
-                    mode = 3;
-                    if (c == '-') {
-                        continue;
-                    }
-                case 3:
-                    if ((c <= '/') || (c >= ':')) {
-                        return false;
-                    }
-                    continue;
-            }
-        }
-        return true;
-    }
-
-    @Override public PlotArea getApplicablePlotArea(Location location) {
-        PlotArea found = super.getApplicablePlotArea(location);
-        if (found != null)
-            return found;
-        String world = location.getWorld();
-        return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
-            area :
-            null;
-    }
-
-    @Override public PlotArea getPlotArea(Location location) {
-        PlotArea found = super.getPlotArea(location);
-        if (found != null)
-            return found;
-        return isWorld(location.getWorld()) || location.getWorld().equals("*") ? area : null;
-    }
-
-    @Override public PlotArea getPlotArea(String world, String id) {
-        PlotArea found = super.getPlotArea(world, id);
-        if (found != null)
-            return found;
-        return isWorld(world) || world.equals("*") ? area : null;
-    }
-
-    @Override public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
-        PlotArea[] found = super.getPlotAreas(world, region);
-        if (found != null && found.length != 0)
-            return found;
-        return isWorld(world) || world.equals("*") ? array : noPlotAreas;
-    }
-
-    @Override public PlotArea[] getAllPlotAreas() {
-        return all;
-    }
-
-    @Override public String[] getAllWorlds() {
-        return super.getAllWorlds();
-    }
-
-    @Override public void addPlotArea(PlotArea area) {
-        if (area == this.area) {
-            return;
-        }
-        super.addPlotArea(area);
-        all = ArrayUtil.concatAll(super.getAllPlotAreas(), array);
-    }
-
-    @Override public void removePlotArea(PlotArea area) {
-        if (area == this.area) {
-            throw new UnsupportedOperationException("Cannot remove base area!");
-        }
-        super.removePlotArea(area);
-    }
-
-    @Override public void addWorld(String worldName) {
-        super.addWorld(worldName);
-    }
-
-    @Override public void removeWorld(String worldName) {
-        super.removeWorld(worldName);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
deleted file mode 100644
index f8e4ab000..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.io.File;
-import java.util.List;
-
-public class SinglePlotManager extends PlotManager {
-    @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
-        return new PlotId(0, 0);
-    }
-
-    @Override public PlotId getPlotId(PlotArea plotArea, int x, int y, int z) {
-        return new PlotId(0, 0);
-    }
-
-    @Override public Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId) {
-        return new Location(plotId.toCommaSeparatedString(), -30000000, 0, -30000000);
-    }
-
-    @Override public Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId) {
-        return new Location(plotId.toCommaSeparatedString(), 30000000, 0, 30000000);
-    }
-
-    @Override public boolean clearPlot(PlotArea plotArea, Plot plot, final Runnable whenDone) {
-        SetupUtils.manager.unload(plot.getWorldName(), false);
-        final File worldFolder =
-            new File(PlotSquared.get().IMP.getWorldContainer(), plot.getWorldName());
-        TaskManager.IMP.taskAsync(() -> {
-            MainUtil.deleteDirectory(worldFolder);
-            if (whenDone != null)
-                whenDone.run();
-        });
-        return true;
-    }
-
-    @Override public boolean claimPlot(PlotArea plotArea, Plot plot) {
-        // TODO
-        return true;
-    }
-
-    @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
-        if (whenDone != null)
-            whenDone.run();
-        return true;
-    }
-
-    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
-        return null;
-    }
-
-    @Override public String[] getPlotComponents(PlotArea plotArea, PlotId plotId) {
-        return new String[0];
-    }
-
-    @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
-        BlockBucket blocks) {
-        return false;
-    }
-
-    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean removeRoadEast(PlotArea plotArea, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean removeRoadSouth(PlotArea plotArea, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean removeRoadSouthEast(PlotArea plotArea, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
-        return false;
-    }
-
-    @Override public boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
-        return false;
-    }
-
-    @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
-        return false;
-    }
-
-    @Override public boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
-        return false;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
deleted file mode 100644
index ba498f971..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
-
-public class SingleWorldGenerator extends IndependentPlotGenerator {
-    private Location bedrock1 = new Location(null, 0, 0, 0);
-    private Location bedrock2 = new Location(null, 15, 0, 15);
-    private Location dirt1 = new Location(null, 0, 1, 0);
-    private Location dirt2 = new Location(null, 15, 2, 15);
-    private Location grass1 = new Location(null, 0, 3, 0);
-    private Location grass2 = new Location(null, 15, 3, 15);
-
-    @Override public String getName() {
-        return "PlotSquared:single";
-    }
-
-    @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
-        BlockBucket[][] blockBuckets = new BlockBucket[16][];
-        SinglePlotArea area = (SinglePlotArea) settings;
-        if (area.VOID) {
-            return blockBuckets;
-        }
-        for (int x = bedrock1.getX(); x <= bedrock2.getX(); x++) {
-            for (int z = bedrock1.getZ(); z <= bedrock2.getZ(); z++) {
-                for (int y = bedrock1.getY(); y <= bedrock2.getY(); y++) {
-                    int layer = y >> 4;
-                    if (blockBuckets[layer] == null) {
-                        blockBuckets[layer] = new BlockBucket[4096];
-                    }
-                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
-                        BlockBucket.withSingle(PlotBlock.get("bedrock"));
-                }
-            }
-        }
-        for (int x = dirt1.getX(); x <= dirt2.getX(); x++) {
-            for (int z = dirt1.getZ(); z <= dirt2.getZ(); z++) {
-                for (int y = dirt1.getY(); y <= dirt2.getY(); y++) {
-                    int layer = y >> 4;
-                    if (blockBuckets[layer] == null) {
-                        blockBuckets[layer] = new BlockBucket[4096];
-                    }
-                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
-                        BlockBucket.withSingle(PlotBlock.get("dirt"));
-                }
-            }
-        }
-        for (int x = grass1.getX(); x <= grass2.getX(); x++) {
-            for (int z = grass1.getZ(); z <= grass2.getZ(); z++) {
-                for (int y = grass1.getY(); y <= grass2.getY(); y++) {
-                    int layer = y >> 4;
-                    if (blockBuckets[layer] == null) {
-                        blockBuckets[layer] = new BlockBucket[4096];
-                    }
-                    blockBuckets[layer][((y & 0xF) << 8) | (z << 4) | x] =
-                        BlockBucket.withSingle(PlotBlock.get("grass_block"));
-                }
-            }
-        }
-        return blockBuckets;
-    }
-
-    @Override public void generateChunk(ScopedLocalBlockQueue result, PlotArea settings) {
-        SinglePlotArea area = (SinglePlotArea) settings;
-        if (area.VOID) {
-            Location min = result.getMin();
-            if (min.getX() == 0 && min.getZ() == 0) {
-                result.setBlock(0, 0, 0, PlotBlock.get("bedrock"));
-            }
-        } else {
-            result.setCuboid(bedrock1, bedrock2, PlotBlock.get("bedrock"));
-            result.setCuboid(dirt1, dirt2, PlotBlock.get("dirt"));
-            result.setCuboid(grass1, grass2, PlotBlock.get("grass_block"));
-        }
-        result.fillBiome("PLAINS");
-    }
-
-    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
-        return ((SinglePlotAreaManager) PlotSquared.get().getPlotAreaManager()).getArea();
-    }
-
-    @Override public PlotManager getNewPlotManager() {
-        return new SinglePlotManager();
-    }
-
-    @Override public void initialize(PlotArea area) {
-
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
deleted file mode 100644
index 329230eaf..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-public abstract class AbstractTitle {
-    public static AbstractTitle TITLE_CLASS;
-
-    public static void sendTitle(PlotPlayer player, String head, String sub) {
-        if (player instanceof ConsolePlayer) {
-            return;
-        }
-        if (TITLE_CLASS != null && !player.getAttribute("disabletitles")) {
-            TITLE_CLASS.sendTitle(player, head, sub, 1, 2, 1);
-        }
-    }
-
-    protected abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
-        int out);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
deleted file mode 100644
index 6052c2a93..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import java.util.Arrays;
-
-public class ArrayUtil {
-    public static final <T> T[] concatAll(T[] first, T[]... rest) {
-        int totalLength = first.length;
-        for (T[] array : rest) {
-            totalLength += array.length;
-        }
-        T[] result = Arrays.copyOf(first, totalLength);
-        int offset = first.length;
-        for (T[] array : rest) {
-            System.arraycopy(array, 0, result, offset, array.length);
-            offset += array.length;
-        }
-        return result;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java
deleted file mode 100644
index ace8bb7e4..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ByteArrayUtilities.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-public class ByteArrayUtilities {
-
-    public static byte[] integerToBytes(int i) {
-        byte[] bytes = new byte[4];
-        bytes[0] = (byte) (i >> 24);
-        bytes[1] = (byte) (i >> 16);
-        bytes[2] = (byte) (i >> 8);
-        bytes[3] = (byte) (i);
-        return bytes;
-    }
-
-    public static int bytesToInteger(byte[] bytes) {
-        return (bytes[0] << 24) & 0xff000000 | (bytes[1] << 16) & 0x00ff0000
-            | (bytes[2] << 8) & 0x0000ff00 | (bytes[3]) & 0x000000ff;
-    }
-
-    public static boolean bytesToBoolean(byte[] bytes) {
-        return bytes[0] == 1;
-    }
-
-    public static byte[] booleanToBytes(boolean b) {
-        return new byte[] {(byte) (b ? 1 : 0)};
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java
deleted file mode 100644
index 1177206e6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChatManager.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-public abstract class ChatManager<T> {
-    public static ChatManager<?> manager;
-
-    public abstract T builder();
-
-    public abstract void color(PlotMessage message, String color);
-
-    public abstract void tooltip(PlotMessage message, PlotMessage... tooltip);
-
-    public abstract void command(PlotMessage message, String command);
-
-    public abstract void text(PlotMessage message, String text);
-
-    public abstract void send(PlotMessage plotMessage, PlotPlayer player);
-
-    public abstract void suggest(PlotMessage plotMessage, String command);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
deleted file mode 100644
index cf2ca96ed..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-public abstract class ChunkManager {
-
-    public static ChunkManager manager = null;
-    private static RunnableVal<ScopedLocalBlockQueue> CURRENT_FORCE_CHUNK;
-    private static RunnableVal<ScopedLocalBlockQueue> CURRENT_ADD_CHUNK;
-
-    public static ChunkLoc getChunkChunk(Location location) {
-        int x = location.getX() >> 9;
-        int z = location.getZ() >> 9;
-        return new ChunkLoc(x, z);
-    }
-
-    public static void setChunkInPlotArea(RunnableVal<ScopedLocalBlockQueue> force,
-        RunnableVal<ScopedLocalBlockQueue> add, String world, ChunkLoc loc) {
-        LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
-        if (PlotSquared.get().isAugmented(world)) {
-            int bx = loc.x << 4;
-            int bz = loc.z << 4;
-            ScopedLocalBlockQueue scoped =
-                new ScopedLocalBlockQueue(queue, new Location(world, bx, 0, bz),
-                    new Location(world, bx + 15, 255, bz + 15));
-            if (force != null) {
-                force.run(scoped);
-            } else {
-                scoped.regenChunk(loc.x, loc.z);
-                if (add != null) {
-                    add.run(scoped);
-                }
-            }
-            queue.flush();
-        } else {
-            CURRENT_FORCE_CHUNK = force;
-            CURRENT_ADD_CHUNK = add;
-            queue.regenChunk(loc.x, loc.z);
-            CURRENT_FORCE_CHUNK = null;
-            CURRENT_ADD_CHUNK = null;
-        }
-    }
-
-    public static boolean preProcessChunk(ScopedLocalBlockQueue queue) {
-        if (CURRENT_FORCE_CHUNK != null) {
-            CURRENT_FORCE_CHUNK.run(queue);
-            CURRENT_FORCE_CHUNK = null;
-            return true;
-        }
-        return false;
-    }
-
-    public static boolean postProcessChunk(ScopedLocalBlockQueue queue) {
-        if (CURRENT_ADD_CHUNK != null) {
-            CURRENT_ADD_CHUNK.run(queue);
-            CURRENT_ADD_CHUNK = null;
-            return true;
-        }
-        return false;
-    }
-
-    public static void largeRegionTask(final String world, final RegionWrapper region,
-        final RunnableVal<ChunkLoc> task, final Runnable whenDone) {
-        TaskManager.runTaskAsync(() -> {
-            HashSet<ChunkLoc> chunks = new HashSet<>();
-            Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
-            for (ChunkLoc mcr : mcrs) {
-                int bx = mcr.x << 9;
-                int bz = mcr.z << 9;
-                int tx = bx + 511;
-                int tz = bz + 511;
-                if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
-                    && tz >= region.minZ) {
-                    for (int x = bx >> 4; x <= (tx >> 4); x++) {
-                        int cbx = x << 4;
-                        int ctx = cbx + 15;
-                        if (cbx <= region.maxX && ctx >= region.minX) {
-                            for (int z = bz >> 4; z <= (tz >> 4); z++) {
-                                int cbz = z << 4;
-                                int ctz = cbz + 15;
-                                if (cbz <= region.maxZ && ctz >= region.minZ) {
-                                    chunks.add(new ChunkLoc(x, z));
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
-
-                @Override public void run(ChunkLoc value) {
-                    if (manager.loadChunk(world, value, false)) {
-                        task.run(value);
-                    }
-                }
-            }, whenDone);
-        });
-    }
-
-    public static void chunkTask(final Plot plot, final RunnableVal<int[]> task,
-        final Runnable whenDone, final int allocate) {
-        final ArrayList<RegionWrapper> regions = new ArrayList<>(plot.getRegions());
-        Runnable smallTask = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper value = regions.remove(0);
-                Location pos1 = new Location(plot.getWorldName(), value.minX, 0, value.minZ);
-                Location pos2 = new Location(plot.getWorldName(), value.maxX, 0, value.maxZ);
-                chunkTask(pos1, pos2, task, this, allocate);
-            }
-        };
-        smallTask.run();
-    }
-
-    /**
-     * The int[] will be in the form: [chunkx, chunkz, pos1x, pos1z, pos2x, pos2z, isedge] and will represent the bottom and top parts of the chunk
-     *
-     * @param pos1
-     * @param pos2
-     * @param task
-     * @param whenDone
-     */
-    public static void chunkTask(Location pos1, Location pos2, final RunnableVal<int[]> task,
-        final Runnable whenDone, final int allocate) {
-        final int p1x = pos1.getX();
-        final int p1z = pos1.getZ();
-        final int p2x = pos2.getX();
-        final int p2z = pos2.getZ();
-        final int bcx = p1x >> 4;
-        final int bcz = p1z >> 4;
-        final int tcx = p2x >> 4;
-        final int tcz = p2z >> 4;
-        final ArrayList<ChunkLoc> chunks = new ArrayList<>();
-
-        for (int x = bcx; x <= tcx; x++) {
-            for (int z = bcz; z <= tcz; z++) {
-                chunks.add(new ChunkLoc(x, z));
-            }
-        }
-        TaskManager.runTask(new Runnable() {
-            @Override public void run() {
-                long start = System.currentTimeMillis();
-                while (!chunks.isEmpty() && ((System.currentTimeMillis() - start) < allocate)) {
-                    ChunkLoc chunk = chunks.remove(0);
-                    task.value = new int[7];
-                    task.value[0] = chunk.x;
-                    task.value[1] = chunk.z;
-                    task.value[2] = task.value[0] << 4;
-                    task.value[3] = task.value[1] << 4;
-                    task.value[4] = task.value[2] + 15;
-                    task.value[5] = task.value[3] + 15;
-                    if (task.value[0] == bcx) {
-                        task.value[2] = p1x;
-                        task.value[6] = 1;
-                    }
-                    if (task.value[0] == tcx) {
-                        task.value[4] = p2x;
-                        task.value[6] = 1;
-                    }
-                    if (task.value[1] == bcz) {
-                        task.value[3] = p1z;
-                        task.value[6] = 1;
-                    }
-                    if (task.value[1] == tcz) {
-                        task.value[5] = p2z;
-                        task.value[6] = 1;
-                    }
-                    task.run();
-                }
-                if (!chunks.isEmpty()) {
-                    TaskManager.runTaskLater(this, 1);
-                } else {
-                    TaskManager.runTask(whenDone);
-                }
-            }
-        });
-    }
-
-    /**
-     * 0 = Entity
-     * 1 = Animal
-     * 2 = Monster
-     * 3 = Mob
-     * 4 = Boat
-     * 5 = Misc
-     *
-     * @param plot
-     * @return
-     */
-    public abstract int[] countEntities(Plot plot);
-
-    public abstract boolean loadChunk(String world, ChunkLoc loc, boolean force);
-
-    public abstract void unloadChunk(String world, ChunkLoc loc, boolean save, boolean safe);
-
-    public Set<ChunkLoc> getChunkChunks(String world) {
-        File folder =
-            new File(PlotSquared.get().IMP.getWorldContainer(), world + File.separator + "region");
-        File[] regionFiles = folder.listFiles();
-        HashSet<ChunkLoc> chunks = new HashSet<>();
-        if (regionFiles == null) {
-            throw new RuntimeException(
-                "Could not find worlds folder: " + folder + " ? (no read access?)");
-        }
-        for (File file : regionFiles) {
-            String name = file.getName();
-            if (name.endsWith("mca")) {
-                String[] split = name.split("\\.");
-                try {
-                    int x = Integer.parseInt(split[1]);
-                    int z = Integer.parseInt(split[2]);
-                    ChunkLoc loc = new ChunkLoc(x, z);
-                    chunks.add(loc);
-                } catch (NumberFormatException ignored) {
-                }
-            }
-        }
-        return chunks;
-    }
-
-    public void deleteRegionFiles(String world, Collection<ChunkLoc> chunks) {
-        deleteRegionFiles(world, chunks, null);
-    }
-
-    public void deleteRegionFiles(final String world, final Collection<ChunkLoc> chunks,
-        final Runnable whenDone) {
-        TaskManager.runTaskAsync(() -> {
-            for (ChunkLoc loc : chunks) {
-                String directory =
-                    world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z
-                        + ".mca";
-                File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
-                PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
-                if (file.exists()) {
-                    file.delete();
-                }
-            }
-            TaskManager.runTask(whenDone);
-        });
-    }
-
-    public Plot hasPlot(String world, ChunkLoc chunk) {
-        int x1 = chunk.x << 4;
-        int z1 = chunk.z << 4;
-        int x2 = x1 + 15;
-        int z2 = z1 + 15;
-        Location bot = new Location(world, x1, 0, z1);
-        Plot plot = bot.getOwnedPlotAbs();
-        if (plot != null) {
-            return plot;
-        }
-        Location top = new Location(world, x2, 0, z2);
-        plot = top.getOwnedPlotAbs();
-        if (plot != null) {
-            return plot;
-        }
-        return null;
-    }
-
-    /**
-     * Copy a region to a new location (in the same world)
-     */
-    public abstract boolean copyRegion(Location pos1, Location pos2, Location newPos,
-        Runnable whenDone);
-
-    /**
-     * Assumptions:<br>
-     * - pos1 and pos2 are in the same plot<br>
-     * It can be harmful to the world if parameters outside this scope are provided
-     *
-     * @param pos1
-     * @param pos2
-     * @param whenDone
-     * @return
-     */
-    public abstract boolean regenerateRegion(Location pos1, Location pos2, boolean ignoreAugment,
-        Runnable whenDone);
-
-    public abstract void clearAllEntities(Location pos1, Location pos2);
-
-    public abstract void swap(Location bot1, Location top1, Location bot2, Location top2,
-        Runnable whenDone);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
deleted file mode 100644
index d0b4012a6..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.CmdInstance;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-public class CmdConfirm {
-
-    public static CmdInstance getPending(PlotPlayer player) {
-        return player.getMeta("cmdConfirm");
-    }
-
-    public static void removePending(PlotPlayer player) {
-        player.deleteMeta("cmdConfirm");
-    }
-
-    public static void addPending(final PlotPlayer player, String commandStr,
-        final Runnable runnable) {
-        removePending(player);
-        if (commandStr != null)
-            MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
-        TaskManager.runTaskLater(() -> {
-            CmdInstance cmd = new CmdInstance(runnable);
-            player.setMeta("cmdConfirm", cmd);
-        }, 1);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
deleted file mode 100644
index 524ea7f67..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.object.comment.*;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class CommentManager {
-
-    public static final HashMap<String, CommentInbox> inboxes = new HashMap<>();
-
-    public static void sendTitle(final PlotPlayer player, final Plot plot) {
-        if (!Settings.Enabled_Components.COMMENT_NOTIFIER || !plot.isOwner(player.getUUID())) {
-            return;
-        }
-        TaskManager.runTaskLaterAsync(() -> {
-            Collection<CommentInbox> boxes = CommentManager.inboxes.values();
-            final AtomicInteger count = new AtomicInteger(0);
-            final AtomicInteger size = new AtomicInteger(boxes.size());
-            for (final CommentInbox inbox : inboxes.values()) {
-                inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-                    @Override public void run(List<PlotComment> value) {
-                        int total;
-                        if (value != null) {
-                            int num = 0;
-                            for (PlotComment comment : value) {
-                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
-                                    num++;
-                                }
-                            }
-                            total = count.addAndGet(num);
-                        } else {
-                            total = count.get();
-                        }
-                        if ((size.decrementAndGet() == 0) && (total > 0)) {
-                            AbstractTitle.sendTitle(player, "",
-                                C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
-                        }
-                    }
-                });
-            }
-        }, 20);
-    }
-
-    public static long getTimestamp(PlotPlayer player, String inbox) {
-        return player.getMeta("inbox:" + inbox, player.getLastPlayed());
-    }
-
-    public static void addInbox(CommentInbox inbox) {
-        inboxes.put(inbox.toString().toLowerCase(), inbox);
-    }
-
-    public static void registerDefaultInboxes() {
-        addInbox(new InboxReport());
-        addInbox(new InboxPublic());
-        addInbox(new InboxOwner());
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
deleted file mode 100644
index 5e9c87a7a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-public class ConsoleColors {
-    public static String fromString(String input) {
-        input = input.replaceAll("&0", fromChatColor("&0")).replaceAll("&1", fromChatColor("&1"))
-            .replaceAll("&2", fromChatColor("&2")).replaceAll("&3", fromChatColor("&3"))
-            .replaceAll("&4", fromChatColor("&4")).replaceAll("&5", fromChatColor("&5"))
-            .replaceAll("&6", fromChatColor("&6")).replaceAll("&7", fromChatColor("&7"))
-            .replaceAll("&8", fromChatColor("&8")).replaceAll("&9", fromChatColor("&9"))
-            .replaceAll("&a", fromChatColor("&a")).replaceAll("&b", fromChatColor("&b"))
-            .replaceAll("&c", fromChatColor("&c")).replaceAll("&d", fromChatColor("&d"))
-            .replaceAll("&e", fromChatColor("&e")).replaceAll("&f", fromChatColor("&f"))
-            .replaceAll("&k", fromChatColor("&k")).replaceAll("&l", fromChatColor("&l"))
-            .replaceAll("&m", fromChatColor("&m")).replaceAll("&n", fromChatColor("&n"))
-            .replaceAll("&o", fromChatColor("&o")).replaceAll("&r", fromChatColor("&r"));
-        return input + "\u001B[0m";
-    }
-
-    /*
-     * public static final String ANSI_RESET = "\u001B[0m"; public static final
-     * String ANSI_BLACK = "\u001B[30m"; public static final String ANSI_RED =
-     * "\u001B[31m"; public static final String ANSI_GREEN = "\u001B[32m";
-     * public static final String ANSI_YELLOW = "\u001B[33m"; public static
-     * final String ANSI_BLUE = "\u001B[34m"; public static final String
-     * ANSI_PURPLE = "\u001B[35m"; public static final String ANSI_CYAN =
-     * "\u001B[36m"; public static final String ANSI_WHITE = "\u001B[37m";
-     * public static final String ANSI_BOLD = "\033[1m"; public static final
-     * String ANSI_UNDERLINE = "\033[0m"; public static final String ANSI_ITALIC
-     * = "\033[3m]";
-     */
-    public static String fromChatColor(final String color) {
-        return chatColor(color).getLin();
-    }
-
-    public static ConsoleColor chatColor(final String color) {
-        switch (color) {
-            case "&r":
-                return ConsoleColor.RESET;
-            case "&7":
-            case "&8":
-                return ConsoleColor.WHITE;
-            case "&0":
-                return ConsoleColor.BLACK;
-            case "&4":
-            case "&c":
-                return ConsoleColor.RED;
-            case "&6":
-            case "&e":
-                return ConsoleColor.YELLOW;
-            case "&a":
-            case "&2":
-                return ConsoleColor.GREEN;
-            case "&b":
-            case "&3":
-                return ConsoleColor.CYAN;
-            case "&d":
-            case "&5":
-                return ConsoleColor.PURPLE;
-            case "&9":
-            case "&1":
-                return ConsoleColor.BLUE;
-            case "&n":
-                return ConsoleColor.UNDERLINE;
-            case "&o":
-                return ConsoleColor.ITALIC;
-            case "&l":
-                return ConsoleColor.BOLD;
-            default:
-                return ConsoleColor.RESET;
-        }
-    }
-
-    enum ConsoleColor {
-        RESET("\u001B[0m"), BLACK("\u001B[30m"), RED("\u001B[31m"), GREEN("\u001B[32m"), YELLOW(
-            "\u001B[33m"), BLUE("\u001B[34m"), PURPLE("\u001B[35m"), CYAN("\u001B[36m"), WHITE(
-            "\u001B[37m"), BOLD("\033[1m"), UNDERLINE("\033[0m"), ITALIC("\033[3m");
-        private final String lin;
-
-        ConsoleColor(final String lin) {
-            this.lin = lin;
-        }
-
-        public String getLin() {
-            return lin;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java
deleted file mode 100644
index 4912b6e83..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EconHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
-import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-public abstract class EconHandler {
-
-    public static EconHandler manager;
-    private static boolean initialized;
-
-    public static EconHandler getEconHandler() {
-        if (initialized) {
-            return manager;
-        }
-        initialized = true;
-        return manager = PlotSquared.get().IMP.getEconomyHandler();
-    }
-
-    public double getMoney(PlotPlayer player) {
-        if (player instanceof ConsolePlayer) {
-            return Double.MAX_VALUE;
-        }
-        return getBalance(player);
-    }
-
-    public abstract double getBalance(PlotPlayer player);
-
-    public abstract void withdrawMoney(PlotPlayer player, double amount);
-
-    public abstract void depositMoney(PlotPlayer player, double amount);
-
-    public abstract void depositMoney(OfflinePlotPlayer player, double amount);
-
-    public abstract boolean hasPermission(String world, String player, String perm);
-
-    public boolean hasPermission(String player, String perm) {
-        return hasPermission(null, player, perm);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
deleted file mode 100644
index fa543b21a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.flag.IntegerFlag;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import lombok.NonNull;
-import lombok.experimental.UtilityClass;
-
-/**
- * Entity related general utility methods
- */
-@UtilityClass public final class EntityUtil {
-
-    private static int capNumeral(@NonNull final String flagName) {
-        int i;
-        switch (flagName) {
-            case "entity-cap":
-                i = 0;
-                break;
-            case "mob-cap":
-                i = 3;
-                break;
-            case "hostile-cap":
-                i = 2;
-                break;
-            case "animal-cap":
-                i = 1;
-                break;
-            case "vehicle-cap":
-                i = 4;
-                break;
-            case "misc-cap":
-                i = 5;
-                break;
-            default:
-                i = 0;
-        }
-        return i;
-    }
-
-    public static boolean checkEntity(Plot plot, IntegerFlag... flags) {
-        if (Settings.Done.RESTRICT_BUILDING && Flags.DONE.isSet(plot)) {
-            return true;
-        }
-        int[] mobs = null;
-        for (IntegerFlag flag : flags) {
-            final int i = capNumeral(flag.getName());
-            int cap = plot.getFlag(flag, Integer.MAX_VALUE);
-            if (cap == Integer.MAX_VALUE) {
-                continue;
-            }
-            if (cap == 0) {
-                return true;
-            }
-            if (mobs == null) {
-                mobs = plot.countEntities();
-            }
-            if (mobs[i] >= cap) {
-                plot.setMeta("EntityCount", mobs);
-                plot.setMeta("EntityCountTime", System.currentTimeMillis());
-                return true;
-            }
-        }
-        if (mobs != null) {
-            for (IntegerFlag flag : flags) {
-                final int i = capNumeral(flag.getName());
-                mobs[i]++;
-            }
-            plot.setMeta("EntityCount", mobs);
-            plot.setMeta("EntityCountTime", System.currentTimeMillis());
-        }
-        return false;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
deleted file mode 100644
index 7d82e5236..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ /dev/null
@@ -1,428 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-
-import javax.annotation.Nullable;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-public abstract class EventUtil {
-
-    public static EventUtil manager = null;
-
-    /**
-     * Submit a plot rate event and return the updated rating
-     *
-     * @param player Player that rated the plot
-     * @param plot   Plot that was rated
-     * @param rating Rating given to the plot
-     * @return Updated rating or null if the event was cancelled
-     */
-    @Nullable public abstract Rating callRating(PlotPlayer player, Plot plot, Rating rating);
-
-    public abstract boolean callClaim(PlotPlayer player, Plot plot, boolean auto);
-
-    public abstract boolean callTeleport(PlotPlayer player, Location from, Plot plot);
-
-    public abstract boolean callComponentSet(Plot plot, String component);
-
-    public abstract boolean callClear(Plot plot);
-
-    public abstract boolean callDelete(Plot plot);
-
-    public abstract boolean callFlagAdd(Flag flag, Plot plot);
-
-    public abstract boolean callFlagRemove(Flag<?> flag, Plot plot, Object value);
-
-    public abstract boolean callMerge(Plot plot, int dir, int max);
-
-    public abstract boolean callAutoMerge(Plot plot, List<PlotId> plots);
-
-    public abstract boolean callUnlink(PlotArea area, List<PlotId> plots);
-
-    public abstract void callEntry(PlotPlayer player, Plot plot);
-
-    public abstract void callLeave(PlotPlayer player, Plot plot);
-
-    public abstract void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added);
-
-    public abstract void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added);
-
-    public abstract void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added);
-
-    public abstract boolean callOwnerChange(PlotPlayer initiator, Plot plot, UUID newOwner,
-        UUID oldOwner, boolean hasOldOwner);
-
-    public void doJoinTask(final PlotPlayer player) {
-        if (player == null) {
-            return; //possible future warning message to figure out where we are retrieving null
-        }
-        if (ExpireManager.IMP != null) {
-            ExpireManager.IMP.handleJoin(player);
-        }
-        if (PlotSquared.get().worldedit != null) {
-            if (player.getAttribute("worldedit")) {
-                MainUtil.sendMessage(player, C.WORLDEDIT_BYPASSED);
-            }
-        }
-        final Plot plot = player.getCurrentPlot();
-        if (Settings.Teleport.ON_LOGIN && plot != null) {
-            TaskManager.runTask(() -> plot.teleportPlayer(player));
-            MainUtil.sendMessage(player,
-                C.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
-                    .getId().y + ")");
-        }
-    }
-
-    public void doRespawnTask(final PlotPlayer player) {
-        final Plot plot = player.getCurrentPlot();
-        if (Settings.Teleport.ON_DEATH && plot != null) {
-            TaskManager.runTask(() -> plot.teleportPlayer(player));
-            MainUtil.sendMessage(player, C.TELEPORTED_TO_ROAD);
-        }
-    }
-
-    public boolean checkPlayerBlockEvent(PlotPlayer player, PlayerBlockEventType type,
-        Location location, LazyBlock block, boolean notifyPerms) {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(location);
-        Plot plot;
-        if (area != null) {
-            plot = area.getPlot(location);
-        } else {
-            plot = null;
-        }
-        if (plot == null) {
-            if (area == null) {
-                return true;
-            }
-        } else if (plot.isAdded(player.getUUID())) {
-            return true;
-        }
-        switch (type) {
-            case TELEPORT_OBJECT:
-                return false;
-            case EAT:
-            case READ:
-                return true;
-            case BREAK_BLOCK:
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
-                if (use.isPresent()) {
-                    HashSet<PlotBlock> value = use.get();
-                    if (PlotBlock.containsEverything(value) || value
-                        .contains(block.getPlotBlock())) {
-                        return true;
-                    }
-                }
-                Optional<HashSet<PlotBlock>> destroy = plot.getFlag(Flags.BREAK);
-                if (destroy.isPresent()) {
-                    HashSet<PlotBlock> value = destroy.get();
-                    if (PlotBlock.containsEverything(value) || value
-                        .contains(block.getPlotBlock())) {
-                        return true;
-                    }
-                }
-                if (Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                    return true;
-                }
-                return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                    C.FLAG_USE.s() + '/' + C.FLAG_BREAK.s()));
-            case BREAK_HANGING:
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (plot.getFlag(Flags.HANGING_BREAK).orElse(false)) {
-                    return true;
-                }
-                if (plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
-                        !notifyPerms || MainUtil
-                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_HANGING_BREAK.s()));
-                }
-                return Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-            case BREAK_MISC:
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (plot.getFlag(Flags.MISC_BREAK).orElse(false)) {
-                    return true;
-                }
-                if (plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
-                        !notifyPerms || MainUtil
-                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_MISC_BREAK.s()));
-                }
-                return Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-            case BREAK_VEHICLE:
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (plot.getFlag(Flags.VEHICLE_BREAK).orElse(false)) {
-                    return true;
-                }
-                if (plot.hasOwner()) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil
-                        .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_VEHICLE_BREAK.s()));
-                }
-                return Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
-            case INTERACT_BLOCK: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
-                HashSet<PlotBlock> value = flagValue.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
-                        !notifyPerms || MainUtil
-                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s()));
-                }
-                return true;
-            }
-            case PLACE_BLOCK: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_UNOWNED.s(), notifyPerms);
-                }
-                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.PLACE);
-                HashSet<PlotBlock> value = flagValue.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil
-                        .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_PLACE.s()));
-                }
-                return true;
-            }
-            case TRIGGER_PHYSICAL: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), false);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), false);
-                }
-                if (plot.getFlag(Flags.DEVICE_INTERACT).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
-                HashSet<PlotBlock> value = flagValue.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return false;
-                }
-                return true;
-            }
-            case INTERACT_HANGING: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                if (plot.getFlag(Flags.HOSTILE_INTERACT).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
-                HashSet<PlotBlock> value = flagValue.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_USE.s() + '/' + C.FLAG_HANGING_INTERACT.s()));
-                }
-                return true;
-            }
-            case INTERACT_MISC: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                if (plot.getFlag(Flags.MISC_INTERACT).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE);
-                HashSet<PlotBlock> value = flag.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_USE.s() + '/' + C.FLAG_MISC_INTERACT.s()));
-                }
-                return true;
-            }
-            case INTERACT_VEHICLE: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                if (plot.getFlag(Flags.VEHICLE_USE).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE);
-                HashSet<PlotBlock> value = flag.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_USE.s() + '/' + C.FLAG_VEHICLE_USE.s()));
-                }
-                return true;
-            }
-            case SPAWN_MOB: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                if (plot.getFlag(Flags.MOB_PLACE).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.PLACE);
-                HashSet<PlotBlock> value = flagValue.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_MOB_PLACE.s() + '/' + C.FLAG_PLACE.s()));
-                }
-                return true;
-            }
-            case PLACE_HANGING: // Handled elsewhere
-                return true;
-            case PLACE_MISC: {
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                if (plot.getFlag(Flags.MISC_PLACE).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.PLACE);
-                HashSet<PlotBlock> value = flag.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_MISC_PLACE.s() + '/' + C.FLAG_PLACE.s()));
-                }
-
-                return true;
-            }
-            case PLACE_VEHICLE:
-                if (plot == null) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
-                }
-                if (!plot.hasOwner()) {
-                    return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
-                            notifyPerms);
-                }
-                if (plot.getFlag(Flags.VEHICLE_PLACE).orElse(false)) {
-                    return true;
-                }
-                Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.PLACE);
-                HashSet<PlotBlock> value = flag.orElse(null);
-                if (value == null || !PlotBlock.containsEverything(value) && !value
-                    .contains(block.getPlotBlock())) {
-                    if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
-                        return true;
-                    }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_VEHICLE_PLACE.s() + '/' + C.FLAG_PLACE.s()));
-                }
-                return true;
-            default:
-                break;
-        }
-        return true;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
deleted file mode 100644
index d2495b646..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class HastebinUtility {
-
-    public static final String BIN_URL = "https://hastebin.com/documents", USER_AGENT =
-        "Mozilla/5.0";
-    public static final Pattern PATTERN = Pattern.compile("\\{\"key\":\"([\\S\\s]*)\"\\}");
-
-    public static String upload(final String string) throws IOException {
-        final URL url = new URL(BIN_URL);
-        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-
-        connection.setRequestMethod("POST");
-        connection.setRequestProperty("User-Agent", USER_AGENT);
-        connection.setDoOutput(true);
-
-        try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
-            outputStream.write(string.getBytes());
-            outputStream.flush();
-        }
-
-        StringBuilder response;
-        try (BufferedReader in = new BufferedReader(
-            new InputStreamReader(connection.getInputStream()))) {
-            response = new StringBuilder();
-
-            String inputLine;
-            while ((inputLine = in.readLine()) != null) {
-                response.append(inputLine);
-            }
-        }
-
-        Matcher matcher = PATTERN.matcher(response.toString());
-        if (matcher.matches()) {
-            return "https://hastebin.com/" + matcher.group(1);
-        } else {
-            throw new RuntimeException("Couldn't read response!");
-        }
-    }
-
-    public static String upload(final File file) throws IOException {
-        final StringBuilder content = new StringBuilder();
-        List<String> lines = new ArrayList<>();
-        try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
-            String line;
-            int i = 0;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
-            content.append(lines.get(i)).append("\n");
-        }
-        return upload(content.toString());
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java
deleted file mode 100644
index 761c5aa0a..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HttpUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-public class HttpUtil {
-
-    public static String readUrl(String urlString) {
-        try (BufferedReader reader = new BufferedReader(
-            new InputStreamReader(new URL(urlString).openStream()))) {
-            StringBuilder buffer = new StringBuilder();
-            int read;
-            char[] chars = new char[1024];
-            while ((read = reader.read(chars)) != -1) {
-                buffer.append(chars, 0, read);
-            }
-            return buffer.toString();
-        } catch (IOException e) {
-            if (Settings.DEBUG) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
deleted file mode 100644
index 18a822d07..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.google.common.base.Charsets;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.*;
-
-/**
- * Single class paster for the Incendo paste service
- */
-@SuppressWarnings({"unused", "WeakerAccess"}) public final class IncendoPaster {
-
-    /**
-     * Upload service URL
-     */
-    public static final String UPLOAD_PATH = "https://incendo.org/paste/upload";
-    /**
-     * Valid paste applications
-     */
-    public static final Collection<String> VALID_APPLICATIONS =
-        Arrays.asList("plotsquared", "fastasyncworldedit", "incendopermissions", "kvantum");
-
-    private final Collection<PasteFile> files = new ArrayList<>();
-    private final String pasteApplication;
-
-    /**
-     * Construct a new paster
-     *
-     * @param pasteApplication The application that is sending the paste
-     */
-    public IncendoPaster(final String pasteApplication) {
-        if (pasteApplication == null || pasteApplication.isEmpty()) {
-            throw new IllegalArgumentException("paste application cannot be null, nor empty");
-        }
-        if (!VALID_APPLICATIONS.contains(pasteApplication.toLowerCase(Locale.ENGLISH))) {
-            throw new IllegalArgumentException(
-                String.format("Unknown application name: %s", pasteApplication));
-        }
-        this.pasteApplication = pasteApplication;
-    }
-
-    /**
-     * Get an immutable collection containing all the files that have been added to this paster
-     *
-     * @return Unmodifiable collection
-     */
-    public final Collection<PasteFile> getFiles() {
-        return Collections.unmodifiableCollection(this.files);
-    }
-
-    /**
-     * Add a file to the paster
-     *
-     * @param file File to paste
-     */
-    public void addFile(final PasteFile file) {
-        if (file == null) {
-            throw new IllegalArgumentException("File cannot be null");
-        }
-        // Check to see that no duplicate files are submitted
-        for (final PasteFile pasteFile : this.files) {
-            if (pasteFile.fileName.equalsIgnoreCase(file.getFileName())) {
-                throw new IllegalArgumentException(
-                    String.format("Found duplicate file with name %s", file.getFileName()));
-            }
-        }
-        this.files.add(file);
-    }
-
-    /**
-     * Create a JSON string from the submitted information
-     *
-     * @return compiled JSON string
-     */
-    private String toJsonString() {
-        final StringBuilder builder = new StringBuilder("{\n");
-        builder.append("\"paste_application\": \"").append(this.pasteApplication)
-            .append("\",\n\"files\": \"");
-        Iterator<PasteFile> fileIterator = this.files.iterator();
-        while (fileIterator.hasNext()) {
-            final PasteFile file = fileIterator.next();
-            builder.append(file.getFileName());
-            if (fileIterator.hasNext()) {
-                builder.append(",");
-            }
-        }
-        builder.append("\",\n");
-        fileIterator = this.files.iterator();
-        while (fileIterator.hasNext()) {
-            final PasteFile file = fileIterator.next();
-            builder.append("\"file-").append(file.getFileName()).append("\": \"")
-                .append(file.getContent().replaceAll("\"", "\\\\\"")).append("\"");
-            if (fileIterator.hasNext()) {
-                builder.append(",\n");
-            }
-        }
-        builder.append("\n}");
-        return builder.toString();
-    }
-
-    /**
-     * Upload the paste and return the status message
-     *
-     * @return Status message
-     * @throws Throwable any and all exceptions
-     */
-    public final String upload() throws Throwable {
-        final URL url = new URL(UPLOAD_PATH);
-        final URLConnection connection = url.openConnection();
-        final HttpURLConnection httpURLConnection = (HttpURLConnection) connection;
-        httpURLConnection.setRequestMethod("POST");
-        httpURLConnection.setDoOutput(true);
-        final byte[] content = toJsonString().getBytes(Charsets.UTF_8);
-        httpURLConnection.setFixedLengthStreamingMode(content.length);
-        httpURLConnection.setRequestProperty("Content-Type", "application/json");
-        httpURLConnection.setRequestProperty("Accept", "*/*");
-        httpURLConnection.connect();
-        try (final OutputStream stream = httpURLConnection.getOutputStream()) {
-            stream.write(content);
-        }
-        if (!httpURLConnection.getResponseMessage().contains("OK")) {
-            if (httpURLConnection.getResponseCode() == 413) {
-                final long size = content.length;
-                PlotSquared.debug(String.format("Paste Too Big > Size: %dMB", size / 1_000_000));
-            }
-            throw new IllegalStateException(String
-                .format("Server returned status: %d %s", httpURLConnection.getResponseCode(),
-                    httpURLConnection.getResponseMessage()));
-        }
-        final StringBuilder input = new StringBuilder();
-        try (final BufferedReader inputStream = new BufferedReader(
-            new InputStreamReader(httpURLConnection.getInputStream()))) {
-            String line;
-            while ((line = inputStream.readLine()) != null) {
-                input.append(line).append("\n");
-            }
-        }
-        return input.toString();
-    }
-
-    /**
-     * Simple class that represents a paste file
-     */
-    public static class PasteFile {
-
-        private final String fileName;
-        private final String content;
-
-        /**
-         * Construct a new paste file
-         *
-         * @param fileName File name, cannot be empty, nor null
-         * @param content  File content, cannot be empty, nor null
-         */
-        public PasteFile(final String fileName, final String content) {
-            if (fileName == null || fileName.isEmpty()) {
-                throw new IllegalArgumentException("file name cannot be null, nor empty");
-            }
-            if (content == null || content.isEmpty()) {
-                throw new IllegalArgumentException("content cannot be null, nor empty");
-            }
-            this.fileName = fileName;
-            this.content = content;
-        }
-
-        /**
-         * Get the file name
-         *
-         * @return File name
-         */
-        public String getFileName() {
-            return this.fileName;
-        }
-
-        /**
-         * Get the file content as a single string
-         *
-         * @return File content
-         */
-        public String getContent() {
-            return this.content;
-        }
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java
deleted file mode 100644
index 03b87fc2b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/InventoryUtil.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotInventory;
-import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-/**
- * This class is only used by internal functions, for most cases use the PlotInventory class
- */
-public abstract class InventoryUtil {
-
-    /**
-     * This class is only used by internal functions, for most cases use the PlotInventory class
-     */
-    public static InventoryUtil manager = null;
-
-    public abstract void open(final PlotInventory inv);
-
-    public abstract void close(final PlotInventory inv);
-
-    public abstract void setItem(final PlotInventory plotInventory, final int index,
-        final PlotItemStack item);
-
-    public abstract PlotItemStack[] getItems(final PlotPlayer player);
-
-    public abstract boolean isOpen(final PlotInventory plotInventory);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
deleted file mode 100644
index 13c2647cd..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import lombok.NonNull;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Converts legacy configurations into the new (BlockBucket) format
- */
-@SuppressWarnings("unused") public final class LegacyConverter {
-
-    public static final String CONFIGURATION_VERSION = "post_flattening";
-    private static final HashMap<String, ConfigurationType> TYPE_MAP = new HashMap<>();
-
-    static {
-        TYPE_MAP.put("plot.filling", ConfigurationType.BLOCK_LIST);
-        TYPE_MAP.put("plot.floor", ConfigurationType.BLOCK_LIST);
-        TYPE_MAP.put("wall.filling", ConfigurationType.BLOCK);
-        TYPE_MAP.put("wall.block_claimed", ConfigurationType.BLOCK);
-        TYPE_MAP.put("wall.block", ConfigurationType.BLOCK);
-        TYPE_MAP.put("road.block", ConfigurationType.BLOCK);
-    }
-
-    private final ConfigurationSection configuration;
-
-    public LegacyConverter(@NonNull final ConfigurationSection configuration) {
-        this.configuration = configuration;
-    }
-
-    private BlockBucket blockToBucket(@NonNull final String block) {
-        final PlotBlock plotBlock = WorldUtil.IMP.getClosestBlock(block).best;
-        return BlockBucket.withSingle(plotBlock);
-    }
-
-    private void setString(@NonNull final ConfigurationSection section,
-        @NonNull final String string, @NonNull final BlockBucket blocks) {
-        if (!section.contains(string)) {
-            throw new IllegalArgumentException(String.format("No such key: %s", string));
-        }
-        section.set(string, blocks.toString());
-    }
-
-    private BlockBucket blockListToBucket(@NonNull final PlotBlock[] blocks) {
-        final Map<PlotBlock, Integer> counts = new HashMap<>();
-        for (final PlotBlock block : blocks) {
-            if (!counts.containsKey(block)) {
-                counts.put(block, 0);
-            }
-            counts.put(block, counts.get(block) + 1);
-        }
-        boolean includeRatios = false;
-        for (final Integer integer : counts.values()) {
-            if (integer > 1) {
-                includeRatios = true;
-                break;
-            }
-        }
-        final BlockBucket bucket = new BlockBucket();
-        if (includeRatios) {
-            final double ratio = 100D / blocks.length;
-            for (final Map.Entry<PlotBlock, Integer> count : counts.entrySet()) {
-                bucket.addBlock(count.getKey(), (int) (count.getValue() * ratio));
-            }
-        } else {
-            counts.keySet().forEach(bucket::addBlock);
-        }
-        return bucket;
-    }
-
-    private PlotBlock[] splitBlockList(@NonNull final List<String> list) {
-        final PlotBlock[] entries = new PlotBlock[list.size()];
-        for (int i = 0; i < list.size(); i++) {
-            entries[i] = WorldUtil.IMP.getClosestBlock(list.get(i)).best;
-        }
-        return entries;
-    }
-
-    private void convertBlock(@NonNull final ConfigurationSection section,
-        @NonNull final String key, @NonNull final String block) {
-        final BlockBucket bucket = this.blockToBucket(block);
-        this.setString(section, key, bucket);
-        PlotSquared.log(C.LEGACY_CONFIG_REPLACED.f(block, bucket.toString()));
-    }
-
-    private void convertBlockList(@NonNull final ConfigurationSection section,
-        @NonNull final String key, @NonNull final List<String> blockList) {
-        final PlotBlock[] blocks = this.splitBlockList(blockList);
-        final BlockBucket bucket = this.blockListToBucket(blocks);
-        this.setString(section, key, bucket);
-        PlotSquared
-            .log(C.LEGACY_CONFIG_REPLACED.f(plotBlockArrayString(blocks), bucket.toString()));
-    }
-
-    private String plotBlockArrayString(@NonNull final PlotBlock[] blocks) {
-        final StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < blocks.length; i++) {
-            builder.append(blocks[i].toString());
-            if ((i + 1) < blocks.length) {
-                builder.append(",");
-            }
-        }
-        return builder.toString();
-    }
-
-    public void convert() {
-        // Section is the "worlds" section
-        final Collection<String> worlds = this.configuration.getKeys(false);
-        for (final String world : worlds) {
-            final ConfigurationSection worldSection = configuration.getConfigurationSection(world);
-            for (final Map.Entry<String, ConfigurationType> entry : TYPE_MAP.entrySet()) {
-                if (entry.getValue() == ConfigurationType.BLOCK) {
-                    this.convertBlock(worldSection, entry.getKey(),
-                        worldSection.getString(entry.getKey()));
-                } else {
-                    this.convertBlockList(worldSection, entry.getKey(),
-                        worldSection.getStringList(entry.getKey()));
-                }
-            }
-        }
-    }
-
-    private enum ConfigurationType {
-        BLOCK, BLOCK_LIST
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java
deleted file mode 100644
index d79ad6653..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyMappings.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-
-public abstract class LegacyMappings {
-
-    public abstract PlotBlock fromAny(final String string);
-
-    public abstract PlotBlock fromLegacyToString(final int id, final int data);
-
-    public abstract PlotBlock fromLegacyToString(final String id);
-
-    public abstract PlotBlock fromStringToLegacy(final String id);
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
deleted file mode 100644
index 5dcc954a8..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ /dev/null
@@ -1,867 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.DoubleFlag;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.stream.AbstractDelegateOutputStream;
-import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Paths;
-import java.text.DecimalFormat;
-import java.util.*;
-import java.util.Map.Entry;
-
-/**
- * plot functions
- */
-public class MainUtil {
-
-    /**
-     * If the NMS code for sending chunk updates is functional<br>
-     * - E.g. If using an older version of Bukkit, or before the plugin is updated to 1.5<br>
-     * - Slower fallback code will be used if not.<br>
-     */
-    public static boolean canSendChunk = false;
-    /**
-     * Cache of mapping x,y,z coordinates to the chunk array<br>
-     * - Used for efficent world generation<br>
-     */
-    public static short[][] x_loc;
-    public static short[][] y_loc;
-    public static short[][] z_loc;
-    public static short[][][] CACHE_I = null;
-    public static short[][][] CACHE_J = null;
-
-    /**
-     * This cache is used for world generation and just saves a bit of calculation time when checking if something is in the plot area.
-     */
-    public static void initCache() {
-        if (x_loc == null) {
-            x_loc = new short[16][4096];
-            y_loc = new short[16][4096];
-            z_loc = new short[16][4096];
-            for (int i = 0; i < 16; i++) {
-                int i4 = i << 4;
-                for (int j = 0; j < 4096; j++) {
-                    int y = i4 + (j >> 8);
-                    int a = j - ((y & 0xF) << 8);
-                    int z1 = a >> 4;
-                    int x1 = a - (z1 << 4);
-                    x_loc[i][j] = (short) x1;
-                    y_loc[i][j] = (short) y;
-                    z_loc[i][j] = (short) z1;
-                }
-            }
-        }
-        if (CACHE_I == null) {
-            CACHE_I = new short[256][16][16];
-            CACHE_J = new short[256][16][16];
-            for (int x = 0; x < 16; x++) {
-                for (int z = 0; z < 16; z++) {
-                    for (int y = 0; y < 256; y++) {
-                        short i = (short) (y >> 4);
-                        short j = (short) ((y & 0xF) << 8 | z << 4 | x);
-                        CACHE_I[y][x][z] = i;
-                        CACHE_J[y][x][z] = j;
-                    }
-                }
-            }
-        }
-    }
-
-    public static void sendAdmin(final String s) {
-        for (final PlotPlayer player : UUIDHandler.getPlayers().values()) {
-            if (player.hasPermission(C.PERMISSION_ADMIN.s())) {
-                player.sendMessage(C.color(s));
-            }
-        }
-        PlotSquared.debug(s);
-    }
-
-    public static void upload(UUID uuid, String file, String extension,
-        final RunnableVal<OutputStream> writeTask, final RunnableVal<URL> whenDone) {
-        if (writeTask == null) {
-            PlotSquared.debug("&cWrite task cannot be null");
-            TaskManager.runTask(whenDone);
-            return;
-        }
-        final String filename;
-        final String website;
-        if (uuid == null) {
-            uuid = UUID.randomUUID();
-            website = Settings.Web.URL + "upload.php?" + uuid;
-            filename = "plot." + extension;
-        } else {
-            website = Settings.Web.URL + "save.php?" + uuid;
-            filename = file + '.' + extension;
-        }
-        final URL url;
-        try {
-            url = new URL(Settings.Web.URL + "?key=" + uuid + "&type=" + extension);
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-            whenDone.run();
-            return;
-        }
-        TaskManager.runTaskAsync(() -> {
-            try {
-                String boundary = Long.toHexString(System.currentTimeMillis());
-                URLConnection con = new URL(website).openConnection();
-                con.setDoOutput(true);
-                con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
-                try (OutputStream output = con.getOutputStream();
-                    PrintWriter writer = new PrintWriter(
-                        new OutputStreamWriter(output, StandardCharsets.UTF_8), true)) {
-                    String CRLF = "\r\n";
-                    writer.append("--" + boundary).append(CRLF);
-                    writer.append("Content-Disposition: form-data; name=\"param\"").append(CRLF);
-                    writer.append(
-                        "Content-Type: text/plain; charset=" + StandardCharsets.UTF_8.displayName())
-                        .append(CRLF);
-                    String param = "value";
-                    writer.append(CRLF).append(param).append(CRLF).flush();
-                    writer.append("--" + boundary).append(CRLF);
-                    writer.append(
-                        "Content-Disposition: form-data; name=\"schematicFile\"; filename=\""
-                            + filename + '"').append(CRLF);
-                    writer
-                        .append("Content-Type: " + URLConnection.guessContentTypeFromName(filename))
-                        .append(CRLF);
-                    writer.append("Content-Transfer-Encoding: binary").append(CRLF);
-                    writer.append(CRLF).flush();
-                    writeTask.value = new AbstractDelegateOutputStream(output) {
-                        @Override public void close() {
-                        } // Don't close
-                    };
-                    writeTask.run();
-                    output.flush();
-                    writer.append(CRLF).flush();
-                    writer.append("--" + boundary + "--").append(CRLF).flush();
-                }
-                try (Reader response = new InputStreamReader(con.getInputStream(),
-                    StandardCharsets.UTF_8)) {
-                    final char[] buffer = new char[256];
-                    final StringBuilder result = new StringBuilder();
-                    while (true) {
-                        final int r = response.read(buffer);
-                        if (r < 0) {
-                            break;
-                        }
-                        result.append(buffer, 0, r);
-                    }
-                    if (!result.toString().startsWith("Success")) {
-                        PlotSquared.debug(result);
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                int responseCode = ((HttpURLConnection) con).getResponseCode();
-                if (responseCode == 200) {
-                    whenDone.value = url;
-                }
-                TaskManager.runTask(whenDone);
-            } catch (IOException e) {
-                e.printStackTrace();
-                TaskManager.runTask(whenDone);
-            }
-        });
-    }
-
-    /**
-     * Resets the biome if it was modified
-     *
-     * @param area
-     * @param pos1
-     * @param pos2
-     * @return true if any changes were made
-     */
-    public static boolean resetBiome(PlotArea area, Location pos1, Location pos2) {
-        String biome = area.PLOT_BIOME;
-        if (!StringMan.isEqual(WorldUtil.IMP
-            .getBiome(area.worldname, (pos1.getX() + pos2.getX()) / 2,
-                (pos1.getZ() + pos2.getZ()) / 2), biome)) {
-            MainUtil.setBiome(area.worldname, pos1.getX(), pos1.getZ(), pos2.getX(), pos2.getZ(),
-                biome);
-            return true;
-        }
-        return false;
-    }
-
-    public static String secToTime(long time) {
-        StringBuilder toreturn = new StringBuilder();
-        if (time >= 33868800) {
-            int years = (int) (time / 33868800);
-            time -= years * 33868800;
-            toreturn.append(years + "y ");
-        }
-        if (time >= 604800) {
-            int weeks = (int) (time / 604800);
-            time -= weeks * 604800;
-            toreturn.append(weeks + "w ");
-        }
-        if (time >= 86400) {
-            int days = (int) (time / 86400);
-            time -= days * 86400;
-            toreturn.append(days + "d ");
-        }
-        if (time >= 3600) {
-            int hours = (int) (time / 3600);
-            time -= hours * 3600;
-            toreturn.append(hours + "h ");
-        }
-        if (time >= 60) {
-            int minutes = (int) (time / 60);
-            time -= minutes * 60;
-            toreturn.append(minutes + "m ");
-        }
-        if (toreturn.equals("") || time > 0) {
-            toreturn.append((time) + "s ");
-        }
-        return toreturn.toString().trim();
-    }
-
-    public static long timeToSec(String string) {
-        if (MathMan.isInteger(string)) {
-            return Long.parseLong(string);
-        }
-        string = string.toLowerCase().trim().toLowerCase();
-        if (string.equalsIgnoreCase("false")) {
-            return 0;
-        }
-        String[] split = string.split(" ");
-        long time = 0;
-        for (String value : split) {
-            int nums = Integer.parseInt(value.replaceAll("[^\\d]", ""));
-            String letters = value.replaceAll("[^a-z]", "");
-            switch (letters) {
-                case "week":
-                case "weeks":
-                case "wks":
-                case "w":
-
-                    time += 604800 * nums;
-                case "days":
-                case "day":
-                case "d":
-                    time += 86400 * nums;
-                case "hour":
-                case "hr":
-                case "hrs":
-                case "hours":
-                case "h":
-                    time += 3600 * nums;
-                case "minutes":
-                case "minute":
-                case "mins":
-                case "min":
-                case "m":
-                    time += 60 * nums;
-                case "seconds":
-                case "second":
-                case "secs":
-                case "sec":
-                case "s":
-                    time += nums;
-            }
-        }
-        return time;
-    }
-
-    /**
-     * Hashcode of a boolean array.<br>
-     * - Used for traversing mega plots quickly.
-     *
-     * @param array
-     * @return hashcode
-     */
-    public static int hash(boolean[] array) {
-        if (array.length == 4) {
-            if (!array[0] && !array[1] && !array[2] && !array[3]) {
-                return 0;
-            }
-            return ((array[0] ? 1 : 0) << 3) + ((array[1] ? 1 : 0) << 2) + ((array[2] ? 1 : 0) << 1)
-                + (array[3] ? 1 : 0);
-        }
-        int n = 0;
-        for (boolean anArray : array) {
-            n = (n << 1) + (anArray ? 1 : 0);
-        }
-        return n;
-    }
-
-    /**
-     * Get a list of plot ids within a selection.
-     *
-     * @param pos1
-     * @param pos2
-     * @return
-     */
-    public static ArrayList<PlotId> getPlotSelectionIds(PlotId pos1, PlotId pos2) {
-        ArrayList<PlotId> myPlots = new ArrayList<>();
-        for (int x = pos1.x; x <= pos2.x; x++) {
-            for (int y = pos1.y; y <= pos2.y; y++) {
-                myPlots.add(new PlotId(x, y));
-            }
-        }
-        return myPlots;
-    }
-
-    /**
-     * Get the name from a UUID.
-     *
-     * @param owner
-     * @return The player's name, None, Everyone or Unknown
-     */
-    public static String getName(UUID owner) {
-        if (owner == null) {
-            return C.NONE.s();
-        }
-        if (owner.equals(DBFunc.EVERYONE)) {
-            return C.EVERYONE.s();
-        }
-        String name = UUIDHandler.getName(owner);
-        if (name == null) {
-            return C.UNKNOWN.s();
-        }
-        return name;
-    }
-
-    /**
-     * Get the corner locations for a list of regions.
-     *
-     * @param world
-     * @param regions
-     * @return
-     * @see Plot#getCorners()
-     */
-    public static Location[] getCorners(String world, Collection<RegionWrapper> regions) {
-        Location min = null;
-        Location max = null;
-        for (RegionWrapper region : regions) {
-            Location[] corners = region.getCorners(world);
-            if (min == null) {
-                min = corners[0];
-                max = corners[1];
-                continue;
-            }
-            Location pos1 = corners[0];
-            Location pos2 = corners[1];
-            if (pos2.getX() > max.getX()) {
-                max.setX(pos2.getX());
-            }
-            if (pos1.getX() < min.getX()) {
-                min.setX(pos1.getX());
-            }
-            if (pos2.getZ() > max.getZ()) {
-                max.setZ(pos2.getZ());
-            }
-            if (pos1.getZ() < min.getZ()) {
-                min.setZ(pos1.getZ());
-            }
-        }
-        return new Location[] {min, max};
-    }
-
-    /**
-     * Fuzzy plot search with spaces separating terms.
-     * - Terms: type, alias, world, owner, trusted, member
-     *
-     * @param search
-     * @return
-     */
-    public static List<Plot> getPlotsBySearch(String search) {
-        String[] split = search.split(" ");
-        int size = split.length * 2;
-
-        List<UUID> uuids = new ArrayList<>();
-        PlotId id = null;
-        PlotArea area = null;
-        String alias = null;
-
-        for (String term : split) {
-            try {
-                UUID uuid = UUIDHandler.getUUID(term, null);
-                if (uuid == null) {
-                    uuid = UUID.fromString(term);
-                }
-                uuids.add(uuid);
-            } catch (Exception ignored) {
-                id = PlotId.fromString(term);
-                if (id != null) {
-                    continue;
-                }
-                area = PlotSquared.get().getPlotAreaByString(term);
-                if (area == null) {
-                    alias = term;
-                }
-            }
-        }
-
-        ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            plotList.add(new ArrayList<>());
-        }
-
-        for (Plot plot : PlotSquared.get().getPlots()) {
-            int count = 0;
-            if (!uuids.isEmpty()) {
-                for (UUID uuid : uuids) {
-                    if (plot.isOwner(uuid)) {
-                        count += 2;
-                    } else if (plot.isAdded(uuid)) {
-                        count++;
-                    }
-                }
-            }
-            if (id != null) {
-                if (plot.getId().equals(id)) {
-                    count++;
-                }
-            }
-            if (plot.getArea().equals(area)) {
-                count++;
-            }
-            if (alias != null && alias.equals(plot.getAlias())) {
-                count += 2;
-            }
-            if (count != 0) {
-                plotList.get(count - 1).add(plot);
-            }
-        }
-
-        List<Plot> plots = new ArrayList<>();
-        for (int i = plotList.size() - 1; i >= 0; i--) {
-            if (!plotList.get(i).isEmpty()) {
-                plots.addAll(plotList.get(i));
-            }
-        }
-        return plots;
-    }
-
-    /**
-     * Get the plot from a string.
-     *
-     * @param player  Provides a context for what world to search in. Prefixing the term with 'world_name;' will override this context.
-     * @param arg     The search term
-     * @param message If a message should be sent to the player if a plot cannot be found
-     * @return The plot if only 1 result is found, or null
-     */
-    public static Plot getPlotFromString(PlotPlayer player, String arg, boolean message) {
-        if (arg == null) {
-            if (player == null) {
-                if (message) {
-                    PlotSquared.log(C.NOT_VALID_PLOT_WORLD);
-                }
-                return null;
-            }
-            return player.getCurrentPlot();
-        }
-        PlotArea area;
-        if (player != null) {
-            area = PlotSquared.get().getPlotAreaByString(arg);
-            if (area == null) {
-                area = player.getApplicablePlotArea();
-            }
-        } else {
-            area = ConsolePlayer.getConsole().getApplicablePlotArea();
-        }
-        String[] split = arg.split(";|,");
-        PlotId id;
-        if (split.length == 4) {
-            area = PlotSquared.get().getPlotAreaByString(split[0] + ';' + split[1]);
-            id = PlotId.fromString(split[2] + ';' + split[3]);
-        } else if (split.length == 3) {
-            area = PlotSquared.get().getPlotAreaByString(split[0]);
-            id = PlotId.fromString(split[1] + ';' + split[2]);
-        } else if (split.length == 2) {
-            id = PlotId.fromString(arg);
-        } else {
-            Collection<Plot> plots;
-            if (area == null) {
-                plots = PlotSquared.get().getPlots();
-            } else {
-                plots = area.getPlots();
-            }
-            for (Plot p : plots) {
-                String name = p.getAlias();
-                if (!name.isEmpty() && StringMan.isEqualIgnoreCase(name, arg)) {
-                    return p;
-                }
-            }
-            if (message) {
-                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            }
-            return null;
-        }
-        if (id == null) {
-            if (message) {
-                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            }
-            return null;
-        }
-        if (area == null) {
-            if (message) {
-                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
-            }
-            return null;
-        }
-        return area.getPlotAbs(id);
-    }
-
-    public static File getFile(File base, String path) {
-        if (Paths.get(path).isAbsolute()) {
-            return new File(path);
-        }
-        return new File(base, path);
-    }
-
-    /**
-     * Synchronously set the biome in a selection.
-     *
-     * @param world
-     * @param p1x
-     * @param p1z
-     * @param p2x
-     * @param p2z
-     * @param biome
-     */
-    public static void setBiome(String world, int p1x, int p1z, int p2x, int p2z, String biome) {
-        RegionWrapper region = new RegionWrapper(p1x, p2x, p1z, p2z);
-        WorldUtil.IMP.setBiomes(world, region, biome);
-    }
-
-    /**
-     * Get the highest block at a location.
-     *
-     * @param world
-     * @param x
-     * @param z
-     * @return
-     */
-    public static int getHeighestBlock(String world, int x, int z) {
-        int result = WorldUtil.IMP.getHighestBlock(world, x, z);
-        if (result == 0) {
-            return 63;
-        }
-        return result;
-    }
-
-    /**
-     * Send a message to the player.
-     *
-     * @param player Player to receive message
-     * @param msg    Message to send
-     * @return true Can be used in things such as commands (return PlayerFunctions.sendMessage(...))
-     */
-    public static boolean sendMessage(PlotPlayer player, String msg) {
-        return sendMessage(player, msg, true);
-    }
-
-    /**
-     * Send a message to console.
-     *
-     * @param caption
-     * @param args
-     */
-    public static void sendConsoleMessage(C caption, String... args) {
-        sendMessage(null, caption, args);
-    }
-
-    /**
-     * Send a message to a player.
-     *
-     * @param player Can be null to represent console, or use ConsolePlayer.getConsole()
-     * @param msg
-     * @param prefix If the message should be prefixed with the configured prefix
-     * @return
-     */
-    public static boolean sendMessage(PlotPlayer player, String msg, boolean prefix) {
-        if (!msg.isEmpty()) {
-            if (player == null) {
-                String message = (prefix ? C.PREFIX.s() : "") + msg;
-                PlotSquared.log(message);
-            } else {
-                player.sendMessage((prefix ? C.PREFIX.s() : "") + C.color(msg));
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send a message to the player.
-     *
-     * @param player  the recipient of the message
-     * @param caption the message to send
-     * @return boolean success
-     */
-    public static boolean sendMessage(PlotPlayer player, C caption, String... args) {
-        return sendMessage(player, caption, (Object[]) args);
-    }
-
-    /**
-     * Send a message to the player
-     *
-     * @param player  the recipient of the message
-     * @param caption the message to send
-     * @return boolean success
-     */
-    public static boolean sendMessage(final PlotPlayer player, final C caption,
-        final Object... args) {
-        if (caption.s().isEmpty()) {
-            return true;
-        }
-        TaskManager.runTaskAsync(() -> {
-            String m = C.format(caption, args);
-            if (player == null) {
-                PlotSquared.log(m);
-            } else {
-                player.sendMessage(m);
-            }
-        });
-        return true;
-    }
-
-    /**
-     * If rating categories are enabled, get the average rating by category.<br>
-     * - The index corresponds to the index of the category in the config
-     *
-     * @param plot
-     * @return
-     */
-    public static double[] getAverageRatings(Plot plot) {
-        HashMap<UUID, Integer> rating;
-        if (plot.getSettings().ratings != null) {
-            rating = plot.getSettings().ratings;
-        } else if (Settings.Enabled_Components.RATING_CACHE) {
-            rating = new HashMap<>();
-        } else {
-            rating = DBFunc.getRatings(plot);
-        }
-        int size = 1;
-        if (!Settings.Ratings.CATEGORIES.isEmpty()) {
-            size = Math.max(1, Settings.Ratings.CATEGORIES.size());
-        }
-        double[] ratings = new double[size];
-        if (rating == null || rating.isEmpty()) {
-            return ratings;
-        }
-        for (Entry<UUID, Integer> entry : rating.entrySet()) {
-            int current = entry.getValue();
-            if (Settings.Ratings.CATEGORIES.isEmpty()) {
-                ratings[0] += current;
-            } else {
-                for (int i = 0; i < Settings.Ratings.CATEGORIES.size(); i++) {
-                    ratings[i] += current % 10 - 1;
-                    current /= 10;
-                }
-            }
-        }
-        for (int i = 0; i < size; i++) {
-            ratings[i] /= rating.size();
-        }
-        return ratings;
-    }
-
-    public static Set<UUID> getUUIDsFromString(String list) {
-        String[] split = list.split(",");
-        HashSet<UUID> result = new HashSet<>();
-        for (String name : split) {
-            if (name.isEmpty()) {
-                // Invalid
-                return Collections.emptySet();
-            }
-            if ("*".equals(name)) {
-                result.add(DBFunc.EVERYONE);
-                continue;
-            }
-            if (name.length() > 16) {
-                try {
-                    result.add(UUID.fromString(name));
-                    continue;
-                } catch (IllegalArgumentException ignored) {
-                    return Collections.emptySet();
-                }
-            }
-            UUID uuid = UUIDHandler.getUUID(name, null);
-            if (uuid == null) {
-                return Collections.emptySet();
-            }
-            result.add(uuid);
-        }
-        return result;
-    }
-
-    /**
-     * Format a string with plot information.
-     *
-     * @param info
-     * @param plot
-     * @param player
-     * @param full
-     * @param whenDone
-     */
-    public static void format(String info, final Plot plot, PlotPlayer player, final boolean full,
-        final RunnableVal<String> whenDone) {
-        int num = plot.getConnectedPlots().size();
-        String alias = !plot.getAlias().isEmpty() ? plot.getAlias() : C.NONE.s();
-        Location bot = plot.getCorners()[0];
-        String biome = WorldUtil.IMP.getBiome(plot.getWorldName(), bot.getX(), bot.getZ());
-        String trusted = getPlayerList(plot.getTrusted());
-        String members = getPlayerList(plot.getMembers());
-        String denied = getPlayerList(plot.getDenied());
-        String seen;
-        if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
-            if (plot.isOnline()) {
-                seen = C.NOW.s();
-            } else {
-                int time = (int) (ExpireManager.IMP.getAge(plot) / 1000);
-                if (time != 0) {
-                    seen = MainUtil.secToTime(time);
-                } else {
-                    seen = C.UNKNOWN.s();
-                }
-            }
-        } else {
-            seen = C.NEVER.s();
-        }
-        Optional<String> descriptionFlag = plot.getFlag(Flags.DESCRIPTION);
-        String description = !descriptionFlag.isPresent() ?
-            C.NONE.s() :
-            Flags.DESCRIPTION.valueToString(descriptionFlag.get());
-
-        StringBuilder flags = new StringBuilder();
-        HashMap<Flag<?>, Object> flagMap =
-            FlagManager.getPlotFlags(plot.getArea(), plot.getSettings(), true);
-        if (flagMap.isEmpty()) {
-            flags.append(C.NONE.s());
-        } else {
-            String prefix = "";
-            for (Entry<Flag<?>, Object> entry : flagMap.entrySet()) {
-                Object value = entry.getValue();
-                if (entry.getKey() instanceof DoubleFlag && !Settings.General.SCIENTIFIC) {
-                    DecimalFormat df = new DecimalFormat("0");
-                    df.setMaximumFractionDigits(340);
-                    value = df.format(value);
-                }
-                flags.append(prefix).append(C.PLOT_FLAG_LIST.f(entry.getKey().getName(), value));
-                prefix = ", ";
-            }
-        }
-        boolean build = plot.isAdded(player.getUUID());
-        String owner = plot.getOwners().isEmpty() ? "unowned" : getPlayerList(plot.getOwners());
-        info = info.replace("%id%", plot.getId().toString());
-        info = info.replace("%alias%", alias);
-        info = info.replace("%num%", String.valueOf(num));
-        info = info.replace("%desc%", description);
-        info = info.replace("%biome%", biome);
-        info = info.replace("%owner%", owner);
-        info = info.replace("%members%", members);
-        info = info.replace("%player%", player.getName());
-        info = info.replace("%trusted%", trusted);
-        info = info.replace("%helpers%", members);
-        info = info.replace("%denied%", denied);
-        info = info.replace("%seen%", seen);
-        info = info.replace("%flags%", flags);
-        info = info.replace("%build%", String.valueOf(build));
-        info = info.replace("%desc%", "No description set.");
-        if (info.contains("%rating%")) {
-            final String newInfo = info;
-            TaskManager.runTaskAsync(() -> {
-                int max = 10;
-                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
-                    max = 8;
-                }
-                String info1;
-                if (full && Settings.Ratings.CATEGORIES != null
-                    && Settings.Ratings.CATEGORIES.size() > 1) {
-                    double[] ratings = MainUtil.getAverageRatings(plot);
-                    String rating = "";
-                    String prefix = "";
-                    for (int i = 0; i < ratings.length; i++) {
-                        rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
-                            .format("%.1f", ratings[i]);
-                        prefix = ",";
-                    }
-                    info1 = newInfo.replaceAll("%rating%", rating);
-                } else {
-                    info1 = newInfo.replaceAll("%rating%",
-                        String.format("%.1f", plot.getAverageRating()) + '/' + max);
-                }
-                whenDone.run(info1);
-            });
-            return;
-        }
-        whenDone.run(info);
-    }
-
-    public static boolean deleteDirectory(File directory) {
-        if (directory.exists()) {
-            File[] files = directory.listFiles();
-            if (null != files) {
-                for (File file : files) {
-                    if (file.isDirectory()) {
-                        deleteDirectory(file);
-                    } else {
-                        PlotSquared.debug("Deleting file: " + file + " | " + file.delete());
-                    }
-                }
-            }
-        }
-        return (directory.delete());
-    }
-
-    /**
-     * Get a list of names given a list of uuids.<br>
-     * - Uses the format {@link C#PLOT_USER_LIST} for the returned string
-     *
-     * @param uuids
-     * @return
-     */
-    public static String getPlayerList(Collection<UUID> uuids) {
-        ArrayList<UUID> l = new ArrayList<>(uuids);
-        if (l.size() < 1) {
-            return C.NONE.s();
-        }
-        List<String> users = new ArrayList<>();
-        for (UUID u : l) {
-            users.add(getName(u));
-        }
-        Collections.sort(users);
-        String c = C.PLOT_USER_LIST.s();
-        StringBuilder list = new StringBuilder();
-        for (int x = 0; x < users.size(); x++) {
-            if (x + 1 == l.size()) {
-                list.append(c.replace("%user%", users.get(x)).replace(",", ""));
-            } else {
-                list.append(c.replace("%user%", users.get(x)));
-            }
-        }
-        return list.toString();
-    }
-
-    public static void getPersistentMeta(UUID uuid, final String key,
-        final RunnableVal<byte[]> result) {
-        PlotPlayer player = UUIDHandler.getPlayer(uuid);
-        if (player != null) {
-            result.run(player.getPersistentMeta(key));
-        } else {
-            DBFunc.getPersistentMeta(uuid, new RunnableVal<Map<String, byte[]>>() {
-                @Override public void run(Map<String, byte[]> value) {
-                    result.run(value.get(key));
-                }
-            });
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
deleted file mode 100644
index 2e65e9305..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
+++ /dev/null
@@ -1,323 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-public class MathMan {
-
-    private static final int ATAN2_BITS = 7;
-    private static final int ATAN2_BITS2 = ATAN2_BITS << 1;
-    private static final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
-    private static final int ATAN2_COUNT = ATAN2_MASK + 1;
-    private static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
-    private static final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
-    private static final float[] atan2 = new float[ATAN2_COUNT];
-    private static final int[] table =
-        {0, 16, 22, 27, 32, 35, 39, 42, 45, 48, 50, 53, 55, 57, 59, 61, 64, 65, 67, 69, 71, 73, 75,
-            76, 78, 80, 81, 83, 84, 86, 87, 89, 90, 91, 93, 94, 96, 97, 98, 99, 101, 102, 103, 104,
-            106, 107, 108, 109, 110, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
-            124, 125, 126, 128, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
-            141, 142, 143, 144, 144, 145, 146, 147, 148, 149, 150, 150, 151, 152, 153, 154, 155,
-            155, 156, 157, 158, 159, 160, 160, 161, 162, 163, 163, 164, 165, 166, 167, 167, 168,
-            169, 170, 170, 171, 172, 173, 173, 174, 175, 176, 176, 177, 178, 178, 179, 180, 181,
-            181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, 190, 191, 192, 192,
-            193, 193, 194, 195, 195, 196, 197, 197, 198, 199, 199, 200, 201, 201, 202, 203, 203,
-            204, 204, 205, 206, 206, 207, 208, 208, 209, 209, 210, 211, 211, 212, 212, 213, 214,
-            214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 221, 221, 222, 222, 223, 224,
-            224, 225, 225, 226, 226, 227, 227, 228, 229, 229, 230, 230, 231, 231, 232, 232, 233,
-            234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239, 240, 240, 241, 241, 242, 242,
-            243, 243, 244, 244, 245, 245, 246, 246, 247, 247, 248, 248, 249, 249, 250, 250, 251,
-            251, 252, 252, 253, 253, 254, 254, 255};
-
-    static {
-        for (int i = 0; i < ATAN2_DIM; i++) {
-            for (int j = 0; j < ATAN2_DIM; j++) {
-                float x0 = (float) i / ATAN2_DIM;
-                float y0 = (float) j / ATAN2_DIM;
-
-                atan2[(j * ATAN2_DIM) + i] = (float) Math.atan2(y0, x0);
-            }
-        }
-    }
-
-    public static long pairInt(int x, int y) {
-        return (((long) x) << 32) | (y & 0xffffffffL);
-    }
-
-    public static int unpairIntX(long pair) {
-        return (int) (pair >> 32);
-    }
-
-    public static int unpairIntY(long pair) {
-        return (int) pair;
-    }
-
-    public static byte pair16(byte x, byte y) {
-        return (byte) (x + (y << 4));
-    }
-
-    public static byte unpair16x(byte value) {
-        return (byte) (value & 0xF);
-    }
-
-    public static byte unpair16y(byte value) {
-        return (byte) ((value >> 4) & 0xF);
-    }
-
-    public static long inverseRound(double val) {
-        long round = Math.round(val);
-        return (long) (round + Math.signum(val - round));
-    }
-
-    public static int sqrt(int x) {
-        int xn;
-
-        if (x >= 0x10000) {
-            if (x >= 0x1000000) {
-                if (x >= 0x10000000) {
-                    if (x >= 0x40000000) {
-                        xn = table[x >> 24] << 8;
-                    } else {
-                        xn = table[x >> 22] << 7;
-                    }
-                } else {
-                    if (x >= 0x4000000) {
-                        xn = table[x >> 20] << 6;
-                    } else {
-                        xn = table[x >> 18] << 5;
-                    }
-                }
-
-                xn = (xn + 1 + (x / xn)) >> 1;
-                xn = (xn + 1 + (x / xn)) >> 1;
-                return ((xn * xn) > x) ? --xn : xn;
-            } else {
-                if (x >= 0x100000) {
-                    if (x >= 0x400000) {
-                        xn = table[x >> 16] << 4;
-                    } else {
-                        xn = table[x >> 14] << 3;
-                    }
-                } else {
-                    if (x >= 0x40000) {
-                        xn = table[x >> 12] << 2;
-                    } else {
-                        xn = table[x >> 10] << 1;
-                    }
-                }
-
-                xn = (xn + 1 + (x / xn)) >> 1;
-
-                return ((xn * xn) > x) ? --xn : xn;
-            }
-        } else {
-            if (x >= 0x100) {
-                if (x >= 0x1000) {
-                    if (x >= 0x4000) {
-                        xn = (table[x >> 8]) + 1;
-                    } else {
-                        xn = (table[x >> 6] >> 1) + 1;
-                    }
-                } else {
-                    if (x >= 0x400) {
-                        xn = (table[x >> 4] >> 2) + 1;
-                    } else {
-                        xn = (table[x >> 2] >> 3) + 1;
-                    }
-                }
-
-                return ((xn * xn) > x) ? --xn : xn;
-            } else {
-                if (x >= 0) {
-                    return table[x] >> 4;
-                }
-            }
-        }
-        throw new IllegalArgumentException("Invalid number:" + x);
-    }
-
-
-    public static double getMean(int[] array) {
-        double count = 0;
-        for (int i : array) {
-            count += i;
-        }
-        return count / array.length;
-    }
-
-    public static double getMean(double[] array) {
-        double count = 0;
-        for (double i : array) {
-            count += i;
-        }
-        return count / array.length;
-    }
-
-    public static int pair(short x, short y) {
-        return (x << 16) | (y & 0xFFFF);
-    }
-
-    public static final int average(int a, int b) {
-        return (a & b) + (a ^ b) / 2;
-    }
-
-    public static short unpairX(int hash) {
-        return (short) (hash >> 16);
-    }
-
-    public static short unpairY(int hash) {
-        return (short) (hash & 0xFFFF);
-    }
-
-    /**
-     * Returns [x, y, z]
-     *
-     * @param yaw
-     * @param pitch
-     * @return
-     */
-    public static float[] getDirection(float yaw, float pitch) {
-        double pitch_sin = Math.sin(pitch);
-        return new float[] {(float) (pitch_sin * Math.cos(yaw)),
-            (float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
-    }
-
-    public static int floorMod(int x, int y) {
-        int i = x % y;
-        if (i < 0)
-            i += y;
-        return i;
-    }
-
-    public static int roundInt(double value) {
-        return (int) (value < 0 ? (value == (int) value) ? value : value - 1 : value);
-    }
-
-    /**
-     * Returns [ pitch, yaw ]
-     *
-     * @param x
-     * @param y
-     * @param z
-     * @return
-     */
-    public static float[] getPitchAndYaw(float x, float y, float z) {
-        float distance = sqrtApprox((z * z) + (x * x));
-        return new float[] {atan2(y, distance), atan2(x, z)};
-    }
-
-    public static final float atan2(float y, float x) {
-        float add;
-        float mul;
-
-        if (x < 0.0f) {
-            if (y < 0.0f) {
-                x = -x;
-                y = -y;
-
-                mul = 1.0f;
-            } else {
-                x = -x;
-                mul = -1.0f;
-            }
-
-            add = -3.141592653f;
-        } else {
-            if (y < 0.0f) {
-                y = -y;
-                mul = -1.0f;
-            } else {
-                mul = 1.0f;
-            }
-
-            add = 0.0f;
-        }
-
-        float invDiv = 1.0f / (((x < y) ? y : x) * INV_ATAN2_DIM_MINUS_1);
-
-        int xi = (int) (x * invDiv);
-        int yi = (int) (y * invDiv);
-
-        return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
-    }
-
-    public static float sqrtApprox(float f) {
-        return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
-    }
-
-    public static double sqrtApprox(double d) {
-        return Double
-            .longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
-    }
-
-    public static float invSqrt(float x) {
-        float xhalf = 0.5f * x;
-        int i = Float.floatToIntBits(x);
-        i = 0x5f3759df - (i >> 1);
-        x = Float.intBitsToFloat(i);
-        x = x * (1.5f - (xhalf * x * x));
-        return x;
-    }
-
-    public static int getPositiveId(int i) {
-        if (i < 0) {
-            return (-i * 2) - 1;
-        }
-        return i * 2;
-    }
-
-    public static boolean isInteger(String str) {
-        if (str == null) {
-            return false;
-        }
-        int length = str.length();
-        if (length == 0) {
-            return false;
-        }
-        int i = 0;
-        if (str.charAt(0) == '-') {
-            if (length == 1) {
-                return false;
-            }
-            i = 1;
-        }
-        for (; i < length; i++) {
-            char c = str.charAt(i);
-            if ((c <= '/') || (c >= ':')) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static double getSD(double[] array, double av) {
-        double sd = 0;
-        for (double element : array) {
-            sd += Math.pow(Math.abs(element - av), 2);
-        }
-        return Math.sqrt(sd / array.length);
-    }
-
-    public static double getSD(int[] array, double av) {
-        double sd = 0;
-        for (int element : array) {
-            sd += Math.pow(Math.abs(element - av), 2);
-        }
-        return Math.sqrt(sd / array.length);
-    }
-
-    public static int mod(int x, int y) {
-        if (isPowerOfTwo(y)) {
-            return x & (y - 1);
-        }
-        return x % y;
-    }
-
-    public static int unsignedmod(int x, int y) {
-        if (isPowerOfTwo(y)) {
-            return x & (y - 1);
-        }
-        return x % y;
-    }
-
-    public static boolean isPowerOfTwo(int number) {
-        return (number & (number - 1)) == 0;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
deleted file mode 100644
index bcd71b186..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.commands.CommandCaller;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-import java.util.HashMap;
-
-/**
- * The Permissions class handles checking user permissions.<br>
- * - This will respect * nodes and plots.admin and can be used to check permission ranges (e.g. plots.plot.5)<br>
- * - Checking the PlotPlayer class directly will not take the above into account<br>
- */
-public class Permissions {
-
-    public static boolean hasPermission(PlotPlayer player, C caption, boolean notify) {
-        return hasPermission(player, caption.s(), notify);
-    }
-
-    /**
-     * Check if a player has a permission (C class helps keep track of permissions).
-     *
-     * @param player
-     * @param caption
-     * @return
-     */
-    public static boolean hasPermission(PlotPlayer player, C caption) {
-        return hasPermission(player, caption.s());
-    }
-
-    /**
-     * Check if a {@link PlotPlayer} has a permission.
-     *
-     * @param player
-     * @param permission
-     * @return
-     */
-    public static boolean hasPermission(PlotPlayer player, String permission) {
-        if (!Settings.Enabled_Components.PERMISSION_CACHE) {
-            return hasPermission((CommandCaller) player, permission);
-        }
-        HashMap<String, Boolean> map = player.getMeta("perm");
-        if (map != null) {
-            Boolean result = map.get(permission);
-            if (result != null) {
-                return result;
-            }
-        } else {
-            map = new HashMap<>();
-            player.setMeta("perm", map);
-        }
-        boolean result = hasPermission((CommandCaller) player, permission);
-        map.put(permission, result);
-        return result;
-    }
-
-    /**
-     * Check if a {@code CommandCaller} has a permission.
-     *
-     * @param caller
-     * @param permission
-     * @return
-     */
-    public static boolean hasPermission(CommandCaller caller, String permission) {
-        if (caller.hasPermission(permission)) {
-            return true;
-        } else if (caller.isPermissionSet(permission)) {
-            return false;
-        }
-        if (caller.hasPermission(C.PERMISSION_ADMIN.s())) {
-            return true;
-        }
-        permission = permission.toLowerCase().replaceAll("^[^a-z|0-9|\\.|_|-]", "");
-        String[] nodes = permission.split("\\.");
-        StringBuilder n = new StringBuilder();
-        for (int i = 0; i <= (nodes.length - 1); i++) {
-            n.append(nodes[i] + ".");
-            String combined = n + C.PERMISSION_STAR.s();
-            if (!permission.equals(combined)) {
-                if (caller.hasPermission(combined)) {
-                    return true;
-                } else if (caller.isPermissionSet(combined)) {
-                    return false;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if a PlotPlayer has a permission, and optionally send the no permission message if applicable.
-     *
-     * @param player
-     * @param permission
-     * @param notify
-     * @return
-     */
-    public static boolean hasPermission(PlotPlayer player, String permission, boolean notify) {
-        if (!hasPermission(player, permission)) {
-            if (notify) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, permission);
-            }
-            return false;
-        }
-        return true;
-    }
-
-    public static int hasPermissionRange(PlotPlayer player, C perm, int range) {
-        return hasPermissionRange(player, perm.s(), range);
-    }
-
-    /**
-     * Check the the highest permission a PlotPlayer has within a specified range.<br>
-     * - Excessively high values will lag<br>
-     * - The default range that is checked is {@link Settings.Limit#MAX_PLOTS}<br>
-     *
-     * @param player
-     * @param stub   The permission stub to check e.g. for `plots.plot.#` the stub is `plots.plot`
-     * @param range  The range to check
-     * @return The highest permission they have within that range
-     */
-    public static int hasPermissionRange(PlotPlayer player, String stub, int range) {
-        return player.hasPermissionRange(stub, range);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java
deleted file mode 100644
index b3b1fd5a7..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotGameMode.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-public enum PlotGameMode {
-    NOT_SET(-1, ""), SURVIVAL(0, "survival"), CREATIVE(1, "creative"), ADVENTURE(2,
-        "adventure"), SPECTATOR(3, "spectator");
-
-    private final int id;
-    private final String name;
-
-    PlotGameMode(int id, String name) {
-        this.id = id;
-        this.name = name;
-    }
-
-    /**
-     * The magic-value id of the GameMode.
-     *
-     * @return the GameMode id
-     */
-    public int getId() {
-        return this.id;
-    }
-
-    /**
-     * Get the name of this GameMode
-     *
-     * @return the GameMode name
-     */
-    public String getName() {
-        return this.name;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java
deleted file mode 100644
index 62ea9cc33..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/PlotWeather.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-public enum PlotWeather {
-    RAIN, CLEAR, RESET
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
deleted file mode 100644
index cf6bbee2d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
+++ /dev/null
@@ -1,677 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import java.lang.reflect.*;
-import java.util.*;
-
-/**
- * @author DPOH-VAR
- * @version 1.0
- */
-public class ReflectionUtils {
-
-    /**
-     * prefix of bukkit classes
-     */
-    private static String preClassB = "org.bukkit.craftbukkit";
-    /**
-     * prefix of minecraft classes
-     */
-    private static String preClassM = "net.minecraft.server";
-
-    public ReflectionUtils(String version) {
-        if (version != null) {
-            preClassB += '.' + version;
-            preClassM += '.' + version;
-        }
-    }
-
-    public static <T, V> Map<T, V> getMap(Map<T, V> map) {
-        try {
-            Class<? extends Map> clazz = map.getClass();
-            Field m = clazz.getDeclaredField("m");
-            m.setAccessible(true);
-            return (Map<T, V>) m.get(map);
-        } catch (Throwable e) {
-            e.printStackTrace();
-            return map;
-        }
-    }
-
-    public static Method findMethod(Class<?> clazz, boolean isStatic, Class<?> returnType,
-        Class... types) {
-        loop:
-        for (Method method : clazz.getMethods()) {
-            Class<?> result = method.getReturnType();
-            Class<?>[] param = method.getParameterTypes();
-            int paramCount = param.length;
-            boolean stc = Modifier.isStatic(method.getModifiers());
-            if (stc == isStatic && result == returnType && types.length == paramCount) {
-                for (int i = 0; i < types.length; i++) {
-                    if (types[i] != param[i]) {
-                        continue loop;
-                    }
-                }
-                method.setAccessible(true);
-                return method;
-            }
-        }
-        throw new RuntimeException("no such method");
-    }
-
-    public static Field findField(Class<?> clazz, Class<?> fieldClass) {
-        for (Field field : clazz.getFields()) {
-            if (fieldClass == field.getType() || fieldClass.isAssignableFrom(field.getType())) {
-                field.setAccessible(true);
-                return field;
-            }
-        }
-        return null;
-    }
-
-    public static <T> List<T> getStaticFields(Class clazz) {
-        ArrayList<T> list = new ArrayList<T>();
-        try {
-            Field[] fields = clazz.getFields();
-            for (Field field : fields) {
-                Object value = field.get(null);
-                try {
-                    list.add((T) value);
-                } catch (ClassCastException ignored) {
-                }
-            }
-        } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) {
-            e.printStackTrace();
-        }
-        return list;
-    }
-
-    public static Class<?> getNmsClass(String name) {
-        String className = preClassM + '.' + name;
-        return getClass(className);
-    }
-
-    public static Class<?> getCbClass(String name) {
-        String className = preClassB + '.' + name;
-        return getClass(className);
-    }
-
-    public static Class<?> getUtilClass(String name) {
-        try {
-            return Class.forName(name); //Try before 1.8 first
-        } catch (ClassNotFoundException ignored) {
-        }
-        try {
-            return Class.forName("net.minecraft.util." + name); //Not 1.8
-        } catch (ClassNotFoundException ignored) {
-            return null;
-        }
-    }
-
-    public static Object getHandle(Object wrapper) {
-        Method getHandle = makeMethod(wrapper.getClass(), "getHandle");
-        return callMethod(getHandle, wrapper);
-    }
-
-    //Utils
-    public static Method makeMethod(Class<?> clazz, String methodName, Class<?>... paramaters) {
-        try {
-            return clazz.getDeclaredMethod(methodName, paramaters);
-        } catch (NoSuchMethodException ignored) {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> T callMethod(Method method, Object instance, Object... paramaters) {
-        if (method == null) {
-            throw new RuntimeException("No such method");
-        }
-        method.setAccessible(true);
-        try {
-            return (T) method.invoke(instance, paramaters);
-        } catch (InvocationTargetException ex) {
-            throw new RuntimeException(ex.getCause());
-        } catch (IllegalAccessException | IllegalArgumentException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> Constructor<T> makeConstructor(Class<?> clazz, Class<?>... paramaterTypes) {
-        try {
-            return (Constructor<T>) clazz.getConstructor(paramaterTypes);
-        } catch (NoSuchMethodException ignored) {
-            return null;
-        }
-    }
-
-    public static <T> T callConstructor(Constructor<T> constructor, Object... paramaters) {
-        if (constructor == null) {
-            throw new RuntimeException("No such constructor");
-        }
-        constructor.setAccessible(true);
-        try {
-            return constructor.newInstance(paramaters);
-        } catch (InvocationTargetException ex) {
-            throw new RuntimeException(ex.getCause());
-        } catch (IllegalAccessException | IllegalArgumentException | InstantiationException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public static Field makeField(Class<?> clazz, String name) {
-        try {
-            return clazz.getDeclaredField(name);
-        } catch (NoSuchFieldException ignored) {
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked") public static <T> T getField(Field field, Object instance) {
-        if (field == null) {
-            throw new RuntimeException("No such field");
-        }
-        field.setAccessible(true);
-        try {
-            return (T) field.get(instance);
-        } catch (IllegalAccessException | IllegalArgumentException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public static void setField(Field field, Object instance, Object value) {
-        if (field == null) {
-            throw new RuntimeException("No such field");
-        }
-        field.setAccessible(true);
-        try {
-            field.set(instance, value);
-        } catch (IllegalAccessException | IllegalArgumentException ex) {
-            throw new RuntimeException(ex);
-        }
-    }
-
-    public static Class<?> getClass(String name) {
-        try {
-            return Class.forName(name);
-        } catch (ClassNotFoundException ignored) {
-            return null;
-        }
-    }
-
-    public static <T> Class<? extends T> getClass(String name, Class<T> superClass) {
-        try {
-            return Class.forName(name).asSubclass(superClass);
-        } catch (ClassCastException | ClassNotFoundException ignored) {
-            return null;
-        }
-    }
-
-    /**
-     * Get class for name. Replace {nms} to net.minecraft.server.V*. Replace {cb} to org.bukkit.craftbukkit.V*. Replace
-     * {nm} to net.minecraft
-     *
-     * @param className possible class paths
-     * @return RefClass object
-     * @throws ClassNotFoundException if no class found
-     */
-    public static RefClass getRefClass(String className) throws ClassNotFoundException {
-        className = className.replace("{cb}", preClassB).replace("{nms}", preClassM)
-            .replace("{nm}", "net.minecraft");
-        return getRefClass(Class.forName(className));
-    }
-
-    /**
-     * get RefClass object by real class
-     *
-     * @param clazz class
-     * @return RefClass based on passed class
-     */
-    public static RefClass getRefClass(Class clazz) {
-        return new RefClass(clazz);
-    }
-
-    /**
-     * RefClass - utility to simplify work with reflections.
-     */
-    public static class RefClass {
-
-        private final Class<?> clazz;
-
-        private RefClass(Class<?> clazz) {
-            this.clazz = clazz;
-        }
-
-        /**
-         * get passed class
-         *
-         * @return class
-         */
-        public Class<?> getRealClass() {
-            return this.clazz;
-        }
-
-        /**
-         * see {@link Class#isInstance(Object)}
-         *
-         * @param object the object to check
-         * @return true if object is an instance of this class
-         */
-        public boolean isInstance(Object object) {
-            return this.clazz.isInstance(object);
-        }
-
-        /**
-         * get existing method by name and types
-         *
-         * @param name  name
-         * @param types method parameters. can be Class or RefClass
-         * @return RefMethod object
-         * @throws RuntimeException if method not found
-         */
-        public RefMethod getMethod(String name, Object... types) throws NoSuchMethodException {
-            Class[] classes = new Class[types.length];
-            int i = 0;
-            for (Object e : types) {
-                if (e instanceof Class) {
-                    classes[i++] = (Class) e;
-                } else if (e instanceof RefClass) {
-                    classes[i++] = ((RefClass) e).getRealClass();
-                } else {
-                    classes[i++] = e.getClass();
-                }
-            }
-            try {
-                return new RefMethod(this.clazz.getMethod(name, classes));
-            } catch (NoSuchMethodException ignored) {
-                return new RefMethod(this.clazz.getDeclaredMethod(name, classes));
-            }
-        }
-
-        /**
-         * get existing constructor by types
-         *
-         * @param types parameters. can be Class or RefClass
-         * @return RefMethod object
-         * @throws RuntimeException if constructor not found
-         */
-        public RefConstructor getConstructor(Object... types) throws NoSuchMethodException {
-            Class[] classes = new Class[types.length];
-            int i = 0;
-            for (Object e : types) {
-                if (e instanceof Class) {
-                    classes[i++] = (Class) e;
-                } else if (e instanceof RefClass) {
-                    classes[i++] = ((RefClass) e).getRealClass();
-                } else {
-                    classes[i++] = e.getClass();
-                }
-            }
-            try {
-                return new RefConstructor(this.clazz.getConstructor(classes));
-            } catch (NoSuchMethodException ignored) {
-                return new RefConstructor(this.clazz.getDeclaredConstructor(classes));
-            }
-        }
-
-        /**
-         * find method by type parameters
-         *
-         * @param types parameters. can be Class or RefClass
-         * @return RefMethod object
-         * @throws RuntimeException if method not found
-         */
-        public RefMethod findMethod(Object... types) {
-            Class[] classes = new Class[types.length];
-            int t = 0;
-            for (Object e : types) {
-                if (e instanceof Class) {
-                    classes[t++] = (Class) e;
-                } else if (e instanceof RefClass) {
-                    classes[t++] = ((RefClass) e).getRealClass();
-                } else {
-                    classes[t++] = e.getClass();
-                }
-            }
-            List<Method> methods = new ArrayList<>();
-            Collections.addAll(methods, this.clazz.getMethods());
-            Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            findMethod:
-            for (Method m : methods) {
-                Class<?>[] methodTypes = m.getParameterTypes();
-                if (methodTypes.length != classes.length) {
-                    continue;
-                }
-                for (Class aClass : classes) {
-                    if (!Arrays.equals(classes, methodTypes)) {
-                        continue findMethod;
-                    }
-                    return new RefMethod(m);
-                }
-            }
-            throw new RuntimeException("no such method");
-        }
-
-        /**
-         * find method by name
-         *
-         * @param names possible names of method
-         * @return RefMethod object
-         * @throws RuntimeException if method not found
-         */
-        public RefMethod findMethodByName(String... names) {
-            List<Method> methods = new ArrayList<>();
-            Collections.addAll(methods, this.clazz.getMethods());
-            Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            for (Method m : methods) {
-                for (String name : names) {
-                    if (m.getName().equals(name)) {
-                        return new RefMethod(m);
-                    }
-                }
-            }
-            throw new RuntimeException("no such method");
-        }
-
-        /**
-         * find method by return value
-         *
-         * @param type type of returned value
-         * @return RefMethod
-         * @throws RuntimeException if method not found
-         */
-        public RefMethod findMethodByReturnType(RefClass type) {
-            return findMethodByReturnType(type.clazz);
-        }
-
-        /**
-         * find method by return value
-         *
-         * @param type type of returned value
-         * @return RefMethod
-         * @throws RuntimeException if method not found
-         */
-        public RefMethod findMethodByReturnType(Class type) {
-            if (type == null) {
-                type = void.class;
-            }
-            List<Method> methods = new ArrayList<>();
-            Collections.addAll(methods, this.clazz.getMethods());
-            Collections.addAll(methods, this.clazz.getDeclaredMethods());
-            for (Method m : methods) {
-                if (type.equals(m.getReturnType())) {
-                    return new RefMethod(m);
-                }
-            }
-            throw new RuntimeException("no such method");
-        }
-
-        /**
-         * find constructor by number of arguments
-         *
-         * @param number number of arguments
-         * @return RefConstructor
-         * @throws RuntimeException if constructor not found
-         */
-        public RefConstructor findConstructor(int number) {
-            List<Constructor> constructors = new ArrayList<>();
-            Collections.addAll(constructors, this.clazz.getConstructors());
-            Collections.addAll(constructors, this.clazz.getDeclaredConstructors());
-            for (Constructor m : constructors) {
-                if (m.getParameterTypes().length == number) {
-                    return new RefConstructor(m);
-                }
-            }
-            throw new RuntimeException("no such constructor");
-        }
-
-        /**
-         * get field by name
-         *
-         * @param name field name
-         * @return RefField
-         * @throws RuntimeException if field not found
-         */
-        public RefField getField(String name) throws NoSuchFieldException {
-            try {
-                return new RefField(this.clazz.getField(name));
-            } catch (NoSuchFieldException ignored) {
-                return new RefField(this.clazz.getDeclaredField(name));
-            }
-        }
-
-        /**
-         * find field by type
-         *
-         * @param type field type
-         * @return RefField
-         * @throws RuntimeException if field not found
-         */
-        public RefField findField(RefClass type) {
-            return findField(type.clazz);
-        }
-
-        /**
-         * find field by type
-         *
-         * @param type field type
-         * @return RefField
-         * @throws RuntimeException if field not found
-         */
-        public RefField findField(Class type) {
-            if (type == null) {
-                type = void.class;
-            }
-            List<Field> fields = new ArrayList<>();
-            Collections.addAll(fields, this.clazz.getFields());
-            Collections.addAll(fields, this.clazz.getDeclaredFields());
-            for (Field f : fields) {
-                if (type.equals(f.getType())) {
-                    return new RefField(f);
-                }
-            }
-            throw new RuntimeException("no such field");
-        }
-    }
-
-
-    /**
-     * Method wrapper
-     */
-    public static class RefMethod {
-
-        private final Method method;
-
-        private RefMethod(Method method) {
-            this.method = method;
-            method.setAccessible(true);
-        }
-
-        /**
-         * @return passed method
-         */
-        public Method getRealMethod() {
-            return this.method;
-        }
-
-        /**
-         * @return owner class of method
-         */
-        public RefClass getRefClass() {
-            return new RefClass(this.method.getDeclaringClass());
-        }
-
-        /**
-         * @return class of method return type
-         */
-        public RefClass getReturnRefClass() {
-            return new RefClass(this.method.getReturnType());
-        }
-
-        /**
-         * apply method to object
-         *
-         * @param e object to which the method is applied
-         * @return RefExecutor with method call(...)
-         */
-        public RefExecutor of(Object e) {
-            return new RefExecutor(e);
-        }
-
-        /**
-         * call static method
-         *
-         * @param params sent parameters
-         * @return return value
-         */
-        public Object call(Object... params) {
-            try {
-                return this.method.invoke(null, params);
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        public class RefExecutor {
-
-            final Object e;
-
-            public RefExecutor(Object e) {
-                this.e = e;
-            }
-
-            /**
-             * apply method for selected object
-             *
-             * @param params sent parameters
-             * @return return value
-             * @throws RuntimeException if something went wrong
-             */
-            public Object call(Object... params) {
-                try {
-                    return RefMethod.this.method.invoke(this.e, params);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Constructor wrapper
-     */
-    public static class RefConstructor {
-
-        private final Constructor constructor;
-
-        private RefConstructor(Constructor constructor) {
-            this.constructor = constructor;
-            constructor.setAccessible(true);
-        }
-
-        /**
-         * @return passed constructor
-         */
-        public Constructor getRealConstructor() {
-            return this.constructor;
-        }
-
-        /**
-         * @return owner class of method
-         */
-        public RefClass getRefClass() {
-            return new RefClass(this.constructor.getDeclaringClass());
-        }
-
-        /**
-         * create new instance with constructor
-         *
-         * @param params parameters for constructor
-         * @return new object
-         * @throws ReflectiveOperationException
-         * @throws IllegalArgumentException
-         */
-        public Object create(Object... params)
-            throws ReflectiveOperationException, IllegalArgumentException {
-            return this.constructor.newInstance(params);
-        }
-    }
-
-
-    public static class RefField {
-
-        private final Field field;
-
-        private RefField(Field field) {
-            this.field = field;
-            field.setAccessible(true);
-        }
-
-        /**
-         * @return passed field
-         */
-        public Field getRealField() {
-            return this.field;
-        }
-
-        /**
-         * @return owner class of field
-         */
-        public RefClass getRefClass() {
-            return new RefClass(this.field.getDeclaringClass());
-        }
-
-        /**
-         * @return type of field
-         */
-        public RefClass getFieldRefClass() {
-            return new RefClass(this.field.getType());
-        }
-
-        /**
-         * apply fiend for object
-         *
-         * @param e applied object
-         * @return RefExecutor with getter and setter
-         */
-        public RefExecutor of(Object e) {
-            return new RefExecutor(e);
-        }
-
-        public class RefExecutor {
-
-            final Object e;
-
-            public RefExecutor(Object e) {
-                this.e = e;
-            }
-
-            /**
-             * set field value for applied object
-             *
-             * @param param value
-             */
-            public void set(Object param) {
-                try {
-                    RefField.this.field.set(this.e, param);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-            /**
-             * get field value for applied object
-             *
-             * @return value of field
-             */
-            public Object get() {
-                try {
-                    return RefField.this.field.get(this.e);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-                }
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java
deleted file mode 100644
index b9fc6ff09..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/RegExUtil.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-public class RegExUtil {
-
-    public static Map<String, Pattern> compiledPatterns;
-
-    static {
-        compiledPatterns = new HashMap<>();
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
deleted file mode 100644
index 05eeee166..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.json.JSONArray;
-import com.github.intellectualsites.plotsquared.json.JSONException;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.generator.ClassicPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.sk89q.jnbt.*;
-import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.io.*;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-import java.io.*;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.channels.Channels;
-import java.nio.channels.ReadableByteChannel;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-public abstract class SchematicHandler {
-    public static SchematicHandler manager;
-
-    private boolean exportAll = false;
-
-    public boolean exportAll(Collection<Plot> collection, final File outputDir,
-        final String namingScheme, final Runnable ifSuccess) {
-        if (this.exportAll) {
-            return false;
-        }
-        if (collection.isEmpty()) {
-            return false;
-        }
-        this.exportAll = true;
-        final ArrayList<Plot> plots = new ArrayList<>(collection);
-        TaskManager.runTask(new Runnable() {
-            @Override public void run() {
-                if (plots.isEmpty()) {
-                    SchematicHandler.this.exportAll = false;
-                    TaskManager.runTask(ifSuccess);
-                    return;
-                }
-                Iterator<Plot> i = plots.iterator();
-                final Plot plot = i.next();
-                i.remove();
-                String o = UUIDHandler.getName(plot.guessOwner());
-                if (o == null) {
-                    o = "unknown";
-                }
-                final String name;
-                if (namingScheme == null) {
-                    name = plot.getId().x + ";" + plot.getId().y + ',' + plot.getArea() + ',' + o;
-                } else {
-                    name = namingScheme.replaceAll("%owner%", o)
-                        .replaceAll("%id%", plot.getId().toString())
-                        .replaceAll("%idx%", plot.getId().x + "")
-                        .replaceAll("%idy%", plot.getId().y + "")
-                        .replaceAll("%world%", plot.getArea().toString());
-                }
-                final String directory;
-                if (outputDir == null) {
-                    directory = Settings.Paths.SCHEMATICS;
-                } else {
-                    directory = outputDir.getAbsolutePath();
-                }
-                final Runnable THIS = this;
-                SchematicHandler.manager.getCompoundTag(plot, new RunnableVal<CompoundTag>() {
-                    @Override public void run(final CompoundTag value) {
-                        if (value == null) {
-                            MainUtil.sendMessage(null, "&7 - Skipped plot &c" + plot.getId());
-                        } else {
-                            TaskManager.runTaskAsync(() -> {
-                                MainUtil.sendMessage(null, "&6ID: " + plot.getId());
-                                boolean result = SchematicHandler.manager
-                                    .save(value, directory + File.separator + name + ".schematic");
-                                if (!result) {
-                                    MainUtil
-                                        .sendMessage(null, "&7 - Failed to save &c" + plot.getId());
-                                } else {
-                                    MainUtil.sendMessage(null, "&7 - &a  success: " + plot.getId());
-                                }
-                                TaskManager.runTask(THIS);
-                            });
-                        }
-                    }
-                });
-            }
-        });
-        return true;
-    }
-
-    /**
-     * Paste a schematic.
-     *
-     * @param schematic the schematic object to paste
-     * @param plot      plot to paste in
-     * @param xOffset   offset x to paste it from plot origin
-     * @param zOffset   offset z to paste it from plot origin
-     * @return boolean true if succeeded
-     */
-    public void paste(final Schematic schematic, final Plot plot, final int xOffset,
-        final int yOffset, final int zOffset, final boolean autoHeight,
-        final RunnableVal<Boolean> whenDone) {
-
-        TaskManager.runTask(() -> {
-            if (whenDone != null) {
-                whenDone.value = false;
-            }
-            if (schematic == null) {
-                PlotSquared.debug("Schematic == null :|");
-                TaskManager.runTask(whenDone);
-                return;
-            }
-            try {
-                // Set flags
-                if (plot.hasOwner()) {
-                    Map<String, Tag> flags = schematic.getFlags();
-                    if (!flags.isEmpty()) {
-                        for (Map.Entry<String, Tag> entry : flags.entrySet()) {
-                            plot.setFlag(Flags.getFlag(entry.getKey()),
-                                StringTag.class.cast(entry.getValue()).getValue());
-                        }
-
-                    }
-                }
-                final LocalBlockQueue queue = plot.getArea().getQueue(false);
-                BlockVector3 dimension = schematic.getClipboard().getDimensions();
-                final int WIDTH = dimension.getX();
-                final int LENGTH = dimension.getZ();
-                final int HEIGHT = dimension.getY();
-                // Validate dimensions
-                RegionWrapper region = plot.getLargestRegion();
-                if (((region.maxX - region.minX + xOffset + 1) < WIDTH) || (
-                    (region.maxZ - region.minZ + zOffset + 1) < LENGTH) || (HEIGHT > 256)) {
-                    PlotSquared.debug("Schematic is too large");
-                    PlotSquared.debug(
-                        "(" + WIDTH + ',' + LENGTH + ',' + HEIGHT + ") is bigger than (" + (
-                            region.maxX - region.minX) + ',' + (region.maxZ - region.minZ)
-                            + ",256)");
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                // block type and data arrays
-                final BlockArrayClipboard blockArrayClipboard = schematic.getClipboard();
-                // Calculate the optimal height to paste the schematic at
-                final int y_offset_actual;
-                if (autoHeight) {
-                    if (HEIGHT >= 256) {
-                        y_offset_actual = yOffset;
-                    } else {
-                        PlotArea pw = plot.getArea();
-                        if (pw instanceof ClassicPlotWorld) {
-                            y_offset_actual = yOffset + ((ClassicPlotWorld) pw).PLOT_HEIGHT;
-                        } else {
-                            y_offset_actual = yOffset + 1 + MainUtil
-                                .getHeighestBlock(plot.getWorldName(), region.minX + 1,
-                                    region.minZ + 1);
-                        }
-                    }
-                } else {
-                    y_offset_actual = yOffset;
-                }
-                Location pos1 =
-                    new Location(plot.getWorldName(), region.minX + xOffset, y_offset_actual,
-                        region.minZ + zOffset);
-                Location pos2 = pos1.clone().add(WIDTH - 1, HEIGHT - 1, LENGTH - 1);
-                final int p1x = pos1.getX();
-                final int p1z = pos1.getZ();
-                final int p2x = pos2.getX();
-                final int p2z = pos2.getZ();
-                final int bcx = p1x >> 4;
-                final int bcz = p1z >> 4;
-                final int tcx = p2x >> 4;
-                final int tcz = p2z >> 4;
-
-                ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
-                    @Override public void run(int[] value) {
-                        ChunkLoc chunk = new ChunkLoc(value[0], value[1]);
-                        int x = chunk.x;
-                        int z = chunk.z;
-                        int xxb = x << 4;
-                        int zzb = z << 4;
-                        int xxt = xxb + 15;
-                        int zzt = zzb + 15;
-                        if (x == bcx) {
-                            xxb = p1x;
-                        }
-                        if (x == tcx) {
-                            xxt = p2x;
-                        }
-                        if (z == bcz) {
-                            zzb = p1z;
-                        }
-                        if (z == tcz) {
-                            zzt = p2z;
-                        }
-                        // Paste schematic here
-
-                        for (int ry = 0; ry < Math.min(256, HEIGHT); ry++) {
-                            int yy = y_offset_actual + ry;
-                            if (yy > 255) {
-                                continue;
-                            }
-                            for (int rz = zzb - p1z; rz <= (zzt - p1z); rz++) {
-                                for (int rx = xxb - p1x; rx <= (xxt - p1x); rx++) {
-                                    int xx = p1x + xOffset + rx;
-                                    int zz = p1z + zOffset + rz;
-                                    BaseBlock id = blockArrayClipboard
-                                        .getFullBlock(BlockVector3.at(rx, ry, rz));
-                                    queue.setBlock(xx, yy, zz, id);
-                                }
-                            }
-                        }
-                        queue.enqueue();
-                    }
-                }, () -> {
-                    if (whenDone != null) {
-                        whenDone.value = true;
-                        whenDone.run();
-                    }
-                }, 10);
-            } catch (Exception e) {
-                e.printStackTrace();
-                TaskManager.runTask(whenDone);
-            }
-        });
-    }
-
-    public abstract boolean restoreTile(LocalBlockQueue queue, CompoundTag tag, int x, int y,
-        int z);
-
-    /**
-     * Get a schematic
-     *
-     * @param name to check
-     * @return schematic if found, else null
-     */
-    public Schematic getSchematic(String name) throws UnsupportedFormatException {
-        File parent =
-            MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
-        if (!parent.exists()) {
-            if (!parent.mkdir()) {
-                throw new RuntimeException("Could not create schematic parent directory");
-            }
-        }
-        File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            Settings.Paths.SCHEMATICS + File.separator + name + (name.endsWith(".schem") ?
-                "" :
-                ".schematic"));
-        return getSchematic(file);
-    }
-
-    /**
-     * Get an immutable collection containing all schematic names
-     *
-     * @return Immutable collection with schematic names
-     */
-    public Collection<String> getShematicNames() {
-        final File parent =
-            MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
-        final List<String> names = new ArrayList<>();
-        if (parent.exists()) {
-            final String[] rawNames = parent.list((dir, name) -> name.endsWith(".schematic"));
-            if (rawNames != null) {
-                final List<String> transformed = Arrays.stream(rawNames)
-                    .map(rawName -> rawName.substring(0, rawName.length() - 10))
-                    .collect(Collectors.toList());
-                names.addAll(transformed);
-            }
-        }
-        return Collections.unmodifiableList(names);
-    }
-
-    /**
-     * Get a schematic
-     *
-     * @param file to check
-     * @return schematic if found, else null
-     */
-    public Schematic getSchematic(File file) throws UnsupportedFormatException {
-        if (!file.exists()) {
-            return null;
-        }
-        try {
-            ClipboardFormat format = ClipboardFormats.findByFile(file);
-            if (format != null) {
-                ClipboardReader reader = format.getReader(new FileInputStream(file));
-                BlockArrayClipboard clip = (BlockArrayClipboard) reader.read();
-                return new Schematic(clip);
-            } else {
-                throw new UnsupportedFormatException(
-                    "This schematic format is not recognised or supported.");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public Schematic getSchematic(URL url) {
-        try {
-            ReadableByteChannel rbc = Channels.newChannel(url.openStream());
-            InputStream is = Channels.newInputStream(rbc);
-            return getSchematic(is);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    public Schematic getSchematic(InputStream is) {
-        if (is == null) {
-            return null;
-        }
-        try {
-            SpongeSchematicReader ssr =
-                new SpongeSchematicReader(new NBTInputStream(new GZIPInputStream(is)));
-            BlockArrayClipboard clip = (BlockArrayClipboard) ssr.read();
-            return new Schematic(clip);
-        } catch (IOException ignored) {
-            try {
-                MCEditSchematicReader msr =
-                    new MCEditSchematicReader(new NBTInputStream(new GZIPInputStream(is)));
-                BlockArrayClipboard clip = (BlockArrayClipboard) msr.read();
-                return new Schematic(clip);
-            } catch (IOException e) {
-                e.printStackTrace();
-                PlotSquared.debug(is.toString() + " | " + is.getClass().getCanonicalName()
-                    + " is not in GZIP format : " + e.getMessage());
-            }
-        }
-        return null;
-    }
-
-    public List<String> getSaves(UUID uuid) {
-        StringBuilder rawJSON = new StringBuilder();
-        try {
-            String website = Settings.Web.URL + "list.php?" + uuid.toString();
-            URL url = new URL(website);
-            URLConnection connection = new URL(url.toString()).openConnection();
-            connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-            BufferedReader reader =
-                new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                rawJSON.append(line);
-            }
-            reader.close();
-            JSONArray array = new JSONArray(rawJSON.toString());
-            List<String> schematics = new ArrayList<>();
-            for (int i = 0; i < array.length(); i++) {
-                String schematic = array.getString(i);
-                schematics.add(schematic);
-            }
-            return schematics;
-        } catch (JSONException | IOException e) {
-            e.printStackTrace();
-            PlotSquared.debug("ERROR PARSING: " + rawJSON);
-        }
-        return null;
-    }
-
-    public void upload(final CompoundTag tag, UUID uuid, String file, RunnableVal<URL> whenDone) {
-        if (tag == null) {
-            PlotSquared.debug("&cCannot save empty tag");
-            TaskManager.runTask(whenDone);
-            return;
-        }
-        MainUtil.upload(uuid, file, "schematic", new RunnableVal<OutputStream>() {
-            @Override public void run(OutputStream output) {
-                try (NBTOutputStream nos = new NBTOutputStream(
-                    new GZIPOutputStream(output, true))) {
-                    nos.writeNamedTag("Schematic", tag);
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                }
-            }
-        }, whenDone);
-    }
-
-    /**
-     * Saves a schematic to a file path.
-     *
-     * @param tag  to save
-     * @param path to save in
-     * @return true if succeeded
-     */
-    public boolean save(CompoundTag tag, String path) {
-        if (tag == null) {
-            PlotSquared.debug("&cCannot save empty tag");
-            return false;
-        }
-        try {
-            File tmp = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), path);
-            tmp.getParentFile().mkdirs();
-            try (NBTOutputStream nbtStream = new NBTOutputStream(
-                new GZIPOutputStream(new FileOutputStream(tmp)))) {
-                nbtStream.writeNamedTag("Schematic", tag);
-            }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-            return false;
-        }
-        return true;
-    }
-
-    public abstract void getCompoundTag(String world, Set<RegionWrapper> regions,
-        RunnableVal<CompoundTag> whenDone);
-
-    public void getCompoundTag(final Plot plot, final RunnableVal<CompoundTag> whenDone) {
-        getCompoundTag(plot.getWorldName(), plot.getRegions(), new RunnableVal<CompoundTag>() {
-            @Override public void run(CompoundTag value) {
-                if (!plot.getFlags().isEmpty()) {
-                    HashMap<String, Tag> flagMap = new HashMap<>();
-                    for (Map.Entry<Flag<?>, Object> entry : plot.getFlags().entrySet()) {
-                        String key = entry.getKey().getName();
-                        flagMap.put(key,
-                            new StringTag(entry.getKey().valueToString(entry.getValue())));
-                    }
-                    CompoundTag tag = new CompoundTag(flagMap);
-                    HashMap<String, Tag> map = new HashMap<>(value.getValue());
-                    map.put("Flags", tag);
-                    value.setValue(map);
-                }
-                whenDone.run(value);
-            }
-        });
-    }
-
-
-    public class UnsupportedFormatException extends Exception {
-        /**
-         * Throw with a message.
-         *
-         * @param message the message
-         */
-        public UnsupportedFormatException(String message) {
-            super(message);
-        }
-
-        /**
-         * Throw with a message and a cause.
-         *
-         * @param message the message
-         * @param cause   the cause
-         */
-        public UnsupportedFormatException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java
deleted file mode 100644
index b77d991fe..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SetupUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
-
-import java.util.HashMap;
-
-public abstract class SetupUtils {
-
-    public static SetupUtils manager;
-
-    public static HashMap<String, GeneratorWrapper<?>> generators = new HashMap<>();
-
-    public abstract void updateGenerators();
-
-    public abstract String getGenerator(final PlotArea plotArea);
-
-    public abstract String setupWorld(final SetupObject object);
-
-    public abstract void unload(String world, boolean save);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java
deleted file mode 100644
index dd6a1f960..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringComparison.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * String comparison library.
- */
-public class StringComparison<T> {
-
-    private T bestMatch;
-    private double match = Integer.MAX_VALUE;
-    private T bestMatchObject;
-
-    /**
-     * Constructor
-     *
-     * @param input   Input Base Value
-     * @param objects Objects to compare
-     */
-    public StringComparison(String input, T[] objects) {
-        init(input, objects);
-    }
-
-    public StringComparison(String input, Collection<T> objects) {
-        init(input, (T[]) objects.toArray());
-    }
-
-    /**
-     * You should call init(...) when you are ready to get a String comparison value.
-     */
-    public StringComparison() {
-    }
-
-    /**
-     * Compare two strings
-     *
-     * @param s1 String Base
-     * @param s2 Object
-     * @return match
-     */
-    public static int compare(String s1, String s2) {
-        int distance = StringMan.getLevenshteinDistance(s1, s2);
-        if (s2.contains(s1)) {
-            distance -= Math.min(s1.length(), s2.length());
-        }
-        if (s2.startsWith(s1)) {
-            distance -= 4;
-        }
-        return distance;
-    }
-
-    /**
-     * Create an ArrayList containing pairs of letters
-     *
-     * @param s string to split
-     * @return ArrayList
-     */
-    public static ArrayList<String> wLetterPair(String s) {
-        ArrayList<String> aPairs = new ArrayList<>();
-        String[] wo = s.split("\\s");
-        for (String aWo : wo) {
-            String[] po = sLetterPair(aWo);
-            Collections.addAll(aPairs, po);
-        }
-        return aPairs;
-    }
-
-    /**
-     * Get an array containing letter pairs
-     *
-     * @param s string to split
-     * @return Array
-     */
-    public static String[] sLetterPair(String s) {
-        int numPair = s.length() - 1;
-        String[] p = new String[numPair];
-        for (int i = 0; i < numPair; i++) {
-            p[i] = s.substring(i, i + 2);
-        }
-        return p;
-    }
-
-    public void init(String input, T[] objects) {
-        int c;
-        this.bestMatch = objects[0];
-        this.bestMatchObject = objects[0];
-        input = input.toLowerCase();
-        for (T o : objects) {
-            if ((c = compare(input, getString(o).toLowerCase())) < this.match) {
-                this.match = c;
-                this.bestMatch = o;
-                this.bestMatchObject = o;
-            }
-        }
-    }
-
-    public String getString(T o) {
-        if (o instanceof StringComparable) {
-            return ((StringComparable) o).getComparableString();
-        }
-        return o.toString();
-    }
-
-    /**
-     * Get the object
-     *
-     * @return match object
-     */
-    public T getMatchObject() {
-        return this.bestMatchObject;
-    }
-
-    /**
-     * Get the best match value
-     *
-     * @return match value
-     */
-    public String getBestMatch() {
-        return getString(this.bestMatch);
-    }
-
-    /**
-     * Will return both the match number, and the actual match string
-     *
-     * @return object[] containing: double, String
-     */
-    public ComparisonResult getBestMatchAdvanced() {
-        return new ComparisonResult(this.match, this.bestMatch);
-    }
-
-    public interface StringComparable {
-        String getComparableString();
-    }
-
-
-    /**
-     * The comparison result
-     */
-    public class ComparisonResult {
-
-        public final T best;
-        public final double match;
-
-        /**
-         * The constructor
-         *
-         * @param match Match value
-         * @param best  Best Match
-         */
-        public ComparisonResult(double match, T best) {
-            this.match = match;
-            this.best = best;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
deleted file mode 100644
index 739c31bec..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import java.lang.reflect.Array;
-import java.util.*;
-import java.util.Map.Entry;
-
-public class StringMan {
-
-    public static String replaceFromMap(String string, Map<String, String> replacements) {
-        StringBuilder sb = new StringBuilder(string);
-        int size = string.length();
-        for (Entry<String, String> entry : replacements.entrySet()) {
-            if (size == 0) {
-                break;
-            }
-            String key = entry.getKey();
-            String value = entry.getValue();
-            int start = sb.indexOf(key, 0);
-            while (start > -1) {
-                int end = start + key.length();
-                int nextSearchStart = start + value.length();
-                sb.replace(start, end, value);
-                size -= end - start;
-                start = sb.indexOf(key, nextSearchStart);
-            }
-        }
-        return sb.toString();
-    }
-
-    public static int intersection(Set<String> options, String[] toCheck) {
-        int count = 0;
-        for (String check : toCheck) {
-            if (options.contains(check)) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    public static String getString(Object obj) {
-        if (obj == null) {
-            return "null";
-        }
-        if (obj instanceof String) {
-            return (String) obj;
-        }
-        if (obj.getClass().isArray()) {
-            StringBuilder result = new StringBuilder();
-            String prefix = "";
-
-            for (int i = 0; i < Array.getLength(obj); i++) {
-                result.append(prefix).append(getString(Array.get(obj, i)));
-                prefix = ",";
-            }
-            return "( " + result + " )";
-        } else if (obj instanceof Collection<?>) {
-            StringBuilder result = new StringBuilder();
-            String prefix = "";
-            for (Object element : (Collection<?>) obj) {
-                result.append(prefix).append(getString(element));
-                prefix = ",";
-            }
-            return "[ " + result + " ]";
-        } else {
-            return obj.toString();
-        }
-    }
-
-    public static String replaceFirst(char c, String s) {
-        if (s == null) {
-            return "";
-        }
-        if (s.isEmpty()) {
-            return s;
-        }
-        char[] chars = s.toCharArray();
-        char[] newChars = new char[chars.length];
-        int used = 0;
-        boolean found = false;
-        for (char cc : chars) {
-            if (!found && (c == cc)) {
-                found = true;
-            } else {
-                newChars[used++] = cc;
-            }
-        }
-        if (found) {
-            chars = new char[newChars.length - 1];
-            System.arraycopy(newChars, 0, chars, 0, chars.length);
-            return String.valueOf(chars);
-        }
-        return s;
-    }
-
-    public static String replaceAll(String string, Object... pairs) {
-        StringBuilder sb = new StringBuilder(string);
-        for (int i = 0; i < pairs.length; i += 2) {
-            String key = pairs[i] + "";
-            String value = pairs[i + 1] + "";
-            int start = sb.indexOf(key, 0);
-            while (start > -1) {
-                int end = start + key.length();
-                int nextSearchStart = start + value.length();
-                sb.replace(start, end, value);
-                start = sb.indexOf(key, nextSearchStart);
-            }
-        }
-        return sb.toString();
-    }
-
-    public static boolean isAlphanumeric(String str) {
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if ((c < 0x30) || ((c >= 0x3a) && (c <= 0x40)) || ((c > 0x5a) && (c <= 0x60)) || (c
-                > 0x7a)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static boolean isAlphanumericUnd(String str) {
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (c < 0x30 || (c >= 0x3a) && (c <= 0x40) || (c > 0x5a) && (c <= 0x60) || (c > 0x7a)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static boolean isAlpha(String str) {
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if ((c <= 0x40) || ((c > 0x5a) && (c <= 0x60)) || (c > 0x7a)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static String join(Collection<?> collection, String delimiter) {
-        return join(collection.toArray(), delimiter);
-    }
-
-    public static String joinOrdered(Collection<?> collection, String delimiter) {
-        Object[] array = collection.toArray();
-        Arrays.sort(array, new Comparator<Object>() {
-            @Override public int compare(Object a, Object b) {
-                return a.hashCode() - b.hashCode();
-            }
-
-        });
-        return join(array, delimiter);
-    }
-
-    public static String join(Collection<?> collection, char delimiter) {
-        return join(collection.toArray(), delimiter + "");
-    }
-
-    public static boolean isAsciiPrintable(char c) {
-        return (c >= ' ') && (c < '');
-    }
-
-    public static boolean isAsciiPrintable(String s) {
-        for (char c : s.toCharArray()) {
-            if (!isAsciiPrintable(c)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static int getLevenshteinDistance(String s, String t) {
-        int n = s.length();
-        int m = t.length();
-        if (n == 0) {
-            return m;
-        } else if (m == 0) {
-            return n;
-        }
-        if (n > m) {
-            String tmp = s;
-            s = t;
-            t = tmp;
-            n = m;
-            m = t.length();
-        }
-        int p[] = new int[n + 1];
-        int d[] = new int[n + 1];
-        int i;
-        for (i = 0; i <= n; i++) {
-            p[i] = i;
-        }
-        for (int j = 1; j <= m; j++) {
-            char t_j = t.charAt(j - 1);
-            d[0] = j;
-
-            for (i = 1; i <= n; i++) {
-                int cost = s.charAt(i - 1) == t_j ? 0 : 1;
-                d[i] = Math.min(Math.min(d[i - 1] + 1, p[i] + 1), p[i - 1] + cost);
-            }
-            int[] _d = p;
-            p = d;
-            d = _d;
-        }
-        return p[n];
-    }
-
-    public static String join(Object[] array, String delimiter) {
-        StringBuilder result = new StringBuilder();
-        for (int i = 0, j = array.length; i < j; i++) {
-            if (i > 0) {
-                result.append(delimiter);
-            }
-            result.append(array[i]);
-        }
-        return result.toString();
-    }
-
-    public static String join(int[] array, String delimiter) {
-        Integer[] wrapped = new Integer[array.length];
-        for (int i = 0; i < array.length; i++) {
-            wrapped[i] = array[i];
-        }
-        return join(wrapped, delimiter);
-    }
-
-    public static boolean isEqualToAny(String a, String... args) {
-        for (String arg : args) {
-            if (StringMan.isEqual(a, arg)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isEqualIgnoreCaseToAny(String a, String... args) {
-        for (String arg : args) {
-            if (StringMan.isEqualIgnoreCase(a, arg)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isEqual(String a, String b) {
-        return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && (
-            a.hashCode() == b.hashCode()) && a.equals(b));
-        // return a.equals(b) || b != null && a.length() == b.length() && a.hashCode() == b.hashCode()
-        //    && a.equals(b);
-    }
-
-    public static boolean isEqualIgnoreCase(String a, String b) {
-        return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && a
-            .equalsIgnoreCase(b));
-    }
-
-    public static String repeat(String s, int n) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < n; i++) {
-            sb.append(s);
-        }
-        return sb.toString();
-    }
-
-    public static boolean contains(String name, char c) {
-        for (char current : name.toCharArray()) {
-            if (c == current) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public <T> Collection<T> match(Collection<T> col, String startsWith) {
-        if (col == null) {
-            return null;
-        }
-        startsWith = startsWith.toLowerCase();
-        Iterator iterator = col.iterator();
-        while (iterator.hasNext()) {
-            Object item = iterator.next();
-            if (item == null || !item.toString().toLowerCase().startsWith(startsWith)) {
-                iterator.remove();
-            }
-        }
-        return col;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
deleted file mode 100644
index f6e86cd92..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/TaskManager.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public abstract class TaskManager {
-
-    public static final HashSet<String> TELEPORT_QUEUE = new HashSet<>();
-    public static final HashMap<Integer, Integer> tasks = new HashMap<>();
-    public static TaskManager IMP;
-    public static AtomicInteger index = new AtomicInteger(0);
-
-    public static int runTaskRepeat(Runnable runnable, int interval) {
-        if (runnable != null) {
-            if (IMP == null) {
-                throw new IllegalArgumentException("disabled");
-            }
-            return IMP.taskRepeat(runnable, interval);
-        }
-        return -1;
-    }
-
-    public static int runTaskRepeatAsync(Runnable runnable, int interval) {
-        if (runnable != null) {
-            if (IMP == null) {
-                throw new IllegalArgumentException("disabled");
-            }
-            return IMP.taskRepeatAsync(runnable, interval);
-        }
-        return -1;
-    }
-
-    public static void runTaskAsync(Runnable runnable) {
-        if (runnable != null) {
-            if (IMP == null) {
-                runnable.run();
-                return;
-            }
-            IMP.taskAsync(runnable);
-        }
-    }
-
-    public static void runTask(Runnable runnable) {
-        if (runnable != null) {
-            if (IMP == null) {
-                runnable.run();
-                return;
-            }
-            IMP.task(runnable);
-        }
-    }
-
-    /**
-     * Run task later.
-     *
-     * @param runnable The task
-     * @param delay    The delay in ticks
-     */
-    public static void runTaskLater(Runnable runnable, int delay) {
-        if (runnable != null) {
-            if (IMP == null) {
-                runnable.run();
-                return;
-            }
-            IMP.taskLater(runnable, delay);
-        }
-    }
-
-    public static void runTaskLaterAsync(Runnable runnable, int delay) {
-        if (runnable != null) {
-            if (IMP == null) {
-                runnable.run();
-                return;
-            }
-            IMP.taskLaterAsync(runnable, delay);
-        }
-    }
-
-    /**
-     * Break up a series of tasks so that they can run without lagging the server.
-     *
-     * @param objects
-     * @param task
-     * @param whenDone
-     */
-    public static <T> void objectTask(Collection<T> objects, final RunnableVal<T> task,
-        final Runnable whenDone) {
-        final Iterator<T> iterator = objects.iterator();
-        TaskManager.runTask(new Runnable() {
-            @Override public void run() {
-                long start = System.currentTimeMillis();
-                boolean hasNext;
-                while ((hasNext = iterator.hasNext()) && System.currentTimeMillis() - start < 5) {
-                    task.value = iterator.next();
-                    task.run();
-                }
-                if (!hasNext) {
-                    TaskManager.runTaskLater(whenDone, 1);
-                } else {
-                    TaskManager.runTaskLater(this, 1);
-                }
-            }
-        });
-    }
-
-    public <T> T sync(final RunnableVal<T> function) {
-        return sync(function, Integer.MAX_VALUE);
-    }
-
-    public <T> T sync(final RunnableVal<T> function, int timeout) {
-        if (PlotSquared.get().isMainThread(Thread.currentThread())) {
-            function.run();
-            return function.value;
-        }
-        final AtomicBoolean running = new AtomicBoolean(true);
-        RunnableVal<RuntimeException> run = new RunnableVal<RuntimeException>() {
-            @Override public void run(RuntimeException value) {
-                try {
-                    function.run();
-                } catch (RuntimeException e) {
-                    this.value = e;
-                } catch (Throwable neverHappens) {
-                    neverHappens.printStackTrace();
-                } finally {
-                    running.set(false);
-                }
-                synchronized (function) {
-                    function.notifyAll();
-                }
-            }
-        };
-        TaskManager.IMP.task(run);
-        try {
-            synchronized (function) {
-                while (running.get()) {
-                    function.wait(timeout);
-                }
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        if (run.value != null) {
-            throw run.value;
-        }
-        return function.value;
-    }
-
-    public abstract int taskRepeat(Runnable runnable, int interval);
-
-    public abstract int taskRepeatAsync(Runnable runnable, int interval);
-
-    public abstract void taskAsync(Runnable runnable);
-
-    public abstract void task(Runnable runnable);
-
-    public abstract void taskLater(Runnable runnable, int delay);
-
-    public abstract void taskLaterAsync(Runnable runnable, int delay);
-
-    public abstract void cancelTask(int task);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
deleted file mode 100644
index aafba9da9..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
-import com.google.common.collect.BiMap;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.UUID;
-
-public class UUIDHandler {
-
-    public static UUIDHandlerImplementation implementation;
-
-    public static void add(StringWrapper name, UUID uuid) {
-        implementation.add(name, uuid);
-    }
-
-    /**
-     * Get the map containing all names/uuids.
-     *
-     * @return map with names + uuids
-     * @see BiMap
-     */
-    public static BiMap<StringWrapper, UUID> getUuidMap() {
-        return implementation.getUUIDMap();
-    }
-
-    /**
-     * Check if a uuid is cached
-     *
-     * @param uuid to check
-     * @return true of the uuid is cached
-     * @see BiMap#containsValue(Object)
-     */
-    public static boolean uuidExists(UUID uuid) {
-        return implementation.uuidExists(uuid);
-    }
-
-    /**
-     * Check if a name is cached
-     *
-     * @param name to check
-     * @return true of the name is cached
-     * @see BiMap#containsKey(Object)
-     */
-    public static boolean nameExists(StringWrapper name) {
-        return implementation.nameExists(name);
-    }
-
-    public static HashSet<UUID> getAllUUIDS() {
-        final HashSet<UUID> uuids = new HashSet<>();
-        PlotSquared.get().foreachPlotRaw(new RunnableVal<Plot>() {
-            @Override public void run(Plot plot) {
-                if (plot.hasOwner()) {
-                    uuids.add(plot.owner);
-                    uuids.addAll(plot.getTrusted());
-                    uuids.addAll(plot.getMembers());
-                    uuids.addAll(plot.getDenied());
-                }
-            }
-        });
-        return uuids;
-    }
-
-    public static UUIDWrapper getUUIDWrapper() {
-        return implementation.getUUIDWrapper();
-    }
-
-    public static void setUUIDWrapper(UUIDWrapper wrapper) {
-        implementation.setUUIDWrapper(wrapper);
-    }
-
-    public static void startCaching(Runnable whenDone) {
-        implementation.startCaching(whenDone);
-    }
-
-    public static void cache(BiMap<StringWrapper, UUID> toAdd) {
-        implementation.add(toAdd);
-    }
-
-    public static UUID getUUID(PlotPlayer player) {
-        if (implementation == null) {
-            return null;
-        }
-        return implementation.getUUID(player);
-    }
-
-    public static UUID getUUID(OfflinePlotPlayer player) {
-        if (implementation == null) {
-            return null;
-        }
-        return implementation.getUUID(player);
-    }
-
-    public static String getName(UUID uuid) {
-        if (implementation == null) {
-            return null;
-        }
-        return implementation.getName(uuid);
-    }
-
-    public static PlotPlayer getPlayer(UUID uuid) {
-        if (implementation == null) {
-            return null;
-        }
-        return check(implementation.getPlayer(uuid));
-    }
-
-    public static PlotPlayer getPlayer(String name) {
-        if (implementation == null) {
-            return null;
-        }
-        return check(implementation.getPlayer(name));
-    }
-
-    private static PlotPlayer check(PlotPlayer plr) {
-        if (plr != null && !plr.isOnline()) {
-            UUIDHandler.getPlayers().remove(plr.getName());
-            PlotSquared.get().IMP.unregister(plr);
-            plr = null;
-        }
-        return plr;
-    }
-
-    public static UUID getUUIDFromString(String nameOrUUIDString) {
-        if (implementation == null) {
-            return null;
-        }
-        if (nameOrUUIDString.length() > 16) {
-            try {
-                return UUID.fromString(nameOrUUIDString);
-            } catch (IllegalArgumentException e) {
-                return null;
-            }
-        }
-        return UUIDHandler.getUUID(nameOrUUIDString, null);
-    }
-
-    public static UUID getUUID(String name, RunnableVal<UUID> ifFetch) {
-        if (implementation == null) {
-            return null;
-        }
-        return implementation.getUUID(name, ifFetch);
-    }
-
-    public static UUID getCachedUUID(String name, RunnableVal<UUID> ifFetch) {
-        if (implementation == null) {
-            return null;
-        }
-        return implementation.getUUIDMap().get(new StringWrapper(name));
-    }
-
-    public static Map<String, PlotPlayer> getPlayers() {
-        if (implementation == null) {
-            return new HashMap<>();
-        }
-        return implementation.getPlayers();
-    }
-
-    public static void handleShutdown() {
-        if (implementation == null) {
-            return;
-        }
-        implementation.handleShutdown();
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
deleted file mode 100644
index b5fbb8b65..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
-import com.google.common.base.Charsets;
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-public abstract class UUIDHandlerImplementation {
-
-    public final ConcurrentHashMap<String, PlotPlayer> players;
-    public final HashSet<UUID> unknown = new HashSet<>();
-    public UUIDWrapper uuidWrapper;
-    private boolean cached = false;
-    private BiMap<StringWrapper, UUID> uuidMap =
-        HashBiMap.create(new HashMap<StringWrapper, UUID>());
-    //    private BiMap<UUID, StringWrapper> nameMap = uuidMap.inverse();
-
-    public UUIDHandlerImplementation(UUIDWrapper wrapper) {
-        this.uuidWrapper = wrapper;
-        this.players = new ConcurrentHashMap<>();
-    }
-
-    /**
-     * If the UUID is not found, some commands can request to fetch the UUID when possible.
-     *
-     * @param name
-     * @param ifFetch
-     */
-    public abstract void fetchUUID(String name, RunnableVal<UUID> ifFetch);
-
-    /**
-     * Start UUID caching (this should be an async task)
-     * Recommended to override this is you want to cache offline players
-     */
-    public boolean startCaching(Runnable whenDone) {
-        if (this.cached) {
-            return false;
-        }
-        return this.cached = true;
-    }
-
-    public UUIDWrapper getUUIDWrapper() {
-        return this.uuidWrapper;
-    }
-
-    public void setUUIDWrapper(UUIDWrapper wrapper) {
-        this.uuidWrapper = wrapper;
-    }
-
-    public void rename(UUID uuid, StringWrapper name) {
-        this.uuidMap.inverse().remove(uuid);
-        this.uuidMap.put(name, uuid);
-    }
-
-    public void add(BiMap<StringWrapper, UUID> toAdd) {
-        if (this.uuidMap.isEmpty()) {
-            this.uuidMap = toAdd;
-        }
-        for (Map.Entry<StringWrapper, UUID> entry : toAdd.entrySet()) {
-            UUID uuid = entry.getValue();
-            StringWrapper name = entry.getKey();
-            if (uuid == null || name == null) {
-                continue;
-            }
-            StringWrapper oldName = this.uuidMap.inverse().get(uuid);
-            if (oldName != null) {
-                if (this.uuidMap.containsKey(name)) {
-                    continue;
-                }
-                if (getPlayer(uuid) == null) {
-                    rename(uuid, name);
-                }
-                continue;
-            }
-            this.uuidMap.put(name, uuid);
-        }
-        PlotSquared.debug(C.PREFIX + "&6Cached a total of: " + this.uuidMap.size() + " UUIDs");
-    }
-
-    public boolean add(final StringWrapper name, final UUID uuid) {
-        if (uuid == null) {
-            PlotSquared.debug("UUID cannot be null!");
-            return false;
-        }
-        if (name == null) {
-            try {
-                this.unknown.add(uuid);
-            } catch (Exception e) {
-                PlotSquared.log("&c(minor) Invalid UUID mapping: " + uuid);
-                e.printStackTrace();
-            }
-            return false;
-        }
-
-        /*
-         * lazy UUID conversion:
-         *  - Useful if the person misconfigured the database, or settings before
-         *   PlotMe conversion
-         */
-        if (!Settings.UUID.OFFLINE && !this.unknown.isEmpty()) {
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    UUID offline = UUID.nameUUIDFromBytes(
-                        ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-                    if (!UUIDHandlerImplementation.this.unknown.contains(offline) && !name.value
-                        .equals(name.value.toLowerCase())) {
-                        offline = UUID.nameUUIDFromBytes(
-                            ("OfflinePlayer:" + name.value.toLowerCase()).getBytes(Charsets.UTF_8));
-                        if (!UUIDHandlerImplementation.this.unknown.contains(offline)) {
-                            offline = null;
-                        }
-                    }
-                    if (offline != null && !offline.equals(uuid)) {
-                        UUIDHandlerImplementation.this.unknown.remove(offline);
-                        Set<Plot> plots = PlotSquared.get().getPlotsAbs(offline);
-                        if (!plots.isEmpty()) {
-                            for (Plot plot : plots) {
-                                plot.owner = uuid;
-                            }
-                            DBFunc.replaceUUID(offline, uuid);
-                            PlotSquared.debug("&cDetected invalid UUID stored for: " + name.value);
-                            PlotSquared.debug(
-                                "&7 - Did you recently switch to online-mode storage without running `uuidconvert`?");
-                            PlotSquared.debug("&6" + PlotSquared.imp().getPluginName()
-                                + " will update incorrect entries when the user logs in, or you can reconstruct your database.");
-                        }
-                    }
-                }
-            });
-        } else if (Settings.UUID.FORCE_LOWERCASE && !this.unknown.isEmpty() && !name.value
-            .equals(name.value.toLowerCase())) {
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    UUID offlineUpper = UUID.nameUUIDFromBytes(
-                        ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-                    if (UUIDHandlerImplementation.this.unknown.contains(offlineUpper)
-                        && !offlineUpper.equals(uuid)) {
-                        UUIDHandlerImplementation.this.unknown.remove(offlineUpper);
-                        Set<Plot> plots = PlotSquared.get().getPlotsAbs(offlineUpper);
-                        if (!plots.isEmpty()) {
-                            for (Plot plot : plots) {
-                                plot.owner = uuid;
-                            }
-                            replace(offlineUpper, uuid, name.value);
-                        }
-                    }
-                }
-            });
-        }
-        try {
-            UUID offline = this.uuidMap.put(name, uuid);
-            if (offline != null) {
-                if (!offline.equals(uuid)) {
-                    Set<Plot> plots = PlotSquared.get().getPlots(offline);
-                    if (!plots.isEmpty()) {
-                        for (Plot plot : plots) {
-                            plot.owner = uuid;
-                        }
-                        replace(offline, uuid, name.value);
-                    }
-                    return true;
-                } else {
-                    StringWrapper oName = this.uuidMap.inverse().get(offline);
-                    if (!oName.equals(name)) {
-                        this.uuidMap.remove(name);
-                        this.uuidMap.put(name, uuid);
-                    }
-                }
-                return false;
-            }
-        } catch (Exception ignored) {
-            BiMap<UUID, StringWrapper> inverse = this.uuidMap.inverse();
-            StringWrapper oldName = inverse.get(uuid);
-            if (oldName != null) {
-                if (this.uuidMap.containsKey(name)) {
-                    return false;
-                }
-                PlotPlayer player = getPlayer(uuid);
-                if (player == null || player.getName().equalsIgnoreCase(name.value)) {
-                    rename(uuid, name);
-                }
-                return false;
-            }
-            this.uuidMap.put(name, uuid);
-        }
-        return true;
-    }
-
-    private void replace(UUID from, UUID to, String name) {
-        DBFunc.replaceUUID(from, to);
-        PlotSquared.debug("&cDetected invalid UUID stored for: " + name);
-        PlotSquared.debug(
-            "&7 - Did you recently switch to online-mode storage without running `uuidconvert`?");
-        PlotSquared.debug("&6" + PlotSquared.imp().getPluginName()
-            + " will update incorrect entries when the user logs in, or you can reconstruct your database.");
-    }
-
-    public boolean uuidExists(UUID uuid) {
-        return this.uuidMap.containsValue(uuid);
-    }
-
-    public BiMap<StringWrapper, UUID> getUUIDMap() {
-        return this.uuidMap;
-    }
-
-    public boolean nameExists(StringWrapper wrapper) {
-        return this.uuidMap.containsKey(wrapper);
-    }
-
-    public void handleShutdown() {
-        this.players.clear();
-        this.uuidMap.clear();
-    }
-
-    public String getName(UUID uuid) {
-        if (uuid == null) {
-            return null;
-        }
-        StringWrapper name = this.uuidMap.inverse().get(uuid);
-        if (name != null) {
-            return name.value;
-        }
-        return null;
-    }
-
-    public UUID getUUID(String name, RunnableVal<UUID> ifFetch) {
-        if (name.isEmpty()) {
-            return null;
-        }
-        // check online
-        PlotPlayer player = getPlayer(name);
-        if (player != null) {
-            return player.getUUID();
-        }
-        // check cache
-        StringWrapper wrap = new StringWrapper(name);
-        UUID uuid = this.uuidMap.get(wrap);
-        if (uuid != null) {
-            return uuid;
-        }
-        // Read from disk OR convert directly to offline UUID
-        if (Settings.UUID.OFFLINE && !StringMan.contains(name, ';')) {
-            uuid = this.uuidWrapper.getUUID(name);
-            add(new StringWrapper(name), uuid);
-            return uuid;
-        }
-        if ((ifFetch != null)) {
-            fetchUUID(name, ifFetch);
-            return null;
-        }
-        return null;
-    }
-
-    public UUID getUUID(PlotPlayer player) {
-        return this.uuidWrapper.getUUID(player);
-    }
-
-    public UUID getUUID(OfflinePlotPlayer player) {
-        return this.uuidWrapper.getUUID(player);
-    }
-
-    public PlotPlayer getPlayer(UUID uuid) {
-        String name = getName(uuid);
-        if (name != null) {
-            return getPlayer(name);
-        }
-        return null;
-    }
-
-    public PlotPlayer getPlayer(String name) {
-        return this.players.get(name);
-    }
-
-    public Map<String, PlotPlayer> getPlayers() {
-        return this.players;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
deleted file mode 100644
index bb376f431..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem;
-import com.sk89q.jnbt.*;
-
-import java.io.*;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-public abstract class WorldUtil {
-    public static WorldUtil IMP;
-
-    public abstract int getBiomeFromString(String value);
-
-    public abstract String[] getBiomeList();
-
-    public abstract String getMainWorld();
-
-    public abstract boolean isWorld(String worldName);
-
-    public abstract String[] getSign(Location location);
-
-    public abstract Location getSpawn(String world);
-
-    public abstract Location getSpawn(PlotPlayer pp);
-
-    public abstract void setSpawn(Location location);
-
-    public abstract void saveWorld(String world);
-
-    public abstract String getClosestMatchingName(PlotBlock plotBlock);
-
-    public abstract boolean isBlockSolid(PlotBlock block);
-
-    public abstract StringComparison<PlotBlock>.ComparisonResult getClosestBlock(String name);
-
-    public abstract String getBiome(String world, int x, int z);
-
-    public abstract PlotBlock getBlock(Location location);
-
-    public abstract int getHighestBlock(String world, int x, int z);
-
-    public abstract boolean addItems(String world, PlotItem item);
-
-    public abstract void setSign(String world, int x, int y, int z, String[] lines);
-
-    public abstract void setBiomes(String world, RegionWrapper region, String biome);
-
-    public abstract com.sk89q.worldedit.world.World getWeWorld(String world);
-
-    public void upload(final Plot plot, UUID uuid, String file, RunnableVal<URL> whenDone) {
-        if (plot == null) {
-            throw new IllegalArgumentException("Plot may not be null!");
-        }
-        final Location home = plot.getHome();
-        MainUtil.upload(uuid, file, "zip", new RunnableVal<OutputStream>() {
-            @Override public void run(OutputStream output) {
-                try (final ZipOutputStream zos = new ZipOutputStream(output)) {
-                    File dat = getDat(plot.getWorldName());
-                    Location spawn = getSpawn(plot.getWorldName());
-                    byte[] buffer = new byte[1024];
-                    if (dat != null) {
-                        ZipEntry ze = new ZipEntry("world" + File.separator + dat.getName());
-                        zos.putNextEntry(ze);
-                        try (NBTInputStream nis = new NBTInputStream(
-                            new GZIPInputStream(new FileInputStream(dat)))) {
-                            CompoundTag tag = (CompoundTag) nis.readNamedTag().getTag();
-                            CompoundTag data = (CompoundTag) tag.getValue().get("Data");
-                            Map<String, Tag> map = ReflectionUtils.getMap(data.getValue());
-                            map.put("SpawnX", new IntTag(home.getX()));
-                            map.put("SpawnY", new IntTag(home.getY()));
-                            map.put("SpawnZ", new IntTag(home.getZ()));
-                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                            try (NBTOutputStream out = new NBTOutputStream(
-                                new GZIPOutputStream(baos, true))) {
-                                //TODO Find what this should be called
-                                out.writeNamedTag("Schematic????", tag);
-                            }
-                            zos.write(baos.toByteArray());
-                        }
-                    }
-                    setSpawn(spawn);
-                    for (Plot current : plot.getConnectedPlots()) {
-                        Location bot = current.getBottomAbs();
-                        Location top = current.getTopAbs();
-                        int brx = bot.getX() >> 9;
-                        int brz = bot.getZ() >> 9;
-                        int trx = top.getX() >> 9;
-                        int trz = top.getZ() >> 9;
-                        Set<ChunkLoc> files = ChunkManager.manager.getChunkChunks(bot.getWorld());
-                        for (ChunkLoc mca : files) {
-                            if (mca.x >= brx && mca.x <= trx && mca.z >= brz && mca.z <= trz) {
-                                final File file = getMcr(plot.getWorldName(), mca.x, mca.z);
-                                if (file != null) {
-                                    //final String name = "r." + (x - cx) + "." + (z - cz) + ".mca";
-                                    String name = file.getName();
-                                    final ZipEntry ze = new ZipEntry(
-                                        "world" + File.separator + "region" + File.separator
-                                            + name);
-                                    zos.putNextEntry(ze);
-                                    final FileInputStream in = new FileInputStream(file);
-                                    int len;
-                                    while ((len = in.read(buffer)) > 0) {
-                                        zos.write(buffer, 0, len);
-                                    }
-                                    in.close();
-                                    zos.closeEntry();
-                                }
-                            }
-                        }
-                    }
-                    zos.closeEntry();
-                    zos.flush();
-                    zos.finish();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }, whenDone);
-    }
-
-    public File getDat(String world) {
-        File file = new File(
-            PlotSquared.get().IMP.getWorldContainer() + File.separator + world + File.separator
-                + "level.dat");
-        if (file.exists()) {
-            return file;
-        }
-        return null;
-    }
-
-    public File getMcr(String world, int x, int z) {
-        File file = new File(PlotSquared.get().IMP.getWorldContainer(),
-            world + File.separator + "region" + File.separator + "r." + x + '.' + z + ".mca");
-        if (file.exists()) {
-            return file;
-        }
-        return null;
-    }
-
-    public abstract boolean isBlockSame(PlotBlock block1, PlotBlock block2);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java
deleted file mode 100644
index 133088a2e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/area/QuadMap.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.area;
-
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class QuadMap<T> {
-
-    public final int size;
-    public final int x;
-    public final int z;
-    private final int newsize;
-    private final int min;
-    public HashSet<T> objects;
-    public QuadMap<T> one;
-    public QuadMap<T> two;
-    public QuadMap<T> three;
-    public QuadMap<T> four;
-    public QuadMap<T> skip;
-
-    public QuadMap(int size, int x, int z) {
-        this.size = size;
-        this.x = x;
-        this.z = z;
-        this.newsize = size >> 1;
-        this.min = 512;
-    }
-
-    public QuadMap(int size, int x, int z, int min) {
-        this.size = size;
-        this.x = x;
-        this.z = z;
-        this.newsize = size >> 1;
-        this.min = min;
-    }
-
-    public int count() {
-        int size = countBelow();
-        if (this.objects != null) {
-            size += this.objects.size();
-        }
-        return size;
-    }
-
-    public Set<T> getAll() {
-        HashSet<T> all = new HashSet<>();
-        if (this.objects != null) {
-            all.addAll(this.objects);
-        }
-        if (this.skip != null) {
-            all.addAll(this.skip.getAll());
-            return all;
-        }
-        if (this.one != null) {
-            all.addAll(this.one.getAll());
-        }
-        if (this.two != null) {
-            all.addAll(this.two.getAll());
-        }
-        if (this.three != null) {
-            all.addAll(this.three.getAll());
-        }
-        if (this.four != null) {
-            all.addAll(this.four.getAll());
-        }
-        return all;
-    }
-
-    public int countCurrent() {
-        return this.objects == null ? 0 : this.objects.size();
-    }
-
-    public int countBelow() {
-        int size = 0;
-        if (this.one != null) {
-            size += this.one.count();
-        }
-        if (this.two != null) {
-            size += this.two.count();
-        }
-        if (this.three != null) {
-            size += this.three.count();
-        }
-        if (this.four != null) {
-            size += this.four.count();
-        }
-        return size;
-    }
-
-    public void add(T area) {
-        if (this.size <= this.min) {
-            if (this.objects == null) {
-                this.objects = new HashSet<>();
-            }
-            this.objects.add(area);
-            return;
-        }
-        RegionWrapper region = getRegion(area);
-        if (region.minX >= this.x) {
-            if (region.minZ >= this.z) {
-                if (this.one == null) {
-                    this.one =
-                        newInstance(this.newsize, this.x + this.newsize, this.z + this.newsize,
-                            this.min);
-                }
-                this.one.add(area);
-                recalculateSkip();
-                return;
-            } else if (region.maxZ < this.z) {
-                if (this.two == null) {
-                    this.two =
-                        newInstance(this.newsize, this.x + this.newsize, this.z - this.newsize,
-                            this.min);
-                }
-                this.two.add(area);
-                recalculateSkip();
-                return;
-            }
-        } else if (region.maxX < this.x) {
-            if (region.minZ >= this.z) {
-                if (this.four == null) {
-                    this.four =
-                        newInstance(this.newsize, this.x - this.newsize, this.z + this.newsize,
-                            this.min);
-                }
-                this.four.add(area);
-                recalculateSkip();
-                return;
-            } else if (region.maxZ < this.z) {
-                if (this.three == null) {
-                    this.three =
-                        newInstance(this.newsize, this.x - this.newsize, this.z - this.newsize,
-                            this.min);
-                }
-                this.three.add(area);
-                recalculateSkip();
-                return;
-            }
-        }
-        if (this.objects == null) {
-            this.objects = new HashSet<>();
-        }
-        this.objects.add(area);
-    }
-
-    public RegionWrapper getRegion(T value) {
-        return null;
-    }
-
-    public QuadMap<T> newInstance(int newsize, int x, int z, int min) {
-        try {
-            return new QuadMap<T>(newsize, x, z, min) {
-                @Override public RegionWrapper getRegion(T value) {
-                    return QuadMap.this.getRegion(value);
-                }
-            };
-        } catch (Throwable e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public boolean remove(T area) {
-        if (this.objects != null) {
-            if (this.objects.remove(area)) {
-                return this.objects.isEmpty();
-            }
-        }
-        if (this.skip != null) {
-            if (this.skip.remove(area)) {
-                this.skip = null;
-            }
-        } else {
-            RegionWrapper region = getRegion(area);
-            if (region.minX >= this.x) {
-                if (region.minZ >= this.z) {
-                    if (this.one != null) {
-                        if (this.one.remove(area)) {
-                            this.one = null;
-                        }
-                        return countCurrent() == 0;
-                    }
-                } else {
-                    if (this.two != null) {
-                        if (this.two.remove(area)) {
-                            this.two = null;
-                        }
-                        return countCurrent() == 0;
-                    }
-                }
-            } else {
-                if (region.minZ >= this.z) {
-                    if (this.four != null) {
-                        if (this.four.remove(area)) {
-                            this.four = null;
-                        }
-                        return countCurrent() == 0;
-                    }
-                } else {
-                    if (this.three != null) {
-                        if (this.three.remove(area)) {
-                            this.three = null;
-                        }
-                        return countCurrent() == 0;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    public void recalculateSkip() {
-        QuadMap<T> map = null;
-        for (QuadMap<T> current : new QuadMap[] {this.one, this.two, this.three, this.four}) {
-            if (current != null) {
-                if (map != null) {
-                    this.skip = null;
-                    return;
-                }
-                map = current;
-            }
-        }
-        this.skip = map.skip == null ? map : map.skip;
-    }
-
-    public Set<T> get(RegionWrapper region) {
-        HashSet<T> set = new HashSet<>();
-        if (this.objects != null) {
-            for (T obj : this.objects) {
-                if (getRegion(obj).intersects(region)) {
-                    set.add(obj);
-                }
-            }
-        }
-        if (this.skip != null) {
-            if (this.skip.intersects(region)) {
-                set.addAll(this.skip.get(region));
-            }
-        } else {
-            if (this.one != null && this.one.intersects(region)) {
-                set.addAll(this.one.get(region));
-            }
-            if (this.two != null && this.two.intersects(region)) {
-                set.addAll(this.two.get(region));
-            }
-            if (this.three != null && this.three.intersects(region)) {
-                set.addAll(this.three.get(region));
-            }
-            if (this.four != null && this.four.intersects(region)) {
-                set.addAll(this.four.get(region));
-            }
-        }
-        return set;
-    }
-
-    public boolean intersects(RegionWrapper other) {
-        return (other.minX <= this.x + this.size) && (other.maxX >= this.x - this.size) && (
-            other.minZ <= this.z + this.size) && (other.maxZ >= this.z - this.size);
-    }
-
-    public T get(int x, int z) {
-        if (this.objects != null) {
-            for (T obj : this.objects) {
-                if (getRegion(obj).isIn(x, z)) {
-                    return obj;
-                }
-            }
-        }
-        if (this.skip != null) {
-            return this.skip.get(x, z);
-        } else {
-            if (x >= this.x) {
-                if (z >= this.z) {
-                    if (this.one != null) {
-                        return this.one.get(x, z);
-                    }
-                } else {
-                    if (this.two != null) {
-                        return this.two.get(x, z);
-                    }
-                }
-            } else {
-                if (z >= this.z) {
-                    if (this.four != null) {
-                        return this.four.get(x, z);
-                    }
-                } else {
-                    if (this.three != null) {
-                        return this.three.get(x, z);
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
deleted file mode 100644
index 8784ebf35..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import lombok.Getter;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
-public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
-
-    private final String world;
-    private final ConcurrentHashMap<Long, LocalChunk> blockChunks = new ConcurrentHashMap<>();
-    private final ConcurrentLinkedDeque<LocalChunk> chunks = new ConcurrentLinkedDeque<>();
-    private long modified;
-    private LocalChunk lastWrappedChunk;
-    private int lastX = Integer.MIN_VALUE;
-    private int lastZ = Integer.MIN_VALUE;
-    @Getter private boolean baseBlocks = false;
-
-    public BasicLocalBlockQueue(String world) {
-        super(world);
-        this.world = world;
-        this.modified = System.currentTimeMillis();
-    }
-
-    public abstract LocalChunk getLocalChunk(int x, int z);
-
-    @Override public abstract PlotBlock getBlock(int x, int y, int z);
-
-    public abstract void setComponents(LocalChunk<T> lc);
-
-    @Override public final String getWorld() {
-        return world;
-    }
-
-    @Override public final boolean next() {
-        lastX = Integer.MIN_VALUE;
-        lastZ = Integer.MIN_VALUE;
-        try {
-            if (this.blockChunks.size() == 0) {
-                return false;
-            }
-            synchronized (blockChunks) {
-                LocalChunk chunk = chunks.poll();
-                if (chunk != null) {
-                    blockChunks.remove(chunk.longHash());
-                    this.execute(chunk);
-                    return true;
-                }
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
-
-    public final boolean execute(final LocalChunk<T> lc) {
-        if (lc == null) {
-            return false;
-        }
-        this.setComponents(lc);
-        return true;
-    }
-
-    @Override public void startSet(boolean parallel) {
-        // Do nothing
-    }
-
-    @Override public void endSet(boolean parallel) {
-        // Do nothing
-    }
-
-    @Override public final int size() {
-        return chunks.size();
-    }
-
-    @Override public final long getModified() {
-        return modified;
-    }
-
-    @Override public final void setModified(long modified) {
-        this.modified = modified;
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
-        if ((y > 255) || (y < 0)) {
-            return false;
-        }
-        baseBlocks = true;
-        int cx = x >> 4;
-        int cz = z >> 4;
-        if (cx != lastX || cz != lastZ) {
-            lastX = cx;
-            lastZ = cz;
-            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
-            lastWrappedChunk = this.blockChunks.get(pair);
-            if (lastWrappedChunk == null) {
-                lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
-                lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
-                LocalChunk previous = this.blockChunks.put(pair, lastWrappedChunk);
-                if (previous == null) {
-                    chunks.add(lastWrappedChunk);
-                    return true;
-                }
-                this.blockChunks.put(pair, previous);
-                lastWrappedChunk = previous;
-            }
-        }
-        lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
-        return true;
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-        if ((y > 255) || (y < 0)) {
-            return false;
-        }
-        int cx = x >> 4;
-        int cz = z >> 4;
-        if (cx != lastX || cz != lastZ) {
-            lastX = cx;
-            lastZ = cz;
-            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
-            lastWrappedChunk = this.blockChunks.get(pair);
-            if (lastWrappedChunk == null) {
-                lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
-                lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
-                LocalChunk previous = this.blockChunks.put(pair, lastWrappedChunk);
-                if (previous == null) {
-                    chunks.add(lastWrappedChunk);
-                    return true;
-                }
-                this.blockChunks.put(pair, previous);
-                lastWrappedChunk = previous;
-            }
-        }
-        lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
-        return true;
-    }
-
-    @Override public final boolean setBiome(int x, int z, String biome) {
-        long pair = (long) (x >> 4) << 32 | (z >> 4) & 0xFFFFFFFFL;
-        LocalChunk result = this.blockChunks.get(pair);
-        if (result == null) {
-            result = this.getLocalChunk(x >> 4, z >> 4);
-            LocalChunk previous = this.blockChunks.put(pair, result);
-            if (previous != null) {
-                this.blockChunks.put(pair, previous);
-                result = previous;
-            } else {
-                chunks.add(result);
-            }
-        }
-        result.setBiome(x & 15, z & 15, biome);
-        return true;
-    }
-
-    public final void setChunk(LocalChunk<T> chunk) {
-        LocalChunk previous = this.blockChunks.put(chunk.longHash(), chunk);
-        if (previous != null) {
-            chunks.remove(previous);
-        }
-        chunks.add(chunk);
-    }
-
-    @Override public void flush() {
-        GlobalBlockQueue.IMP.dequeue(this);
-        TaskManager.IMP.sync(new RunnableVal<Object>() {
-            @Override public void run(Object value) {
-                while (next())
-                    ;
-            }
-        });
-    }
-
-
-    public abstract class LocalChunk<T> {
-        public final BasicLocalBlockQueue parent;
-        public final int z;
-        public final int x;
-
-        public T[] blocks;
-        public BaseBlock[][] baseblocks;
-        public String[][] biomes;
-
-        public LocalChunk(BasicLocalBlockQueue<T> parent, int x, int z) {
-            this.parent = parent;
-            this.x = x;
-            this.z = z;
-        }
-
-        /**
-         * Get the parent queue this chunk belongs to
-         *
-         * @return
-         */
-        public BasicLocalBlockQueue getParent() {
-            return parent;
-        }
-
-        public int getX() {
-            return x;
-        }
-
-        public int getZ() {
-            return z;
-        }
-
-        public abstract void setBlock(final int x, final int y, final int z, final PlotBlock block);
-
-        public abstract void setBlock(final int x, final int y, final int z, final BaseBlock block);
-
-        public void setBiome(int x, int z, String biome) {
-            if (this.biomes == null) {
-                this.biomes = new String[16][];
-            }
-            String[] index = this.biomes[x];
-            if (index == null) {
-                index = this.biomes[x] = new String[16];
-            }
-            index[z] = biome;
-        }
-
-        public long longHash() {
-            return MathMan.pairInt(x, z);
-        }
-
-        @Override public int hashCode() {
-            return MathMan.pair((short) x, (short) z);
-        }
-    }
-
-
-    public class BasicLocalChunk extends LocalChunk<PlotBlock[]> {
-        public BasicLocalChunk(BasicLocalBlockQueue parent, int x, int z) {
-            super(parent, x, z);
-            blocks = new PlotBlock[16][];
-            baseblocks = new BaseBlock[16][];
-        }
-
-        @Override public void setBlock(int x, int y, int z, PlotBlock block) {
-            this.setInternal(x, y, z, block);
-        }
-
-        private void setInternal(final int x, final int y, final int z, final PlotBlock plotBlock) {
-            final int i = MainUtil.CACHE_I[y][x][z];
-            final int j = MainUtil.CACHE_J[y][x][z];
-            PlotBlock[] array = blocks[i];
-            if (array == null) {
-                array = (blocks[i] = new PlotBlock[4096]);
-            }
-            array[j] = plotBlock;
-        }
-
-        @Override public void setBlock(int x, int y, int z, BaseBlock block) {
-            this.setInternal(x, y, z, block);
-        }
-
-        private void setInternal(final int x, final int y, final int z, final BaseBlock baseBlock) {
-            final int i = MainUtil.CACHE_I[y][x][z];
-            final int j = MainUtil.CACHE_J[y][x][z];
-            BaseBlock[] array = baseblocks[i];
-            if (array == null) {
-                array = (baseblocks[i] = new BaseBlock[4096]);
-            }
-            array[j] = baseBlock;
-        }
-
-        public void setBlock(final int x, final int y, final int z, final int id, final int data) {
-            final PlotBlock block = PlotBlock.get(id, data);
-            this.setInternal(x, y, z, block);
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
deleted file mode 100644
index cd3a4a81d..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-public class DelegateLocalBlockQueue extends LocalBlockQueue {
-
-    private final LocalBlockQueue parent;
-
-    public DelegateLocalBlockQueue(LocalBlockQueue parent) {
-        super(parent == null ? null : parent.getWorld());
-        this.parent = parent;
-    }
-
-    public LocalBlockQueue getParent() {
-        return parent;
-    }
-
-    @Override public boolean next() {
-        return parent.next();
-    }
-
-    @Override public void startSet(boolean parallel) {
-        if (parent != null) {
-            parent.startSet(parallel);
-        }
-    }
-
-    @Override public void endSet(boolean parallel) {
-        if (parent != null) {
-            parent.endSet(parallel);
-        }
-    }
-
-    @Override public int size() {
-        if (parent != null) {
-            return parent.size();
-        }
-        return 0;
-    }
-
-    @Override public void optimize() {
-        if (parent != null) {
-            parent.optimize();
-        }
-    }
-
-    @Override public long getModified() {
-        if (parent != null) {
-            return parent.getModified();
-        }
-        return 0;
-    }
-
-    @Override public void setModified(long modified) {
-        if (parent != null) {
-            parent.setModified(modified);
-        }
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
-        return parent.setBlock(x, y, z, id);
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-        return parent.setBlock(x, y, z, id);
-    }
-
-    @Override public PlotBlock getBlock(int x, int y, int z) {
-        return parent.getBlock(x, y, z);
-    }
-
-    @Override public boolean setBiome(int x, int y, String biome) {
-        return parent.setBiome(x, y, biome);
-    }
-
-    @Override public String getWorld() {
-        return parent.getWorld();
-    }
-
-    @Override public void flush() {
-        if (parent != null) {
-            parent.flush();
-        }
-    }
-
-    @Override public void refreshChunk(int x, int z) {
-        if (parent != null) {
-            parent.refreshChunk(x, z);
-        }
-    }
-
-    @Override public void fixChunkLighting(int x, int z) {
-        if (parent != null) {
-            parent.fixChunkLighting(x, z);
-        }
-    }
-
-    @Override public void regenChunk(int x, int z) {
-        if (parent != null) {
-            parent.regenChunk(x, z);
-        }
-    }
-
-    @Override public void enqueue() {
-        if (parent != null) {
-            parent.enqueue();
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
deleted file mode 100644
index 84d5f7ef4..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.util.ArrayList;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class GlobalBlockQueue {
-
-    public static GlobalBlockQueue IMP;
-    private final int PARALLEL_THREADS;
-    private final ConcurrentLinkedDeque<LocalBlockQueue> activeQueues;
-    private final ConcurrentLinkedDeque<LocalBlockQueue> inactiveQueues;
-    private final ConcurrentLinkedDeque<Runnable> runnables;
-    private final AtomicBoolean running;
-    private QueueProvider provider;
-    /**
-     * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the
-     * server
-     */
-    private long last;
-    private long secondLast;
-    private long lastSuccess;
-    private final RunnableVal2<Long, LocalBlockQueue> SET_TASK =
-        new RunnableVal2<Long, LocalBlockQueue>() {
-            @Override public void run(Long free, LocalBlockQueue queue) {
-                do {
-                    boolean more = queue.next();
-                    if (!more) {
-                        lastSuccess = last;
-                        if (inactiveQueues.size() == 0 && activeQueues.size() == 0) {
-                            tasks();
-                        }
-                        return;
-                    }
-                } while (((GlobalBlockQueue.this.secondLast = System.currentTimeMillis())
-                    - GlobalBlockQueue.this.last) < free);
-            }
-        };
-
-    public GlobalBlockQueue(QueueProvider provider, int threads) {
-        this.provider = provider;
-        activeQueues = new ConcurrentLinkedDeque<>();
-        inactiveQueues = new ConcurrentLinkedDeque<>();
-        runnables = new ConcurrentLinkedDeque<>();
-        running = new AtomicBoolean();
-        this.PARALLEL_THREADS = threads;
-    }
-
-    public QueueProvider getProvider() {
-        return provider;
-    }
-
-    public void setProvider(QueueProvider provider) {
-        this.provider = provider;
-    }
-
-    public LocalBlockQueue getNewQueue(String world, boolean autoQueue) {
-        LocalBlockQueue queue = provider.getNewQueue(world);
-        if (autoQueue) {
-            inactiveQueues.add(queue);
-        }
-        return queue;
-    }
-
-    public boolean stop() {
-        if (!running.get()) {
-            return false;
-        }
-        running.set(false);
-        return true;
-    }
-
-    public boolean runTask() {
-        if (running.get()) {
-            return false;
-        }
-        running.set(true);
-        TaskManager.runTaskRepeat(() -> {
-            if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
-                lastSuccess = System.currentTimeMillis();
-                tasks();
-                return;
-            }
-            SET_TASK.value1 = 50 + Math.min(
-                (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
-                    System.currentTimeMillis()),
-                GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
-            SET_TASK.value2 = getNextQueue();
-            if (SET_TASK.value2 == null) {
-                return;
-            }
-            if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-                throw new IllegalStateException(
-                    "This shouldn't be possible for placement to occur off the main thread");
-            }
-            // Disable the async catcher as it can't discern async vs parallel
-            SET_TASK.value2.startSet(true);
-            try {
-                if (PARALLEL_THREADS <= 1) {
-                    SET_TASK.run();
-                } else {
-                    ArrayList<Thread> threads = new ArrayList<Thread>();
-                    for (int i = 0; i < PARALLEL_THREADS; i++) {
-                        threads.add(new Thread(SET_TASK));
-                    }
-                    for (Thread thread : threads) {
-                        thread.start();
-                    }
-                    for (Thread thread : threads) {
-                        try {
-                            thread.join();
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } catch (Throwable e) {
-                e.printStackTrace();
-            } finally {
-                // Enable it again (note that we are still on the main thread)
-                SET_TASK.value2.endSet(true);
-            }
-        }, 1);
-        return true;
-    }
-
-    public QueueStage getStage(LocalBlockQueue queue) {
-        if (activeQueues.contains(queue)) {
-            return QueueStage.ACTIVE;
-        } else if (inactiveQueues.contains(queue)) {
-            return QueueStage.INACTIVE;
-        }
-        return QueueStage.NONE;
-    }
-
-    public boolean isStage(LocalBlockQueue queue, QueueStage stage) {
-        switch (stage) {
-            case ACTIVE:
-                return activeQueues.contains(queue);
-            case INACTIVE:
-                return inactiveQueues.contains(queue);
-            case NONE:
-                return !activeQueues.contains(queue) && !inactiveQueues.contains(queue);
-        }
-        return false;
-    }
-
-    public void enqueue(LocalBlockQueue queue) {
-        inactiveQueues.remove(queue);
-        if (queue.size() > 0 && !activeQueues.contains(queue)) {
-            queue.optimize();
-            activeQueues.add(queue);
-        }
-    }
-
-    public void dequeue(LocalBlockQueue queue) {
-        inactiveQueues.remove(queue);
-        activeQueues.remove(queue);
-    }
-
-    public List<LocalBlockQueue> getAllQueues() {
-        ArrayList<LocalBlockQueue> list =
-            new ArrayList<>(activeQueues.size() + inactiveQueues.size());
-        list.addAll(inactiveQueues);
-        list.addAll(activeQueues);
-        return list;
-    }
-
-    public List<LocalBlockQueue> getActiveQueues() {
-        return new ArrayList<>(activeQueues);
-    }
-
-    public List<LocalBlockQueue> getInactiveQueues() {
-        return new ArrayList<>(inactiveQueues);
-    }
-
-    public void flush(LocalBlockQueue queue) {
-        SET_TASK.value1 = Long.MAX_VALUE;
-        SET_TASK.value2 = queue;
-        if (SET_TASK.value2 == null) {
-            return;
-        }
-        if (PlotSquared.get().isMainThread(Thread.currentThread())) {
-            throw new IllegalStateException("Must be flushed on the main thread!");
-        }
-        // Disable the async catcher as it can't discern async vs parallel
-        SET_TASK.value2.startSet(true);
-        try {
-            if (PARALLEL_THREADS <= 1) {
-                SET_TASK.run();
-            } else {
-                ArrayList<Thread> threads = new ArrayList<>();
-                for (int i = 0; i < PARALLEL_THREADS; i++) {
-                    threads.add(new Thread(SET_TASK));
-                }
-                for (Thread thread : threads) {
-                    thread.start();
-                }
-                for (Thread thread : threads) {
-                    try {
-                        thread.join();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        } catch (Throwable e) {
-            e.printStackTrace();
-        } finally {
-            // Enable it again (note that we are still on the main thread)
-            SET_TASK.value2.endSet(true);
-            dequeue(queue);
-        }
-    }
-
-    public LocalBlockQueue getNextQueue() {
-        long now = System.currentTimeMillis();
-        while (activeQueues.size() > 0) {
-            LocalBlockQueue queue = activeQueues.peek();
-            if (queue != null && queue.size() > 0) {
-                queue.setModified(now);
-                return queue;
-            } else {
-                activeQueues.poll();
-            }
-        }
-        int size = inactiveQueues.size();
-        if (size > 0) {
-            Iterator<LocalBlockQueue> iter = inactiveQueues.iterator();
-            try {
-                int total = 0;
-                LocalBlockQueue firstNonEmpty = null;
-                while (iter.hasNext()) {
-                    LocalBlockQueue queue = iter.next();
-                    long age = now - queue.getModified();
-                    total += queue.size();
-                    if (queue.size() == 0) {
-                        if (age > 1000) {
-                            iter.remove();
-                        }
-                        continue;
-                    }
-                    if (firstNonEmpty == null) {
-                        firstNonEmpty = queue;
-                    }
-                    if (total > 64) {
-                        firstNonEmpty.setModified(now);
-                        return firstNonEmpty;
-                    }
-                    if (age > 60000) {
-                        queue.setModified(now);
-                        return queue;
-                    }
-                }
-            } catch (ConcurrentModificationException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    public boolean isDone() {
-        return activeQueues.size() == 0 && inactiveQueues.size() == 0;
-    }
-
-    public boolean addTask(final Runnable whenDone) {
-        if (this.isDone()) {
-            // Run
-            this.tasks();
-            if (whenDone != null) {
-                whenDone.run();
-            }
-            return true;
-        }
-        if (whenDone != null) {
-            this.runnables.add(whenDone);
-        }
-        return false;
-    }
-
-    public synchronized boolean tasks() {
-        if (this.runnables.isEmpty()) {
-            return false;
-        }
-        final ArrayList<Runnable> tmp = new ArrayList<>(this.runnables);
-        this.runnables.clear();
-        for (final Runnable runnable : tmp) {
-            runnable.run();
-        }
-        return true;
-    }
-
-    public enum QueueStage {
-        INACTIVE, ACTIVE, NONE
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
deleted file mode 100644
index 65dc13971..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-import java.util.Map;
-
-public abstract class LocalBlockQueue {
-
-    public LocalBlockQueue(String world) {
-        // Implement this elsewhere
-    }
-
-    public ScopedLocalBlockQueue getForChunk(int x, int z) {
-        int bx = x << 4;
-        int bz = z << 4;
-        return new ScopedLocalBlockQueue(this, new Location(getWorld(), bx, 0, bz),
-            new Location(getWorld(), bx + 15, 255, bz + 15));
-    }
-
-    public abstract boolean next();
-
-    public abstract void startSet(boolean parallel);
-
-    public abstract void endSet(boolean parallel);
-
-    public abstract int size();
-
-    public abstract void optimize();
-
-    public abstract long getModified();
-
-    public abstract void setModified(long modified);
-
-    public abstract boolean setBlock(final int x, final int y, final int z, final PlotBlock id);
-
-    public abstract boolean setBlock(final int x, final int y, final int z, final BaseBlock id);
-
-    public boolean setTile(int x, int y, int z, CompoundTag tag) {
-        SchematicHandler.manager.restoreTile(this, tag, x, y, z);
-        return true;
-    }
-
-    public abstract PlotBlock getBlock(int x, int y, int z);
-
-    public abstract boolean setBiome(int x, int z, String biome);
-
-    public abstract String getWorld();
-
-    public abstract void flush();
-
-    public final void setModified() {
-        setModified(System.currentTimeMillis());
-    }
-
-    public abstract void refreshChunk(int x, int z);
-
-    public abstract void fixChunkLighting(int x, int z);
-
-    public abstract void regenChunk(int x, int z);
-
-    public final void regenChunkSafe(int x, int z) {
-        regenChunk(x, z);
-        fixChunkLighting(x, z);
-        ChunkLoc loc = new ChunkLoc(x, z);
-        for (Map.Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-            PlotPlayer pp = entry.getValue();
-            Location pLoc = pp.getLocation();
-            if (!StringMan.isEqual(getWorld(), pLoc.getWorld()) || !pLoc.getChunkLoc()
-                .equals(loc)) {
-                continue;
-            }
-            pLoc.setY(WorldUtil.IMP.getHighestBlock(getWorld(), pLoc.getX(), pLoc.getZ()));
-            pp.teleport(pLoc);
-        }
-    }
-
-    public void enqueue() {
-        GlobalBlockQueue.IMP.enqueue(this);
-    }
-
-    public void setCuboid(Location pos1, Location pos2, PlotBlock block) {
-        for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
-            for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                    setBlock(x, y, z, block);
-                }
-            }
-        }
-    }
-
-    public void setCuboid(Location pos1, Location pos2, BlockBucket blocks) {
-        for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
-            for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                    // int i = PseudoRandom.random.random(blocks.length);
-                    // PlotBlock block = blocks[i];
-                    setBlock(x, y, z, blocks.getBlock());
-                }
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java
deleted file mode 100644
index d0a561111..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/OffsetLocalBlockQueue.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-public class OffsetLocalBlockQueue extends DelegateLocalBlockQueue {
-    private final int ox;
-    private final int oy;
-    private final int oz;
-
-    public OffsetLocalBlockQueue(LocalBlockQueue parent, int ox, int oy, int oz) {
-        super(parent);
-        this.ox = ox;
-        this.oy = oy;
-        this.oz = oz;
-    }
-
-    @Override public boolean setBiome(int x, int y, String biome) {
-        return super.setBiome(ox + x, oy + y, biome);
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
-        return super.setBlock(ox + x, oy + y, oz + z, id);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java
deleted file mode 100644
index 3c96e0d5f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/QueueProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-public abstract class QueueProvider {
-    public static QueueProvider of(final Class<? extends LocalBlockQueue> primary,
-        final Class<? extends LocalBlockQueue> fallback) {
-        return new QueueProvider() {
-
-            private boolean failed = false;
-
-            @Override public LocalBlockQueue getNewQueue(String world) {
-                if (!failed) {
-                    try {
-                        return (LocalBlockQueue) primary.getConstructors()[0].newInstance(world);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        failed = true;
-                    }
-                }
-                try {
-                    return (LocalBlockQueue) fallback.getConstructors()[0].newInstance(world);
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                }
-                return null;
-            }
-        };
-    }
-
-    public abstract LocalBlockQueue getNewQueue(String world);
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
deleted file mode 100644
index 352465aea..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.block;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.sk89q.worldedit.world.block.BaseBlock;
-
-public class ScopedLocalBlockQueue extends DelegateLocalBlockQueue {
-    private final int minX;
-    private final int minY;
-    private final int minZ;
-
-    private final int maxX;
-    private final int maxY;
-    private final int maxZ;
-
-    private final int dx;
-    private final int dy;
-    private final int dz;
-
-    public ScopedLocalBlockQueue(LocalBlockQueue parent, Location min, Location max) {
-        super(parent);
-        this.minX = min.getX();
-        this.minY = min.getY();
-        this.minZ = min.getZ();
-
-        this.maxX = max.getX();
-        this.maxY = max.getY();
-        this.maxZ = max.getZ();
-
-        this.dx = maxX - minX;
-        this.dy = maxY - minY;
-        this.dz = maxZ - minZ;
-    }
-
-
-    @Override public boolean setBiome(int x, int z, String biome) {
-        return x >= 0 && x <= dx && z >= 0 && z <= dz && super.setBiome(x + minX, z + minZ, biome);
-    }
-
-    public void fillBiome(String biome) {
-        for (int x = 0; x <= dx; x++) {
-            for (int z = 0; z < dz; z++) {
-                setBiome(x, z, biome);
-            }
-        }
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
-        return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super
-            .setBlock(x + minX, y + minY, z + minZ, id);
-    }
-
-    @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-        return x >= 0 && x <= dx && y >= 0 && y <= dy && z >= 0 && z <= dz && super
-            .setBlock(x + minX, y + minY, z + minZ, id);
-    }
-
-    public Location getMin() {
-        return new Location(getWorld(), minX, minY, minZ);
-    }
-
-    public Location getMax() {
-        return new Location(getWorld(), maxX, maxY, maxZ);
-    }
-
-    /**
-     * Run a task for each x,z value corresponding to the plot at that location<br>
-     * - Plot: The plot at the x,z (may be null)<br>
-     * - Location: The location in the chunk (y = 0)<br>
-     * - PlotChunk: Reference to this chunk object<br>
-     *
-     * @param task
-     */
-    public void mapByType2D(RunnableVal3<Plot, Integer, Integer> task) {
-        int bx = minX;
-        int bz = minZ;
-        PlotArea area = PlotSquared.get().getPlotArea(getWorld(), null);
-        Location loc = new Location(getWorld(), bx, 0, bz);
-        if (area != null) {
-            PlotManager manager = area.getPlotManager();
-            for (int x = 0; x < 16; x++) {
-                loc.setX(bx + x);
-                for (int z = 0; z < 16; z++) {
-                    loc.setZ(bz + z);
-                    task.run(area.getPlotAbs(loc), x, z);
-                }
-            }
-        } else {
-            for (int x = 0; x < 16; x++) {
-                loc.setX(bx + x);
-                for (int z = 0; z < 16; z++) {
-                    loc.setZ(bz + z);
-                    task.run(loc.getPlotAbs(), x, z);
-                }
-            }
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
deleted file mode 100644
index 0362e0831..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ /dev/null
@@ -1,449 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.expiry;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-
-public class ExpireManager {
-
-    public static ExpireManager IMP;
-    private final ConcurrentHashMap<UUID, Long> dates_cache;
-    private final ConcurrentHashMap<UUID, Long> account_age_cache;
-    private volatile HashSet<Plot> plotsToDelete;
-    private ArrayDeque<ExpiryTask> tasks;
-    /**
-     * 0 = stopped, 1 = stopping, 2 = running
-     */
-    private int running;
-
-    public ExpireManager() {
-        tasks = new ArrayDeque<>();
-        dates_cache = new ConcurrentHashMap<>();
-        account_age_cache = new ConcurrentHashMap<>();
-    }
-
-    public void addTask(ExpiryTask task) {
-        PlotSquared.debug("Adding new expiry task!");
-        this.tasks.add(task);
-    }
-
-    public void handleJoin(PlotPlayer pp) {
-        storeDate(pp.getUUID(), System.currentTimeMillis());
-        if (plotsToDelete != null && !plotsToDelete.isEmpty()) {
-            for (Plot plot : pp.getPlots()) {
-                plotsToDelete.remove(plot);
-            }
-        }
-        confirmExpiry(pp);
-    }
-
-    public void handleEntry(PlotPlayer pp, Plot plot) {
-        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
-            .hasPermission("plots.admin.command.autoclear") && plotsToDelete.contains(plot)) {
-            if (!isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
-                confirmExpiry(pp);
-            } else {
-                plotsToDelete.remove(plot);
-                confirmExpiry(pp);
-            }
-        }
-    }
-
-    /**
-     * Gets the account last joined - first joined (or Long.MAX_VALUE)
-     *
-     * @return result
-     */
-    public long getAccountAge(UUID uuid) {
-        Long value = this.account_age_cache.get(uuid);
-        return value == null ? Long.MAX_VALUE : value;
-    }
-
-    public long getTimestamp(UUID uuid) {
-        Long value = this.dates_cache.get(uuid);
-        return value == null ? 0 : value;
-    }
-
-    public void updateExpired(Plot plot) {
-        if (plotsToDelete != null && !plotsToDelete.isEmpty() && plotsToDelete.contains(plot)) {
-            if (isExpired(new ArrayDeque<>(tasks), plot).isEmpty()) {
-                plotsToDelete.remove(plot);
-            }
-        }
-    }
-
-    public void confirmExpiry(final PlotPlayer pp) {
-        if (pp.getMeta("ignoreExpireTask") != null) {
-            return;
-        }
-        if (plotsToDelete != null && !plotsToDelete.isEmpty() && pp
-            .hasPermission("plots.admin.command.autoclear")) {
-            final int num = plotsToDelete.size();
-            while (!plotsToDelete.isEmpty()) {
-                Iterator<Plot> iter = plotsToDelete.iterator();
-                final Plot current = iter.next();
-                if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
-                    TaskManager.runTask(() -> {
-                        pp.setMeta("ignoreExpireTask", true);
-                        pp.teleport(current.getCenter());
-                        pp.deleteMeta("ignoreExpireTask");
-                        PlotMessage msg = new PlotMessage()
-                            .text(num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
-                            .color("$1").text(current.toString()).color("$2")
-                            .suggest("/plot list expired").tooltip("/plot list expired")
-                            //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
-                            .text("\n - ").color("$3").text("Delete this (/plot delete)")
-                            .color("$2").suggest("/plot delete").tooltip("/plot delete")
-                            .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
-                            .color("$2").suggest("/plot set keep 1d").tooltip("/plot set keep 1d")
-                            .text("\n - ").color("$3").text("Keep this (/plot set keep true)")
-                            .color("$2").suggest("/plot set keep true")
-                            .tooltip("/plot set keep true").text("\n - ").color("$3")
-                            .text("Don't show me this").color("$2")
-                            .suggest("/plot toggle clear-confirmation")
-                            .tooltip("/plot toggle clear-confirmation");
-                        msg.send(pp);
-                    });
-                    return;
-                } else {
-                    iter.remove();
-                }
-            }
-            plotsToDelete.clear();
-        }
-    }
-
-
-    public boolean cancelTask() {
-        if (this.running != 2) {
-            return false;
-        }
-        this.running = 1;
-        return true;
-    }
-
-    public boolean runAutomatedTask() {
-        return runTask(new RunnableVal3<Plot, Runnable, Boolean>() {
-            @Override public void run(Plot plot, Runnable runnable, Boolean confirm) {
-                if (confirm) {
-                    if (plotsToDelete == null) {
-                        plotsToDelete = new HashSet<>();
-                    }
-                    plotsToDelete.add(plot);
-                    runnable.run();
-                } else {
-                    deleteWithMessage(plot, runnable);
-                }
-            }
-        });
-    }
-
-    public Collection<ExpiryTask> isExpired(ArrayDeque<ExpiryTask> applicable, Plot plot) {
-        // Filter out invalid worlds
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask et = applicable.poll();
-            if (et.applies(plot.getArea())) {
-                applicable.add(et);
-            }
-        }
-        if (applicable.isEmpty()) {
-            return new ArrayList<>();
-        }
-        boolean shouldCheckAccountAge = false;
-
-        long diff = getAge(plot);
-        if (diff == 0) {
-            return new ArrayList<>();
-        }
-        // Filter out non old plots
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask et = applicable.poll();
-            if (et.applies(diff)) {
-                applicable.add(et);
-                shouldCheckAccountAge |= et.getSettings().SKIP_ACCOUNT_AGE_DAYS != -1;
-            }
-        }
-        if (applicable.isEmpty()) {
-            return new ArrayList<>();
-        }
-        // Check account age
-        if (shouldCheckAccountAge) {
-            long accountAge = getAge(plot);
-            for (int i = 0; i < applicable.size(); i++) {
-                ExpiryTask et = applicable.poll();
-                if (et.appliesAccountAge(accountAge)) {
-                    applicable.add(et);
-                }
-            }
-            if (applicable.isEmpty()) {
-                return new ArrayList<>();
-            }
-        }
-
-        // Run applicable non confirming tasks
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask expiryTask = applicable.poll();
-            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
-                if (!expiryTask.requiresConfirmation()) {
-                    return Collections.singletonList(expiryTask);
-                }
-            }
-            applicable.add(expiryTask);
-        }
-        // Run applicable confirming tasks
-        for (int i = 0; i < applicable.size(); i++) {
-            ExpiryTask expiryTask = applicable.poll();
-            if (!expiryTask.needsAnalysis() || plot.getArea().TYPE != 0) {
-                return Collections.singletonList(expiryTask);
-            }
-            applicable.add(expiryTask);
-        }
-        return applicable;
-    }
-
-    public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
-        ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
-        queue.removeIf(expiryTask -> !expiryTask.applies(area));
-        return queue;
-    }
-
-    public void passesComplexity(PlotAnalysis analysis, Collection<ExpiryTask> applicable,
-        RunnableVal<Boolean> success, Runnable failure) {
-        if (analysis != null) {
-            // Run non confirming tasks
-            for (ExpiryTask et : applicable) {
-                if (!et.requiresConfirmation() && et.applies(analysis)) {
-                    success.run(false);
-                    return;
-                }
-            }
-            for (ExpiryTask et : applicable) {
-                if (et.applies(analysis)) {
-                    success.run(true);
-                    return;
-                }
-            }
-            failure.run();
-        }
-    }
-
-    public boolean runTask(final RunnableVal3<Plot, Runnable, Boolean> expiredTask) {
-        if (this.running != 0) {
-            return false;
-        }
-        this.running = 2;
-        final ConcurrentLinkedDeque<Plot> plots =
-            new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                final Runnable task = this;
-                if (ExpireManager.this.running != 2) {
-                    ExpireManager.this.running = 0;
-                    return;
-                }
-                long start = System.currentTimeMillis();
-                while (!plots.isEmpty()) {
-                    if (ExpireManager.this.running != 2) {
-                        ExpireManager.this.running = 0;
-                        return;
-                    }
-                    Plot plot = plots.poll();
-                    PlotArea area = plot.getArea();
-                    final Plot newPlot = area.getPlot(plot.getId());
-                    final ArrayDeque<ExpiryTask> applicable = new ArrayDeque<>(tasks);
-                    final Collection<ExpiryTask> expired = isExpired(applicable, newPlot);
-                    if (expired.isEmpty()) {
-                        continue;
-                    }
-                    for (ExpiryTask expiryTask : expired) {
-                        if (!expiryTask.needsAnalysis()) {
-                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
-                                expiryTask.requiresConfirmation());
-                            return;
-                        }
-                    }
-                    final RunnableVal<PlotAnalysis> handleAnalysis =
-                        new RunnableVal<PlotAnalysis>() {
-                            @Override public void run(final PlotAnalysis changed) {
-                                passesComplexity(changed, expired, new RunnableVal<Boolean>() {
-                                    @Override public void run(Boolean confirmation) {
-                                        expiredTask.run(newPlot,
-                                            () -> TaskManager.IMP.taskLaterAsync(task, 1),
-                                            confirmation);
-                                    }
-                                }, () -> {
-                                    FlagManager
-                                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
-                                    TaskManager.runTaskLaterAsync(task, 20);
-                                });
-                            }
-                        };
-                    final Runnable doAnalysis =
-                        () -> HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
-
-                    PlotAnalysis analysis = newPlot.getComplexity(null);
-                    if (analysis != null) {
-                        passesComplexity(analysis, expired, new RunnableVal<Boolean>() {
-                            @Override public void run(Boolean value) {
-                                doAnalysis.run();
-                            }
-                        }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
-                    } else {
-                        doAnalysis.run();
-                    }
-                    return;
-                }
-                if (plots.isEmpty()) {
-                    ExpireManager.this.running = 3;
-                    TaskManager.runTaskLater(() -> {
-                        if (ExpireManager.this.running == 3) {
-                            ExpireManager.this.running = 2;
-                            runTask(expiredTask);
-                        }
-                    }, 86400000);
-                } else {
-                    TaskManager.runTaskLaterAsync(task, 20 * 10);
-                }
-            }
-        });
-        return true;
-    }
-
-    public void storeDate(UUID uuid, long time) {
-        Long existing = this.dates_cache.put(uuid, time);
-        if (existing != null) {
-            long diff = time - existing;
-            if (diff > 0) {
-                Long account_age = this.account_age_cache.get(uuid);
-                if (account_age != null) {
-                    this.account_age_cache.put(uuid, account_age + diff);
-                }
-            }
-        }
-    }
-
-    public void storeAccountAge(UUID uuid, long time) {
-        this.account_age_cache.put(uuid, time);
-    }
-
-    public HashSet<Plot> getPendingExpired() {
-        return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
-    }
-
-    public void deleteWithMessage(Plot plot, Runnable whenDone) {
-        if (plot.isMerged()) {
-            plot.unlinkPlot(true, false);
-        }
-        for (UUID helper : plot.getTrusted()) {
-            PlotPlayer player = UUIDHandler.getPlayer(helper);
-            if (player != null) {
-                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
-            }
-        }
-        for (UUID helper : plot.getMembers()) {
-            PlotPlayer player = UUIDHandler.getPlayer(helper);
-            if (player != null) {
-                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
-            }
-        }
-        Set<Plot> plots = plot.getConnectedPlots();
-        plot.deletePlot(whenDone);
-        PlotAnalysis changed = plot.getComplexity(null);
-        int changes = changed == null ? 0 : changed.changes_sd;
-        int modified = changed == null ? 0 : changed.changes;
-        PlotSquared.debug(
-            "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
-                + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
-                .getString(plots));
-        PlotSquared.debug("$4 - Area: " + plot.getArea());
-        if (plot.hasOwner()) {
-            PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
-        } else {
-            PlotSquared.debug("$4 - Owner: Unowned");
-        }
-    }
-
-    public long getAge(UUID uuid) {
-        if (UUIDHandler.getPlayer(uuid) != null) {
-            return 0;
-        }
-        String name = UUIDHandler.getName(uuid);
-        if (name != null) {
-            Long last = this.dates_cache.get(uuid);
-            if (last == null) {
-                OfflinePlotPlayer opp;
-                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid);
-                } else {
-                    opp = UUIDHandler.getUUIDWrapper().getOfflinePlayer(name);
-                }
-                if (opp != null && (last = opp.getLastPlayed()) != 0) {
-                    this.dates_cache.put(uuid, last);
-                } else {
-                    return 0;
-                }
-            }
-            if (last == 0) {
-                return 0;
-            }
-            return System.currentTimeMillis() - last;
-        }
-        return 0;
-    }
-
-    public long getAccountAge(Plot plot) {
-        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
-            return Long.MAX_VALUE;
-        }
-        long max = 0;
-        for (UUID owner : plot.getOwners()) {
-            long age = getAccountAge(owner);
-            max = Math.max(age, max);
-        }
-        return max;
-    }
-
-    public long getAge(Plot plot) {
-        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
-            return 0;
-        }
-        Optional<?> keep = plot.getFlag(Flags.KEEP);
-        if (keep.isPresent()) {
-            Object value = keep.get();
-            if (value instanceof Boolean) {
-                if (Boolean.TRUE.equals(value)) {
-                    return 0;
-                }
-            } else if (value instanceof Long) {
-                if ((Long) value > System.currentTimeMillis()) {
-                    return 0;
-                }
-            } else { // Invalid?
-                return 0;
-            }
-        }
-        long min = Long.MAX_VALUE;
-        for (UUID owner : plot.getOwners()) {
-            long age = getAge(owner);
-            if (age < min) {
-                min = age;
-            }
-        }
-        return min;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
deleted file mode 100644
index ab95068da..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpirySettings.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.expiry;
-
-public class ExpirySettings {
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
deleted file mode 100644
index df1244a12..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.expiry;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotFilter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-public class ExpiryTask {
-    private final Settings.Auto_Clear settings;
-    private long cutoffThreshold = Long.MIN_VALUE;
-
-    public ExpiryTask(Settings.Auto_Clear settings) {
-        this.settings = settings;
-    }
-
-    public Settings.Auto_Clear getSettings() {
-        return settings;
-    }
-
-    public boolean allowsArea(PlotArea area) {
-        return settings.WORLDS.contains(area.toString()) || settings.WORLDS.contains(area.worldname)
-            || settings.WORLDS.contains("*");
-    }
-
-    public boolean applies(PlotArea area) {
-        if (allowsArea(area)) {
-            if (settings.REQUIRED_PLOTS <= 0) {
-                return true;
-            }
-            Set<Plot> plots = null;
-            if (cutoffThreshold != Long.MAX_VALUE
-                && area.getPlots().size() > settings.REQUIRED_PLOTS
-                || (plots = getPlotsToCheck()).size() > settings.REQUIRED_PLOTS) {
-                // calculate cutoff
-                if (cutoffThreshold == Long.MIN_VALUE) {
-                    plots = plots != null ? plots : getPlotsToCheck();
-                    int diff = settings.REQUIRED_PLOTS;
-                    boolean min = true;
-                    if (settings.REQUIRED_PLOTS - plots.size() < settings.REQUIRED_PLOTS) {
-                        min = false;
-                        diff = settings.REQUIRED_PLOTS - plots.size();
-                    }
-                    List<Long> entireList = new ArrayList<>();
-                    for (Plot plot : plots) {
-                        entireList.add(ExpireManager.IMP.getAge(plot));
-                    }
-                    List<Long> top = new ArrayList<>(diff + 1);
-                    if (diff > 1000) {
-                        Collections.sort(entireList);
-                        cutoffThreshold = entireList.get(settings.REQUIRED_PLOTS);
-                    } else {
-                        loop:
-                        for (long num : entireList) {
-                            int size = top.size();
-                            if (size == 0) {
-                                top.add(num);
-                                continue;
-                            }
-                            long end = top.get(size - 1);
-                            if (min ? num < end : num > end) {
-                                for (int i = 0; i < size; i++) {
-                                    long existing = top.get(i);
-                                    if (min ? num < existing : num > existing) {
-                                        top.add(i, num);
-                                        if (size == diff) {
-                                            top.remove(size);
-                                        }
-                                        continue loop;
-                                    }
-                                }
-                            }
-                            if (size < diff) {
-                                top.add(num);
-                            }
-                        }
-                        cutoffThreshold = top.get(top.size() - 1);
-                    }
-                    // Add half a day, as expiry is performed each day
-                    cutoffThreshold += (TimeUnit.DAYS.toMillis(1) / 2);
-                }
-                return true;
-            } else {
-                cutoffThreshold = Long.MAX_VALUE;
-            }
-        }
-        return false;
-    }
-
-    public Set<Plot> getPlotsToCheck() {
-        return PlotSquared.get().getPlots(new PlotFilter() {
-            @Override public boolean allowsArea(PlotArea area) {
-                return ExpiryTask.this.allowsArea(area);
-            }
-        });
-    }
-
-    public boolean applies(long diff) {
-        return diff > TimeUnit.DAYS.toMillis(settings.DAYS) && diff > cutoffThreshold;
-    }
-
-    public boolean appliesAccountAge(long accountAge) {
-        if (settings.SKIP_ACCOUNT_AGE_DAYS != -1)
-            return accountAge <= TimeUnit.DAYS.toMillis(settings.SKIP_ACCOUNT_AGE_DAYS);
-        return false;
-    }
-
-    public boolean needsAnalysis() {
-        return settings.THRESHOLD > 0;
-    }
-
-    public boolean applies(PlotAnalysis analysis) {
-        return analysis.getComplexity(settings) <= settings.THRESHOLD;
-    }
-
-    public boolean requiresConfirmation() {
-        return settings.CONFIRMATION;
-    }
-
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
deleted file mode 100644
index 2e7854828..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
+++ /dev/null
@@ -1,552 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.expiry;
-
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-
-import java.lang.reflect.Array;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class PlotAnalysis {
-    public static boolean running = false;
-    public int changes;
-    public int faces;
-    public int data;
-    public int air;
-    public int variety;
-    public int changes_sd;
-    public int faces_sd;
-    public int data_sd;
-    public int air_sd;
-    public int variety_sd;
-    private int complexity;
-
-    public static PlotAnalysis getAnalysis(Plot plot, Settings.Auto_Clear settings) {
-        Optional<List<Integer>> flag = plot.getFlag(Flags.ANALYSIS);
-        if (flag.isPresent()) {
-            PlotAnalysis analysis = new PlotAnalysis();
-            List<Integer> values = flag.get();
-            analysis.changes = values.get(0); // 2126
-            analysis.faces = values.get(1); // 90
-            analysis.data = values.get(2); // 0
-            analysis.air = values.get(3); // 19100
-            analysis.variety = values.get(4); // 266
-
-            analysis.changes_sd = values.get(5); // 2104
-            analysis.faces_sd = values.get(6); // 89
-            analysis.data_sd = values.get(7); // 0
-            analysis.air_sd = values.get(8); // 18909
-            analysis.variety_sd = values.get(9); // 263
-
-            analysis.complexity = settings != null ? analysis.getComplexity(settings) : 0;
-            return analysis;
-        }
-        return null;
-    }
-
-    public static void analyzePlot(Plot plot, RunnableVal<PlotAnalysis> whenDone) {
-        HybridUtils.manager.analyzePlot(plot, whenDone);
-    }
-
-    /**
-     * This will set the optimal modifiers for the plot analysis based on the current plot ratings<br>
-     * - Will be used to calibrate the threshold for plot clearing
-     *
-     * @param whenDone
-     * @param threshold
-     */
-    public static void calcOptimalModifiers(final Runnable whenDone, final double threshold) {
-        if (running) {
-            PlotSquared.debug("Calibration task already in progress!");
-            return;
-        }
-        if (threshold <= 0 || threshold >= 1) {
-            PlotSquared.debug(
-                "Invalid threshold provided! (Cannot be 0 or 100 as then there's no point calibrating)");
-            return;
-        }
-        running = true;
-        PlotSquared.debug(" - Fetching all plots");
-        final ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots());
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                Iterator<Plot> iterator = plots.iterator();
-                PlotSquared.debug(
-                    " - $1Reducing " + plots.size() + " plots to those with sufficient data");
-                while (iterator.hasNext()) {
-                    Plot plot = iterator.next();
-                    if (plot.getSettings().ratings == null || plot.getSettings().getRatings()
-                        .isEmpty()) {
-                        iterator.remove();
-                    } else {
-                        plot.addRunning();
-                    }
-                }
-                PlotSquared.debug(" - | Reduced to " + plots.size() + " plots");
-
-                if (plots.size() < 3) {
-                    PlotSquared.debug(
-                        "Calibration cancelled due to insufficient comparison data, please try again later");
-                    running = false;
-                    for (Plot plot : plots) {
-                        plot.removeRunning();
-                    }
-                    return;
-                }
-
-                PlotSquared.debug(" - $1Analyzing plot contents (this may take a while)");
-
-                int[] changes = new int[plots.size()];
-                int[] faces = new int[plots.size()];
-                int[] data = new int[plots.size()];
-                int[] air = new int[plots.size()];
-                int[] variety = new int[plots.size()];
-
-                int[] changes_sd = new int[plots.size()];
-                int[] faces_sd = new int[plots.size()];
-                int[] data_sd = new int[plots.size()];
-                int[] air_sd = new int[plots.size()];
-                int[] variety_sd = new int[plots.size()];
-
-                final int[] ratings = new int[plots.size()];
-
-                final AtomicInteger mi = new AtomicInteger(0);
-
-                Thread ratingAnalysis = new Thread(() -> {
-                    for (; mi.intValue() < plots.size(); mi.incrementAndGet()) {
-                        int i = mi.intValue();
-                        Plot plot = plots.get(i);
-                        ratings[i] = (int) (
-                            (plot.getAverageRating() + plot.getSettings().getRatings().size())
-                                * 100);
-                        PlotSquared.debug(" | " + plot + " (rating) " + ratings[i]);
-                    }
-                });
-                ratingAnalysis.start();
-
-                ArrayDeque<Plot> plotsQueue = new ArrayDeque<>(plots);
-                while (true) {
-                    final Plot queuePlot = plotsQueue.poll();
-                    if (queuePlot == null) {
-                        break;
-                    }
-                    PlotSquared.debug(" | " + queuePlot);
-                    final Object lock = new Object();
-                    TaskManager.runTask(new Runnable() {
-                        @Override public void run() {
-                            analyzePlot(queuePlot, new RunnableVal<PlotAnalysis>() {
-                                @Override public void run(PlotAnalysis value) {
-                                    try {
-                                        synchronized (this) {
-                                            wait(10000);
-                                        }
-                                    } catch (InterruptedException e) {
-                                        e.printStackTrace();
-                                    }
-                                    synchronized (lock) {
-                                        queuePlot.removeRunning();
-                                        lock.notify();
-                                    }
-                                }
-                            });
-                        }
-                    });
-                    try {
-                        synchronized (lock) {
-                            lock.wait();
-                        }
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                PlotSquared.debug(
-                    " - $1Waiting on plot rating thread: " + mi.intValue() * 100 / plots.size()
-                        + "%");
-                try {
-                    ratingAnalysis.join();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-
-                PlotSquared
-                    .debug(" - $1Processing and grouping single plot analysis for bulk processing");
-                for (int i = 0; i < plots.size(); i++) {
-                    Plot plot = plots.get(i);
-                    PlotSquared.debug(" | " + plot);
-                    PlotAnalysis analysis = plot.getComplexity(null);
-
-                    changes[i] = analysis.changes;
-                    faces[i] = analysis.faces;
-                    data[i] = analysis.data;
-                    air[i] = analysis.air;
-                    variety[i] = analysis.variety;
-
-                    changes_sd[i] = analysis.changes_sd;
-                    faces_sd[i] = analysis.faces_sd;
-                    data_sd[i] = analysis.data_sd;
-                    air_sd[i] = analysis.air_sd;
-                    variety_sd[i] = analysis.variety_sd;
-                }
-
-                PlotSquared.debug(" - $1Calculating rankings");
-
-                int[] rankRatings = rank(ratings);
-                int n = rankRatings.length;
-
-                int optimalIndex = (int) Math.round((1 - threshold) * (n - 1));
-
-                PlotSquared.debug(" - $1Calculating rank correlation: ");
-                PlotSquared.debug(
-                    " - The analyzed plots which were processed and put into bulk data will be compared and correlated to the plot ranking");
-                PlotSquared.debug(
-                    " - The calculated correlation constant will then be used to calibrate the threshold for auto plot clearing");
-
-                Settings.Auto_Clear settings = new Settings.Auto_Clear();
-
-                int[] rankChanges = rank(changes);
-                int[] sdChanges = getSD(rankChanges, rankRatings);
-                int[] varianceChanges = square(sdChanges);
-                int sumChanges = sum(varianceChanges);
-                double factorChanges = getCC(n, sumChanges);
-                settings.CALIBRATION.CHANGES = factorChanges == 1 ?
-                    0 :
-                    (int) (factorChanges * 1000 / MathMan.getMean(changes));
-                PlotSquared.debug(" - | changes " + factorChanges);
-
-                int[] rankFaces = rank(faces);
-                int[] sdFaces = getSD(rankFaces, rankRatings);
-                int[] varianceFaces = square(sdFaces);
-                int sumFaces = sum(varianceFaces);
-                double factorFaces = getCC(n, sumFaces);
-                settings.CALIBRATION.FACES =
-                    factorFaces == 1 ? 0 : (int) (factorFaces * 1000 / MathMan.getMean(faces));
-                PlotSquared.debug(" - | faces " + factorFaces);
-
-                int[] rankData = rank(data);
-                int[] sdData = getSD(rankData, rankRatings);
-                int[] variance_data = square(sdData);
-                int sum_data = sum(variance_data);
-                double factor_data = getCC(n, sum_data);
-                settings.CALIBRATION.DATA =
-                    factor_data == 1 ? 0 : (int) (factor_data * 1000 / MathMan.getMean(data));
-                PlotSquared.debug(" - | data " + factor_data);
-
-                int[] rank_air = rank(air);
-                int[] sd_air = getSD(rank_air, rankRatings);
-                int[] variance_air = square(sd_air);
-                int sum_air = sum(variance_air);
-                double factor_air = getCC(n, sum_air);
-                settings.CALIBRATION.AIR =
-                    factor_air == 1 ? 0 : (int) (factor_air * 1000 / MathMan.getMean(air));
-                PlotSquared.debug(" - | air " + factor_air);
-
-                int[] rank_variety = rank(variety);
-                int[] sd_variety = getSD(rank_variety, rankRatings);
-                int[] variance_variety = square(sd_variety);
-                int sum_variety = sum(variance_variety);
-                double factor_variety = getCC(n, sum_variety);
-                settings.CALIBRATION.VARIETY = factor_variety == 1 ?
-                    0 :
-                    (int) (factor_variety * 1000 / MathMan.getMean(variety));
-                PlotSquared.debug(" - | variety " + factor_variety);
-
-                int[] rank_changes_sd = rank(changes_sd);
-                int[] sd_changes_sd = getSD(rank_changes_sd, rankRatings);
-                int[] variance_changes_sd = square(sd_changes_sd);
-                int sum_changes_sd = sum(variance_changes_sd);
-                double factor_changes_sd = getCC(n, sum_changes_sd);
-                settings.CALIBRATION.CHANGES_SD = factor_changes_sd == 1 ?
-                    0 :
-                    (int) (factor_changes_sd * 1000 / MathMan.getMean(changes_sd));
-                PlotSquared.debug(" - | changes_sd " + factor_changes_sd);
-
-                int[] rank_faces_sd = rank(faces_sd);
-                int[] sd_faces_sd = getSD(rank_faces_sd, rankRatings);
-                int[] variance_faces_sd = square(sd_faces_sd);
-                int sum_faces_sd = sum(variance_faces_sd);
-                double factor_faces_sd = getCC(n, sum_faces_sd);
-                settings.CALIBRATION.FACES_SD = factor_faces_sd == 1 ?
-                    0 :
-                    (int) (factor_faces_sd * 1000 / MathMan.getMean(faces_sd));
-                PlotSquared.debug(" - | faces_sd " + factor_faces_sd);
-
-                int[] rank_data_sd = rank(data_sd);
-                int[] sd_data_sd = getSD(rank_data_sd, rankRatings);
-                int[] variance_data_sd = square(sd_data_sd);
-                int sum_data_sd = sum(variance_data_sd);
-                double factor_data_sd = getCC(n, sum_data_sd);
-                settings.CALIBRATION.DATA_SD = factor_data_sd == 1 ?
-                    0 :
-                    (int) (factor_data_sd * 1000 / MathMan.getMean(data_sd));
-                PlotSquared.debug(" - | data_sd " + factor_data_sd);
-
-                int[] rank_air_sd = rank(air_sd);
-                int[] sd_air_sd = getSD(rank_air_sd, rankRatings);
-                int[] variance_air_sd = square(sd_air_sd);
-                int sum_air_sd = sum(variance_air_sd);
-                double factor_air_sd = getCC(n, sum_air_sd);
-                settings.CALIBRATION.AIR_SD =
-                    factor_air_sd == 1 ? 0 : (int) (factor_air_sd * 1000 / MathMan.getMean(air_sd));
-                PlotSquared.debug(" - | air_sd " + factor_air_sd);
-
-                int[] rank_variety_sd = rank(variety_sd);
-                int[] sd_variety_sd = getSD(rank_variety_sd, rankRatings);
-                int[] variance_variety_sd = square(sd_variety_sd);
-                int sum_variety_sd = sum(variance_variety_sd);
-                double factor_variety_sd = getCC(n, sum_variety_sd);
-                settings.CALIBRATION.VARIETY_SD = factor_variety_sd == 1 ?
-                    0 :
-                    (int) (factor_variety_sd * 1000 / MathMan.getMean(variety_sd));
-                PlotSquared.debug(" - | variety_sd " + factor_variety_sd);
-
-                int[] complexity = new int[n];
-
-                PlotSquared.debug(" $1Calculating threshold");
-                int max = 0;
-                int min = 0;
-                for (int i = 0; i < n; i++) {
-                    Plot plot = plots.get(i);
-                    PlotAnalysis analysis = plot.getComplexity(settings);
-                    complexity[i] = analysis.complexity;
-                    if (analysis.complexity < min) {
-                        min = analysis.complexity;
-                    } else if (analysis.complexity > max) {
-                        max = analysis.complexity;
-                    }
-                }
-                int optimalComplexity = Integer.MAX_VALUE;
-                if (min > 0 && max < 102400) { // If low size, use my fast ranking algorithm
-                    int[] rankComplexity = rank(complexity, max + 1);
-                    for (int i = 0; i < n; i++) {
-                        if (rankComplexity[i] == optimalIndex) {
-                            optimalComplexity = complexity[i];
-                            break;
-                        }
-                    }
-                    logln("Complexity: ");
-                    logln(rankComplexity);
-                    logln("Ratings: ");
-                    logln(rankRatings);
-                    logln("Correlation: ");
-                    logln(getCC(n, sum(square(getSD(rankComplexity, rankRatings)))));
-                    if (optimalComplexity == Integer.MAX_VALUE) {
-                        PlotSquared.debug(
-                            "Insufficient data to determine correlation! " + optimalIndex + " | "
-                                + n);
-                        running = false;
-                        for (Plot plot : plots) {
-                            plot.removeRunning();
-                        }
-                        return;
-                    }
-                } else { // Use the fast radix sort algorithm
-                    int[] sorted = complexity.clone();
-                    sort(sorted);
-                    optimalComplexity = sorted[optimalIndex];
-                    logln("Complexity: ");
-                    logln(complexity);
-                    logln("Ratings: ");
-                    logln(rankRatings);
-                }
-
-                // Save calibration
-                PlotSquared.debug(" $1Saving calibration");
-                Settings.AUTO_CLEAR.put("auto-calibrated", settings);
-                Settings.save(PlotSquared.get().worldsFile);
-                PlotSquared.debug("$1Done!");
-                running = false;
-                for (Plot plot : plots) {
-                    plot.removeRunning();
-                }
-                whenDone.run();
-            }
-        });
-    }
-
-    public static void logln(Object obj) {
-        PlotSquared.debug(log(obj));
-    }
-
-    public static String log(Object obj) {
-        String result = "";
-        if (obj.getClass().isArray()) {
-            String prefix = "";
-
-            for (int i = 0; i < Array.getLength(obj); i++) {
-                result += prefix + log(Array.get(obj, i));
-                prefix = ",";
-            }
-            return "( " + result + " )";
-        } else if (obj instanceof List<?>) {
-            String prefix = "";
-            for (Object element : (List<?>) obj) {
-                result += prefix + log(element);
-                prefix = ",";
-            }
-            return "[ " + result + " ]";
-        } else {
-            return obj.toString();
-        }
-    }
-
-    /**
-     * Get correlation coefficient.
-     *
-     * @return
-     */
-    public static double getCC(int n, int sum) {
-        return 1 - 6 * (double) sum / (n * (n * n - 1));
-    }
-
-    /**
-     * Sum of an array
-     *
-     * @param array
-     * @return
-     */
-    public static int sum(int[] array) {
-        int sum = 0;
-        for (int value : array) {
-            sum += value;
-        }
-        return sum;
-    }
-
-    /**
-     * A simple array squaring algorithm.
-     * - Used for calculating the variance
-     */
-    public static int[] square(int[] array) {
-        array = array.clone();
-        for (int i = 0; i < array.length; i++) {
-            array[i] *= array[i];
-        }
-        return array;
-    }
-
-    /**
-     * An optimized lossy standard deviation algorithm.
-     */
-    public static int[] getSD(int[]... ranks) {
-        if (ranks.length == 0) {
-            return null;
-        }
-        int[] result = new int[ranks[0].length];
-        for (int j = 0; j < ranks[0].length; j++) {
-            int sum = 0;
-            for (int[] rank : ranks) {
-                sum += rank[j];
-            }
-            int mean = sum / ranks.length;
-            int sd = 0;
-            for (int[] rank : ranks) {
-                int value = rank[j];
-                sd += value < mean ? mean - value : value - mean;
-            }
-            result[j] = sd;
-        }
-        return result;
-    }
-
-    /**
-     * An optimized algorithm for ranking a very specific set of inputs<br>
-     * - Input is an array of int with a max size of 102400<br>
-     * - A reduced sample space allows for sorting (and ranking in this case) in linear time
-     */
-    public static int[] rank(int[] input) {
-        return rank(input, 102400);
-    }
-
-    /**
-     * An optimized algorithm for ranking a very specific set of inputs.
-     */
-    public static int[] rank(int[] input, int size) {
-        int[] cache = new int[size];
-        int max = 0;
-        if (input.length < size) {
-            for (int value : input) {
-                if (value > max) {
-                    max = value;
-                }
-                cache[value]++;
-            }
-        } else {
-            max = cache.length - 1;
-            for (int value : input) {
-                cache[value]++;
-            }
-        }
-        int last = 0;
-        for (int i = max; i >= 0; i--) {
-            if (cache[i] != 0) {
-                cache[i] += last;
-                last = cache[i];
-                if (last == input.length) {
-                    break;
-                }
-            }
-        }
-
-        int[] ranks = new int[input.length];
-        for (int i = 0; i < input.length; i++) {
-            int index = input[i];
-            ranks[i] = cache[index];
-            cache[index]--;
-        }
-        return ranks;
-    }
-
-    public static void sort(int[] input) {
-        int SIZE = 10;
-        List<Integer>[] bucket = new ArrayList[SIZE];
-        for (int i = 0; i < bucket.length; i++) {
-            bucket[i] = new ArrayList<>();
-        }
-        boolean maxLength = false;
-        int placement = 1;
-        while (!maxLength) {
-            maxLength = true;
-            for (Integer i : input) {
-                int tmp = i / placement;
-                bucket[tmp % SIZE].add(i);
-                if (maxLength && tmp > 0) {
-                    maxLength = false;
-                }
-            }
-            int a = 0;
-            for (int b = 0; b < SIZE; b++) {
-                for (Integer i : bucket[b]) {
-                    input[a++] = i;
-                }
-                bucket[b].clear();
-            }
-            placement *= SIZE;
-        }
-    }
-
-    public List<Integer> asList() {
-        return Arrays
-            .asList(this.changes, this.faces, this.data, this.air, this.variety, this.changes_sd,
-                this.faces_sd, this.data_sd, this.air_sd, this.variety_sd);
-    }
-
-    public int getComplexity(Settings.Auto_Clear settings) {
-        Settings.Auto_Clear.CALIBRATION modifiers = settings.CALIBRATION;
-        if (this.complexity != 0) {
-            return this.complexity;
-        }
-        this.complexity = this.changes * modifiers.CHANGES + this.faces * modifiers.FACES
-            + this.data * modifiers.DATA + this.air * modifiers.AIR
-            + this.variety * modifiers.VARIETY + this.changes_sd * modifiers.CHANGES_SD
-            + this.faces_sd * modifiers.FACES_SD + this.data_sd * modifiers.DATA_SD
-            + this.air_sd * modifiers.AIR_SD + this.variety_sd * modifiers.VARIETY_SD;
-        return this.complexity;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
deleted file mode 100644
index c4716b8ef..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
-
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
-import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-import java.util.List;
-
-public class HelpMenu {
-
-    public static final int PER_PAGE = 5;
-
-    private final PlotPlayer player;
-    private HelpPage page = new HelpPage(CommandCategory.INFO, 0, 0);
-    private int maxPage;
-    private CommandCategory commandCategory;
-    private List<Command> commands;
-
-    public HelpMenu(PlotPlayer player) {
-        this.player = player;
-    }
-
-    public HelpMenu setCategory(CommandCategory commandCategory) {
-        this.commandCategory = commandCategory;
-        return this;
-    }
-
-    public HelpMenu getCommands() {
-        this.commands = MainCommand.getInstance().getCommands(this.commandCategory, this.player);
-        return this;
-    }
-
-    public HelpMenu generateMaxPages() {
-        this.maxPage = Math.max((this.commands.size() - 1) / PER_PAGE, 0);
-        return this;
-    }
-
-    public HelpMenu generatePage(int currentPage, String label) {
-        if (currentPage > this.maxPage) {
-            currentPage = this.maxPage;
-        }
-        if (currentPage < 0) {
-            currentPage = 0;
-        }
-        this.page = new HelpPage(this.commandCategory, currentPage, this.maxPage);
-        int max = Math.min((currentPage * PER_PAGE) + (PER_PAGE - 1), this.commands.size());
-        for (int i = currentPage * PER_PAGE; i < max; i++) {
-            this.page.addHelpItem(new HelpObject(this.commands.get(i), label));
-        }
-        return this;
-    }
-
-    public void render() {
-        this.page.render(this.player);
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
deleted file mode 100644
index f972f5d8e..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
-
-import com.github.intellectualsites.plotsquared.commands.Argument;
-import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-public class HelpObject {
-
-    private final String _rendered;
-
-    public HelpObject(final Command command, final String label) {
-        _rendered = StringMan.replaceAll(C.HELP_ITEM.s(), "%usage%",
-            command.getUsage().replaceAll("\\{label\\}", label), "[%alias%]",
-            !command.getAliases().isEmpty() ?
-                "(" + StringMan.join(command.getAliases(), "|") + ")" :
-                "", "%desc%", command.getDescription(), "%arguments%",
-            buildArgumentList(command.getRequiredArguments()), "{label}", label);
-    }
-
-    @Override public String toString() {
-        return _rendered;
-    }
-
-    private String buildArgumentList(final Argument[] arguments) {
-        if (arguments == null) {
-            return "";
-        }
-        final StringBuilder builder = new StringBuilder();
-        for (final Argument<?> argument : arguments) {
-            builder.append("[").append(argument.getName()).append(" (")
-                .append(argument.getExample()).append(")],");
-        }
-        return arguments.length > 0 ? builder.substring(0, builder.length() - 1) : "";
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
deleted file mode 100644
index 6d521627b..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
-
-import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
-import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class HelpPage {
-
-    private final List<HelpObject> helpObjects;
-    private final String header;
-
-    public HelpPage(CommandCategory category, int currentPage, int maxPages) {
-        this.helpObjects = new ArrayList<>();
-        this.header = C.HELP_PAGE_HEADER.s()
-            .replace("%category%", category == null ? "ALL" : category.toString())
-            .replace("%current%", (currentPage + 1) + "").replace("%max%", (maxPages + 1) + "");
-    }
-
-    public void render(PlotPlayer player) {
-        if (this.helpObjects.size() < 1) {
-            MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0)");
-        } else {
-            String message = C.HELP_HEADER.s() + "\n" + this.header + "\n" + StringMan
-                .join(this.helpObjects, "\n") + "\n" + C.HELP_FOOTER.s();
-            MainUtil.sendMessage(player, message, false);
-        }
-    }
-
-    public void addHelpItem(HelpObject object) {
-        this.helpObjects.add(object);
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
deleted file mode 100644
index 55f3697f7..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.uuid;
-
-import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-import java.util.UUID;
-
-public interface UUIDWrapper {
-
-    UUID getUUID(PlotPlayer player);
-
-    UUID getUUID(OfflinePlotPlayer player);
-
-    UUID getUUID(String name);
-
-    OfflinePlotPlayer getOfflinePlayer(UUID uuid);
-
-    OfflinePlotPlayer getOfflinePlayer(String name);
-
-    OfflinePlotPlayer[] getOfflinePlayers();
-}
diff --git a/Bukkit/src/main/resources/LICENSE b/Bukkit/src/main/resources/LICENSE
deleted file mode 100644
index c95a26732..000000000
--- a/Bukkit/src/main/resources/LICENSE
+++ /dev/null
@@ -1,553 +0,0 @@
-GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-                            Preamble
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-  The precise terms and conditions for copying, distribution and
-modification follow.
-                       TERMS AND CONDITIONS
-  0. Definitions.
-  "This License" refers to version 3 of the GNU General Public License.
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-  1. Source Code.
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-  The Corresponding Source for a work in source code form is that
-same work.
-  2. Basic Permissions.
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-  4. Conveying Verbatim Copies.
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-  5. Conveying Modified Source Versions.
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-  6. Conveying Non-Source Forms.
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-  7. Additional Terms.
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-  8. Termination.
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-  9. Acceptance Not Required for Having Copies.
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-  10. Automatic Licensing of Downstream Recipients.
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-  11. Patents.
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-  12. No Surrender of Others' Freedom.
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-  13. Use with the GNU Affero General Public License.
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-  14. Revised Versions of this License.
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-  15. Disclaimer of Warranty.
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-  16. Limitation of Liability.
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-  17. Interpretation of Sections 15 and 16.
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-                     END OF TERMS AND CONDITIONS
-            How to Apply These Terms to Your New Programs
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-Also add information on how to contact you by electronic and paper mail.
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/Bukkit/src/main/resources/addplots.js b/Bukkit/src/main/resources/addplots.js
deleted file mode 100644
index 5691c181c..000000000
--- a/Bukkit/src/main/resources/addplots.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-This will increase a player's allowed plots by the provided value
-/plot debugexec runasync addperm <player> <amount>
-*/
-var uuid = UUIDHandler.getUUID('%s0', null);
-if (uuid === null) {
-    C_INVALID_PLAYER.send(PlotPlayer, '%s0');
-}
-else if (!MathMan.class.static.isInteger('%s1')) {
-    C_NOT_VALID_NUMBER.send(PlotPlayer, '(0, ' + Settings.MAX_PLOTS + ')');
-}
-else {
-    var amount = parseInt('%s1');
-    var pp = IMP.wrapPlayer(UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid).player);
-    var allowed = pp.getAllowedPlots();
-    MainUtil.class.static.sendMessage(PlotPlayer, '$4Setting permission: plots.plot.' + (allowed + amount) + ' for %s0');
-    IMP.getEconomyHandler().setPermission("", pp.getName(), 'plots.plot.' + (allowed + amount), true);
-}
diff --git a/Bukkit/src/main/resources/addsigns.js b/Bukkit/src/main/resources/addsigns.js
deleted file mode 100644
index 7f0996ca1..000000000
--- a/Bukkit/src/main/resources/addsigns.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-This script will fix all signs in the world.
-*/
-var plots = PS.sortPlots(PS.getPlots());
-for (var i = 0; i < plots.size(); i++) {
-    var plot = plots.get(i);
-    if (!plot.isMerged() || !plot.getMerged(0)) {
-        plot.setSign();
-        PS.class.static.log('&cSetting sign for: ' + plot);
-    }
-    java.lang.Thread.sleep(10);
-}
diff --git a/Bukkit/src/main/resources/automerge.js b/Bukkit/src/main/resources/automerge.js
deleted file mode 100644
index b8326e842..000000000
--- a/Bukkit/src/main/resources/automerge.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Need to script something quick with PlotSquared?
-/plot debugexec runasync automerge.js <removeroads>
-
-This is an example script that will auto merge all plots
-
-The following utility classes are usable:
- - PlotSquared
- - TaskManager
- - TitleManager
- - ConsolePlayer
- - SchematicHandler
- - ChunkManager
- - BlockManager
- - SetupUtils
- - EventUtil
- - UUIDHandler
- - DBFunc
- - HybridUtils
- - IMP ( BukkitMain or SpongeMain)
- - MainCommand
- - MainUtil
- - Settings
- - StringMan
- - MathMan
- - C ( use C_ )
- - Permissions ( use Permissions_ )
- 
- For more information see: https://github.com/IntellectualSites/PlotSquared/wiki/Scripting
-*/
-var plots = PS.sortPlots(PS.getPlots());
-PS.class.static.log("Attempting to auto merge " + plots.size() + " plots");
-if ("%s0" === "true") {
-    for (var i = 0; i < plots.size(); i++) {
-        var plot = plots.get(i);
-        plot.autoMerge(-1, 250000, plot.owner, true);
-    }
-}
-else if ("%s0" === "false") {
-    for (var i = 0; i < plots.size(); i++) {
-        var plot = plots.get(i);
-        plot.autoMerge(-1, 250000, plot.owner, false);
-    }
-}
-else {
-    C_COMMAND_SYNTAX.send(PlotPlayer, "/plot debugexec automerge.js <removeroads>");
-    MainUtil.class.static.sendMessage(PlotPlayer, "$1<removeroads> is true or false if you want to remove roads when auto merging");
-}
diff --git a/Bukkit/src/main/resources/bridge.template b/Bukkit/src/main/resources/bridge.template
deleted file mode 100644
index d5f9ccd933cdd4107dc56b07265ed7bc13946f00..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5325
zcmbVQWl$W-vR>TX9fAf35-hm8yDp0c7TvH|a0r^<fk1E%?(P=cJ-E9CPhjCC_rAL4
zoLlewIIpL=YNl#tx~jXsuI^7m83B<HfQpI=sO3YD2mDDyf9;``w$_g3u3$^3iM*^D
zNK0K(2Ba;mAgd~=qbO|x0_n)AYJg-EwLl;fDA>x{#o647<3DfU_z?ylXg;9+@1G|r
zT~4VIxS{>ZbJ&{L*93RlX+DP(wRU;bM%NQ^Xl>aEy@mD0U(<5Myv(_|Qn{YbQ1b-C
zth&a%3?BVIvsCqv-GQ8wCWTZsjd321hB-YvmROns32D?g1r*bICvVt=#gLw$$uc-^
z8W)578h*B65=Dy3eTTga6xcteEs^VAE7=OW6I(@8j~<<6f?Uw4NCo_$A&u&cJ#iEr
zvM!*TKX+|?;(L4O<0JoA@b;uHqD)si!+!iZ9X(Xl_bCBM&{Qcqn;cnUin?Ky)~*m5
z@#ZKBnJ<s#uvrER!`t(cd^_KcMHTqL#J{-Rjv#*qbvDxO2*if}Qt7-?)keI7ijFQ9
z5ofuvoxA|W$pnNojUZ575qc0vQCz|Fam#zdLZsYPpN!FSJ#?s0C*QYY%6BB1XOo@u
zG!kC~B5nQ4^M+Sd{R~zK>w&5DWX}tafn^AZN6G(sL2pTrQYyW~2aXRBCMi&qL!<uL
zKIRB+VT!K-3~i#_t1!Ez!|;u1@YB+#Hoefe=Mu&69&Xi1j#RGHud5)pPj^~Elu@2@
zVm)^`W0OexlkAuKpK$ipHg&B;F$>Hdo-ZylD|?nmfcnL?+{6OE-_KSoWiA~*=g6<K
znJ^+U+A;DTI-XLE1#_+tZDq`<UvJpACfO6F$P@7m-I&ZK8;nB_96a@FdiFb8U2ud@
zhu)NaAip>9Ry!`cF!R<{eV_r4KIJm$x<6TY!BrZle>rk+b{$gdvEb)vF&U4`n6;<v
zvyq4dJ$O^oj<sc#hg?yn3#ZS`87!s2_!c>KYrJrDI9Rt@C9!xXX6gzB2i-W%s7^mu
zCym&td^taii`5K5af0+^?@(3$)%WxIJy)Grv-(HZ-`gO8HLi)jFQ!->d%LqL<IcoD
z|Ltwj>3-^u|M~-a=W~ku;#q>_>)&B0f8cF$GRC2Vp1uqA77ccDQZ|0_9enmJHP6kD
zz3Q5->#?WORJjF2I_Mj6V38j2IBAU`Y6rZU&YeV36NbghiE3X@>CV2@R}=PS!SaXe
zYpRG{Rt5kxlu=N@bDEvP2mk>8FV*;4lnVYcltO;F^$&zv>v@O}K2qpwY3a$hx8pNw
z#mDImjI53g4XnzajtPRW*xroA@u<02rKb}$N7hsecyPE_jZa%&ZOvz{-R@=X!TiKC
z$B*7-jEl!;h|sTqO7RR4Ua=!`I?VlK8h$})JrO}PA?`KEfc#9{O8qC=?KvWQVTg6u
zenGPr6OV@`caZwfGvSbh@wUf|yIsM+xWU6I!>Xh9TqQL^OIwL;@o{=X+8~^aOh#8C
z<U9IH&UPVnE&X}>u7^~==<SXU{x*LX%zaL~;tk(dcjC%9Knwb-LIRQ7gxmzpzF4;8
zx`clIv>_4?-)z<lFh-I4feV8=hxO9hqV{pFA?cZA{!G0O?K=ulXAU`HTL0m=(rVR}
zYO}eW@)HXAcEoSNeK<!gV`42G`QRJbgEXk%M><n<$37ZtzkBP&7h7dvDh3u)3m-ro
z0mWASsj~^IH|CIYJyKJ|&G&99jrUsok9!(!3fXS~xpc3TGF4w@&#1gux1}PiwD1&h
zKa<OCLj-kb9aQPST^3Z-O_mQwc_LwrkxhyGsFbp|JEW0SNCtX(5y8z^^9T$$t!2^S
zEdW_0*feVL$xBe#^_Tl7Y?n|Jb=GC=>=<nkGV>INe{>tKBqIi2@COZ~%zg|UV==Ca
zoqsusG^iBa^-(HeRpmrj;{DKLCkM_{ZTw=Z<%_QOFMGjL!UWpFgH8eaC(2Vvwud2V
zdbaQvi&<WLVd{i}YNSyENOO`J&+NMl4JId09Ky2t!Y*WC`rS-BDi<94a~2_h>$RLp
zWB1kOf)2?DaVa=MVR*62O(z)s@y!aig*jR6+A?WPlMX3FZEwO$(?l#=Buk3NF~6a+
zO`AGYER%qWJCg}t72I7@f=i{VtCwRMf}W~!2yQDT4A4Mw5>6oi3{LxHw8HYq5xbkE
z+^OP=aXC?ff?G&gt8A8?3S-u3d<sYwts$Klged+6C_=3FhfWm4tKYHgiXB%l)Erjt
zi?7U0%@s(0q_IW6{PF=~UiF61t22Ku$@Hi^N#y|rsr*Eiv>o0M`y7DmNl4|gKWGyF
zun1L-6mH3BKSpX<tEFsn&AE(W%%LDgOH<8&DOc4?;|V<2ubkbMxwdX6ojyD8^W3_~
z%e8R_M%Hd!NBiXS3Tn3%JHbCs7pnb~wns!b-t)x=mvtelzTmP2Al$B@kRL!}0z#5D
zL2)Uz^m}j^lRZM9EHm}Mfu6l9C%3jBCY}5tRf+;_8-)o6jbvREe<I0b4BNZkL+pm;
z!~mDEK3!g1LNY~F^*?zHlg$UV4f`OiCLKnMnULTMY3Cs&yneHy43W}^8s+ZUv^z`a
z6rGE6=%Zo0PG+TH&Ye$FeQjp+*$=K#9kf-LP#tT=r*l?ciP}KPQJLaC0gM~gs=SHF
z8lkx4-9DzqY_1ppdP~0Px|+X%-<j3pT8nMG4&JV3ho3&qNQPa!EI*$rD{hMNnmG+u
zW7BIt4s%`(&PZCU9qbQpgeE4AyRNNb@+v$ZmFBxBPTH1~SH94=F|zKsY+Xw9$<E0q
z8(P0zORsN<?815vIbQ4$eY-2)L+gEj{-yj)(r%wtf<u(OEnCktZ17_STyz)h!}cqP
zB#vW~qQTlXT)Wn{J9_3HwN(Z(1s6I#%Lh{)$C)vSV=+>Qv?<K63{KzNl7u84hCc<t
z1j+Ab64GKyD23fI4nSfDYLwJ+-BI;QnMcg8T$_r%_}*OSzaI7)v${b=b4Pc%$+nuG
zWOTn4n%f|4Vj%1y<S{(S$7UT>78t7CawTT$&K8NH@p&J!-UTg~&Ze@=^;2G*pW;s!
zZ>I}wuA3E%POhlV8s-k08D;K-wHRuPQJKi^7+2k{2hpALbIPAY$qabHZ_8<Y4OtJ>
zYLSp=P}wK%cV?79YA+tC__A4&DE;wi3rsmOa{oC{eUbnB)cuLw(BT}!@_Q+MMXBUy
z?SXxAzHTQOJ>pNLlc`A~Y1&4m-fi0G{NYvn;$$60+9*#37tD>DlpO(#6F6_y?UjVx
z-P;9?ax7*|G3)%0bF^Z_4eX;2kzLp3Csui4w?YP8@7Q$SxKmffxx0ntU1%dE_9fXR
z&Q8!Cot8J1dr!Djie^S4D3H_)yy*@Voj(!wmPw_ZOc&K&Rk2jPvZKkqAt=TX3h>QL
z2%0lF>(okW?E`y~v%)FXpDz_vOI~Q%os9t4-P`#B$Yy+W>GKRE)Cw}>IW`79EN~Da
zY_#ta_!Q*YU809m=2f=nU5*g0{+zMBobCF8*Lsc+T8tUV#U>xILl|aR*l19jPt798
zH4ar`;@Mb?HUH_Rna0pQJ`^n;{z~viC&k=WxucxU-1$;C#JA&Bn?aV6XsfS3Nahx-
zT%T6j(D@}%%4mgm<n6N)(Q-4{DNWYO9c{Btz<%<@bm#yB5>pl++=C4``;IaPeX(J=
z6H}P@_2moGAH6-#GQKx&#$>vIk>6bgBYN5ll>A7|K_@cgVmu4QWyGe+d_-_E*;VSq
zV7bUw|L&{ut)O#$j)~fT_`2TQNXXY{w8gyT9fJ75KCH94UVvbu7QN|M&um$hmC*SG
z3m$AaoIh$I<9Sc|J^$QTKkQ_FpWR%A;iv3*MN@V!H&na`E!ypIW|p{Xi~jC-2XFK%
zjogI8{wmMc9?p;`#j+aqj$l5+J4iFIj+bw;p?(5QiMyF&%-F$}_D~&d$}kH#v2)|Q
z2t0`runir_PbQOuT-cTBhu~HKi{u`W)~P#h!_#n8O;`6~nigY)eu96=mr~O77hG4_
zZA!UL-uW!znDOU+86!wekvF8KEu#%|v;zAfGkjEB%@zxV{S%1lPGaN>%!=Q{OcNYQ
zNxUUrc6Se3$WFv#Cw$;1E$dL0#(pp2!Xa@1<_pm1hq?QWAunq7&kIDk8>-R750?Wz
zmGV&~S58mEP}+-(C`0DebA^Jjhg^n_O20pn2{ngFw5Bt_zvpw;!w~xZY}k_5(FF?P
zHzF#^&{BroU=-n-q7#!Ie<OHg3@n@xw`ld)?Kpe-+H>eRxfY;EVo{EyK-Aih79N5r
zyX^(hf35qzUp_+gVtWEGnG?!bAbbzBklGSap<MiS0$Lh|NRv5onOwOdtej9)%#KX~
zGgAzwxAKhlq;d{kU9EjR9a;f8dnDqOEwXXrOKqlG-DJGTZoWHDT-KgBD=&&G@7U^!
zE7ZH~ogT6nvybqU-|T=0wzQApnKBCTWPT#<sWbW*-nfP=)2gLOgT?Oe!)j+*d(vpR
zBV@Z`gqkc&<X}HEYheOOPx9tA7<g}ovP23CnH~;uzA1mp!>JTk0nQ7L!E05B{Na!j
zNAziTW}u>!84W~V<(O*1sxGIg88WAm!eh$KL>#G}|0*USjj@*bmc|jEGb5T>g3l{0
zdNRwcWS6HI4d~R$_Jws@i}fp1F|<2W2*Uc<4n`IpWOKWlbx9KV6gR|*M&Q@2W^r$a
zwca-O@*KGMoGK`NtHSE;snk-j)w$s=nXy?{m>5Jz)nSu6rJ3hAIQfB@<6AXlhSLpc
zB#>jjhL}6d?L02tm3Q#{1M@28^sM-G%%Kq>^g@5MzB@h|`2@&lr3J6X&QDAuKYkRR
zqjpK?TVY*-EeD+^a039j%ULsSZeuE(X=<pg7wbJmM5S-Vf49j^7Q1Dg=m5ajFa7&A
zS@NH?$zUf}YZs`sr7PIk>5q09jthPq_NRgN)2P#;1YyY80;XpU`{C_6qY<ALNm;XP
z?#zneOrR!rSy03FH(~!9N(v^-dVIGo$pIU=+l+fS{u`_a=Mq)jq$rbo2I|vxF|pH<
zU6ki&L#OUh4pwy?lSh%gN!3LeR!u7e{vEKE=L9MK#oJ!f6T<r(u6(8bKd(QU3<J3h
zQo$H0zU--5G1ifBcsx?$MoW&B1c^7k$0$3FL$r^!PG`0Y(+Q>;@tzpK<WAZR6+L_f
zvoAyA=*?W_RtB^uL(rYi-8BZi^5=7-q(Aoqemw9ZnDjEph){Uo@{D<jeS)(Id3?=b
zQG-hi2a^enm2z0MM?J-z2s`Ao3CHb$@<XVrtM=T|WD2&$tP7l98MgMXUcS>Pot{|Q
zJXp0suMA(GG`+m{)qFybRyen{qE1I#@k?4NzU3;&Xcg0MajVH*3ch>ykiQbNOH=Q!
z*Kym-yeFbq_iB8WZT5o<SsU+CL8n6_RShJuxP+x~<<uLr<;`7#r95hIL{L|fmE@K&
zuY6CJR2P3)t5Yq1=x$dS%%L(+h3w4@<-#BczwnviL<A;ty=0Gd-)Xu~*(f@?3oq9J
zQLW0Ote4{UAUU{UWOKeb|47z1*Ya&Qz>ig0Av<lXWUYwh;#2Rv1`IV6^`NOtAMxw+
z7`}=u8~VL#*gif^Tim;}yDn-RleVQ%gjf;v>wclDq~+W|Ut_wSw%gnOMCV-U9`UVi
zhq-0^e~)s9GF9b#@BjeUFa7%*CH|G8uGWqa2Xj|zD5t9<<b{>Ft2xJ8M+a*y)tVVv
z+}2Armtk<3mHlOH<B{(0o~W#u6bnkYkAsiVqeob5LyNlem5RFhbXJ!n?jXuo%ImMC
zQCp)VR|h}jiQx#14@|r;NZS}zMS!Ry`$xS+;PF=b170%cK!Hp#f7sna6oj_}6&nZ+
zL^t)@Q$;639R@t>B8_tYu9t?D^X4b+NlD?rU<`2(Q<0$=BC<ZDCA0DUXd=P^3PATY
zj#^QmAA)uC;L=j{b@OV=(RDdT+vQFEz%D9If*C_^vuX}k-i*geixa1e#P;a@MnKrg
zB1nm4=UKR)u;3Z{0-98-GF!5&96CQak^}wb6PRXl+2S)Krl!q=`n-_>LHEdaIEduE
zc;&r$;g!H<swSAO#iss8fLkXD(uR{JhRX>N(9T~F`a+h?FS<f%ZzDpsDImXKdzQP(
zI0<i9>a35xPJgg5i1%{%&KV_&4~&y?rQT5a^Ad%Lq)J@m6}NfQ>-1zzTZ@Oso-_qP
zRLZi<KA4AyPejM>B6BAZBIFAP0POuMfN=1HfIm31KhNpEIkUgYf7r194}+$m{8v+d
zu64f$|39SQ7fJ9BO#PJx_-`|RPS@Xs^A8!t{zqp1?=t$|=Kk#5-x&Bq-r)TmA~ckd
TkbmDp{Ix=U1?DBe@6-PPqm#)9

diff --git a/Bukkit/src/main/resources/de-DE.yml b/Bukkit/src/main/resources/de-DE.yml
deleted file mode 100644
index 8a52ce9a6..000000000
--- a/Bukkit/src/main/resources/de-DE.yml
+++ /dev/null
@@ -1,414 +0,0 @@
-# Translated by: Krauti2 / EvilOlaf
-# Adjusted and updated by: NotMyFault
-BORDER: $2Du befindest dich außerhalb der aktuellen Weltengrenze.
-confirm:
-  failed_confirm: $2Es gibt keine zur Bestätigung ausstehenden Befehle!
-  requires_confirm: '$2Bist du sicher, dass du diesen Befehl ausführen willst: $1%s$2?&-$2Die
-    Änderung ist unwiderruflich! Wenn du sicher bist: $1/plot confirm'
-  expired_confirm: $2Bestätigung abgelaufgen, führe den Befehl erneut aus!
-move:
-  move_success: $4Plot erfolgreich verschoben.
-  copy_success: $4Plot erfolgreich kopiert.
-  requires_unowned: $2Der angegebene Ort ist bereits belegt.
-compass:
-  compass_target: $4Plot erfolgreich mit dem Kompass anvisiert.
-cluster:
-  cluster_available_args: '$1Die folgenden Parameter sind verfügbar: $4list$2, $4create$2,
-    $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4helpers$2, $4info$2,
-    $4tp$2, $4sethome'
-  cluster_list_heading: $2Es gibt $1%s$2 Cluster in dieser Welt.
-  cluster_list_element: $2 - $1%sn
-  cluster_intersection: $2Der vorgeschlagene Bereich überlappt mit $1%s$2 existierendem/n
-    Cluster/n
-  cluster_added: $4Cluster erfolgreich erstellt.
-  cluster_deleted: $4Cluster erfolgreich gelöscht.
-  cluster_resized: $4Größe des Clusters wurde erfolgreich geändert.
-  cluster_added_user: $4Spieler erfolgreich zum Cluster hinzugefügt.
-  cannot_kick_player: $2Du kannst diesen Spieler nicht kicken.
-  cluster_invited: '$1Du wurdest in folgenden Cluster eingeladen: $2%s'
-  cluster_removed: '$1Du wurdest aus folgendem Cluster entfernt: $2%s'
-  cluster_kicked_user: $4Spieler erfolgreich gekickt.
-  invalid_cluster: '$1Clustername ungültig: $2%s'
-  cluster_not_added: $2Dieser Spieler war nicht zum Cluster hinzugefügt.
-  cluster_cannot_leave: $1Du musst deinen Besitz löschen oder transferieren bevor
-    du gehen kannst.
-  cluster_added_helper: $4Helfer erfolgreich hinzugefügt.
-  cluster_removed_helper: $4Helfer erfolgreich vom Cluster entfernt.
-  cluster_regenerated: $4Clusterregeneration erfolgreich gestartet
-  cluster_teleporting: $4Teleportiere...
-  cluster_info: '$1Aktueller Cluster: $2%id%&-$1Name: $2%name%&-$1Besitzer: $2%owner%&-$1Größe:
-    $2%size%&-$1Rechte: $2%rights%'
-  cluster_outside: '$2Der vorgeschlagene Bereich liegt außerhalb der Plot Grenze: %s0'
-unclaim:
-  unclaim_success: $4Dieser Plot gehört dir jetzt nicht mehr.
-  unclaim_failed: $2Plot konnte nicht enteignet werden.
-worldedit masks:
-  require_selection_in_mask: $2%s deiner Selektion befindet sich nicht innerhalb deines
-    Plots. Du kannst Änderungen nur innerhalb deines Plots vornehmen.
-  worldedit_volume: $2Du kannst die Menge %current% nicht auswählen. Die maximale
-    Grenze liegt bei %max%.
-  worldedit_iterations: $2Du kannst nicht %current% mal wiederholen. Die maximalen
-    Wiederholungen liegen bei %max%.
-  worldedit_unsafe: $2Der Zugriff auf diesen Befehl wurde verwehrt.
-  worldedit_bypass: $2&oUm die Beschränkung außer Kraft zu setzen, verwende $4/plot
-    wea
-  worldedit_unmasked: $1Dein WorldEdit-Bereich ist jetzt nicht mehr begrenzt.
-  worldedit_restricted: $1Dein WorldEdit-Bereich ist jetzt begrenzt.
-  worldedit_delayed: $2Bitte warte während deine WorldEdit Aktion verarbeitet wird...
-  worldedit_run: '$2Sorry für die Wartezeit. Starte jetzt: %s'
-  worldedit_bypassed: $2Beschränkungen werden nun ignoriert.
-records:
-  record_play: $2%player $2startete Spielaufzeichnung $1%name
-  notify_enter: $2%player $2betritt deinen Plot ($1%plot$2)
-  notify_leave: $2%player $2verließ deinen Plot ($1%plot$2)
-swap:
-  swap_overlap: $2Der geplante Bereich darf nicht überlappen.
-  swap_dimensions: $2Die geplanten Bereiche müssen vergleichbare Dimensionen aufweisen.
-  swap_syntax: $2/plot swap <plot id>
-  swap_success: $4Plots erfolgreich getauscht.
-  started_swap: $2Plot swap Aufgabe gestartet. Du erhälst eine Meldung wenn sie beendet
-    ist.
-comment:
-  not_valid_inbox_index: $2Keine Kommentar auf Seite %s
-  inbox_item: $2 - $4%s
-  comment_syntax: $2Verwende /plot comment [X;Z] <%s> <comment>
-  invalid_inbox: '$2Dieses Postfach ist ungültig.&-$1Akzeptierte Werte: %s'
-  no_perm_inbox: $2Du hast keine Berechtigung für dieses Postfach.
-  no_perm_inbox_modify: $2Du hast keine Berechtigung.
-  no_plot_inbox: $2Du musst an einem Plot stehen oder einen solchen angeben.
-  comment_removed: $4Kommentar/e n$2 - '$3%s$2' erfolgreich gelöscht.
-  comment_added: $4Ein Kommentar wurde hinterlassen.
-  comment_header: $2------ Kommentare ------
-  inbox_notification: '%s ungelesene Nachrichten. Öffne sie mit /plot inbox'
-  inbox_empty: $2Keine Kommentare.
-console:
-  not_console: $2Aus Sicherheitsgründen kann dieser Befehl nur von der Konsole ausgeführt
-    werden.
-  is_console: $2Dieser Befehl kann nur von einem Spieler ausgeführt werden.
-clipboard:
-  clipboard_set: $2Der aktuelle Plot wird in die Zwischenablage kopiert. Benutze $1/plot
-    paste$2 um ihn einzufügen.
-  pasted: $4Die Plotauswahl wurde erfolgreich eingefügt. Die Zwischenablage wurde
-    geleert.
-  paste_failed: '$2Einfügen fehlgeschlagen: $2%s'
-  no_clipboard: $2Deine Zwischenablage ist leer.
-  clipboard_info: '$2Aktuelle Auswahl - Plot ID: $1%id$2, Breite: $1%width$2, Anzahl
-    Blöcke: $1%total$2'
-ratings:
-  rating_not_valid: $2Wähle eine Zahl zwischen 1 und 10
-  rating_already_exists: '$2Du hast diesen Plot bereits bewertet: $2%s'
-  rating_applied: '$4Du hast diesen Plot erfolgreich bewertet: $2%s'
-  rating_not_your_own: $2Du kannst deinen eigenen Plot nicht selbst bewerten.
-  rating_not_owned: $2Plots ohne Besitzer können nicht bewertet werden.
-  ratings_purged: $2Bewertungen für diesen Plot wurden gelöscht.
-  rating_not_done: $2Du kannst nur beendete Plots bewerten.
-economy:
-  econ_disabled: $2Ökonomie ist nicht aktiviert.
-  cannot_afford_plot: $2Du kannst dir diesen Plot nicht leisten. Er kostet $1%s
-  not_for_sale: $2Dieser Plot steht nicht zum Verkauf.
-  cannot_buy_own: $2Du kannst deinen eigenen Plot nicht kaufen.
-  plot_sold: $4Dein Plot $1%s$4 wurde an $1%s$4 für $1$%s$4 verkauft.
-  cannot_afford_merge: $2Du kannst dir das Zusammenfügen der Plots nicht leisten.
-    Es kostet $1%s
-  added_balance: $1%s $2wurden deinem Guthaben hinzugefügt.
-  removed_balance: $1%s $2wurden von deinem Guthaben abgezogen.
-  removed_granted_plot: $2Du hast %s plot grant(s) benutzt, du hast $1%s $2übrig.
-setup:
-  setup_init: '$1Verwendung: $2/plot setup <value>'
-  setup_step: '$3[$1Schritt %s$3] $1%s $2- $1Erwarte: $2%s $1Standard: $2%s'
-  setup_invalid_arg: '$2%s ist kein gültiger Wert für Schritt %s. Um Setup abzubrechen
-    verwende: $1/plot setup cancel'
-  setup_valid_arg: $2Wert $1%s $2gesetzt auf %s
-  setup_finished: $3Falls du MULTIVERSE oder MULTIWORLD verwendest, sollte die Welt
-    generiert worden sein. Andernfalls musst du die Welt manuell über bukkit.yml hinzufügen.
-  setup_world_taken: $2%s ist bereits eine bekannte Plotwelt.
-  setup_missing_world: $2Du musst einen Namen für die Welt vergeben ($1/plot setup
-    &l<world>$1 <generator>$2)&-$1Zusätzliche Befehle:&-$2 - $1/plot setup <value>&-$2
-    - $1/plot setup backn$2 - $1/plot setup cancel
-  setup_missing_generator: $2Du musst einen Generator angeben ($1/plot setup <world>
-    &l<generator>&r$2)&-$1Zusätzliche Befehle:&-$2 - $1/plot setup <value>&-$2 - $1/plot
-    setup backn$2 - $1/plot setup cancel
-  setup_invalid_generator: '$2Ungültiger Generarator. Mögliche Optionen: %s'
-schematics:
-  schematic_missing_arg: '$2Du musst einen Wert angeben. Gültige Werte: $1test <name>$2
-    , $1save$2 , $1paste $2, $1exportall'
-  schematic_invalid: '$2Diese Schematic ist ungültig: $2%s'
-  schematic_valid: $2Diese Schematic ist gültig.
-  schematic_paste_failed: $2Einfügen der Schematic fehlgeschlagen.
-  schematic_paste_success: $4Einfügen der Schematic erfolgreich.
-  schematic_too_large: $2Der Plot ist zu groß für diese Aktion.
-titles:
-  title_entered_plot: Du betrittst Plot %world%;%x%;%z%
-  title_entered_plot_sub: 'Besitzer: %s'
-  prefix_greeting: '$1%id%$2> '
-  prefix_farewell: '$1%id%$2> '
-core:
-  prefix: '$3[$1P2$3] '
-  enabled: $1PlotSquared wurde aktiviert
-  task_start: Starte Aufgabe...
-reload:
-  reloaded_configs: $1Übersetzungen und Welteneinstellungen wurden neu geladen.
-  reload_failed: $2Erneutes Laden der Konfiguration fehlgeschlagen.
-alias:
-  alias_set_to: $2Plot Alias auf $1%alias% gesetzt.
-  missing_alias: $2Du musst einen Alias angeben.
-  alias_too_long: $2Der Alias darf nicht länger als 50 Zeichen sein.
-  alias_is_taken: $2Dieser Alias wird bereits verwendet.
-  alias_removed: $2Der Alias wurde gelöscht.
-position:
-  missing_position: '$2Du musst eine Position angeben. Mögliche Werte sind: $1none'
-  position_set: $1Der Plot Spawn wurde auf deinen aktuellen Standort gesetzt.
-  home_argument: $2Verwende /plot set home [none]
-  invalid_position: $2Dies ist eine ungültige Position.
-  position_unset: $1Home Position zurückgesetzt auf standard Wert.
-time:
-  time_format: $1%hours%, %min%, %sec%
-permission:
-  no_schematic_permission: '$2Du hast keine Berechtigung um Schematics zu verwenden:
-    $1%s'
-  no_permission: '$2Dir fehlt folgende Berechtigung: $1%s'
-  no_plot_perms: $2Diese Aktion kann nur der Besitzer des Plots ausführen.
-  cant_claim_more_plots: $2Du kannst keine weiteren Plots besitzen.
-  cant_transfer_more_plots: $2Du kannst keine weiteren Plots diesem Spieler übergeben.
-  cant_claim_more_plots_num: $2Du kannst nicht mehr als $1%s $2Plots auf einmal einnehmen.
-  you_be_denied: $2Es ist dir nicht gestattet diesen Plot zu betreten.
-  merge_request_confirm: '%s möchte sein Plot mit deinem verbinden.'
-  no_permission_event: '$2Dir fehlt folgende Berechtigung: $1%s'
-  cant_claim_more_clusters: $2Du kannst nicht mehr Cluster besitzen.
-merge:
-  no_perm_merge: $2Du bist nicht Besitzer des Plots $1%plot%
-  unlink_required: $2Die Plots müssen vorher getrennt (unlink) werden.
-  unlink_impossible: $2Die Trennung (unlink) funktioniert nur auf Megaplots.
-  unlink_success: $2Trennung erfolgreich.
-  merge_not_valid: $2Diese Anfrage ist nicht länger gültig.
-  merge_accepted: $2Die Anfrage wurde akzeptiert.
-  success_merge: $2Plots wurden zusammengeführt.
-  merge_requested: $2Anfrage erfolgreich verschickt.
-  no_available_automerge: $2Dir gehören keine benachbarten Plots oder du darfst die Plot Zusammenführungsgröße nicht überschreiten.
-commandconfig:
-  not_valid_subcommand: $2Das ist kein gültiger Parameter.
-  did_you_mean: '$2Meintest du: $1%s'
-  name_little: $2%s Name ist zu kurz, $1%s$2<$1%s
-  no_commands: $2Du hast für keinen Befehl eine Berechtigung.
-  subcommand_set_options_header: '$2Mögliche Werte: '
-  command_syntax: '$1Verwendung: $2%s'
-  flag_tutorial_usage: '$1Folgende Flags fehlen zur Benutzung: $2%s'
-errors:
-  invalid_player: '$2Spieler nicht gefunden: $1%s$2.'
-  command_went_wrong: $2Beim Ausführen des Befehls ging etwas schief...
-  no_free_plots: $2Es sind keine freien Plots verfügbar.
-  not_in_plot: $2Du befindest dich nicht auf einem Plot.
-  not_in_cluster: $2Du musst dich innerhalb eines Plot Clusters befinden um das zu
-    tun.
-  not_in_plot_world: $2Du befindest dich nicht in einer Plotwelt.
-  plotworld_incompatible: $2Die beiden Welten müssen kompatibel sein.
-  not_valid_world: $2Das ist keine gültige Welt (Groß- / Kleinschreibung beachten)
-  not_valid_plot_world: $2Das ist keine gültige Plotwelt (Groß- / Kleinschreibung
-    beachten)
-  no_plots: $2Du hast keine Plots.
-  wait_for_timer: $2Ein Zeitgeber wurde an den Plot oder an dich gebunden. Bitte warte
-    bis die Zeit abgelaufen ist.
-  invalid_player_wait: '$2Spieler nicht gefunden: $1%s$2. Versuche es später nochmal.'
-  invalid_player_offline: '$2Der Spieler muss online sein: $1%s.'
-  invalid_command_flag: '$2Ungültige Flag: %s0'
-  error: '$2Ein Fehler ist aufgetreten: %s'
-  not_loaded: $2Der Plot konnte nicht geladen werden.
-purge:
-  purge_success: $4%s Plots erfolgreich gelöscht.
-trim:
-  trim_in_progress: Die Weltenbeschneidung ist bereits gestartet!
-  not_valid_hybrid_plot_world: Hybrid Plot Manager wird für diese Aktion benötigt.
-block list:
-  block_list_separater: '$1,$2 '
-biome:
-  need_biome: $2Du musst ein Biom angeben.
-  biome_set_to: '$2Plot Biome gesetzt: $2'
-teleport:
-  teleported_to_plot: $1Du wurdest teleportiert.
-  teleported_to_road: $2Du wurdest auf die Straße teleportiert.
-  teleport_in_seconds: $1Teleportiere in %s Sekunden. Bewege dich nicht...
-  teleport_failed: $2Teleportation wurde wegen einer Bewegung oder Schaden abgebrochen.
-set block:
-  set_block_action_finished: $1Die letze Setblock-Aktion wurde fertiggestellt.
-debug:
-  debug_section: $2>> $1&l%val%
-  debug_line: $2>> $1%var%$2:$1 %val%&-
-  debug_header: $1Debug Information&-
-  requires_unmerged: Diser Plot kann nicht verbunden werden.
-invalid:
-  not_valid_data: $2Das ist kein gültiger Datenwert.
-  not_valid_block: $2Das ist kein gültiger Block.
-  not_valid_number: $2Das ist keine gültige Zahl.
-  not_valid_plot_id: $2Das ist keine gültige Plot-ID.
-  plot_id_form: '$2Die Plot-ID muss wie folgt angegeben werden: $1X;Y $2z.B. $1-5;7'
-  not_your_plot: $2Das ist nicht dein Plot.
-  no_such_plot: $2Ein solcher Plot existiert nicht.
-  player_has_not_been_on: $2Dieser Spieler war nicht in der Plotwelt.
-  found_no_plots: $2Dein Suchmuster ergab keine Treffer.
-  not_allowed_block: '$2Dieser Block ist nicht erlaubt: %s'
-  found_no_plots_for_player: '$2Keine Grundstücke für %s gefunden.'
-camera:
-  camera_started: $2Du verwendest den Kameramodus für Plot $1%s
-  camera_stopped: $2Der Kameramodus wurde abeschaltet.
-need:
-  need_plot_number: $2Du musst eine Plotnummer oder einen Alias angeben.
-  need_block: $2Du musst einen Block angeben.
-  need_plot_id: $2Du musst eine Plot-ID angeben.
-  need_plot_world: $2Du musst eine Plotwelt angeben.
-  need_user: $2Du musst einen Spielernamen angeben.
-info:
-  plot_unowned: $2Für diese Aktion muss dieser Plot einen Besitzer aufweisen.
-  plot_info_unclaimed: $2Plot $1%s$2 hat bisher keinen Besitzer.
-  plot_info_header: $3&m---------&r $1INFO $3&m---------
-  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Besitzer: $2%owner%$1&-$1Biom:
-    $2%biome%$1&-$1Baurechte: $2%build%$1&-$1Bewertung: $2%rating%$1/$210$1&-$1Helfer:
-    $2%helpers%$1&-$1Vertraut: $2%trusted%$1&-$1Verboten: $2%denied%$1&-$1Flags: $2%flags%'
-  plot_info_trusted: $1Vertraute:$2 %trusted%
-  plot_info_denied: $1Verboten:$2 %denied%
-  plot_info_flags: $1Flags:$2 %flags%
-  plot_info_biome: $1Biom:$2 %biome%
-  plot_info_rating: $1Bewertung:$2 %rating%
-  plot_info_owner: $1Besitzer:$2 %owner%
-  plot_info_id: $1ID:$2 %id%
-  plot_info_alias: $1Alias:$2 %alias%
-  plot_info_size: $1Größe:$2 %size%
-  plot_user_list: ' $1%user%$2,'
-  info_syntax_console: $2/plot info <world> X;Y
-  none: Keiner
-  now: Jetzt
-  never: Niemals
-  unknown: Unbekannt
-  everyone: Jeder
-  plot_info_footer: $3&m---------&r $1INFO $3&m---------
-  plot_info_members: $1Members:$2 %members%
-  plot_info_seen: $1Seen:$2 %seen%
-  plot_flag_list: $1%s0:%s1$2
-working:
-  generating_component: $1Die Generierung wurde gemäß deiner Einstellungen gestartet.
-  clearing_plot: $2Plot wird asynchron geleert.
-  clearing_done: $4Erfolgreich in %sms geleert.
-  plot_not_claimed: $2Dieser Plot hat keinen Besitzer.
-  plot_is_claimed: $2Dieser Plot hat bereits einen Besitzer.
-  claimed: $4Plot erfolgreich in Besitz genommen.
-  deleting_done: $4Löschung in %sms abgeschlossen.
-list:
-  plot_list_header_paged: $2(Seite $1%von$2/$1%max$2) $1Liste Plots nach %word%
-  plot_list_header: $1Liste aller %word% Plots.
-  plot_list_item: $2>> $1%id$2:$1%Welt $2- $1%owner
-  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%Welt $2- $1%owner
-  plot_list_footer: $2>> $1%word% umfasst insgesamt $2%num% $1Plots %plot%.
-  comment_list_header_paged: $2(Seite $1%cur$2/$1%max$2) $1Liste %amount% Kommentare auf.
-  clickable: ' (interactive)'
-  area_list_header_paged: $2(Seite $1%cur$2/$1%max$2) $1Liste %amount% of Plot-Areas auf.
-left:
-  left_plot: $2Du hast einen Plot verlassen.
-chat:
-  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_forced: $2Diese Welt zwingt jeden Spieler dazu den Plot Chat zu benutzen.
-  plot_chat_on: $4Plot Chat aktiviert.
-  plot_chat_off: $4Plot Chat deaktiviert.
-deny:
-  denied_removed: $4Der Spieler darf diesen Plot wieder betreten.
-  denied_added: $4Der Spieler darf diesen Plot nicht mehr betreten.
-  denied_need_argument: $2Argumente fehlen. $1/plot denied add <name> $2oder $1/plot
-    helpers remove <name>
-  was_not_denied: $2Der Spieler durfte diesen Plot bereits betreten.
-  you_got_denied: $4Du wurdest von dem Plot gebannt auf dem du dich befunden hast und wurdest zum Spawn teleportiert.
-rain:
-  need_on_off: '$2Du musst einen Wert angeben. Mögliche Werte: $1on$2, $1off'
-  setting_updated: $4Einstellungen erfolgreich aktualisiert.
-flag:
-  flag_key: '$2Schlüssel: %s'
-  flag_type: '$2Typ: %s'
-  flag_desc: '$2Beschreibung: %s'
-  not_valid_flag: $2Ungültige Flag
-  not_valid_value: $2Wert der Flag muss alphanumerisch angegeben werden.
-  flag_not_in_plot: $2Diese Flag wurde in diesem Plot nicht gesetzt.
-  flag_not_removed: $2Die Flag konnte nicht entfernt werden.
-  flag_not_added: $2Flag konnte nicht gesetzt werden.
-  flag_removed: $4Flag erfolgreich entfernt.
-  flag_added: $4Flag erfolreich hinzugefügt
-  not_valid_flag_suggested: '$2Ungültige Flag. Meintest du: $1%s'
-trusted:
-  was_not_added: $2Dieser Spieler war bisher kein Helfer auf diesem Plot.
-  trusted_added: $4Spieler erfolgreich in diesem Plot vertraut.
-  trusted_removed: $1Diesem Spieler wird auf diesem Plot nicht mehr vertraut.
-  plot_removed_user: $1Plot %s wurde wegen Inaktivität des Plot Besitzers gelöscht.
-member:
-  already_owner: $2Dieser Spieler ist bereits Besitzer des Plots.
-  already_added: $2Dieser Spieler ist bereits in dieser Kategorie.
-  removed_players: $2%s Spieler wurde von dem Plot entfernt.
-  member_added: $4Dieser Spieler kann nun bauen wenn der Plot Besitzer online ist.
-  member_removed: $1Du hast einen Spieler von dem Plot entfernt.
-  member_was_not_added: $2Dieser Spieler war nicht diesem Plot hinzugefügt.
-  plot_max_members: $2Du kannst nicht mehr Spieler diesem Plot hinzufügen.
-owner:
-  set_owner: $4Plotbesitzer erfolgreich gesetzt.
-  now_owner: $4Du bist jetzt Besitzer des Plots %s
-  set_owner_cancelled: Die Plotübergabe wurde abgebrochen.
-signs:
-  owner_sign_line_1: '$1ID: $1%id%'
-  owner_sign_line_2: '$1Besitzer:'
-  owner_sign_line_3: $2%plr%
-  owner_sign_line_4: $3in Besitz
-help:
-  help_header: $3&m---------&r $1Plot² Hilfe $3&m---------
-  help_info_item: $1/plot help %category% $3- $2%category_desc%
-  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
-  direction: '$1Aktuelle Himmelsrichtung: %dir%'
-  help_page_header: '$1Kategorie: $2%category%$2,$1 Seite: $2%current%$3/$2%max%$2'
-  help_footer: $3&m---------&r $1Plot² Hilfe $3&m---------
-'-':
-  custom_string: '-'
-set:
-  set_attribute: $4Successfully set %s0 set to %s1
-web:
-  generating_link: $1Lade Plot hoch...
-  generating_link_failed: $2Es konnte kein Download Link erstellt werden!
-  save_failed: $2Konnte Plot nicht speichern.
-  load_null: $2Benutze $4/plot load $2um eine Liste der Schematics zu bekommen.
-  load_failed: $2Fehler beim Laden des Plots.
-  load_list: '$2Um eine Schematic zu laden benutze $1/plot load #'
-  save_success: $1Gespeichert!
-gamemode:
-  gamemode_was_bypassed: $1Du ignorierst den Spielmodus ($2{gamemode}$1) $1im Plot $2{plot}
-height limit:
-  height_limit: $1Diese Plot Region hat ein Höhenlimit von $2{limit}
-inventory:
-  inventory_usage: '&cBenutzung: &6{usage}'
-  inventory_desc: '&cBeschreibung: &6{desc}'
-  inventory_category: '&cKategorie: &6{category}'
-toggle:
-  toggle_enabled: '$2Einstellungen aktiviert: %s'
-  toggle_disabled: '$2Einstellungen deaktiviert: %s'
-blocked command:
-  command_blocked: $2Dieser Befehl darf nicht in diesem Plot genutzt werden.
-done:
-  done_already_done: $2Dieses Plot ist bereits als fertig markiert.
-  done_not_done: $2Dieses Plot ist nicht als fertig markiert.
-  done_insufficient_complexity: $2Dieses Plot ist zu simpel. Füge mehr Struktur und Terrain hinzu bevor du den Befehl erneut benutzt.
-  done_success: $1Plot als fertig markiert.
-  done_removed: $1Du kannst nun weiterbauen.
-tutorial:
-  rate_this: $2Bewerte dieses Plot.
-  comment_this: '$2Hinterlasse deine Meinung über das Plot: %s'
-desc:
-  desc_set: $2Plot Beschreibung gesetzt.
-  desc_unset: $2Plot Beschreibung gelöscht.
-  missing_desc: $2Du musst eine Beschreibung angeben.
-cap:
-  entity_cap: $2Du darfst hier keine Mobs spawnen.
-paste:
-  debug_report_created: '$1Debug-Log hochgeladen: $1%url%'
-unsafe:
-  debugallowunsafe_on: $2Unsichere Aktionen sind jetzt erlaubt.
-  debugallowunsafe_off: $2Unsichere Aktionen sind jetzt nicht mehr erlaubt.
-near:
-  plot_near: '$2Spieler: %s0'
-kick:
-  you_got_kicked: $4Du wurdest gekickt!
-grants:
-  granted_plots: '$Ergebnis: $2%s $1Zuschuss übrig'
-  granted_plot: $1Du gewährst %s0 Plot an $2%s1
-  granted_plot_failed: '$1Gewährung gescheitert: $2%s'
diff --git a/Bukkit/src/main/resources/es-ES.yml b/Bukkit/src/main/resources/es-ES.yml
deleted file mode 100644
index f4459649d..000000000
--- a/Bukkit/src/main/resources/es-ES.yml
+++ /dev/null
@@ -1,394 +0,0 @@
-confirm:
-  failed_confirm: $2No tienes acciones pendientes por confirmar.
-  requires_confirm: '$2¿Estas seguro de realizar este comando?: $1%s$2?&-$2¡No hay vuelta atras! Si estas seguro escribe: $1/plot confirm'
-  expired_confirm: $2La confirmación ha expirado, por favor ejecute el comando otra vez!
-move:
-  move_success: $4La parcela fue movida correctamente.
-  copy_success: $4La parcela fue copiada correctamente.
-  requires_unowned: $2La localizacion especificada ya esta ocupada.
-web:
-  generating_link: $1Procesando parcela...
-  generating_link_failed: $2¡Fallo al generar un link de descarga!
-  save_failed: $2Fallo al guardar.
-  load_null: $2Por favor usa $4/plot load $2para conseguir una schematic.
-  load_failed: $2Fallo al cargar schematic.
-  load_list: '$2Para cargar una schematic usa $1/plot load #'
-  save_success: $1¡Guardado completado!
-compass:
-  compass_target: $4Parcela seleccionada con la brujula completada.
-cluster:
-  cluster_available_args: '$1Los siguientes subcomandos estan disponibles: $4list$2,
-    $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2,
-    $4info$2, $4tp$2, $4sethome'
-  cluster_list_heading: $2Hay $1%s$2 agrupaciones en este mundo.
-  cluster_list_element: $2 - $1%s&-
-  cluster_intersection: $2El area propuesta se solapa con $1%s$2 de la parcela existente.
-  cluster_added: $4Creacion de agrupaciones completado.
-  cluster_deleted: $4Borrado de agrupaciones completado.
-  cluster_resized: $4Reescalado de agrupaciones completado.
-  cluster_added_user: $4Añadido usuario a la agrupacion con exito.
-  cannot_kick_player: $2Tu no puedes expulsar a este jugador.
-  cluster_invited: '$1Has sido invitado a la siguiente agrupacion: $2%s'
-  cluster_removed: '$1Has sido eliminado de la agrupacion: $2%s'
-  cluster_kicked_user: $4Usuario expulsado con exito.
-  invalid_cluster: '$1Nombre de agrupacion invalido: $2%s'
-  cluster_not_added: $2Este jugador no fue añadido a la agrupacion de parcelas.
-  cluster_cannot_leave: $1Debes eliminar o transferir el dueño antes de salir.
-  cluster_added_helper: $4Ayudante añadido a la agrupacion con exito.
-  cluster_removed_helper: $4Ayudante eliminado de la agrupacion con exito.
-  cluster_regenerated: $4Regeneracion de la agrupacion comenzada con exito.
-  cluster_teleporting: $4Teletransportando...
-  cluster_info: '$1Agrupacion actual: $2%id%&-$1Nombre: $2%name%&-$1Propietario: $2%owner%&-$1Tamaño:
-    $2%size%&-$1Derechos: $2%rights%'
-  cluster_outside: '$2El área propuesta está fuera del área de la parcela: %s0'
-border:
-  border: $2Estas en las afueras del borde del mapa.
-unclaim:
-  unclaim_success: $4Desclaimeaste la parcela correctamente.
-  unclaim_failed: $2No se pudo desclaimear la parcela.
-worldedit masks:
-  worldedit_delayed: $2Por favor espere mientras se procesa tu accion de WorldEdit...
-  worldedit_run: '$2Sentimos la tardanza. Ejecutando: %s'
-  require_selection_in_mask: $2%s la seleccion no esta en tu parcela. Solo puedes editar la zona de tu parcela.
-  worldedit_volume: $2No puedes seleccionar el volumen de %current%. El volumen maximo de modificacion es %max%.
-  worldedit_iterations: $2No puedes repetir %current% veces. El límite es %max%.
-  worldedit_unsafe: $2El acceso a ese comando ha sido bloqueado.
-  worldedit_bypass: $2&oPara evitar las restrinciones usa $4/plot wea
-  worldedit_bypassed: $2 Sobrepasando las restrincciones de WorlEdit.
-  worldedit_unmasked: $1El WorldEdit desactivo tus restricciones. Tus permisos de WorldEdit son ilimitados.
-  worldedit_restricted: $1Tus permisos de WorldEdit estan restringidos.
-gamemode:
-  gamemode_was_bypassed: $1Has omitido el modo de juego ($2{gamemode}$1) $1set for $2{plot}
-height limit:
-  height_limit: $1Esta parcela tiene un limite de altura de $2{limit}
-records:
-  record_play: $2%player $2comenzando a registrar la parcela $1%name
-  notify_enter: $2%player $2introduce tu parcela ($1%plot$2)
-  notify_leave: $2%player $2abandona tu parcela ($1%plot$2)
-swap:
-  swap_overlap: $2Las áreas propuestas no pueden superponerse.
-  swap_dimensions: $2El area propuesta debe tener dimensiones comparables.
-  swap_syntax: $2/plot swap <plot id>
-  swap_success: $4Intercambio de parcelas completado
-  started_swap: $2 Intercambiando las tareas de las parcelas. Serás notificado cuando el proceso haya terminado.
-comment:
-  inbox_notification: '%s Mensajes no leidos. Usa /plot inbox'
-  not_valid_inbox_index: $2No hay comentarios %s
-  inbox_item: $2 - $4%s
-  comment_syntax: $2Usa /plot comment [X;Z] <%s> <comment>
-  invalid_inbox: '$2Esta no es una bandeja de entrada valida.&-$1Los valores aceptados: %s'
-  no_perm_inbox: $2No tienes permisos para ingresar a esta bandeja de entrada.
-  no_perm_inbox_modify: $2No tienes permisos para modificar esta bandeja de entrada.
-  no_plot_inbox: $2Debes permanecer en la parcela para poder escribir el comentario.
-  comment_removed: $4Comentario eliminado satisfactoriamente/s:n$2 - '$3%s$2'
-  comment_added: $4Te han dejado un comentario.
-  comment_header: $2&m---------&r $1Comentarios $2&m---------&r
-  inbox_empty: $2No hay comentarios.
-console:
-  not_console: $2Por razones de seguridad, este comando solo se puede ejecutar desde la consola.
-  is_console: $2Este comando solo puede ser ejecutado por los jugadores.
-inventory:
-  inventory_usage: '&cUso: &6{usage}'
-  inventory_desc: '&cDescripcion: &6{desc}'
-  inventory_category: '&cCategoria: &6{category}'
-clipboard:
-  clipboard_set: $2La parcela actual fue copiada a tu portapapeles, usa $1/plot paste$2 para copiarla.
-  pasted: $4La seleccion de la parcela ha sido copiada correctamente.
-  paste_failed: '$2Fallo al copiar la seleccion. Razon: $2%s'
-  no_clipboard: $2No tienes nada seleccionado en el portapapeles.
-  clipboard_info: '$2Seleccion actual - Plot ID: $1%id$2, Ancho: $1%width$2, Bloques totales: $1%total$2'
-toggle:
-  toggle_enabled: '$2Ajustes activados : %s'
-  toggle_disabled: '$2Ajustes desactivados : %s'
-blocked command:
-  command_blocked: $2El comando no esta permitido en esta parcela.
-done:
-  done_already_done: $2Esta parcela esta finalizada.
-  done_not_done: $2Esta parcela no esta finalizada.
-  done_insufficient_complexity: $2Esta parcela es muy simple. Porfavor añade mas detalles antes de usar este comando.
-  done_success: $1Parcela finalizada con exito.
-  done_removed: $1Ya puedes continuar construyendo en esta parcela.
-ratings:
-  rating_not_valid: $2Tienes que especificar un número entre 1 y 10.
-  rating_already_exists: $2Ya has valorado la parcela. $2%s
-  rating_applied: $4Has valorado correctamente la parcela. $2%s
-  rating_not_your_own: $2No puedes valorar tu propia parcela.
-  rating_not_done: $2Solo puedes valorar parcelas terminadas.
-  rating_not_owned: $2No puedes valorar una parcela que no pertenece a nadie.
-  ratings_purged: $2Calificaciones purgadas para esta parcela
-tutorial:
-  rate_this: $2¡Valora esta parcela!
-  comment_this: '$2Deja tu opinion de esta parcela: %s'
-economy:
-  econ_disabled: $2La economia no esta activada.
-  cannot_afford_plot: $2No te puedes permitir comprar esta parcela. Cuesta $1%s
-  not_for_sale: $2Esta parcela no esta a la venta.
-  cannot_buy_own: $2No puedes comprar tu propia parcela.
-  plot_sold: $4Tu parcela; $1%s0$4, se ha vendido por $1%s1$4 para $1$%s2
-  cannot_afford_merge: $2Tu no puedes permitirte combinar las parcelas. Cuesta $1%s
-  added_balance: $1%s $2 fue añadido a tu fondo de dinero.
-  removed_balance: $1%s $2 fue removido de tu fondo de dinero.
-  removed_granted_plot: $2Usaste %s concesiones de trama, te quedan 5 $1%s
-setup:
-  setup_init: '$1Uso: $2/plot setup <cantidad>'
-  setup_step: '$3[$1Step %s0$3] $1%s1 $2- $1Espectando: $2%s2 $1Default: $2%s3'
-  setup_invalid_arg: '$2%s0 no es un argumento valido para este paso %s1. Para cancelar la configuracion usa: $1/plot setup cancel'
-  setup_valid_arg: $2Valor $1%s0 $2ajustado a %s1
-  setup_finished: $4Deberias haber sido teletransportado al mundo creado, sino tendras que generarlo manualmente usando el bukkit.yml
-  setup_world_taken: $2%s este mundo ya esta registrado.
-  setup_missing_world: $2 Necesitas especificar el nombre del mundo ($1/plot setup
-    &l<world>$1 <generator>$2)&-$1Comandos adicionales:&-$2 - $1/plot setup <value>&-$2
-    - $1/plot setup back&-$2 - $1/plot setup cancel
-  setup_missing_generator: $2Tienes que especificar un generador ($1/plot setup <world>
-    &l<generator>&r$2)&-$1Comandos adicionales:&-$2 - $1/plot setup <value>&-$2 - $1/plot
-    setup back&-$2 - $1/plot setup cancel
-  setup_invalid_generator: '$2Generador inválido. Opciones posibles: %s'
-schematics:
-  schematic_missing_arg: '$2Necesitas especificar un argumento. Valores posibles:
-    $1test <name>$2 , $1save$2 , $1paste $2, $1exportall'
-  schematic_invalid: '$2Este no es un schematic valido. Razon: $2%s'
-  schematic_valid: $2Este es un schematic valido.
-  schematic_paste_failed: $2Fallo al pegar el schematic.
-  schematic_paste_success: $4El schematic ha sido copiado correctamente.
-  schematic_too_large: $2¡La trama es demasiado grande para esta acción!
-titles:
-  title_entered_plot: '$1Parcela: %world%;%x%;%z%'
-  title_entered_plot_sub: $4Propiedad de %s
-  prefix_greeting: '$1%id%$2> '
-  prefix_farewell: '$1%id%$2> '
-core:
-  task_start: Comenzando la tarea...
-  prefix: $3[$1P2$3] $2
-  enabled: $1PlotSquared esta activado.
-reload:
-  reloaded_configs: $1Las traducciones y opciones del mundo han sido cargados.
-  reload_failed: $2Fallo al cargar las configuraciones de los archivos.
-desc:
-  desc_set: $2Descripcion de la parcela.
-  desc_unset: $2Descripcion de la parcela no especificada.
-  missing_desc: $2Necesitas especificar una descripcion.
-alias:
-  alias_set_to: $2Alias de la parcela establecido en $1%alias%
-  missing_alias: $2Necesitas especificar un alias.
-  alias_too_long: $2El alias debe ser < de 50 caracteres
-  alias_is_taken: $2Ese alias ya ha sido utilizado.
-  alias_removed: $2Parcela alias eliminado
-position:
-  missing_position: '$2Necesitas especificar una posicion. Valores posibles: $1none'
-  position_set: $1Hogar establecido en tu posicion actual.
-  position_unset: $1Hogar reseteado a la posicion por defecto.
-  home_argument: $2Usa /plot set home [none]
-  invalid_position: $2Valor de posicion no valida.
-time:
-  time_format: $1%hours%, %min%, %sec%
-permission:
-  no_schematic_permission: $2No tienes permisos para usar schematic $1%s
-  no_permission: '$2Careces de los permisos de este nodo: $1%s'
-  no_permission_event: '$2Careces de los permisos de este nodo: $1%s'
-  no_plot_perms: $2Tienes que ser el dueño de la parcela para realizar esta accion.
-  cant_claim_more_plots: $2No puedes claimear mas parcelas.
-  cant_transfer_more_plots: $2No puedes enviar mas parcelas a ese usuario.
-  cant_claim_more_plots_num: $2No puedes claimear mas de $1%s $2parcelas a la vez.
-  you_be_denied: $2No tienes permitido entrar en esta parcela.
-  merge_request_confirm: Peticion de agrupamiento de %s
-  cant_claim_more_clusters: $2No puedes reclamar más grupos.
-merge:
-  merge_not_valid: $2La peticion de agrupacion ya no es valida.
-  merge_accepted: $2La peticion de agrupacion ha sido aceptada.
-  success_merge: $2¡Las parcelas se han agrupado!
-  merge_requested: $2Se ha enviado con exito la peticion de agrupar.
-  no_perm_merge: '$2No eres el dueño de la parcela: $1%plot%'
-  no_available_automerge: $2 No eres propietario de ninguna parcela adyacente en la direccion especificada o no tienes permitido agrupar el tamaño requerido.
-  unlink_required: $2Se requiere una desconexion para hacer esto.
-  unlink_impossible: $2Solo puedes desconectar una mega-parcela.
-  unlink_success: $2Se han desconectado las parcelas.
-errors:
-  invalid_player_wait: '$2Jugador no encontrado: $1%s$2, buscando. Prueba mas tarde.'
-  invalid_player: '$2Jugador no encontrado: $1%s$2.'
-  invalid_player_offline: '$2El jugador debe estar conectado: $1%s.'
-  command_went_wrong: $2Algo ocurrio ejecutando este comando...
-  no_free_plots: $2No hay parcelas libres disponibles.
-  not_in_plot: $2No estas en ninguna parcela.
-  not_in_cluster: $2Debes tener una agrupacion de parcelas para realizar esta accion.
-  not_in_plot_world: $2No estas en el mundo de parcelas.
-  plotworld_incompatible: $2Los dos mundos deben ser compatibles.
-  not_valid_world: $2Esto no es un mundo valido. (caso sensitivo)
-  not_valid_plot_world: $2Esta no es una parcela valida. (caso sensitivo)
-  no_plots: $2No tienes ninguna parcela.
-  wait_for_timer: $2El temporizador del selector de bloque esta ligado a ti o a la parcela actual. Por favor espere a que termine.
-  invalid_command_flag: '$2Indicador de comando no válido: %s0'
-  error: '$2Ocurrió un error: %s'
-  not_loaded: $2No se pudo cargar la trama
-paste:
-  debug_report_created: '$1Se ha enviado una depuracion a: $1%url%'
-purge:
-  purge_success: $4Se ha limpiado %s parcelas.
-trim:
-  trim_in_progress: La tarea de recorte esta en proceso!
-  not_valid_hybrid_plot_world: Es necesario el dueño de las parcelas para realizar esta accion.
-block list:
-  block_list_separater: '$1,$2 '
-biome:
-  need_biome: $2Necesitas especificar un bioma valido.
-  biome_set_to: $2El bioma de la parcela ha sido cambiado a $2
-teleport:
-  teleported_to_plot: $1Has sido teletransportado.
-  teleported_to_road: $2Has sido teletransportado a la carretera.
-  teleport_in_seconds: $1Teletransporte en %s segundos. No te muevas...
-  teleport_failed: $2Teletransporte cancelado debido a movimiento o daño.
-set block:
-  set_block_action_finished: $1La ultima accion de seleccion de bloque se ha finalizado.
-unsafe:
-  debugallowunsafe_on: $2Acciones inseguras habilitadas.
-  debugallowunsafe_off: $2Acciones inseguras deshabilitadas.
-debug:
-  debug_header: $1Informacion de Debug&-
-  debug_section: $2>> $1&l%val%
-  debug_line: $2>> $1%var%$2:$1 %val%&-
-invalid:
-  not_valid_data: $2No es una informacion de id valida.
-  not_valid_block: '$2No es un bloque valido: %s'
-  not_allowed_block: '$2Ese bloque no esta permitido: %s'
-  not_valid_number: '$2No es un numero valido en el rango: %s'
-  not_valid_plot_id: $2No es una id de parcela valida.
-  plot_id_form: '$2La id de la parcela tiene que estar de manera: $1X;Y $2e.g. $1-5;7'
-  not_your_plot: $2Esa no es tu parcela.
-  no_such_plot: $2No existe dicha parcela.
-  player_has_not_been_on: $2Este usuario no ha estado en el mundo de parcelas.
-  found_no_plots: $2No se ha encontrado parcelas con esta informacion.
-  found_no_plots_for_player: '$2No se encontraron parcelas para jugador: %s'
-camera:
-  camera_started: $2Has entrado en modo camara para la parcela $1%s
-  camera_stopped: $2Ya no estas en modo camara.
-need:
-  need_plot_number: $2Necesitas especificar un alias o numero de parcela.
-  need_block: $2Necesitas especificar un bloque.
-  need_plot_id: $2Necesitas especificar la id de una parcela.
-  need_plot_world: $2Necesitas especificar un mundo de parcelas.
-  need_user: $2Necesitas especificar un usuario.
-info:
-  none: Ninguno
-  unknown: Desconocido
-  everyone: Todos
-  plot_unowned: $2La parcela actual tiene que tener un propietario para ejecutar esa accion.
-  plot_info_unclaimed: $2Parcela $1%s$2 aun no esta claimeada.
-  plot_info_header: $3&m---------&r $1INFO $3&m---------
-  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Propietario: $2%owner%$1&-$1Bioma:
-    $2%biome%$1&-$1Puede construir: $2%build%$1&-$1Clasificacion: $2%rating%&-$1Confianza:
-    $2%trusted%$1&-$1Miembros: $2%members%$1&-$1Denegados: $2%denied%$1&-$1Flags:
-    $2%flags%'
-  plot_info_footer: $3&m---------&r $1INFO $3&m---------
-  plot_info_trusted: $1Confianza:$2 %trusted%
-  plot_info_members: $1Miembros:$2 %members%
-  plot_info_denied: $1Denegado:$2 %denied%
-  plot_info_flags: $1Flags:$2 %flags%
-  plot_info_biome: $1Bioma:$2 %biome%
-  plot_info_rating: $1Clasificacion:$2 %rating%
-  plot_info_owner: $1Propietario:$2 %owner%
-  plot_info_id: $1ID:$2 %id%
-  plot_info_alias: $1Alias:$2 %alias%
-  plot_info_size: $1Tamaño:$2 %size%
-  plot_user_list: ' $1%user%$2,'
-  info_syntax_console: $2/plot info X;Y
-  now: Ahora
-  never: Nunca
-  plot_info_seen: $1Seen:$2 %seen%
-  plot_flag_list: $1%s0:%s1$2
-working:
-  generating_component: $1Empezando a generar componentes desde tus opciones.
-  clearing_plot: $2Limpiando parcela async.
-  clearing_done: $4¡Limpieza completada! Ha tardado %sms.
-  plot_not_claimed: $2Parcela no reclamada.
-  plot_is_claimed: $2Esta parcela ya esta reclamada.
-  claimed: $4Has reclamado con exito esta parcela.
-  deleting_done: $4Eliminar completado! Tomó %sms.
-list:
-  comment_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Lista de %amount% comentarios.
-  clickable: ' (interactive)'
-  plot_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Lista de %amount% parcelas.
-  plot_list_header: $1Lista de %word% parcelas.
-  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner.
-  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner.
-  plot_list_footer: $2>> $1%word% un total $2%num% $1claimeado %plot%.
-  area_list_header_paged: $2(Página $1%cur$2/$1%max$2) $1lista de %amount% areas
-left:
-  left_plot: $2Has abandonado una parcela.
-chat:
-  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_forced: $2Este mundo obliga a usar el chat de parcela.
-  plot_chat_on: $4Chat de parcela activado.
-  plot_chat_off: $4Chat de parcela desactivado.
-  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-deny:
-  denied_removed: $4Este usuario ya no esta denegado en esta parcela.
-  denied_added: $4Has denegado este usuario de tu parcela.
-  denied_need_argument: $2Faltan argumentos. $1/plot denied add <name> $2o $1/plot denied remove <name>
-  was_not_denied: $2Ese usuario no ha sido denegado de este plot.
-  you_got_denied: $4Has sido denegado de la parcela, se te ha teletransportado al spawn.
-rain:
-  need_on_off: '$2Necesitas un valor especifico. Posible valores: $1on$2, $1off'
-  setting_updated: $4Has actualizado las opciones.
-flag:
-  flag_key: '$2Llave: %s'
-  flag_type: '$2Tipo: %s'
-  flag_desc: '$2Desc: %s'
-  not_valid_flag: $2No es una flag valida.
-  not_valid_value: $2El valor de la flag tiene que ser alfanumerico.
-  flag_not_in_plot: $2La parcela no tiene flag.
-  flag_not_removed: $2No se ha podido remover la flag.
-  flag_not_added: $2La flag no se ha podido añadir.
-  flag_removed: $4Flag removida con exito.
-  flag_added: $4Flag añadida con exito.
-  not_valid_flag_suggested: '$2Eso no es una bandera válida. Querías decir: $1%s'
-trusted:
-  trusted_added: $4Has añadido un usuario de confianza en esta parcela.
-  trusted_removed: $4Has removido un usuario de confianza en esta parcela.
-  was_not_added: $2Ese usuario no es de confianza en esta parcela.
-  plot_removed_user: $1La parcela %s en la que estabas añadido fue removida por inactividad.
-member:
-  removed_players: $2Removido %s jugadores de esta parcela.
-  already_owner: $2Ese usuario es el dueño del parcela.
-  already_added: $2Ese usuario ya esta en esa categoria.
-  member_added: $4Este usuario puede construir mientras el dueño de la parcela este conectado.
-  member_removed: $1Has removido a un usuario de tu parcela.
-  member_was_not_added: $2Ese usuario no fue añadido a tu parcela.
-  plot_max_members: $2No puedes añadir mas personas.
-owner:
-  set_owner: $4Has añadido con exito el dueño de la parcela.
-  now_owner: $4Ahora eres dueño de esta parcela %s
-  set_owner_cancelled: $2La setowner la acción fue cancelada
-signs:
-  owner_sign_line_1: '$1ID: $1%id%'
-  owner_sign_line_2: '$1Propietario:'
-  owner_sign_line_3: $2%plr%
-  owner_sign_line_4: $3Claimeado
-help:
-  help_header: $3&m---------&r $1Plot² Ayuda $3&m---------
-  help_page_header: '$1Categoria: $2%category%$2,$1 Página: $2%current%$3/$2%max%$2'
-  help_footer: $3&m---------&r $1Plot² Ayuda $3&m---------
-  help_info_item: $1/plot help %category% $3- $2%category_desc%
-  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
-  direction: '$1Direccion actual: %dir%'
-'-':
-  custom_string: '-'
-commandconfig:
-  not_valid_subcommand: $2No es un subcomando valido.
-  did_you_mean: '$2Quisiste decir: $1%s'
-  name_little: $2%s0 el nombre es muy corto, $1%s1$2<$1%s3
-  no_commands: $2No tienes permitido utilizar cualquier subcomando.
-  subcommand_set_options_header: '$2Valores posibles: '
-  command_syntax: '$1Usos: $2%s'
-  flag_tutorial_usage: '$1Haz que un administrador coloque la bandera: $2%s'
-bar api: {}
-set:
-  set_attribute: $4Establecer con éxito %s0 ajustado a %s1
-cap:
-  entity_cap: $2No tienes permitido engendrar más mobs
-near:
-  plot_near: '$1Jugadores: %s0'
-kick:
-  you_got_kicked: $4Te patearon!
-grants:
-  granted_plots: '$1Resultado: $2%s $1grants left'
-  granted_plot: $1You granted %s0 plot to $2%s1
-  granted_plot_failed: '$1Subvención fallida: $2%s'
diff --git a/Bukkit/src/main/resources/fr-FR.yml b/Bukkit/src/main/resources/fr-FR.yml
deleted file mode 100644
index 4867aff98..000000000
--- a/Bukkit/src/main/resources/fr-FR.yml
+++ /dev/null
@@ -1,393 +0,0 @@
-#Translated by Bobbber#5545
-#12.12.2018
-confirm:
-  expired_confirm: $2La confirmation a expiré, veuillez relancer la commande.!
-  failed_confirm: '$2Vous n''avez aucune action en attente à confirmer!'
-  requires_confirm: '$2Êtes-vous sûr de vouloir exécuter: $1%s$2?&-$2Ça ne peut pas être inversé! Si vous êtes certain: $1/plot confirm'
-move:
-  move_success: $4Parcelle déplacée avec succès.
-  copy_success: $4Parcelle copiée avec succès.
-  requires_unowned: '$2L''emplacement spécifié est déjà occupé.'
-set:
-  set_attribute: $4Réglé avec succès %s0 mis à %s1
-web:
-  generating_link: $1Parcelle en traitement...
-  generating_link_failed: $2Impossible de générer le lien de téléchargement!
-  save_failed: $2Échec de la sauvegarde
-  load_null: $2Veuillez utiliser $4/plot load $2pour obtenir une liste des schématics
-  load_failed: $2Impossible de charger le schématic
-  load_list: '$2Pour charger un schématic, utilisez $1/plot load #'
-  save_success: $1Enregistré avec succès!
-compass:
-  compass_target: $4Parcelle ciblée avec la boussole, réussi.
-cluster:
-  cluster_available_args: '$1Les sous-commandes suivantes sont disponibles: $4list$2, $4create$2,
-    $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2,
-    $4tp$2, $4sethome'
-  cluster_list_heading: $2Il y a $1%s$2 clusters dans ce monde
-  cluster_list_element: $2 - $1%s&-
-  cluster_intersection: '$2La zone proposée chevauche avec: %s0'
-  cluster_outside: '$2La zone proposée est en dehors de la parcelle: %s0'
-  cluster_added: $4Cluster créé avec succès.
-  cluster_deleted: $4Cluster supprimé avec succès.
-  cluster_resized: $4Cluster redimensionné avec succès.
-  cluster_added_user: $4Utilisateur ajouté avec succès au cluster.
-  cannot_kick_player: $2Vous ne pouvez pas kick ce joueur
-  cluster_invited: '$1Vous avez été invité au cluster suivant: $2%s'
-  cluster_removed: '$1Vous avez été retiré du cluster: $2%s'
-  cluster_kicked_user: '$4Vous avez expulsé avec succès l''utilisateur'
-  invalid_cluster: '$1Nom de cluster non valide: $2%s'
-  cluster_not_added: '$2Ce joueur n''a pas été ajouté au parcelle de cluster'
-  cluster_cannot_leave: $1Vous devez supprimer ou transférer la propriété avant de partir
-  cluster_added_helper: '$4Ajout réussi d''un assistant au cluster'
-  cluster_removed_helper: '$4Suppression réussie d''un assistant du cluster'
-  cluster_regenerated: $4La régénération de cluster a démarré avec succès
-  cluster_teleporting: $4Téléportation...
-  cluster_info: '$1Cluster actuel: $2%id%&-$1Nom: $2%name%&-$1Propriétaire: $2%owner%&-$1Taille:
-    $2%size%&-$1Droits: $2%rights%'
-border:
-  border: $2Vous êtes en dehors de la bordure de la map actuelle
-unclaim:
-  unclaim_success: $4Vous avez réussi à canceller votre claim de plot.
-  unclaim_failed: $2Impossible de canceller votre claim de plot
-worldedit masks:
-  worldedit_delayed: $2Veuillez patienter pendant que nous traitons votre action WorldEdit...
-  worldedit_run: '$2Toutes mes excuses pour le délais. Nous exécutons: %s'
-  require_selection_in_mask: '$2%s de votre sélection n''est pas dans votre masque de parcelle. Vous pouvez seulement éditer dans votre parcelle.'
-  worldedit_volume: $2Vous ne pouvez pas sélectionner un volume de %current%. Le volume maximum que vous pouvez modifier est %max%.
-  worldedit_iterations: '$2Vous ne pouvez pas itérer %current% fois. Le nombre maximum d''itérations autorisé est %max%.'
-  worldedit_unsafe: '$2L''accès à cette commande a été bloqué'
-  worldedit_bypass: $2&oPour contourner vos restrictions, utilisez $4/plot wea
-  worldedit_bypassed: $2Restriction actuellement contourné de WorldEdit.
-  worldedit_unmasked: $1Votre WorldEdit est maintenant illimité.
-  worldedit_restricted: $1Votre WorldEdit est maintenant limité.
-gamemode:
-  gamemode_was_bypassed: $1Vous avez contourné le GameMode ($2{gamemode}$1) $1fixé pour $2{plot}
-height limit:
-  height_limit: $1Ce plot a une limite de hauteur de $2{limit}
-records:
-  record_play: $2%Joueur $2started playing record $1%name
-  notify_enter: $2%Joueur $2entré dans votre plot ($1%plot$2)
-  notify_leave: $2%Joueur $2quitté votre plot ($1%plot$2)
-swap:
-  swap_overlap: $2Les zones proposées ne peuvent pas se chevaucher
-  swap_dimensions: $2Les zones proposées doivent avoir des dimensions comparables
-  swap_syntax: $2/plot swap <id>
-  swap_success: $4Parcelles échangées avec succès
-  started_swap: '$2La tâche d''échange de parcelle est commencé. Vous serez averti quand elle sera terminée'
-comment:
-  inbox_notification: '%s messages non lus. Utilisez /plot inbox'
-  not_valid_inbox_index: '$2Aucun commentaire à l''index %s'
-  inbox_item: $2 - $4%s
-  comment_syntax: $2Utilisez /plot comment [X;Z] <%s> <comment>
-  invalid_inbox: '$2Ce n''est pas une boîte de réception valide.&-$1Valeurs acceptées: %s'
-  no_perm_inbox: '$2Vous n''avez pas la permission pour cette boîte de réception'
-  no_perm_inbox_modify: '$2Vous n''êtes pas autorisé à modifier cette boîte de réception'
-  no_plot_inbox: $2Vous devez être présent ou fournir un argument de plot
-  comment_removed: $4Commentaire supprimé avec succès/s:n$2 - '$3%s$2'
-  comment_added: $4Un commentaire a été laissé
-  comment_header: $2&m---------&r $1Commentaires $2&m---------&r
-  inbox_empty: $2Sans commentaires
-console:
-  not_console: $2Pour des raisons de sécurité, cette commande ne peut être exécutée que par la console.
-  is_console: $2Cette commande ne peut être exécutée que par un joueur.
-inventory:
-  inventory_usage: '&cUsage: &6{usage}'
-  inventory_desc: '&cDescription: &6{desc}'
-  inventory_category: '&cCatégorie: &6{category}'
-clipboard:
-  clipboard_set: $2Le plot actuel est maintenant copié dans votre presse-papiers, utilisez $1/plot paste$2 pour le coller
-  pasted: $4La sélection de plot a été collée avec succès. Il a été effacé de votre presse-papiers.
-  paste_failed: '$2Impossible de coller la sélection. Raison: $2%s'
-  no_clipboard: '$2Vous n''avez pas de choix dans votre presse-papiers'
-  clipboard_info: '$2Sélection actuelle - Plot ID: $1%id$2, Largeur: $1%width$2, nombre total de blocs: $1%total$2'
-toggle:
-  toggle_enabled: '$2Paramètre activé: %s'
-  toggle_disabled: '$2Paramètre désactivé: %s'
-blocked command:
-  command_blocked: '$2Cette commande n''est pas autorisée dans ce plot'
-done:
-  done_already_done: $2Ce plot est déjà marquée comme étant terminée
-  done_not_done: '$2Ce plot n''est pas marquée comme étant terminée.'
-  done_insufficient_complexity: '$2Ce complot est trop simple. S''il vous plaît ajouter plus de détails avant d''utiliser cette commande.'
-  done_success: $1Marqué avec succès ce plot comme étant terminée.
-  done_removed: $1Vous pouvez maintenant continuer à construire dans ce plot.
-ratings:
-  ratings_purged: $2Notes purgées pour ce plot
-  rating_not_valid: $2Vous devez spécifier un nombre entre 1 et 10
-  rating_already_exists: $2Vous avez déjà évalué ce plot $2%s
-  rating_applied: $4Vous avez évalué ce plot avec succès $2%s
-  rating_not_your_own: $2Vous ne pouvez pas évaluer votre propre plot
-  rating_not_done: $2Vous ne pouvez évaluer que les parcelles finies.
-  rating_not_owned: '$2Vous ne pouvez pas évaluer un terrain qui n''est revendiqué par personne'
-tutorial:
-  rate_this: $2Noter ce plot!
-  comment_this: '$2Laisser des commentaires sur ce plot: %s'
-economy:
-  econ_disabled: '$2L''économie n''est pas activée'
-  cannot_afford_plot: '$2Vous ne pouvez pas vous permettre d''acheter ce plot. Il coute $1%s'
-  not_for_sale: '$2Ce plot n''est pas à vendre'
-  cannot_buy_own: $2Vous ne pouvez pas acheter votre propre plot
-  plot_sold: $4Votre plot; $1%s0$4, a été vendu à $1%s1$4 pour $1$%s2
-  cannot_afford_merge: $2Vous ne pouvez pas vous permettre de fusionner ces plots. Il coute $1%s
-  added_balance: $1%s $2a été ajouté à votre solde
-  removed_balance: $1%s $2a été pris sur votre solde
-  removed_granted_plot: '$2Vous avez utilisé %s plot grant(s), il vous $2reste $1%s'
-setup:
-  setup_init: '$1Usage: $2/plot setup <valeur>'
-  setup_step: '$3[$1Step %s0$3] $1%s1 $2- $1Attendant: $2%s2 $1Défaut: $2%s3'
-  setup_invalid_arg: '$2%s0 n''est pas un argument valable pour l''étape %s1. Pour annuler la configuration, utilisez: $1/plot setup cancel'
-  setup_valid_arg: $2valeur $1%s0 $2mis à %s1
-  setup_finished: '$4Vous auriez dû être téléporté dans le monde créé. Sinon, vous devrez configurer le générateur manuellement à l''aide du fichier bukkit.yml ou du plug-in de gestion de monde votre choix.'
-  setup_world_taken: $2%s est déjà un monde
-  setup_missing_world: $2Vous devez spécifier un nom de monde ($1/plot setup &l<monde>$1
-    <generateur>$2)&-$1Commandes supplémentaires:&-$2 - $1/plot setup <valeur>&-$2 - $1/plot
-    setup back&-$2 - $1/plot setup cancel
-  setup_missing_generator: $2Vous devez spécifier un générateur ($1/plot setup <monde> $l<generateur>&r$2)&-$1Commandes supplémentaires:&-$2 - $1/plot setup <valeur>&-$2 - $1/plot
-    setup back&-$2 - $1/plot setup cancel
-  setup_invalid_generator: '$2Générateur invalide. Options possibles: %s'
-schematics:
-  schematic_too_large: $2Ce plot est trop grand pour cette action!
-  schematic_missing_arg: '$2Vous devez spécifier un argument. Valeurs possibles: $1test <nom>$2 , $1save$2 , $1paste $2, $1exportall'
-  schematic_invalid: '$2Ce n''est pas un schématic valide. Raison: $2%s'
-  schematic_valid: '$2C''est un schématic valide'
-  schematic_paste_failed: $2Impossible de coller le schématic
-  schematic_paste_success: $4Le schématic a été collé avec succès
-titles:
-  title_entered_plot: '$1Plot: %world%;%x%;%z%'
-  title_entered_plot_sub: $4Propriété de %s
-  prefix_greeting: '$1%id%$2> '
-  prefix_farewell: '$1%id%$2> '
-core:
-  task_start: Début de tâche...
-  prefix: $3[$1P2$3] $2
-  enabled: $1%s0 est maintenant activé
-reload:
-  reloaded_configs: $1Les traductions et les paramètres du monde ont été rechargés
-  reload_failed: $2Impossible de recharger les configurations de fichier
-desc:
-  desc_set: $2Description des configurations du plot
-  desc_unset: $2Description du plot non défini
-  missing_desc: $2Vous devez spécifier une description
-alias:
-  alias_set_to: $2Alias du plot défini sur $1%alias%
-  alias_removed: $2Alias du plot a été retiré
-  missing_alias: $2Vous devez spécifier un alias
-  alias_too_long: '$2L''alias doit être < 50 caractères de long'
-  alias_is_taken: $2Cet alias est déjà pris
-position:
-  missing_position: '$2Vous devez spécifier une position. Valeurs possibles: $1none'
-  position_set: $1Home définie sur votre position actuelle
-  position_unset: '$1Home, position réinitialisée à l''emplacement par défaut'
-  home_argument: $2Utilisez /plot set home [none]
-  invalid_position: '$2Ce n''est pas une valeur de position valide'
-cap:
-  entity_cap: '$2Vous n''êtes pas autorisé à générer plus de créatures'
-time:
-  time_format: $1%hours%, %min%, %sec%
-permission:
-  no_schematic_permission: '$2Vous ne disposez pas de l''autorisation nécessaire pour utiliser le schématic $1%s'
-  no_permission: '$2Il vous manque la permission: $1%s'
-  no_permission_event: '$2Il vous manque la permission: $1%s'
-  no_plot_perms: $2Vous devez être le propriétaire du plot pour effectuer cette action.
-  cant_claim_more_plots: $2Vous ne pouvez pas réclamer plus de plot.
-  cant_claim_more_clusters: $2Vous ne pouvez pas réclamer plus de clusters.
-  cant_transfer_more_plots: $2Vous ne pouvez pas envoyer plus de plot à cet utilisateur
-  cant_claim_more_plots_num: $2Vous ne pouvez pas réclamer plus que $1%s $2plots à la fois
-  you_be_denied: '$2Vous n''êtes pas autorisé à entrer dans ce plot'
-  merge_request_confirm: Demande de fusionnement de la part de %s
-merge:
-  merge_not_valid: '$2Cette demande de fusion n''est plus valide.'
-  merge_accepted: $2La demande de fusion a été acceptée.
-  success_merge: $2Les plots ont été fusionnés!
-  merge_requested: $2Envoyé avec succès une demande de fusion
-  no_perm_merge: '$2Vous n''êtes pas propriétaire du plot: $1%plot%'
-  no_available_automerge: '$2Vous ne possédez aucun plot adjacent dans la direction spécifiée ou vous n''êtes pas autorisé à fusionner à la taille requise.'
-  unlink_required: $2Une dissociation est nécessaire pour faire ceci.
-  unlink_impossible: $2Vous pouvez seulement dissocier un méga-plot
-  unlink_success: $2Plot dissocié avec succès.
-commandconfig:
-  not_valid_subcommand: '$2Ce n''est pas une sous-commande valide'
-  did_you_mean: '$2Vouliez-vous dire: $1%s'
-  name_little: $2%s0 Le nom est trop court, $1%s1$2<$1%s3
-  no_commands: '$2Je suis désolé, mais vous n''êtes autorisé à utiliser aucune sous-commande.'
-  subcommand_set_options_header: '$2Valeurs possibles: '
-  command_syntax: '$1Usage: $2%s'
-  flag_tutorial_usage: '$1Avoir un administrateur pour mettre le flag: $2%s'
-errors:
-  invalid_player_wait: '$2Joueur non trouvé: $1%s$2, Réessayez bientôt.'
-  invalid_player: '$2Joueur non trouvé: $1%s$2.'
-  invalid_player_offline: '$2Le joueur doit être en ligne: $1%s.'
-  invalid_command_flag: '$2Commande de flag invalide: %s0'
-  error: '$2Une erreur est survenue: %s'
-  command_went_wrong: '$2Quelque chose s''est mal passé lors de l''exécution de cette commande...'
-  no_free_plots: '$2Il n''y a plus de plots gratuits disponibles'
-  not_in_plot: '$2Vous n''êtes pas dans un plot'
-  not_loaded: '$2Le plot n''a pas pu être chargée'
-  not_in_cluster: $2Vous devez être dans un cluster de plot pour effectuer cette action.
-  not_in_plot_world: '$2Vous n''êtes pas dans un plot'
-  plotworld_incompatible: $2Les deux mondes doivent être compatibles
-  not_valid_world: '$2Ce n''est pas un monde valide (sensible aux majuscules et minuscules)'
-  not_valid_plot_world: '$2Ce n''est pas un plot valide (sensible aux majuscules et minuscules)'
-  no_plots: '$2Vous n''avez pas de plots'
-  wait_for_timer: $2Un minuteur est lié au plot actuel ou à vous. Merci d'attendre la fin
-paste:
-  debug_report_created: '$1Téléchargé un débogage complet vers: $1%url%'
-purge:
-  purge_success: $4Purgé avec succès %s plots
-trim:
-  trim_in_progress: Une tâche de trim du monde est déjà en cours!
-  not_valid_hybrid_plot_world: Le gestionnaire de plot hybride est requis pour effectuer cette action.
-block list:
-  block_list_separater: '$1,$2 '
-biome:
-  need_biome: $2Vous devez spécifier un biome valide.
-  biome_set_to: $2Biome du plot mis à $2
-teleport:
-  teleported_to_plot: $1Vous avez été téléporté
-  teleported_to_road: $2Vous avez été téléporté sur la route
-  teleport_in_seconds: $1Téléportation dans %s secondes. Ne bougez pas...
-  teleport_failed: $2Téléportation annulée pour cause de mouvement ou de dommage
-set block:
-  set_block_action_finished: $1La dernière action setblock est maintenant terminée.
-unsafe:
-  debugallowunsafe_on: $2Actions dangereuses autorisées
-  debugallowunsafe_off: $2Actions dangereuses désactivées
-debug:
-  debug_header: $1Informations de débogage&-
-  debug_section: $2>> $1&l%val%
-  debug_line: $2>> $1%var%$2:$1 %val%&-
-invalid:
-  not_valid_data: '$2Ce n''est pas un identifiant de données valide.'
-  not_valid_block: '$2Ce n''est pas un bloc valide: %s'
-  not_allowed_block: '$2Ce bloc n''est pas autorisé: %s'
-  not_valid_number: '$2Ce n''est pas un nombre valide: %s'
-  not_valid_plot_id: $2Ce n''est pas un identifiant de plot valide.
-  plot_id_form: '$2L''identifiant de plot doit être sous la forme: $1X;Y $2e.g. $1-5;7'
-  not_your_plot: '$2Ce n''est pas votre plot.'
-  no_such_plot: '$2Il n''y a pas un tel plot'
-  player_has_not_been_on: '$2Ce joueur n''a pas été dans ce monde de plot'
-  found_no_plots: '$2Nous n''avons trouvé aucun plot avec votre requête de recherche'
-  found_no_plots_for_player: '$2Aucun plot trouvé pour le joueur: %s'
-camera:
-  camera_started: $2Vous êtes entré en mode caméra pour le plot $1%s
-  camera_stopped: '$2Vous n''êtes plus en mode caméra'
-need:
-  need_plot_number: $2Vous devez spécifier un numéro de plot ou un alias
-  need_block: $2Vous devez spécifier un bloc
-  need_plot_id: $2Vous devez spécifier un identifiant de plot.
-  need_plot_world: $2Vous devez spécifier une zone ou plot.
-  need_user: '$2Vous devez spécifier un nom d''utilisateur'
-near:
-  plot_near: '$1Joueurs: %s0'
-info:
-  none: Aucun
-  now: À présent
-  never: Jamais
-  unknown: Inconnu
-  everyone: Toutes les personnes
-  plot_unowned: $2Le plot actuel doit avoir un propriétaire pour effectuer cette action
-  plot_info_unclaimed: '$2Plot $1%s$2 n''est pas encore réclamé'
-  plot_info_header: $3&m---------&r $1INFO $3&m---------
-  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Propriétaire: $2%owner%$1&-$1Biome:
-    $2%biome%$1&-$1Can Construit: $2%build%$1&-$1Évaluation: $2%rating%&-$1Vu: $2%seen%&-$1De confiance:
-    $2%trusted%$1&-$1Membres: $2%members%$1&-$1Refusé: $2%denied%$1&-$1Flags: $2%flags%'
-  plot_info_footer: $3&m---------&r $1INFO $3&m---------
-  plot_info_trusted: $1De confiance:$2 %trusted%
-  plot_info_members: $1Membres:$2 %members%
-  plot_info_denied: $1Refusé:$2 %denied%
-  plot_info_flags: $1Flags:$2 %flags%
-  plot_info_biome: $1Biome:$2 %biome%
-  plot_info_rating: $1Évaluation:$2 %rating%
-  plot_info_owner: $1Propriétaire:$2 %owner%
-  plot_info_id: $1ID:$2 %id%
-  plot_info_alias: $1Alias:$2 %alias%
-  plot_info_size: $1Taille:$2 %size%
-  plot_info_seen: $1Vu:$2 %seen%
-  plot_user_list: ' $1%user%$2,'
-  plot_flag_list: $1%s0:%s1$2
-  info_syntax_console: $2/plot info X;Y
-working:
-  generating_component: $1Début de génération des composants à partir de vos paramètres
-  clearing_plot: $2Effacement des items du plot.
-  clearing_done: $4Effacer terminé! Cela a pris %sms.
-  deleting_done: $4Supprimer terminé! Cela a pris %sms.
-  plot_not_claimed: $2Plot non réclamé
-  plot_is_claimed: $2Ce plot a déja été réclamé
-  claimed: $4Vous avez réclamé avec succès ce plot
-list:
-  comment_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Liste de %amount% commentaires
-  clickable: ' (interactive)'
-  area_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Liste de  %amount% zones
-  plot_list_header_paged: $2(Page $1%cur$2/$1%max$2) $1Liste de  %amount% plots
-  plot_list_header: $1Liste de  %word% plots
-  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
-  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
-  plot_list_footer: $2>> $1%word% un total de $2%num% %plot% $1réclamé.
-left:
-  left_plot: $2Tu as quitté le plot
-chat:
-  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_forced: $2Ce monde oblige tout le monde à utiliser le chat de plot.
-  plot_chat_on: $4Chat du plot activé.
-  plot_chat_off: $4Chat du plot désactivé.
-deny:
-  denied_removed: $4Vous avez réussi à retirer ce joueur de la liste des joueurs interdits
-  denied_added: $4Vous avez réussi à ajouter ce joueur à la liste des joueurs interdits
-  denied_need_argument: $2Arguments manquants. $1/plot denied add <nom du joueur> $2or $1/plot
-    denied remove <nom du joueur>
-  was_not_denied: '$2Ce joueur n''est pas interdit sur ce plot'
-  you_got_denied: $4Le plot sur lequel vous étiez précédemmment vous a été refusé et vous avez été téléporté au spawn
-kick:
-  you_got_kicked: $4Vous avez été expulsé!
-rain:
-  need_on_off: '$2Vous devez spécifier une valeur. Valeurs possibles: $1on$2, $1off'
-  setting_updated: $4Vous avez mis à jour les paramètres avec succès
-flag:
-  flag_key: '$2Key: %s'
-  flag_type: '$2Type: %s'
-  flag_desc: '$2Desc: %s'
-  not_valid_flag: '$2Ceci n''est pas un flag valide'
-  not_valid_flag_suggested: '$2Ce n''est pas un flag valide. Vouliez-vous dire: $1%s'
-  not_valid_value: $2Les valeurs du flag doivent être alphanumériques
-  flag_not_in_plot: '$2Ce plot n''a pas ce flag'
-  flag_not_removed: $2Ce flag ne peut pas etre retiré
-  flag_not_added: $2Ce flag ne peut pas etre ajouté
-  flag_removed: $4Flag retiré avec succès
-  flag_added: $4Flag ajouté avec succès
-trusted:
-  trusted_added: $4Vous avez réussi à ajouter ce joueur à la liste des joueurs fiables pour ce plot
-  trusted_removed: $4Vous avez réussi à retirer ce joueur de la liste des joueurs fiables pour ce plot
-  was_not_added: $2Ce joueur fait partie de la liste des joueurs non-fiables
-  plot_removed_user: 'Le $1Plot %s dont vous avez été ajouté a été supprimé en raison de l''inactivité du propriétaire'
-member:
-  removed_players: $2Suppression du joueur %s de ce plot.
-  already_owner: '$2Cet utilisateur est déjà propriétaire de ce plot: %s0'
-  already_added: '$2Cet utilisateur est déjà ajouté à cette catégorie: %s0'
-  member_added: $4Cet utilisateur peut maintenant construire pendant que le propriétaire du plot est en ligne
-  member_removed: $1Vous avez supprimé avec succès un utilisateur du plot
-  member_was_not_added: '$2Ce joueur n''a pas été ajouté en tant qu''utilisateur sur ce plot'
-  plot_max_members: '$2Vous n''êtes pas autorisé à ajouter d''autres joueurs à ce plot'
-owner:
-  set_owner: $4You successfully set the plot owner
-  set_owner_cancelled: $2The setowner action was cancelled
-  now_owner: $4You are now owner of plot %s
-signs:
-  owner_sign_line_1: '$1ID: $1%id%'
-  owner_sign_line_2: '$1Owner:'
-  owner_sign_line_3: $2%plr%
-  owner_sign_line_4: $3Claimed
-help:
-  help_header: $3&m---------&r $1Plot² Help $3&m---------
-  help_page_header: '$1Category: $2%category%$2,$1 Page: $2%current%$3/$2%max%$2'
-  help_footer: $3&m---------&r $1Plot² Help $3&m---------
-  help_info_item: $1/plot help %category% $3- $2%category_desc%
-  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
-  direction: '$1Current direction: %dir%'
-grants:
-  granted_plots: '$1Résultat: $2%s $1Ajout retiré'
-  granted_plot: $1Vous avez été ajouté %s0 au plot $2%s1
-  granted_plot_failed: '$1L''ajout a échoué: $2%s'
-'-':
-  custom_string: '-'
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/furthest.js b/Bukkit/src/main/resources/furthest.js
deleted file mode 100644
index b0f973088..000000000
--- a/Bukkit/src/main/resources/furthest.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-* Script to find the furthest plot from origin in a world:
-*  - /plot debugexec runasync furthest.js <plotworld>
-*/
-
-if (PS.hasPlotArea("%s0")) {
-    var plots = PS.getAllPlotsRaw().get("%s0").values().toArray();
-    var max = 0;
-    var maxplot;
-    for (var i in plots) {
-        var plot = plots[i];
-        if (plot.x > max) {
-            max = plot.x;
-            maxplot = plot;
-        }
-        if (plot.y > max) {
-            max = plot.y;
-            maxplot = plot;
-        }
-        if (-plot.x > max) {
-            max = -plot.x;
-            maxplot = plot;
-        }
-        if (-plot.y > max) {
-            max = -plot.y;
-            maxplot = plot;
-        }
-    }
-    PS.class.static.log(plot);
-}
-else {
-    PlotPlayer.sendMessage("Usage: /plot debugexec runasync furthest.js <plotworld>");
-}
diff --git a/Bukkit/src/main/resources/it-IT.yml b/Bukkit/src/main/resources/it-IT.yml
deleted file mode 100644
index 6419a2234..000000000
--- a/Bukkit/src/main/resources/it-IT.yml
+++ /dev/null
@@ -1,393 +0,0 @@
-confirm:
-  expired_confirm: $2La conferma è scaduta, esegui nuovamente il comando!
-  failed_confirm: $2Non hai azioni in sospeso da confermare!
-  requires_confirm: '$2Sei sicuro di voler eseguire: $1%s$2?&-$2Questo non può essere annullato! Se sei sicuro: $1/plot confirm'
-move:
-  move_success: $4Lotto spostato con successo.
-  copy_success: $4Lotto copiato con successo.
-  requires_unowned: $2La posizione specificata è già occupata.
-set:
-  set_attribute: $4Impostato con successo %s0 a %s1
-web:
-  generating_link: $1Elaborazione del lotto in corso...
-  generating_link_failed: $2Generazione del link per il download fallita!
-  save_failed: $2Salvataggio fallito
-  load_null: $2Usa $4/plot load $2per ottenere una lista delle schematiche
-  load_failed: $2Caricamento schematica fallito
-  load_list: '$2Per caricare una schematica, usa $1/plot load #'
-  save_success: $1Salvata con successo!
-compass:
-  compass_target: $4Lotto mirato con successo con la bussola
-cluster:
-  cluster_available_args: '$1Sono disponibili i seguenti sotto comandi: $4list$2, 
-    $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2,
-    $4info$2, $4tp$2, $4sethome'
-  cluster_list_heading: $2Ci sono $1%s$2 cluster in questo mondo
-  cluster_list_element: $2 - $1%s&-
-  cluster_intersection: '$2L''area proposta si sovrappone a: %s0'
-  cluster_outside: '$2L''area proposta è fuori dall''area dei lotti: %s0'
-  cluster_added: $4Cluster creato con successo.
-  cluster_deleted: $4Cluster eliminato con successo.
-  cluster_resized: $4Cluster ridimensionato con successo.
-  cluster_added_user: $4Utente aggiunto al cluster con successo.
-  cannot_kick_player: $2Non puoi cacciare quel giocatore
-  cluster_invited: '$1Sei stato invitato nel cluster seguente: $2%s'
-  cluster_removed: '$1Sei stato rimosso dal cluster: $2%s'
-  cluster_kicked_user: $4Utente cacciato con successo
-  invalid_cluster: '$1Nome cluster non valido: $2%s'
-  cluster_not_added: $2Quel giocatore non è stato aggiunto al cluster di lotti
-  cluster_cannot_leave: $1Devi eliminare o trasferire la proprietà prima di uscire
-  cluster_added_helper: $4Aggiunto con successo un aiutante al cluster
-  cluster_removed_helper: $4Rimosso con successo un aiutante dal cluster
-  cluster_regenerated: $4Rigenerazione cluster iniziata correttamente
-  cluster_teleporting: $4Teletrasporto in corso...
-  cluster_info: '$1Cluster attuale: $2%id%&-$1Nome: $2%name%&-$1Proprietario: $2%owner%&-$1Dimensione: $2%size%&-$1Permessi: $2%rights%'
-border:
-  border: $2Sei fuori dal confine della mappa attuale
-unclaim:
-  unclaim_success: $4Hai liberato il lotto con successo.
-  unclaim_failed: $2Impossibile liberare il lotto
-worldedit masks:
-  worldedit_delayed: $2Attendi durante l'elaborazione della tua azione WorldEdit...
-  worldedit_run: '$2Scuse per il ritardo. Ora in esecuzione: %s'
-  require_selection_in_mask: $2%s della tua selezione non è all'interno del tuo lotto. Puoi apportare modifiche solo dentro il tuo lotto.
-  worldedit_volume: $2Non puoi selezionare un volume di %current%. Il volume massimo che puoi modificare è %max%.
-  worldedit_iterations: $2Non puoi iterare %current% volte. Il massimo numero di iterazioni consentite è %max%.
-  worldedit_unsafe: $2L'accesso a quel comando è stato bloccato
-  worldedit_bypass: $2&oPer bypassare le tue restrizioni usa $4/plot wea
-  worldedit_bypassed: $2Attualmente bypassando le restrizioni di WorldEdit.
-  worldedit_unmasked: $1Il tuo WorldEdit è ora libero.
-  worldedit_restricted: $1Il tuo WorldEdit è ora ristretto.
-gamemode:
-  gamemode_was_bypassed: $1Hai bypassato la modalità di gioco ($2{gamemode}$1) $1impostata per $2{plot}
-height limit:
-  height_limit: $1Questa area lotti ha un limite di altezza di $2{limit}
-records:
-  record_play: $2%player $2ha iniziato a riprodurre il disco $1%name
-  notify_enter: $2%player $2è entrato nel tuo lotto ($1%plot$2)
-  notify_leave: $2%player $2è uscito dal tuo lotto ($1%plot$2)
-swap:
-  swap_overlap: $2Le aree proposte non possono sovrapporsi
-  swap_dimensions: $2Le aree proposte devono avere le stesse dimensioni
-  swap_syntax: $2/plot swap <id lotto>
-  swap_success: $4Lotti scambiati con successo
-  started_swap: $2Scambio lotti avviato. Sarai avvisato al termine
-comment:
-  inbox_notification: '%s messaggi non letti. Usa /plot inbox'
-  not_valid_inbox_index: $2Nessun commento all'indice %s
-  inbox_item: $2 - $4%s
-  comment_syntax: $2Usa /plot comment [X;Z] <%s> <commento>
-  invalid_inbox: '$2Quella non è una casella di posta valida.&-$1Valori accettati: %s'
-  no_perm_inbox: $2Non hai il permesso per quella casella di posta
-  no_perm_inbox_modify: $2Non hai il permesso di modificare quella casella di posta
-  no_plot_inbox: $2Devi stare in un lotto o fornirlo nell'argomento
-  comment_removed: $4Cancellato con successo il commento/i:n$2 - '$3%s$2'
-  comment_added: $4È stato lasciato un commento
-  comment_header: $2&m---------&r $1Commenti $2&m---------&r
-  inbox_empty: $2Nessun commento
-console:
-  not_console: $2Per ragioni di sicurezza, questo commando può essere eseguito solo dalla console.
-  is_console: $2Questo comando può essere eseguito solo da un giocatore.
-inventory:
-  inventory_usage: '&cUso: &6{usage}'
-  inventory_desc: '&cDescrizione: &6{desc}'
-  inventory_category: '&cCategoria: &6{category}'
-clipboard:
-  clipboard_set: $2Il lotto corrente è ora copiato nei tuoi appunti, usa $1/plot paste$2 per incollarlo
-  pasted: $4La selezione del lotto è stata incollata. È stata cancellata dai tuoi appunti.
-  paste_failed: '$2Incollaggio della selezione fallito. Motivo: $2%s'
-  no_clipboard: $2Non hai una selezione nei tuoi appunti
-  clipboard_info: '$2Selezione Attuale - ID Lotto: $1%id$2, Larghezza: $1%width$2, Blocchi Totali: $1%total$2'
-toggle:
-  toggle_enabled: '$2Impostazione abilitata: %s'
-  toggle_disabled: '$2Impostazione disabilitata: %s'
-blocked command:
-  command_blocked: $2Quel comando non è consentito in questo lotto
-done:
-  done_already_done: $2Questo lotto è già contrassegnato come finito
-  done_not_done: $2Questo lotto non è contrassegnato come finito.
-  done_insufficient_complexity: $2Questo lotto è troppo semplice. Aggiungi altri dettagli prima di usare questo comando.
-  done_success: $1Questo lotto è stato contrassegnato con successo come finito.
-  done_removed: $1Ora puoi continuare a costruire in questo lotto.
-ratings:
-  ratings_purged: $2Valutazioni di questo lotto eliminate
-  rating_not_valid: $2Devi specificare un numero compreso tra 1 e 10
-  rating_already_exists: $2Hai già valutato il lotto $2%s
-  rating_applied: $4Hai valutato con successo il lotto $2%s
-  rating_not_your_own: $2Non puoi valutare il tuo stesso lotto
-  rating_not_done: $2Puoi valutare solo lotti finiti.
-  rating_not_owned: $2Non puoi valutare un lotto che non è stato claimato
-tutorial:
-  rate_this: $2Valuta questo lotto!
-  comment_this: '$2Lascia un feedback a questo lotto: %s'
-economy:
-  econ_disabled: $2L'economia non è abilitata
-  cannot_afford_plot: $2Non ti puoi permettere di comprare questo lotto. Costa $1%s
-  not_for_sale: $2Questo lotto non è in vendita
-  cannot_buy_own: $2Non puoi comprare il tuo stesso lotto
-  plot_sold: $4Il tuo lotto; $1%s0$4, è stato venduto a $1%s1$4 per $1$%s2
-  cannot_afford_merge: $2Non puoi permetterti di unire i lotti. Costa $1%s
-  added_balance: $1%s $2sono stati aggiunti al tuo bilancio
-  removed_balance: $1%s $2sono stati presi dal tuo bilancio
-  removed_granted_plot: $2Hai usato la concessione del lotto di %s, hai $1%s $2rimanenti
-setup:
-  setup_init: '$1Uso: $2/plot setup <valore>'
-  setup_step: '$3[$1Passaggio %s0$3] $1%s1 $2- $1Stimato: $2%s2 $1Predefinito: $2%s3'
-  setup_invalid_arg: '$2%s0 non è un argomento valido per il passaggio %s1. Per cancellare il setup usa: $1/plot setup cancel'
-  setup_valid_arg: $2Valore $1%s0 $2impostato a %s1
-  setup_finished: $4Dovresti essere stato teletrasportato nel mondo creato. Altrimenti
-    sarà necessario impostare manualmente il generatore usando il file bukkit.yml
-    o il tuo plugin di gestione dei mondi scelto.
-  setup_world_taken: $2%s è già un mondo lotti
-  setup_missing_world: $2Devi specificare un nome per il mondo ($1/plot setup &l<mondo>$1
-    <generatore>$2)&-$1Comandi aggiuntivi:&-$2 - $1/plot setup <valore>&-$2 - $1/plot
-    setup back&-$2 - $1/plot setup cancel
-  setup_missing_generator: $2Devi specificare un generatore ($1/plot setup <mondo>
-    &l<generatore>&r$2)&-$1Comandi aggiuntivi:&-$2 - $1/plot setup <valore>&-$2 -
-    $1/plot setup back&-$2 - $1/plot setup cancel
-  setup_invalid_generator: '$2Generatore non valido. Opzioni possibili: %s'
-schematics:
-  schematic_too_large: $2Il lotto è troppo grande per questa azione!
-  schematic_missing_arg: '$2Devi specificare un argomento. Valori possibili: $1test <nome>$2 , $1save$2 , $1paste $2, $1exportall'
-  schematic_invalid: '$2Quella non è una schematica valida. Motivo: $2%s'
-  schematic_valid: $2Quella è una schematica valida
-  schematic_paste_failed: $2L'incollaggio della schematica è fallito
-  schematic_paste_success: $4Schematica incollata con successo
-titles:
-  title_entered_plot: '$1Lotto: %world%;%x%;%z%'
-  title_entered_plot_sub: $4Proprietà di %s
-  prefix_greeting: '$1%id%$2> '
-  prefix_farewell: '$1%id%$2> '
-core:
-  task_start: Avviando l'attività...
-  prefix: $3[$1P2$3] $2
-  enabled: $1%s0 è ora abilitato
-reload:
-  reloaded_configs: $1Le traduzioni e le configurazioni del mondo sono state ricaricate
-  reload_failed: $2Ricarimento dei file di configurazione fallito
-desc:
-  desc_set: $2Descrizione del lotto impostata
-  desc_unset: $2Descrizione del lotto eliminata
-  missing_desc: $2Devi specificare una descrizione
-alias:
-  alias_set_to: $2Alias del lotto impostato a $1%alias%
-  alias_removed: $2Alias del lotto rimosso
-  missing_alias: $2Devi specificare un alias
-  alias_too_long: $2L'alias deve esssere deve essere lungo meno di 50 caratteri
-  alias_is_taken: $2Quell'alias è già in uso
-position:
-  missing_position: '$2Devi specificare una posizione. Valori possibili: $1none'
-  position_set: $1Casa impostata alla tua posizione attuale
-  position_unset: $1Posizione della casa ripristinata al punto predefinito
-  home_argument: $2Usa /plot set home [none]
-  invalid_position: $2Quella non è una posizione valida
-cap:
-  entity_cap: $2Non puoi spawnare ulteriori mob
-time:
-  time_format: $1%hours%, %min%, %sec%
-permission:
-  no_schematic_permission: $2Non hai il permesso richiesto per usare la schematica $1%s
-  no_permission: '$2Ti manca il permesso: $1%s'
-  no_permission_event: '$2Ti manca il permesso: $1%s'
-  no_plot_perms: $2Devi essere il proprietario del lotto per eseguire questa azione
-  cant_claim_more_plots: $2Non puoi avere ulteriori lotti.
-  cant_claim_more_clusters: $2Non puoi avere ulteriori cluster.
-  cant_transfer_more_plots: $2Non puoi trasferire ulteriori lotti a quell'utente
-  cant_claim_more_plots_num: $2Non puoi claimare più di $1%s $2lotti alla volta
-  you_be_denied: $2Non ti è permesso entrare in questo lotto
-  merge_request_confirm: Richiesta di fusione dei lotti da %s
-merge:
-  merge_not_valid: $2Questa richiesta di fusione dei lotti non è più valida.
-  merge_accepted: $2La richiesta di fusione dei lotti è stata accettata
-  success_merge: $2I lotti sono stati uniti!
-  merge_requested: $2Richiesta di fusione dei lotti inviata
-  no_perm_merge: '$2Non sei il proprietario del lotto: $1%plot%'
-  no_available_automerge: $2Non possiedi alcun lotto adiacente nella direzione specificata o non puoi unire i lotti alla dimensione richiesta.
-  unlink_required: $2Per fare questo è necessario uno scollegamento dei lotti.
-  unlink_impossible: $2Puoi scollegare solo un mega-lotto
-  unlink_success: $2Lotti scollegati con successo.
-commandconfig:
-  not_valid_subcommand: $2Quello non è un sottocomando valido
-  did_you_mean: '$2Forse intendevi: $1%s'
-  name_little: $2Il nome %s0 è troppo corto, $1%s1$2<$1%s3
-  no_commands: $2Non ti è permesso usare alcun sottocomando.
-  subcommand_set_options_header: '$2Valori Possibili: '
-  command_syntax: '$1Uso: $2%s'
-  flag_tutorial_usage: '$1Avere un amministratore che imposta la flag: $2%s'
-errors:
-  invalid_player_wait: '$2Giocatore non trovato: $1%s$2, ricerca in corso. Riprova presto.'
-  invalid_player: '$2Giocatore non trovato: $1%s$2.'
-  invalid_player_offline: '$2Il giocatore deve essere online: $1%s.'
-  invalid_command_flag: '$2Flag dei comandi non valida: %s0'
-  error: '$2Si è verificato un errore: %s'
-  command_went_wrong: $2Qualcosa è andato storto durante l'esecuzione di quel comando...
-  no_free_plots: $2Non ci sono lotti liberi disponibili
-  not_in_plot: $2Non sei in un lotto
-  not_loaded: $2Non è stato possibile caricare il lotto
-  not_in_cluster: $2Devi essere dentro un cluster di lotti per eseguire questa azione
-  not_in_plot_world: $2Non sei in un mondo lotti
-  plotworld_incompatible: $2I due mondi devono essere compatibili
-  not_valid_world: $2Quello non è un mondo valido (case sensitive)
-  not_valid_plot_world: $2Quello non è un mondo lotti valido (case sensitive)
-  no_plots: $2Non hai nessun lotto
-  wait_for_timer: $2Un timer setblock è impostato sul lotto attuale o su di te. Aspetta che finisca
-paste:
-  debug_report_created: '$1Un debug completo è stato caricato a: $1%url%'
-purge:
-  purge_success: $4Eliminati con successo %s lotti
-trim:
-  trim_in_progress: Un'attività di trim del mondo è già in esecuzione!
-  not_valid_hybrid_plot_world: Il gestore di lotti ibridi è richiesto per eseguire questa azione
-block list:
-  block_list_separater: '$1,$2 '
-biome:
-  need_biome: $2Devi specificare un bioma valido.
-  biome_set_to: $2Bioma del lotto impostato a $2
-teleport:
-  teleported_to_plot: $1Sei stato teletrasportato
-  teleported_to_road: $2Sei stato teletrasportato sulla strada
-  teleport_in_seconds: $1Teletrasporto tra %s secondi. Non muoverti...
-  teleport_failed: $2Teletrasporto annullato a causa di movimenti o danni
-set block:
-  set_block_action_finished: $1L'ultima azione setblock è ora terminata.
-unsafe:
-  debugallowunsafe_on: $2Azioni non sicure consentite
-  debugallowunsafe_off: $2Azioni non sicure disabilitate
-debug:
-  debug_header: $1Informazioni di Debug&-
-  debug_section: $2>> $1&l%val%
-  debug_line: $2>> $1%var%$2:$1 %val%&-
-invalid:
-  not_valid_data: $2Quello non è un id valido.
-  not_valid_block: '$2Questo non è un blocco valido: %s'
-  not_allowed_block: '$2Questo blocco non è consentito: %s'
-  not_valid_number: '$2Quello non è un numero valido all''interno dell''intervallo: %s'
-  not_valid_plot_id: $2Quello non è un id lotto valido.
-  plot_id_form: '$2L''id del lotto deve essere scritto in questa forma: $1X;Y $2es. $1-5;7'
-  not_your_plot: $2Quel lotto non è tuo.
-  no_such_plot: $2Quel lotto non esiste
-  player_has_not_been_on: $2Quel giocatore non è mai stato nel mondo lotti
-  found_no_plots: $2Non sono stati trovati lotti con la tua ricerca
-  found_no_plots_for_player: '$2Nessun lotto trovato per il giocatore: %s'
-camera:
-  camera_started: $2Hai inserito la modalità telecamera per il lotto $1%s
-  camera_stopped: $2Non sei più in modalità telecamera
-need:
-  need_plot_number: $2Devi specificare un numero lotto o un alias
-  need_block: $2Devi specificare un blocco
-  need_plot_id: $2Devi specificare un id lotto.
-  need_plot_world: $2Devi specificare un mondo lotti.
-  need_user: $2Devi specificare un nome utente
-near:
-  plot_near: '$1Giocatori: %s0'
-info:
-  none: Nessuno
-  now: Adesso
-  never: Mai
-  unknown: Sconosciuto
-  everyone: Tutti
-  plot_unowned: $2Il lotto attuale deve avere un proprietario per eseguire questa azione
-  plot_info_unclaimed: $2Il lotto $1%s$2 non è ancora claimato
-  plot_info_header: $3&m---------&r $1INFO $3&m---------
-  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Proprietario: $2%owner%$1&-$1Bioma:
-    $2%biome%$1&-$1Puoi costruire: $2%build%$1&-$1Valutazione: $2%rating%&-$1Visto:
-    $2%seen%&-$1Membri fidati: $2%trusted%$1&-$1Membri: $2%members%$1&-$1Bloccati:
-    $2%denied%$1&-$1Flag: $2%flags%'
-  plot_info_footer: $3&m---------&r $1INFO $3&m---------
-  plot_info_trusted: $1Membri fidati:$2 %trusted%
-  plot_info_members: $1Membri:$2 %members%
-  plot_info_denied: $1Bloccati:$2 %denied%
-  plot_info_flags: $1Flag:$2 %flags%
-  plot_info_biome: $1Bioma:$2 %biome%
-  plot_info_rating: $1Valutazione:$2 %rating%
-  plot_info_owner: $1Proprietario:$2 %owner%
-  plot_info_id: $1ID:$2 %id%
-  plot_info_alias: $1Alias:$2 %alias%
-  plot_info_size: $1Dimensione:$2 %size%
-  plot_info_seen: $1Visto:$2 %seen%
-  plot_user_list: ' $1%user%$2,'
-  plot_flag_list: $1%s0:%s1$2
-  info_syntax_console: $2/plot info X;Y
-working:
-  generating_component: $1Iniziato a generare componenti dalle tue impostazioni
-  clearing_plot: $2Pulizia del lotto.
-  clearing_done: $4Pulizia completata! Impiegati %sms.
-  deleting_done: $4Cancellazione completata! Impiegati %sms.
-  plot_not_claimed: $2Lotto non claimato
-  plot_is_claimed: $2Questo lotto è già claimato
-  claimed: $4Hai claimato il lotto con successo
-list:
-  comment_list_header_paged: $2(Pagina $1%cur$2/$1%max$2) $1Elenco di %amount% commenti
-  clickable: ' (interattivo)'
-  area_list_header_paged: $2(Pagina $1%cur$2/$1%max$2) $1Elenco di %amount% aree
-  plot_list_header_paged: $2(Pagina $1%cur$2/$1%max$2) $1Elenco di %amount% lotti
-  plot_list_header: $1Elenco dei lotti di %word%
-  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
-  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
-  plot_list_footer: $2>> $1%word% con un totale di $2%num% $1%plot% claimati.
-left:
-  left_plot: $2Hai lasciato il lotto
-chat:
-  plot_chat_spy_format: '$2[$1Spia Chat Lotti$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_format: '$2[$1Chat Lotti$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_forced: $2Questo mondo costringe tutti a usare la chat dei lotti.
-  plot_chat_on: $4Chat lotti abilitata.
-  plot_chat_off: $4Chat lotti disabilitata.
-deny:
-  denied_removed: $4Hai sbloccato con successo il giocatore da questo lotto
-  denied_added: $4Hai bloccato con successo il giocatore da questo lotto
-  denied_need_argument: $2Gli argomenti sono mancanti. $1/plot denied add <nome> $2o $1/plot denied remove <nome>
-  was_not_denied: $2Quel giocatore non è bloccato in questo lotto
-  you_got_denied: $4Sei stato bloccato dal lotto dove eri prima, e sei stato teletrasportato allo spawn
-kick:
-  you_got_kicked: $4Sei stato cacciato!
-rain:
-  need_on_off: '$2Devi specificare un valore. Valori possibili: $1on$2, $1off'
-  setting_updated: $4Hai aggiornato l'impostazione con successo
-flag:
-  flag_key: '$2Key: %s'
-  flag_type: '$2Tipo: %s'
-  flag_desc: '$2Desc: %s'
-  not_valid_flag: $2Quella non è una flag valida
-  not_valid_flag_suggested: '$2Quella non è una flag valida. Forse intendevi: $1%s'
-  not_valid_value: $2Il valore delle flag deve essere alfanumerico
-  flag_not_in_plot: $2Il lotto non ha quella flag
-  flag_not_removed: $2La flag non può essere rimossa
-  flag_not_added: $2La flag non può essere aggiunta
-  flag_removed: $4Flag rimossa con successo
-  flag_added: $4Flag aggiunta con successo
-trusted:
-  trusted_added: $4Quell'utente ora può costruire nel tuo lotto
-  trusted_removed: $4Hai rimosso con successo un amico dal lotto
-  was_not_added: $2Quel giocatore non è aggiunto come amico in questo lotto
-  plot_removed_user: $1Il lotto %s in cui eri aggiunto è stato eliminato a causa dell'inattività del proprietario
-member:
-  removed_players: $2Rimossi %s giocatori dal lotto.
-  already_owner: $2L'utente %s0 è già il proprietario di questo lotto.
-  already_added: $2L'utente %s0 è già aggiunto a quella categoria.
-  member_added: $4Quell'utente ora può costruire quando il proprietario è online
-  member_removed: $1Hai rimosso con successo un utente dal lotto
-  member_was_not_added: $2Quel giocatore non è aggiunto a questo lotto
-  plot_max_members: $2Non puoi aggiungere altri giocatori a questo lotto
-owner:
-  set_owner: $4Hai impostato correttamente il proprietario del lotto
-  now_owner: $4Sei ora proprietario del lotto %s
-  set_owner_cancelled: $2L'azione del proprietario è stata annullata
-signs:
-  owner_sign_line_1: '$1ID: $1%id%'
-  owner_sign_line_2: '$1Proprietario:'
-  owner_sign_line_3: $2%plr%
-  owner_sign_line_4: $3Claimato
-help:
-  help_header: $3&m---------&r $1Aiuto Plot² $3&m---------
-  help_page_header: '$1Categoria: $2%category%$2,$1 Pagina: $2%current%$3/$2%max%$2'
-  help_footer: $3&m---------&r $1Aiuto Plot² $3&m---------
-  help_info_item: $1/plot help %category% $3- $2%category_desc%
-  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
-  direction: '$1Direzione attuale: %dir%'
-grants:
-  granted_plots: '$1Risultato: $2%s $1concessioni rimanenti'
-  granted_plot: $1Hai concesso il lotto %s0 a $2%s1
-  granted_plot_failed: '$1Concessione fallita: $2%s'
-'-':
-  custom_string: '-'
diff --git a/Bukkit/src/main/resources/ko-KR.yml b/Bukkit/src/main/resources/ko-KR.yml
deleted file mode 100644
index 07d6caca5..000000000
--- a/Bukkit/src/main/resources/ko-KR.yml
+++ /dev/null
@@ -1,402 +0,0 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Translate by Protocodyne Korean Translate team 
-# First Author <bmr02039@protocodyne.com>, 2015.
-confirm:
-  failed_confirm: $2이 작업이 완료되기 위한 행동이 당신에게 존재하지 않습니다!
-  requires_confirm: '$2정말로 실행되길 원하나요: $1%s$2?&-$2이 작업은 되돌릴 수 없습니다! 확실하다면 다음 명령어를 입력하세요:
-    $1/plot confirm'
-  expired_confirm: $2확인이 만료되었습니다. 명령을 다시 실행하십시오.!
-move:
-  move_success: $4성공적으로 땅이 옮겨졌습니다.
-  copy_success: $4성공적으로 땅이 복사되었습니다.
-  requires_unowned: $2이 지역은 이미 사용되고 있습니다.
-web:
-  generating_link: $1땅을 생성중입니다...
-  generating_link_failed: $2다운로드 링크 생성에 실패하였습니다!
-  save_failed: $2저장에 실패하였습니다.
-  load_null: $2/plot load $4명령어를 사용하여 $2schematics 리스트를 가져오십시오
-  load_failed: $2schematic 로드를 실패하였습니다.
-  load_list: '$2schematic로드를 원한다면, 다음명령어를 사용하세요 $1/plot load #'
-  save_success: $1성공적으로 저장되었습니다!
-compass:
-  compass_target: $4나침반과 함께 음모를 성공적으로 지정했습니다.
-cluster:
-  cluster_available_args: '$1다음 하위명령어가 사용 가능합니다.: $4list$2, $4create$2, $4delete$2,
-    $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2, $4tp$2, $4sethome'
-  cluster_list_heading: $2이 월드에 $1%s$2 cluster가 있습니다
-  cluster_list_element: $2 - $1%s&-
-  cluster_intersection: $2제안 된 영역이 겹칩니다 와 $1%s$2 기존의 cluster
-  cluster_added: $4cluster가 성공적으로 생성되었습니다.
-  cluster_deleted: $4cluster가 성공적으로 삭제되었습니다.
-  cluster_resized: $4cluster가 성공적으로 재조정 되었습니다.
-  cluster_added_user: $4cluster에 성공적으로 유저가 추가되었습니다.
-  cannot_kick_player: $2당신은 해당 플레이어를 추방 할 수 없습니다.
-  cluster_invited: '$1당신은 다음 cluster으로 초대받았습니다: $2%s'
-  cluster_removed: '$1당신은 다음cluster에서 삭제되었습니다: $2%s'
-  cluster_kicked_user: $4성공적으로 해당 유저를 추방 하였습니다
-  invalid_cluster: '$1올바르지 않은 cluster 이름입니다: $2%s'
-  cluster_not_added: $2해당 플레이어는  plot cluster 추가되지 않았습니다
-  cluster_cannot_leave: $1당신은 떠나기전에 cluster를 반드시 삭제하거나 소유권을 이전해야합니다
-  cluster_added_helper: $4helper가 성공적으로 cluster에 추가되었습니다
-  cluster_removed_helper: $4helper가 성공적으로 cluster에서 제거되었습니다
-  cluster_regenerated: $4성공적으로 cluster가 재생성 되었습니다
-  cluster_teleporting: $4이동중...
-  cluster_info: '$1현재 cluster: $2%id%&-$1이름: $2%name%&-$1소유자: $2%owner%&-$1크기: $2%size%&-$1Rights:
-    $2%rights%'
-  cluster_outside: '$2제안 된 영역이 플롯 영역 밖에 있습니다: %s0'
-border:
-  border: $2당신은 현재 지도의 경계 밖에 있습니다
-unclaim:
-  unclaim_success: $4성공적으로 땅을 판매하였습니다.
-  unclaim_failed: $2땅을 판매할 수 없습니다
-worldedit masks:
-  worldedit_delayed: $2당신의 WorldEdit 행동을 처리중이니 기다려주시기 바랍니다...
-  worldedit_run: '$2처리가 지연되어 죄송합니다. 해당 명령어를 실행합니다: %s'
-  require_selection_in_mask: $2%s 선택한 마스크가 플롯 마스크 안에 있지 않습니다..
-    플롯 내에서만 편집 할 수 있습니다..
-  worldedit_volume: $2당신은 a volume of %current%를 선택 할 수 없습니다. 당신이  수정할 수 있는 최대부피는 %max% 입니다.
-  worldedit_iterations: $2당신은 %current%번 반복 적용시킬 수 없습니다. 당신이 수정가능한 최대 부피는 %max% 입니다.
-  worldedit_unsafe: $2해당 명령어는 실행 될 수 없습니다.
-  worldedit_bypass: $2&o당신의 제한을 우회하고 싶다면 $4/plot wea를 사용하십시오
-  worldedit_bypassed: $2현재 WorldEdit의 제한을 수정하는 중입니다.
-  worldedit_unmasked: $1당신의  WorldEdit 제한이 제거되었습니다.
-  worldedit_restricted: $1당신의 WorldEdit은 제한됩니다.
-gamemode:
-  gamemode_was_bypassed: $1당신은 gamemode를 무시합니다 ($2{gamemode}$1) $1set for $2{plot}
-height limit:
-  height_limit: $1이 Plot World는 $2{limit}만큼 제한이 있습니다
-records:
-  record_play: $2%player가 $2플레이 기록을 시작합니다 $1%name
-  notify_enter: $2%player가 $2당신의 plot에 입장합니다 ($1%plot$2)
-  notify_leave: $2%player가 $2당신의 plot를 떠납니다 ($1%plot$2)
-swap:
-  swap_overlap: $2해당 구역은 덮어쓰기가 허용되지 않습니다.
-  swap_dimensions: $2해당 지역은 반드시 비교 가능한 차원이 있어야 합니다.
-  swap_syntax: $2/plot swap <plot id>
-  swap_success: $4성공적으로 땅이 교환되었습니다
-  started_swap: $2땅 교환이 시작되었습니다. 작업 완료시 장신에게 통보 될 예정입니다.
-comment:
-  inbox_notification: '%s 읽지않은 메세지가 있습니다. 다음 명령어를 사용해주세요 /plot inbox'
-  not_valid_inbox_index: $2메일함에 comment가 존재하지 않습니다 %s
-  inbox_item: $2 - $4%s
-  comment_syntax: $2다음 명령어를 사용해주세요 /plot comment [X;Z] <%s> <comment>
-  invalid_inbox: '$2올바르지 않은 메일함 입니다..&-$1Accepted values: %s'
-  no_perm_inbox: $2당신은 해당 메일함에 권한이 없습니다
-  no_perm_inbox_modify: $2당신은 해당 메일함을 수정할 권한이 없습니다
-  no_plot_inbox: $2당신은 서 있거나 줄거리를 제공해야합니다
-  comment_removed: $4comment가 성공적으로 삭제되었습니다/s:n$2 - '$3%s$2'
-  comment_added: $4A comment가 남아있습니다
-  comment_header: $2&m---------&r $1댓글 $2&m---------&r
-  inbox_empty: $2comment가 없습니다
-console:
-  not_console: $2보안상의 이유로, 이 명령어는 Console에서만 입력 가능합니다.
-  is_console: $2해당 명령어는 Player만 사용 가능합니다.
-inventory:
-  inventory_usage: '&c시용: &6{usage}'
-  inventory_desc: '&c설명: &6{desc}'
-  inventory_category: '&c카테고리: &6{category}'
-clipboard:
-  clipboard_set: $2현재 땅은 당신의 클리보드로 복사되었습니다, 다음명령어를 사용하여 $1/plot paste$2 붙여넣으세요.
-  pasted: $4해당 땅은 성공적으로 붙여넣어졌습니다. 해당 땅은 클립보드로부터 제거됩니다.
-  paste_failed: '$2선택된 땅의 복사가 실패했습니다. 사유: $2%s'
-  no_clipboard: $2클립보드에 복사된 땅이 존재하지 않습니다
-  clipboard_info: '$2현재 선택 - Plot ID: $1%id$2, Width: $1%width$2, Total Blocks: $1%total$2'
-toggle:
-  toggle_enabled: '$2가능한 세팅: %s'
-  toggle_disabled: '$2불가능한 세팅: %s'
-blocked command:
-  command_blocked: $2해당 명령어는 이 plot에서 허가되지 않았습니다
-done:
-  done_already_done: $2이 땅은 이미 완료로 표기 되어 있습니다.
-  done_not_done: $2이 땅은 완료로 표기되어 있지 않습니다.
-  done_insufficient_complexity: $2이 땅은 너무 간단합니다. 이 명령어를 사용하기전 더 많은 정보를 입력해주시기 바랍니다.
-  done_success: $1성공적으로 이 땅에 완료표시를 하였습니다.
-  done_removed: $1이 땅에 건축을 진행해도 좋습니다.
-ratings:
-  rating_not_valid: $2당신은 1 과 10 사이의 숫자를 입력해야 합니다
-  rating_already_exists: $2당신은 이미 이 땅에 투표하였습니다 $2%s
-  rating_applied: $4성공적으로 투표되었습니다 $2%s
-  rating_not_your_own: $2당신은 자신의 땅에 투표 할 수 없습니다
-  rating_not_done: $2당신은 완료된 땅에만 투표 할 수 있습니다.
-  rating_not_owned: $2당신은 소유자가 없는 땅에 투표 할 수 없습니다
-  ratings_purged: $2Purged ratings for this plot
-tutorial:
-  rate_this: $2이 땅에 투표해보세요!
-  comment_this: '$2이땅에 피드백을 남겨보세요: %s'
-economy:
-  econ_disabled: $2Economy 가 활성화 되있지 않습니다
-  cannot_afford_plot: $2당신은 이 땅을 구입 할 수 없습니다. 이 땅의 가격은 $1%s 입니다
-  not_for_sale: $2이 땅은 판매 불가능합니다
-  cannot_buy_own: $2당신은 본인의 땅을 구입 불가능 합니다
-  plot_sold: $4당신의 땅; $1%s0$4, 판매 된 $1%s1$4 에 대한 $1$%s2
-  cannot_afford_merge: $2당신은 이 땅을 함칠 수 없습니다. 이 땅의 가격은 $1%s 입니다
-  added_balance: $1%s $2이 당신의 통장에 추가되었습니다
-  removed_balance: $1%s $2이 당신의 통장에서 빠져나갔습니다
-  removed_granted_plot: $2너는 사용했다 %s 계획 교부금 (들), 당신이있어 $1%s $2왼쪽
-setup:
-  setup_init: '$1용법: $2/plot setup <value>'
-  setup_step: '$3[$1Step %s0$3] $1%s1 $2- $1기대: $2%s2 $1태만: $2%s3'
-  setup_invalid_arg: '$2%s0 는 올바르지 않은 값입니다  %s1. 설정 취소를 원하시면 다음 명령어를 사용하십시오: $1/plot
-    setup cancel'
-  setup_valid_arg: $2Value $1%s0 $2set to %s1
-  setup_finished: $4당신은 만들어진 World로 이동되있어야 합니다. 그렇지 않으면 당신은 bukkit.yml를 통하여 워드를 설정하거나
-    다중월드 플러그인을 사용하여 월드를 생성하여야 합니다.
-  setup_world_taken: $2%s 는 이미 등록된 Plot World 입니다
-  setup_missing_world: $2당신은 월드의 이름을 지정해야 합니다 ($1/plot setup &l<world>$1 <generator>$2)&-$1Additional
-    commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup
-    cancel
-  setup_missing_generator: $2당신은 생성기를 지정해야 합니다 ($1/plot setup <world> &l<generator>&r$2)&-$1Additional
-    commands:&-$2 - $1/plot setup <value>&-$2 - $1/plot setup back&-$2 - $1/plot setup
-    cancel
-  setup_invalid_generator: '$2올바르지 않은 생성기 입니다. 가능한 옵션: %s'
-schematics:
-  schematic_missing_arg: '$2당신은 인수를 지정해야 합니다. 가능한 값: $1test <name>$2 , $1save$2 ,
-    $1paste $2, $1exportall'
-  schematic_invalid: '$2이것은 올바르지 않은 schematic파일 입니다. 사유: $2%s'
-  schematic_valid: $2이것은 올바른 schematic파일 입니다
-  schematic_paste_failed: $2schematic 적용에 실패하엿습니다
-  schematic_paste_success: $4schematic이 성공적으로 적용되었습니다
-  schematic_too_large: $2플롯이 너무 커서이 작업을 수행 할 수 없습니다!
-titles:
-  title_entered_plot: '$1Plot: %world%;%x%;%z%'
-  title_entered_plot_sub: $4에게 소유 된 %s
-  prefix_greeting: '$1%id%$2> '
-  prefix_farewell: '$1%id%$2> '
-core:
-  task_start: 작업을 시작합니다...
-  prefix: $3[$1P2$3] $2
-  enabled: $1PlotSquared 가 실행됩니다
-reload:
-  reloaded_configs: $1번역 파일 및 월드 설정 파일이 성공적으로 리로드 되었습니다
-  reload_failed: $2설정파일의 리로드에 실패하였습니다
-desc:
-  desc_set: $2Plot 설명 설정
-  desc_unset: $2Plot 설명 설정취소
-  missing_desc: $2당신은 설명을 지정해야 합니다
-alias:
-  alias_set_to: $2땅의 별명을 $1%alias%로 성정합니다
-  missing_alias: $2당신은 별명을 설정해야 합니다
-  alias_too_long: $2별명은 50자 이내여야 합니다
-  alias_is_taken: $2이 별명은 이미 존재합니다
-  alias_removed: $2플롯 별칭이 제거되었습니다
-position:
-  missing_position: '$2당신은 위치를 지정해야합니다. 가능한 값: $1none'
-  position_set: $1Home 위치를 현재 위치로 지정합니다
-  position_unset: $1Home 위치를 기본위치로 초기화 합니다
-  home_argument: $2다음 명령어를 사용하십시오 /plot set home [none]
-  invalid_position: $2해당 위치는 유효하지 않습니다
-time:
-  time_format: $1%시간%, %분%, %초%
-permission:
-  no_schematic_permission: $2당신은 schematic을 이용하기 위한 권한이 없습니다 $1%s
-  no_permission: '$2당신은 해당 퍼미션 노드가 존재하지 않습니다: $1%s'
-  no_permission_event: '$2당신은 해당 퍼미션 노드가 존재하지 않습니다: $1%s'
-  no_plot_perms: $2이 행동을 하기 위해선 반드시 땅의 소유자여야 합니다
-  cant_claim_more_plots: $2당신은 더 많은 땅들을 소유할 수 없습니다
-  cant_transfer_more_plots: $2당신은 해당 유저에게 더 많은 땅을 보낼 수 없습니다
-  cant_claim_more_plots_num: $2당신은 한번에 $1%s $2plots보다 더 많이 소유할 수 없습니다
-  you_be_denied: $2당신은 이 땅에 들어갈 수 없습니다
-  merge_request_confirm: 병합요청이 들어왔습니다 %s
-  cant_claim_more_clusters: $2더 많은 클러스터를 청구 할 수 없습니다.
-merge:
-  merge_not_valid: $2이 병합 요청은 더이상 유효하지 않습니다
-  merge_accepted: $2병합 요청이 수락되었습니다
-  success_merge: $2땅이 병합되었습니다
-  merge_requested: $2병합요청이 성공적으로 전송되었습니다
-  no_perm_merge: '$2당신은 이 땅의 소유자가 아닙니다: $1%plot%'
-  no_available_automerge: $2당신은 지정한 방향으로 인접한 plots를 소유하지 않았거나 plots를 필요한 크기로 합병 할
-    수 없습니다.
-  unlink_required: $2An unlink는 이것을 하는데 요구 됩니다.
-  unlink_impossible: $2당신은 오직 mega-plot만 unlink 할 수 있습니다
-  unlink_success: $2성공적으로 plots을 unlink 하였습니다.
-errors:
-  invalid_player_wait: '$2플레이어를 찾지 못했습니다: $1%s$2, fetching it. 잠시 후 시도해주세요.'
-  invalid_player_offline: '$2플레이어는 반드시 접속 중이어야 합니다: $1%s.'
-  invalid_player: '$2플레이어를 찾지 못했습니다: $1%s.'
-  command_went_wrong: $2해당 명령어를 실행 중 오류가 발생 하였습니다...
-  no_free_plots: $2그곳에는 사용가능한 Free Plot이 없습니다
-  not_in_plot: $2당신은 땅에 있지 않습니다
-  not_in_cluster: $2당신은 그 행동을 하기 위해서 plot cluster 내부에 있어야만 합니다.
-  not_in_plot_world: $2당신은 plot world에 있지 않습니다.
-  plotworld_incompatible: $2해당 월드는 호환되지 않습니다
-  not_valid_world: $2옳바르지 않은 World 입니다
-  not_valid_plot_world: $2올바르지 않은 plot world 입니다 (case sensitive)
-  no_plots: $2당신은 어떤 땅도 가지고 있지 않습니다
-  wait_for_timer: $2A setblock 타이머는 현재의 땅 또는 당신에게 묶여있습니다. 완료까지 잠시 기다려주시기 바랍니다
-  invalid_command_flag: '$2잘못된 명령 플래그: %s0'
-  error: '$2오류가 발생했습니다: %s'
-  not_loaded: $2플롯을로드 할 수 없습니다
-paste:
-  debug_report_created: '$1전체 디버그를에 업로드했습니다.: $1%url%'
-purge:
-  purge_success: $4%s 땅들을 성공적으로 제거하였습니다
-trim:
-  trim_in_progress: 최적화 작업이 이미 진행중입니다!
-  not_valid_hybrid_plot_world: 이 행동을 위하여 hybrid plot manager가 필요합니다.
-block list:
-  block_list_separater: '$1,$2 '
-biome:
-  need_biome: $2당신은 유효한 생태계를 지정해야 합니다.
-  biome_set_to: $2플롯 생물 설정 $2
-teleport:
-  teleported_to_plot: $1당신은 이동 되었습니다.
-  teleported_to_road: $2당신은 길로 이동 되었습니다.
-  teleport_in_seconds: $1%s초 후 이동됩니다. 움직이지 마세요...
-  teleport_failed: $2이동이 움직임 또는 데미지 때문에 취소되었습니다.
-set block:
-  set_block_action_finished: $1마지막 setblock 행동이 이제 끝났습니다.
-unsafe:
-  debugallowunsafe_on: $2안전하지 않은 행동을 허가합니다
-  debugallowunsafe_off: $2안전하지 않은 행동을 차단합니다
-debug:
-  debug_header: $1Debug Information&-
-  debug_section: $2>> $1&l%val%
-  debug_line: $2>> $1%var%$2:$1 %val%&-
-invalid:
-  not_valid_data: $2그것은 유효한 데이터 ID가 아닙니다.
-  not_valid_block: '$2그것은 유효한 블록이 아닙니다.: %s 그것은 유효한 블록이 아닙니다.'
-  not_allowed_block: '$2그 블록은 허락되지 않았습니다 : %s'
-  not_valid_number: $2그것은 %s범위내에서 유효하지 않은 숫자입니다.
-  not_valid_plot_id: $2그 땅의 ID는 유효하지 않습니다.
-  plot_id_form: '$2땅의 ID는 반드시 형식에 있어야 합니다: $1X;Y $2e.g. $1-5;7'
-  not_your_plot: $2그것은 당신의 땅이 아닙니다.
-  no_such_plot: $2거기엔 어떤 땅도 없습니다.
-  player_has_not_been_on: $2해당 플레이어는 plotworld에 없습니다.
-  found_no_plots: $2당신의 검색에서 아무 땅도 발견하지 못했습니다
-  found_no_plots_for_player: '$2No plots found for player: %s'
-camera:
-  camera_started: $2당신은 땅을 위한 카메라 모드에 입장했습니다 $1%s
-  camera_stopped: $2카메라 모드를 종료합니다
-need:
-  need_plot_number: $2당신은 땅의 번호 또는 별칭을 지정해야합니다.
-  need_block: $2당신은 블록을 지정해야합니다
-  need_plot_id: $2당신은 Plot ID를 지정할 수 있습니다
-  need_plot_world: $2당신은 Plot world를 지정할 수 있습니다
-  need_user: $2당신은 유저이름을 지정할 필요가 있습니다
-info:
-  none: None
-  unknown: Unknown
-  everyone: Everyone
-  plot_unowned: $2이 행동을 실행하기 위해선 현재 plot에 소유자가 있어야 합니다
-  plot_info_unclaimed: $2땅 $1%s$2 이 아직 판매되지 않았습니다
-  plot_info_header: $3&m---------&r $1INFO $3&m---------
-  plot_info: '$1ID: $2%id%$1&-$1Alias: $2%alias%$1&-$1Owner: $2%owner%$1&-$1Biome:
-    $2%biome%$1&-$1Can Build: $2%build%$1&-$1Rating: $2%rating%&-$1Trusted: $2%trusted%$1&-$1Members:
-    $2%members%$1&-$1Denied: $2%denied%$1&-$1Flags: $2%flags%'
-  plot_info_footer: $3&m---------&r $1INFO $3&m---------
-  plot_info_trusted: $1Trusted:$2 %trusted%
-  plot_info_members: $1Members:$2 %members%
-  plot_info_denied: $1Denied:$2 %denied%
-  plot_info_flags: $1Flags:$2 %flags%
-  plot_info_biome: $1Biome:$2 %biome%
-  plot_info_rating: $1Rating:$2 %rating%
-  plot_info_owner: $1Owner:$2 %owner%
-  plot_info_id: $1ID:$2 %id%
-  plot_info_alias: $1Alias:$2 %alias%
-  plot_info_size: $1Size:$2 %size%
-  plot_user_list: ' $1%user%$2,'
-  info_syntax_console: $2/plot info X;Y
-  now: 지금
-  never: 못
-  plot_info_seen: $1Seen:$2 %seen%
-  plot_flag_list: $1%s0:%s1$2
-working:
-  generating_component: $1당신의 설정값으로부터 component 생성을 시작합니다
-  clearing_plot: $2플롯 비동기 지우기.
-  clearing_done: $4명확한 완료. 했다 %sms.
-  plot_not_claimed: $2땅이 판매되지 않았습니다
-  plot_is_claimed: $2이 땅은 이미 판매되었습니다
-  claimed: $4성공적으로 땅을 판매하였습니다
-  deleting_done: $4삭제가 완료되었습니다! 가져왔다 %sms.
-list:
-  comment_list_header_paged: $2(페이지 $1%cur$2/$1%max$2) $1목록 %amount% 코멘트
-  clickable: ' (상호 작용하는)'
-  plot_list_header_paged: $2(페이지 $1%cur$2/$1%max$2) $1목록 %amount% plots
-  plot_list_header: $1목록 %word% plots
-  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
-  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
-  plot_list_footer: $2>> $1%word% 총 $2%num% $1claimed %plot%.
-  area_list_header_paged: $2(페이지 $1%cur$2/$1%max$2) $1목록f %amount% areas
-left:
-  left_plot: $2당신은 땅을 떠났습니다.
-chat:
-  plot_chat_format: '$2[$1Plot Chat$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_forced: $이 월드는 모두가 plot chat을 쓰도록 강제합니다
-  plot_chat_on: $4플롯 채팅 사용 설정 됨.
-  plot_chat_off: $4플롯 채팅 사용 중지됨.
-  plot_chat_spy_format: '$2[$1Plot Spy$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-deny:
-  denied_removed: $4당신은 이 땅으로부터 플레이어를 차단 해제 했습니다.
-  denied_added: $4당신은 이 땅으로부터 플레이어를 성공적으로 차단 했습니다.
-  denied_need_argument: $2변수가 빠졌습니다. $1/plot denied add <name> $2or $1/plot denied
-    remove <name>
-  was_not_denied: $2해당 플레이어는 이 땅에서 차단되지 않았습니다.
-  you_got_denied: $4당신은 해당 땅으로부터 차단되었습니다 따라서 spawn으로 자동 이동 되었습니다.
-rain:
-  need_on_off: '$2당신은 올바른 값을 선택하여야 합니다. 가능한 값: $1on$2, $1off'
-  setting_updated: $4당신은 설정을 성공적으로 업데이트 했습니다
-flag:
-  flag_key: '$2Key: %s'
-  flag_type: '$2Type: %s'
-  flag_desc: '$2Desc: %s'
-  not_valid_flag: $2그것은 유효한 깃발이 아닙니다
-  not_valid_value: $2깃발 값은 무조건 문자 숫자여야만 한다
-  flag_not_in_plot: $2그땅은 그 깃발을 가지고 있지 않습니다
-  flag_not_removed: $2그 깃발은 제거될 수 없습니다
-  flag_not_added: $2그 깃발은 추가될 수 없습니다
-  flag_removed: $4깃발이 성공적으로 제거되었습니다
-  flag_added: $4깃발이 성공적으로 추가되었습니다
-  not_valid_flag_suggested: '$2That is not a valid flag. Did you mean: $1%s'
-trusted:
-  trusted_added: $4당신은 그 땅에 유저를 성공적으로 위탁했습니다
-  trusted_removed: $4당신은 그 땅으로부터 신용(위탁)받은 유저를 성공적으로 제거했습니다.
-  was_not_added: $2그 플레이어는 이 땅에서 신용(위탁)받지 못했습니다.
-  plot_removed_user: $1당신이 추가되었던 땅 %s가 소유자의 비활성의 이유로 삭제되었습니다.
-member:
-  removed_players: $2이 땅으로부터 %s 플레이어가 제거되었습니다
-  already_owner: $2해당 유저는 이미 땅의 주인입니다
-  already_added: $2그 유저는 그 카테고리에 이미 추가되었습니다.
-  member_added: $4그 유저는 이제 그 땅의 소유자가 온라인에 있는 동안 지을 수 있습니다.
-  member_removed: $1당신은 땅으로부터 유저를 성공적으로 제거되었습니다.
-  member_was_not_added: $2그 플레이어는 이 땅에 유저로서 추가되지 않았습니다
-  plot_max_members: $2당신은 이 땅에 어떤 플레이어를 더 추가 할 수 없습니다
-owner:
-  set_owner: $4당신은 땅의 소유자를 성공적으로 설정했습니다
-  now_owner: $4당신은 이제 %s땅의 소유자입니다
-  set_owner_cancelled: $2The setowner action was cancelled
-signs:
-  owner_sign_line_1: '$1ID: $1%id%'
-  owner_sign_line_2: '$1소유자:'
-  owner_sign_line_3: $2%plr%
-  owner_sign_line_4: $3Claimed
-help:
-  help_header: $3&m---------&r $1Plot² 도움말 $3&m---------
-  help_page_header: '$1범주: $2%category%$2,$1 페이지: $2%current%$3/$2%max%$2'
-  help_footer: $3&m---------&r $1Plot² 도움말 $3&m---------
-  help_info_item: $1/plot help %category% $3- $2%category_desc%
-  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
-  direction: '$1현재 방향: %dir%'
-'-':
-  custom_string: '-'
-commandconfig:
-  not_valid_subcommand: $2이것은 유효하지 않은 하위 명령어 입니다
-  did_you_mean: '$2이것을 명령어를 의미하나요: $1%s'
-  name_little: $2%s0 아름이 너무 짧습니다, $1%s1$2<$1%s3
-  no_commands: $2죄송합니다 당신은 하위명령어 사용을 허가받지 못했습니다.
-  subcommand_set_options_header: '$2Possible Values: '
-  command_syntax: '$1Usage: $2%s'
-  flag_tutorial_usage: '$1관리자에게 국기를 설정하게하십시오: $2%s'
-bar api: {}
-set:
-  set_attribute: $4설정 완료 %s0 로 설정 %s1
-cap:
-  entity_cap: $2더 많은 몹을 스폰하는 것은 허용되지 않습니다.
-near:
-  plot_near: '$1선수: %s0'
-kick:
-  you_got_kicked: $4너는 쫓겨났다
-grants:
-  granted_plots: '$1결과: $2%s $1grants left'
-  granted_plot: $1You granted %s0 plot to $2%s1
-  granted_plot_failed: '$1Grant failed: $2%s'
diff --git a/Bukkit/src/main/resources/mycommand.js b/Bukkit/src/main/resources/mycommand.js
deleted file mode 100644
index e5a3f27c3..000000000
--- a/Bukkit/src/main/resources/mycommand.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// This command is registered from the start.js file which is run during startup
-PlotPlayer.sendMessage("Hello World!");
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/plugin.properties b/Bukkit/src/main/resources/plugin.properties
deleted file mode 100644
index 9ff2dd711..000000000
--- a/Bukkit/src/main/resources/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-version=${version}
-commit=${commit}
-date=${date}
diff --git a/Bukkit/src/main/resources/setbiomes.js b/Bukkit/src/main/resources/setbiomes.js
deleted file mode 100644
index b3d1dd4ff..000000000
--- a/Bukkit/src/main/resources/setbiomes.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-This script will reset all biomes in claimed plots
-*/
-var plots = PS.sortPlots(PS.getPlots());
-for (var i = 0; i < plots.size(); i++) {
-    var plot = plots.get(i);
-    if (!plot.isMerged() || !plot.getMerged(0)) {
-        plot.setBiome("%s0", null);
-        PS.class.static.log('&cSetting biome for: ' + plot);
-    }
-    java.lang.Thread.sleep(1000);
-}
diff --git a/Bukkit/src/main/resources/skyblock.template b/Bukkit/src/main/resources/skyblock.template
deleted file mode 100644
index 1801175de6ef386cdbffe98679a3ca4f2fdee3ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1127
zcmWIWW@Zs#;Nak35SkY4#()GYf$ZYsjMUu3lFa1d7<X5{_#l5rm-t|34_9Bu5Krfr
z`1lZ4-+*`*&!G7Dn1Y=A5<R$j#$}9=|Kz(lpys`u;_ZLPL8SHl6tP=ut{!)OYsc&e
zR=CLWm`PYp+L*`LdLh3P`{IB3cP001)#c#|HBdQLVb*^6_WLa}za%wZP1F0nQe+K7
z*z!taDc6`XMu*J@a@c}A4k}9<&q#<3KDoT9N>JkYy(3GdMD%wS#BgqN`u^<m&&`v5
z8_s>QvcToS;S*Et9Q_^dy}*3Ml8VQie_o4w+|J&;@A|j>x~ZkVc3A0)P04RPel=B9
zOd@>J@AnHcn$+3?zPcW`Ii>H3B==v=UZt4(Y+qL%7Gzi~caF)E<3+Cil#jcPUw9}a
z)xsF>{6f<)=#fVyPioP$?;^UXTHa}=ej4y=E;(^fNHFJab!x*rrsLiR7JvVeXONt%
zSL~q7+Pmwta%R&#uA3HiwVztrvliJedi{d`qvGR3BGEPlOSreOxw-RvoF3WqsI@(2
z$-j*gTeVz5&3yKJQq2GGqxr^yoE=japIXJGQs{K*q`~J;-({BShFl0qJ-oKY_3HWQ
z`>tf3%b9NHY8sN&86I9_c7K`P`t{pV=U<u=wRPL1^02Vr-;wvFt!#6j_5&j*z?+?8
z`pu|gs~H&>mH}}9I7Kipa4?kcv$_{;pZDGdC|btEz#s;U&63pIf}F&X)MEXT+ydQ{
z#F9k4%G{jTfP;RA4S4px*Dku9xncoh(7OUxrgx#UcI37QhkNeIQursU9=m;7%%tyc
zz9;Qx)I2#?!1l&E{~#M#NtfTeK{E0`ZbrGh-hHP?VCov9R+mIylLV%h`kGO#f<}oa
zHy(U_`}gVN>dCSWsw)=1t(l_KYG}UFFz~HH$p#MfR*lUvo1@L*9o7a$vM-ykeI?f&
zK6#IsZww<RSFOum75(0h|D?!&ugeD~mp_o=__(dTF|7AQ5U-u%jf0)<bvm18)zocB
zWH7Kf9eR{~7w?s1pC{|O`IjfIJNIChUB;&;=WdquY{=pabDmRw+H%9?+R(e9tsMtu
zc0NDOty8J@wUcR<kOnJrVqwoN_T`hV7Wqy3{k_iRj<Jfpd+kfz)lJ*p?)(>jaj#Zj
zLpX0!<O{LT<DCEgyxZfI91vlh^=i^}ttIvW-i%Bl42V3492cNGhzj62jMN+nvc?{0
z4fcptf!d+~q=kS{jXj#V7(nt242%pC40<ayCZ0QYfzc&b_xo8SI>4Ki4Wxz%2+srQ
ICT0*10BLf<asU7T

diff --git a/Bukkit/src/main/resources/start.js b/Bukkit/src/main/resources/start.js
deleted file mode 100644
index f58be7459..000000000
--- a/Bukkit/src/main/resources/start.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// Add your commands to this list
-var commands = ["mycommand"];
-
-// Command registration:
-for (var i in commands) {
-    MainCommand.class.static.onCommand(PlotPlayer, "plot", "debugexec", "addcmd", commands[i] + ".js");
-}
\ No newline at end of file
diff --git a/Bukkit/src/main/resources/town.template b/Bukkit/src/main/resources/town.template
deleted file mode 100644
index f655fbd0a11b4b4b97ddac0914dc9bba7d4b348c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1771
zcmbVNc~BBq9L6iCJn+b-n#8uuR?V!mGBrcZ3lA){#v>%9Gz2eFbG=s0ifqk1(2P7r
zSKaa;HOd3ZD<ko~6-m=nj1=(#MHhE=(rwzEX}>qWnfLy9@6G#u-}gN@OiWw>00Myk
zs5{Q4fK4zE&I8;%Q5Yo7%RRuw?3@kaye-rOalzR9oHf+m!q^3Yus>%FN0?ZgM<84R
zygX3;K1dJEuX_@wKe<Ill7m{7w*v7chIg7V3KfHutC{467^$6sR-Pm#y#ZTJ@*2KI
z3JN+|1zvq)haTEHGQpkiEzn~yBg`I$@mf8b1-i~<J~JzfBFa+Nu#~!>crWD!|6^Ms
z)j+o{qNVGIG?}^B#4026sI7$J+3IE5qJByk!f%j2^p-Mf=mKM-DGXwLby#{Yl}Vr(
z75VTgY#NtejO`^5VL>rlJPzB)616e(ENjAx&@N{KBn+S5+a9@N^;Z&M96P{PIYvxg
zYm9HfGhiVsz45C<zcEJr_(1Z_#i!1Fzg(<TFb(&eAQ70Oeyq21O=|&Sb^0n(kbbR|
z#~*g%yw61BSh65m$A_YrZ!}RON%1X2sM>2QPC%19SWOx4Y<OHBnjd*6JoUv*PBI(V
z#JF$Uk}4OHt<(82t~=4#NzE(UWf(FVMEqhWD;L;$A?;LjmN|(FdLJtlMeQapr<l${
zGD5TZXEJVeRxAXKpD=F_7*ZB3b@jw*n+S-hK$b>TJI|7qTUNGY_S7ZoQ=;f_UWd{x
z-J;J@r#WzT64qnNp}11LTPOBOZ^lm*KK%I0Z`GwLMcoI2Wi%95H3J2O&OiI~V*R#Q
z&A5$BEzB_yL4(if5#`>*es6AJHMfWE)3-Z({#wq_o)sQuO`4J(#(O^QkoHob(h^a<
zw17@zu(*Qh#cnpK(TU2cN}s-OKzO=p#vM0vD2-qU5~+?@NXJE9|Lc@xNl5@41_U*G
zO$_RY0st1mg8!>N6@~i5p)kJQNE|BQ2oB?W*aL|}YTm?nyC&FPh}HtvPlw_MPfec1
zup3>APj~Cd*T@}<J%D|9tcz2bZm7^UKp~8=zsT$_M{hGS1&89KUNM2ldR6V5Gxk|Z
zF-b<8-T-4-MFGvzve1td*vHB=qYv#FX*KRNvfVd2$(!fQDQX*MN;|2)e2$i%w;{_b
z%Mitq74d17yQ1~dYG{J+yYUsMhxo1h&pl&Tt8bLk_vL#*O0Tw69v$S)tTj(P;0NzC
z{FDhOcu#nB@2=z(i97cBv7e)~+PRmg;@CVHTUownbEcdLdg9p?*=*TN+k0b`*}#=}
zkD=2Bg&IwLE0jlEOYv04kczrXKFE%!s9)(Fa)c6$1H<uM30UjlM`XhGk(D#(q`R;@
z60qu^(}@}rqMLQYZa!=*Hx6EYogmvY*$t4d%@wTGm_C9>W)tHg)CQt+^j8*&r;Y5!
z6KH|$uIa%TWx-#4Dc*Iw+Fk?zxc{Ghf&N%-cwuoU{{WOb&dUe8ksTu2Mdnr^_dtK=
z5&Jw8TcZVj{JV}@T_N*>eBs#<c%8_BLnqaB-r*lO)=@comaGt+G0G#)T<dPZCYL@C
zIbZtq{2~5Ic_Dd{^{%+fr7gkEfVRcjtQdo0IkQ}8qQN0vLSlGa;f);`rPtptU!syR
zx2YZyA+8~2bl%iJ*Umf)OyuHil~%Xls3RgSVyUsz*w=AT)gn>}P}jk9+5#m}2U|$~
zL-UC#EuTeYUXP0K1-&VlIZzbruoxXFFG3Y9vXoRzn)JgqKG5VRYqX&`AmT})>cM*M
z{!xGZ0q<=X$F780<{nC3%&d+cBE!jATcrRxnlsz(KvYYavvb8mR0GMF$SvzO0D{at
z!4qI1{o92Fhlz+P05*bqvt`zU`=9t4$^R$DzrAX+3f4WiflQ$;zVFCy&)EEwb-irh
cl=u(*I^S0h93~;;3;+-l4kaO5WQq0FpAlUTS^xk5

diff --git a/Bukkit/src/main/resources/zh-CN.yml b/Bukkit/src/main/resources/zh-CN.yml
deleted file mode 100644
index 4afc3564a..000000000
--- a/Bukkit/src/main/resources/zh-CN.yml
+++ /dev/null
@@ -1,407 +0,0 @@
-# This file is translated by c7w, w/1345979462 and 佛壁灯(f0rb1d)
-# Translation Guide
-# 1. 句子与变量、命令、数字之间保留空隙，全角符号除外
-# 2. 使用已成功/已复制/正在/未启用/已启用/请使用开头
-# 3. 使用阁下（其实好像也无所谓）
-# 4. 失败/成功/无效应放在句末
-# 就差不多这些
-confirm:
-  expired_confirm: $2确认已过期，请重新执行命令！
-  failed_confirm: $2阁下没有待确认的操作！
-  requires_confirm: '$2阁下是否确定执行：$1%s$2?&-$2此操作无法恢复！若阁下确定，请输入：$1/plot confirm'
-move:
-  move_success: $4已成功移除地皮。
-  copy_success: $4已成功复制地皮。
-  requires_unowned: $2指定地点已被占用。
-set:
-  set_attribute: $4已成功设置 %s0 为 %s1
-web:
-  generating_link: $1正在处理地皮···
-  generating_link_failed: $2生成下载链接失败！
-  save_failed: $2保存失败
-  load_null: $2请使用 $4/plot load$2 获取布局列表
-  load_failed: $2载入布局失败
-  load_list: '$2要载入布局，请使用 $1/plot load #'
-  save_success: $1已成功保存！
-compass:
-  compass_target: $4已成功将指南针指向地皮
-cluster:
-  cluster_available_args: '$1以下子指令可用：$4list$2, $4create$2,
-    $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, $4members$2, $4info$2,
-    $4tp$2, $4sethome'
-  cluster_list_heading: $2此世界中有 $1%s$2 个群集
-  cluster_list_element: $2 - $1%s&-
-  cluster_intersection: '$计划的区域与%s0重叠'
-  cluster_outside: '$2计划的区域在地皮区域%s0外'
-  cluster_added: $4已成功创建群集。
-  cluster_deleted: $4已成功删除群集。
-  cluster_resized: $4已成功调整群集尺寸。
-  cluster_added_user: $4已成功将玩家添加到群集。
-  cannot_kick_player: $2阁下无法踢出此玩家
-  cluster_invited: '$1阁下已被邀请至群集 $2%s'
-  cluster_removed: '$1阁下已被群集 $2%s $1移除'
-  cluster_kicked_user: $4已成功踢出此玩家
-  invalid_cluster: '$1群集名 $2%s 无效'
-  cluster_not_added: $2此玩家未被添加至地皮群集
-  cluster_cannot_leave: $1阁下必须在离开前先删除群集或转移所有权
-  cluster_added_helper: $4已成功将帮手添加到群集
-  cluster_removed_helper: $4已成功将帮手从群集移除
-  cluster_regenerated: $4已成功开始群集重生
-  cluster_teleporting: $4正在传送···
-  cluster_info: '$1当前群集：$2%id%&-$1名称：$2%name%&-$1所有者：$2%owner%&-$1大小：
-    $2%size%&-$1权限：$2%rights%'
-border:
-  border: $2阁下处于当前地图边界外
-unclaim:
-  unclaim_success: $4阁下已成功解除认领地皮。
-  unclaim_failed: $2无法解除认领地皮
-worldedit masks:
-  worldedit_delayed: $2请在我们处理阁下的WorldEdit操作时稍等片刻···
-  worldedit_run: '$2很抱歉造成了延迟。现正执行：%s'
-  require_selection_in_mask: $2选中的 %s 不在阁下的地皮覆盖范围内。
-    阁下仅可对自己的地皮做出修改。
-  worldedit_volume: $2阁下无法选择 %current% 体积。阁下可编辑的最大
-    体积为 %max%。
-  worldedit_iterations: $2阁下无法重复 %current% 次。容许的最大
-    重复次数为 %max%。
-  worldedit_unsafe: $2已禁止对此命令的访问
-  worldedit_bypass: $2&o要绕过对阁下的限制，请使用 $4/plot wea
-  worldedit_bypassed: $2当前正绕过WorldEdit功能限制。
-  worldedit_unmasked: $1阁下的WorldEdit功能现已解除限制。
-  worldedit_restricted: $1阁下的WorldEdit功能现已受限制。
-gamemode:
-  gamemode_was_bypassed: $1阁下绕过了为 $2{plot} $1设置的游戏模式（$2{gamemode}$1）限制
-height limit:
-  height_limit: $1此地皮拥有高度 $2{limit} 的限制
-records:
-  record_play: $2%player $2已开始游玩记录 $1%name
-  notify_enter: $2%player $2已进入阁下的地皮（$1%plot$2）
-  notify_leave: $2%player $2已离开阁下的地皮（$1%plot$2）
-swap:
-  swap_overlap: $2计划的区域不允许重叠
-  swap_dimensions: $2计划的区域必须有可对比的维度
-  swap_syntax: $2/plot swap <编号>
-  swap_success: $4已成功交换地皮
-  started_swap: $2已开始地皮交换任务。阁下将会在完成时收到提醒
-comment:
-  inbox_notification: '%s 条未读消息。请使用 /plot inbox 阅读'
-  not_valid_inbox_index: $2索引 %s 处无评论
-  inbox_item: $2 - $4%s
-  comment_syntax: $2请使用 /plot comment [X;Z] <%s> <评论>
-  invalid_inbox: '$2此收件箱无效。&-$1接受的值：%s'
-  no_perm_inbox: $2阁下没有此收件箱的权限
-  no_perm_inbox_modify: $2阁下没有编辑此收件箱的权限
-  no_plot_inbox: $2阁下必须站在地皮内或提供地皮参数
-  comment_removed: $4已成功删除评论$2 - '$3%s$2'
-  comment_added: $4有玩家留下了一条评论
-  comment_header: $2&m---------&r $1评论 $2&m---------&r
-  inbox_empty: $2无评论
-console:
-  not_console: $2由于安全考虑，此命令只可由控制台执行。
-  is_console: $2此命令只可被玩家执行。
-inventory:
-  inventory_usage: '&c用法：&6{usage}'
-  inventory_desc: '&c描述：&6{desc}'
-  inventory_category: '&c分类：&6{category}'
-clipboard:
-  clipboard_set: $2当前地皮已复制到阁下的剪贴板，请使用 $1/plot paste$2 粘贴
-  pasted: $4已成功粘贴选择项并已从剪贴板中清除。
-  paste_failed: '$2无法粘贴选择项。理由：$2%s'
-  no_clipboard: $2阁下的剪贴板内无选择项
-  clipboard_info: '$2当前选择项 - 地皮编号：$1%id$2, 宽度：$1%width$2, 方块
-    总数： $1%total$2'
-toggle:
-  toggle_enabled: '$2已启用设置：%s'
-  toggle_disabled: '$2已禁用设置：%s'
-blocked command:
-  command_blocked: $2此地皮中不允许使用此命令
-done:
-  done_already_done: $2此地皮已被标记为已完成
-  done_not_done: $2此地皮未标记为已完成。
-  done_insufficient_complexity: $2此地皮过于简单。请在使用此命令前添加更多的细节。
-  done_success: $1已成功标记此地皮为已完成。
-  done_removed: $1阁下现在可以在此地皮中继续建造了。
-ratings:
-  ratings_purged: $2已清除此地皮的评分
-  rating_not_valid: $2阁下需要指定介于 1 到 10 之间的数字
-  rating_already_exists: $2阁下已评价过地皮 $2%s
-  rating_applied: $4阁下已成功评价地皮 $2%s
-  rating_not_your_own: $2阁下无法评价自己的地皮
-  rating_not_done: $2阁下仅可评价已完成的地皮。
-  rating_not_owned: $2阁下无法评价尚未被任何玩家拥有的地皮
-tutorial:
-  rate_this: $2评价此地皮！
-  comment_this: '$2请为地皮 %s 留下反馈'
-economy:
-  econ_disabled: $2未启用经济系统
-  cannot_afford_plot: $2阁下无法购买此地皮。此地皮价值 $1%s
-  not_for_sale: $2此地皮恕不出售
-  cannot_buy_own: $2阁下无法购买自己的地皮
-  plot_sold: $4阁下的地皮 $1%s0$4 已以 $1$%s2$4 的价格售给了 $1%s1
-  cannot_afford_merge: $2阁下无法合并地皮。此操作花费 $1%s
-  added_balance: $1%s $2已转入您的余额
-  removed_balance: $1%s $2已从您的余额中转出
-  removed_granted_plot: $2阁下已使用了授予的 %s 块地皮，剩余 $1%s $2块
-setup:
-  setup_init: '$1用法：$2/plot setup <值>'
-  setup_step: '$3[$1步骤 %s0$3] $1%s1 $2- $1预期值：$2%s2 $1默认值：$2%s3'
-  setup_invalid_arg: '$2%s0 不是步骤 %s1 的有效参数。要取消配置
-    请使用：$1/plot setup cancel'
-  setup_valid_arg: $2值 $1%s0 $2已设置为 %s1
-  setup_finished: $4阁下应已被传送至新建的世界。否则阁下将需
-    在 bukkit.yml 或世界管理插件中手动设置生成器。
-  setup_world_taken: $2%s 已是一个世界
-  setup_missing_world: $2阁下需要指定世界名（$1/plot setup &l<世界名>$1
-    <生成器>$2）&-$1附加指令：&-$2 - $1/plot setup <值>&-$2 - $1/plot
-    setup back&-$2 - $1/plot setup cancel
-  setup_missing_generator: $2阁下需要指定生成器（$1/plot setup <世界名>
-    &l<生成器>&r$2)&-$1附加指令&-$2 - $1/plot setup <值>&-$2 - $1/plot
-    setup back&-$2 - $1/plot setup cancel
-  setup_invalid_generator: '$2无效的生成器。可能选项：%s'
-schematics:
-  schematic_too_large: $2此地皮过大无法进行此操作！
-  schematic_missing_arg: '$2阁下需要指定参数。可能的值：$1test
-    <名称>$2 , $1save$2 , $1paste $2, $1exportall'
-  schematic_invalid: '$2布局无效。理由：$2%s'
-  schematic_valid: $2布局无效
-  schematic_paste_failed: $2粘贴布局失败
-  schematic_paste_success: $4已成功粘贴布局
-titles:
-  title_entered_plot: '$1地皮：%world%;%x%;%z%'
-  title_entered_plot_sub: $4由 %s 所有
-  prefix_greeting: '$1%id%$2> '
-  prefix_farewell: '$1%id%$2> '
-core:
-  task_start: 正在启动任务···
-  prefix: $3[$1P2$3] $2
-  enabled: $1%s0 现已启用
-reload:
-  reloaded_configs: $1已重载翻译及世界设置
-  reload_failed: $2重载文件配置失败
-desc:
-  desc_set: $2已设置地皮描述
-  desc_unset: $2已重置地皮描述
-  missing_desc: $2阁下需要指定描述
-alias:
-  alias_set_to: $2地皮别名已设置为 $1%alias%
-  alias_removed: $2已移除地皮别名
-  missing_alias: $2阁下需要指定别名
-  alias_too_long: $2别名长度必须小于 50 个字符
-  alias_is_taken: $2此别名已被占用
-position:
-  missing_position: '$2阁下需要指定位置。可能的值：$1none'
-  position_set: $1已设置家为阁下的当前位置
-  position_unset: $1已重置家为默认位置
-  home_argument: $2使用 /plot set home [无]
-  invalid_position: $2位置值无效
-cap:
-  entity_cap: $2阁下被禁止生成更多怪物
-time:
-  time_format: $1%hours%, %min%, %sec%
-permission:
-  no_schematic_permission: $2阁下没有使用布局的所需权限
-    $1%s
-  no_permission: '$2阁下缺少权限节点：$1%s'
-  no_permission_event: '$2阁下缺少权限节点：$1%s'
-  no_plot_perms: $2阁下必须为地皮所有者才能执行此操作
-  cant_claim_more_plots: $2阁下无法拥有更多地皮。
-  cant_claim_more_clusters: $2阁下无法拥有更多群集。
-  cant_transfer_more_plots: $2阁下无法赠予此用户更多地皮
-  cant_claim_more_plots_num: $2阁下无法同时拥有多于 $1%s $2块地皮
-  you_be_denied: $2阁下被禁止进入此地皮
-  merge_request_confirm: 来自 %s 的合并请求
-merge:
-  merge_not_valid: $2此合并请求已不再可用。
-  merge_accepted: $2此合并请求已被接受
-  success_merge: $2已合并地皮！
-  merge_requested: $2已成功发送合并请求
-  no_perm_merge: '$2阁下不是地皮 $1%plot% $2的所有者'
-  no_available_automerge: $2阁下在指定方向不拥有任何相邻的地皮
-    或阁下被禁止合并所需的大小。
-  unlink_required: $2需要解除关联才能执行此操作。
-  unlink_impossible: $2阁下只能解除关联大地皮
-  unlink_success: $2已成功将地皮解除关联。
-commandconfig:
-  not_valid_subcommand: $2此子命令无效
-  did_you_mean: '$2阁下的意思是否是：$1%s'
-  name_little: $2%s0 名称过短，$1%s1$2<$1%s3
-  no_commands: $2很抱歉，但阁下无法使用任何子命令。
-  subcommand_set_options_header: '$2可能的值：'
-  command_syntax: '$1用法：$2%s'
-  flag_tutorial_usage: '$1请让管理员设置标记：$2%s'
-errors:
-  invalid_player_wait: '$2未找到玩家：$1%s$2，正在获取。请稍后再试。'
-  invalid_player: '$2未找到玩家：$1%s$2.'
-  invalid_player_offline: '$2玩家 $1%s $2必须在线。'
-  invalid_command_flag: '$2无效的命令标记：%s0'
-  error: '$2发生了 %s 错误'
-  command_went_wrong: $2执行此命令时发生错误···
-  no_free_plots: $2无可用的免费地皮
-  not_in_plot: $2阁下不在地皮上
-  not_loaded: $2无法加载地皮
-  not_in_cluster: $2阁下必须在地皮群集上以进行此操作
-  not_in_plot_world: $2阁下不在地皮区域上
-  plotworld_incompatible: $2两个世界必须相互兼容
-  not_valid_world: $2世界无效（大小写敏感）
-  not_valid_plot_world: $2地皮区域无效（大小写敏感）
-  no_plots: $2阁下不拥有任何地皮
-  wait_for_timer: $2一个设置方块计时器已关联到当前地皮或阁下上。请等待此操作完成
-paste:
-  debug_report_created: '$1已上传完整调试日志至：$1%url%'
-purge:
-  purge_success: $4已成功清除了 %s 块地皮
-trim:
-  trim_in_progress: 世界修整任务正在进行中！
-  not_valid_hybrid_plot_world: 需要混合地皮管理以执行此操作
-block list:
-  block_list_separater: '$1,$2 '
-biome:
-  need_biome: $2阁下需要指定一个有效的生态群落。
-  biome_set_to: $2地皮生态群落被设置为 $2
-teleport:
-  teleported_to_plot: $1阁下已被传送
-  teleported_to_road: $2阁下已被传送到道路上
-  teleport_in_seconds: $1%s 秒后传送。请勿移动···
-  teleport_failed: $2传送由于移动或伤害取消
-set block:
-  set_block_action_finished: $1已完成最后一个设置方块操作。
-unsafe:
-  debugallowunsafe_on: $2已允许不安全的操作
-  debugallowunsafe_off: $2已禁用不安全的操作
-debug:
-  debug_header: $1调试信息&-
-  debug_section: $2>> $1&l%val%
-  debug_line: $2>> $1%var%$2:$1 %val%&-
-invalid:
-  not_valid_data: $2数据编号无效。
-  not_valid_block: '$2%s 不是有效的方块。'
-  not_allowed_block: '$2方块 %s 被禁止'
-  not_valid_number: '$2%s 不是区间内的有效数字'
-  not_valid_plot_id: $2地皮编号无效。
-  plot_id_form: '$2地皮编号必须为 $1X;Y 形式 $2例如:$1-5;7'
-  not_your_plot: $2此地皮不为阁下拥有
-  no_such_plot: $2没有此地皮
-  player_has_not_been_on: $2此玩家从未进入过地皮世界
-  found_no_plots: $2阁下的搜索查询未找到地皮
-  found_no_plots_for_player: '$2未找到玩家 %s 的地皮'
-camera:
-  camera_started: $2阁下已进入地皮 $1%s 的摄像模式
-  camera_stopped: $2阁下已不再处于摄像模式
-need:
-  need_plot_number: $2阁下必须指定地皮数字或别名
-  need_block: $2阁下必须指定方块
-  need_plot_id: $2阁下必须指定地皮编号。
-  need_plot_world: $2阁下必须指定地皮区域。
-  need_user: $2阁下必须指定用户名
-near:
-  plot_near: '$1玩家：%s0'
-info:
-  none: 无
-  now: 现在
-  never: 从不
-  unknown: 未知
-  everyone: 所有人
-  plot_unowned: $2当前地皮必须有所有者才能执行此操作
-  plot_info_unclaimed: $2地皮 $1%s$2 尚未被领取
-  plot_info_header: $3&m---------&r $1信息 $3&m---------
-  plot_info: '$1编号：$2%id%$1&-$1别名：$2%alias%$1&-$1所有者：$2%owner%$1&-$1生态群落：
-    $2%biome%$1&-$1可以建造：$2%build%$1&-$1评分：$2%rating%&-$1可见：$2%seen%&-$1受信：
-    $2%trusted%$1&-$1成员：$2%members%$1&-$1拒绝：$2%denied%$1&-$1标记：$2%flags%'
-  plot_info_footer: $3&m---------&r $1信息 $3&m---------
-  plot_info_trusted: $1受信：$2 %trusted%
-  plot_info_members: $1成员：$2 %members%
-  plot_info_denied: $1拒绝：$2 %denied%
-  plot_info_flags: $1标记：$2 %flags%
-  plot_info_biome: $1生态群落：$2 %biome%
-  plot_info_rating: $1评分：$2 %rating%
-  plot_info_owner: $1所有者：$2 %owner%
-  plot_info_id: $1编号：$2 %id%
-  plot_info_alias: $1别名：$2 %alias%
-  plot_info_size: $1大小：$2 %size%
-  plot_info_seen: $1可见：$2 %seen%
-  plot_user_list: ' $1%user%$2,'
-  plot_flag_list: $1%s0:%s1$2
-  info_syntax_console: $2/plot info X;Y
-working:
-  generating_component: $1已开始从阁下的设置中生成元件
-  clearing_plot: $2正在清除地皮异步。
-  clearing_done: $4已清除！此操作花费了 %s 毫秒。
-  deleting_done: $4已删除！此操作花费了 %s 毫秒。
-  plot_not_claimed: $2地皮未领取
-  plot_is_claimed: $2此地皮已被领取
-  claimed: $4阁下已成功领取地皮
-list:
-  comment_list_header_paged: $2（页面 $1%cur$2/$1%max$2） $1共计 %amount% 条评论
-  clickable: '（可交互）'
-  area_list_header_paged: $2（页面 $1%cur$2/$1%max$2） $1共计 %amount% 块区域
-  plot_list_header_paged: $2（页面 $1%cur$2/$1%max$2） $1共计 %amount% 块地皮
-  plot_list_header: $1共计 %word% 块地皮
-  plot_list_item: $2>> $1%id$2:$1%world $2- $1%owner
-  plot_list_item_ordered: $2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner
-  plot_list_footer: $2>> $1%word% 共计 $2%num% $1领取了地皮 %plot%。
-left:
-  left_plot: $2阁下已离开地皮
-chat:
-  plot_chat_spy_format: '$2[$1地皮间谍$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_format: '$2[$1地皮老铁$2][$1%plot_id%$2] $1%sender%$2: $1%msg%'
-  plot_chat_forced: $2此世界强制所有人使用地皮聊天。
-  plot_chat_on: $4已启用地皮聊天。
-  plot_chat_off: $4已禁用地皮聊天。
-deny:
-  denied_removed: $4阁下已成功解禁此玩家进入地皮
-  denied_added: $4阁下已成功禁止此玩家进入地皮
-  denied_need_argument: $2缺少参数。$1/plot denied add <名称> $2或 $1/plot
-    denied remove <名称>
-  was_not_denied: $2此玩家未被此地皮封禁
-  you_got_denied: $4阁下已被禁止进入先前所在的地皮并已被传送至出生点
-kick:
-  you_got_kicked: $4阁下已被踢出！
-rain:
-  need_on_off: '$2阁下需要指定值。可能的值：$1on$2, $1off'
-  setting_updated: $4阁下已成功更新设置
-flag:
-  flag_key: '$2关键词：%s'
-  flag_type: '$2类型：%s'
-  flag_desc: '$2描述：%s'
-  not_valid_flag: $2标记无效
-  not_valid_flag_suggested: '$2标记无效。阁下的意思是否是：$1%s'
-  not_valid_value: $2标记值必须为字母数字混合编制
-  flag_not_in_plot: $2此地皮不拥有此标记
-  flag_not_removed: $2无法移除此标记
-  flag_not_added: $2无法添加此标记
-  flag_removed: $4已成功移除标记
-  flag_added: $4已成功添加标记
-trusted:
-  trusted_added: $4阁下已成功将用户添加到地皮受信列表
-  trusted_removed: $4阁下已成功将用户从地皮受信列表中移除
-  was_not_added: $2此用户在此地皮上不受信任
-  plot_removed_user: $1阁下所添加至的地皮 %s 由于所有者不活跃已被删除
-member:
-  removed_players: $2已从此地皮中移除了 %s 位玩家。
-  already_owner: '$2此玩家已是地皮所有者：%s0'
-  already_added: '$2此玩家已被添加到此分类：%s0'
-  member_added: $4此用户现已可以在地皮所有者在线时建造
-  member_removed: $1阁下已成功从此地皮中移除了用户
-  member_was_not_added: $2此玩家并未被添加到此地皮的用户列表
-  plot_max_members: $2阁下被禁止添加更多玩家至此地皮
-owner:
-  set_owner: $4阁下已成功设置地皮所有者
-  now_owner: $4阁下现在是地皮 %s 的所有者
-signs:
-  owner_sign_line_1: '$1编号：$1%id%'
-  owner_sign_line_2: '$1所有者：'
-  owner_sign_line_3: $2%plr%
-  owner_sign_line_4: $3已被领取
-help:
-  help_header: $3&m---------&r $1Plot² 帮助 $3&m---------
-  help_page_header: '$1分类：$2%category%$2,$1 页面：$2%current%$3/$2%max%$2'
-  help_footer: $3&m---------&r $1Plot² 帮助 $3&m---------
-  help_info_item: $1/plot help %category% $3- $2%category_desc%
-  help_item: $1%usage% [%alias%]&- $3- $2%desc%&-
-  direction: '$1当前方向：%dir%'
-grants:
-  granted_plots: '$1结果：剩余 $2%s $1次授权'
-  granted_plot: $1阁下授权了 %s0 地皮至 $2%s1
-  granted_plot_failed: '$1授权失败：$2%s'
-'-':
-  custom_string: '-'
diff --git a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java
deleted file mode 100644
index c2b81a729..000000000
--- a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot;
-
-import com.github.intellectualsites.plotsquared.plot.database.AbstractDBTest;
-import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtilTest;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.UUID;
-
-import static org.junit.Assert.assertEquals;
-
-public class FlagTest {
-
-    private Object testBlock;
-    private Flag<? extends Collection<?>> use = Flags.USE;
-
-    @Before public void setUp() throws Exception {
-        EventUtil.manager = new EventUtilTest();
-        DBFunc.dbManager = new AbstractDBTest();
-    }
-
-    @Test public void flagTest() throws Exception {
-        Plot plot = new Plot(null, new PlotId(0, 0));
-        plot.owner = UUID.fromString("84499644-ad72-454b-a19d-f28c28df382b");
-        //plot.setFlag(use, use.parseValue("33,33:1,6:4")); //TODO fix this so FlagTest will run during compile
-        Optional<? extends Collection> flag = plot.getFlag(use);
-        if (flag.isPresent()) {
-            System.out.println(Flags.USE.valueToString(flag.get()));
-            testBlock = PlotBlock.get((short) 1, (byte) 0);
-            flag.get().add(testBlock);
-        }
-        flag.ifPresent(collection -> System.out.println(Flags.USE.valueToString(collection)));
-        Optional<HashSet<PlotBlock>> flag2 = plot.getFlag(Flags.USE);
-        if (flag2.isPresent()) {
-            //   assertThat(flag2.get(), (Matcher<? super HashSet<PlotBlock>>) IsCollectionContaining.hasItem(testBlock));
-        }
-        if (flag.isPresent() && flag2.isPresent()) {
-            assertEquals(flag.get(), flag2.get());
-        }
-    }
-}
diff --git a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
deleted file mode 100644
index 1ef04abba..000000000
--- a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.database;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
-
-import java.util.*;
-
-public class AbstractDBTest implements AbstractDB {
-
-    @Override public void setOwner(Plot plot, UUID uuid) {
-    }
-
-    @Override public void createPlotsAndData(List<Plot> plots, Runnable whenDone) {
-    }
-
-    @Override public void createPlotSafe(Plot plot, Runnable success, Runnable failure) {
-    }
-
-    @Override public void createTables() {
-    }
-
-    @Override public void delete(Plot plot) {
-    }
-
-    @Override public void deleteSettings(Plot plot) {
-    }
-
-    @Override public void deleteHelpers(Plot plot) {
-    }
-
-    @Override public void deleteTrusted(Plot plot) {
-    }
-
-    @Override public void deleteDenied(Plot plot) {
-    }
-
-    @Override public void deleteComments(Plot plot) {
-    }
-
-    @Override public void deleteRatings(Plot plot) {
-    }
-
-    @Override public void delete(PlotCluster cluster) {
-    }
-
-    @Override public void addPersistentMeta(UUID uuid, String key, byte[] meta, boolean delete) {
-    }
-
-    @Override public void removePersistentMeta(UUID uuid, String key) {
-    }
-
-    @Override public void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result) {
-    }
-
-    @Override public void createPlotSettings(int id, Plot plot) {
-    }
-
-    @Override public int getId(Plot plot) {
-        return 0;
-    }
-
-    @Override public int getClusterId(PlotCluster cluster) {
-        return 0;
-    }
-
-    @Override public HashMap<String, HashMap<PlotId, Plot>> getPlots() {
-        return null;
-    }
-
-    @Override public void validateAllPlots(Set<Plot> toValidate) {
-    }
-
-    @Override public HashMap<String, Set<PlotCluster>> getClusters() {
-        return null;
-    }
-
-    @Override public void setMerged(Plot plot, boolean[] merged) {
-    }
-
-    @Override public void swapPlots(Plot plot1, Plot plot2) {
-    }
-
-    @Override public void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
-    }
-
-    @Override public void setClusterName(PlotCluster cluster, String name) {
-    }
-
-    @Override public void setAlias(Plot plot, String alias) {
-    }
-
-    @Override public void purgeIds(Set<Integer> uniqueIds) {
-    }
-
-    @Override public void purge(PlotArea area, Set<PlotId> plotIds) {
-    }
-
-    @Override public void setPosition(Plot plot, String position) {
-    }
-
-    @Override public void setPosition(PlotCluster cluster, String position) {
-    }
-
-    @Override public void removeTrusted(Plot plot, UUID uuid) {
-    }
-
-    @Override public void removeHelper(PlotCluster cluster, UUID uuid) {
-    }
-
-    @Override public void removeMember(Plot plot, UUID uuid) {
-    }
-
-    @Override public void removeInvited(PlotCluster cluster, UUID uuid) {
-    }
-
-    @Override public void setTrusted(Plot plot, UUID uuid) {
-    }
-
-    @Override public void setHelper(PlotCluster cluster, UUID uuid) {
-    }
-
-    @Override public void setMember(Plot plot, UUID uuid) {
-    }
-
-    @Override public void setInvited(PlotCluster cluster, UUID uuid) {
-    }
-
-    @Override public void removeDenied(Plot plot, UUID uuid) {
-    }
-
-    @Override public void setDenied(Plot plot, UUID uuid) {
-    }
-
-    @Override public HashMap<UUID, Integer> getRatings(Plot plot) {
-        return null;
-    }
-
-    @Override public void setRating(Plot plot, UUID rater, int value) {
-    }
-
-    @Override public void removeComment(Plot plot, PlotComment comment) {
-    }
-
-    @Override public void clearInbox(Plot plot, String inbox) {
-    }
-
-    @Override public void setComment(Plot plot, PlotComment comment) {
-    }
-
-    @Override
-    public void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone) {
-    }
-
-    @Override public void createPlotAndSettings(Plot plot, Runnable whenDone) {
-    }
-
-    @Override public void createCluster(PlotCluster cluster) {
-    }
-
-    @Override public void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
-    }
-
-    @Override public void movePlot(Plot originalPlot, Plot newPlot) {
-    }
-
-    @Override public void replaceUUID(UUID old, UUID now) {
-    }
-
-    @Override public boolean deleteTables() {
-        return false;
-    }
-
-    @Override public void close() {
-    }
-
-    @Override public void replaceWorld(String oldWorld, String newWorld, PlotId min, PlotId max) {
-    }
-
-    @Override public void updateTables(int[] oldVersion) {
-    }
-}
-
diff --git a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java b/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
deleted file mode 100644
index 6ae75a86d..000000000
--- a/Bukkit/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-
-import java.util.List;
-import java.util.UUID;
-
-public class EventUtilTest extends EventUtil {
-
-    @Override public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
-        return null;
-    }
-
-    @Override public boolean callClaim(PlotPlayer player, Plot plot, boolean auto) {
-        return false;
-    }
-
-    @Override public boolean callTeleport(PlotPlayer player, Location from, Plot plot) {
-        return false;
-    }
-
-    @Override public boolean callComponentSet(Plot plot, String component) {
-        return false;
-    }
-
-    @Override public boolean callClear(Plot plot) {
-        return false;
-    }
-
-    @Override public boolean callDelete(Plot plot) {
-        return false;
-    }
-
-    @Override public boolean callFlagAdd(Flag flag, Plot plot) {
-        return true;
-    }
-
-    @Override public boolean callFlagRemove(Flag<?> flag, Plot plot, Object value) {
-        return true;
-    }
-
-    @Override public boolean callMerge(Plot plot, int dir, int max) {
-        return false;
-    }
-
-    @Override public boolean callAutoMerge(Plot plot, List<PlotId> plots) {
-        return false;
-    }
-
-    @Override public boolean callUnlink(PlotArea area, List<PlotId> plots) {
-        return false;
-    }
-
-    @Override public void callEntry(PlotPlayer player, Plot plot) {
-    }
-
-    @Override public void callLeave(PlotPlayer player, Plot plot) {
-    }
-
-    @Override public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
-    }
-
-    @Override public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
-    }
-
-    @Override public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
-    }
-
-    @Override
-    public boolean callOwnerChange(PlotPlayer initiator, Plot plot, UUID newOwner, UUID oldOwner,
-        boolean hasOldOwner) {
-        return false;
-    }
-}

From 14e1296e138e3ce6248a41443b4b6c447e6ffcd5 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Mon, 4 Feb 2019 14:24:17 +0000
Subject: [PATCH 016/210] Only thing I can think of in 8ac9b86that would be
 causing the lack of plot owners (before reverting the commit)

---
 .../github/intellectualsites/plotsquared/bukkit/BukkitMain.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index e1006b056..0693e1070 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -754,7 +754,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         }
         ChunkGenerator gen = world.getGenerator();
         if (gen instanceof BukkitPlotGenerator) {
-            PlotSquared.get().loadWorld(worldName, (GeneratorWrapper<?>) gen);
+            PlotSquared.get().loadWorld(worldName, (BukkitPlotGenerator) gen);
         } else if (gen != null) {
             PlotSquared.get().loadWorld(worldName, new BukkitPlotGenerator(worldName, gen));
         } else if (PlotSquared.get().worlds.contains("worlds." + worldName)) {

From cf82bc5efbb9d5ec18e9ef87954a88c9971fb6f9 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Mon, 4 Feb 2019 15:18:50 +0000
Subject: [PATCH 017/210] Revert 8ac9b86

---
 .../plotsquared/bukkit/BukkitMain.java        |   9 +-
 .../plotsquared/bukkit/chat/FancyMessage.java |  33 +-
 .../bukkit/events/ClusterFlagRemoveEvent.java |  63 ++
 .../bukkit/listeners/ChunkListener.java       | 117 +--
 .../bukkit/listeners/PlayerEvents.java        |  39 +-
 .../bukkit/listeners/PlotPlusListener.java    |  73 +-
 .../bukkit/listeners/SingleWorldListener.java |   4 +-
 .../entity/ReplicatingEntityWrapper.java      |  21 +-
 .../bukkit/object/schematic/StateWrapper.java |   3 +-
 .../bukkit/titles/TitleManager.java           |   6 +-
 .../bukkit/titles/TitleManager_1_11.java      |   2 +-
 .../bukkit/util/BukkitEventUtil.java          |   4 +
 .../bukkit/util/BukkitHybridUtils.java        |   1 -
 .../bukkit/util/BukkitInventoryUtil.java      |   4 +-
 .../plotsquared/bukkit/util/SendChunk.java    |  29 +-
 .../bukkit/util/block/BukkitLocalQueue.java   |   3 +-
 .../bukkit/uuid/DefaultUUIDWrapper.java       |   9 +-
 .../bukkit/uuid/FileUUIDHandler.java          | 350 ++++-----
 .../bukkit/uuid/OfflineUUIDWrapper.java       |  24 +-
 .../bukkit/uuid/SQLUUIDHandler.java           | 235 +++---
 .../configuration/Configuration.java          |   3 +-
 .../configuration/ConfigurationOptions.java   |   4 +-
 .../configuration/ConfigurationSection.java   |   9 +-
 .../configuration/MemoryConfiguration.java    |   3 +-
 .../configuration/MemorySection.java          |  56 +-
 .../configuration/file/FileConfiguration.java |   3 +-
 .../configuration/file/YamlConfiguration.java |   2 +-
 .../file/YamlConfigurationOptions.java        |   2 +-
 .../configuration/file/YamlConstructor.java   |   2 +-
 .../plotsquared/plot/IPlotMain.java           |   4 +-
 .../plotsquared/plot/Platform.java            |   2 +-
 .../plotsquared/plot/PlotSquared.java         | 293 ++++---
 .../plotsquared/plot/commands/Area.java       | 112 +--
 .../plotsquared/plot/commands/Claim.java      |  22 +-
 .../plotsquared/plot/commands/Cluster.java    |   7 +-
 .../plotsquared/plot/commands/Condense.java   |  13 +-
 .../plotsquared/plot/commands/Database.java   |  46 +-
 .../plotsquared/plot/commands/Help.java       |   4 +-
 .../plotsquared/plot/commands/Inbox.java      |   5 +-
 .../plotsquared/plot/commands/Merge.java      |   4 +-
 .../plotsquared/plot/commands/Purge.java      |  30 +-
 .../plotsquared/plot/commands/Rate.java       |  72 +-
 .../plotsquared/plot/database/AbstractDB.java |   8 +
 .../plotsquared/plot/database/DBFunc.java     |  68 +-
 .../plotsquared/plot/database/Database.java   |  16 +-
 .../plotsquared/plot/database/MySQL.java      |   2 +-
 .../plotsquared/plot/database/SQLManager.java | 712 +++++++++++-------
 .../plotsquared/plot/database/SQLite.java     |   2 +-
 .../plotsquared/plot/flag/FlagManager.java    |  42 +-
 .../plot/generator/HybridPlotWorld.java       |   6 +-
 .../plotsquared/plot/logger/ILogger.java      |   2 +-
 .../plotsquared/plot/object/Expression.java   |   4 +-
 .../plotsquared/plot/object/Plot.java         | 383 ++++++----
 .../plotsquared/plot/object/PlotArea.java     |   3 -
 .../plotsquared/plot/object/PlotCluster.java  |  20 +-
 .../plotsquared/plot/object/PlotMessage.java  |   1 -
 .../plotsquared/plot/object/PlotPlayer.java   | 108 ++-
 .../plotsquared/plot/object/PlotSettings.java |   9 +-
 .../stream/AbstractDelegateOutputStream.java  |   5 +-
 .../object/worlds/DefaultPlotAreaManager.java |  18 +-
 .../plot/object/worlds/PlotAreaManager.java   |  20 +-
 .../plot/object/worlds/SinglePlot.java        |   3 +-
 .../object/worlds/SinglePlotAreaManager.java  |   3 +-
 .../plot/object/worlds/SinglePlotManager.java |  10 +-
 .../plotsquared/plot/util/AbstractTitle.java  |   2 +-
 .../plotsquared/plot/util/ChunkManager.java   |  76 +-
 .../plotsquared/plot/util/CmdConfirm.java     |   8 +-
 .../plotsquared/plot/util/CommentManager.java |  47 +-
 .../plotsquared/plot/util/EventUtil.java      |   8 +-
 .../plotsquared/plot/util/MainUtil.java       |  66 +-
 .../plot/util/SchematicHandler.java           |   2 +-
 .../plot/util/block/GlobalBlockQueue.java     |  93 +--
 .../plot/util/expiry/ExpireManager.java       | 105 ++-
 .../plot/util/expiry/PlotAnalysis.java        |  33 +-
 .../plotsquared/plot/uuid/UUIDWrapper.java    |  14 +-
 .../plot/database/AbstractDBTest.java         |   3 +
 .../plotsquared/plot/util/EventUtilTest.java  |   4 +
 77 files changed, 2105 insertions(+), 1528 deletions(-)
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 0693e1070..78cd3a189 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -81,7 +81,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     private final BlockRegistry<Material> blockRegistry =
         new BukkitBlockRegistry(Material.values());
     private int[] version;
-    private String pluginName;
+    @Getter private String pluginName;
     @Getter private SingleWorldListener singleWorldListener;
     private Method methodUnloadChunk0;
     private boolean methodUnloadSetup = false;
@@ -112,9 +112,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return Bukkit.getVersion();
     }
 
-
     @Override public void onEnable() {
         this.pluginName = getDescription().getName();
+        getServer().getName();
 
         PlotPlayer.registerConverter(Player.class, BukkitUtil::getPlayer);
 
@@ -266,10 +266,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return getDescription().getVersion();
     }
 
-    @Override public String getPluginName() {
-        return pluginName;
-    }
-
     @Override public void registerCommands() {
         final BukkitCommand bukkitCommand = new BukkitCommand();
         final PluginCommand plotCommand = getCommand("plots");
@@ -537,7 +533,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
     @Override @Nullable
     public final ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
-        PlotSquared.log("DEFAULT WORLD GENERATOR RUN");
         final IndependentPlotGenerator result;
         if (id != null && id.equalsIgnoreCase("single")) {
             result = new SingleWorldGenerator();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
index 5e87231df..41ec91e49 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
@@ -5,10 +5,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonWriter;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.Statistic;
+import org.bukkit.*;
 import org.bukkit.Statistic.Type;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
@@ -323,6 +320,34 @@ public class FancyMessage
         return this;
     }
 
+    /**
+     * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
+     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
+     *
+     * @param which The achievement to display.
+     * @return This builder instance.
+     */
+    public FancyMessage achievementTooltip(final Achievement which) {
+        try {
+            Object achievement = Reflection
+                .getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSAchievement",
+                    Achievement.class).invoke(null, which);
+            return achievementTooltip(
+                (String) Reflection.getField(Reflection.getNMSClass("Achievement"), "name")
+                    .get(achievement));
+        } catch (IllegalAccessException e) {
+            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
+            return this;
+        } catch (IllegalArgumentException e) {
+            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
+            return this;
+        } catch (InvocationTargetException e) {
+            Bukkit.getLogger()
+                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
+            return this;
+        }
+    }
+
     /**
      * Set the behavior of the current editing component to display information about a parameterless statistic when the client hovers over the text.
      * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
new file mode 100644
index 000000000..40acef111
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
@@ -0,0 +1,63 @@
+package com.github.intellectualsites.plotsquared.bukkit.events;
+
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.object.PlotCluster;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Called when a flag is removed from a plot.
+ */
+public class ClusterFlagRemoveEvent extends Event implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private final PlotCluster cluster;
+    private final Flag flag;
+    private boolean cancelled;
+
+    /**
+     * PlotFlagRemoveEvent: Called when a flag is removed from a plot.
+     *
+     * @param flag    Flag that was removed
+     * @param cluster PlotCluster from which the flag was removed
+     */
+    public ClusterFlagRemoveEvent(Flag flag, PlotCluster cluster) {
+        this.cluster = cluster;
+        this.flag = flag;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    /**
+     * Get the cluster involved.
+     *
+     * @return PlotCluster
+     */
+    public PlotCluster getCluster() {
+        return this.cluster;
+    }
+
+    /**
+     * Get the flag involved.
+     *
+     * @return Flag
+     */
+    public Flag getFlag() {
+        return this.flag;
+    }
+
+    @Override public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    @Override public boolean isCancelled() {
+        return this.cancelled;
+    }
+
+    @Override public void setCancelled(boolean b) {
+        this.cancelled = b;
+    }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index a57a8dbe3..af9ed712a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -59,45 +59,48 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         for (World world : Bukkit.getWorlds()) {
             world.setAutoSave(false);
         }
-        TaskManager.runTaskRepeat(() -> {
-            try {
-                HashSet<Chunk> toUnload = new HashSet<>();
-                for (World world : Bukkit.getWorlds()) {
-                    String worldName = world.getName();
-                    if (!PlotSquared.get().hasPlotArea(worldName)) {
-                        continue;
-                    }
-                    Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
-                    Object chunkMap = w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
-                    Method methodIsChunkInUse =
-                        chunkMap.getClass().getDeclaredMethod("isChunkInUse", int.class, int.class);
-                    Chunk[] chunks = world.getLoadedChunks();
-                    for (Chunk chunk : chunks) {
-                        if ((boolean) methodIsChunkInUse
-                            .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
+        TaskManager.runTaskRepeat(new Runnable() {
+            @Override public void run() {
+                try {
+                    HashSet<Chunk> toUnload = new HashSet<>();
+                    for (World world : Bukkit.getWorlds()) {
+                        String worldName = world.getName();
+                        if (!PlotSquared.get().hasPlotArea(worldName)) {
                             continue;
                         }
-                        int x = chunk.getX();
-                        int z = chunk.getZ();
-                        if (!shouldSave(worldName, x, z)) {
-                            unloadChunk(worldName, chunk, false);
-                            continue;
+                        Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
+                        Object chunkMap =
+                            w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
+                        Method methodIsChunkInUse = chunkMap.getClass()
+                            .getDeclaredMethod("isChunkInUse", int.class, int.class);
+                        Chunk[] chunks = world.getLoadedChunks();
+                        for (Chunk chunk : chunks) {
+                            if ((boolean) methodIsChunkInUse
+                                .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
+                                continue;
+                            }
+                            int x = chunk.getX();
+                            int z = chunk.getZ();
+                            if (!shouldSave(worldName, x, z)) {
+                                unloadChunk(worldName, chunk, false);
+                                continue;
+                            }
+                            toUnload.add(chunk);
                         }
-                        toUnload.add(chunk);
                     }
-                }
-                if (toUnload.isEmpty()) {
-                    return;
-                }
-                long start = System.currentTimeMillis();
-                for (Chunk chunk : toUnload) {
-                    if (System.currentTimeMillis() - start > 5) {
+                    if (toUnload.isEmpty()) {
                         return;
                     }
-                    chunk.unload(true, false);
+                    long start = System.currentTimeMillis();
+                    for (Chunk chunk : toUnload) {
+                        if (System.currentTimeMillis() - start > 5) {
+                            return;
+                        }
+                        chunk.unload(true, false);
+                    }
+                } catch (Throwable e) {
+                    e.printStackTrace();
                 }
-            } catch (Throwable e) {
-                e.printStackTrace();
             }
         }, 1);
     }
@@ -108,7 +111,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         }
         Object c = this.methodGetHandleChunk.of(chunk).call();
         RefField.RefExecutor field = this.mustSave.of(c);
-        if ((Boolean) field.get()) {
+        if ((Boolean) field.get() == true) {
             field.set(false);
             if (chunk.isLoaded()) {
                 ignoreUnload = true;
@@ -219,26 +222,9 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
     private void cleanChunk(final Chunk chunk) {
         TaskManager.index.incrementAndGet();
         final Integer currentIndex = TaskManager.index.get();
-        Integer task = TaskManager.runTaskRepeat(() -> {
-            if (!chunk.isLoaded()) {
-                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                TaskManager.tasks.remove(currentIndex);
-                PlotSquared.debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                chunk.unload(true, true);
-                return;
-            }
-            BlockState[] tiles = chunk.getTileEntities();
-            if (tiles.length == 0) {
-                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                TaskManager.tasks.remove(currentIndex);
-                PlotSquared.debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                chunk.unload(true, true);
-                return;
-            }
-            long start = System.currentTimeMillis();
-            int i = 0;
-            while (System.currentTimeMillis() - start < 250) {
-                if (i >= tiles.length) {
+        Integer task = TaskManager.runTaskRepeat(new Runnable() {
+            @Override public void run() {
+                if (!chunk.isLoaded()) {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
                     PlotSquared
@@ -246,8 +232,29 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                     chunk.unload(true, true);
                     return;
                 }
-                tiles[i].getBlock().setType(Material.AIR, false);
-                i++;
+                BlockState[] tiles = chunk.getTileEntities();
+                if (tiles.length == 0) {
+                    Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
+                    TaskManager.tasks.remove(currentIndex);
+                    PlotSquared
+                        .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                    chunk.unload(true, true);
+                    return;
+                }
+                long start = System.currentTimeMillis();
+                int i = 0;
+                while (System.currentTimeMillis() - start < 250) {
+                    if (i >= tiles.length) {
+                        Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
+                        TaskManager.tasks.remove(currentIndex);
+                        PlotSquared
+                            .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                        chunk.unload(true, true);
+                        return;
+                    }
+                    tiles[i].getBlock().setType(Material.AIR, false);
+                    i++;
+                }
             }
         }, 5);
         TaskManager.tasks.put(currentIndex, task);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index d0511aaa7..e8ab247a7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -42,7 +42,6 @@ import org.bukkit.help.HelpTopic;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.material.Directional;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
@@ -673,9 +672,8 @@ import java.util.regex.Pattern;
                 if (passenger instanceof Player) {
                     final Player player = (Player) passenger;
                     // reset
-                    if (moveTmp == null) {
+                    if (moveTmp == null)
                         moveTmp = new PlayerMoveEvent(null, from, to);
-                    }
                     moveTmp.setFrom(from);
                     moveTmp.setTo(to);
                     moveTmp.setCancelled(false);
@@ -703,7 +701,7 @@ import java.util.regex.Pattern;
                             vehicle.eject();
                             vehicle.setVelocity(new Vector(0d, 0d, 0d));
                             vehicle.teleport(dest);
-                            vehicle.addPassenger(player);
+                            vehicle.setPassenger(player);
                         }
                         return;
                     }
@@ -785,7 +783,7 @@ import java.util.regex.Pattern;
                 this.tmpTeleport = true;
                 return;
             }
-            int border = area.getBorder();
+            Integer border = area.getBorder();
             if (x2 > border && this.tmpTeleport) {
                 to.setX(x2 - 1);
                 this.tmpTeleport = false;
@@ -848,7 +846,7 @@ import java.util.regex.Pattern;
                 this.tmpTeleport = true;
                 return;
             }
-            int border = area.getBorder();
+            Integer border = area.getBorder();
             if (z2 > border && this.tmpTeleport) {
                 to.setZ(z2 - 1);
                 this.tmpTeleport = false;
@@ -866,9 +864,8 @@ import java.util.regex.Pattern;
     }
 
     @EventHandler(priority = EventPriority.LOW) public void onChat(AsyncPlayerChatEvent event) {
-        if (event.isCancelled()) {
+        if (event.isCancelled())
             return;
-        }
 
         PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
         Location location = plotPlayer.getLocation();
@@ -1085,9 +1082,8 @@ import java.util.regex.Pattern;
             PlotArea area = location.getPlotArea();
             if (area != null) {
                 Plot plot = area.getOwnedPlot(location);
-                if (plot != null && Flags.MOB_BREAK.isTrue(plot)) {
+                if (plot != null && Flags.MOB_BREAK.isTrue(plot))
                     return;
-                }
                 event.setCancelled(true);
             }
         }
@@ -1454,11 +1450,11 @@ import java.util.regex.Pattern;
         switch (type) {
             case WATER_BUCKET:
             case LAVA_BUCKET: {
-                if (event.getBlock().getType() == Material.DROPPER) {
+                if (event.getBlock().getType() == Material.DROPPER)
                     return;
-                }
                 BlockFace targetFace =
-                    ((Directional) event.getBlock().getState().getData()).getFacing();
+                    ((org.bukkit.material.Dispenser) event.getBlock().getState().getData())
+                        .getFacing();
                 Location location =
                     BukkitUtil.getLocation(event.getBlock().getRelative(targetFace).getLocation());
                 if (location.isPlotRoad()) {
@@ -1579,9 +1575,8 @@ import java.util.regex.Pattern;
             switch (newItem.getType()) {
                 case LEGACY_BANNER:
                 case PLAYER_HEAD:
-                    if (newMeta != null) {
+                    if (newMeta != null)
                         break;
-                    }
                 default:
                     return;
             }
@@ -1597,13 +1592,11 @@ import java.util.regex.Pattern;
             switch (stateType) {
                 case LEGACY_STANDING_BANNER:
                 case LEGACY_WALL_BANNER:
-                    if (itemType == Material.LEGACY_BANNER) {
+                    if (itemType == Material.LEGACY_BANNER)
                         break;
-                    }
                 case LEGACY_SKULL:
-                    if (itemType == Material.LEGACY_SKULL_ITEM) {
+                    if (itemType == Material.LEGACY_SKULL_ITEM)
                         break;
-                    }
                 default:
                     return;
             }
@@ -2571,11 +2564,11 @@ import java.util.regex.Pattern;
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
-        EntityDamageByEntityEvent eventChange =
-            new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
-                EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
+        EntityDamageByEntityEvent eventChange = null;
+        eventChange = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
+            EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
         onEntityDamageByEntityEvent(eventChange);
         if (eventChange.isCancelled()) {
             event.setCancelled(true);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index 33a63dbde..d95a7c199 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -10,7 +10,6 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -37,43 +36,45 @@ import java.util.UUID;
     private static final HashMap<UUID, Interval> healRunnable = new HashMap<>();
 
     public static void startRunnable(JavaPlugin plugin) {
-        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
-            if (!healRunnable.isEmpty()) {
-                for (Iterator<Entry<UUID, Interval>> iterator =
-                     healRunnable.entrySet().iterator(); iterator.hasNext(); ) {
-                    Entry<UUID, Interval> entry = iterator.next();
-                    Interval value = entry.getValue();
-                    ++value.count;
-                    if (value.count == value.interval) {
-                        value.count = 0;
-                        Player player = Bukkit.getPlayer(entry.getKey());
-                        if (player == null) {
-                            iterator.remove();
-                            continue;
-                        }
-                        double level = player.getHealth();
-                        if (level != value.max) {
-                            player.setHealth(Math.min(level + value.amount, value.max));
+        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
+            @Override public void run() {
+                if (!healRunnable.isEmpty()) {
+                    for (Iterator<Entry<UUID, Interval>> iterator =
+                         healRunnable.entrySet().iterator(); iterator.hasNext(); ) {
+                        Entry<UUID, Interval> entry = iterator.next();
+                        Interval value = entry.getValue();
+                        ++value.count;
+                        if (value.count == value.interval) {
+                            value.count = 0;
+                            Player player = Bukkit.getPlayer(entry.getKey());
+                            if (player == null) {
+                                iterator.remove();
+                                continue;
+                            }
+                            double level = player.getHealth();
+                            if (level != value.max) {
+                                player.setHealth(Math.min(level + value.amount, value.max));
+                            }
                         }
                     }
                 }
-            }
-            if (!feedRunnable.isEmpty()) {
-                for (Iterator<Entry<UUID, Interval>> iterator =
-                     feedRunnable.entrySet().iterator(); iterator.hasNext(); ) {
-                    Entry<UUID, Interval> entry = iterator.next();
-                    Interval value = entry.getValue();
-                    ++value.count;
-                    if (value.count == value.interval) {
-                        value.count = 0;
-                        Player player = Bukkit.getPlayer(entry.getKey());
-                        if (player == null) {
-                            iterator.remove();
-                            continue;
-                        }
-                        int level = player.getFoodLevel();
-                        if (level != value.max) {
-                            player.setFoodLevel(Math.min(level + value.amount, value.max));
+                if (!feedRunnable.isEmpty()) {
+                    for (Iterator<Entry<UUID, Interval>> iterator =
+                         feedRunnable.entrySet().iterator(); iterator.hasNext(); ) {
+                        Entry<UUID, Interval> entry = iterator.next();
+                        Interval value = entry.getValue();
+                        ++value.count;
+                        if (value.count == value.interval) {
+                            value.count = 0;
+                            Player player = Bukkit.getPlayer(entry.getKey());
+                            if (player == null) {
+                                iterator.remove();
+                                continue;
+                            }
+                            int level = player.getFoodLevel();
+                            if (level != value.max) {
+                                player.setFoodLevel(Math.min(level + value.amount, value.max));
+                            }
                         }
                     }
                 }
@@ -104,7 +105,7 @@ import java.util.UUID;
         if (event.getEntityType() != EntityType.PLAYER) {
             return;
         }
-        Entity player = event.getEntity();
+        Player player = (Player) event.getEntity();
         Plot plot = BukkitUtil.getLocation(player).getOwnedPlot();
         if (plot == null) {
             return;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index b0912fea2..6a3e26d59 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -33,8 +33,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
             this.done = classChunk.getField("done").getRealField();
             this.lit = classChunk.getField("lit").getRealField();
             this.s = classChunk.getField("s").getRealField();
-        } catch (NoSuchFieldException exception) {
-            exception.printStackTrace();
+        } catch (Throwable ignore) {
+            ignore.printStackTrace();
         }
         Bukkit.getPluginManager().registerEvents(this, plugin);
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index 0b6921f88..e71373771 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -135,11 +135,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 Horse horse = (Horse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
-                if (horse instanceof ChestedHorse) {
-                    this.horse.chest = ((ChestedHorse) horse).isCarryingChest();
-                } else {
-                    this.horse.chest = false;
-                }
+                this.horse.chest = horse.isCarryingChest();
                 this.horse.variant = horse.getVariant();
                 this.horse.style = horse.getStyle();
                 this.horse.color = horse.getColor();
@@ -179,12 +175,10 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 return;
             // END AGEABLE //
             case GUARDIAN:
-                //todo no longer works (possible exception thrown)
                 this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
                 storeLiving((LivingEntity) entity);
                 return;
             case SKELETON:
-                //todo no longer works (possible exception thrown)
                 this.dataByte = getOrdinal(Skeleton.SkeletonType.values(),
                     ((Skeleton) entity).getSkeletonType());
                 storeLiving((LivingEntity) entity);
@@ -430,7 +424,10 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             return entity;
         }
         if (this.base.passenger != null) {
-            entity.addPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
+            try {
+                entity.setPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
+            } catch (Exception ignored) {
+            }
         }
         if (this.base.fall != 0) {
             entity.setFallDistance(this.base.fall);
@@ -515,10 +512,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case HORSE:
                 Horse horse = (Horse) entity;
                 horse.setJumpStrength(this.horse.jump);
-                if (horse instanceof ChestedHorse && this.horse.chest) {
-                    ((ChestedHorse) horse).setCarryingChest(true);
-                }
-                //todo broken in 1.13 possible exception thrown
+                horse.setCarryingChest(this.horse.chest);
                 horse.setVariant(this.horse.variant);
                 horse.setStyle(this.horse.style);
                 horse.setColor(this.horse.color);
@@ -565,15 +559,12 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 return entity;
             case GUARDIAN:
                 if (this.dataByte != 0) {
-                    //todo broken in 1.13 possible exception thrown
-
                     ((Guardian) entity).setElder(true);
                 }
                 restoreLiving((LivingEntity) entity);
                 return entity;
             case SKELETON:
                 if (this.dataByte != 0) {
-                    //todo broken in 1.13 possible exception thrown
                     ((Skeleton) entity)
                         .setSkeletonType(Skeleton.SkeletonType.values()[this.dataByte]);
                 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
index 4815c2e01..3557f33af 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
@@ -14,7 +14,6 @@ import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.Damageable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -242,7 +241,7 @@ public class StateWrapper {
     public Map<String, Tag> serializeItem(ItemStack item) {
         Map<String, Tag> data = new HashMap<>();
         data.put("id", new StringTag(item.getType().name()));
-        data.put("Damage", new ShortTag((short) ((Damageable) item.getItemMeta()).getDamage()));
+        data.put("Damage", new ShortTag(item.getDurability()));
         data.put("Count", new ByteTag((byte) item.getAmount()));
         if (!item.getEnchantments().isEmpty()) {
             List<CompoundTag> enchantmentList = new ArrayList<>();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
index df16d07a2..f4c249f97 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
@@ -187,7 +187,11 @@ public abstract class TitleManager {
         throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
 
     private Class<?> getPrimitiveType(Class<?> clazz) {
-        return CORRESPONDING_TYPES.getOrDefault(clazz, clazz);
+        if (CORRESPONDING_TYPES.containsKey(clazz)) {
+            return CORRESPONDING_TYPES.get(clazz);
+        } else {
+            return clazz;
+        }
     }
 
     private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
index 817417087..92155ba45 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
@@ -335,7 +335,7 @@ public class TitleManager_1_11 {
     }
 
     private Class<?> getPrimitiveType(Class<?> clazz) {
-        return CORRESPONDING_TYPES.getOrDefault(clazz, clazz);
+        return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
     }
 
     private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
index 5a4cf885a..7fd22b55e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
@@ -101,6 +101,10 @@ public final class BukkitEventUtil extends EventUtil {
             new PlotChangeOwnerEvent(getPlayer(initiator), plot, oldOwner, newOwner, hasOldOwner));
     }
 
+    @Override public boolean callFlagRemove(Flag flag, Object object, PlotCluster cluster) {
+        return callEvent(new ClusterFlagRemoveEvent(flag, cluster));
+    }
+
     @Override @Nullable public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
         PlotRateEvent event = new PlotRateEvent(player, rating, plot);
         Bukkit.getServer().getPluginManager().callEvent(event);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index 395523f35..3c2c75d2b 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -148,7 +148,6 @@ public class BukkitHybridUtils extends HybridUtils {
                                 }
                                 int y = MainUtil.y_loc[i][j];
                                 oldBlocks[y][x][z] = airBucket;
-
                             }
                             continue;
                         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
index d855f9e39..c40e13d09 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
@@ -83,7 +83,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
         }
         // int id = item.getTypeId();
         Material id = item.getType();
-        //short data = item.getDurability();
+        short data = item.getDurability();
         int amount = item.getAmount();
         String name = null;
         String[] lore = null;
@@ -94,7 +94,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
             }
             if (meta.hasLore()) {
                 List<String> itemLore = meta.getLore();
-                lore = itemLore.toArray(new String[0]);
+                lore = itemLore.toArray(new String[itemLore.size()]);
             }
         }
         return new PlotItemStack(id.name(), amount, name, lore);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
index 6be193778..f0987b219 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
@@ -26,8 +26,8 @@ import java.util.Map.Entry;
 import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
 
 /**
- * An utility that can be used to send chunks, rather than using bukkit code to do so (uses heavy
- * NMS).
+ * An utility that can be used to send chunks, rather than using bukkit code
+ * to do so (uses heavy NMS).
  */
 public class SendChunk {
 
@@ -118,17 +118,20 @@ public class SendChunk {
             }
         }
         for (final Chunk chunk : chunks) {
-            TaskManager.runTask(() -> {
-                try {
-                    chunk.unload(true, false);
-                } catch (Throwable ignored) {
-                    String worldName = chunk.getWorld().getName();
-                    PlotSquared.debug(
-                        "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";" + chunk
-                            .getZ());
-                    PlotSquared.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
-                    PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
-                        + "/level_old.dat may be corrupt (try repairing or removing these)");
+            TaskManager.runTask(new Runnable() {
+                @Override public void run() {
+                    try {
+                        chunk.unload(true, false);
+                    } catch (Throwable ignored) {
+                        String worldName = chunk.getWorld().getName();
+                        PlotSquared.debug(
+                            "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";"
+                                + chunk.getZ());
+                        PlotSquared
+                            .debug("$3 - $4File may be open in another process (e.g. MCEdit)");
+                        PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
+                            + "/level_old.dat may be corrupt (try repairing or removing these)");
+                    }
                 }
             });
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index eee467db1..77518690d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -192,7 +192,8 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
             for (int x = 0; x < lc.biomes.length; x++) {
                 String[] biomes2 = lc.biomes[x];
                 if (biomes2 != null) {
-                    for (String biomeStr : biomes2) {
+                    for (int y = 0; y < biomes2.length; y++) {
+                        String biomeStr = biomes2[y];
                         if (biomeStr != null) {
                             if (last == null || !StringMan.isEqual(last, biomeStr)) {
                                 biome = Biome.valueOf(biomeStr.toUpperCase());
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index 40305cca5..3660bef92 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -8,10 +8,9 @@ import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
-import java.util.Arrays;
 import java.util.UUID;
 
-public class DefaultUUIDWrapper implements UUIDWrapper {
+public class DefaultUUIDWrapper extends UUIDWrapper {
 
     @Override public UUID getUUID(PlotPlayer player) {
         return ((BukkitPlayer) player).player.getUniqueId();
@@ -31,7 +30,11 @@ public class DefaultUUIDWrapper implements UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        return Arrays.stream(ops).map(BukkitOfflinePlayer::new).toArray(BukkitOfflinePlayer[]::new);
+        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
+        for (int i = 0; i < ops.length; i++) {
+            toReturn[i] = new BukkitOfflinePlayer(ops[i]);
+        }
+        return toReturn;
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index 42a83f466..2223feceb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -47,196 +47,204 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
         } else {
             world = worlds.get(0).getName();
         }
-        TaskManager.runTaskAsync(() -> {
-            PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
-            File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
-            if (uuidFile.exists()) {
-                try {
-                    List<String> lines =
-                        Files.readAllLines(uuidFile.toPath(), StandardCharsets.UTF_8);
-                    for (String line : lines) {
-                        try {
-                            line = line.trim();
-                            if (line.isEmpty()) {
-                                continue;
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
+                File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
+                if (uuidFile.exists()) {
+                    try {
+                        List<String> lines =
+                            Files.readAllLines(uuidFile.toPath(), StandardCharsets.UTF_8);
+                        for (String line : lines) {
+                            try {
+                                line = line.trim();
+                                if (line.isEmpty()) {
+                                    continue;
+                                }
+                                line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
+                                String[] split = line.split("\\|");
+                                String name = split[0];
+                                if (name.isEmpty() || (name.length() > 16) || !StringMan
+                                    .isAlphanumericUnd(name)) {
+                                    continue;
+                                }
+                                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                                if (uuid == null) {
+                                    continue;
+                                }
+                                UUIDHandler.add(new StringWrapper(name), uuid);
+                            } catch (Exception e2) {
+                                e2.printStackTrace();
                             }
-                            line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
-                            String[] split = line.split("\\|");
-                            String name = split[0];
-                            if (name.isEmpty() || (name.length() > 16) || !StringMan
-                                .isAlphanumericUnd(name)) {
-                                continue;
+                        }
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+                HashBiMap<StringWrapper, UUID> toAdd =
+                    HashBiMap.create(new HashMap<StringWrapper, UUID>());
+                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
+                    HashSet<UUID> all = UUIDHandler.getAllUUIDS();
+                    PlotSquared.debug("&aFast mode UUID caching enabled!");
+                    File playerDataFolder =
+                        new File(container, world + File.separator + "playerdata");
+                    String[] dat = playerDataFolder.list(new DatFileFilter());
+                    boolean check = all.isEmpty();
+                    if (dat != null) {
+                        for (String current : dat) {
+                            String s = current.replaceAll(".dat$", "");
+                            try {
+                                UUID uuid = UUID.fromString(s);
+                                if (check || all.remove(uuid)) {
+                                    File file = new File(playerDataFolder, current);
+                                    NbtFactory.NbtCompound compound = NbtFactory
+                                        .fromStream(new FileInputStream(file),
+                                            NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                                    if (!compound.containsKey("bukkit")) {
+                                        PlotSquared.debug("ERROR: Player data (" + uuid.toString()
+                                            + ".dat) does not contain the the key \"bukkit\"");
+                                    } else {
+                                        NbtFactory.NbtCompound bukkit =
+                                            (NbtFactory.NbtCompound) compound.get("bukkit");
+                                        String name = (String) bukkit.get("lastKnownName");
+                                        long last = (long) bukkit.get("lastPlayed");
+                                        long first = (long) bukkit.get("firstPlayed");
+                                        if (ExpireManager.IMP != null) {
+                                            ExpireManager.IMP.storeDate(uuid, last);
+                                            ExpireManager.IMP.storeAccountAge(uuid, last - first);
+                                        }
+                                        toAdd.put(new StringWrapper(name), uuid);
+                                    }
+                                }
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
                             }
-                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                            if (uuid == null) {
-                                continue;
-                            }
-                            UUIDHandler.add(new StringWrapper(name), uuid);
-                        } catch (Exception e2) {
-                            e2.printStackTrace();
                         }
                     }
-                } catch (IOException e) {
-                    e.printStackTrace();
+                    add(toAdd);
+                    if (all.isEmpty()) {
+                        if (whenDone != null) {
+                            whenDone.run();
+                        }
+                        return;
+                    } else {
+                        PlotSquared.debug("Failed to cache: " + all.size()
+                            + " uuids - slowly processing all files");
+                    }
                 }
-            }
-            HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<>());
-            if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-                HashSet<UUID> all = UUIDHandler.getAllUUIDS();
-                PlotSquared.debug("&aFast mode UUID caching enabled!");
-                File playerDataFolder = new File(container, world + File.separator + "playerdata");
-                String[] dat = playerDataFolder.list(new DatFileFilter());
-                boolean check = all.isEmpty();
-                if (dat != null) {
-                    for (String current : dat) {
-                        String s = current.replaceAll(".dat$", "");
-                        try {
-                            UUID uuid = UUID.fromString(s);
-                            if (check || all.remove(uuid)) {
-                                File file = new File(playerDataFolder, current);
-                                NbtFactory.NbtCompound compound = NbtFactory
-                                    .fromStream(new FileInputStream(file),
-                                        NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                                if (!compound.containsKey("bukkit")) {
-                                    PlotSquared.debug("ERROR: Player data (" + uuid.toString()
-                                        + ".dat) does not contain the the key \"bukkit\"");
-                                } else {
-                                    NbtFactory.NbtCompound bukkit =
-                                        (NbtFactory.NbtCompound) compound.get("bukkit");
-                                    String name = (String) bukkit.get("lastKnownName");
-                                    long last = (long) bukkit.get("lastPlayed");
-                                    long first = (long) bukkit.get("firstPlayed");
-                                    if (ExpireManager.IMP != null) {
-                                        ExpireManager.IMP.storeDate(uuid, last);
-                                        ExpireManager.IMP.storeAccountAge(uuid, last - first);
+                HashSet<String> worlds = Sets.newHashSet(world, "world");
+                HashSet<UUID> uuids = new HashSet<>();
+                HashSet<String> names = new HashSet<>();
+                File playerDataFolder = null;
+                for (String worldName : worlds) {
+                    // Getting UUIDs
+                    playerDataFolder =
+                        new File(container, worldName + File.separator + "playerdata");
+                    String[] dat = playerDataFolder.list(new DatFileFilter());
+                    if ((dat != null) && (dat.length != 0)) {
+                        for (String current : dat) {
+                            String s = current.replaceAll(".dat$", "");
+                            try {
+                                UUID uuid = UUID.fromString(s);
+                                uuids.add(uuid);
+                            } catch (Exception ignored) {
+                                PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
+                            }
+                        }
+                        break;
+                    }
+                    // Getting names
+                    File playersFolder = new File(worldName + File.separator + "players");
+                    dat = playersFolder.list(new DatFileFilter());
+                    if ((dat != null) && (dat.length != 0)) {
+                        for (String current : dat) {
+                            names.add(current.replaceAll(".dat$", ""));
+                        }
+                        break;
+                    }
+                }
+                for (UUID uuid : uuids) {
+                    try {
+                        File file =
+                            new File(playerDataFolder + File.separator + uuid.toString() + ".dat");
+                        if (!file.exists()) {
+                            continue;
+                        }
+                        NbtFactory.NbtCompound compound = NbtFactory
+                            .fromStream(new FileInputStream(file),
+                                NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                        if (!compound.containsKey("bukkit")) {
+                            PlotSquared.debug("ERROR: Player data (" + uuid.toString()
+                                + ".dat) does not contain the the key \"bukkit\"");
+                        } else {
+                            NbtFactory.NbtCompound bukkit =
+                                (NbtFactory.NbtCompound) compound.get("bukkit");
+                            String name = (String) bukkit.get("lastKnownName");
+                            StringWrapper wrap = new StringWrapper(name);
+                            if (!toAdd.containsKey(wrap)) {
+                                long last = (long) bukkit.get("lastPlayed");
+                                long first = (long) bukkit.get("firstPlayed");
+                                if (Settings.UUID.OFFLINE) {
+                                    if (Settings.UUID.FORCE_LOWERCASE && !name.toLowerCase()
+                                        .equals(name)) {
+                                        uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                                    } else {
+                                        long most = (long) compound.get("UUIDMost");
+                                        long least = (long) compound.get("UUIDLeast");
+                                        uuid = new UUID(most, least);
                                     }
-                                    toAdd.put(new StringWrapper(name), uuid);
+                                }
+                                if (ExpireManager.IMP != null) {
+                                    ExpireManager.IMP.storeDate(uuid, last);
+                                    ExpireManager.IMP.storeAccountAge(uuid, last - first);
+                                }
+                                toAdd.put(wrap, uuid);
+                            }
+                        }
+                    } catch (Exception ignored) {
+                        PlotSquared
+                            .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
+                    }
+                }
+                for (String name : names) {
+                    UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                    StringWrapper nameWrap = new StringWrapper(name);
+                    toAdd.put(nameWrap, uuid);
+                }
+
+                if (getUUIDMap().isEmpty()) {
+                    for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
+                        .getOfflinePlayers()) {
+                        long last = op.getLastPlayed();
+                        if (last != 0) {
+                            String name = op.getName();
+                            StringWrapper wrap = new StringWrapper(name);
+                            if (!toAdd.containsKey(wrap)) {
+                                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
+                                toAdd.put(wrap, uuid);
+                                if (ExpireManager.IMP != null) {
+                                    ExpireManager.IMP.storeDate(uuid, last);
                                 }
                             }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
                         }
                     }
                 }
                 add(toAdd);
-                if (all.isEmpty()) {
-                    if (whenDone != null) {
-                        whenDone.run();
-                    }
-                    return;
-                } else {
-                    PlotSquared.debug(
-                        "Failed to cache: " + all.size() + " uuids - slowly processing all files");
+                if (whenDone != null) {
+                    whenDone.run();
                 }
             }
-            HashSet<String> worlds1 = Sets.newHashSet(world, "world");
-            HashSet<UUID> uuids = new HashSet<>();
-            HashSet<String> names = new HashSet<>();
-            File playerDataFolder = null;
-            for (String worldName : worlds1) {
-                // Getting UUIDs
-                playerDataFolder = new File(container, worldName + File.separator + "playerdata");
-                String[] dat = playerDataFolder.list(new DatFileFilter());
-                if ((dat != null) && (dat.length != 0)) {
-                    for (String current : dat) {
-                        String s = current.replaceAll(".dat$", "");
-                        try {
-                            UUID uuid = UUID.fromString(s);
-                            uuids.add(uuid);
-                        } catch (Exception ignored) {
-                            PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
-                        }
-                    }
-                    break;
-                }
-                // Getting names
-                File playersFolder = new File(worldName + File.separator + "players");
-                dat = playersFolder.list(new DatFileFilter());
-                if ((dat != null) && (dat.length != 0)) {
-                    for (String current : dat) {
-                        names.add(current.replaceAll(".dat$", ""));
-                    }
-                    break;
-                }
-            }
-            for (UUID uuid : uuids) {
-                try {
-                    File file =
-                        new File(playerDataFolder + File.separator + uuid.toString() + ".dat");
-                    if (!file.exists()) {
-                        continue;
-                    }
-                    NbtFactory.NbtCompound compound = NbtFactory
-                        .fromStream(new FileInputStream(file),
-                            NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                    if (!compound.containsKey("bukkit")) {
-                        PlotSquared.debug("ERROR: Player data (" + uuid.toString()
-                            + ".dat) does not contain the the key \"bukkit\"");
-                    } else {
-                        NbtFactory.NbtCompound bukkit =
-                            (NbtFactory.NbtCompound) compound.get("bukkit");
-                        String name = (String) bukkit.get("lastKnownName");
-                        StringWrapper wrap = new StringWrapper(name);
-                        if (!toAdd.containsKey(wrap)) {
-                            long last = (long) bukkit.get("lastPlayed");
-                            long first = (long) bukkit.get("firstPlayed");
-                            if (Settings.UUID.OFFLINE) {
-                                if (Settings.UUID.FORCE_LOWERCASE && !name.toLowerCase()
-                                    .equals(name)) {
-                                    uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                                } else {
-                                    long most = (long) compound.get("UUIDMost");
-                                    long least = (long) compound.get("UUIDLeast");
-                                    uuid = new UUID(most, least);
-                                }
-                            }
-                            if (ExpireManager.IMP != null) {
-                                ExpireManager.IMP.storeDate(uuid, last);
-                                ExpireManager.IMP.storeAccountAge(uuid, last - first);
-                            }
-                            toAdd.put(wrap, uuid);
-                        }
-                    }
-                } catch (Exception ignored) {
-                    PlotSquared
-                        .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
-                }
-            }
-            for (String name : names) {
-                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                StringWrapper nameWrap = new StringWrapper(name);
-                toAdd.put(nameWrap, uuid);
-            }
-
-            if (getUUIDMap().isEmpty()) {
-                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper.getOfflinePlayers()) {
-                    long last = op.getLastPlayed();
-                    if (last != 0) {
-                        String name = op.getName();
-                        StringWrapper wrap = new StringWrapper(name);
-                        if (!toAdd.containsKey(wrap)) {
-                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
-                            toAdd.put(wrap, uuid);
-                            if (ExpireManager.IMP != null) {
-                                ExpireManager.IMP.storeDate(uuid, last);
-                            }
-                        }
-                    }
-                }
-            }
-            add(toAdd);
-            if (whenDone != null) {
-                whenDone.run();
-            }
         });
         return true;
     }
 
     @Override public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
-        TaskManager.runTaskAsync(() -> {
-            ifFetch.value = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-            TaskManager.runTask(ifFetch);
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                ifFetch.value = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                TaskManager.runTask(ifFetch);
+            }
         });
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index 0f3b4d5ea..c44fa6e72 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -16,11 +16,10 @@ import org.bukkit.entity.Player;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.UUID;
 
-public class OfflineUUIDWrapper implements UUIDWrapper {
+public class OfflineUUIDWrapper extends UUIDWrapper {
 
     private final Object[] arg = new Object[0];
     private Method getOnline = null;
@@ -60,15 +59,18 @@ public class OfflineUUIDWrapper implements UUIDWrapper {
                 return new BukkitOfflinePlayer(op);
             }
         }
-        return Arrays.stream(Bukkit.getOfflinePlayers())
-            .filter(player -> getUUID(player).equals(uuid)).findFirst()
-            .map(BukkitOfflinePlayer::new).orElse(null);
+        for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
+            if (getUUID(player).equals(uuid)) {
+                return new BukkitOfflinePlayer(player);
+            }
+        }
+        return null;
     }
 
     public Player[] getOnlinePlayers() {
         if (this.getOnline == null) {
             Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
-            return onlinePlayers.toArray(new Player[0]);
+            return onlinePlayers.toArray(new Player[onlinePlayers.size()]);
         }
         try {
             Object players = this.getOnline.invoke(Bukkit.getServer(), this.arg);
@@ -77,13 +79,13 @@ public class OfflineUUIDWrapper implements UUIDWrapper {
             } else {
                 @SuppressWarnings("unchecked") Collection<? extends Player> p =
                     (Collection<? extends Player>) players;
-                return p.toArray(new Player[0]);
+                return p.toArray(new Player[p.size()]);
             }
         } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {
             PlotSquared.debug("Failed to resolve online players");
             this.getOnline = null;
             Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
-            return onlinePlayers.toArray(new Player[0]);
+            return onlinePlayers.toArray(new Player[onlinePlayers.size()]);
         }
     }
 
@@ -93,7 +95,11 @@ public class OfflineUUIDWrapper implements UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        return Arrays.stream(ops).map(BukkitOfflinePlayer::new).toArray(BukkitOfflinePlayer[]::new);
+        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
+        for (int i = 0; i < ops.length; i++) {
+            toReturn[i] = new BukkitOfflinePlayer(ops[i]);
+        }
+        return toReturn;
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 234059e02..1c9a30bba 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -71,82 +71,96 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         if (!super.startCaching(whenDone)) {
             return false;
         }
-        TaskManager.runTaskAsync(() -> {
-            try {
-                HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<>());
-                try (PreparedStatement statement = getConnection()
-                    .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
-                    ResultSet resultSet = statement.executeQuery()) {
-                    while (resultSet.next()) {
-                        StringWrapper username = new StringWrapper(resultSet.getString("username"));
-                        UUID uuid = UUID.fromString(resultSet.getString("uuid"));
-                        toAdd.put(new StringWrapper(username.value), uuid);
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                try {
+                    HashBiMap<StringWrapper, UUID> toAdd =
+                        HashBiMap.create(new HashMap<StringWrapper, UUID>());
+                    try (PreparedStatement statement = getConnection()
+                        .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
+                        ResultSet resultSet = statement.executeQuery()) {
+                        while (resultSet.next()) {
+                            StringWrapper username =
+                                new StringWrapper(resultSet.getString("username"));
+                            UUID uuid = UUID.fromString(resultSet.getString("uuid"));
+                            toAdd.put(new StringWrapper(username.value), uuid);
+                        }
                     }
-                }
-                add(toAdd);
-                // This should be called as long as there are some unknown plots
-                final ArrayDeque<UUID> toFetch = new ArrayDeque<>();
-                for (UUID u : UUIDHandler.getAllUUIDS()) {
-                    if (!uuidExists(u)) {
-                        toFetch.add(u);
+                    add(toAdd);
+                    // This should be called as long as there are some unknown plots
+                    final ArrayDeque<UUID> toFetch = new ArrayDeque<>();
+                    for (UUID u : UUIDHandler.getAllUUIDS()) {
+                        if (!uuidExists(u)) {
+                            toFetch.add(u);
+                        }
                     }
-                }
-                if (toFetch.isEmpty()) {
-                    if (whenDone != null) {
-                        whenDone.run();
-                    }
-                    return;
-                }
-                FileUUIDHandler fileHandler = new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
-                fileHandler.startCaching(() -> {
-                    // If the file based UUID handler didn't cache it, then we can't cache offline mode
-                    // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
-                    if (Settings.UUID.OFFLINE) {
+                    if (toFetch.isEmpty()) {
                         if (whenDone != null) {
                             whenDone.run();
                         }
                         return;
                     }
+                    FileUUIDHandler fileHandler =
+                        new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
+                    fileHandler.startCaching(new Runnable() {
+                        @Override public void run() {
+                            // If the file based UUID handler didn't cache it, then we can't cache offline mode
+                            // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
+                            if (Settings.UUID.OFFLINE) {
+                                if (whenDone != null) {
+                                    whenDone.run();
+                                }
+                                return;
+                            }
 
-                    TaskManager.runTaskAsync(() -> {
-                        while (!toFetch.isEmpty()) {
-                            try {
-                                for (int i = 0; i < Math.min(500, toFetch.size()); i++) {
-                                    UUID uuid = toFetch.pop();
-                                    HttpURLConnection connection = (HttpURLConnection) new URL(
-                                        SQLUUIDHandler.this.PROFILE_URL + uuid.toString()
-                                            .replace("-", "")).openConnection();
-                                    try (InputStream con = connection.getInputStream()) {
-                                        InputStreamReader reader = new InputStreamReader(con);
-                                        JSONObject response =
-                                            (JSONObject) SQLUUIDHandler.this.jsonParser
-                                                .parse(reader);
-                                        String name = (String) response.get("name");
-                                        if (name != null) {
-                                            add(new StringWrapper(name), uuid);
+                            TaskManager.runTaskAsync(new Runnable() {
+                                @Override public void run() {
+                                    while (!toFetch.isEmpty()) {
+                                        try {
+                                            for (int i = 0;
+                                                 i < Math.min(500, toFetch.size()); i++) {
+                                                UUID uuid = toFetch.pop();
+                                                HttpURLConnection connection =
+                                                    (HttpURLConnection) new URL(
+                                                        SQLUUIDHandler.this.PROFILE_URL + uuid
+                                                            .toString().replace("-", ""))
+                                                        .openConnection();
+                                                try (InputStream con = connection
+                                                    .getInputStream()) {
+                                                    InputStreamReader reader =
+                                                        new InputStreamReader(con);
+                                                    JSONObject response =
+                                                        (JSONObject) SQLUUIDHandler.this.jsonParser
+                                                            .parse(reader);
+                                                    String name = (String) response.get("name");
+                                                    if (name != null) {
+                                                        add(new StringWrapper(name), uuid);
+                                                    }
+                                                }
+                                                connection.disconnect();
+                                            }
+                                        } catch (IOException | ParseException e) {
+                                            PlotSquared.debug(
+                                                "Invalid response from Mojang: Some UUIDs will be cached later. (`unknown` until then or player joins)");
+                                        }
+                                        try {
+                                            Thread.sleep(INTERVAL * 50);
+                                        } catch (InterruptedException e) {
+                                            e.printStackTrace();
+                                            break;
                                         }
                                     }
-                                    connection.disconnect();
+                                    if (whenDone != null) {
+                                        whenDone.run();
+                                    }
+                                    return;
                                 }
-                            } catch (IOException | ParseException e) {
-                                PlotSquared.debug(
-                                    "Invalid response from Mojang: Some UUIDs will be cached later. (`unknown` until then or player joins)");
-                            }
-                            try {
-                                Thread.sleep(INTERVAL * 50);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                                break;
-                            }
+                            });
                         }
-                        if (whenDone != null) {
-                            whenDone.run();
-                        }
-                        return;
                     });
-                });
-            } catch (SQLException e) {
-                throw new SQLUUIDHandlerException("Couldn't select :s", e);
+                } catch (SQLException e) {
+                    throw new SQLUUIDHandlerException("Couldn't select :s", e);
+                }
             }
         });
         return true;
@@ -158,32 +172,34 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         if (ifFetch == null) {
             return;
         }
-        TaskManager.runTaskAsync(() -> {
-            try {
-                URL url = new URL(SQLUUIDHandler.this.PROFILE_URL);
-                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                connection.setRequestMethod("POST");
-                connection.setRequestProperty("Content-Type", "application/json");
-                connection.setUseCaches(false);
-                connection.setDoInput(true);
-                connection.setDoOutput(true);
-                String body = JSONArray.toJSONString(Collections.singletonList(name));
-                OutputStream stream = connection.getOutputStream();
-                stream.write(body.getBytes());
-                stream.flush();
-                stream.close();
-                JSONArray array = (JSONArray) SQLUUIDHandler.this.jsonParser
-                    .parse(new InputStreamReader(connection.getInputStream()));
-                JSONObject jsonProfile = (JSONObject) array.get(0);
-                String id = (String) jsonProfile.get("id");
-                String name1 = (String) jsonProfile.get("name");
-                ifFetch.value = UUID.fromString(
-                    id.substring(0, 8) + '-' + id.substring(8, 12) + '-' + id.substring(12, 16)
-                        + '-' + id.substring(16, 20) + '-' + id.substring(20, 32));
-            } catch (IOException | ParseException e) {
-                e.printStackTrace();
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                try {
+                    URL url = new URL(SQLUUIDHandler.this.PROFILE_URL);
+                    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                    connection.setRequestMethod("POST");
+                    connection.setRequestProperty("Content-Type", "application/json");
+                    connection.setUseCaches(false);
+                    connection.setDoInput(true);
+                    connection.setDoOutput(true);
+                    String body = JSONArray.toJSONString(Collections.singletonList(name));
+                    OutputStream stream = connection.getOutputStream();
+                    stream.write(body.getBytes());
+                    stream.flush();
+                    stream.close();
+                    JSONArray array = (JSONArray) SQLUUIDHandler.this.jsonParser
+                        .parse(new InputStreamReader(connection.getInputStream()));
+                    JSONObject jsonProfile = (JSONObject) array.get(0);
+                    String id = (String) jsonProfile.get("id");
+                    String name = (String) jsonProfile.get("name");
+                    ifFetch.value = UUID.fromString(
+                        id.substring(0, 8) + '-' + id.substring(8, 12) + '-' + id.substring(12, 16)
+                            + '-' + id.substring(16, 20) + '-' + id.substring(20, 32));
+                } catch (IOException | ParseException e) {
+                    e.printStackTrace();
+                }
+                TaskManager.runTask(ifFetch);
             }
-            TaskManager.runTask(ifFetch);
         });
     }
 
@@ -199,15 +215,18 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
     @Override public boolean add(final StringWrapper name, final UUID uuid) {
         // Ignoring duplicates
         if (super.add(name, uuid)) {
-            TaskManager.runTaskAsync(() -> {
-                try (PreparedStatement statement = getConnection()
-                    .prepareStatement("REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
-                    statement.setString(1, uuid.toString());
-                    statement.setString(2, name.toString());
-                    statement.execute();
-                    PlotSquared.debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
-                } catch (SQLException e) {
-                    e.printStackTrace();
+            TaskManager.runTaskAsync(new Runnable() {
+                @Override public void run() {
+                    try (PreparedStatement statement = getConnection().prepareStatement(
+                        "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
+                        statement.setString(1, uuid.toString());
+                        statement.setString(2, name.toString());
+                        statement.execute();
+                        PlotSquared
+                            .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
                 }
             });
             return true;
@@ -220,16 +239,18 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
      */
     @Override public void rename(final UUID uuid, final StringWrapper name) {
         super.rename(uuid, name);
-        TaskManager.runTaskAsync(() -> {
-            try (PreparedStatement statement = getConnection()
-                .prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?")) {
-                statement.setString(1, name.value);
-                statement.setString(2, uuid.toString());
-                statement.execute();
-                PlotSquared
-                    .debug(C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
-            } catch (SQLException e) {
-                e.printStackTrace();
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                try (PreparedStatement statement = getConnection()
+                    .prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?")) {
+                    statement.setString(1, name.value);
+                    statement.setString(2, uuid.toString());
+                    statement.execute();
+                    PlotSquared.debug(
+                        C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
             }
         });
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
index 9d694c1ec..c2b4b4d95 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java
@@ -1,6 +1,5 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import javax.annotation.Nonnull;
 import java.util.Map;
 
 /**
@@ -21,7 +20,7 @@ public interface Configuration extends ConfigurationSection {
      * @param value Value to set the default to.
      * @throws IllegalArgumentException Thrown if path is null.
      */
-    @Override void addDefault(@Nonnull String path, Object value);
+    @Override void addDefault(String path, Object value);
 
     /**
      * Sets the default values of the given paths as provided.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
index f86016031..5d13920e4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java
@@ -31,7 +31,7 @@ class ConfigurationOptions {
      *
      * @return Path separator
      */
-    char pathSeparator() {
+    public char pathSeparator() {
         return pathSeparator;
     }
 
@@ -64,7 +64,7 @@ class ConfigurationOptions {
      *
      * @return Whether or not defaults are directly copied
      */
-    boolean copyDefaults() {
+    public boolean copyDefaults() {
         return copyDefaults;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
index 9e15a9030..0752dfb57 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java
@@ -1,6 +1,5 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import javax.annotation.Nonnull;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -53,7 +52,7 @@ public interface ConfigurationSection {
      * default or being set.
      * @throws IllegalArgumentException Thrown when path is {@code null}.
      */
-    boolean contains(@Nonnull String path);
+    boolean contains(String path);
 
     /**
      * Checks if this {@link ConfigurationSection} has a value set for the
@@ -67,7 +66,7 @@ public interface ConfigurationSection {
      * having a default.
      * @throws IllegalArgumentException Thrown when path is {@code null}.
      */
-    boolean isSet(@Nonnull String path);
+    boolean isSet(String path);
 
     /**
      * Gets the path of this {@link ConfigurationSection} from its root {@link
@@ -152,7 +151,7 @@ public interface ConfigurationSection {
      * @param defaultValue The default value to return if the path is not found.
      * @return Requested Object.
      */
-    Object getOrDefault(@Nonnull String path, Object defaultValue);
+    Object get(String path, Object defaultValue);
 
     /**
      * Sets the specified path to the given value.
@@ -645,5 +644,5 @@ public interface ConfigurationSection {
      * @param value Value to set the default to
      * @throws IllegalArgumentException Thrown if path is {@code null}
      */
-    void addDefault(@Nonnull String path, Object value);
+    void addDefault(String path, Object value);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
index d1677c54d..20131cbe1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java
@@ -1,6 +1,5 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import javax.annotation.Nonnull;
 import java.util.Map;
 
 /**
@@ -29,7 +28,7 @@ public class MemoryConfiguration extends MemorySection implements Configuration
         this.defaults = defaults;
     }
 
-    @Override public void addDefault(@Nonnull String path, Object value) {
+    @Override public void addDefault(String path, Object value) {
         if (this.defaults == null) {
             this.defaults = new MemoryConfiguration();
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
index 26f6760c8..0f87931f4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java
@@ -1,6 +1,5 @@
 package com.github.intellectualsites.plotsquared.configuration;
 
-import javax.annotation.Nonnull;
 import java.util.*;
 
 /**
@@ -15,12 +14,14 @@ public class MemorySection implements ConfigurationSection {
     private final String fullPath;
 
     /**
-     * Creates an empty MemorySection for use as a root {@link Configuration} section.
+     * Creates an empty MemorySection for use as a root {@link Configuration}
+     * section.
      *
      * <p>Note that calling this without being yourself a {@link Configuration}
      * will throw an exception!
      *
-     * @throws IllegalStateException Thrown if this is not a {@link Configuration} root.
+     * @throws IllegalStateException Thrown if this is not a {@link
+     *                               Configuration} root.
      */
     protected MemorySection() {
         if (!(this instanceof Configuration)) {
@@ -38,9 +39,10 @@ public class MemorySection implements ConfigurationSection {
      * Creates an empty MemorySection with the specified parent and path.
      *
      * @param parent Parent section that contains this own section.
-     * @param path   Path that you may access this section from via the root {@link Configuration}.
-     * @throws IllegalArgumentException Thrown is parent or path is null, or if parent contains no
-     *                                  root Configuration.
+     * @param path   Path that you may access this section from via the root
+     *               {@link Configuration}.
+     * @throws IllegalArgumentException Thrown is parent or path is null, or
+     *                                  if parent contains no root Configuration.
      */
     protected MemorySection(ConfigurationSection parent, String path) {
         this.path = path;
@@ -109,8 +111,8 @@ public class MemorySection implements ConfigurationSection {
     }
 
     /**
-     * Creates a full path to the given {@link ConfigurationSection} from its root {@link
-     * Configuration}.
+     * Creates a full path to the given {@link ConfigurationSection} from its
+     * root {@link Configuration}.
      *
      * <p>You may use this method for any given {@link ConfigurationSection}, not
      * only {@link MemorySection}.
@@ -124,8 +126,8 @@ public class MemorySection implements ConfigurationSection {
     }
 
     /**
-     * Creates a relative path to the given {@link ConfigurationSection} from the given relative
-     * section.
+     * Creates a relative path to the given {@link ConfigurationSection} from
+     * the given relative section.
      *
      * <p>You may use this method for any given {@link ConfigurationSection}, not
      * only {@link MemorySection}.
@@ -198,11 +200,11 @@ public class MemorySection implements ConfigurationSection {
         return result;
     }
 
-    @Override public boolean contains(@Nonnull String path) {
+    @Override public boolean contains(String path) {
         return get(path) != null;
     }
 
-    @Override public boolean isSet(@Nonnull String path) {
+    @Override public boolean isSet(String path) {
         Configuration root = getRoot();
         if (root == null) {
             return false;
@@ -210,7 +212,7 @@ public class MemorySection implements ConfigurationSection {
         if (root.options().copyDefaults()) {
             return contains(path);
         }
-        return getOrDefault(path, null) != null;
+        return get(path, null) != null;
     }
 
     @Override public String getCurrentPath() {
@@ -229,7 +231,7 @@ public class MemorySection implements ConfigurationSection {
         return this.parent;
     }
 
-    @Override public void addDefault(@Nonnull String path, Object value) {
+    @Override public void addDefault(String path, Object value) {
         Configuration root = getRoot();
         if (root == null) {
             throw new IllegalStateException("Cannot add default without root");
@@ -289,10 +291,14 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public Object get(String path) {
-        return getOrDefault(path, getDefault(path));
+        return get(path, getDefault(path));
     }
 
-    @Override public Object getOrDefault(@Nonnull String path, Object defaultValue) {
+    @Override public Object get(String path, Object defaultValue) {
+        if (path == null) {
+            throw new NullPointerException("Path cannot be null");
+        }
+
         if (path.isEmpty()) {
             return this;
         }
@@ -324,7 +330,7 @@ public class MemorySection implements ConfigurationSection {
                 return result;
             }
         }
-        return section.getOrDefault(key, defaultValue);
+        return section.get(key, defaultValue);
     }
 
     @Override public ConfigurationSection createSection(String path) {
@@ -379,7 +385,7 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public String getString(String path, String def) {
-        Object val = getOrDefault(path, def);
+        Object val = get(path, def);
         if (val != null) {
             return val.toString();
         } else {
@@ -398,7 +404,7 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public int getInt(String path, int def) {
-        Object val = getOrDefault(path, def);
+        Object val = get(path, def);
         return toInt(val, def);
     }
 
@@ -417,7 +423,7 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public boolean getBoolean(String path, boolean defaultValue) {
-        Object val = getOrDefault(path, defaultValue);
+        Object val = get(path, defaultValue);
         if (val instanceof Boolean) {
             return (Boolean) val;
         } else {
@@ -436,7 +442,7 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public double getDouble(String path, double defaultValue) {
-        Object val = getOrDefault(path, defaultValue);
+        Object val = get(path, defaultValue);
         return toDouble(val, defaultValue);
     }
 
@@ -451,7 +457,7 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public long getLong(String path, long def) {
-        Object val = getOrDefault(path, def);
+        Object val = get(path, def);
         return toLong(val, def);
     }
 
@@ -467,7 +473,7 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public List<?> getList(String path, List<?> def) {
-        Object val = getOrDefault(path, def);
+        Object val = get(path, def);
         return (List<?>) ((val instanceof List) ? val : def);
     }
 
@@ -688,12 +694,12 @@ public class MemorySection implements ConfigurationSection {
     }
 
     @Override public ConfigurationSection getConfigurationSection(String path) {
-        Object val = getOrDefault(path, null);
+        Object val = get(path, null);
         if (val != null) {
             return (val instanceof ConfigurationSection) ? (ConfigurationSection) val : null;
         }
 
-        val = getOrDefault(path, getDefault(path));
+        val = get(path, getDefault(path));
         return (val instanceof ConfigurationSection) ? createSection(path) : null;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
index bc0b375e9..668509bf3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
@@ -4,7 +4,6 @@ import com.github.intellectualsites.plotsquared.configuration.Configuration;
 import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
 import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration;
 
-import javax.annotation.Nonnull;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 
@@ -83,7 +82,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      *                                       a valid Configuration.
      * @throws IllegalArgumentException      Thrown when file is null.
      */
-    public void load(@Nonnull File file) throws IOException, InvalidConfigurationException {
+    public void load(File file) throws IOException, InvalidConfigurationException {
 
         FileInputStream stream = new FileInputStream(file);
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
index 1e694f05a..d8c41c3da 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java
@@ -83,7 +83,7 @@ public class YamlConfiguration extends FileConfiguration {
 
         Map<?, ?> input;
         try {
-            input = yaml.load(contents);
+            input = (Map<?, ?>) yaml.load(contents);
         } catch (YAMLException e) {
             throw new InvalidConfigurationException(e);
         } catch (ClassCastException ignored) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
index 730527652..a17bc3538 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java
@@ -42,7 +42,7 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
      *
      * @return How much to indent by
      */
-    int indent() {
+    public int indent() {
         return indent;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
index cdc5eb821..1f52f7abb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java
@@ -9,7 +9,7 @@ import org.yaml.snakeyaml.nodes.Tag;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-class YamlConstructor extends SafeConstructor {
+public class YamlConstructor extends SafeConstructor {
 
     YamlConstructor() {
         yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
index 2f6559a4e..e50ec9e8e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -76,9 +76,7 @@ public interface IPlotMain extends ILogger {
      *
      * @return
      */
-    default String getPluginName() {
-        return "PlotSquared";
-    }
+    String getPluginName();
 
     /**
      * Get the version of Minecraft that is running.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
index 9dfbf2ffb..b7eb33b83 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot;
 
 public enum Platform {
-    Bukkit, Sponge, Spigot
+    Bukkit, Sponge, Spigot, Cauldron
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 63bbf8142..1db55bf28 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -48,8 +48,8 @@ import java.util.zip.ZipInputStream;
  * An implementation of the core, with a static getter for easy access.
  */
 @SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
-
-    private static final Set<Plot> EMPTY_SET = Collections.unmodifiableSet(Collections.emptySet());
+    private static final Set<Plot> EMPTY_SET =
+        Collections.unmodifiableSet(Collections.<Plot>emptySet());
     private static PlotSquared instance;
     // Implementation
     public final IPlotMain IMP;
@@ -214,8 +214,11 @@ import java.util.zip.ZipInputStream;
             }
             // Economy
             if (Settings.Enabled_Components.ECONOMY) {
-                TaskManager
-                    .runTask(() -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
+                TaskManager.runTask(new Runnable() {
+                    @Override public void run() {
+                        EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler();
+                    }
+                });
             }
 
 /*            // Check for updates
@@ -244,20 +247,21 @@ import java.util.zip.ZipInputStream;
                         this.IMP.setGenerator(world);
                     }
                 }
-                TaskManager.runTaskLater(() -> {
-                    for (String world : section.getKeys(false)) {
-                        if (world.equals("CheckingPlotSquaredGenerator")) {
-                            continue;
-                        }
-                        if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
-                            debug(
-                                "&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
-                                    + " will now try to load it properly: ");
-                            debug(
-                                "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
-                            debug(
-                                "&8 - &7Your world management plugin may be faulty (or non existent)");
-                            PlotSquared.this.IMP.setGenerator(world);
+                TaskManager.runTaskLater(new Runnable() {
+                    @Override public void run() {
+                        for (String world : section.getKeys(false)) {
+                            if (world.equals("CheckingPlotSquaredGenerator")) {
+                                continue;
+                            }
+                            if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
+                                debug("&c`" + world + "` was not properly loaded - " + IMP
+                                    .getPluginName() + " will now try to load it properly: ");
+                                debug(
+                                    "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
+                                debug(
+                                    "&8 - &7Your world management plugin may be faulty (or non existent)");
+                                PlotSquared.this.IMP.setGenerator(world);
+                            }
                         }
                     }
                 }, 1);
@@ -338,21 +342,25 @@ import java.util.zip.ZipInputStream;
     }
 
     private void startUuidCatching() {
-        TaskManager.runTaskLater(() -> {
-            debug("Starting UUID caching");
-            UUIDHandler.startCaching(() -> {
-                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                foreachPlotRaw(new RunnableVal<Plot>() {
-                    @Override public void run(Plot plot) {
-                        if (plot.hasOwner() && plot.temp != -1) {
-                            if (UUIDHandler.getName(plot.owner) == null) {
-                                UUIDHandler.implementation.unknown.add(plot.owner);
+        TaskManager.runTaskLater(new Runnable() {
+            @Override public void run() {
+                debug("Starting UUID caching");
+                UUIDHandler.startCaching(new Runnable() {
+                    @Override public void run() {
+                        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+                        foreachPlotRaw(new RunnableVal<Plot>() {
+                            @Override public void run(Plot plot) {
+                                if (plot.hasOwner() && plot.temp != -1) {
+                                    if (UUIDHandler.getName(plot.owner) == null) {
+                                        UUIDHandler.implementation.unknown.add(plot.owner);
+                                    }
+                                }
                             }
-                        }
+                        });
+                        startExpiryTasks();
                     }
                 });
-                startExpiryTasks();
-            });
+            }
         }, 20);
     }
 
@@ -487,8 +495,11 @@ import java.util.zip.ZipInputStream;
         if (this.plots_tmp == null) {
             this.plots_tmp = new HashMap<>();
         }
-        HashMap<PlotId, Plot> map =
-            this.plots_tmp.computeIfAbsent(area.toString(), k -> new HashMap<>());
+        HashMap<PlotId, Plot> map = this.plots_tmp.get(area.toString());
+        if (map == null) {
+            map = new HashMap<>();
+            this.plots_tmp.put(area.toString(), map);
+        }
         for (Plot plot : area.getPlots()) {
             map.put(plot.getId(), plot);
         }
@@ -508,7 +519,8 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all the base plots in a single set (for merged plots it just returns the bottom plot).
+     * Get all the base plots in a single set (for merged plots it just returns
+     * the bottom plot).
      *
      * @return Set of base Plots
      */
@@ -555,7 +567,11 @@ import java.util.zip.ZipInputStream;
                 result.add(plot);
             }
         }
-        overflow.sort(Comparator.comparingInt(Plot::hashCode));
+        Collections.sort(overflow, new Comparator<Plot>() {
+            @Override public int compare(Plot a, Plot b) {
+                return a.hashCode() - b.hashCode();
+            }
+        });
         result.addAll(overflow);
         return result;
     }
@@ -564,11 +580,13 @@ import java.util.zip.ZipInputStream;
      * Sort plots by hashcode.
      *
      * @param plots the collection of plots to sort
-     * @return the sorted collection {@link #sortPlots(Collection, SortType, PlotArea)} which has
+     * @return the sorted collection
+     * @deprecated Unchecked, please use
+     * {@link #sortPlots(Collection, SortType, PlotArea)} which has
      * additional checks before calling this
      */
-    // TODO: Re-evaluate this (previously public and deprecated), as it's being used internally
-    private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
+    // TODO: Re-evaluate deprecation of this, as it's being used internally
+    @Deprecated public ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
         int hardmax = 256000;
         int max = 0;
         int overflowSize = 0;
@@ -609,11 +627,19 @@ import java.util.zip.ZipInputStream;
             }
         }
         Collections.addAll(result, overflowArray);
-        result.addAll(extra);
+        for (Plot plot : extra) {
+            result.add(plot);
+        }
         return result;
     }
 
-    private void sortPlotsByHash(Plot[] input) {
+    /**
+     * Unchecked, use {@link #sortPlots(Collection, SortType, PlotArea)} instead which will in turn call this.
+     *
+     * @param input an array of plots to sort
+     */
+    // TODO: Re-evaluate deprecation of this, as it's being used internally
+    @Deprecated public void sortPlotsByHash(Plot[] input) {
         List<Plot>[] bucket = new ArrayList[32];
         for (int i = 0; i < bucket.length; i++) {
             bucket[i] = new ArrayList<>();
@@ -640,7 +666,8 @@ import java.util.zip.ZipInputStream;
         }
     }
 
-    private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
+    // TODO: Re-evaluate deprecation of this, as it's being used internally
+    @Deprecated public ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
         int hardMax = 256000;
         int max = 0;
         int overflowSize = 0;
@@ -681,31 +708,48 @@ import java.util.zip.ZipInputStream;
             }
         }
         Collections.addAll(result, overflowArray);
-        result.addAll(extra);
+        for (Plot plot : extra) {
+            result.add(plot);
+        }
         return result;
     }
 
     /**
      * Sort plots by creation timestamp.
+     *
+     * @param input
+     * @return
+     * @deprecated Unchecked, use {@link #sortPlots(Collection, SortType, PlotArea)} instead which will call this after checks
      */
-
-    private List<Plot> sortPlotsByModified(Collection<Plot> input) {
+    // TODO: Re-evaluate deprecation of this, as it's being used internally
+    @Deprecated public List<Plot> sortPlotsByModified(Collection<Plot> input) {
         List<Plot> list;
         if (input instanceof List) {
             list = (List<Plot>) input;
         } else {
             list = new ArrayList<>(input);
         }
-        list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
+        Collections.sort(list, new Comparator<Plot>() {
+            @Override public int compare(Plot a, Plot b) {
+                return Long.compare(ExpireManager.IMP.getTimestamp(a.owner),
+                    ExpireManager.IMP.getTimestamp(b.owner));
+            }
+        });
         return list;
     }
 
+    public ArrayList<Plot> sortPlots(Collection<Plot> plots) {
+        return sortPlots(plots, SortType.DISTANCE_FROM_ORIGIN, null);
+    }
+
     /**
-     * Sort a collection of plots by world (with a priority world), then by hashcode.
+     * Sort a collection of plots by world (with a priority world), then
+     * by hashcode.
      *
      * @param plots        the plots to sort
      * @param type         The sorting method to use for each world (timestamp, or hash)
-     * @param priorityArea Use null, "world", or "gibberish" if you want default world order
+     * @param priorityArea Use null, "world", or "gibberish" if you
+     *                     want default world order
      * @return ArrayList of plot
      */
     public ArrayList<Plot> sortPlots(Collection<Plot> plots, SortType type,
@@ -720,7 +764,7 @@ import java.util.zip.ZipInputStream;
             }
         } else {
             for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                map.put(area, new ArrayList<>(0));
+                map.put(area, new ArrayList<Plot>(0));
             }
             Collection<Plot> lastList = null;
             PlotArea lastWorld = null;
@@ -735,15 +779,17 @@ import java.util.zip.ZipInputStream;
             }
         }
         List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
-        areas.sort((a, b) -> {
-            if (priorityArea != null) {
-                if (a.equals(priorityArea)) {
-                    return -1;
-                } else if (b.equals(priorityArea)) {
-                    return 1;
+        Collections.sort(areas, new Comparator<PlotArea>() {
+            @Override public int compare(PlotArea a, PlotArea b) {
+                if (priorityArea != null) {
+                    if (a.equals(priorityArea)) {
+                        return -1;
+                    } else if (b.equals(priorityArea)) {
+                        return 1;
+                    }
                 }
+                return a.hashCode() - b.hashCode();
             }
-            return a.hashCode() - b.hashCode();
         });
         ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
         for (PlotArea area : areas) {
@@ -768,7 +814,8 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * A more generic way to filter plots - make your own method if you need complex filters.
+     * A more generic way to filter plots - make your own method
+     * if you need complex filters.
      *
      * @param filters the filter
      * @return a filtered set of plots
@@ -813,29 +860,28 @@ import java.util.zip.ZipInputStream;
         return result;
     }
 
-    //TODO look at uncommenting or deleting tis. Is it useful and will it work?
-    //If it is readded make sure there is proper javadoc documentation for it.
-/*
-  public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
-    if (this.plots_tmp == null) {
-      this.plots_tmp = new HashMap<>();
-    }
-    for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
-      String world = entry.getKey();
-      PlotArea area = getPlotArea(world, null);
-      if (area == null) {
-        HashMap<PlotId, Plot> map = this.plots_tmp
-            .computeIfAbsent(world, k -> new HashMap<>());
-        map.putAll(entry.getValue());
-      } else {
-        for (Plot plot : entry.getValue().values()) {
-          plot.setArea(area);
-          area.addPlot(plot);
+    public void setPlots(HashMap<String, HashMap<PlotId, Plot>> plots) {
+        if (this.plots_tmp == null) {
+            this.plots_tmp = new HashMap<>();
+        }
+        for (Entry<String, HashMap<PlotId, Plot>> entry : plots.entrySet()) {
+            String world = entry.getKey();
+            PlotArea area = getPlotArea(world, null);
+            if (area == null) {
+                HashMap<PlotId, Plot> map = this.plots_tmp.get(world);
+                if (map == null) {
+                    map = new HashMap<>();
+                    this.plots_tmp.put(world, map);
+                }
+                map.putAll(entry.getValue());
+            } else {
+                for (Plot plot : entry.getValue().values()) {
+                    plot.setArea(area);
+                    area.addPlot(plot);
+                }
+            }
         }
-      }
     }
-  }
-*/
 
     /**
      * Get all the plots owned by a player name.
@@ -980,9 +1026,8 @@ import java.util.zip.ZipInputStream;
 
     public boolean hasPlot(final UUID uuid) {
         for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
-            if (area.hasPlot(uuid)) {
+            if (area.hasPlot(uuid))
                 return true;
-            }
         }
         return false;
     }
@@ -1142,8 +1187,9 @@ import java.util.zip.ZipInputStream;
                 PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
                 String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
                 if (type == 2) {
-                    Set<PlotCluster> clusters =
-                        this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<>();
+                    Set<PlotCluster> clusters = this.clusters_tmp != null ?
+                        this.clusters_tmp.get(world) :
+                        new HashSet<PlotCluster>();
                     if (clusters == null) {
                         throw new IllegalArgumentException("No cluster exists for world: " + world);
                     }
@@ -1552,8 +1598,8 @@ import java.util.zip.ZipInputStream;
             // Close the connection
             DBFunc.close();
             UUIDHandler.handleShutdown();
-        } catch (NullPointerException exception) {
-            exception.printStackTrace();
+        } catch (NullPointerException ignored) {
+            ignored.printStackTrace();
             PlotSquared.log("&cCould not close database connection!");
         }
     }
@@ -1579,11 +1625,6 @@ import java.util.zip.ZipInputStream;
                 return;
             }
             DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
-            PlotSquared.log("GETTING PLOTS NOW AND STORING TO PLOTS_TMP");
-            for (PlotArea allPlotArea : plotAreaManager.getAllPlotAreas()) {
-                PlotSquared.log(allPlotArea.toString());
-            }
-
             this.plots_tmp = DBFunc.getPlots();
             if (plotAreaManager instanceof SinglePlotAreaManager) {
                 SinglePlotArea area = ((SinglePlotAreaManager) plotAreaManager).getArea();
@@ -1656,16 +1697,18 @@ import java.util.zip.ZipInputStream;
             Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
                 .toHexString(version.hash);
             System.out.println("Version is " + this.version);
-        } catch (IOException exception) {
-            exception.printStackTrace();
+        } catch (Throwable ignore) {
+            ignore.printStackTrace();
         }
         Settings.save(configFile);
         config = YamlConfiguration.loadConfiguration(configFile);
     }
 
     /**
-     * Setup all configuration files<br> - Config: settings.yml<br> - Storage: storage.yml<br> -
-     * Translation: PlotSquared.use_THIS.yml, style.yml<br>
+     * Setup all configuration files<br>
+     * - Config: settings.yml<br>
+     * - Storage: storage.yml<br>
+     * - Translation: PlotSquared.use_THIS.yml, style.yml<br>
      */
     public boolean setupConfigs() {
         File folder = new File(this.IMP.getDirectory(), "config");
@@ -1916,6 +1959,7 @@ import java.util.zip.ZipInputStream;
      * Note: An applicable plot area may not include the location i.e. clusters
      *
      * @param location the location
+     * @return
      */
     public PlotArea getApplicablePlotArea(@NonNull final Location location) {
         return plotAreaManager.getApplicablePlotArea(location);
@@ -1972,72 +2016,7 @@ import java.util.zip.ZipInputStream;
      *
      * @param alias     to search plots
      * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{
-                       *       @       link
-                       *       <   p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * Plot
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * <p>
-     * }> empty if nothing found
+     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
      */
     public Set<Plot> getPlotsByAlias(@Nullable final String alias,
         @NonNull final String worldname) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
index ee7c1cb23..9dc5ce20e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -104,34 +104,36 @@ import java.util.Set;
                                 final String path =
                                     "worlds." + area.worldname + ".areas." + area.id + '-'
                                         + object.min + '-' + object.max;
-                                Runnable run = () -> {
-                                    if (offsetX != 0) {
-                                        PlotSquared.get().worlds
-                                            .set(path + ".road.offset.x", offsetX);
-                                    }
-                                    if (offsetZ != 0) {
-                                        PlotSquared.get().worlds
-                                            .set(path + ".road.offset.z", offsetZ);
-                                    }
-                                    final String world = SetupUtils.manager.setupWorld(object);
-                                    if (WorldUtil.IMP.isWorld(world)) {
-                                        PlotSquared.get().loadWorld(world, null);
-                                        C.SETUP_FINISHED.send(player);
-                                        player.teleport(WorldUtil.IMP.getSpawn(world));
-                                        if (area.TERRAIN != 3) {
-                                            ChunkManager.largeRegionTask(world, region,
-                                                new RunnableVal<ChunkLoc>() {
-                                                    @Override public void run(ChunkLoc value) {
-                                                        AugmentedUtils
-                                                            .generate(world, value.x, value.z,
-                                                                null);
-                                                    }
-                                                }, null);
+                                Runnable run = new Runnable() {
+                                    @Override public void run() {
+                                        if (offsetX != 0) {
+                                            PlotSquared.get().worlds
+                                                .set(path + ".road.offset.x", offsetX);
+                                        }
+                                        if (offsetZ != 0) {
+                                            PlotSquared.get().worlds
+                                                .set(path + ".road.offset.z", offsetZ);
+                                        }
+                                        final String world = SetupUtils.manager.setupWorld(object);
+                                        if (WorldUtil.IMP.isWorld(world)) {
+                                            PlotSquared.get().loadWorld(world, null);
+                                            C.SETUP_FINISHED.send(player);
+                                            player.teleport(WorldUtil.IMP.getSpawn(world));
+                                            if (area.TERRAIN != 3) {
+                                                ChunkManager.largeRegionTask(world, region,
+                                                    new RunnableVal<ChunkLoc>() {
+                                                        @Override public void run(ChunkLoc value) {
+                                                            AugmentedUtils
+                                                                .generate(world, value.x, value.z,
+                                                                    null);
+                                                        }
+                                                    }, null);
+                                            }
+                                        } else {
+                                            MainUtil.sendMessage(player,
+                                                "An error occurred while creating the world: "
+                                                    + area.worldname);
                                         }
-                                    } else {
-                                        MainUtil.sendMessage(player,
-                                            "An error occurred while creating the world: "
-                                                + area.worldname);
                                     }
                                 };
                                 if (hasConfirmation(player)) {
@@ -226,30 +228,32 @@ import java.util.Set;
                                 C.SETUP_WORLD_TAKEN.send(player, pa.worldname);
                                 return false;
                             }
-                            Runnable run = () -> {
-                                String path = "worlds." + pa.worldname;
-                                if (!PlotSquared.get().worlds.contains(path)) {
-                                    PlotSquared.get().worlds.createSection(path);
-                                }
-                                ConfigurationSection section =
-                                    PlotSquared.get().worlds.getConfigurationSection(path);
-                                pa.saveConfiguration(section);
-                                pa.loadConfiguration(section);
-                                object.plotManager = PlotSquared.imp().getPluginName();
-                                object.setupGenerator = PlotSquared.imp().getPluginName();
-                                String world = SetupUtils.manager.setupWorld(object);
-                                if (WorldUtil.IMP.isWorld(world)) {
-                                    C.SETUP_FINISHED.send(player);
-                                    player.teleport(WorldUtil.IMP.getSpawn(world));
-                                } else {
-                                    MainUtil.sendMessage(player,
-                                        "An error occurred while creating the world: "
-                                            + pa.worldname);
-                                }
-                                try {
-                                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-                                } catch (IOException e) {
-                                    e.printStackTrace();
+                            Runnable run = new Runnable() {
+                                @Override public void run() {
+                                    String path = "worlds." + pa.worldname;
+                                    if (!PlotSquared.get().worlds.contains(path)) {
+                                        PlotSquared.get().worlds.createSection(path);
+                                    }
+                                    ConfigurationSection section =
+                                        PlotSquared.get().worlds.getConfigurationSection(path);
+                                    pa.saveConfiguration(section);
+                                    pa.loadConfiguration(section);
+                                    object.plotManager = PlotSquared.imp().getPluginName();
+                                    object.setupGenerator = PlotSquared.imp().getPluginName();
+                                    String world = SetupUtils.manager.setupWorld(object);
+                                    if (WorldUtil.IMP.isWorld(world)) {
+                                        C.SETUP_FINISHED.send(player);
+                                        player.teleport(WorldUtil.IMP.getSpawn(world));
+                                    } else {
+                                        MainUtil.sendMessage(player,
+                                            "An error occurred while creating the world: "
+                                                + pa.worldname);
+                                    }
+                                    try {
+                                        PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+                                    } catch (IOException e) {
+                                        e.printStackTrace();
+                                    }
                                 }
                             };
                             if (hasConfirmation(player)) {
@@ -418,7 +422,11 @@ import java.util.Set;
                         @Override public void run(ChunkLoc value) {
                             AugmentedUtils.generate(area.worldname, value.x, value.z, null);
                         }
-                    }, () -> player.sendMessage("Regen complete"));
+                    }, new Runnable() {
+                        @Override public void run() {
+                            player.sendMessage("Regen complete");
+                        }
+                    });
                 return true;
             }
             case "goto":
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
index e49155b8d..88f102967 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
@@ -82,14 +82,22 @@ public class Claim extends SubCommand {
         if (plot.canClaim(player)) {
             plot.owner = player.getUUID();
             final String finalSchematic = schematic;
-            DBFunc.createPlotSafe(plot, () -> TaskManager.IMP.sync(new RunnableVal<Object>() {
-                @Override public void run(Object value) {
-                    plot.claim(player, true, finalSchematic, false);
-                    if (area.AUTO_MERGE) {
-                        plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
-                    }
+            DBFunc.createPlotSafe(plot, new Runnable() {
+                @Override public void run() {
+                    TaskManager.IMP.sync(new RunnableVal<Object>() {
+                        @Override public void run(Object value) {
+                            plot.claim(player, true, finalSchematic, false);
+                            if (area.AUTO_MERGE) {
+                                plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
+                            }
+                        }
+                    });
                 }
-            }), () -> sendMessage(player, C.PLOT_NOT_CLAIMED));
+            }, new Runnable() {
+                @Override public void run() {
+                    sendMessage(player, C.PLOT_NOT_CLAIMED);
+                }
+            });
             return true;
         } else {
             sendMessage(player, C.PLOT_NOT_CLAIMED);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index b4b24021f..9145d1b3d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -301,7 +301,6 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
@@ -347,7 +346,6 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
@@ -406,7 +404,6 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
@@ -442,6 +439,7 @@ import java.util.UUID;
                     PlotSquared.get().getPlots(player.getLocation().getWorld(), uuid))) {
                     PlotCluster current = plot.getCluster();
                     if (current != null && current.equals(cluster)) {
+                        player.getLocation().getWorld();
                         plot.unclaim();
                     }
                 }
@@ -463,7 +461,6 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
@@ -536,7 +533,6 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
@@ -584,7 +580,6 @@ import java.util.UUID;
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
                     C.NOT_IN_PLOT_WORLD.send(player);
-                    return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
index 44d0e5593..040fd97b8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
@@ -65,7 +65,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
                     sizes.add(size - 1);
                 }
                 // Sort plots by size (buckets?)]
-                //noinspection unchecked
                 ArrayList<Plot>[] buckets = new ArrayList[maxSize];
                 for (int i = 0; i < plots.size(); i++) {
                     Plot plot = plots.get(i);
@@ -127,11 +126,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
                             }
                             i++;
                             final AtomicBoolean result = new AtomicBoolean(false);
-                            result.set(origin.move(possible, () -> {
-                                if (result.get()) {
-                                    MainUtil.sendMessage(player,
-                                        "Moving: " + origin + " -> " + possible);
-                                    TaskManager.runTaskLater(task, 1);
+                            result.set(origin.move(possible, new Runnable() {
+                                @Override public void run() {
+                                    if (result.get()) {
+                                        MainUtil.sendMessage(player,
+                                            "Moving: " + origin + " -> " + possible);
+                                        TaskManager.runTaskLater(task, 1);
+                                    }
                                 }
                             }, false));
                             if (result.get()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
index e94850121..b760bc282 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -30,18 +30,25 @@ import java.util.Map.Entry;
 
     public static void insertPlots(final SQLManager manager, final List<Plot> plots,
         final PlotPlayer player) {
-        TaskManager.runTaskAsync(() -> {
-            try {
-                ArrayList<Plot> ps = new ArrayList<>(plots);
-                MainUtil.sendMessage(player, "&6Starting...");
-                manager.createPlotsAndData(ps, () -> {
-                    MainUtil.sendMessage(player, "&6Database conversion finished!");
-                    manager.close();
-                });
-            } catch (Exception e) {
-                MainUtil
-                    .sendMessage(player, "Failed to insert plot objects, see stacktrace for info");
-                e.printStackTrace();
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                try {
+                    ArrayList<Plot> ps = new ArrayList<>();
+                    for (Plot p : plots) {
+                        ps.add(p);
+                    }
+                    MainUtil.sendMessage(player, "&6Starting...");
+                    manager.createPlotsAndData(ps, new Runnable() {
+                        @Override public void run() {
+                            MainUtil.sendMessage(player, "&6Database conversion finished!");
+                            manager.close();
+                        }
+                    });
+                } catch (Exception e) {
+                    MainUtil.sendMessage(player,
+                        "Failed to insert plot objects, see stacktrace for info");
+                    e.printStackTrace();
+                }
             }
         });
     }
@@ -123,13 +130,20 @@ import java.util.Map.Entry;
                                 plots.add(plot);
                             }
                         } else {
-                            HashMap<PlotId, Plot> plotmap = PlotSquared.get().plots_tmp
-                                .computeIfAbsent(areaname, k -> new HashMap<>());
+                            HashMap<PlotId, Plot> plotmap =
+                                PlotSquared.get().plots_tmp.get(areaname);
+                            if (plotmap == null) {
+                                plotmap = new HashMap<>();
+                                PlotSquared.get().plots_tmp.put(areaname, plotmap);
+                            }
                             plotmap.putAll(entry.getValue());
                         }
                     }
-                    DBFunc.createPlotsAndData(plots,
-                        () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
+                    DBFunc.createPlotsAndData(plots, new Runnable() {
+                        @Override public void run() {
+                            MainUtil.sendMessage(player, "&6Database conversion finished!");
+                        }
+                    });
                     return true;
                 case "mysql":
                     if (args.length < 6) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
index ff697953c..f0ff64af1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -57,7 +57,9 @@ public class Help extends Command {
     public void displayHelp(PlotPlayer player, String cat, int page) {
         CommandCategory catEnum = null;
         if (cat != null) {
-            if (!StringMan.isEqualIgnoreCase(cat, "all")) {
+            if (StringMan.isEqualIgnoreCase(cat, "all")) {
+                catEnum = null;
+            } else {
                 for (CommandCategory c : CommandCategory.values()) {
                     if (StringMan.isEqualIgnoreCaseToAny(cat, c.name(), c.toString())) {
                         catEnum = c;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
index 908e35afc..5c7cfc0ac 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -165,8 +165,9 @@ import java.util.Optional;
                     inbox.clearInbox(plot);
                     Optional<ArrayList<PlotComment>> comments =
                         plot.getSettings().getComments(inbox.toString());
-                    comments
-                        .ifPresent(plotComments -> plot.getSettings().removeComments(plotComments));
+                    if (comments.isPresent()) {
+                        plot.getSettings().removeComments(comments.get());
+                    }
                     MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
                     return true;
                 default:
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
index 94152175e..a944be561 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
@@ -60,9 +60,9 @@ public class Merge extends SubCommand {
         }
         final PlotArea plotArea = plot.getArea();
         Expression<Double> priceExr =
-            plotArea.PRICES.getOrDefault("merge", Expression.constant(0d));
+            plotArea.PRICES.containsKey("merge") ? plotArea.PRICES.get("merge") : null;
         final int size = plot.getConnectedPlots().size();
-        final double price = priceExr.evaluate((double) size);
+        final double price = priceExr == null ? 0d : priceExr.evaluate((double) size);
         if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d
             && EconHandler.manager.getMoney(player) < price) {
             sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
index 8cd4d9e56..b8b38e298 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -108,7 +108,9 @@ import java.util.UUID;
             if (unknown && UUIDHandler.getName(plot.owner) != null) {
                 continue;
             }
-            toDelete.addAll(plot.getConnectedPlots());
+            for (Plot current : plot.getConnectedPlots()) {
+                toDelete.add(current);
+            }
         }
         if (PlotSquared.get().plots_tmp != null) {
             for (Entry<String, HashMap<PlotId, Plot>> entry : PlotSquared.get().plots_tmp
@@ -141,21 +143,23 @@ import java.util.UUID;
         }
         String cmd =
             "/plot purge " + StringMan.join(args, " ") + " (" + toDelete.size() + " plots)";
-        Runnable run = () -> {
-            PlotSquared.debug("Calculating plots to purge, please wait...");
-            HashSet<Integer> ids = new HashSet<>();
-            for (Plot plot : toDelete) {
-                if (plot.temp != Integer.MAX_VALUE) {
-                    ids.add(plot.temp);
-                    plot.getArea().removePlot(plot.getId());
-                    for (PlotPlayer pp : plot.getPlayersInPlot()) {
-                        PlotListener.plotEntry(pp, plot);
+        Runnable run = new Runnable() {
+            @Override public void run() {
+                PlotSquared.debug("Calculating plots to purge, please wait...");
+                HashSet<Integer> ids = new HashSet<>();
+                for (Plot plot : toDelete) {
+                    if (plot.temp != Integer.MAX_VALUE) {
+                        ids.add(plot.temp);
+                        plot.getArea().removePlot(plot.getId());
+                        for (PlotPlayer pp : plot.getPlayersInPlot()) {
+                            PlotListener.plotEntry(pp, plot);
+                        }
+                        plot.removeSign();
                     }
-                    plot.removeSign();
                 }
+                DBFunc.purgeIds(ids);
+                C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
             }
-            DBFunc.purgeIds(ids);
-            C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, cmd, run);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index d8103e5b8..7141df96e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -10,10 +10,8 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.UUID;
 
 @CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
     usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
@@ -24,23 +22,25 @@ import java.util.UUID;
             switch (args[0].toLowerCase()) {
                 case "next": {
                     ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getBasePlots());
-                    plots.sort((p1, p2) -> {
-                        double v1 = 0;
-                        if (!p1.getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                v1 -= 11 - entry.getValue().getAverageRating();
+                    Collections.sort(plots, new Comparator<Plot>() {
+                        @Override public int compare(Plot p1, Plot p2) {
+                            double v1 = 0;
+                            if (!p1.getRatings().isEmpty()) {
+                                for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
+                                    v1 -= 11 - entry.getValue().getAverageRating();
+                                }
                             }
-                        }
-                        double v2 = 0;
-                        if (!p2.getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                v2 -= 11 - entry.getValue().getAverageRating();
+                            double v2 = 0;
+                            if (!p2.getRatings().isEmpty()) {
+                                for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                                    v2 -= 11 - entry.getValue().getAverageRating();
+                                }
                             }
+                            if (v1 == v2) {
+                                return -0;
+                            }
+                            return v2 > v1 ? 1 : -1;
                         }
-                        if (v1 == v2) {
-                            return -0;
-                        }
-                        return v2 > v1 ? 1 : -1;
                     });
                     UUID uuid = player.getUUID();
                     for (Plot p : plots) {
@@ -123,7 +123,7 @@ import java.util.UUID;
                             return true;
                         }
                     };
-                    inventory.setItem(0, new PlotItemStack("minecraft:brown_wool", 0, "0/8"));
+                    inventory.setItem(0, new PlotItemStack(35, (short) 12, 0, "0/8"));
                     inventory.setItem(1, new PlotItemStack(35, (short) 14, 1, "1/8"));
                     inventory.setItem(2, new PlotItemStack(35, (short) 1, 2, "2/8"));
                     inventory.setItem(3, new PlotItemStack(35, (short) 4, 3, "3/8"));
@@ -137,9 +137,11 @@ import java.util.UUID;
             };
             if (plot.getSettings().ratings == null) {
                 if (!Settings.Enabled_Components.RATING_CACHE) {
-                    TaskManager.runTaskAsync(() -> {
-                        plot.getSettings().ratings = DBFunc.getRatings(plot);
-                        run.run();
+                    TaskManager.runTaskAsync(new Runnable() {
+                        @Override public void run() {
+                            plot.getSettings().ratings = DBFunc.getRatings(plot);
+                            run.run();
+                        }
                     });
                     return true;
                 }
@@ -165,22 +167,26 @@ import java.util.UUID;
             return false;
         }
         final UUID uuid = player.getUUID();
-        final Runnable run = () -> {
-            if (plot.getRatings().containsKey(uuid)) {
-                sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
-                return;
-            }
-            Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
-            if (result != null) {
-                plot.addRating(uuid, result);
-                sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
+        final Runnable run = new Runnable() {
+            @Override public void run() {
+                if (plot.getRatings().containsKey(uuid)) {
+                    sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                    return;
+                }
+                Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
+                if (result != null) {
+                    plot.addRating(uuid, result);
+                    sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
+                }
             }
         };
         if (plot.getSettings().ratings == null) {
             if (!Settings.Enabled_Components.RATING_CACHE) {
-                TaskManager.runTaskAsync(() -> {
-                    plot.getSettings().ratings = DBFunc.getRatings(plot);
-                    run.run();
+                TaskManager.runTaskAsync(new Runnable() {
+                    @Override public void run() {
+                        plot.getSettings().ratings = DBFunc.getRatings(plot);
+                        run.run();
+                    }
                 });
                 return true;
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
index e5341103d..a26d4d02e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -143,6 +143,14 @@ public interface AbstractDB {
      */
     void setFlags(Plot plot, HashMap<Flag<?>, Object> flags);
 
+    /**
+     * Set cluster flags.
+     *
+     * @param cluster PlotCluster Object
+     * @param flags   flags to set (flag[])
+     */
+    void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags);
+
     /**
      * Rename a cluster to the given name.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
index 1127a6ed2..5050c699f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
@@ -13,7 +13,7 @@ import java.util.*;
  * Database Functions
  * - These functions do not update the local plot objects and only make changes to the DB
  */
-@SuppressWarnings("deprecation") public class DBFunc {
+public class DBFunc {
     /**
      * The "global" uuid.
      */
@@ -298,6 +298,17 @@ import java.util.*;
         DBFunc.dbManager.setFlags(plot, flags);
     }
 
+    public static void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
+        if (dbManager == null) {
+            return;
+        }
+        DBFunc.dbManager.setFlags(cluster, flags);
+    }
+
+    /**
+     * @param plot
+     * @param alias
+     */
     public static void setAlias(Plot plot, String alias) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -319,6 +330,10 @@ import java.util.*;
         DBFunc.dbManager.purge(area, plotIds);
     }
 
+    /**
+     * @param plot
+     * @param position
+     */
     public static void setPosition(Plot plot, String position) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -326,6 +341,10 @@ import java.util.*;
         DBFunc.dbManager.setPosition(plot, position);
     }
 
+    /**
+     * @param plot
+     * @param comment
+     */
     public static void removeComment(Plot plot, PlotComment comment) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -340,6 +359,10 @@ import java.util.*;
         DBFunc.dbManager.clearInbox(plot, inbox);
     }
 
+    /**
+     * @param plot
+     * @param comment
+     */
     public static void setComment(Plot plot, PlotComment comment) {
         if (plot != null && plot.temp == -1 || dbManager == null) {
             return;
@@ -347,6 +370,9 @@ import java.util.*;
         DBFunc.dbManager.setComment(plot, comment);
     }
 
+    /**
+     * @param plot
+     */
     public static void getComments(Plot plot, String inbox,
         RunnableVal<List<PlotComment>> whenDone) {
         if (plot != null && plot.temp == -1 || dbManager == null) {
@@ -355,6 +381,10 @@ import java.util.*;
         DBFunc.dbManager.getComments(plot, inbox, whenDone);
     }
 
+    /**
+     * @param plot
+     * @param uuid
+     */
     public static void removeTrusted(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -362,6 +392,10 @@ import java.util.*;
         DBFunc.dbManager.removeTrusted(plot, uuid);
     }
 
+    /**
+     * @param cluster
+     * @param uuid
+     */
     public static void removeHelper(PlotCluster cluster, UUID uuid) {
         if (dbManager == null) {
             return;
@@ -369,6 +403,9 @@ import java.util.*;
         DBFunc.dbManager.removeHelper(cluster, uuid);
     }
 
+    /**
+     * @param cluster
+     */
     public static void createCluster(PlotCluster cluster) {
         if (dbManager == null) {
             return;
@@ -376,6 +413,11 @@ import java.util.*;
         DBFunc.dbManager.createCluster(cluster);
     }
 
+    /**
+     * @param current
+     * @param min
+     * @param max
+     */
     public static void resizeCluster(PlotCluster current, PlotId min, PlotId max) {
         if (dbManager == null) {
             return;
@@ -383,6 +425,10 @@ import java.util.*;
         DBFunc.dbManager.resizeCluster(current, min, max);
     }
 
+    /**
+     * @param plot
+     * @param uuid
+     */
     public static void removeMember(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -390,6 +436,10 @@ import java.util.*;
         DBFunc.dbManager.removeMember(plot, uuid);
     }
 
+    /**
+     * @param cluster
+     * @param uuid
+     */
     public static void removeInvited(PlotCluster cluster, UUID uuid) {
         if (dbManager == null) {
             return;
@@ -397,6 +447,10 @@ import java.util.*;
         DBFunc.dbManager.removeInvited(cluster, uuid);
     }
 
+    /**
+     * @param plot
+     * @param uuid
+     */
     public static void setTrusted(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -411,6 +465,10 @@ import java.util.*;
         DBFunc.dbManager.setHelper(cluster, uuid);
     }
 
+    /**
+     * @param plot
+     * @param uuid
+     */
     public static void setMember(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -425,6 +483,10 @@ import java.util.*;
         DBFunc.dbManager.setInvited(cluster, uuid);
     }
 
+    /**
+     * @param plot
+     * @param uuid
+     */
     public static void removeDenied(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
@@ -432,6 +494,10 @@ import java.util.*;
         DBFunc.dbManager.removeDenied(plot, uuid);
     }
 
+    /**
+     * @param plot
+     * @param uuid
+     */
     public static void setDenied(Plot plot, UUID uuid) {
         if (plot.temp == -1 || dbManager == null) {
             return;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
index 8626a1a24..4acecc01f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/Database.java
@@ -11,9 +11,9 @@ import java.sql.Statement;
  * @author -_Husky_-
  * @author tips48
  */
-public interface Database {
+public abstract class Database {
 
-    Connection forceConnection() throws SQLException, ClassNotFoundException;
+    public abstract Connection forceConnection() throws SQLException, ClassNotFoundException;
 
     /**
      * Opens a connection with the database.
@@ -22,7 +22,7 @@ public interface Database {
      * @throws SQLException           if the connection can not be opened
      * @throws ClassNotFoundException if the driver cannot be found
      */
-    Connection openConnection() throws SQLException, ClassNotFoundException;
+    public abstract Connection openConnection() throws SQLException, ClassNotFoundException;
 
     /**
      * Checks if a connection is open with the database.
@@ -30,14 +30,14 @@ public interface Database {
      * @return true if the connection is open
      * @throws SQLException if the connection cannot be checked
      */
-    boolean checkConnection() throws SQLException;
+    public abstract boolean checkConnection() throws SQLException;
 
     /**
      * Gets the connection with the database.
      *
      * @return Connection with the database, null if none
      */
-    Connection getConnection();
+    public abstract Connection getConnection();
 
     /**
      * Closes the connection with the database.
@@ -45,7 +45,7 @@ public interface Database {
      * @return true if successful
      * @throws SQLException if the connection cannot be closed
      */
-    boolean closeConnection() throws SQLException;
+    public abstract boolean closeConnection() throws SQLException;
 
     /**
      * Executes a SQL Query.
@@ -56,7 +56,7 @@ public interface Database {
      * @throws SQLException           If the query cannot be executed
      * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
      */
-    ResultSet querySQL(String query) throws SQLException, ClassNotFoundException;
+    public abstract ResultSet querySQL(String query) throws SQLException, ClassNotFoundException;
 
     /**
      * Executes an Update SQL Query.
@@ -68,5 +68,5 @@ public interface Database {
      * @throws SQLException           If the query cannot be executed
      * @throws ClassNotFoundException If the driver cannot be found; see {@link #openConnection()}
      */
-    int updateSQL(String query) throws SQLException, ClassNotFoundException;
+    public abstract int updateSQL(String query) throws SQLException, ClassNotFoundException;
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
index 4a0e655c5..7e7df9124 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
@@ -11,7 +11,7 @@ import java.sql.*;
  * @author -_Husky_-
  * @author tips48
  */
-public class MySQL implements Database {
+public class MySQL extends Database {
 
     private final String user;
     private final String database;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 3e197a16d..66a21174d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -14,7 +14,6 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.google.common.base.Charsets;
 
-import javax.annotation.Nonnull;
 import java.sql.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -49,7 +48,13 @@ import java.util.concurrent.atomic.AtomicInteger;
      */
     public volatile Queue<Runnable> notifyTasks;
     /**
-     * plot plot_denied plot_helpers plot_trusted plot_comments plot_settings plot_rating
+     * plot
+     * plot_denied
+     * plot_helpers
+     * plot_trusted
+     * plot_comments
+     * plot_settings
+     * plot_rating
      */
     public volatile ConcurrentHashMap<Plot, Queue<UniqueStatement>> plotTasks;
     /**
@@ -57,7 +62,10 @@ import java.util.concurrent.atomic.AtomicInteger;
      */
     public volatile ConcurrentHashMap<UUID, Queue<UniqueStatement>> playerTasks;
     /**
-     * cluster cluster_helpers cluster_invited cluster_settings
+     * cluster
+     * cluster_helpers
+     * cluster_invited
+     * cluster_settings
      */
     public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
     // Private
@@ -67,7 +75,10 @@ import java.util.concurrent.atomic.AtomicInteger;
     /**
      * Constructor
      *
-     * @param p prefix
+     * @param database
+     * @param p        prefix
+     * @throws SQLException
+     * @throws ClassNotFoundException
      */
     public SQLManager(final Database database, String p, boolean debug)
         throws SQLException, ClassNotFoundException {
@@ -110,40 +121,42 @@ import java.util.concurrent.atomic.AtomicInteger;
         } catch (SQLException e) {
             e.printStackTrace();
         }
-        TaskManager.runTaskAsync(() -> {
-            long last = System.currentTimeMillis();
-            while (true) {
-                if (SQLManager.this.closed) {
-                    break;
-                }
-                boolean hasTask =
-                    !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
-                        || !clusterTasks.isEmpty();
-                if (hasTask) {
-                    if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
-                        || !isValid()) {
-                        last = System.currentTimeMillis();
-                        reconnect();
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                long last = System.currentTimeMillis();
+                while (true) {
+                    if (SQLManager.this.closed) {
+                        break;
                     }
-                    if (!sendBatch()) {
-                        try {
-                            if (!getNotifyTasks().isEmpty()) {
-                                for (Runnable task : getNotifyTasks()) {
-                                    TaskManager.runTask(task);
+                    boolean hasTask =
+                        !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
+                            || !clusterTasks.isEmpty();
+                    if (hasTask) {
+                        if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
+                            || !isValid()) {
+                            last = System.currentTimeMillis();
+                            reconnect();
+                        }
+                        if (!sendBatch()) {
+                            try {
+                                if (!getNotifyTasks().isEmpty()) {
+                                    for (Runnable task : getNotifyTasks()) {
+                                        TaskManager.runTask(task);
+                                    }
+                                    getNotifyTasks().clear();
                                 }
-                                getNotifyTasks().clear();
+                                Thread.sleep(50);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
                             }
-                            Thread.sleep(50);
+                        }
+                    } else {
+                        try {
+                            Thread.sleep(1000);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
                     }
-                } else {
-                    try {
-                        Thread.sleep(1000);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
                 }
             }
         });
@@ -183,9 +196,15 @@ import java.util.concurrent.atomic.AtomicInteger;
         return this.notifyTasks;
     }
 
-    public synchronized void addPlotTask(@Nonnull Plot plot, UniqueStatement task) {
-        Queue<UniqueStatement> tasks =
-            this.plotTasks.computeIfAbsent(plot, plot1 -> new ConcurrentLinkedQueue<>());
+    public synchronized void addPlotTask(Plot plot, UniqueStatement task) {
+        if (plot == null) {
+            plot = new Plot(null, new PlotId(Integer.MAX_VALUE, Integer.MAX_VALUE));
+        }
+        Queue<UniqueStatement> tasks = this.plotTasks.get(plot);
+        if (tasks == null) {
+            tasks = new ConcurrentLinkedQueue<>();
+            this.plotTasks.put(plot, tasks);
+        }
         if (task == null) {
             task = new UniqueStatement(String.valueOf(plot.hashCode())) {
 
@@ -211,8 +230,11 @@ import java.util.concurrent.atomic.AtomicInteger;
         if (uuid == null) {
             return;
         }
-        Queue<UniqueStatement> tasks =
-            this.playerTasks.computeIfAbsent(uuid, uuid1 -> new ConcurrentLinkedQueue<>());
+        Queue<UniqueStatement> tasks = this.playerTasks.get(uuid);
+        if (tasks == null) {
+            tasks = new ConcurrentLinkedQueue<>();
+            this.playerTasks.put(uuid, tasks);
+        }
         if (task == null) {
             task = new UniqueStatement(String.valueOf(uuid.hashCode())) {
 
@@ -235,8 +257,11 @@ import java.util.concurrent.atomic.AtomicInteger;
     }
 
     public synchronized void addClusterTask(PlotCluster cluster, UniqueStatement task) {
-        Queue<UniqueStatement> tasks = this.clusterTasks
-            .computeIfAbsent(cluster, plotCluster -> new ConcurrentLinkedQueue<>());
+        Queue<UniqueStatement> tasks = this.clusterTasks.get(cluster);
+        if (tasks == null) {
+            tasks = new ConcurrentLinkedQueue<>();
+            this.clusterTasks.put(cluster, tasks);
+        }
         if (task == null) {
             task = new UniqueStatement(String.valueOf(cluster.hashCode())) {
 
@@ -490,74 +515,92 @@ import java.util.concurrent.atomic.AtomicInteger;
     }
 
     @Override public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
-        addGlobalTask(() -> {
-            try {
-                // Create the plots
-                createPlots(myList, () -> {
-                    try {
-                        // Creating datastructures
-                        HashMap<PlotId, Plot> plotMap = new HashMap<>();
-                        for (Plot plot : myList) {
-                            plotMap.put(plot.getId(), plot);
-                        }
-                        ArrayList<SettingsPair> settings = new ArrayList<>();
-                        final ArrayList<UUIDPair> helpers = new ArrayList<>();
-                        final ArrayList<UUIDPair> trusted = new ArrayList<>();
-                        final ArrayList<UUIDPair> denied = new ArrayList<>();
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                try {
+                    // Create the plots
+                    createPlots(myList, new Runnable() {
+                        @Override public void run() {
+                            try {
+                                // Creating datastructures
+                                HashMap<PlotId, Plot> plotMap = new HashMap<>();
+                                for (Plot plot : myList) {
+                                    plotMap.put(plot.getId(), plot);
+                                }
+                                ArrayList<SettingsPair> settings = new ArrayList<>();
+                                final ArrayList<UUIDPair> helpers = new ArrayList<>();
+                                final ArrayList<UUIDPair> trusted = new ArrayList<>();
+                                final ArrayList<UUIDPair> denied = new ArrayList<>();
 
-                        // Populating structures
-                        try (PreparedStatement stmt = SQLManager.this.connection
-                            .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
-                            ResultSet result = stmt.executeQuery()) {
-                            while (result.next()) {
-                                int id = result.getInt("id");
-                                int x = result.getInt("plot_id_x");
-                                int y = result.getInt("plot_id_z");
-                                PlotId plotId = new PlotId(x, y);
-                                Plot plot = plotMap.get(plotId);
-                                if (plot != null) {
-                                    settings.add(new SettingsPair(id, plot.getSettings()));
-                                    for (UUID uuid : plot.getDenied()) {
-                                        denied.add(new UUIDPair(id, uuid));
+                                // Populating structures
+                                try (PreparedStatement stmt = SQLManager.this.connection
+                                    .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
+                                    ResultSet result = stmt.executeQuery()) {
+                                    while (result.next()) {
+                                        int id = result.getInt("id");
+                                        int x = result.getInt("plot_id_x");
+                                        int y = result.getInt("plot_id_z");
+                                        PlotId plotId = new PlotId(x, y);
+                                        Plot plot = plotMap.get(plotId);
+                                        if (plot != null) {
+                                            settings.add(new SettingsPair(id, plot.getSettings()));
+                                            for (UUID uuid : plot.getDenied()) {
+                                                denied.add(new UUIDPair(id, uuid));
+                                            }
+                                            for (UUID uuid : plot.getMembers()) {
+                                                trusted.add(new UUIDPair(id, uuid));
+                                            }
+                                            for (UUID uuid : plot.getTrusted()) {
+                                                helpers.add(new UUIDPair(id, uuid));
+                                            }
+                                        }
                                     }
-                                    for (UUID uuid : plot.getMembers()) {
-                                        trusted.add(new UUIDPair(id, uuid));
-                                    }
-                                    for (UUID uuid : plot.getTrusted()) {
-                                        helpers.add(new UUIDPair(id, uuid));
+                                }
+                                createSettings(settings, new Runnable() {
+                                    @Override public void run() {
+                                        createTiers(helpers, "helpers", new Runnable() {
+                                            @Override public void run() {
+                                                createTiers(trusted, "trusted", new Runnable() {
+                                                    @Override public void run() {
+                                                        createTiers(denied, "denied",
+                                                            new Runnable() {
+                                                                @Override public void run() {
+                                                                    try {
+                                                                        SQLManager.this.connection
+                                                                            .commit();
+                                                                    } catch (SQLException e) {
+                                                                        e.printStackTrace();
+                                                                    }
+                                                                    if (whenDone != null) {
+                                                                        whenDone.run();
+                                                                    }
+                                                                }
+                                                            });
+                                                    }
+                                                });
+                                            }
+                                        });
                                     }
+                                });
+                            } catch (SQLException e) {
+                                e.printStackTrace();
+                                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                                try {
+                                    SQLManager.this.connection.commit();
+                                } catch (SQLException e1) {
+                                    e1.printStackTrace();
                                 }
                             }
                         }
-                        createSettings(settings, () -> createTiers(helpers, "helpers",
-                            () -> createTiers(trusted, "trusted",
-                                () -> createTiers(denied, "denied", () -> {
-                                    try {
-                                        SQLManager.this.connection.commit();
-                                    } catch (SQLException e) {
-                                        e.printStackTrace();
-                                    }
-                                    if (whenDone != null) {
-                                        whenDone.run();
-                                    }
-                                }))));
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                        try {
-                            SQLManager.this.connection.commit();
-                        } catch (SQLException e1) {
-                            e1.printStackTrace();
-                        }
+                    });
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                    try {
+                        SQLManager.this.connection.commit();
+                    } catch (SQLException e1) {
+                        e1.printStackTrace();
                     }
-                });
-            } catch (Exception e) {
-                e.printStackTrace();
-                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                try {
-                    SQLManager.this.connection.commit();
-                } catch (SQLException e1) {
-                    e1.printStackTrace();
                 }
             }
         });
@@ -886,7 +929,11 @@ import java.util.concurrent.atomic.AtomicInteger;
                 stmt.setInt(1, pair.id);
             }
         };
-        addGlobalTask(() -> setBulk(myList, mod, whenDone));
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                setBulk(myList, mod, whenDone);
+            }
+        });
     }
 
     public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
@@ -930,7 +977,11 @@ import java.util.concurrent.atomic.AtomicInteger;
                 stmt.setInt(1, id);
             }
         };
-        addGlobalTask(() -> setBulk(myList, mod, whenDone));
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                setBulk(myList, mod, whenDone);
+            }
+        });
     }
 
     public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
@@ -975,16 +1026,14 @@ import java.util.concurrent.atomic.AtomicInteger;
                                             + "plot_settings`(`plot_plot_id`) VALUES(?)");
                                 }
                             });
-                            if (success != null) {
+                            if (success != null)
                                 addNotifyTask(success);
-                            }
                             return;
                         }
                     }
                 }
-                if (failure != null) {
+                if (failure != null)
                     failure.run();
-                }
             }
         });
     }
@@ -1046,6 +1095,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     /**
      * Create tables.
+     *
+     * @throws SQLException
      */
     @Override public void createTables() throws SQLException {
         String[] tables =
@@ -1294,6 +1345,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     /**
      * Delete a plot.
+     *
+     * @param plot
      */
     @Override public void delete(final Plot plot) {
         PlotSquared.debug(
@@ -1319,6 +1372,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     /**
      * Create plot settings
+     *
+     * @param id
+     * @param plot
      */
     @Override public void createPlotSettings(final int id, Plot plot) {
         PlotSquared.debug(
@@ -1554,12 +1610,12 @@ import java.util.concurrent.atomic.AtomicInteger;
                         ConfigurationSection areaSection =
                             worldSection.getConfigurationSection(worldKey + ".areas");
                         if (areaSection != null) {
-                            areaSection.getKeys(false).forEach(s -> {
-                                String[] split = s.split("(?<![;])-");
+                            for (String areaKey : areaSection.getKeys(false)) {
+                                String[] split = areaKey.split("(?<![;])-");
                                 if (split.length == 3) {
                                     areas.add(worldKey + ';' + split[0]);
                                 }
-                            });
+                            }
                         }
                     }
                 }
@@ -1572,7 +1628,7 @@ import java.util.concurrent.atomic.AtomicInteger;
              */
             try (Statement statement = this.connection.createStatement()) {
                 int id;
-                String owner;
+                String o;
                 UUID user;
                 try (ResultSet resultSet = statement.executeQuery(
                     "SELECT `id`, `plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp` FROM `"
@@ -1596,21 +1652,23 @@ import java.util.concurrent.atomic.AtomicInteger;
                                 }
                             }
                         }
-                        owner = resultSet.getString("owner");
-                        user = uuids.computeIfAbsent(owner, s -> {
+                        o = resultSet.getString("owner");
+                        user = uuids.get(o);
+                        if (user == null) {
                             try {
-                                return UUID.fromString(s);
-                            } catch (IllegalArgumentException ignored) {
+                                user = UUID.fromString(o);
+                            } catch (IllegalArgumentException e) {
                                 if (Settings.UUID.FORCE_LOWERCASE) {
-                                    return UUID.nameUUIDFromBytes(
-                                        ("OfflinePlayer:" + s.toLowerCase())
+                                    user = UUID.nameUUIDFromBytes(
+                                        ("OfflinePlayer:" + o.toLowerCase())
                                             .getBytes(Charsets.UTF_8));
                                 } else {
-                                    return UUID.nameUUIDFromBytes(
-                                        ("OfflinePlayer:" + s).getBytes(Charsets.UTF_8));
+                                    user = UUID.nameUUIDFromBytes(
+                                        ("OfflinePlayer:" + o).getBytes(Charsets.UTF_8));
                                 }
                             }
-                        });
+                            uuids.put(o, user);
+                        }
                         long time;
                         try {
                             Timestamp timestamp = resultSet.getTimestamp("timestamp");
@@ -1627,12 +1685,12 @@ import java.util.concurrent.atomic.AtomicInteger;
                                 time = System.currentTimeMillis() + id;
                             }
                         }
-                        Plot plot = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
-                            new HashSet<>(), "", null, null, null,
+                        Plot p = new Plot(plot_id, user, new HashSet<UUID>(), new HashSet<UUID>(),
+                            new HashSet<UUID>(), "", null, null, null,
                             new boolean[] {false, false, false, false}, time, id);
                         HashMap<PlotId, Plot> map = newPlots.get(areaid);
                         if (map != null) {
-                            Plot last = map.put(plot.getId(), plot);
+                            Plot last = map.put(p.getId(), p);
                             if (last != null) {
                                 if (Settings.Enabled_Components.DATABASE_PURGER) {
                                     toDelete.add(last.temp);
@@ -1645,9 +1703,9 @@ import java.util.concurrent.atomic.AtomicInteger;
                         } else {
                             map = new HashMap<>();
                             newPlots.put(areaid, map);
-                            map.put(plot.getId(), plot);
+                            map.put(p.getId(), p);
                         }
-                        plots.put(id, plot);
+                        plots.put(id, p);
                     }
                     deleteRows(toDelete, this.prefix + "plot", "id");
                 }
@@ -1658,8 +1716,12 @@ import java.util.concurrent.atomic.AtomicInteger;
                         ArrayList<Integer> toDelete = new ArrayList<>();
                         while (r.next()) {
                             id = r.getInt("plot_plot_id");
-                            owner = r.getString("player");
-                            user = uuids.computeIfAbsent(owner, UUID::fromString);
+                            o = r.getString("player");
+                            user = uuids.get(o);
+                            if (user == null) {
+                                user = UUID.fromString(o);
+                                uuids.put(o, user);
+                            }
                             Plot plot = plots.get(id);
                             if (plot != null) {
                                 plot.getSettings().getRatings().put(user, r.getInt("rating"));
@@ -1683,8 +1745,12 @@ import java.util.concurrent.atomic.AtomicInteger;
                     ArrayList<Integer> toDelete = new ArrayList<>();
                     while (r.next()) {
                         id = r.getInt("plot_plot_id");
-                        owner = r.getString("user_uuid");
-                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        o = r.getString("user_uuid");
+                        user = uuids.get(o);
+                        if (user == null) {
+                            user = UUID.fromString(o);
+                            uuids.put(o, user);
+                        }
                         Plot plot = plots.get(id);
                         if (plot != null) {
                             plot.getTrusted().add(user);
@@ -1707,8 +1773,12 @@ import java.util.concurrent.atomic.AtomicInteger;
                     ArrayList<Integer> toDelete = new ArrayList<>();
                     while (r.next()) {
                         id = r.getInt("plot_plot_id");
-                        owner = r.getString("user_uuid");
-                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        o = r.getString("user_uuid");
+                        user = uuids.get(o);
+                        if (user == null) {
+                            user = UUID.fromString(o);
+                            uuids.put(o, user);
+                        }
                         Plot plot = plots.get(id);
                         if (plot != null) {
                             plot.getMembers().add(user);
@@ -1731,8 +1801,12 @@ import java.util.concurrent.atomic.AtomicInteger;
                     ArrayList<Integer> toDelete = new ArrayList<>();
                     while (r.next()) {
                         id = r.getInt("plot_plot_id");
-                        owner = r.getString("user_uuid");
-                        user = uuids.computeIfAbsent(owner, UUID::fromString);
+                        o = r.getString("user_uuid");
+                        user = uuids.get(o);
+                        if (user == null) {
+                            user = UUID.fromString(o);
+                            uuids.put(o, user);
+                        }
                         Plot plot = plots.get(id);
                         if (plot != null) {
                             plot.getDenied().add(user);
@@ -1771,7 +1845,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                                     } catch (Exception ignored) {
                                     }
                             }
-                            int m = resultSet.getInt("merged");
+                            Integer m = resultSet.getInt("merged");
                             boolean[] merged = new boolean[4];
                             for (int i = 0; i < 4; i++) {
                                 merged[3 - i] = (m & 1 << i) != 0;
@@ -1962,98 +2036,103 @@ import java.util.concurrent.atomic.AtomicInteger;
      * Purge all plots with the following database IDs
      */
     @Override public void purgeIds(final Set<Integer> uniqueIds) {
-        addGlobalTask(() -> {
-            if (!uniqueIds.isEmpty()) {
-                try {
-                    ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
-                    String stmt_prefix = "";
-                    int size = uniqueIdsList.size();
-                    int packet = 990;
-                    int amount = size / packet;
-                    int count = 0;
-                    int last = -1;
-                    for (int j = 0; j <= amount; j++) {
-                        PlotSquared.debug("Purging " + (j * packet) + " / " + size);
-                        List<Integer> subList =
-                            uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
-                        if (subList.isEmpty()) {
-                            break;
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                if (!uniqueIds.isEmpty()) {
+                    try {
+                        ArrayList<Integer> uniqueIdsList = new ArrayList<Integer>(uniqueIds);
+                        String stmt_prefix = "";
+                        int size = uniqueIdsList.size();
+                        int packet = 990;
+                        int amount = size / packet;
+                        int count = 0;
+                        int last = -1;
+                        for (int j = 0; j <= amount; j++) {
+                            PlotSquared.debug("Purging " + (j * packet) + " / " + size);
+                            List<Integer> subList =
+                                uniqueIdsList.subList(j * packet, Math.min(size, (j + 1) * packet));
+                            if (subList.isEmpty()) {
+                                break;
+                            }
+                            StringBuilder idstr2 = new StringBuilder("");
+                            stmt_prefix = "";
+                            for (Integer id : subList) {
+                                idstr2.append(stmt_prefix).append(id);
+                                stmt_prefix = " OR `id` = ";
+                            }
+                            stmt_prefix = "";
+                            StringBuilder idstr = new StringBuilder();
+                            for (Integer id : subList) {
+                                idstr.append(stmt_prefix).append(id);
+                                stmt_prefix = " OR `plot_plot_id` = ";
+                            }
+                            PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                                "DELETE FROM `" + SQLManager.this.prefix
+                                    + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
+                            stmt.executeUpdate();
+                            stmt.close();
+                            stmt = SQLManager.this.connection.prepareStatement(
+                                "DELETE FROM `" + SQLManager.this.prefix
+                                    + "plot_denied` WHERE `plot_plot_id` = " + idstr);
+                            stmt.executeUpdate();
+                            stmt.close();
+                            stmt = SQLManager.this.connection.prepareStatement(
+                                "DELETE FROM `" + SQLManager.this.prefix
+                                    + "plot_settings` WHERE `plot_plot_id` = " + idstr);
+                            stmt.executeUpdate();
+                            stmt.close();
+                            stmt = SQLManager.this.connection.prepareStatement(
+                                "DELETE FROM `" + SQLManager.this.prefix
+                                    + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
+                            stmt.executeUpdate();
+                            stmt.close();
+                            stmt = SQLManager.this.connection.prepareStatement(
+                                "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
+                                    + idstr2);
+                            stmt.executeUpdate();
+                            stmt.close();
+                            commit();
                         }
-                        StringBuilder idstr2 = new StringBuilder();
-                        stmt_prefix = "";
-                        for (Integer id : subList) {
-                            idstr2.append(stmt_prefix).append(id);
-                            stmt_prefix = " OR `id` = ";
-                        }
-                        stmt_prefix = "";
-                        StringBuilder idstr = new StringBuilder();
-                        for (Integer id : subList) {
-                            idstr.append(stmt_prefix).append(id);
-                            stmt_prefix = " OR `plot_plot_id` = ";
-                        }
-                        PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_helpers` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_denied` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_settings` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix
-                                + "plot_trusted` WHERE `plot_plot_id` = " + idstr);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        stmt = SQLManager.this.connection.prepareStatement(
-                            "DELETE FROM `" + SQLManager.this.prefix + "plot` WHERE `id` = "
-                                + idstr2);
-                        stmt.executeUpdate();
-                        stmt.close();
-                        commit();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                        PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
+                        return;
                     }
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE PLOTS!");
-                    return;
                 }
+                PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
             }
-            PlotSquared.debug("&6[INFO] SUCCESSFULLY PURGED " + uniqueIds.size() + " PLOTS!");
         });
     }
 
     @Override public void purge(final PlotArea area, final Set<PlotId> plots) {
-        addGlobalTask(() -> {
-            try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
-                    + "plot` WHERE `world` = ?")) {
-                stmt.setString(1, area.toString());
-                Set<Integer> ids;
-                try (ResultSet r = stmt.executeQuery()) {
-                    ids = new HashSet<>();
-                    while (r.next()) {
-                        PlotId plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-                        if (plots.contains(plot_id)) {
-                            ids.add(r.getInt("id"));
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
+                        + "plot` WHERE `world` = ?")) {
+                    stmt.setString(1, area.toString());
+                    Set<Integer> ids;
+                    try (ResultSet r = stmt.executeQuery()) {
+                        ids = new HashSet<>();
+                        while (r.next()) {
+                            PlotId plot_id =
+                                new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                            if (plots.contains(plot_id)) {
+                                ids.add(r.getInt("id"));
+                            }
                         }
                     }
+                    purgeIds(ids);
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
+                }
+                for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
+                    PlotId plotId = iterator.next();
+                    iterator.remove();
+                    PlotId id = new PlotId(plotId.x, plotId.y);
+                    area.removePlot(id);
                 }
-                purgeIds(ids);
-            } catch (SQLException e) {
-                e.printStackTrace();
-                PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
-            }
-            for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
-                PlotId plotId = iterator.next();
-                iterator.remove();
-                PlotId id = new PlotId(plotId.x, plotId.y);
-                area.removePlot(id);
             }
         });
     }
@@ -2444,7 +2523,11 @@ import java.util.concurrent.atomic.AtomicInteger;
                 }
 
                 resultSet.close();
-                TaskManager.runTaskAsync(() -> result.run(metaMap));
+                TaskManager.runTaskAsync(new Runnable() {
+                    @Override public void run() {
+                        result.run(metaMap);
+                    }
+                });
             }
 
         });
@@ -2501,11 +2584,18 @@ import java.util.concurrent.atomic.AtomicInteger;
                         }
                     }
                     owner = resultSet.getString("owner");
-                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    user = uuids.get(owner);
+                    if (user == null) {
+                        user = UUID.fromString(owner);
+                        uuids.put(owner, user);
+                    }
                     cluster = new PlotCluster(null, pos1, pos2, user, id);
                     clusters.put(id, cluster);
-                    Set<PlotCluster> set =
-                        newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
+                    Set<PlotCluster> set = newClusters.get(areaid);
+                    if (set == null) {
+                        set = new HashSet<>();
+                        newClusters.put(areaid, set);
+                    }
                     set.add(cluster);
                 }
                 //Getting helpers
@@ -2514,7 +2604,11 @@ import java.util.concurrent.atomic.AtomicInteger;
                 while (resultSet.next()) {
                     id = resultSet.getInt("cluster_id");
                     owner = resultSet.getString("user_uuid");
-                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    user = uuids.get(owner);
+                    if (user == null) {
+                        user = UUID.fromString(owner);
+                        uuids.put(owner, user);
+                    }
                     cluster = clusters.get(id);
                     if (cluster != null) {
                         cluster.helpers.add(user);
@@ -2529,7 +2623,11 @@ import java.util.concurrent.atomic.AtomicInteger;
                 while (resultSet.next()) {
                     id = resultSet.getInt("cluster_id");
                     owner = resultSet.getString("user_uuid");
-                    user = uuids.computeIfAbsent(owner, UUID::fromString);
+                    user = uuids.get(owner);
+                    if (user == null) {
+                        user = UUID.fromString(owner);
+                        uuids.put(owner, user);
+                    }
                     cluster = clusters.get(id);
                     if (cluster != null) {
                         cluster.invited.add(user);
@@ -2562,7 +2660,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                                 } catch (Exception ignored) {
                                 }
                         }
-                        int m = resultSet.getInt("merged");
+                        Integer m = resultSet.getInt("merged");
                         boolean[] merged = new boolean[4];
                         for (int i = 0; i < 4; i++) {
                             merged[3 - i] = (m & 1 << i) != 0;
@@ -2628,6 +2726,32 @@ import java.util.concurrent.atomic.AtomicInteger;
         return newClusters;
     }
 
+    @Override public void setFlags(final PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
+        final StringBuilder flag_string = new StringBuilder();
+        int i = 0;
+        for (Entry<Flag<?>, Object> flag : flags.entrySet()) {
+            if (i != 0) {
+                flag_string.append(',');
+            }
+            flag_string.append(flag.getKey().getName()).append(':').append(
+                flag.getKey().valueToString(flag.getValue()).replaceAll(":", "\u00AF")
+                    .replaceAll(",", "´"));
+            i++;
+        }
+        addClusterTask(cluster, new UniqueStatement("setFlags") {
+            @Override public void set(PreparedStatement stmt) throws SQLException {
+                stmt.setString(1, flag_string.toString());
+                stmt.setInt(2, getClusterId(cluster));
+            }
+
+            @Override public PreparedStatement get() throws SQLException {
+                return SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster_settings` SET `flags` = ? WHERE `cluster_id` = ?");
+            }
+        });
+    }
+
     @Override public void setClusterName(final PlotCluster cluster, final String name) {
         addClusterTask(cluster, new UniqueStatement("setClusterName") {
             @Override public void set(PreparedStatement stmt) throws SQLException {
@@ -2706,7 +2830,7 @@ import java.util.concurrent.atomic.AtomicInteger;
             new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
                 @Override public void set(PreparedStatement stmt) throws SQLException {
                     stmt.setInt(1, getClusterId(cluster));
-                    stmt.setString(2, cluster.getAlias());
+                    stmt.setString(2, cluster.settings.getAlias());
                 }
 
                 @Override public PreparedStatement get() throws SQLException {
@@ -2945,83 +3069,87 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override
     public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
         final PlotId max) {
-        addGlobalTask(() -> {
-            if (min == null) {
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `world` = ? WHERE `world` = ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster` SET `world` = ? WHERE `world` = ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            } else {
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.setInt(3, min.x);
-                    stmt.setInt(4, max.x);
-                    stmt.setInt(5, min.y);
-                    stmt.setInt(6, max.y);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
-                    stmt.setString(1, newWorld);
-                    stmt.setString(2, oldWorld);
-                    stmt.setInt(3, max.x);
-                    stmt.setInt(4, max.y);
-                    stmt.setInt(5, min.x);
-                    stmt.setInt(6, min.y);
-                    stmt.executeUpdate();
-                } catch (SQLException e) {
-                    e.printStackTrace();
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                if (min == null) {
+                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                        "UPDATE `" + SQLManager.this.prefix
+                            + "plot` SET `world` = ? WHERE `world` = ?")) {
+                        stmt.setString(1, newWorld);
+                        stmt.setString(2, oldWorld);
+                        stmt.executeUpdate();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                        "UPDATE `" + SQLManager.this.prefix
+                            + "cluster` SET `world` = ? WHERE `world` = ?")) {
+                        stmt.setString(1, newWorld);
+                        stmt.setString(2, oldWorld);
+                        stmt.executeUpdate();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                        "UPDATE `" + SQLManager.this.prefix
+                            + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
+                        stmt.setString(1, newWorld);
+                        stmt.setString(2, oldWorld);
+                        stmt.setInt(3, min.x);
+                        stmt.setInt(4, max.x);
+                        stmt.setInt(5, min.y);
+                        stmt.setInt(6, max.y);
+                        stmt.executeUpdate();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                        "UPDATE `" + SQLManager.this.prefix
+                            + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
+                        stmt.setString(1, newWorld);
+                        stmt.setString(2, oldWorld);
+                        stmt.setInt(3, max.x);
+                        stmt.setInt(4, max.y);
+                        stmt.setInt(5, min.x);
+                        stmt.setInt(6, min.y);
+                        stmt.executeUpdate();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         });
     }
 
     @Override public void replaceUUID(final UUID old, final UUID now) {
-        addGlobalTask(() -> {
-            try (Statement stmt = SQLManager.this.connection.createStatement()) {
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
-                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now.toString()
-                        + "' WHERE `owner` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '" + now
-                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '" + now
-                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '" + now
-                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-            } catch (SQLException e) {
-                e.printStackTrace();
+        addGlobalTask(new Runnable() {
+            @Override public void run() {
+                try (Statement stmt = SQLManager.this.connection.createStatement()) {
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
+                            .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
+                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
+                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
+                            .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
+                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
+                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    stmt.executeUpdate(
+                        "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
+                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
             }
         });
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
index d42b1d67b..3675ad0cd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLite.java
@@ -9,7 +9,7 @@ import java.sql.*;
 /**
  * Connects to and uses a SQLite database.
  */
-public class SQLite implements Database {
+public class SQLite extends Database {
 
     private final String dbLocation;
     private Connection connection;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
index 1bac3e526..06be89e15 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -2,10 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.flag;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
+import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.google.common.collect.ImmutableSet;
@@ -117,7 +114,7 @@ public class FlagManager {
      * @param flag
      * @return
      */
-    @SuppressWarnings("deprecation") public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
+    public static <V> V getPlotFlagRaw(Plot plot, Flag<V> flag) {
         if (plot.owner == null) {
             return null;
         }
@@ -144,6 +141,13 @@ public class FlagManager {
         return true;
     }
 
+    public static <V> boolean addClusterFlag(PlotCluster cluster, Flag<V> flag, V value) {
+        getSettingFlag(cluster.area, cluster.settings, flag);
+        cluster.settings.flags.put(flag, value);
+        DBFunc.setFlags(cluster, cluster.settings.flags);
+        return true;
+    }
+
     /**
      * Returns a map of the {@link Flag}s and their values for the specified plot.
      *
@@ -213,6 +217,20 @@ public class FlagManager {
         return true;
     }
 
+    public static boolean removeClusterFlag(PlotCluster cluster, Flag id) {
+        Object object = cluster.settings.flags.remove(id);
+        if (object == null) {
+            return false;
+        }
+        boolean result = EventUtil.manager.callFlagRemove(id, object, cluster);
+        if (!result) {
+            cluster.settings.flags.put(id, object);
+            return false;
+        }
+        DBFunc.setFlags(cluster, cluster.settings.flags);
+        return true;
+    }
+
     public static void setPlotFlags(Plot origin, HashMap<Flag<?>, Object> flags) {
         for (Plot plot : origin.getConnectedPlots()) {
             if (flags != null && !flags.isEmpty()) {
@@ -230,6 +248,20 @@ public class FlagManager {
         }
     }
 
+    public static void setClusterFlags(PlotCluster cluster, Set<Flag> flags) {
+        if (flags != null && !flags.isEmpty()) {
+            cluster.settings.flags.clear();
+            for (Flag flag : flags) {
+                cluster.settings.flags.put(flag, flag);
+            }
+        } else if (cluster.settings.flags.isEmpty()) {
+            return;
+        } else {
+            cluster.settings.flags.clear();
+        }
+        DBFunc.setFlags(cluster, cluster.settings.flags);
+    }
+
     /**
      * Get a list of registered {@link Flag} objects based on player permissions.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 53a9d6891..ea3a23691 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -277,7 +277,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             id = rotate(id);
         }
         int pair = MathMan.pair(x, z);
-        BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
+        BaseBlock[] existing = this.G_SCH.get(pair);
+        if (existing == null) {
+            existing = new BaseBlock[height];
+            this.G_SCH.put(pair, existing);
+        }
         existing[y] = id;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
index 29a45ac27..16fb343bf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/logger/ILogger.java
@@ -1,5 +1,5 @@
 package com.github.intellectualsites.plotsquared.plot.logger;
 
-@FunctionalInterface public interface ILogger {
+public interface ILogger {
     void log(String message);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
index da9c2c09d..bb466c082 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java
@@ -4,12 +4,10 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.DebugExec;
 import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
 
-import javax.annotation.Nonnull;
 import javax.script.ScriptException;
 
 public abstract class Expression<T> {
-
-    @Nonnull public static <U> Expression<U> constant(final U value) {
+    public static <U> Expression<U> constant(final U value) {
         return new Expression<U>() {
             @Override public U evaluate(U arg) {
                 return value;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index c31404cd5..85349cd55 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -20,7 +20,6 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableSet;
 import com.sk89q.jnbt.CompoundTag;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.awt.geom.Area;
 import java.awt.geom.PathIterator;
@@ -33,10 +32,12 @@ import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * The plot class<br> [IMPORTANT] - Unclaimed plots will not have persistent information. - Any
- * information set/modified in an unclaimed object may not be reflected in other instances - Using
- * the `new` operator will create an unclaimed plot instance - Use the methods from the
- * PlotArea/PS/Location etc to get existing plots
+ * The plot class<br>
+ * [IMPORTANT]
+ * - Unclaimed plots will not have persistent information.
+ * - Any information set/modified in an unclaimed object may not be reflected in other instances
+ * - Using the `new` operator will create an unclaimed plot instance
+ * - Use the methods from the PlotArea/PS/Location etc to get existing plots
  */
 public class Plot {
 
@@ -50,8 +51,9 @@ public class Plot {
      */
     private final PlotId id;
     /**
-     * plot owner (Merged plots can have multiple owners) Direct access is Deprecated: use
-     * getOwners()
+     * plot owner
+     * (Merged plots can have multiple owners)
+     * Direct access is Deprecated: use getOwners()
      */
     @Deprecated public UUID owner;
     /**
@@ -59,9 +61,9 @@ public class Plot {
      */
     public boolean countsTowardsMax = true;
     /**
-     * Represents whatever the database manager needs it to: <br> - A value of -1 usually indicates
-     * the plot will not be stored in the DB<br> - A value of 0 usually indicates that the DB manager
-     * hasn't set a value<br>
+     * Represents whatever the database manager needs it to: <br>
+     * - A value of -1 usually indicates the plot will not be stored in the DB<br>
+     * - A value of 0 usually indicates that the DB manager hasn't set a value<br>
      *
      * @deprecated magical
      */
@@ -84,14 +86,15 @@ public class Plot {
      */
     private HashSet<UUID> denied;
     /**
-     * External settings class. - Please favor the methods over direct access to this class<br> - The
-     * methods are more likely to be left unchanged from version changes<br>
+     * External settings class.
+     * - Please favor the methods over direct access to this class<br>
+     * - The methods are more likely to be left unchanged from version changes<br>
      */
     private PlotSettings settings;
     /**
      * The {@link PlotArea}.
      */
-    @Nonnull private PlotArea area;
+    private PlotArea area;
     /**
      * Session only plot metadata (session is until the server stops)<br>
      * <br>
@@ -101,42 +104,43 @@ public class Plot {
      */
     private ConcurrentHashMap<String, Object> meta;
     /**
-     * The cached origin plot. - The origin plot is used for plot grouping and relational data
+     * The cached origin plot.
+     * - The origin plot is used for plot grouping and relational data
      */
     private Plot origin;
 
     /**
-     * Constructor for a new plot. (Only changes after plot.create() will be properly set in the
-     * database)
+     * Constructor for a new plot.
+     * (Only changes after plot.create() will be properly set in the database)
      *
      * @param area  the PlotArea where the plot is located
      * @param id    the plot id
      * @param owner the plot owner
      * @see Plot#getPlot(Location) for existing plots
      */
-    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner) {
+    public Plot(PlotArea area, PlotId id, UUID owner) {
         this.area = area;
         this.id = id;
         this.owner = owner;
     }
 
     /**
-     * Constructor for an unowned plot. (Only changes after plot.create() will be properly set in the
-     * database)
+     * Constructor for an unowned plot.
+     * (Only changes after plot.create() will be properly set in the database)
      *
      * @param area the PlotArea where the plot is located
      * @param id   the plot id
      * @see Plot#getPlot(Location) for existing plots
      */
-    public Plot(@Nonnull PlotArea area, PlotId id) {
+    public Plot(PlotArea area, PlotId id) {
         this.area = area;
         this.id = id;
     }
 
     /**
-     * Constructor for a temporary plot (use -1 for temp)<br> The database will ignore any queries
-     * regarding temporary plots. Please note that some bulk plot management functions may still
-     * affect temporary plots (TODO: fix this)
+     * Constructor for a temporary plot (use -1 for temp)<br>
+     * The database will ignore any queries regarding temporary plots.
+     * Please note that some bulk plot management functions may still affect temporary plots (TODO: fix this)
      *
      * @param area  the PlotArea where the plot is located
      * @param id    the plot id
@@ -144,7 +148,7 @@ public class Plot {
      * @param temp  Represents whatever the database manager needs it to
      * @see Plot#getPlot(Location) for existing plots
      */
-    public Plot(@Nonnull PlotArea area, PlotId id, UUID owner, int temp) {
+    public Plot(PlotArea area, PlotId id, UUID owner, int temp) {
         this.area = area;
         this.id = id;
         this.owner = owner;
@@ -163,7 +167,7 @@ public class Plot {
      */
     public Plot(PlotId id, UUID owner, HashSet<UUID> trusted, HashSet<UUID> members,
         HashSet<UUID> denied, String alias, BlockLoc position, Collection<Flag> flags,
-        @Nonnull PlotArea area, boolean[] merged, long timestamp, int temp) {
+        PlotArea area, boolean[] merged, long timestamp, int temp) {
         this.id = id;
         this.area = area;
         this.owner = owner;
@@ -264,8 +268,9 @@ public class Plot {
     }
 
     /**
-     * Delete the metadata for a key<br> - metadata is session only - deleting other plugin's metadata
-     * may cause issues
+     * Delete the metadata for a key<br>
+     * - metadata is session only
+     * - deleting other plugin's metadata may cause issues
      *
      * @param key key to delete
      */
@@ -285,9 +290,9 @@ public class Plot {
     }
 
     /**
-     * Efficiently get the players currently inside this plot<br> - Will return an empty list if no
-     * players are in the plot<br> - Remember, you can cast a PlotPlayer to it's respective
-     * implementation (BukkitPlayer, SpongePlayer) to obtain the player object
+     * Efficiently get the players currently inside this plot<br>
+     * - Will return an empty list if no players are in the plot<br>
+     * - Remember, you can cast a PlotPlayer to it's respective implementation (BukkitPlayer, SpongePlayer) to obtain the player object
      *
      * @return list of PlotPlayer(s) or an empty list
      */
@@ -348,7 +353,7 @@ public class Plot {
         }
         if (isMerged()) {
             Set<Plot> plots = getConnectedPlots();
-            Plot[] array = plots.toArray(new Plot[0]);
+            Plot[] array = plots.toArray(new Plot[plots.size()]);
             ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
             UUID last = this.owner;
             owners.add(this.owner);
@@ -403,38 +408,41 @@ public class Plot {
     /**
      * Get the {@link PlotId}.
      */
-    @Nonnull public PlotId getId() {
+    public PlotId getId() {
         return this.id;
     }
 
     /**
-     * Get the plot world object for this plot<br> - The generic PlotArea object can be casted to its
-     * respective class for more control (e.g. HybridPlotWorld)
+     * Get the plot world object for this plot<br>
+     * - The generic PlotArea object can be casted to its respective class for more control (e.g. HybridPlotWorld)
      *
      * @return PlotArea
      */
-    @Nonnull public PlotArea getArea() {
+    public PlotArea getArea() {
         return this.area;
     }
 
     /**
-     * Assign this plot to a plot area.<br> (Mostly used during startup when worlds are being
-     * created)<br> Note: Using this when it doesn't make sense will result in strange behavior
+     * Assign this plot to a plot area.<br>
+     * (Mostly used during startup when worlds are being created)<br>
+     * Note: Using this when it doesn't make sense will result in strange behavior
      *
      * @param area area to assign to
      */
-    public void setArea(@Nonnull PlotArea area) {
+    public void setArea(PlotArea area) {
         if (this.getArea() == area) {
             return;
         }
-        this.area.removePlot(this.id);
+        if (this.getArea() != null) {
+            this.area.removePlot(this.id);
+        }
         this.area = area;
         area.addPlot(this);
     }
 
     /**
-     * Get the plot manager object for this plot<br> - The generic PlotManager object can be casted to
-     * its respective class for more control (e.g. HybridPlotManager)
+     * Get the plot manager object for this plot<br>
+     * - The generic PlotManager object can be casted to its respective class for more control (e.g. HybridPlotManager)
      *
      * @return PlotManager
      */
@@ -448,7 +456,7 @@ public class Plot {
      * @return PlotSettings
      * @deprecated use equivalent plot method;
      */
-    @Deprecated @Nonnull public PlotSettings getSettings() {
+    @Deprecated public PlotSettings getSettings() {
         if (this.settings == null) {
             this.settings = new PlotSettings();
         }
@@ -456,7 +464,8 @@ public class Plot {
     }
 
     /**
-     * Returns true if the plot is not merged, or it is the base plot of multiple merged plots.
+     * Returns true if the plot is not merged, or it is the base
+     * plot of multiple merged plots.
      *
      * @return Boolean
      */
@@ -466,9 +475,10 @@ public class Plot {
 
     /**
      * The base plot is an arbitrary but specific connected plot. It is useful for the following:<br>
-     * - Merged plots need to be treated as a single plot for most purposes<br> - Some data such as
-     * home location needs to be associated with the group rather than each plot<br> - If the plot is
-     * not merged it will return itself.<br> - The result is cached locally
+     * - Merged plots need to be treated as a single plot for most purposes<br>
+     * - Some data such as home location needs to be associated with the group rather than each plot<br>
+     * - If the plot is not merged it will return itself.<br>
+     * - The result is cached locally
      *
      * @return base Plot
      */
@@ -508,8 +518,9 @@ public class Plot {
     }
 
     /**
-     * Get the timestamp of when the plot was created (unreliable)<br> - not accurate if the plot was
-     * created before this was implemented<br> - Milliseconds since the epoch<br>
+     * Get the timestamp of when the plot was created (unreliable)<br>
+     * - not accurate if the plot was created before this was implemented<br>
+     * - Milliseconds since the epoch<br>
      *
      * @return the creation date of the plot
      */
@@ -521,11 +532,19 @@ public class Plot {
     }
 
     /**
-     * Get if the plot is merged in a direction<br> ------- Actual -------<br> 0 = north<br> 1 =
-     * east<br> 2 = south<br> 3 = west<br> ----- Artificial -----<br> 4 = north-east<br> 5 =
-     * south-east<br> 6 = south-west<br> 7 = north-west<br> ----------<br> Note: A plot that is merged
-     * north and east will not be merged northeast if the northeast plot is not part of the same
-     * group<br>
+     * Get if the plot is merged in a direction<br>
+     * ------- Actual -------<br>
+     * 0 = north<br>
+     * 1 = east<br>
+     * 2 = south<br>
+     * 3 = west<br>
+     * ----- Artificial -----<br>
+     * 4 = north-east<br>
+     * 5 = south-east<br>
+     * 6 = south-west<br>
+     * 7 = north-west<br>
+     * ----------<br>
+     * Note: A plot that is merged north and east will not be merged northeast if the northeast plot is not part of the same group<br>
      *
      * @param direction direction to check for merged plot
      * @return true if merged in that direction
@@ -737,9 +756,8 @@ public class Plot {
     public boolean setOwner(UUID owner, PlotPlayer initiator) {
         boolean result = EventUtil.manager
             .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
-        if (!result) {
+        if (!result)
             return false;
-        }
         if (!hasOwner()) {
             this.owner = owner;
             create();
@@ -934,9 +952,8 @@ public class Plot {
      * @param name name
      */
     public void setSign(final String name) {
-        if (!isLoaded()) {
+        if (!isLoaded())
             return;
-        }
         if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
             TaskManager.runTask(() -> Plot.this.setSign(name));
             return;
@@ -1045,8 +1062,13 @@ public class Plot {
      * Count the entities in a plot
      *
      * @return array of entity counts
-     * @see ChunkManager#countEntities(Plot) 0 = Entity 1 = Animal 2 = Monster 3 = Mob 4 = Boat 5 =
-     * Misc
+     * @see ChunkManager#countEntities(Plot)
+     * 0 = Entity
+     * 1 = Animal
+     * 2 = Monster
+     * 3 = Mob
+     * 4 = Boat
+     * 5 = Misc
      */
     public int[] countEntities() {
         int[] count = new int[6];
@@ -1076,8 +1098,8 @@ public class Plot {
     }
 
     /**
-     * Decrement the number of tracked tasks this plot is running<br> - Used to track/limit the number
-     * of things a player can do on the plot at once
+     * Decrement the number of tracked tasks this plot is running<br>
+     * - Used to track/limit the number of things a player can do on the plot at once
      *
      * @return previous number of tasks (int)
      */
@@ -1096,8 +1118,8 @@ public class Plot {
     }
 
     /**
-     * Get the number of tracked running tasks for this plot<br> - Used to track/limit the number of
-     * things a player can do on the plot at once
+     * Get the number of tracked running tasks for this plot<br>
+     * - Used to track/limit the number of things a player can do on the plot at once
      *
      * @return number of tasks (int)
      */
@@ -1107,8 +1129,7 @@ public class Plot {
     }
 
     /**
-     * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in
-     * unclaimed plot objects.
+     * Unclaim the plot (does not modify terrain). Changes made to this plot will not be reflected in unclaimed plot objects.
      *
      * @return false if the Plot has no owner, otherwise true.
      */
@@ -1148,9 +1169,8 @@ public class Plot {
         Location bot = corners[1];
         Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
             MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
-        if (!isLoaded()) {
+        if (!isLoaded())
             return loc;
-        }
         int y =
             isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
         if (area.ALLOW_SIGNS) {
@@ -1185,9 +1205,8 @@ public class Plot {
             Location bot = this.getBottomAbs();
             Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
                 bot.getZ() + home.z, home.yaw, home.pitch);
-            if (!isLoaded()) {
+            if (!isLoaded())
                 return loc;
-            }
             if (!WorldUtil.IMP.getBlock(loc).isAir()) {
                 loc.setY(Math.max(
                     1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
@@ -1216,8 +1235,8 @@ public class Plot {
     }
 
     /**
-     * Get the default home location for a plot<br> - Ignores any home location set for that specific
-     * plot
+     * Get the default home location for a plot<br>
+     * - Ignores any home location set for that specific plot
      *
      * @return Location
      */
@@ -1277,7 +1296,8 @@ public class Plot {
     }
 
     /**
-     * Set a rating for a user<br> - If the user has already rated, the following will return false
+     * Set a rating for a user<br>
+     * - If the user has already rated, the following will return false
      *
      * @param uuid   uuid of rater
      * @param rating rating
@@ -1308,7 +1328,8 @@ public class Plot {
     }
 
     /**
-     * Get the ratings associated with a plot<br> - The rating object may contain multiple categories
+     * Get the ratings associated with a plot<br>
+     * - The rating object may contain multiple categories
      *
      * @return Map of user who rated to the rating
      */
@@ -1330,7 +1351,8 @@ public class Plot {
     }
 
     /**
-     * Resend all chunks inside the plot to nearby players<br> This should not need to be called
+     * Resend all chunks inside the plot to nearby players<br>
+     * This should not need to be called
      */
     public void refreshChunks() {
         LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
@@ -1372,9 +1394,10 @@ public class Plot {
     }
 
     /**
-     * Register a plot and create it in the database<br> - The plot will not be created if the owner
-     * is null<br> - Any setting from before plot creation will not be saved until the server is
-     * stopped properly. i.e. Set any values/options after plot creation.
+     * Register a plot and create it in the database<br>
+     * - The plot will not be created if the owner is null<br>
+     * - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot
+     * creation.
      *
      * @return true if plot was created successfully
      */
@@ -1436,9 +1459,10 @@ public class Plot {
     }
 
     /**
-     * Register a plot and create it in the database<br> - The plot will not be created if the owner
-     * is null<br> - Any setting from before plot creation will not be saved until the server is
-     * stopped properly. i.e. Set any values/options after plot creation.
+     * Register a plot and create it in the database<br>
+     * - The plot will not be created if the owner is null<br>
+     * - Any setting from before plot creation will not be saved until the server is stopped properly. i.e. Set any values/options after plot
+     * creation.
      *
      * @param uuid   the uuid of the plot owner
      * @param notify notify
@@ -1478,7 +1502,8 @@ public class Plot {
     }
 
     /**
-     * Set components such as border, wall, floor. (components are generator specific)
+     * Set components such as border, wall, floor.
+     * (components are generator specific)
      */
     public boolean setComponent(String component, String blocks) {
         BlockBucket parsed = Configuration.BLOCK_BUCKET.parseString(blocks);
@@ -1497,6 +1522,8 @@ public class Plot {
 
     /**
      * Return the top location for the plot.
+     *
+     * @return
      */
     public Location getTopAbs() {
         Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
@@ -1506,6 +1533,8 @@ public class Plot {
 
     /**
      * Return the bottom location for the plot.
+     *
+     * @return
      */
     public Location getBottomAbs() {
         Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
@@ -1518,6 +1547,7 @@ public class Plot {
      *
      * @param plot     the plot to swap data with
      * @param whenDone the task to run at the end of this method.
+     * @return
      */
     public boolean swapData(Plot plot, Runnable whenDone) {
         if (this.owner == null) {
@@ -1552,7 +1582,9 @@ public class Plot {
     /**
      * Move the settings for a plot.
      *
-     * @param plot the plot to move
+     * @param plot     the plot to move
+     * @param whenDone
+     * @return
      */
     public boolean moveData(Plot plot, Runnable whenDone) {
         if (this.owner == null) {
@@ -1576,8 +1608,8 @@ public class Plot {
     }
 
     /**
-     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like
-     * each plot treated as a small plot use getPlotTopLocAbs(...)
+     * Gets the top loc of a plot (if mega, returns top loc of that mega plot) - If you would like each plot treated as
+     * a small plot use getPlotTopLocAbs(...)
      *
      * @return Location top of mega plot
      */
@@ -1596,8 +1628,9 @@ public class Plot {
     }
 
     /**
-     * Gets the bottom location for a plot.<br> - Does not respect mega plots<br> - Merged plots, only
-     * the road will be considered part of the plot<br>
+     * Gets the bottom location for a plot.<br>
+     * - Does not respect mega plots<br>
+     * - Merged plots, only the road will be considered part of the plot<br>
      *
      * @return Location bottom of mega plot
      */
@@ -1616,9 +1649,9 @@ public class Plot {
     }
 
     /**
-     * Returns the top and bottom location.<br> - If the plot is not connected, it will return its own
-     * corners<br> - the returned locations will not necessarily correspond to claimed plots if the
-     * connected plots do not form a rectangular shape
+     * Returns the top and bottom location.<br>
+     * - If the plot is not connected, it will return its own corners<br>
+     * - the returned locations will not necessarily correspond to claimed plots if the connected plots do not form a rectangular shape
      *
      * @return new Location[] { bottom, top }
      * @deprecated as merged plots no longer need to be rectangular
@@ -1631,7 +1664,8 @@ public class Plot {
     }
 
     /**
-     * Remove the east road section of a plot<br> - Used when a plot is merged<br>
+     * Remove the east road section of a plot<br>
+     * - Used when a plot is merged<br>
      */
     public void removeRoadEast() {
         if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
@@ -1650,6 +1684,7 @@ public class Plot {
     }
 
     /**
+     * @return
      * @deprecated in favor of getCorners()[0];<br>
      */
     // Won't remove as suggestion also points to deprecated method
@@ -1667,8 +1702,8 @@ public class Plot {
     }
 
     /**
-     * Swap the plot contents and settings with another location<br> - The destination must correspond
-     * to a valid plot of equal dimensions
+     * Swap the plot contents and settings with another location<br>
+     * - The destination must correspond to a valid plot of equal dimensions
      *
      * @param destination The other plot to swap with
      * @param whenDone    A task to run when finished, or null
@@ -1682,7 +1717,8 @@ public class Plot {
     }
 
     /**
-     * Move the plot to an empty location<br> - The location must be empty
+     * Move the plot to an empty location<br>
+     * - The location must be empty
      *
      * @param destination Where to move the plot
      * @param whenDone    A task to run when done, or null
@@ -1706,7 +1742,10 @@ public class Plot {
 
 
     /**
-     * Remove a denied player (use DBFunc as well)<br> Using the * uuid will remove all users
+     * Remove a denied player (use DBFunc as well)<br>
+     * Using the * uuid will remove all users
+     *
+     * @param uuid
      */
     public boolean removeDenied(UUID uuid) {
         if (uuid == DBFunc.EVERYONE && !denied.contains(uuid)) {
@@ -1731,7 +1770,10 @@ public class Plot {
     }
 
     /**
-     * Remove a helper (use DBFunc as well)<br> Using the * uuid will remove all users
+     * Remove a helper (use DBFunc as well)<br>
+     * Using the * uuid will remove all users
+     *
+     * @param uuid
      */
     public boolean removeTrusted(UUID uuid) {
         if (uuid == DBFunc.EVERYONE && !trusted.contains(uuid)) {
@@ -1756,7 +1798,10 @@ public class Plot {
     }
 
     /**
-     * Remove a trusted user (use DBFunc as well)<br> Using the * uuid will remove all users
+     * Remove a trusted user (use DBFunc as well)<br>
+     * Using the * uuid will remove all users
+     *
+     * @param uuid
      */
     public boolean removeMember(UUID uuid) {
         if (this.members == null) {
@@ -1785,6 +1830,8 @@ public class Plot {
 
     /**
      * Export the plot as a schematic to the configured output directory.
+     *
+     * @return
      */
     public void export(final RunnableVal<Boolean> whenDone) {
         SchematicHandler.manager.getCompoundTag(this, new RunnableVal<CompoundTag>() {
@@ -1824,10 +1871,11 @@ public class Plot {
     }
 
     /**
-     * Upload this plot as a world file<br> - The mca files are each 512x512, so depending on the plot
-     * size it may also download adjacent plots<br> - Works best when (plot width + road width) % 512
-     * == 0<br>
+     * Upload this plot as a world file<br>
+     * - The mca files are each 512x512, so depending on the plot size it may also download adjacent plots<br>
+     * - Works best when (plot width + road width) % 512 == 0<br>
      *
+     * @param whenDone
      * @see WorldUtil
      */
     public void uploadWorld(RunnableVal<URL> whenDone) {
@@ -1850,8 +1898,10 @@ public class Plot {
     }
 
     /**
-     * Get the plot hashcode<br> Note: The hashcode is unique if:<br> - Plots are in the same
-     * world<br> - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
+     * Get the plot hashcode<br>
+     * Note: The hashcode is unique if:<br>
+     * - Plots are in the same world<br>
+     * - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
      *
      * @return integer.
      */
@@ -1860,7 +1910,10 @@ public class Plot {
     }
 
     /**
-     * Get the flags specific to this plot<br> - Does not take default flags into account<br>
+     * Get the flags specific to this plot<br>
+     * - Does not take default flags into account<br>
+     *
+     * @return
      */
     public HashMap<Flag<?>, Object> getFlags() {
         return this.getSettings().flags;
@@ -1868,13 +1921,16 @@ public class Plot {
 
     /**
      * Set a flag for this plot.
+     *
+     * @param flags
      */
     public void setFlags(HashMap<Flag<?>, Object> flags) {
         FlagManager.setPlotFlags(this, flags);
     }
 
     /**
-     * Get the plot alias. - Returns an empty string if no alias is set
+     * Get the plot alias.
+     * - Returns an empty string if no alias is set
      *
      * @return The plot alias
      */
@@ -1905,10 +1961,20 @@ public class Plot {
     }
 
     /**
-     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> ----------<br> 0 =
-     * north<br> 1 = east<br> 2 = south<br> 3 = west<br> ----------<br>
+     * Set the raw merge data<br>
+     * - Updates DB<br>
+     * - Does not modify terrain<br>
+     * ----------<br>
+     * 0 = north<br>
+     * 1 = east<br>
+     * 2 = south<br>
+     * 3 = west<br>
+     * ----------<br>
+     *
+     * @param direction
+     * @param value
      */
-    private void setMerged(int direction, boolean value) {
+    public void setMerged(int direction, boolean value) {
         if (this.getSettings().setMerged(direction, value)) {
             if (value) {
                 Plot other = this.getRelative(direction).getBasePlot(false);
@@ -1942,9 +2008,19 @@ public class Plot {
     }
 
     /**
-     * Set the raw merge data<br> - Updates DB<br> - Does not modify terrain<br> Get if the plot is
-     * merged in a direction<br> ----------<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
-     * ----------<br> Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
+     * Set the raw merge data<br>
+     * - Updates DB<br>
+     * - Does not modify terrain<br>
+     * Get if the plot is merged in a direction<br>
+     * ----------<br>
+     * 0 = north<br>
+     * 1 = east<br>
+     * 2 = south<br>
+     * 3 = west<br>
+     * ----------<br>
+     * Note: Diagonal merging (4-7) must be done by merging the corresponding plots.
+     *
+     * @param merged
      */
     public void setMerged(boolean[] merged) {
         this.getSettings().setMerged(merged);
@@ -1952,7 +2028,7 @@ public class Plot {
         clearCache();
     }
 
-    private void clearCache() {
+    public void clearCache() {
         connected_cache = null;
         regions_cache = null;
         if (this.origin != null) {
@@ -1962,9 +2038,10 @@ public class Plot {
     }
 
     /**
-     * Get the set home location or 0,0,0 if no location is set<br> - Does not take the default home
-     * location into account
+     * Get the set home location or 0,0,0 if no location is set<br>
+     * - Does not take the default home location into account
      *
+     * @return
      * @see #getHome()
      */
     public BlockLoc getPosition() {
@@ -1975,6 +2052,7 @@ public class Plot {
      * Check if a plot can be claimed by the provided player.
      *
      * @param player the claiming player
+     * @return
      */
     public boolean canClaim(@Nullable PlotPlayer player) {
         PlotCluster cluster = this.getCluster();
@@ -1988,8 +2066,8 @@ public class Plot {
     }
 
     /**
-     * Guess the owner of a plot either by the value in memory, or the sign data<br> Note: Recovering
-     * from sign information is useful if e.g. PlotMe conversion wasn't successful
+     * Guess the owner of a plot either by the value in memory, or the sign data<br>
+     * Note: Recovering from sign information is useful if e.g. PlotMe conversion wasn't successful
      *
      * @return UUID
      */
@@ -2055,7 +2133,8 @@ public class Plot {
     }
 
     /**
-     * Remove the south road section of a plot<br> - Used when a plot is merged<br>
+     * Remove the south road section of a plot<br>
+     * - Used when a plot is merged<br>
      */
     public void removeRoadSouth() {
         if (this.area.TYPE != 0 && this.area.TERRAIN > 1) {
@@ -2076,8 +2155,12 @@ public class Plot {
     /**
      * Auto merge a plot in a specific direction<br>
      *
-     * @param dir         The direction to merge<br> -1 = All directions<br> 0 = north<br> 1 = east<br> 2 =
-     *                    south<br> 3 = west<br>
+     * @param dir         The direction to merge<br>
+     *                    -1 = All directions<br>
+     *                    0 = north<br>
+     *                    1 = east<br>
+     *                    2 = south<br>
+     *                    3 = west<br>
      * @param max         The max number of merges to do
      * @param uuid        The UUID it is allowed to merge with
      * @param removeRoads Whether to remove roads
@@ -2162,7 +2245,10 @@ public class Plot {
     }
 
     /**
-     * Merge the plot settings<br> - Used when a plot is merged<br>
+     * Merge the plot settings<br>
+     * - Used when a plot is merged<br>
+     *
+     * @param b
      */
     public void mergeData(Plot b) {
         HashMap<Flag<?>, Object> flags1 = this.getFlags();
@@ -2224,9 +2310,11 @@ public class Plot {
     }
 
     /**
-     * Get the plot in a relative location<br> Note: May be null if the partial plot area does not
-     * include the relative location
+     * Get the plot in a relative location<br>
+     * Note: May be null if the partial plot area does not include the relative location
      *
+     * @param x
+     * @param y
      * @return Plot
      */
     public Plot getRelative(int x, int y) {
@@ -2238,18 +2326,28 @@ public class Plot {
     }
 
     /**
-     * Get the plot in a relative direction<br> 0 = north<br> 1 = east<br> 2 = south<br> 3 = west<br>
+     * Get the plot in a relative direction<br>
+     * 0 = north<br>
+     * 1 = east<br>
+     * 2 = south<br>
+     * 3 = west<br>
      * Note: May be null if the partial plot area does not include the relative location
+     *
+     * @param direction
+     * @return
      */
     public Plot getRelative(int direction) {
         return this.area.getPlotAbs(this.id.getRelative(direction));
     }
 
     /**
-     * Get a set of plots connected (and including) this plot<br> - This result is cached globally
+     * Get a set of plots connected (and including) this plot<br>
+     * - This result is cached globally
+     *
+     * @return
      */
     public Set<Plot> getConnectedPlots() {
-        if (this.settings == null || !this.isMerged()) {
+        if (this.settings == null) {
             return Collections.singleton(this);
         }
         boolean[] merged = this.getMerged();
@@ -2377,8 +2475,11 @@ public class Plot {
     }
 
     /**
-     * This will combine each plot into effective rectangular regions<br> - This result is cached
-     * globally<br> - Useful for handling non rectangular shapes
+     * This will combine each plot into effective rectangular regions<br>
+     * - This result is cached globally<br>
+     * - Useful for handling non rectangular shapes
+     *
+     * @return
      */
     public HashSet<RegionWrapper> getRegions() {
         if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
@@ -2461,7 +2562,9 @@ public class Plot {
             }
             Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
             Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
-            visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
+            for (PlotId id : MainUtil.getPlotSelectionIds(bot, top)) {
+                visited.add(id);
+            }
             for (int x = bot.x; x <= top.x; x++) {
                 Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
                 if (plot.getMerged(2)) {
@@ -2504,8 +2607,9 @@ public class Plot {
     }
 
     /**
-     * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular
-     * shapes)
+     * Attempt to find the largest rectangular region in a plot (as plots can form non rectangular shapes)
+     *
+     * @return
      */
     public RegionWrapper getLargestRegion() {
         HashSet<RegionWrapper> regions = this.getRegions();
@@ -2523,8 +2627,8 @@ public class Plot {
     }
 
     /**
-     * Do the plot entry tasks for each player in the plot<br> - Usually called when the plot state
-     * changes (unclaimed/claimed/flag change etc)
+     * Do the plot entry tasks for each player in the plot<br>
+     * - Usually called when the plot state changes (unclaimed/claimed/flag change etc)
      */
     public void reEnter() {
         TaskManager.runTaskLater(() -> {
@@ -2618,8 +2722,13 @@ public class Plot {
     }
 
     /**
-     * Set a component for a plot to the provided blocks<br> - E.g. floor, wall, border etc.<br> - The
-     * available components depend on the generator being used<br>
+     * Set a component for a plot to the provided blocks<br>
+     * - E.g. floor, wall, border etc.<br>
+     * - The available components depend on the generator being used<br>
+     *
+     * @param component
+     * @param blocks
+     * @return
      */
     public boolean setComponent(String component, BlockBucket blocks) {
         if (StringMan
@@ -2654,8 +2763,10 @@ public class Plot {
     }
 
     /**
-     * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other
-     * <br> - saves to DB
+     * Merges 2 plots Removes the road in-between <br>- Assumes plots are directly next to each other <br> - saves to DB
+     *
+     * @param lesserPlot
+     * @param removeRoads
      */
     public void mergePlot(Plot lesserPlot, boolean removeRoads) {
         Plot greaterPlot = this;
@@ -2805,6 +2916,10 @@ public class Plot {
 
     /**
      * Copy a plot to a location, both physically and the settings
+     *
+     * @param destination
+     * @param whenDone
+     * @return
      */
     public boolean copy(final Plot destination, final Runnable whenDone) {
         PlotId offset = new PlotId(destination.getId().x - this.getId().x,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 00a30e22d..48ebb759a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -721,9 +721,6 @@ public abstract class PlotArea {
             } else {
                 start = start.getNextId(1);
             }
-            if (start == null) {
-                PlotSquared.debug("NPE possible in getNextFreePlot");
-            }
             currentId = new PlotId(center.x + start.x, center.y + start.y);
             Plot plot = getPlotAbs(currentId);
             if (plot != null && plot.canClaim(player)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
index ed9ca5fd8..a1134cbce 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
@@ -2,24 +2,22 @@ package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import lombok.Getter;
 
-import javax.annotation.Nonnull;
 import java.util.HashSet;
 import java.util.UUID;
 
 public class PlotCluster {
     public PlotArea area;
-    @Nonnull @Getter public PlotSettings settings;
+    public PlotSettings settings;
     public UUID owner;
     public HashSet<UUID> helpers = new HashSet<>();
     public HashSet<UUID> invited = new HashSet<>();
     public int temp;
-    @Nonnull private PlotId pos1;
-    @Nonnull private PlotId pos2;
+    private PlotId pos1;
+    private PlotId pos2;
     private RegionWrapper region;
 
-    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, @Nonnull PlotId pos2, UUID owner) {
+    public PlotCluster(PlotArea area, PlotId pos1, PlotId pos2, UUID owner) {
         this.area = area;
         this.pos1 = pos1;
         this.pos2 = pos2;
@@ -29,7 +27,7 @@ public class PlotCluster {
         setRegion();
     }
 
-    public PlotCluster(PlotArea area, @Nonnull PlotId pos1, PlotId pos2, UUID owner, int temp) {
+    public PlotCluster(PlotArea area, PlotId pos1, PlotId pos2, UUID owner, int temp) {
         this.area = area;
         this.pos1 = pos1;
         this.pos2 = pos2;
@@ -84,14 +82,6 @@ public class PlotCluster {
         return this.settings.getAlias();
     }
 
-    public void setName(String name) {
-        this.settings.setAlias(name);
-    }
-
-    public String getAlias() {
-        return this.settings.getAlias();
-    }
-
     /**
      * Get the area (in plots).
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
index 6db234de3..47069a38e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
@@ -13,7 +13,6 @@ public class PlotMessage {
         try {
             reset(ChatManager.manager);
         } catch (Throwable e) {
-            assert PlotSquared.imp() != null;
             PlotSquared.debug(
                 PlotSquared.imp().getPluginName() + " doesn't support fancy chat for " + PlotSquared
                     .get().IMP.getServerVersion());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index 2fc42059f..d535c625e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -48,17 +48,25 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     }
 
     /**
-     * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's
-     * already cached)<br> - Accepts sponge/bukkit Player (online) - Accepts player name (online) -
-     * Accepts UUID - Accepts bukkit OfflinePlayer (offline)
+     * Efficiently wrap a Player, or OfflinePlayer object to get a PlotPlayer (or fetch if it's already cached)<br>
+     * - Accepts sponge/bukkit Player (online)
+     * - Accepts player name (online)
+     * - Accepts UUID
+     * - Accepts bukkit OfflinePlayer (offline)
+     *
+     * @param player
+     * @return
      */
     public static PlotPlayer wrap(Object player) {
         return PlotSquared.get().IMP.wrapPlayer(player);
     }
 
     /**
-     * Get the cached PlotPlayer from a username<br> - This will return null if the player has not
-     * finished logging in or is not online
+     * Get the cached PlotPlayer from a username<br>
+     * - This will return null if the player has not finished logging in or is not online
+     *
+     * @param name
+     * @return
      */
     public static PlotPlayer get(String name) {
         return UUIDHandler.getPlayer(name);
@@ -66,6 +74,9 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * Set some session only metadata for this player.
+     *
+     * @param key
+     * @param value
      */
     public void setMeta(String key, Object value) {
         if (value == null) {
@@ -101,8 +112,11 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     }
 
     /**
-     * Delete the metadata for a key. - metadata is session only - deleting other plugin's metadata
-     * may cause issues
+     * Delete the metadata for a key.
+     * - metadata is session only
+     * - deleting other plugin's metadata may cause issues
+     *
+     * @param key
      */
     public Object deleteMeta(String key) {
         return this.meta == null ? null : this.meta.remove(key);
@@ -120,8 +134,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     /**
      * Get this player's current plot.
      *
-     * @return the plot the player is standing on or null if standing on a road or not in a {@link
-     * PlotArea}
+     * @return the plot the player is standing on or null if standing on a road or not in a {@link PlotArea}
      */
     public Plot getCurrentPlot() {
         Plot value = getMeta(PlotPlayer.META_LAST_PLOT);
@@ -132,11 +145,10 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     }
 
     /**
-     * Get the total number of allowed plots Possibly relevant: (To increment the player's allowed
-     * plots, see the example script on the wiki)
+     * Get the total number of allowed plots
+     * Possibly relevant: (To increment the player's allowed plots, see the example script on the wiki)
      *
-     * @return number of allowed plots within the scope (globally, or in the player's current world as
-     * defined in the settings.yml)
+     * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
      */
     public int getAllowedPlots() {
         return Permissions.hasPermissionRange(this, "plots.plot", Settings.Limit.MAX_PLOTS);
@@ -145,8 +157,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     /**
      * Get the total number of allowed clusters
      *
-     * @return number of allowed clusters within the scope (globally, or in the player's current world
-     * as defined in the settings.yml)
+     * @return number of allowed clusters within the scope (globally, or in the player's current world as defined in the settings.yml)
      */
     public int getAllowedClusters() {
         return Permissions.hasPermissionRange(this, "plots.cluster", Settings.Limit.MAX_PLOTS);
@@ -180,8 +191,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     /**
      * Get the number of plots this player owns.
      *
-     * @return number of plots within the scope (globally, or in the player's current world as defined
-     * in the settings.yml)
+     * @return number of plots within the scope (globally, or in the player's current world as defined in the settings.yml)
      * @see #getPlotCount(String);
      * @see #getPlots()
      */
@@ -229,6 +239,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      * Get the number of plots this player owns in the world.
      *
      * @param world the name of the plotworld to check.
+     * @return
      */
     public int getPlotCount(String world) {
         UUID uuid = getUUID();
@@ -273,6 +284,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * Return the PlotArea this player is currently in, or null.
+     *
+     * @return
      */
     public PlotArea getPlotAreaAbs() {
         return PlotSquared.get().getPlotAreaAbs(getLocation());
@@ -305,15 +318,18 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * Get this player's full location (including yaw/pitch)
+     *
+     * @return
      */
     public abstract Location getLocationFull();
 
     ////////////////////////////////////////////////
 
     /**
-     * Get this player's UUID. === !IMPORTANT ===<br> The UUID is dependent on the mode chosen in the
-     * settings.yml and may not be the same as Bukkit has (especially if using an old version of
-     * Bukkit that does not support UUIDs)
+     * Get this player's UUID.
+     * === !IMPORTANT ===<br>
+     * The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
+     * (especially if using an old version of Bukkit that does not support UUIDs)
      *
      * @return UUID
      */
@@ -356,8 +372,11 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     public abstract void setCompassTarget(Location location);
 
     /**
-     * Set player data that will persist restarts. - Please note that this is not intended to store
-     * large values - For session only data use meta
+     * Set player data that will persist restarts.
+     * - Please note that this is not intended to store large values
+     * - For session only data use meta
+     *
+     * @param key
      */
     public void setAttribute(String key) {
         setPersistentMeta("attrib_" + key, new byte[] {(byte) 1});
@@ -366,6 +385,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     /**
      * Retrieves the attribute of this player.
      *
+     * @param key
      * @return the attribute will be either true or false
      */
     public boolean getAttribute(String key) {
@@ -377,6 +397,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * Remove an attribute from a player.
+     *
+     * @param key
      */
     public void removeAttribute(String key) {
         removePersistentMeta("attrib_" + key);
@@ -470,7 +492,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                 owned.deletePlot(null);
                 PlotSquared.debug(String
                     .format("&cPlot &6%s &cwas deleted + cleared due to &6%s&c getting banned",
-                        owned.getId(), getName()));
+                        plot.getId(), getName()));
             }
         }
         String name = getName();
@@ -483,6 +505,9 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * Get the amount of clusters this player owns in the specific world.
+     *
+     * @param world
+     * @return
      */
     public int getPlayerClusterCount(String world) {
         UUID uuid = getUUID();
@@ -555,27 +580,31 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                                                 final Location loc =
                                                     new Location(plot.getWorldName(), x, y, z);
                                                 if (plot.isLoaded()) {
-                                                    TaskManager.runTask(() -> {
-                                                        if (getMeta("teleportOnLogin", true)) {
-                                                            teleport(loc);
-                                                            sendMessage(C.TELEPORTED_TO_PLOT.f()
-                                                                + " (quitLoc) (" + plotX + ","
-                                                                + plotZ + ")");
+                                                    TaskManager.runTask(new Runnable() {
+                                                        @Override public void run() {
+                                                            if (getMeta("teleportOnLogin", true)) {
+                                                                teleport(loc);
+                                                                sendMessage(C.TELEPORTED_TO_PLOT.f()
+                                                                    + " (quitLoc) (" + plotX + ","
+                                                                    + plotZ + ")");
+                                                            }
                                                         }
                                                     });
                                                 } else if (!PlotSquared.get()
                                                     .isMainThread(Thread.currentThread())) {
                                                     if (getMeta("teleportOnLogin", true)) {
                                                         if (plot.teleportPlayer(PlotPlayer.this)) {
-                                                            TaskManager.runTask(() -> {
-                                                                if (getMeta("teleportOnLogin",
-                                                                    true)) {
-                                                                    teleport(loc);
-                                                                    sendMessage(
-                                                                        C.TELEPORTED_TO_PLOT.f()
-                                                                            + " (quitLoc-unloaded) ("
-                                                                            + plotX + "," + plotZ
-                                                                            + ")");
+                                                            TaskManager.runTask(new Runnable() {
+                                                                @Override public void run() {
+                                                                    if (getMeta("teleportOnLogin",
+                                                                        true)) {
+                                                                        teleport(loc);
+                                                                        sendMessage(
+                                                                            C.TELEPORTED_TO_PLOT.f()
+                                                                                + " (quitLoc-unloaded) ("
+                                                                                + plotX + ","
+                                                                                + plotZ + ")");
+                                                                    }
                                                                 }
                                                             });
                                                         }
@@ -624,6 +653,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * The amount of money this Player has.
+     *
+     * @return
      */
     public double getMoney() {
         return EconHandler.manager == null ? 0 : EconHandler.manager.getMoney(this);
@@ -642,7 +673,6 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     }
 
     public interface PlotPlayerConverter<BaseObject> {
-
         PlotPlayer convert(BaseObject object);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
index 2ccaa47a8..4f3701f56 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -42,7 +42,7 @@ public class PlotSettings {
     /**
      * Flags.
      *
-     * @deprecated Raw access. Not compatible with PlotClusters.
+     * @deprecated Raw access
      */
     @Deprecated public HashMap<Flag<?>, Object> flags = new HashMap<>();
     /**
@@ -85,7 +85,7 @@ public class PlotSettings {
         return this.ratings;
     }
 
-    boolean setMerged(int direction, boolean merged) {
+    public boolean setMerged(int direction, boolean merged) {
         if (this.merged[direction] != merged) {
             this.merged[direction] = merged;
             return true;
@@ -142,7 +142,6 @@ public class PlotSettings {
         }
     }
 
-    //todo need a plot method
     public Optional<ArrayList<PlotComment>> getComments(String inbox) {
         ArrayList<PlotComment> c = new ArrayList<>();
         if (this.comments == null) {
@@ -156,26 +155,22 @@ public class PlotSettings {
         return Optional.of(c);
     }
 
-    //todo need a plot method
     public void setComments(List<PlotComment> comments) {
         this.comments = comments;
     }
 
-    //todo need a plot method
     public void removeComment(PlotComment comment) {
         if (this.comments.contains(comment)) {
             this.comments.remove(comment);
         }
     }
 
-    //todo need a plot method
     public void removeComments(List<PlotComment> comments) {
         for (PlotComment comment : comments) {
             removeComment(comment);
         }
     }
 
-    //todo need a plot method
     public void addComment(PlotComment comment) {
         if (this.comments == null) {
             this.comments = new ArrayList<>();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
index 900471193..994f6a465 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/stream/AbstractDelegateOutputStream.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 public class AbstractDelegateOutputStream extends OutputStream {
-
     private final OutputStream parent;
 
     public AbstractDelegateOutputStream(OutputStream os) {
@@ -19,6 +18,10 @@ public class AbstractDelegateOutputStream extends OutputStream {
         parent.write(b);
     }
 
+    @Override public void write(byte[] b, int off, int len) throws IOException {
+        parent.write(b, off, len);
+    }
+
     @Override public void flush() throws IOException {
         parent.flush();
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
index f53465b2a..989948f0c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -88,8 +88,9 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         HashSet<PlotArea> globalAreas = new HashSet<>(Arrays.asList(plotAreas));
         localAreas.add(plotArea);
         globalAreas.add(plotArea);
-        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
-        this.plotAreaMap.put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
+        this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
+        this.plotAreaMap
+            .put(plotArea.worldname, localAreas.toArray(new PlotArea[localAreas.size()]));
         QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
         if (map == null) {
             map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
@@ -103,14 +104,15 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
     }
 
     @Override public void removePlotArea(PlotArea area) {
-        ArrayList<PlotArea> globalAreas = new ArrayList<>(Arrays.asList(plotAreas));
+        ArrayList<PlotArea> globalAreas = new ArrayList<PlotArea>(Arrays.asList(plotAreas));
         globalAreas.remove(area);
-        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
+        this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
         if (globalAreas.isEmpty()) {
             this.plotAreaMap.remove(area.worldname);
             this.plotAreaGrid.remove(area.worldname);
         } else {
-            this.plotAreaMap.put(area.worldname, globalAreas.toArray(new PlotArea[0]));
+            this.plotAreaMap
+                .put(area.worldname, globalAreas.toArray(new PlotArea[globalAreas.size()]));
             this.plotAreaGrid.get(area.worldname).remove(area);
         }
     }
@@ -204,7 +206,7 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
             return noPlotAreas;
         } else {
             Set<PlotArea> found = areas.get(region);
-            return found.toArray(new PlotArea[0]);
+            return found.toArray(new PlotArea[found.size()]);
         }
     }
 
@@ -215,14 +217,14 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         Set<String> tmp = new LinkedHashSet<>();
         Collections.addAll(tmp, worlds);
         tmp.add(worldName);
-        worlds = tmp.toArray(new String[0]);
+        worlds = tmp.toArray(new String[tmp.size()]);
     }
 
     @Override public void removeWorld(String worldName) {
         Set<String> tmp = new LinkedHashSet<>();
         Collections.addAll(tmp, worlds);
         tmp.remove(worldName);
-        worlds = tmp.toArray(new String[0]);
+        worlds = tmp.toArray(new String[tmp.size()]);
     }
 
     @Override public String[] getAllWorlds() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
index 7a59dab9d..aef7f53a8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
@@ -5,24 +5,24 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
 
 public interface PlotAreaManager {
-    PlotArea getApplicablePlotArea(Location location);
+    public PlotArea getApplicablePlotArea(Location location);
 
-    PlotArea getPlotArea(Location location);
+    public PlotArea getPlotArea(Location location);
 
-    PlotArea getPlotArea(String world, String id);
+    public PlotArea getPlotArea(String world, String id);
 
-    PlotArea[] getPlotAreas(String world, RegionWrapper region);
+    public PlotArea[] getPlotAreas(String world, RegionWrapper region);
 
-    PlotArea[] getAllPlotAreas();
+    public PlotArea[] getAllPlotAreas();
 
-    String[] getAllWorlds();
+    public String[] getAllWorlds();
 
-    void addPlotArea(PlotArea area);
+    public void addPlotArea(PlotArea area);
 
-    void removePlotArea(PlotArea area);
+    public void removePlotArea(PlotArea area);
 
-    void addWorld(String worldName);
+    public void addWorld(String worldName);
 
-    void removeWorld(String worldName);
+    public void removeWorld(String worldName);
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
index 5cf07cc14..5e153c02e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
@@ -4,7 +4,6 @@ import com.github.intellectualsites.plotsquared.plot.config.C;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 
-import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.UUID;
@@ -41,7 +40,7 @@ public class SinglePlot extends Plot {
         return getId().toCommaSeparatedString();
     }
 
-    @Nonnull @Override public SinglePlotArea getArea() {
+    @Override public SinglePlotArea getArea() {
         return (SinglePlotArea) super.getArea();
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index a3b398136..adc462f4e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -35,7 +35,8 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
         if (chars.length == 1 && chars[0] == '*') {
             return true;
         }
-        for (char c : chars) {
+        for (int i = 0; i < chars.length; i++) {
+            char c = chars[i];
             switch (mode) {
                 case 0:
                     mode = 1;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index f8e4ab000..8e5a6da12 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -30,10 +30,12 @@ public class SinglePlotManager extends PlotManager {
         SetupUtils.manager.unload(plot.getWorldName(), false);
         final File worldFolder =
             new File(PlotSquared.get().IMP.getWorldContainer(), plot.getWorldName());
-        TaskManager.IMP.taskAsync(() -> {
-            MainUtil.deleteDirectory(worldFolder);
-            if (whenDone != null)
-                whenDone.run();
+        TaskManager.IMP.taskAsync(new Runnable() {
+            @Override public void run() {
+                MainUtil.deleteDirectory(worldFolder);
+                if (whenDone != null)
+                    whenDone.run();
+            }
         });
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
index 329230eaf..a5f75c96a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
@@ -15,6 +15,6 @@ public abstract class AbstractTitle {
         }
     }
 
-    protected abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
+    public abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
         int out);
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index cf2ca96ed..e863e1302 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -71,39 +71,41 @@ public abstract class ChunkManager {
 
     public static void largeRegionTask(final String world, final RegionWrapper region,
         final RunnableVal<ChunkLoc> task, final Runnable whenDone) {
-        TaskManager.runTaskAsync(() -> {
-            HashSet<ChunkLoc> chunks = new HashSet<>();
-            Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
-            for (ChunkLoc mcr : mcrs) {
-                int bx = mcr.x << 9;
-                int bz = mcr.z << 9;
-                int tx = bx + 511;
-                int tz = bz + 511;
-                if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
-                    && tz >= region.minZ) {
-                    for (int x = bx >> 4; x <= (tx >> 4); x++) {
-                        int cbx = x << 4;
-                        int ctx = cbx + 15;
-                        if (cbx <= region.maxX && ctx >= region.minX) {
-                            for (int z = bz >> 4; z <= (tz >> 4); z++) {
-                                int cbz = z << 4;
-                                int ctz = cbz + 15;
-                                if (cbz <= region.maxZ && ctz >= region.minZ) {
-                                    chunks.add(new ChunkLoc(x, z));
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                HashSet<ChunkLoc> chunks = new HashSet<>();
+                Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
+                for (ChunkLoc mcr : mcrs) {
+                    int bx = mcr.x << 9;
+                    int bz = mcr.z << 9;
+                    int tx = bx + 511;
+                    int tz = bz + 511;
+                    if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
+                        && tz >= region.minZ) {
+                        for (int x = bx >> 4; x <= (tx >> 4); x++) {
+                            int cbx = x << 4;
+                            int ctx = cbx + 15;
+                            if (cbx <= region.maxX && ctx >= region.minX) {
+                                for (int z = bz >> 4; z <= (tz >> 4); z++) {
+                                    int cbz = z << 4;
+                                    int ctz = cbz + 15;
+                                    if (cbz <= region.maxZ && ctz >= region.minZ) {
+                                        chunks.add(new ChunkLoc(x, z));
+                                    }
                                 }
                             }
                         }
                     }
                 }
-            }
-            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
+                TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
 
-                @Override public void run(ChunkLoc value) {
-                    if (manager.loadChunk(world, value, false)) {
-                        task.run(value);
+                    @Override public void run(ChunkLoc value) {
+                        if (manager.loadChunk(world, value, false)) {
+                            task.run(value);
+                        }
                     }
-                }
-            }, whenDone);
+                }, whenDone);
+            }
         });
     }
 
@@ -237,18 +239,20 @@ public abstract class ChunkManager {
 
     public void deleteRegionFiles(final String world, final Collection<ChunkLoc> chunks,
         final Runnable whenDone) {
-        TaskManager.runTaskAsync(() -> {
-            for (ChunkLoc loc : chunks) {
-                String directory =
-                    world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z
-                        + ".mca";
-                File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
-                PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
-                if (file.exists()) {
-                    file.delete();
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                for (ChunkLoc loc : chunks) {
+                    String directory =
+                        world + File.separator + "region" + File.separator + "r." + loc.x + "."
+                            + loc.z + ".mca";
+                    File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
+                    PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
+                    if (file.exists()) {
+                        file.delete();
+                    }
                 }
+                TaskManager.runTask(whenDone);
             }
-            TaskManager.runTask(whenDone);
         });
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
index d0b4012a6..11c157320 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
@@ -19,9 +19,11 @@ public class CmdConfirm {
         removePending(player);
         if (commandStr != null)
             MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
-        TaskManager.runTaskLater(() -> {
-            CmdInstance cmd = new CmdInstance(runnable);
-            player.setMeta("cmdConfirm", cmd);
+        TaskManager.runTaskLater(new Runnable() {
+            @Override public void run() {
+                CmdInstance cmd = new CmdInstance(runnable);
+                player.setMeta("cmdConfirm", cmd);
+            }
         }, 1);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index 524ea7f67..3dc43fe06 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -20,31 +20,34 @@ public class CommentManager {
         if (!Settings.Enabled_Components.COMMENT_NOTIFIER || !plot.isOwner(player.getUUID())) {
             return;
         }
-        TaskManager.runTaskLaterAsync(() -> {
-            Collection<CommentInbox> boxes = CommentManager.inboxes.values();
-            final AtomicInteger count = new AtomicInteger(0);
-            final AtomicInteger size = new AtomicInteger(boxes.size());
-            for (final CommentInbox inbox : inboxes.values()) {
-                inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-                    @Override public void run(List<PlotComment> value) {
-                        int total;
-                        if (value != null) {
-                            int num = 0;
-                            for (PlotComment comment : value) {
-                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
-                                    num++;
+        TaskManager.runTaskLaterAsync(new Runnable() {
+            @Override public void run() {
+                Collection<CommentInbox> boxes = CommentManager.inboxes.values();
+                final AtomicInteger count = new AtomicInteger(0);
+                final AtomicInteger size = new AtomicInteger(boxes.size());
+                for (final CommentInbox inbox : inboxes.values()) {
+                    inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+                        @Override public void run(List<PlotComment> value) {
+                            int total;
+                            if (value != null) {
+                                int num = 0;
+                                for (PlotComment comment : value) {
+                                    if (comment.timestamp > getTimestamp(player,
+                                        inbox.toString())) {
+                                        num++;
+                                    }
                                 }
+                                total = count.addAndGet(num);
+                            } else {
+                                total = count.get();
+                            }
+                            if ((size.decrementAndGet() == 0) && (total > 0)) {
+                                AbstractTitle.sendTitle(player, "",
+                                    C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
                             }
-                            total = count.addAndGet(num);
-                        } else {
-                            total = count.get();
                         }
-                        if ((size.decrementAndGet() == 0) && (total > 0)) {
-                            AbstractTitle.sendTitle(player, "",
-                                C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
-                        }
-                    }
-                });
+                    });
+                }
             }
         }, 20);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index 7d82e5236..b8037944e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -43,6 +43,8 @@ public abstract class EventUtil {
 
     public abstract boolean callFlagRemove(Flag<?> flag, Plot plot, Object value);
 
+    public abstract boolean callFlagRemove(Flag<?> flag, Object value, PlotCluster cluster);
+
     public abstract boolean callMerge(Plot plot, int dir, int max);
 
     public abstract boolean callAutoMerge(Plot plot, List<PlotId> plots);
@@ -76,7 +78,11 @@ public abstract class EventUtil {
         }
         final Plot plot = player.getCurrentPlot();
         if (Settings.Teleport.ON_LOGIN && plot != null) {
-            TaskManager.runTask(() -> plot.teleportPlayer(player));
+            TaskManager.runTask(new Runnable() {
+                @Override public void run() {
+                    plot.teleportPlayer(player);
+                }
+            });
             MainUtil.sendMessage(player,
                 C.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
                     .getId().y + ")");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index 5dcc954a8..906c70595 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -411,7 +411,7 @@ public class MainUtil {
 
         ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
-            plotList.add(new ArrayList<>());
+            plotList.add(new ArrayList<Plot>());
         }
 
         for (Plot plot : PlotSquared.get().getPlots()) {
@@ -430,7 +430,7 @@ public class MainUtil {
                     count++;
                 }
             }
-            if (plot.getArea().equals(area)) {
+            if (area != null && plot.getArea().equals(area)) {
                 count++;
             }
             if (alias != null && alias.equals(plot.getAlias())) {
@@ -622,12 +622,14 @@ public class MainUtil {
         if (caption.s().isEmpty()) {
             return true;
         }
-        TaskManager.runTaskAsync(() -> {
-            String m = C.format(caption, args);
-            if (player == null) {
-                PlotSquared.log(m);
-            } else {
-                player.sendMessage(m);
+        TaskManager.runTaskAsync(new Runnable() {
+            @Override public void run() {
+                String m = C.format(caption, args);
+                if (player == null) {
+                    PlotSquared.log(m);
+                } else {
+                    player.sendMessage(m);
+                }
             }
         });
         return true;
@@ -778,28 +780,31 @@ public class MainUtil {
         info = info.replace("%desc%", "No description set.");
         if (info.contains("%rating%")) {
             final String newInfo = info;
-            TaskManager.runTaskAsync(() -> {
-                int max = 10;
-                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
-                    max = 8;
-                }
-                String info1;
-                if (full && Settings.Ratings.CATEGORIES != null
-                    && Settings.Ratings.CATEGORIES.size() > 1) {
-                    double[] ratings = MainUtil.getAverageRatings(plot);
-                    String rating = "";
-                    String prefix = "";
-                    for (int i = 0; i < ratings.length; i++) {
-                        rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
-                            .format("%.1f", ratings[i]);
-                        prefix = ",";
+            TaskManager.runTaskAsync(new Runnable() {
+                @Override public void run() {
+                    int max = 10;
+                    if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES
+                        .isEmpty()) {
+                        max = 8;
                     }
-                    info1 = newInfo.replaceAll("%rating%", rating);
-                } else {
-                    info1 = newInfo.replaceAll("%rating%",
-                        String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                    String info;
+                    if (full && Settings.Ratings.CATEGORIES != null
+                        && Settings.Ratings.CATEGORIES.size() > 1) {
+                        double[] ratings = MainUtil.getAverageRatings(plot);
+                        String rating = "";
+                        String prefix = "";
+                        for (int i = 0; i < ratings.length; i++) {
+                            rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
+                                .format("%.1f", ratings[i]);
+                            prefix = ",";
+                        }
+                        info = newInfo.replaceAll("%rating%", rating);
+                    } else {
+                        info = newInfo.replaceAll("%rating%",
+                            String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                    }
+                    whenDone.run(info);
                 }
-                whenDone.run(info1);
             });
             return;
         }
@@ -810,9 +815,10 @@ public class MainUtil {
         if (directory.exists()) {
             File[] files = directory.listFiles();
             if (null != files) {
-                for (File file : files) {
+                for (int i = 0; i < files.length; i++) {
+                    File file = files[i];
                     if (file.isDirectory()) {
-                        deleteDirectory(file);
+                        deleteDirectory(files[i]);
                     } else {
                         PlotSquared.debug("Deleting file: " + file + " | " + file.delete());
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index 05eeee166..f1ca31b4d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -87,7 +87,7 @@ public abstract class SchematicHandler {
                                 } else {
                                     MainUtil.sendMessage(null, "&7 - &a  success: " + plot.getId());
                                 }
-                                TaskManager.runTask(THIS);
+                                TaskManager.runTask(() -> THIS.run());
                             });
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
index 84d5f7ef4..3991cd78d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -21,8 +21,7 @@ public class GlobalBlockQueue {
     private final AtomicBoolean running;
     private QueueProvider provider;
     /**
-     * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the
-     * server
+     * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the server
      */
     private long last;
     private long secondLast;
@@ -82,50 +81,52 @@ public class GlobalBlockQueue {
             return false;
         }
         running.set(true);
-        TaskManager.runTaskRepeat(() -> {
-            if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
-                lastSuccess = System.currentTimeMillis();
-                tasks();
-                return;
-            }
-            SET_TASK.value1 = 50 + Math.min(
-                (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
-                    System.currentTimeMillis()),
-                GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
-            SET_TASK.value2 = getNextQueue();
-            if (SET_TASK.value2 == null) {
-                return;
-            }
-            if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-                throw new IllegalStateException(
-                    "This shouldn't be possible for placement to occur off the main thread");
-            }
-            // Disable the async catcher as it can't discern async vs parallel
-            SET_TASK.value2.startSet(true);
-            try {
-                if (PARALLEL_THREADS <= 1) {
-                    SET_TASK.run();
-                } else {
-                    ArrayList<Thread> threads = new ArrayList<Thread>();
-                    for (int i = 0; i < PARALLEL_THREADS; i++) {
-                        threads.add(new Thread(SET_TASK));
-                    }
-                    for (Thread thread : threads) {
-                        thread.start();
-                    }
-                    for (Thread thread : threads) {
-                        try {
-                            thread.join();
-                        } catch (InterruptedException e) {
-                            e.printStackTrace();
+        TaskManager.runTaskRepeat(new Runnable() {
+            @Override public void run() {
+                if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
+                    lastSuccess = System.currentTimeMillis();
+                    tasks();
+                    return;
+                }
+                SET_TASK.value1 = 50 + Math.min(
+                    (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
+                        System.currentTimeMillis()),
+                    GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
+                SET_TASK.value2 = getNextQueue();
+                if (SET_TASK.value2 == null) {
+                    return;
+                }
+                if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                    throw new IllegalStateException(
+                        "This shouldn't be possible for placement to occur off the main thread");
+                }
+                // Disable the async catcher as it can't discern async vs parallel
+                SET_TASK.value2.startSet(true);
+                try {
+                    if (PARALLEL_THREADS <= 1) {
+                        SET_TASK.run();
+                    } else {
+                        ArrayList<Thread> threads = new ArrayList<Thread>();
+                        for (int i = 0; i < PARALLEL_THREADS; i++) {
+                            threads.add(new Thread(SET_TASK));
+                        }
+                        for (Thread thread : threads) {
+                            thread.start();
+                        }
+                        for (Thread thread : threads) {
+                            try {
+                                thread.join();
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
                         }
                     }
+                } catch (Throwable e) {
+                    e.printStackTrace();
+                } finally {
+                    // Enable it again (note that we are still on the main thread)
+                    SET_TASK.value2.endSet(true);
                 }
-            } catch (Throwable e) {
-                e.printStackTrace();
-            } finally {
-                // Enable it again (note that we are still on the main thread)
-                SET_TASK.value2.endSet(true);
             }
         }, 1);
         return true;
@@ -167,7 +168,7 @@ public class GlobalBlockQueue {
 
     public List<LocalBlockQueue> getAllQueues() {
         ArrayList<LocalBlockQueue> list =
-            new ArrayList<>(activeQueues.size() + inactiveQueues.size());
+            new ArrayList<LocalBlockQueue>(activeQueues.size() + inactiveQueues.size());
         list.addAll(inactiveQueues);
         list.addAll(activeQueues);
         return list;
@@ -196,7 +197,7 @@ public class GlobalBlockQueue {
             if (PARALLEL_THREADS <= 1) {
                 SET_TASK.run();
             } else {
-                ArrayList<Thread> threads = new ArrayList<>();
+                ArrayList<Thread> threads = new ArrayList<Thread>();
                 for (int i = 0; i < PARALLEL_THREADS; i++) {
                     threads.add(new Thread(SET_TASK));
                 }
@@ -298,6 +299,6 @@ public class GlobalBlockQueue {
     }
 
     public enum QueueStage {
-        INACTIVE, ACTIVE, NONE
+        INACTIVE, ACTIVE, NONE;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index 0362e0831..84f86daa2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -65,6 +65,7 @@ public class ExpireManager {
     /**
      * Gets the account last joined - first joined (or Long.MAX_VALUE)
      *
+     * @param uuid
      * @return result
      */
     public long getAccountAge(UUID uuid) {
@@ -96,26 +97,28 @@ public class ExpireManager {
                 Iterator<Plot> iter = plotsToDelete.iterator();
                 final Plot current = iter.next();
                 if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
-                    TaskManager.runTask(() -> {
-                        pp.setMeta("ignoreExpireTask", true);
-                        pp.teleport(current.getCenter());
-                        pp.deleteMeta("ignoreExpireTask");
-                        PlotMessage msg = new PlotMessage()
-                            .text(num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
-                            .color("$1").text(current.toString()).color("$2")
-                            .suggest("/plot list expired").tooltip("/plot list expired")
-                            //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
-                            .text("\n - ").color("$3").text("Delete this (/plot delete)")
-                            .color("$2").suggest("/plot delete").tooltip("/plot delete")
-                            .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
-                            .color("$2").suggest("/plot set keep 1d").tooltip("/plot set keep 1d")
-                            .text("\n - ").color("$3").text("Keep this (/plot set keep true)")
-                            .color("$2").suggest("/plot set keep true")
-                            .tooltip("/plot set keep true").text("\n - ").color("$3")
-                            .text("Don't show me this").color("$2")
-                            .suggest("/plot toggle clear-confirmation")
-                            .tooltip("/plot toggle clear-confirmation");
-                        msg.send(pp);
+                    TaskManager.runTask(new Runnable() {
+                        @Override public void run() {
+                            pp.setMeta("ignoreExpireTask", true);
+                            pp.teleport(current.getCenter());
+                            pp.deleteMeta("ignoreExpireTask");
+                            PlotMessage msg = new PlotMessage().text(
+                                num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
+                                .color("$1").text(current.toString()).color("$2")
+                                .suggest("/plot list expired").tooltip("/plot list expired")
+                                //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
+                                .text("\n - ").color("$3").text("Delete this (/plot delete)")
+                                .color("$2").suggest("/plot delete").tooltip("/plot delete")
+                                .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
+                                .color("$2").suggest("/plot set keep 1d")
+                                .tooltip("/plot set keep 1d").text("\n - ").color("$3")
+                                .text("Keep this (/plot set keep true)").color("$2")
+                                .suggest("/plot set keep true").tooltip("/plot set keep true")
+                                .text("\n - ").color("$3").text("Don't show me this").color("$2")
+                                .suggest("/plot toggle clear-confirmation")
+                                .tooltip("/plot toggle clear-confirmation");
+                            msg.send(pp);
+                        }
                     });
                     return;
                 } else {
@@ -216,7 +219,12 @@ public class ExpireManager {
 
     public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
         ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
-        queue.removeIf(expiryTask -> !expiryTask.applies(area));
+        Iterator<ExpiryTask> iter = queue.iterator();
+        while (iter.hasNext()) {
+            if (!iter.next().applies(area)) {
+                iter.remove();
+            }
+        }
         return queue;
     }
 
@@ -246,7 +254,7 @@ public class ExpireManager {
         }
         this.running = 2;
         final ConcurrentLinkedDeque<Plot> plots =
-            new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
+            new ConcurrentLinkedDeque<Plot>(PlotSquared.get().getPlots());
         TaskManager.runTaskAsync(new Runnable() {
             @Override public void run() {
                 final Runnable task = this;
@@ -270,8 +278,11 @@ public class ExpireManager {
                     }
                     for (ExpiryTask expiryTask : expired) {
                         if (!expiryTask.needsAnalysis()) {
-                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
-                                expiryTask.requiresConfirmation());
+                            expiredTask.run(newPlot, new Runnable() {
+                                @Override public void run() {
+                                    TaskManager.IMP.taskLaterAsync(task, 1);
+                                }
+                            }, expiryTask.requiresConfirmation());
                             return;
                         }
                     }
@@ -280,19 +291,26 @@ public class ExpireManager {
                             @Override public void run(final PlotAnalysis changed) {
                                 passesComplexity(changed, expired, new RunnableVal<Boolean>() {
                                     @Override public void run(Boolean confirmation) {
-                                        expiredTask.run(newPlot,
-                                            () -> TaskManager.IMP.taskLaterAsync(task, 1),
-                                            confirmation);
+                                        expiredTask.run(newPlot, new Runnable() {
+                                            @Override public void run() {
+                                                TaskManager.IMP.taskLaterAsync(task, 1);
+                                            }
+                                        }, confirmation);
+                                    }
+                                }, new Runnable() {
+                                    @Override public void run() {
+                                        FlagManager
+                                            .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
+                                        TaskManager.runTaskLaterAsync(task, 20);
                                     }
-                                }, () -> {
-                                    FlagManager
-                                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
-                                    TaskManager.runTaskLaterAsync(task, 20);
                                 });
                             }
                         };
-                    final Runnable doAnalysis =
-                        () -> HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
+                    final Runnable doAnalysis = new Runnable() {
+                        @Override public void run() {
+                            HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
+                        }
+                    };
 
                     PlotAnalysis analysis = newPlot.getComplexity(null);
                     if (analysis != null) {
@@ -300,7 +318,11 @@ public class ExpireManager {
                             @Override public void run(Boolean value) {
                                 doAnalysis.run();
                             }
-                        }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
+                        }, new Runnable() {
+                            @Override public void run() {
+                                TaskManager.IMP.taskLaterAsync(task, 1);
+                            }
+                        });
                     } else {
                         doAnalysis.run();
                     }
@@ -308,10 +330,12 @@ public class ExpireManager {
                 }
                 if (plots.isEmpty()) {
                     ExpireManager.this.running = 3;
-                    TaskManager.runTaskLater(() -> {
-                        if (ExpireManager.this.running == 3) {
-                            ExpireManager.this.running = 2;
-                            runTask(expiredTask);
+                    TaskManager.runTaskLater(new Runnable() {
+                        @Override public void run() {
+                            if (ExpireManager.this.running == 3) {
+                                ExpireManager.this.running = 2;
+                                runTask(expiredTask);
+                            }
                         }
                     }, 86400000);
                 } else {
@@ -328,9 +352,8 @@ public class ExpireManager {
             long diff = time - existing;
             if (diff > 0) {
                 Long account_age = this.account_age_cache.get(uuid);
-                if (account_age != null) {
+                if (account_age != null)
                     this.account_age_cache.put(uuid, account_age + diff);
-                }
             }
         }
     }
@@ -340,7 +363,7 @@ public class ExpireManager {
     }
 
     public HashSet<Plot> getPendingExpired() {
-        return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
+        return plotsToDelete == null ? new HashSet<Plot>() : plotsToDelete;
     }
 
     public void deleteWithMessage(Plot plot, Runnable whenDone) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
index 2e7854828..b17f3ce47 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
@@ -118,14 +118,16 @@ public class PlotAnalysis {
 
                 final AtomicInteger mi = new AtomicInteger(0);
 
-                Thread ratingAnalysis = new Thread(() -> {
-                    for (; mi.intValue() < plots.size(); mi.incrementAndGet()) {
-                        int i = mi.intValue();
-                        Plot plot = plots.get(i);
-                        ratings[i] = (int) (
-                            (plot.getAverageRating() + plot.getSettings().getRatings().size())
-                                * 100);
-                        PlotSquared.debug(" | " + plot + " (rating) " + ratings[i]);
+                Thread ratingAnalysis = new Thread(new Runnable() {
+                    @Override public void run() {
+                        for (; mi.intValue() < plots.size(); mi.incrementAndGet()) {
+                            int i = mi.intValue();
+                            Plot plot = plots.get(i);
+                            ratings[i] = (int) (
+                                (plot.getAverageRating() + plot.getSettings().getRatings().size())
+                                    * 100);
+                            PlotSquared.debug(" | " + plot + " (rating) " + ratings[i]);
+                        }
                     }
                 });
                 ratingAnalysis.start();
@@ -422,6 +424,9 @@ public class PlotAnalysis {
     /**
      * A simple array squaring algorithm.
      * - Used for calculating the variance
+     *
+     * @param array
+     * @return
      */
     public static int[] square(int[] array) {
         array = array.clone();
@@ -433,6 +438,9 @@ public class PlotAnalysis {
 
     /**
      * An optimized lossy standard deviation algorithm.
+     *
+     * @param ranks
+     * @return
      */
     public static int[] getSD(int[]... ranks) {
         if (ranks.length == 0) {
@@ -459,13 +467,20 @@ public class PlotAnalysis {
      * An optimized algorithm for ranking a very specific set of inputs<br>
      * - Input is an array of int with a max size of 102400<br>
      * - A reduced sample space allows for sorting (and ranking in this case) in linear time
+     *
+     * @param input
+     * @param input
+     * @return
      */
     public static int[] rank(int[] input) {
         return rank(input, 102400);
     }
 
     /**
-     * An optimized algorithm for ranking a very specific set of inputs.
+     * An optimized algorithm for ranking a very specific set of inputs
+     *
+     * @param input
+     * @return
      */
     public static int[] rank(int[] input, int size) {
         int[] cache = new int[size];
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
index 55f3697f7..235b51a34 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
@@ -5,17 +5,17 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
 import java.util.UUID;
 
-public interface UUIDWrapper {
+public abstract class UUIDWrapper {
 
-    UUID getUUID(PlotPlayer player);
+    public abstract UUID getUUID(PlotPlayer player);
 
-    UUID getUUID(OfflinePlotPlayer player);
+    public abstract UUID getUUID(OfflinePlotPlayer player);
 
-    UUID getUUID(String name);
+    public abstract UUID getUUID(String name);
 
-    OfflinePlotPlayer getOfflinePlayer(UUID uuid);
+    public abstract OfflinePlotPlayer getOfflinePlayer(UUID uuid);
 
-    OfflinePlotPlayer getOfflinePlayer(String name);
+    public abstract OfflinePlotPlayer getOfflinePlayer(String name);
 
-    OfflinePlotPlayer[] getOfflinePlayers();
+    public abstract OfflinePlotPlayer[] getOfflinePlayers();
 }
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
index 1ef04abba..7b29cdf97 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
@@ -84,6 +84,9 @@ public class AbstractDBTest implements AbstractDB {
     @Override public void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
     }
 
+    @Override public void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
+    }
+
     @Override public void setClusterName(PlotCluster cluster, String name) {
     }
 
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
index 6ae75a86d..e9d1f29ec 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
@@ -40,6 +40,10 @@ public class EventUtilTest extends EventUtil {
         return true;
     }
 
+    @Override public boolean callFlagRemove(Flag<?> flag, Object value, PlotCluster cluster) {
+        return true;
+    }
+
     @Override public boolean callMerge(Plot plot, int dir, int max) {
         return false;
     }

From dfbcecb0810681bd9fdff10bdf9e138cdbd958a9 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 4 Feb 2019 12:46:27 -0500
Subject: [PATCH 018/210] Removes Cluster Flags

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/events/ClusterFlagRemoveEvent.java | 63 -------------------
 .../bukkit/util/BukkitEventUtil.java          |  4 --
 .../plotsquared/plot/database/AbstractDB.java |  8 ---
 .../plotsquared/plot/database/DBFunc.java     |  7 ---
 .../plotsquared/plot/database/SQLManager.java | 61 ------------------
 .../plotsquared/plot/flag/FlagManager.java    | 35 -----------
 .../plotsquared/plot/util/EventUtil.java      |  2 -
 .../plot/database/AbstractDBTest.java         |  3 -
 .../plotsquared/plot/util/EventUtilTest.java  |  4 --
 9 files changed, 187 deletions(-)
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
deleted file mode 100644
index 40acef111..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.events;
-
-import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.PlotCluster;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * Called when a flag is removed from a plot.
- */
-public class ClusterFlagRemoveEvent extends Event implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private final PlotCluster cluster;
-    private final Flag flag;
-    private boolean cancelled;
-
-    /**
-     * PlotFlagRemoveEvent: Called when a flag is removed from a plot.
-     *
-     * @param flag    Flag that was removed
-     * @param cluster PlotCluster from which the flag was removed
-     */
-    public ClusterFlagRemoveEvent(Flag flag, PlotCluster cluster) {
-        this.cluster = cluster;
-        this.flag = flag;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    /**
-     * Get the cluster involved.
-     *
-     * @return PlotCluster
-     */
-    public PlotCluster getCluster() {
-        return this.cluster;
-    }
-
-    /**
-     * Get the flag involved.
-     *
-     * @return Flag
-     */
-    public Flag getFlag() {
-        return this.flag;
-    }
-
-    @Override public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    @Override public boolean isCancelled() {
-        return this.cancelled;
-    }
-
-    @Override public void setCancelled(boolean b) {
-        this.cancelled = b;
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
index 7fd22b55e..5a4cf885a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
@@ -101,10 +101,6 @@ public final class BukkitEventUtil extends EventUtil {
             new PlotChangeOwnerEvent(getPlayer(initiator), plot, oldOwner, newOwner, hasOldOwner));
     }
 
-    @Override public boolean callFlagRemove(Flag flag, Object object, PlotCluster cluster) {
-        return callEvent(new ClusterFlagRemoveEvent(flag, cluster));
-    }
-
     @Override @Nullable public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
         PlotRateEvent event = new PlotRateEvent(player, rating, plot);
         Bukkit.getServer().getPluginManager().callEvent(event);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
index a26d4d02e..e5341103d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -143,14 +143,6 @@ public interface AbstractDB {
      */
     void setFlags(Plot plot, HashMap<Flag<?>, Object> flags);
 
-    /**
-     * Set cluster flags.
-     *
-     * @param cluster PlotCluster Object
-     * @param flags   flags to set (flag[])
-     */
-    void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags);
-
     /**
      * Rename a cluster to the given name.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
index 5050c699f..46ede5d3c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
@@ -298,13 +298,6 @@ public class DBFunc {
         DBFunc.dbManager.setFlags(plot, flags);
     }
 
-    public static void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
-        if (dbManager == null) {
-            return;
-        }
-        DBFunc.dbManager.setFlags(cluster, flags);
-    }
-
     /**
      * @param plot
      * @param alias
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 66a21174d..a3e6aadd5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -2666,41 +2666,6 @@ import java.util.concurrent.atomic.AtomicInteger;
                             merged[3 - i] = (m & 1 << i) != 0;
                         }
                         cluster.settings.setMerged(merged);
-                        String[] flags_string;
-                        String myflags = resultSet.getString("flags");
-                        if (myflags == null || myflags.isEmpty()) {
-                            flags_string = new String[] {};
-                        } else {
-                            flags_string = myflags.split(",");
-                        }
-                        HashMap<Flag<?>, Object> flags = new HashMap<>();
-                        for (String element : flags_string) {
-                            if (element.contains(":")) {
-                                String[] split = element.split(":");
-                                String flag_str =
-                                    split[1].replaceAll("\u00AF", ":").replaceAll("´", ",");
-                                Flag flag = FlagManager.getOrCreateFlag(split[0]);
-                                if (flag == null) {
-                                    flag = new StringFlag(split[0]) {
-                                        @Override public String getValueDescription() {
-                                            return "Generic Filler Flag";
-                                        }
-                                    };
-                                }
-                                flags.put(flag, flag.parseValue(flag_str));
-                            } else {
-                                Flag flag = FlagManager.getOrCreateFlag(element);
-                                if (flag == null) {
-                                    flag = new StringFlag(element) {
-                                        @Override public String getValueDescription() {
-                                            return "Generic Filler Flag";
-                                        }
-                                    };
-                                }
-                                flags.put(flag, flag.parseValue(""));
-                            }
-                        }
-                        cluster.settings.flags = flags;
                     } else {
                         PlotSquared.debug("&cCluster #" + id + "(" + cluster
                             + ") in cluster_settings does not exist. Please create the cluster or remove this entry.");
@@ -2726,32 +2691,6 @@ import java.util.concurrent.atomic.AtomicInteger;
         return newClusters;
     }
 
-    @Override public void setFlags(final PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
-        final StringBuilder flag_string = new StringBuilder();
-        int i = 0;
-        for (Entry<Flag<?>, Object> flag : flags.entrySet()) {
-            if (i != 0) {
-                flag_string.append(',');
-            }
-            flag_string.append(flag.getKey().getName()).append(':').append(
-                flag.getKey().valueToString(flag.getValue()).replaceAll(":", "\u00AF")
-                    .replaceAll(",", "´"));
-            i++;
-        }
-        addClusterTask(cluster, new UniqueStatement("setFlags") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string.toString());
-                stmt.setInt(2, getClusterId(cluster));
-            }
-
-            @Override public PreparedStatement get() throws SQLException {
-                return SQLManager.this.connection.prepareStatement(
-                    "UPDATE `" + SQLManager.this.prefix
-                        + "cluster_settings` SET `flags` = ? WHERE `cluster_id` = ?");
-            }
-        });
-    }
-
     @Override public void setClusterName(final PlotCluster cluster, final String name) {
         addClusterTask(cluster, new UniqueStatement("setClusterName") {
             @Override public void set(PreparedStatement stmt) throws SQLException {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
index 06be89e15..98c523b2e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -141,13 +141,6 @@ public class FlagManager {
         return true;
     }
 
-    public static <V> boolean addClusterFlag(PlotCluster cluster, Flag<V> flag, V value) {
-        getSettingFlag(cluster.area, cluster.settings, flag);
-        cluster.settings.flags.put(flag, value);
-        DBFunc.setFlags(cluster, cluster.settings.flags);
-        return true;
-    }
-
     /**
      * Returns a map of the {@link Flag}s and their values for the specified plot.
      *
@@ -217,20 +210,6 @@ public class FlagManager {
         return true;
     }
 
-    public static boolean removeClusterFlag(PlotCluster cluster, Flag id) {
-        Object object = cluster.settings.flags.remove(id);
-        if (object == null) {
-            return false;
-        }
-        boolean result = EventUtil.manager.callFlagRemove(id, object, cluster);
-        if (!result) {
-            cluster.settings.flags.put(id, object);
-            return false;
-        }
-        DBFunc.setFlags(cluster, cluster.settings.flags);
-        return true;
-    }
-
     public static void setPlotFlags(Plot origin, HashMap<Flag<?>, Object> flags) {
         for (Plot plot : origin.getConnectedPlots()) {
             if (flags != null && !flags.isEmpty()) {
@@ -248,20 +227,6 @@ public class FlagManager {
         }
     }
 
-    public static void setClusterFlags(PlotCluster cluster, Set<Flag> flags) {
-        if (flags != null && !flags.isEmpty()) {
-            cluster.settings.flags.clear();
-            for (Flag flag : flags) {
-                cluster.settings.flags.put(flag, flag);
-            }
-        } else if (cluster.settings.flags.isEmpty()) {
-            return;
-        } else {
-            cluster.settings.flags.clear();
-        }
-        DBFunc.setFlags(cluster, cluster.settings.flags);
-    }
-
     /**
      * Get a list of registered {@link Flag} objects based on player permissions.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index b8037944e..0c608c0e9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -43,8 +43,6 @@ public abstract class EventUtil {
 
     public abstract boolean callFlagRemove(Flag<?> flag, Plot plot, Object value);
 
-    public abstract boolean callFlagRemove(Flag<?> flag, Object value, PlotCluster cluster);
-
     public abstract boolean callMerge(Plot plot, int dir, int max);
 
     public abstract boolean callAutoMerge(Plot plot, List<PlotId> plots);
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
index 7b29cdf97..1ef04abba 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
@@ -84,9 +84,6 @@ public class AbstractDBTest implements AbstractDB {
     @Override public void setFlags(Plot plot, HashMap<Flag<?>, Object> flags) {
     }
 
-    @Override public void setFlags(PlotCluster cluster, HashMap<Flag<?>, Object> flags) {
-    }
-
     @Override public void setClusterName(PlotCluster cluster, String name) {
     }
 
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
index e9d1f29ec..6ae75a86d 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
@@ -40,10 +40,6 @@ public class EventUtilTest extends EventUtil {
         return true;
     }
 
-    @Override public boolean callFlagRemove(Flag<?> flag, Object value, PlotCluster cluster) {
-        return true;
-    }
-
     @Override public boolean callMerge(Plot plot, int dir, int max) {
         return false;
     }

From e3d43509cf56d399bd3edb7ff49c5a70798a18f8 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 4 Feb 2019 18:00:05 -0500
Subject: [PATCH 019/210] Cleanup of some database methods

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/uuid/FileUUIDHandler.java          | 356 +++++-----
 .../plotsquared/plot/commands/Database.java   |  46 +-
 .../plotsquared/plot/database/SQLManager.java | 657 +++++++++---------
 .../plotsquared/plot/flag/FlagManager.java    |  11 +-
 4 files changed, 506 insertions(+), 564 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index 2223feceb..edb08b763 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -47,204 +47,200 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
         } else {
             world = worlds.get(0).getName();
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
-                File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
-                if (uuidFile.exists()) {
-                    try {
-                        List<String> lines =
-                            Files.readAllLines(uuidFile.toPath(), StandardCharsets.UTF_8);
-                        for (String line : lines) {
-                            try {
-                                line = line.trim();
-                                if (line.isEmpty()) {
-                                    continue;
-                                }
-                                line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
-                                String[] split = line.split("\\|");
-                                String name = split[0];
-                                if (name.isEmpty() || (name.length() > 16) || !StringMan
-                                    .isAlphanumericUnd(name)) {
-                                    continue;
-                                }
-                                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                                if (uuid == null) {
-                                    continue;
-                                }
-                                UUIDHandler.add(new StringWrapper(name), uuid);
-                            } catch (Exception e2) {
-                                e2.printStackTrace();
+        TaskManager.runTaskAsync(() -> {
+            PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
+            File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
+            if (uuidFile.exists()) {
+                try {
+                    List<String> lines =
+                        Files.readAllLines(uuidFile.toPath(), StandardCharsets.UTF_8);
+                    for (String line : lines) {
+                        try {
+                            line = line.trim();
+                            if (line.isEmpty()) {
+                                continue;
                             }
+                            line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
+                            String[] split = line.split("\\|");
+                            String name = split[0];
+                            if (name.isEmpty() || (name.length() > 16) || !StringMan
+                                .isAlphanumericUnd(name)) {
+                                continue;
+                            }
+                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                            if (uuid == null) {
+                                continue;
+                            }
+                            UUIDHandler.add(new StringWrapper(name), uuid);
+                        } catch (Exception e2) {
+                            e2.printStackTrace();
                         }
-                    } catch (IOException e) {
-                        e.printStackTrace();
                     }
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
-                HashBiMap<StringWrapper, UUID> toAdd =
-                    HashBiMap.create(new HashMap<StringWrapper, UUID>());
-                if (Settings.UUID.NATIVE_UUID_PROVIDER) {
-                    HashSet<UUID> all = UUIDHandler.getAllUUIDS();
-                    PlotSquared.debug("&aFast mode UUID caching enabled!");
-                    File playerDataFolder =
-                        new File(container, world + File.separator + "playerdata");
-                    String[] dat = playerDataFolder.list(new DatFileFilter());
-                    boolean check = all.isEmpty();
-                    if (dat != null) {
-                        for (String current : dat) {
-                            String s = current.replaceAll(".dat$", "");
-                            try {
-                                UUID uuid = UUID.fromString(s);
-                                if (check || all.remove(uuid)) {
-                                    File file = new File(playerDataFolder, current);
-                                    NbtFactory.NbtCompound compound = NbtFactory
-                                        .fromStream(new FileInputStream(file),
-                                            NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                                    if (!compound.containsKey("bukkit")) {
-                                        PlotSquared.debug("ERROR: Player data (" + uuid.toString()
-                                            + ".dat) does not contain the the key \"bukkit\"");
-                                    } else {
-                                        NbtFactory.NbtCompound bukkit =
-                                            (NbtFactory.NbtCompound) compound.get("bukkit");
-                                        String name = (String) bukkit.get("lastKnownName");
-                                        long last = (long) bukkit.get("lastPlayed");
-                                        long first = (long) bukkit.get("firstPlayed");
-                                        if (ExpireManager.IMP != null) {
-                                            ExpireManager.IMP.storeDate(uuid, last);
-                                            ExpireManager.IMP.storeAccountAge(uuid, last - first);
-                                        }
-                                        toAdd.put(new StringWrapper(name), uuid);
+            }
+            HashBiMap<StringWrapper, UUID> toAdd =
+                HashBiMap.create(new HashMap<StringWrapper, UUID>());
+            if (Settings.UUID.NATIVE_UUID_PROVIDER) {
+                HashSet<UUID> all = UUIDHandler.getAllUUIDS();
+                PlotSquared.debug("&aFast mode UUID caching enabled!");
+                File playerDataFolder =
+                    new File(container, world + File.separator + "playerdata");
+                String[] dat = playerDataFolder.list(new DatFileFilter());
+                boolean check = all.isEmpty();
+                if (dat != null) {
+                    for (String current : dat) {
+                        String s = current.replaceAll(".dat$", "");
+                        try {
+                            UUID uuid = UUID.fromString(s);
+                            if (check || all.remove(uuid)) {
+                                File file = new File(playerDataFolder, current);
+                                NbtFactory.NbtCompound compound = NbtFactory
+                                    .fromStream(new FileInputStream(file),
+                                        NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                                if (!compound.containsKey("bukkit")) {
+                                    PlotSquared.debug("ERROR: Player data (" + uuid.toString()
+                                        + ".dat) does not contain the the key \"bukkit\"");
+                                } else {
+                                    NbtFactory.NbtCompound bukkit =
+                                        (NbtFactory.NbtCompound) compound.get("bukkit");
+                                    String name = (String) bukkit.get("lastKnownName");
+                                    long last = (long) bukkit.get("lastPlayed");
+                                    long first = (long) bukkit.get("firstPlayed");
+                                    if (ExpireManager.IMP != null) {
+                                        ExpireManager.IMP.storeDate(uuid, last);
+                                        ExpireManager.IMP.storeAccountAge(uuid, last - first);
                                     }
-                                }
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
-                            }
-                        }
-                    }
-                    add(toAdd);
-                    if (all.isEmpty()) {
-                        if (whenDone != null) {
-                            whenDone.run();
-                        }
-                        return;
-                    } else {
-                        PlotSquared.debug("Failed to cache: " + all.size()
-                            + " uuids - slowly processing all files");
-                    }
-                }
-                HashSet<String> worlds = Sets.newHashSet(world, "world");
-                HashSet<UUID> uuids = new HashSet<>();
-                HashSet<String> names = new HashSet<>();
-                File playerDataFolder = null;
-                for (String worldName : worlds) {
-                    // Getting UUIDs
-                    playerDataFolder =
-                        new File(container, worldName + File.separator + "playerdata");
-                    String[] dat = playerDataFolder.list(new DatFileFilter());
-                    if ((dat != null) && (dat.length != 0)) {
-                        for (String current : dat) {
-                            String s = current.replaceAll(".dat$", "");
-                            try {
-                                UUID uuid = UUID.fromString(s);
-                                uuids.add(uuid);
-                            } catch (Exception ignored) {
-                                PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
-                            }
-                        }
-                        break;
-                    }
-                    // Getting names
-                    File playersFolder = new File(worldName + File.separator + "players");
-                    dat = playersFolder.list(new DatFileFilter());
-                    if ((dat != null) && (dat.length != 0)) {
-                        for (String current : dat) {
-                            names.add(current.replaceAll(".dat$", ""));
-                        }
-                        break;
-                    }
-                }
-                for (UUID uuid : uuids) {
-                    try {
-                        File file =
-                            new File(playerDataFolder + File.separator + uuid.toString() + ".dat");
-                        if (!file.exists()) {
-                            continue;
-                        }
-                        NbtFactory.NbtCompound compound = NbtFactory
-                            .fromStream(new FileInputStream(file),
-                                NbtFactory.StreamOptions.GZIP_COMPRESSION);
-                        if (!compound.containsKey("bukkit")) {
-                            PlotSquared.debug("ERROR: Player data (" + uuid.toString()
-                                + ".dat) does not contain the the key \"bukkit\"");
-                        } else {
-                            NbtFactory.NbtCompound bukkit =
-                                (NbtFactory.NbtCompound) compound.get("bukkit");
-                            String name = (String) bukkit.get("lastKnownName");
-                            StringWrapper wrap = new StringWrapper(name);
-                            if (!toAdd.containsKey(wrap)) {
-                                long last = (long) bukkit.get("lastPlayed");
-                                long first = (long) bukkit.get("firstPlayed");
-                                if (Settings.UUID.OFFLINE) {
-                                    if (Settings.UUID.FORCE_LOWERCASE && !name.toLowerCase()
-                                        .equals(name)) {
-                                        uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                                    } else {
-                                        long most = (long) compound.get("UUIDMost");
-                                        long least = (long) compound.get("UUIDLeast");
-                                        uuid = new UUID(most, least);
-                                    }
-                                }
-                                if (ExpireManager.IMP != null) {
-                                    ExpireManager.IMP.storeDate(uuid, last);
-                                    ExpireManager.IMP.storeAccountAge(uuid, last - first);
-                                }
-                                toAdd.put(wrap, uuid);
-                            }
-                        }
-                    } catch (Exception ignored) {
-                        PlotSquared
-                            .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
-                    }
-                }
-                for (String name : names) {
-                    UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                    StringWrapper nameWrap = new StringWrapper(name);
-                    toAdd.put(nameWrap, uuid);
-                }
-
-                if (getUUIDMap().isEmpty()) {
-                    for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
-                        .getOfflinePlayers()) {
-                        long last = op.getLastPlayed();
-                        if (last != 0) {
-                            String name = op.getName();
-                            StringWrapper wrap = new StringWrapper(name);
-                            if (!toAdd.containsKey(wrap)) {
-                                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
-                                toAdd.put(wrap, uuid);
-                                if (ExpireManager.IMP != null) {
-                                    ExpireManager.IMP.storeDate(uuid, last);
+                                    toAdd.put(new StringWrapper(name), uuid);
                                 }
                             }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
                         }
                     }
                 }
                 add(toAdd);
-                if (whenDone != null) {
-                    whenDone.run();
+                if (all.isEmpty()) {
+                    if (whenDone != null) {
+                        whenDone.run();
+                    }
+                    return;
+                } else {
+                    PlotSquared.debug("Failed to cache: " + all.size()
+                        + " uuids - slowly processing all files");
                 }
             }
+            HashSet<String> worlds1 = Sets.newHashSet(world, "world");
+            HashSet<UUID> uuids = new HashSet<>();
+            HashSet<String> names = new HashSet<>();
+            File playerDataFolder = null;
+            for (String worldName : worlds1) {
+                // Getting UUIDs
+                playerDataFolder =
+                    new File(container, worldName + File.separator + "playerdata");
+                String[] dat = playerDataFolder.list(new DatFileFilter());
+                if ((dat != null) && (dat.length != 0)) {
+                    for (String current : dat) {
+                        String s = current.replaceAll(".dat$", "");
+                        try {
+                            UUID uuid = UUID.fromString(s);
+                            uuids.add(uuid);
+                        } catch (Exception ignored) {
+                            PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
+                        }
+                    }
+                    break;
+                }
+                // Getting names
+                File playersFolder = new File(worldName + File.separator + "players");
+                dat = playersFolder.list(new DatFileFilter());
+                if ((dat != null) && (dat.length != 0)) {
+                    for (String current : dat) {
+                        names.add(current.replaceAll(".dat$", ""));
+                    }
+                    break;
+                }
+            }
+            for (UUID uuid : uuids) {
+                try {
+                    File file =
+                        new File(playerDataFolder + File.separator + uuid.toString() + ".dat");
+                    if (!file.exists()) {
+                        continue;
+                    }
+                    NbtFactory.NbtCompound compound = NbtFactory
+                        .fromStream(new FileInputStream(file),
+                            NbtFactory.StreamOptions.GZIP_COMPRESSION);
+                    if (!compound.containsKey("bukkit")) {
+                        PlotSquared.debug("ERROR: Player data (" + uuid.toString()
+                            + ".dat) does not contain the the key \"bukkit\"");
+                    } else {
+                        NbtFactory.NbtCompound bukkit =
+                            (NbtFactory.NbtCompound) compound.get("bukkit");
+                        String name = (String) bukkit.get("lastKnownName");
+                        StringWrapper wrap = new StringWrapper(name);
+                        if (!toAdd.containsKey(wrap)) {
+                            long last = (long) bukkit.get("lastPlayed");
+                            long first = (long) bukkit.get("firstPlayed");
+                            if (Settings.UUID.OFFLINE) {
+                                if (Settings.UUID.FORCE_LOWERCASE && !name.toLowerCase()
+                                    .equals(name)) {
+                                    uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                                } else {
+                                    long most = (long) compound.get("UUIDMost");
+                                    long least = (long) compound.get("UUIDLeast");
+                                    uuid = new UUID(most, least);
+                                }
+                            }
+                            if (ExpireManager.IMP != null) {
+                                ExpireManager.IMP.storeDate(uuid, last);
+                                ExpireManager.IMP.storeAccountAge(uuid, last - first);
+                            }
+                            toAdd.put(wrap, uuid);
+                        }
+                    }
+                } catch (Exception ignored) {
+                    PlotSquared
+                        .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
+                }
+            }
+            for (String name : names) {
+                UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+                StringWrapper nameWrap = new StringWrapper(name);
+                toAdd.put(nameWrap, uuid);
+            }
+
+            if (getUUIDMap().isEmpty()) {
+                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
+                    .getOfflinePlayers()) {
+                    long last = op.getLastPlayed();
+                    if (last != 0) {
+                        String name = op.getName();
+                        StringWrapper wrap = new StringWrapper(name);
+                        if (!toAdd.containsKey(wrap)) {
+                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
+                            toAdd.put(wrap, uuid);
+                            if (ExpireManager.IMP != null) {
+                                ExpireManager.IMP.storeDate(uuid, last);
+                            }
+                        }
+                    }
+                }
+            }
+            add(toAdd);
+            if (whenDone != null) {
+                whenDone.run();
+            }
         });
         return true;
     }
 
     @Override public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                ifFetch.value = FileUUIDHandler.this.uuidWrapper.getUUID(name);
-                TaskManager.runTask(ifFetch);
-            }
+        TaskManager.runTaskAsync(() -> {
+            ifFetch.value = FileUUIDHandler.this.uuidWrapper.getUUID(name);
+            TaskManager.runTask(ifFetch);
         });
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
index b760bc282..039959916 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -30,25 +30,18 @@ import java.util.Map.Entry;
 
     public static void insertPlots(final SQLManager manager, final List<Plot> plots,
         final PlotPlayer player) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try {
-                    ArrayList<Plot> ps = new ArrayList<>();
-                    for (Plot p : plots) {
-                        ps.add(p);
-                    }
-                    MainUtil.sendMessage(player, "&6Starting...");
-                    manager.createPlotsAndData(ps, new Runnable() {
-                        @Override public void run() {
-                            MainUtil.sendMessage(player, "&6Database conversion finished!");
-                            manager.close();
-                        }
-                    });
-                } catch (Exception e) {
-                    MainUtil.sendMessage(player,
-                        "Failed to insert plot objects, see stacktrace for info");
-                    e.printStackTrace();
-                }
+        TaskManager.runTaskAsync(() -> {
+            try {
+                ArrayList<Plot> ps = new ArrayList<>(plots);
+                MainUtil.sendMessage(player, "&6Starting...");
+                manager.createPlotsAndData(ps, () -> {
+                    MainUtil.sendMessage(player, "&6Database conversion finished!");
+                    manager.close();
+                });
+            } catch (Exception e) {
+                MainUtil.sendMessage(player,
+                    "Failed to insert plot objects, see stacktrace for info");
+                e.printStackTrace();
             }
         });
     }
@@ -130,20 +123,13 @@ import java.util.Map.Entry;
                                 plots.add(plot);
                             }
                         } else {
-                            HashMap<PlotId, Plot> plotmap =
-                                PlotSquared.get().plots_tmp.get(areaname);
-                            if (plotmap == null) {
-                                plotmap = new HashMap<>();
-                                PlotSquared.get().plots_tmp.put(areaname, plotmap);
-                            }
+                            HashMap<PlotId, Plot> plotmap = PlotSquared.get().plots_tmp
+                                .computeIfAbsent(areaname, k -> new HashMap<>());
                             plotmap.putAll(entry.getValue());
                         }
                     }
-                    DBFunc.createPlotsAndData(plots, new Runnable() {
-                        @Override public void run() {
-                            MainUtil.sendMessage(player, "&6Database conversion finished!");
-                        }
-                    });
+                    DBFunc.createPlotsAndData(plots,
+                        () -> MainUtil.sendMessage(player, "&6Database conversion finished!"));
                     return true;
                 case "mysql":
                     if (args.length < 6) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index a3e6aadd5..8629efd17 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -6,7 +6,6 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.config.Storage;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
-import com.github.intellectualsites.plotsquared.plot.flag.StringFlag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@@ -121,42 +120,40 @@ import java.util.concurrent.atomic.AtomicInteger;
         } catch (SQLException e) {
             e.printStackTrace();
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                long last = System.currentTimeMillis();
-                while (true) {
-                    if (SQLManager.this.closed) {
-                        break;
+        TaskManager.runTaskAsync(() -> {
+            long last = System.currentTimeMillis();
+            while (true) {
+                if (SQLManager.this.closed) {
+                    break;
+                }
+                boolean hasTask =
+                    !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
+                        || !clusterTasks.isEmpty();
+                if (hasTask) {
+                    if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
+                        || !isValid()) {
+                        last = System.currentTimeMillis();
+                        reconnect();
                     }
-                    boolean hasTask =
-                        !globalTasks.isEmpty() || !playerTasks.isEmpty() || !plotTasks.isEmpty()
-                            || !clusterTasks.isEmpty();
-                    if (hasTask) {
-                        if (SQLManager.this.mySQL && System.currentTimeMillis() - last > 550000
-                            || !isValid()) {
-                            last = System.currentTimeMillis();
-                            reconnect();
-                        }
-                        if (!sendBatch()) {
-                            try {
-                                if (!getNotifyTasks().isEmpty()) {
-                                    for (Runnable task : getNotifyTasks()) {
-                                        TaskManager.runTask(task);
-                                    }
-                                    getNotifyTasks().clear();
-                                }
-                                Thread.sleep(50);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    } else {
+                    if (!sendBatch()) {
                         try {
-                            Thread.sleep(1000);
+                            if (!getNotifyTasks().isEmpty()) {
+                                for (Runnable task : getNotifyTasks()) {
+                                    TaskManager.runTask(task);
+                                }
+                                getNotifyTasks().clear();
+                            }
+                            Thread.sleep(50);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
                     }
+                } else {
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         });
@@ -171,7 +168,7 @@ import java.util.concurrent.atomic.AtomicInteger;
             return false;
         }
         try (PreparedStatement stmt = this.connection.prepareStatement("SELECT 1")) {
-            stmt.executeQuery();
+            stmt.execute();
             return true;
         } catch (Throwable e) {
             return false;
@@ -212,7 +209,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                     return null;
                 }
 
-                @Override public void set(PreparedStatement stmt) {
+                @Override public void set(PreparedStatement statement) {
                 }
 
                 @Override public void addBatch(PreparedStatement statement) {
@@ -242,7 +239,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                     return null;
                 }
 
-                @Override public void set(PreparedStatement stmt) {
+                @Override public void set(PreparedStatement statement) {
                 }
 
                 @Override public void addBatch(PreparedStatement statement) {
@@ -269,7 +266,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                     return null;
                 }
 
-                @Override public void set(PreparedStatement stmt) {
+                @Override public void set(PreparedStatement statement) {
                 }
 
                 @Override public void addBatch(PreparedStatement statement) {
@@ -515,92 +512,88 @@ import java.util.concurrent.atomic.AtomicInteger;
     }
 
     @Override public void createPlotsAndData(final List<Plot> myList, final Runnable whenDone) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                try {
-                    // Create the plots
-                    createPlots(myList, new Runnable() {
-                        @Override public void run() {
-                            try {
-                                // Creating datastructures
-                                HashMap<PlotId, Plot> plotMap = new HashMap<>();
-                                for (Plot plot : myList) {
-                                    plotMap.put(plot.getId(), plot);
-                                }
-                                ArrayList<SettingsPair> settings = new ArrayList<>();
-                                final ArrayList<UUIDPair> helpers = new ArrayList<>();
-                                final ArrayList<UUIDPair> trusted = new ArrayList<>();
-                                final ArrayList<UUIDPair> denied = new ArrayList<>();
+        addGlobalTask(() -> {
+            try {
+                // Create the plots
+                createPlots(myList, () -> {
+                    try {
+                        // Creating datastructures
+                        HashMap<PlotId, Plot> plotMap = new HashMap<>();
+                        for (Plot plot : myList) {
+                            plotMap.put(plot.getId(), plot);
+                        }
+                        ArrayList<SettingsPair> settings = new ArrayList<>();
+                        final ArrayList<UUIDPair> helpers = new ArrayList<>();
+                        final ArrayList<UUIDPair> trusted = new ArrayList<>();
+                        final ArrayList<UUIDPair> denied = new ArrayList<>();
 
-                                // Populating structures
-                                try (PreparedStatement stmt = SQLManager.this.connection
-                                    .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
-                                    ResultSet result = stmt.executeQuery()) {
-                                    while (result.next()) {
-                                        int id = result.getInt("id");
-                                        int x = result.getInt("plot_id_x");
-                                        int y = result.getInt("plot_id_z");
-                                        PlotId plotId = new PlotId(x, y);
-                                        Plot plot = plotMap.get(plotId);
-                                        if (plot != null) {
-                                            settings.add(new SettingsPair(id, plot.getSettings()));
-                                            for (UUID uuid : plot.getDenied()) {
-                                                denied.add(new UUIDPair(id, uuid));
-                                            }
-                                            for (UUID uuid : plot.getMembers()) {
-                                                trusted.add(new UUIDPair(id, uuid));
-                                            }
-                                            for (UUID uuid : plot.getTrusted()) {
-                                                helpers.add(new UUIDPair(id, uuid));
-                                            }
-                                        }
+                        // Populating structures
+                        try (PreparedStatement stmt = SQLManager.this.connection
+                            .prepareStatement(SQLManager.this.GET_ALL_PLOTS);
+                            ResultSet result = stmt.executeQuery()) {
+                            while (result.next()) {
+                                int id = result.getInt("id");
+                                int x = result.getInt("plot_id_x");
+                                int y = result.getInt("plot_id_z");
+                                PlotId plotId = new PlotId(x, y);
+                                Plot plot = plotMap.get(plotId);
+                                if (plot != null) {
+                                    settings.add(new SettingsPair(id, plot.getSettings()));
+                                    for (UUID uuid : plot.getDenied()) {
+                                        denied.add(new UUIDPair(id, uuid));
+                                    }
+                                    for (UUID uuid : plot.getMembers()) {
+                                        trusted.add(new UUIDPair(id, uuid));
+                                    }
+                                    for (UUID uuid : plot.getTrusted()) {
+                                        helpers.add(new UUIDPair(id, uuid));
                                     }
                                 }
-                                createSettings(settings, new Runnable() {
+                            }
+                        }
+                        createSettings(settings, new Runnable() {
+                            @Override public void run() {
+                                createTiers(helpers, "helpers", new Runnable() {
                                     @Override public void run() {
-                                        createTiers(helpers, "helpers", new Runnable() {
+                                        createTiers(trusted, "trusted", new Runnable() {
                                             @Override public void run() {
-                                                createTiers(trusted, "trusted", new Runnable() {
-                                                    @Override public void run() {
-                                                        createTiers(denied, "denied",
-                                                            new Runnable() {
-                                                                @Override public void run() {
-                                                                    try {
-                                                                        SQLManager.this.connection
-                                                                            .commit();
-                                                                    } catch (SQLException e) {
-                                                                        e.printStackTrace();
-                                                                    }
-                                                                    if (whenDone != null) {
-                                                                        whenDone.run();
-                                                                    }
-                                                                }
-                                                            });
-                                                    }
-                                                });
+                                                createTiers(denied, "denied",
+                                                    new Runnable() {
+                                                        @Override public void run() {
+                                                            try {
+                                                                SQLManager.this.connection
+                                                                    .commit();
+                                                            } catch (SQLException e) {
+                                                                e.printStackTrace();
+                                                            }
+                                                            if (whenDone != null) {
+                                                                whenDone.run();
+                                                            }
+                                                        }
+                                                    });
                                             }
                                         });
                                     }
                                 });
-                            } catch (SQLException e) {
-                                e.printStackTrace();
-                                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                                try {
-                                    SQLManager.this.connection.commit();
-                                } catch (SQLException e1) {
-                                    e1.printStackTrace();
-                                }
                             }
+                        });
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                        PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                        try {
+                            SQLManager.this.connection.commit();
+                        } catch (SQLException e1) {
+                            e1.printStackTrace();
                         }
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
-                    try {
-                        SQLManager.this.connection.commit();
-                    } catch (SQLException e1) {
-                        e1.printStackTrace();
                     }
+                });
+            } catch (Exception e) {
+                e.printStackTrace();
+                PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
+                try {
+                    SQLManager.this.connection.commit();
+                } catch (SQLException e1) {
+                    e1.printStackTrace();
                 }
             }
         });
@@ -929,11 +922,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                 stmt.setInt(1, pair.id);
             }
         };
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                setBulk(myList, mod, whenDone);
-            }
-        });
+        addGlobalTask(() -> setBulk(myList, mod, whenDone));
     }
 
     public void createEmptySettings(final ArrayList<Integer> myList, final Runnable whenDone) {
@@ -977,25 +966,21 @@ import java.util.concurrent.atomic.AtomicInteger;
                 stmt.setInt(1, id);
             }
         };
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                setBulk(myList, mod, whenDone);
-            }
-        });
+        addGlobalTask(() -> setBulk(myList, mod, whenDone));
     }
 
     public void createPlotSafe(final Plot plot, final Runnable success, final Runnable failure) {
         final long timestamp = plot.getTimestamp();
         addPlotTask(plot, new UniqueStatement("createPlotSafe_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
-                stmt.setString(6, plot.getArea().toString());
-                stmt.setInt(7, plot.getId().x);
-                stmt.setInt(8, plot.getId().y);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, plot.getId().x);
+                statement.setInt(2, plot.getId().y);
+                statement.setString(3, plot.owner.toString());
+                statement.setString(4, plot.getArea().toString());
+                statement.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+                statement.setString(6, plot.getArea().toString());
+                statement.setInt(7, plot.getId().x);
+                statement.setInt(8, plot.getId().y);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1015,9 +1000,9 @@ import java.util.concurrent.atomic.AtomicInteger;
                             plot.temp = keys.getInt(1);
                             addPlotTask(plot, new UniqueStatement(
                                 "createPlotAndSettings_settings_" + plot.hashCode()) {
-                                @Override public void set(PreparedStatement stmt)
+                                @Override public void set(PreparedStatement statement)
                                     throws SQLException {
-                                    stmt.setInt(1, getId(plot));
+                                    statement.setInt(1, getId(plot));
                                 }
 
                                 @Override public PreparedStatement get() throws SQLException {
@@ -1054,12 +1039,12 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void createPlotAndSettings(final Plot plot, Runnable whenDone) {
         addPlotTask(plot, new UniqueStatement("createPlotAndSettings_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, plot.getId().x);
-                stmt.setInt(2, plot.getId().y);
-                stmt.setString(3, plot.owner.toString());
-                stmt.setString(4, plot.getArea().toString());
-                stmt.setTimestamp(5, new Timestamp(plot.getTimestamp()));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, plot.getId().x);
+                statement.setInt(2, plot.getId().y);
+                statement.setString(3, plot.owner.toString());
+                statement.setString(4, plot.getArea().toString());
+                statement.setTimestamp(5, new Timestamp(plot.getTimestamp()));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1080,8 +1065,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             }
         });
         addPlotTask(plot, new UniqueStatement("createPlotAndSettings_settings_" + plot.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1248,8 +1233,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void deleteSettings(final Plot plot) {
         addPlotTask(plot, new UniqueStatement("delete_plot_settings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1265,8 +1250,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             return;
         }
         addPlotTask(plot, new UniqueStatement("delete_plot_helpers") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1282,8 +1267,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             return;
         }
         addPlotTask(plot, new UniqueStatement("delete_plot_trusted") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1299,8 +1284,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             return;
         }
         addPlotTask(plot, new UniqueStatement("delete_plot_denied") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1313,9 +1298,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void deleteComments(final Plot plot) {
         addPlotTask(plot, new UniqueStatement("delete_plot_comments") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, plot.getArea().toString());
-                stmt.setInt(2, plot.hashCode());
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, plot.getArea().toString());
+                statement.setInt(2, plot.hashCode());
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1331,8 +1316,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             return;
         }
         addPlotTask(plot, new UniqueStatement("delete_plot_ratings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1359,8 +1344,8 @@ import java.util.concurrent.atomic.AtomicInteger;
         deleteComments(plot);
         deleteRatings(plot);
         addPlotTask(plot, new UniqueStatement("delete_plot") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1381,8 +1366,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             "Creating plot... Id: " + plot.getId() + " World: " + plot.getWorldName() + " Owner: "
                 + plot.owner + " Index: " + id);
         addPlotTask(plot, new UniqueStatement("createPlotSettings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, id);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1685,8 +1670,8 @@ import java.util.concurrent.atomic.AtomicInteger;
                                 time = System.currentTimeMillis() + id;
                             }
                         }
-                        Plot p = new Plot(plot_id, user, new HashSet<UUID>(), new HashSet<UUID>(),
-                            new HashSet<UUID>(), "", null, null, null,
+                        Plot p = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
+                            new HashSet<>(), "", null, null, null,
                             new boolean[] {false, false, false, false}, time, id);
                         HashMap<PlotId, Plot> map = newPlots.get(areaid);
                         if (map != null) {
@@ -1845,7 +1830,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                                     } catch (Exception ignored) {
                                     }
                             }
-                            Integer m = resultSet.getInt("merged");
+                            int m = resultSet.getInt("merged");
                             boolean[] merged = new boolean[4];
                             for (int i = 0; i < 4; i++) {
                                 merged[3 - i] = (m & 1 << i) != 0;
@@ -1878,13 +1863,6 @@ import java.util.concurrent.atomic.AtomicInteger;
                                     if (StringMan
                                         .isAlpha(element.replaceAll("_", "").replaceAll("-", ""))) {
                                         Flag flag = FlagManager.getOrCreateFlag(element);
-                                        if (flag == null) {
-                                            flag = new StringFlag(element) {
-                                                @Override public String getValueDescription() {
-                                                    return "Generic Filler Flag";
-                                                }
-                                            };
-                                        }
                                         flags.put(flag, flag.parseValue(""));
                                     } else {
                                         PlotSquared.debug("INVALID FLAG: " + element);
@@ -1936,10 +1914,10 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override public void setMerged(final Plot plot, final boolean[] merged) {
         plot.getSettings().setMerged(merged);
         addPlotTask(plot, new UniqueStatement("setMerged") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
+            @Override public void set(PreparedStatement statement) throws SQLException {
                 int hash = MainUtil.hash(merged);
-                stmt.setInt(1, hash);
-                stmt.setInt(2, getId(plot));
+                statement.setInt(1, hash);
+                statement.setInt(2, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1956,10 +1934,10 @@ import java.util.concurrent.atomic.AtomicInteger;
         final PlotId pos1 = plot1.getId();
         final PlotId pos2 = plot2.getId();
         addPlotTask(plot1, new UniqueStatement("swapPlots") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos2.x);
-                stmt.setInt(2, pos2.y);
-                stmt.setInt(3, id1);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, pos2.x);
+                statement.setInt(2, pos2.y);
+                statement.setInt(3, id1);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1969,10 +1947,10 @@ import java.util.concurrent.atomic.AtomicInteger;
             }
         });
         addPlotTask(plot2, new UniqueStatement("swapPlots") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, id2);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, pos1.x);
+                statement.setInt(2, pos1.y);
+                statement.setInt(3, id2);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -1985,11 +1963,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void movePlot(final Plot original, final Plot newPlot) {
         addPlotTask(original, new UniqueStatement("movePlot") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, newPlot.getId().x);
-                stmt.setInt(2, newPlot.getId().y);
-                stmt.setString(3, newPlot.getArea().toString());
-                stmt.setInt(4, getId(original));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, newPlot.getId().x);
+                statement.setInt(2, newPlot.getId().y);
+                statement.setString(3, newPlot.getArea().toString());
+                statement.setInt(4, getId(original));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2004,9 +1982,9 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override public void setFlags(final Plot plot, HashMap<Flag<?>, Object> flags) {
         final String flag_string = FlagManager.toString(flags);
         addPlotTask(plot, new UniqueStatement("setFlags") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, flag_string);
-                stmt.setInt(2, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, flag_string);
+                statement.setInt(2, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2019,9 +1997,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void setAlias(final Plot plot, final String alias) {
         addPlotTask(plot, new UniqueStatement("setAlias") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, alias);
-                stmt.setInt(2, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, alias);
+                statement.setInt(2, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2040,8 +2018,7 @@ import java.util.concurrent.atomic.AtomicInteger;
             @Override public void run() {
                 if (!uniqueIds.isEmpty()) {
                     try {
-                        ArrayList<Integer> uniqueIdsList = new ArrayList<Integer>(uniqueIds);
-                        String stmt_prefix = "";
+                        ArrayList<Integer> uniqueIdsList = new ArrayList<>(uniqueIds);
                         int size = uniqueIdsList.size();
                         int packet = 990;
                         int amount = size / packet;
@@ -2054,8 +2031,8 @@ import java.util.concurrent.atomic.AtomicInteger;
                             if (subList.isEmpty()) {
                                 break;
                             }
-                            StringBuilder idstr2 = new StringBuilder("");
-                            stmt_prefix = "";
+                            StringBuilder idstr2 = new StringBuilder();
+                            String stmt_prefix = "";
                             for (Integer id : subList) {
                                 idstr2.append(stmt_prefix).append(id);
                                 stmt_prefix = " OR `id` = ";
@@ -2105,43 +2082,41 @@ import java.util.concurrent.atomic.AtomicInteger;
     }
 
     @Override public void purge(final PlotArea area, final Set<PlotId> plots) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                    "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
-                        + "plot` WHERE `world` = ?")) {
-                    stmt.setString(1, area.toString());
-                    Set<Integer> ids;
-                    try (ResultSet r = stmt.executeQuery()) {
-                        ids = new HashSet<>();
-                        while (r.next()) {
-                            PlotId plot_id =
-                                new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
-                            if (plots.contains(plot_id)) {
-                                ids.add(r.getInt("id"));
-                            }
+        addGlobalTask(() -> {
+            try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                "SELECT `id`, `plot_id_x`, `plot_id_z` FROM `" + SQLManager.this.prefix
+                    + "plot` WHERE `world` = ?")) {
+                stmt.setString(1, area.toString());
+                Set<Integer> ids;
+                try (ResultSet r = stmt.executeQuery()) {
+                    ids = new HashSet<>();
+                    while (r.next()) {
+                        PlotId plot_id =
+                            new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                        if (plots.contains(plot_id)) {
+                            ids.add(r.getInt("id"));
                         }
                     }
-                    purgeIds(ids);
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                    PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
-                }
-                for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
-                    PlotId plotId = iterator.next();
-                    iterator.remove();
-                    PlotId id = new PlotId(plotId.x, plotId.y);
-                    area.removePlot(id);
                 }
+                purgeIds(ids);
+            } catch (SQLException e) {
+                e.printStackTrace();
+                PlotSquared.debug("&c[ERROR] FAILED TO PURGE AREA '" + area + "'!");
+            }
+            for (Iterator<PlotId> iterator = plots.iterator(); iterator.hasNext(); ) {
+                PlotId plotId = iterator.next();
+                iterator.remove();
+                PlotId id = new PlotId(plotId.x, plotId.y);
+                area.removePlot(id);
             }
         });
     }
 
     @Override public void setPosition(final Plot plot, final String position) {
         addPlotTask(plot, new UniqueStatement("setPosition") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position == null ? "" : position);
-                stmt.setInt(2, getId(plot));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, position == null ? "" : position);
+                statement.setInt(2, getId(plot));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2407,8 +2382,8 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override public void delete(PlotCluster cluster) {
         final int id = getClusterId(cluster);
         addClusterTask(cluster, new UniqueStatement("delete_cluster_settings") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, id);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2418,8 +2393,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             }
         });
         addClusterTask(cluster, new UniqueStatement("delete_cluster_helpers") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, id);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2429,8 +2404,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             }
         });
         addClusterTask(cluster, new UniqueStatement("delete_cluster_invited") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, id);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2440,8 +2415,8 @@ import java.util.concurrent.atomic.AtomicInteger;
             }
         });
         addClusterTask(cluster, new UniqueStatement("delete_cluster") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, id);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, id);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2454,15 +2429,15 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override public void addPersistentMeta(final UUID uuid, final String key, final byte[] meta,
         final boolean replace) {
         addPlayerTask(uuid, new UniqueStatement("addPersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
+            @Override public void set(PreparedStatement statement) throws SQLException {
                 if (replace) {
-                    stmt.setBytes(1, meta);
-                    stmt.setString(2, uuid.toString());
-                    stmt.setString(3, key);
+                    statement.setBytes(1, meta);
+                    statement.setString(2, uuid.toString());
+                    statement.setString(3, key);
                 } else {
-                    stmt.setString(1, uuid.toString());
-                    stmt.setString(2, key);
-                    stmt.setBytes(3, meta);
+                    statement.setString(1, uuid.toString());
+                    statement.setString(2, key);
+                    statement.setBytes(3, meta);
                 }
             }
 
@@ -2482,9 +2457,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void removePersistentMeta(final UUID uuid, final String key) {
         addPlayerTask(uuid, new UniqueStatement("removePersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, uuid.toString());
-                stmt.setString(2, key);
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, uuid.toString());
+                statement.setString(2, key);
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2498,8 +2473,8 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override
     public void getPersistentMeta(final UUID uuid, final RunnableVal<Map<String, byte[]>> result) {
         addPlayerTask(uuid, new UniqueStatement("getPersistentMeta") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, uuid.toString());
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, uuid.toString());
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2523,11 +2498,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                 }
 
                 resultSet.close();
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        result.run(metaMap);
-                    }
-                });
+                TaskManager.runTaskAsync(() -> result.run(metaMap));
             }
 
         });
@@ -2591,11 +2562,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                     }
                     cluster = new PlotCluster(null, pos1, pos2, user, id);
                     clusters.put(id, cluster);
-                    Set<PlotCluster> set = newClusters.get(areaid);
-                    if (set == null) {
-                        set = new HashSet<>();
-                        newClusters.put(areaid, set);
-                    }
+                    Set<PlotCluster> set = newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
                     set.add(cluster);
                 }
                 //Getting helpers
@@ -2693,9 +2660,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void setClusterName(final PlotCluster cluster, final String name) {
         addClusterTask(cluster, new UniqueStatement("setClusterName") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, name);
-                stmt.setInt(2, getClusterId(cluster));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, name);
+                statement.setInt(2, getClusterId(cluster));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2739,13 +2706,13 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void createCluster(final PlotCluster cluster) {
         addClusterTask(cluster, new UniqueStatement("createCluster_" + cluster.hashCode()) {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, cluster.getP1().x);
-                stmt.setInt(2, cluster.getP1().y);
-                stmt.setInt(3, cluster.getP2().x);
-                stmt.setInt(4, cluster.getP2().y);
-                stmt.setString(5, cluster.owner.toString());
-                stmt.setString(6, cluster.area.toString());
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, cluster.getP1().x);
+                statement.setInt(2, cluster.getP1().y);
+                statement.setInt(3, cluster.getP2().x);
+                statement.setInt(4, cluster.getP2().y);
+                statement.setString(5, cluster.owner.toString());
+                statement.setString(6, cluster.area.toString());
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2767,9 +2734,9 @@ import java.util.concurrent.atomic.AtomicInteger;
         });
         addClusterTask(cluster,
             new UniqueStatement("createCluster_settings_" + cluster.hashCode()) {
-                @Override public void set(PreparedStatement stmt) throws SQLException {
-                    stmt.setInt(1, getClusterId(cluster));
-                    stmt.setString(2, cluster.settings.getAlias());
+                @Override public void set(PreparedStatement statement) throws SQLException {
+                    statement.setInt(1, getClusterId(cluster));
+                    statement.setString(2, cluster.settings.getAlias());
                 }
 
                 @Override public PreparedStatement get() throws SQLException {
@@ -2787,12 +2754,12 @@ import java.util.concurrent.atomic.AtomicInteger;
         current.setP2(max);
 
         addClusterTask(current, new UniqueStatement("resizeCluster") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setInt(1, pos1.x);
-                stmt.setInt(2, pos1.y);
-                stmt.setInt(3, pos2.x);
-                stmt.setInt(4, pos2.y);
-                stmt.setInt(5, getClusterId(current));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setInt(1, pos1.x);
+                statement.setInt(2, pos1.y);
+                statement.setInt(3, pos2.x);
+                statement.setInt(4, pos2.y);
+                statement.setInt(5, getClusterId(current));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -2805,9 +2772,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 
     @Override public void setPosition(final PlotCluster cluster, final String position) {
         addClusterTask(cluster, new UniqueStatement("setPosition") {
-            @Override public void set(PreparedStatement stmt) throws SQLException {
-                stmt.setString(1, position);
-                stmt.setInt(2, getClusterId(cluster));
+            @Override public void set(PreparedStatement statement) throws SQLException {
+                statement.setString(1, position);
+                statement.setInt(2, getClusterId(cluster));
             }
 
             @Override public PreparedStatement get() throws SQLException {
@@ -3008,87 +2975,83 @@ import java.util.concurrent.atomic.AtomicInteger;
     @Override
     public void replaceWorld(final String oldWorld, final String newWorld, final PlotId min,
         final PlotId max) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                if (min == null) {
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "plot` SET `world` = ? WHERE `world` = ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "cluster` SET `world` = ? WHERE `world` = ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.setInt(3, min.x);
-                        stmt.setInt(4, max.x);
-                        stmt.setInt(5, min.y);
-                        stmt.setInt(6, max.y);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
-                    try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
-                        "UPDATE `" + SQLManager.this.prefix
-                            + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
-                        stmt.setString(1, newWorld);
-                        stmt.setString(2, oldWorld);
-                        stmt.setInt(3, max.x);
-                        stmt.setInt(4, max.y);
-                        stmt.setInt(5, min.x);
-                        stmt.setInt(6, min.y);
-                        stmt.executeUpdate();
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
+        addGlobalTask(() -> {
+            if (min == null) {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `world` = ? WHERE `world` = ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `world` = ? WHERE `world` = ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "plot` SET `world` = ? WHERE `world` = ? AND `plot_id_x` BETWEEN ? AND ? AND `plot_id_z` BETWEEN ? AND ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.setInt(3, min.x);
+                    stmt.setInt(4, max.x);
+                    stmt.setInt(5, min.y);
+                    stmt.setInt(6, max.y);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+                try (PreparedStatement stmt = SQLManager.this.connection.prepareStatement(
+                    "UPDATE `" + SQLManager.this.prefix
+                        + "cluster` SET `world` = ? WHERE `world` = ? AND `pos1_x` <= ? AND `pos1_z` <= ? AND `pos2_x` >= ? AND `pos2_z` >= ?")) {
+                    stmt.setString(1, newWorld);
+                    stmt.setString(2, oldWorld);
+                    stmt.setInt(3, max.x);
+                    stmt.setInt(4, max.y);
+                    stmt.setInt(5, min.x);
+                    stmt.setInt(6, min.y);
+                    stmt.executeUpdate();
+                } catch (SQLException e) {
+                    e.printStackTrace();
                 }
             }
         });
     }
 
     @Override public void replaceUUID(final UUID old, final UUID now) {
-        addGlobalTask(new Runnable() {
-            @Override public void run() {
-                try (Statement stmt = SQLManager.this.connection.createStatement()) {
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
-                            .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
-                            .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                    stmt.executeUpdate(
-                        "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
-                            + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
+        addGlobalTask(() -> {
+            try (Statement stmt = SQLManager.this.connection.createStatement()) {
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster` SET `owner` = '" + now
+                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster_helpers` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
+                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                stmt.executeUpdate(
+                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
+                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+            } catch (SQLException e) {
+                e.printStackTrace();
             }
         });
     }
@@ -3120,7 +3083,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
         public abstract PreparedStatement get() throws SQLException;
 
-        public abstract void set(PreparedStatement stmt) throws SQLException;
+        public abstract void set(PreparedStatement statement) throws SQLException;
     }
 
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
index 98c523b2e..b35d96a43 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -8,6 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.google.common.collect.ImmutableSet;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Flag Manager Utility.
@@ -234,13 +235,9 @@ public class FlagManager {
      * @return a list of flags the specified player can use
      */
     public static List<Flag> getFlags(PlotPlayer player) {
-        List<Flag> returnFlags = new ArrayList<>();
-        for (Flag flag : Flags.getFlags()) {
-            if (Permissions
-                .hasPermission(player, "plots.set.flag." + flag.getName().toLowerCase())) {
-                returnFlags.add(flag);
-            }
-        }
+        List<Flag> returnFlags = Flags.getFlags().stream().filter(flag -> Permissions
+            .hasPermission(player, "plots.set.flag." + flag.getName().toLowerCase()))
+            .collect(Collectors.toList());
         return returnFlags;
     }
 

From 9a23b718f38fd5f34e8787707e7159277a81be73 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 5 Feb 2019 19:41:03 -0500
Subject: [PATCH 020/210] Cleanup of various methods mainly just more lambda's

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/uuid/SQLUUIDHandler.java           | 239 ++++++++----------
 .../plotsquared/plot/PlotSquared.java         | 168 +++++-------
 .../plotsquared/plot/commands/Set.java        |  21 +-
 .../plot/util/SchematicHandler.java           |   2 +-
 .../plot/util/expiry/ExpireManager.java       |  99 +++-----
 5 files changed, 218 insertions(+), 311 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 1c9a30bba..fc366c305 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -71,96 +71,85 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         if (!super.startCaching(whenDone)) {
             return false;
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try {
-                    HashBiMap<StringWrapper, UUID> toAdd =
-                        HashBiMap.create(new HashMap<StringWrapper, UUID>());
-                    try (PreparedStatement statement = getConnection()
-                        .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
-                        ResultSet resultSet = statement.executeQuery()) {
-                        while (resultSet.next()) {
-                            StringWrapper username =
-                                new StringWrapper(resultSet.getString("username"));
-                            UUID uuid = UUID.fromString(resultSet.getString("uuid"));
-                            toAdd.put(new StringWrapper(username.value), uuid);
-                        }
+        TaskManager.runTaskAsync(() -> {
+            try {
+                HashBiMap<StringWrapper, UUID> toAdd =
+                    HashBiMap.create(new HashMap<>());
+                try (PreparedStatement statement = getConnection()
+                    .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
+                    ResultSet resultSet = statement.executeQuery()) {
+                    while (resultSet.next()) {
+                        StringWrapper username =
+                            new StringWrapper(resultSet.getString("username"));
+                        UUID uuid = UUID.fromString(resultSet.getString("uuid"));
+                        toAdd.put(new StringWrapper(username.value), uuid);
                     }
-                    add(toAdd);
-                    // This should be called as long as there are some unknown plots
-                    final ArrayDeque<UUID> toFetch = new ArrayDeque<>();
-                    for (UUID u : UUIDHandler.getAllUUIDS()) {
-                        if (!uuidExists(u)) {
-                            toFetch.add(u);
-                        }
+                }
+                add(toAdd);
+                // This should be called as long as there are some unknown plots
+                final ArrayDeque<UUID> toFetch = new ArrayDeque<>();
+                for (UUID u : UUIDHandler.getAllUUIDS()) {
+                    if (!uuidExists(u)) {
+                        toFetch.add(u);
                     }
-                    if (toFetch.isEmpty()) {
+                }
+                if (toFetch.isEmpty()) {
+                    if (whenDone != null) {
+                        whenDone.run();
+                    }
+                    return;
+                }
+                FileUUIDHandler fileHandler =
+                    new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
+                fileHandler.startCaching(() -> {
+                    // If the file based UUID handler didn't cache it, then we can't cache offline mode
+                    // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
+                    if (Settings.UUID.OFFLINE) {
                         if (whenDone != null) {
                             whenDone.run();
                         }
                         return;
                     }
-                    FileUUIDHandler fileHandler =
-                        new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
-                    fileHandler.startCaching(new Runnable() {
-                        @Override public void run() {
-                            // If the file based UUID handler didn't cache it, then we can't cache offline mode
-                            // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
-                            if (Settings.UUID.OFFLINE) {
-                                if (whenDone != null) {
-                                    whenDone.run();
-                                }
-                                return;
-                            }
 
-                            TaskManager.runTaskAsync(new Runnable() {
-                                @Override public void run() {
-                                    while (!toFetch.isEmpty()) {
-                                        try {
-                                            for (int i = 0;
-                                                 i < Math.min(500, toFetch.size()); i++) {
-                                                UUID uuid = toFetch.pop();
-                                                HttpURLConnection connection =
-                                                    (HttpURLConnection) new URL(
-                                                        SQLUUIDHandler.this.PROFILE_URL + uuid
-                                                            .toString().replace("-", ""))
-                                                        .openConnection();
-                                                try (InputStream con = connection
-                                                    .getInputStream()) {
-                                                    InputStreamReader reader =
-                                                        new InputStreamReader(con);
-                                                    JSONObject response =
-                                                        (JSONObject) SQLUUIDHandler.this.jsonParser
-                                                            .parse(reader);
-                                                    String name = (String) response.get("name");
-                                                    if (name != null) {
-                                                        add(new StringWrapper(name), uuid);
-                                                    }
-                                                }
-                                                connection.disconnect();
-                                            }
-                                        } catch (IOException | ParseException e) {
-                                            PlotSquared.debug(
-                                                "Invalid response from Mojang: Some UUIDs will be cached later. (`unknown` until then or player joins)");
-                                        }
-                                        try {
-                                            Thread.sleep(INTERVAL * 50);
-                                        } catch (InterruptedException e) {
-                                            e.printStackTrace();
-                                            break;
+                    TaskManager.runTaskAsync(() -> {
+                        while (!toFetch.isEmpty()) {
+                            try {
+                                for (int i = 0; i < Math.min(500, toFetch.size()); i++) {
+                                    UUID uuid = toFetch.pop();
+                                    HttpURLConnection connection = (HttpURLConnection) new URL(
+                                        SQLUUIDHandler.this.PROFILE_URL + uuid.toString()
+                                            .replace("-", "")).openConnection();
+                                    try (InputStream con = connection.getInputStream()) {
+                                        InputStreamReader reader = new InputStreamReader(con);
+                                        JSONObject response =
+                                            (JSONObject) SQLUUIDHandler.this.jsonParser
+                                                .parse(reader);
+                                        String name = (String) response.get("name");
+                                        if (name != null) {
+                                            add(new StringWrapper(name), uuid);
                                         }
                                     }
-                                    if (whenDone != null) {
-                                        whenDone.run();
-                                    }
-                                    return;
+                                    connection.disconnect();
                                 }
-                            });
+                            } catch (IOException | ParseException e) {
+                                PlotSquared.debug(
+                                    "Invalid response from Mojang: Some UUIDs will be cached later. (`unknown` until then or player joins)");
+                            }
+                            try {
+                                Thread.sleep(INTERVAL * 50);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                                break;
+                            }
                         }
+                        if (whenDone != null) {
+                            whenDone.run();
+                        }
+                        return;
                     });
-                } catch (SQLException e) {
-                    throw new SQLUUIDHandlerException("Couldn't select :s", e);
-                }
+                });
+            } catch (SQLException e) {
+                throw new SQLUUIDHandlerException("Couldn't select :s", e);
             }
         });
         return true;
@@ -172,34 +161,32 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         if (ifFetch == null) {
             return;
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try {
-                    URL url = new URL(SQLUUIDHandler.this.PROFILE_URL);
-                    HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                    connection.setRequestMethod("POST");
-                    connection.setRequestProperty("Content-Type", "application/json");
-                    connection.setUseCaches(false);
-                    connection.setDoInput(true);
-                    connection.setDoOutput(true);
-                    String body = JSONArray.toJSONString(Collections.singletonList(name));
-                    OutputStream stream = connection.getOutputStream();
-                    stream.write(body.getBytes());
-                    stream.flush();
-                    stream.close();
-                    JSONArray array = (JSONArray) SQLUUIDHandler.this.jsonParser
-                        .parse(new InputStreamReader(connection.getInputStream()));
-                    JSONObject jsonProfile = (JSONObject) array.get(0);
-                    String id = (String) jsonProfile.get("id");
-                    String name = (String) jsonProfile.get("name");
-                    ifFetch.value = UUID.fromString(
-                        id.substring(0, 8) + '-' + id.substring(8, 12) + '-' + id.substring(12, 16)
-                            + '-' + id.substring(16, 20) + '-' + id.substring(20, 32));
-                } catch (IOException | ParseException e) {
-                    e.printStackTrace();
-                }
-                TaskManager.runTask(ifFetch);
+        TaskManager.runTaskAsync(() -> {
+            try {
+                URL url = new URL(SQLUUIDHandler.this.PROFILE_URL);
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                connection.setRequestMethod("POST");
+                connection.setRequestProperty("Content-Type", "application/json");
+                connection.setUseCaches(false);
+                connection.setDoInput(true);
+                connection.setDoOutput(true);
+                String body = JSONArray.toJSONString(Collections.singletonList(name));
+                OutputStream stream = connection.getOutputStream();
+                stream.write(body.getBytes());
+                stream.flush();
+                stream.close();
+                JSONArray array = (JSONArray) SQLUUIDHandler.this.jsonParser
+                    .parse(new InputStreamReader(connection.getInputStream()));
+                JSONObject jsonProfile = (JSONObject) array.get(0);
+                String id = (String) jsonProfile.get("id");
+                String name1 = (String) jsonProfile.get("name");
+                ifFetch.value = UUID.fromString(
+                    id.substring(0, 8) + '-' + id.substring(8, 12) + '-' + id.substring(12, 16)
+                        + '-' + id.substring(16, 20) + '-' + id.substring(20, 32));
+            } catch (IOException | ParseException e) {
+                e.printStackTrace();
             }
+            TaskManager.runTask(ifFetch);
         });
     }
 
@@ -215,18 +202,16 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
     @Override public boolean add(final StringWrapper name, final UUID uuid) {
         // Ignoring duplicates
         if (super.add(name, uuid)) {
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    try (PreparedStatement statement = getConnection().prepareStatement(
-                        "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
-                        statement.setString(1, uuid.toString());
-                        statement.setString(2, name.toString());
-                        statement.execute();
-                        PlotSquared
-                            .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
-                    } catch (SQLException e) {
-                        e.printStackTrace();
-                    }
+            TaskManager.runTaskAsync(() -> {
+                try (PreparedStatement statement = getConnection().prepareStatement(
+                    "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
+                    statement.setString(1, uuid.toString());
+                    statement.setString(2, name.toString());
+                    statement.execute();
+                    PlotSquared
+                        .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
+                } catch (SQLException e) {
+                    e.printStackTrace();
                 }
             });
             return true;
@@ -239,18 +224,16 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
      */
     @Override public void rename(final UUID uuid, final StringWrapper name) {
         super.rename(uuid, name);
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                try (PreparedStatement statement = getConnection()
-                    .prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?")) {
-                    statement.setString(1, name.value);
-                    statement.setString(2, uuid.toString());
-                    statement.execute();
-                    PlotSquared.debug(
-                        C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
+        TaskManager.runTaskAsync(() -> {
+            try (PreparedStatement statement = getConnection()
+                .prepareStatement("UPDATE usercache SET `username`=? WHERE `uuid`=?")) {
+                statement.setString(1, name.value);
+                statement.setString(2, uuid.toString());
+                statement.execute();
+                PlotSquared.debug(
+                    C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
+            } catch (SQLException e) {
+                e.printStackTrace();
             }
         });
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 1db55bf28..b73fd9426 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -214,11 +214,8 @@ import java.util.zip.ZipInputStream;
             }
             // Economy
             if (Settings.Enabled_Components.ECONOMY) {
-                TaskManager.runTask(new Runnable() {
-                    @Override public void run() {
-                        EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler();
-                    }
-                });
+                TaskManager.runTask(
+                    () -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
             }
 
 /*            // Check for updates
@@ -247,21 +244,19 @@ import java.util.zip.ZipInputStream;
                         this.IMP.setGenerator(world);
                     }
                 }
-                TaskManager.runTaskLater(new Runnable() {
-                    @Override public void run() {
-                        for (String world : section.getKeys(false)) {
-                            if (world.equals("CheckingPlotSquaredGenerator")) {
-                                continue;
-                            }
-                            if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
-                                debug("&c`" + world + "` was not properly loaded - " + IMP
-                                    .getPluginName() + " will now try to load it properly: ");
-                                debug(
-                                    "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
-                                debug(
-                                    "&8 - &7Your world management plugin may be faulty (or non existent)");
-                                PlotSquared.this.IMP.setGenerator(world);
-                            }
+                TaskManager.runTaskLater(() -> {
+                    for (String world : section.getKeys(false)) {
+                        if (world.equals("CheckingPlotSquaredGenerator")) {
+                            continue;
+                        }
+                        if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
+                            debug("&c`" + world + "` was not properly loaded - " + IMP
+                                .getPluginName() + " will now try to load it properly: ");
+                            debug(
+                                "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
+                            debug(
+                                "&8 - &7Your world management plugin may be faulty (or non existent)");
+                            PlotSquared.this.IMP.setGenerator(world);
                         }
                     }
                 }, 1);
@@ -342,25 +337,21 @@ import java.util.zip.ZipInputStream;
     }
 
     private void startUuidCatching() {
-        TaskManager.runTaskLater(new Runnable() {
-            @Override public void run() {
-                debug("Starting UUID caching");
-                UUIDHandler.startCaching(new Runnable() {
-                    @Override public void run() {
-                        UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                        foreachPlotRaw(new RunnableVal<Plot>() {
-                            @Override public void run(Plot plot) {
-                                if (plot.hasOwner() && plot.temp != -1) {
-                                    if (UUIDHandler.getName(plot.owner) == null) {
-                                        UUIDHandler.implementation.unknown.add(plot.owner);
-                                    }
-                                }
+        TaskManager.runTaskLater(() -> {
+            debug("Starting UUID caching");
+            UUIDHandler.startCaching(() -> {
+                UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
+                foreachPlotRaw(new RunnableVal<Plot>() {
+                    @Override public void run(Plot plot) {
+                        if (plot.hasOwner() && plot.temp != -1) {
+                            if (UUIDHandler.getName(plot.owner) == null) {
+                                UUIDHandler.implementation.unknown.add(plot.owner);
                             }
-                        });
-                        startExpiryTasks();
+                        }
                     }
                 });
-            }
+                startExpiryTasks();
+            });
         }, 20);
     }
 
@@ -495,11 +486,8 @@ import java.util.zip.ZipInputStream;
         if (this.plots_tmp == null) {
             this.plots_tmp = new HashMap<>();
         }
-        HashMap<PlotId, Plot> map = this.plots_tmp.get(area.toString());
-        if (map == null) {
-            map = new HashMap<>();
-            this.plots_tmp.put(area.toString(), map);
-        }
+        HashMap<PlotId, Plot> map =
+            this.plots_tmp.computeIfAbsent(area.toString(), k -> new HashMap<>());
         for (Plot plot : area.getPlots()) {
             map.put(plot.getId(), plot);
         }
@@ -567,11 +555,7 @@ import java.util.zip.ZipInputStream;
                 result.add(plot);
             }
         }
-        Collections.sort(overflow, new Comparator<Plot>() {
-            @Override public int compare(Plot a, Plot b) {
-                return a.hashCode() - b.hashCode();
-            }
-        });
+        overflow.sort(Comparator.comparingInt(Plot::hashCode));
         result.addAll(overflow);
         return result;
     }
@@ -581,12 +565,8 @@ import java.util.zip.ZipInputStream;
      *
      * @param plots the collection of plots to sort
      * @return the sorted collection
-     * @deprecated Unchecked, please use
-     * {@link #sortPlots(Collection, SortType, PlotArea)} which has
-     * additional checks before calling this
      */
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
+    private ArrayList<Plot> sortPlotsByHash(Collection<Plot> plots) {
         int hardmax = 256000;
         int max = 0;
         int overflowSize = 0;
@@ -618,7 +598,7 @@ import java.util.zip.ZipInputStream;
                 overflow.add(plot);
             }
         }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        Plot[] overflowArray = overflow.toArray(new Plot[0]);
         sortPlotsByHash(overflowArray);
         ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
         for (Plot plot : cache) {
@@ -627,9 +607,7 @@ import java.util.zip.ZipInputStream;
             }
         }
         Collections.addAll(result, overflowArray);
-        for (Plot plot : extra) {
-            result.add(plot);
-        }
+        result.addAll(extra);
         return result;
     }
 
@@ -638,8 +616,7 @@ import java.util.zip.ZipInputStream;
      *
      * @param input an array of plots to sort
      */
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public void sortPlotsByHash(Plot[] input) {
+    private void sortPlotsByHash(Plot[] input) {
         List<Plot>[] bucket = new ArrayList[32];
         for (int i = 0; i < bucket.length; i++) {
             bucket[i] = new ArrayList<>();
@@ -648,26 +625,25 @@ import java.util.zip.ZipInputStream;
         int placement = 1;
         while (!maxLength) {
             maxLength = true;
-            for (Plot i : input) {
-                int tmp = MathMan.getPositiveId(i.hashCode()) / placement;
-                bucket[tmp & 31].add(i);
+            for (Plot plot : input) {
+                int tmp = MathMan.getPositiveId(plot.hashCode()) / placement;
+                bucket[tmp & 31].add(plot);
                 if (maxLength && tmp > 0) {
                     maxLength = false;
                 }
             }
             int a = 0;
-            for (int b = 0; b < 32; b++) {
-                for (Plot i : bucket[b]) {
-                    input[a++] = i;
+            for (int i = 0; i < 32; i++) {
+                for (Plot plot : bucket[i]) {
+                    input[a++] = plot;
                 }
-                bucket[b].clear();
+                bucket[i].clear();
             }
             placement *= 32;
         }
     }
 
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
+    private ArrayList<Plot> sortPlotsByTimestamp(Collection<Plot> plots) {
         int hardMax = 256000;
         int max = 0;
         int overflowSize = 0;
@@ -699,7 +675,7 @@ import java.util.zip.ZipInputStream;
                 overflow.add(plot);
             }
         }
-        Plot[] overflowArray = overflow.toArray(new Plot[overflow.size()]);
+        Plot[] overflowArray = overflow.toArray(new Plot[0]);
         sortPlotsByHash(overflowArray);
         ArrayList<Plot> result = new ArrayList<>(cache.length + overflowArray.length);
         for (Plot plot : cache) {
@@ -708,9 +684,7 @@ import java.util.zip.ZipInputStream;
             }
         }
         Collections.addAll(result, overflowArray);
-        for (Plot plot : extra) {
-            result.add(plot);
-        }
+        result.addAll(extra);
         return result;
     }
 
@@ -719,29 +693,18 @@ import java.util.zip.ZipInputStream;
      *
      * @param input
      * @return
-     * @deprecated Unchecked, use {@link #sortPlots(Collection, SortType, PlotArea)} instead which will call this after checks
      */
-    // TODO: Re-evaluate deprecation of this, as it's being used internally
-    @Deprecated public List<Plot> sortPlotsByModified(Collection<Plot> input) {
+    private List<Plot> sortPlotsByModified(Collection<Plot> input) {
         List<Plot> list;
         if (input instanceof List) {
             list = (List<Plot>) input;
         } else {
             list = new ArrayList<>(input);
         }
-        Collections.sort(list, new Comparator<Plot>() {
-            @Override public int compare(Plot a, Plot b) {
-                return Long.compare(ExpireManager.IMP.getTimestamp(a.owner),
-                    ExpireManager.IMP.getTimestamp(b.owner));
-            }
-        });
+        list.sort(Comparator.comparingLong(a -> ExpireManager.IMP.getTimestamp(a.owner)));
         return list;
     }
 
-    public ArrayList<Plot> sortPlots(Collection<Plot> plots) {
-        return sortPlots(plots, SortType.DISTANCE_FROM_ORIGIN, null);
-    }
-
     /**
      * Sort a collection of plots by world (with a priority world), then
      * by hashcode.
@@ -764,7 +727,7 @@ import java.util.zip.ZipInputStream;
             }
         } else {
             for (PlotArea area : plotAreaManager.getAllPlotAreas()) {
-                map.put(area, new ArrayList<Plot>(0));
+                map.put(area, new ArrayList<>(0));
             }
             Collection<Plot> lastList = null;
             PlotArea lastWorld = null;
@@ -779,17 +742,15 @@ import java.util.zip.ZipInputStream;
             }
         }
         List<PlotArea> areas = Arrays.asList(plotAreaManager.getAllPlotAreas());
-        Collections.sort(areas, new Comparator<PlotArea>() {
-            @Override public int compare(PlotArea a, PlotArea b) {
-                if (priorityArea != null) {
-                    if (a.equals(priorityArea)) {
-                        return -1;
-                    } else if (b.equals(priorityArea)) {
-                        return 1;
-                    }
+        areas.sort((a, b) -> {
+            if (priorityArea != null) {
+                if (a.equals(priorityArea)) {
+                    return -1;
+                } else if (b.equals(priorityArea)) {
+                    return 1;
                 }
-                return a.hashCode() - b.hashCode();
             }
+            return a.hashCode() - b.hashCode();
         });
         ArrayList<Plot> toReturn = new ArrayList<>(plots.size());
         for (PlotArea area : areas) {
@@ -868,11 +829,8 @@ import java.util.zip.ZipInputStream;
             String world = entry.getKey();
             PlotArea area = getPlotArea(world, null);
             if (area == null) {
-                HashMap<PlotId, Plot> map = this.plots_tmp.get(world);
-                if (map == null) {
-                    map = new HashMap<>();
-                    this.plots_tmp.put(world, map);
-                }
+                HashMap<PlotId, Plot> map =
+                    this.plots_tmp.computeIfAbsent(world, k -> new HashMap<>());
                 map.putAll(entry.getValue());
             } else {
                 for (Plot plot : entry.getValue().values()) {
@@ -1025,11 +983,8 @@ import java.util.zip.ZipInputStream;
     }
 
     public boolean hasPlot(final UUID uuid) {
-        for (final PlotArea area : plotAreaManager.getAllPlotAreas()) {
-            if (area.hasPlot(uuid))
-                return true;
-        }
-        return false;
+        return Arrays.stream(plotAreaManager.getAllPlotAreas())
+            .anyMatch(area -> area.hasPlot(uuid));
     }
 
     public Set<Plot> getBasePlots(final UUID uuid) {
@@ -1918,11 +1873,8 @@ import java.util.zip.ZipInputStream;
     }
 
     public int getPlotCount() {
-        int count = 0;
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            count += area.getPlotCount();
-        }
-        return count;
+        return Arrays.stream(this.plotAreaManager.getAllPlotAreas()).mapToInt(PlotArea::getPlotCount)
+            .sum();
     }
 
     public Set<PlotArea> getPlotAreas() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
index 95166aa4a..6d8dc9c22 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
@@ -15,6 +15,8 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 @CommandDeclaration(command = "set", description = "Set a plot value", aliases = {"s"},
     usage = "/plot set <biome|alias|home|flag> <value...>", permission = "plots.set",
@@ -100,11 +102,7 @@ import java.util.HashSet;
                             current.setComponent(component, bucket);
                         }
                         MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
-                        GlobalBlockQueue.IMP.addTask(new Runnable() {
-                            @Override public void run() {
-                                plot.removeRunning();
-                            }
-                        });
+                        GlobalBlockQueue.IMP.addTask(plot::removeRunning);
                         return true;
                     }
                 }
@@ -114,8 +112,8 @@ import java.util.HashSet;
     }
 
     public boolean noArgs(PlotPlayer player) {
-        ArrayList<String> newValues = new ArrayList<>();
-        newValues.addAll(Arrays.asList("biome", "alias", "home", "flag"));
+        ArrayList<String> newValues =
+            new ArrayList<>(Arrays.asList("biome", "alias", "home", "flag"));
         Plot plot = player.getCurrentPlot();
         if (plot != null) {
             newValues.addAll(
@@ -153,13 +151,12 @@ import java.util.HashSet;
         // flag
         Flag<?> flag = FlagManager.getFlag(args[0].toLowerCase());
         if (Flags.getFlags().contains(flag)) {
-            StringBuilder a = new StringBuilder();
+            String a = "";
             if (args.length > 1) {
-                for (int x = 1; x < args.length; x++) {
-                    a.append(" ").append(args[x]);
-                }
+                a = IntStream.range(1, args.length).mapToObj(x -> " " + args[x])
+                    .collect(Collectors.joining());
             }
-            MainCommand.onCommand(player, ("flag set " + args[0] + a.toString()).split(" "));
+            MainCommand.onCommand(player, ("flag set " + args[0] + a).split(" "));
             return true;
         }
         return noArgs(player);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index f1ca31b4d..6957e858a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -87,7 +87,7 @@ public abstract class SchematicHandler {
                                 } else {
                                     MainUtil.sendMessage(null, "&7 - &a  success: " + plot.getId());
                                 }
-                                TaskManager.runTask(() -> THIS.run());
+                                TaskManager.runTask(THIS::run);
                             });
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index 84f86daa2..4614cfe25 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -97,28 +97,26 @@ public class ExpireManager {
                 Iterator<Plot> iter = plotsToDelete.iterator();
                 final Plot current = iter.next();
                 if (!isExpired(new ArrayDeque<>(tasks), current).isEmpty()) {
-                    TaskManager.runTask(new Runnable() {
-                        @Override public void run() {
-                            pp.setMeta("ignoreExpireTask", true);
-                            pp.teleport(current.getCenter());
-                            pp.deleteMeta("ignoreExpireTask");
-                            PlotMessage msg = new PlotMessage().text(
-                                num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
-                                .color("$1").text(current.toString()).color("$2")
-                                .suggest("/plot list expired").tooltip("/plot list expired")
-                                //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
-                                .text("\n - ").color("$3").text("Delete this (/plot delete)")
-                                .color("$2").suggest("/plot delete").tooltip("/plot delete")
-                                .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
-                                .color("$2").suggest("/plot set keep 1d")
-                                .tooltip("/plot set keep 1d").text("\n - ").color("$3")
-                                .text("Keep this (/plot set keep true)").color("$2")
-                                .suggest("/plot set keep true").tooltip("/plot set keep true")
-                                .text("\n - ").color("$3").text("Don't show me this").color("$2")
-                                .suggest("/plot toggle clear-confirmation")
-                                .tooltip("/plot toggle clear-confirmation");
-                            msg.send(pp);
-                        }
+                    TaskManager.runTask(() -> {
+                        pp.setMeta("ignoreExpireTask", true);
+                        pp.teleport(current.getCenter());
+                        pp.deleteMeta("ignoreExpireTask");
+                        PlotMessage msg = new PlotMessage().text(
+                            num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
+                            .color("$1").text(current.toString()).color("$2")
+                            .suggest("/plot list expired").tooltip("/plot list expired")
+                            //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
+                            .text("\n - ").color("$3").text("Delete this (/plot delete)")
+                            .color("$2").suggest("/plot delete").tooltip("/plot delete")
+                            .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
+                            .color("$2").suggest("/plot set keep 1d")
+                            .tooltip("/plot set keep 1d").text("\n - ").color("$3")
+                            .text("Keep this (/plot set keep true)").color("$2")
+                            .suggest("/plot set keep true").tooltip("/plot set keep true")
+                            .text("\n - ").color("$3").text("Don't show me this").color("$2")
+                            .suggest("/plot toggle clear-confirmation")
+                            .tooltip("/plot toggle clear-confirmation");
+                        msg.send(pp);
                     });
                     return;
                 } else {
@@ -219,12 +217,7 @@ public class ExpireManager {
 
     public ArrayDeque<ExpiryTask> getTasks(PlotArea area) {
         ArrayDeque<ExpiryTask> queue = new ArrayDeque<>(tasks);
-        Iterator<ExpiryTask> iter = queue.iterator();
-        while (iter.hasNext()) {
-            if (!iter.next().applies(area)) {
-                iter.remove();
-            }
-        }
+        queue.removeIf(expiryTask -> !expiryTask.applies(area));
         return queue;
     }
 
@@ -254,7 +247,7 @@ public class ExpireManager {
         }
         this.running = 2;
         final ConcurrentLinkedDeque<Plot> plots =
-            new ConcurrentLinkedDeque<Plot>(PlotSquared.get().getPlots());
+            new ConcurrentLinkedDeque<>(PlotSquared.get().getPlots());
         TaskManager.runTaskAsync(new Runnable() {
             @Override public void run() {
                 final Runnable task = this;
@@ -278,11 +271,7 @@ public class ExpireManager {
                     }
                     for (ExpiryTask expiryTask : expired) {
                         if (!expiryTask.needsAnalysis()) {
-                            expiredTask.run(newPlot, new Runnable() {
-                                @Override public void run() {
-                                    TaskManager.IMP.taskLaterAsync(task, 1);
-                                }
-                            }, expiryTask.requiresConfirmation());
+                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1), expiryTask.requiresConfirmation());
                             return;
                         }
                     }
@@ -291,26 +280,18 @@ public class ExpireManager {
                             @Override public void run(final PlotAnalysis changed) {
                                 passesComplexity(changed, expired, new RunnableVal<Boolean>() {
                                     @Override public void run(Boolean confirmation) {
-                                        expiredTask.run(newPlot, new Runnable() {
-                                            @Override public void run() {
-                                                TaskManager.IMP.taskLaterAsync(task, 1);
-                                            }
-                                        }, confirmation);
-                                    }
-                                }, new Runnable() {
-                                    @Override public void run() {
-                                        FlagManager
-                                            .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
-                                        TaskManager.runTaskLaterAsync(task, 20);
+                                        expiredTask.run(newPlot,
+                                            () -> TaskManager.IMP.taskLaterAsync(task, 1), confirmation);
                                     }
+                                }, () -> {
+                                    FlagManager
+                                        .addPlotFlag(newPlot, Flags.ANALYSIS, changed.asList());
+                                    TaskManager.runTaskLaterAsync(task, 20);
                                 });
                             }
                         };
-                    final Runnable doAnalysis = new Runnable() {
-                        @Override public void run() {
-                            HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
-                        }
-                    };
+                    final Runnable doAnalysis =
+                        () -> HybridUtils.manager.analyzePlot(newPlot, handleAnalysis);
 
                     PlotAnalysis analysis = newPlot.getComplexity(null);
                     if (analysis != null) {
@@ -318,11 +299,7 @@ public class ExpireManager {
                             @Override public void run(Boolean value) {
                                 doAnalysis.run();
                             }
-                        }, new Runnable() {
-                            @Override public void run() {
-                                TaskManager.IMP.taskLaterAsync(task, 1);
-                            }
-                        });
+                        }, () -> TaskManager.IMP.taskLaterAsync(task, 1));
                     } else {
                         doAnalysis.run();
                     }
@@ -330,12 +307,10 @@ public class ExpireManager {
                 }
                 if (plots.isEmpty()) {
                     ExpireManager.this.running = 3;
-                    TaskManager.runTaskLater(new Runnable() {
-                        @Override public void run() {
-                            if (ExpireManager.this.running == 3) {
-                                ExpireManager.this.running = 2;
-                                runTask(expiredTask);
-                            }
+                    TaskManager.runTaskLater(() -> {
+                        if (ExpireManager.this.running == 3) {
+                            ExpireManager.this.running = 2;
+                            runTask(expiredTask);
                         }
                     }, 86400000);
                 } else {
@@ -363,7 +338,7 @@ public class ExpireManager {
     }
 
     public HashSet<Plot> getPendingExpired() {
-        return plotsToDelete == null ? new HashSet<Plot>() : plotsToDelete;
+        return plotsToDelete == null ? new HashSet<>() : plotsToDelete;
     }
 
     public void deleteWithMessage(Plot plot, Runnable whenDone) {

From ccc53278a1d07d50b93f69a279dbab07358f3626 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 5 Feb 2019 20:36:42 -0500
Subject: [PATCH 021/210] Fix the world border issue

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/listeners/PlayerEvents.java | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index e8ab247a7..0dd518696 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -650,7 +650,6 @@ import java.util.regex.Pattern;
                     }
                 }
             }
-            return;
         }
         playerMove(event);
     }
@@ -772,7 +771,6 @@ import java.util.regex.Pattern;
                 }
             } else if (now.equals(lastPlot)) {
                 ForceFieldListener.handleForcefield(player, pp, now);
-                return;
             } else if (!plotEntry(pp, now) && this.tmpTeleport) {
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
                 this.tmpTeleport = false;
@@ -785,22 +783,19 @@ import java.util.regex.Pattern;
             }
             Integer border = area.getBorder();
             if (x2 > border && this.tmpTeleport) {
-                to.setX(x2 - 1);
+                to.setX(border - 1);
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
                 MainUtil.sendMessage(pp, C.BORDER);
-                return;
             }
             if (x2 < -border && this.tmpTeleport) {
-                to.setX(x2 + 1);
+                to.setX(-border + 1);
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
                 MainUtil.sendMessage(pp, C.BORDER);
-                return;
             }
-            return;
         }
         int z2;
         if (MathMan.roundInt(from.getZ()) != (z2 = MathMan.roundInt(to.getZ()))) {
@@ -834,7 +829,6 @@ import java.util.regex.Pattern;
                 }
             } else if (now.equals(lastPlot)) {
                 ForceFieldListener.handleForcefield(player, pp, now);
-                return;
             } else if (!plotEntry(pp, now) && this.tmpTeleport) {
                 MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
                 this.tmpTeleport = false;
@@ -848,13 +842,13 @@ import java.util.regex.Pattern;
             }
             Integer border = area.getBorder();
             if (z2 > border && this.tmpTeleport) {
-                to.setZ(z2 - 1);
+                to.setZ(border - 1);
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
                 MainUtil.sendMessage(pp, C.BORDER);
             } else if (z2 < -border && this.tmpTeleport) {
-                to.setZ(z2 + 1);
+                to.setZ(-border + 1);
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;

From 87547834ef331bfbe43ca04e5664d8bb4a6e7cfd Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 5 Feb 2019 23:12:01 -0500
Subject: [PATCH 022/210] Minor changes to variable names and castings

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/listeners/PlayerEvents.java        | 121 +++++++++---------
 1 file changed, 61 insertions(+), 60 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 0dd518696..890d82f85 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -20,7 +20,6 @@ import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Piston;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.*;
 import org.bukkit.event.Event;
@@ -42,6 +41,7 @@ import org.bukkit.help.HelpTopic;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.material.Directional;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
@@ -381,7 +381,8 @@ import java.util.regex.Pattern;
                     switch (block.getType()) {
                         case PISTON:
                         case STICKY_PISTON:
-                            Piston piston = (Piston) block.getBlockData();
+                            org.bukkit.block.data.Directional piston =
+                                (org.bukkit.block.data.Directional) block.getBlockData();
                             Location loc = BukkitUtil.getLocation(block.getLocation());
                             PlotArea area = loc.getPlotArea();
                             if (area == null) {
@@ -425,12 +426,12 @@ import java.util.regex.Pattern;
         if (!(shooter instanceof Player)) {
             return;
         }
-        Location l = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+        Location location = BukkitUtil.getLocation(entity);
+        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
             return;
         }
         PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
-        Plot plot = l.getOwnedPlot();
+        Plot plot = location.getOwnedPlot();
         if (plot != null && !plot.isAdded(pp.getUUID())) {
             entity.remove();
             event.setCancelled(true);
@@ -520,15 +521,15 @@ import java.util.regex.Pattern;
         if (flag.isPresent() && !Permissions
             .hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
             List<String> blocked_cmds = flag.get();
-            String c = parts[0];
+            String part = parts[0];
             if (parts[0].contains(":")) {
-                c = parts[0].split(":")[1];
+                part = parts[0].split(":")[1];
                 msg = msg.replace(parts[0].split(":")[0] + ':', "");
             }
-            String l = c;
+            String s1 = part;
             List<String> aliases = new ArrayList<>();
             for (HelpTopic cmdLabel : Bukkit.getServer().getHelpMap().getHelpTopics()) {
-                if (c.equals(cmdLabel.getName())) {
+                if (part.equals(cmdLabel.getName())) {
                     break;
                 }
                 String label = cmdLabel.getName().replaceFirst("/", "");
@@ -543,15 +544,15 @@ import java.util.regex.Pattern;
                         }
                         aliases.add(a);
                         a = a.replaceFirst("/", "");
-                        if (!a.equals(label) && a.equals(c)) {
-                            c = label;
+                        if (!a.equals(label) && a.equals(part)) {
+                            part = label;
                             break;
                         }
                     }
                 }
             }
-            if (!l.equals(c)) {
-                msg = msg.replace(l, c);
+            if (!s1.equals(part)) {
+                msg = msg.replace(s1, part);
             }
             for (String s : blocked_cmds) {
                 Pattern pattern;
@@ -700,7 +701,7 @@ import java.util.regex.Pattern;
                             vehicle.eject();
                             vehicle.setVelocity(new Vector(0d, 0d, 0d));
                             vehicle.teleport(dest);
-                            vehicle.setPassenger(player);
+                            vehicle.addPassenger(player);
                         }
                         return;
                     }
@@ -781,7 +782,7 @@ import java.util.regex.Pattern;
                 this.tmpTeleport = true;
                 return;
             }
-            Integer border = area.getBorder();
+            int border = area.getBorder();
             if (x2 > border && this.tmpTeleport) {
                 to.setX(border - 1);
                 this.tmpTeleport = false;
@@ -840,7 +841,7 @@ import java.util.regex.Pattern;
                 this.tmpTeleport = true;
                 return;
             }
-            Integer border = area.getBorder();
+            int border = area.getBorder();
             if (z2 > border && this.tmpTeleport) {
                 to.setZ(border - 1);
                 this.tmpTeleport = false;
@@ -1249,8 +1250,8 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onFade(BlockFadeEvent event) {
-        Block b = event.getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -1260,7 +1261,7 @@ import java.util.regex.Pattern;
             event.setCancelled(true);
             return;
         }
-        switch (b.getType()) {
+        switch (block.getType()) {
             case ICE:
                 if (Flags.ICE_MELT.isFalse(plot)) {
                     event.setCancelled(true);
@@ -1314,8 +1315,8 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onGrow(BlockGrowEvent event) {
-        Block b = event.getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
         if (location.isUnownedPlotArea()) {
             event.setCancelled(true);
         }
@@ -1332,8 +1333,9 @@ import java.util.regex.Pattern;
             if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
                 return;
             }
-            for (Block b : event.getBlocks()) {
-                if (BukkitUtil.getLocation(b.getLocation().add(relative)).getPlotArea() != null) {
+            for (Block block1 : event.getBlocks()) {
+                if (BukkitUtil.getLocation(block1.getLocation().add(relative)).getPlotArea()
+                    != null) {
                     event.setCancelled(true);
                     return;
                 }
@@ -1346,8 +1348,8 @@ import java.util.regex.Pattern;
             return;
         }
         List<Block> blocks = event.getBlocks();
-        for (Block b : blocks) {
-            Location bloc = BukkitUtil.getLocation(b.getLocation());
+        for (Block block1 : blocks) {
+            Location bloc = BukkitUtil.getLocation(block1.getLocation());
             if (!area.contains(bloc.getX(), bloc.getZ()) || !area
                 .contains(bloc.getX() + relative.getBlockX(), bloc.getZ() + relative.getBlockZ())) {
                 event.setCancelled(true);
@@ -1447,8 +1449,7 @@ import java.util.regex.Pattern;
                 if (event.getBlock().getType() == Material.DROPPER)
                     return;
                 BlockFace targetFace =
-                    ((org.bukkit.material.Dispenser) event.getBlock().getState().getData())
-                        .getFacing();
+                    ((Directional) event.getBlock().getState().getData()).getFacing();
                 Location location =
                     BukkitUtil.getLocation(event.getBlock().getRelative(targetFace).getLocation());
                 if (location.isPlotRoad()) {
@@ -1595,12 +1596,12 @@ import java.util.regex.Pattern;
                     return;
             }
         }
-        Location l = BukkitUtil.getLocation(state.getLocation());
-        PlotArea area = l.getPlotArea();
+        Location location = BukkitUtil.getLocation(state.getLocation());
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
         }
-        Plot plot = area.getPlotAbs(l);
+        Plot plot = area.getPlotAbs(location);
         boolean cancelled = false;
         if (plot == null) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
@@ -1637,8 +1638,8 @@ import java.util.regex.Pattern;
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPotionSplash(LingeringPotionSplashEvent event) {
         LingeringPotion entity = event.getEntity();
-        Location l = BukkitUtil.getLocation(entity);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+        Location location = BukkitUtil.getLocation(entity);
+        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
             return;
         }
         if (!this.onProjectileHit(event)) {
@@ -1652,15 +1653,15 @@ import java.util.regex.Pattern;
         if (!(entity instanceof ArmorStand)) {
             return;
         }
-        Location l = BukkitUtil.getLocation(e.getRightClicked().getLocation());
-        PlotArea area = l.getPlotArea();
+        Location location = BukkitUtil.getLocation(e.getRightClicked().getLocation());
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
         }
 
         EntitySpawnListener.test(entity);
 
-        Plot plot = area.getPlotAbs(l);
+        Plot plot = area.getPlotAbs(location);
         PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
         if (plot == null) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
@@ -1710,7 +1711,7 @@ import java.util.regex.Pattern;
             event.setCancelled(true);
         }
         event.blockList().removeIf(
-            b -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(b.getLocation()))));
+            blox -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(blox.getLocation()))));
     }
 
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
@@ -2105,8 +2106,8 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockBurn(BlockBurnEvent event) {
-        Block b = event.getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
+        Block block = event.getBlock();
+        Location location = BukkitUtil.getLocation(block.getLocation());
 
         PlotArea area = location.getPlotArea();
         if (area == null) {
@@ -2215,10 +2216,10 @@ import java.util.regex.Pattern;
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
         BlockFace bf = event.getBlockFace();
-        Block b =
+        Block block =
             event.getBlockClicked().getLocation().add(bf.getModX(), bf.getModY(), bf.getModZ())
                 .getBlock();
-        Location location = BukkitUtil.getLocation(b.getLocation());
+        Location location = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -2272,8 +2273,8 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketFill(PlayerBucketFillEvent event) {
-        Block b = event.getBlockClicked();
-        Location location = BukkitUtil.getLocation(b.getLocation());
+        Block blockClicked = event.getBlockClicked();
+        Location location = BukkitUtil.getLocation(blockClicked.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -2335,8 +2336,8 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onHangingPlace(HangingPlaceEvent event) {
-        Block b = event.getBlock().getRelative(event.getBlockFace());
-        Location location = BukkitUtil.getLocation(b.getLocation());
+        Block block = event.getBlock().getRelative(event.getBlockFace());
+        Location location = BukkitUtil.getLocation(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
@@ -2499,16 +2500,16 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onVehicleDestroy(VehicleDestroyEvent event) {
-        Location l = BukkitUtil.getLocation(event.getVehicle());
-        PlotArea area = l.getPlotArea();
+        Location location = BukkitUtil.getLocation(event.getVehicle());
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
         }
-        Entity d = event.getAttacker();
-        if (d instanceof Player) {
-            Player p = (Player) d;
+        Entity attacker = event.getAttacker();
+        if (attacker instanceof Player) {
+            Player p = (Player) attacker;
             PlotPlayer pp = BukkitUtil.getPlayer(p);
-            Plot plot = area.getPlot(l);
+            Plot plot = area.getPlot(location);
             if (plot == null) {
                 if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
                     MainUtil
@@ -2542,8 +2543,8 @@ import java.util.regex.Pattern;
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPotionSplash(PotionSplashEvent event) {
         ThrownPotion damager = event.getPotion();
-        Location l = BukkitUtil.getLocation(damager);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+        Location location = BukkitUtil.getLocation(damager);
+        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
             return;
         }
         int count = 0;
@@ -2560,9 +2561,9 @@ import java.util.regex.Pattern;
 
     @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
-        EntityDamageByEntityEvent eventChange = null;
-        eventChange = new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
-            EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
+        EntityDamageByEntityEvent eventChange =
+            new EntityDamageByEntityEvent(event.getCombuster(), event.getEntity(),
+                EntityDamageEvent.DamageCause.FIRE_TICK, (double) event.getDuration());
         onEntityDamageByEntityEvent(eventChange);
         if (eventChange.isCancelled()) {
             event.setCancelled(true);
@@ -2572,8 +2573,8 @@ import java.util.regex.Pattern;
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
         Entity damager = event.getDamager();
-        Location l = BukkitUtil.getLocation(damager);
-        if (!PlotSquared.get().hasPlotArea(l.getWorld())) {
+        Location location = BukkitUtil.getLocation(damager);
+        if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
             return;
         }
         Entity victim = event.getEntity();
@@ -2754,14 +2755,14 @@ import java.util.regex.Pattern;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerEggThrow(PlayerEggThrowEvent event) {
-        Location l = BukkitUtil.getLocation(event.getEgg().getLocation());
-        PlotArea area = l.getPlotArea();
+        Location location = BukkitUtil.getLocation(event.getEgg().getLocation());
+        PlotArea area = location.getPlotArea();
         if (area == null) {
             return;
         }
         Player player = event.getPlayer();
         PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        Plot plot = area.getPlot(l);
+        Plot plot = area.getPlot(location);
         if (plot == null) {
             if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.road")) {
                 MainUtil

From 0c780166e0d7f71d3d0339a15c1e1eaa9d870d71 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 6 Feb 2019 00:03:52 -0500
Subject: [PATCH 023/210] Documentation and PlotId updates minor code tweaks in
 the plot class too

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/BukkitMain.java        |  83 ++++-----
 .../plotsquared/api/PlotAPI.java              |  14 +-
 .../plotsquared/plot/PlotSquared.java         |  44 ++---
 .../plotsquared/plot/commands/Cluster.java    |  18 +-
 .../plotsquared/plot/commands/Comment.java    |   8 +-
 .../plotsquared/plot/commands/Purge.java      |   5 +-
 .../plotsquared/plot/commands/Setup.java      |  11 +-
 .../plotsquared/plot/object/Plot.java         | 163 +++++++++---------
 .../plotsquared/plot/object/PlotId.java       |  20 +--
 9 files changed, 184 insertions(+), 182 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 78cd3a189..d58443025 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -180,46 +180,49 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                     continue;
                 }
 
-                final PlotId id = PlotId.fromString(name);
-                if (id != null) {
-                    final Plot plot = area.getOwnedPlot(id);
-                    if (plot != null) {
-                        if (PlotPlayer.wrap(plot.owner) == null) {
-                            if (world.getKeepSpawnInMemory()) {
-                                world.setKeepSpawnInMemory(false);
-                                return;
+                PlotId id;
+                try {
+                    id = PlotId.fromString(name);
+                } catch (IllegalArgumentException ignored) {
+                    continue;
+                }
+                final Plot plot = area.getOwnedPlot(id);
+                if (plot != null) {
+                    if (PlotPlayer.wrap(plot.owner) == null) {
+                        if (world.getKeepSpawnInMemory()) {
+                            world.setKeepSpawnInMemory(false);
+                            return;
+                        }
+                        final Chunk[] chunks = world.getLoadedChunks();
+                        if (chunks.length == 0) {
+                            if (!Bukkit.unloadWorld(world, true)) {
+                                PlotSquared.debug("Failed to unload " + world.getName());
                             }
-                            final Chunk[] chunks = world.getLoadedChunks();
-                            if (chunks.length == 0) {
-                                if (!Bukkit.unloadWorld(world, true)) {
-                                    PlotSquared.debug("Failed to unload " + world.getName());
-                                }
-                                return;
-                            } else {
-                                int index = 0;
-                                do {
-                                    final Chunk chunkI = chunks[index++];
-                                    boolean result;
-                                    if (methodUnloadChunk0 != null) {
-                                        try {
-                                            result = (boolean) methodUnloadChunk0
-                                                .invoke(world, chunkI.getX(), chunkI.getZ(), true);
-                                        } catch (Throwable e) {
-                                            methodUnloadChunk0 = null;
-                                            e.printStackTrace();
-                                            continue outer;
-                                        }
-                                    } else {
-                                        result = world
-                                            .unloadChunk(chunkI.getX(), chunkI.getZ(), true, false);
-                                    }
-                                    if (!result) {
+                            return;
+                        } else {
+                            int index = 0;
+                            do {
+                                final Chunk chunkI = chunks[index++];
+                                boolean result;
+                                if (methodUnloadChunk0 != null) {
+                                    try {
+                                        result = (boolean) methodUnloadChunk0
+                                            .invoke(world, chunkI.getX(), chunkI.getZ(), true);
+                                    } catch (Throwable e) {
+                                        methodUnloadChunk0 = null;
+                                        e.printStackTrace();
                                         continue outer;
                                     }
-                                } while (index < chunks.length
-                                    && System.currentTimeMillis() - start < 5);
-                                return;
-                            }
+                                } else {
+                                    result = world
+                                        .unloadChunk(chunkI.getX(), chunkI.getZ(), true, false);
+                                }
+                                if (!result) {
+                                    continue outer;
+                                }
+                            } while (index < chunks.length
+                                && System.currentTimeMillis() - start < 5);
+                            return;
                         }
                     }
                 }
@@ -532,17 +535,17 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override @Nullable
-    public final ChunkGenerator getDefaultWorldGenerator(final String world, final String id) {
+    public final ChunkGenerator getDefaultWorldGenerator(final String worldName, final String id) {
         final IndependentPlotGenerator result;
         if (id != null && id.equalsIgnoreCase("single")) {
             result = new SingleWorldGenerator();
         } else {
             result = PlotSquared.get().IMP.getDefaultGenerator();
-            if (!PlotSquared.get().setupPlotWorld(world, id, result)) {
+            if (!PlotSquared.get().setupPlotWorld(worldName, id, result)) {
                 return null;
             }
         }
-        return (ChunkGenerator) result.specify(world);
+        return (ChunkGenerator) result.specify(worldName);
     }
 
     @Override public void registerPlayerEvents() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
index c966903be..a93f2fa26 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
@@ -37,7 +37,7 @@ import java.util.UUID;
 @SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI {
 
     /**
-     * Get all plots.
+     * Gets all plots.
      *
      * @return all plots
      * @see PlotSquared#getPlots()
@@ -77,7 +77,7 @@ import java.util.UUID;
     }
 
     /**
-     * Get the PlotSquared storage file.
+     * Gets the PlotSquared storage file.
      *
      * @return storage configuration
      * @see PlotSquared#storage
@@ -87,7 +87,7 @@ import java.util.UUID;
     }
 
     /**
-     * Get the main class for this plugin. Only use this if you really need it.
+     * Gets the main class for this plugin. Only use this if you really need it.
      *
      * @return PlotSquared PlotSquared Main Class
      * @see PlotSquared
@@ -114,7 +114,7 @@ import java.util.UUID;
     }
 
     /**
-     * Get the block/biome set queue
+     * Gets the block/biome set queue
      *
      * @return GlobalBlockQueue.IMP
      */
@@ -145,7 +145,7 @@ import java.util.UUID;
     }
 
     /**
-     * Get a list of PlotAreas in the world.
+     * Gets a list of PlotAreas in the world.
      *
      * @param world The world to check for plot areas
      * @return A set of PlotAreas
@@ -198,7 +198,7 @@ import java.util.UUID;
     }
 
     /**
-     * Get the PlotPlayer for a UUID.
+     * Gets the PlotPlayer for a UUID.
      *
      * <p><i>Please note that PlotSquared can be configured to provide
      * different UUIDs than bukkit</i>
@@ -212,7 +212,7 @@ import java.util.UUID;
     }
 
     /**
-     * Get the PlotPlayer for a username.
+     * Gets the PlotPlayer for a username.
      *
      * @param player the player to wrap
      * @return a {@code PlotPlayer}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index b73fd9426..c686b21de 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -288,7 +288,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get an instance of PlotSquared.
+     * Gets an instance of PlotSquared.
      *
      * @return instance of PlotSquared
      */
@@ -383,7 +383,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the current PlotSquared version.
+     * Gets the current PlotSquared version.
      *
      * @return current version in config or null
      */
@@ -392,7 +392,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the server platform this plugin is running on this is running on.
+     * Gets the server platform this plugin is running on this is running on.
      * <p>
      * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
      *
@@ -507,7 +507,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all the base plots in a single set (for merged plots it just returns
+     * Gets all the base plots in a single set (for merged plots it just returns
      * the bottom plot).
      *
      * @return Set of base Plots
@@ -806,7 +806,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all the plots in a single set.
+     * Gets all the plots in a single set.
      *
      * @return Set of Plots
      */
@@ -842,7 +842,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all the plots owned by a player name.
+     * Gets all the plots owned by a player name.
      *
      * @param world  the world
      * @param player the plot owner
@@ -854,7 +854,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all the plots owned by a player name.
+     * Gets all the plots owned by a player name.
      *
      * @param area   the PlotArea
      * @param player the plot owner
@@ -866,7 +866,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all plots by a PlotPlayer.
+     * Gets all plots by a PlotPlayer.
      *
      * @param world  the world
      * @param player the plot owner
@@ -877,7 +877,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all plots by a PlotPlayer.
+     * Gets all plots by a PlotPlayer.
      *
      * @param area   the PlotArea
      * @param player the plot owner
@@ -888,7 +888,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all plots by a UUID in a world.
+     * Gets all plots by a UUID in a world.
      *
      * @param world the world
      * @param uuid  the plot owner
@@ -905,7 +905,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get all plots by a UUID in an area.
+     * Gets all plots by a UUID in an area.
      *
      * @param area the {@code PlotArea}
      * @param uuid the plot owner
@@ -943,7 +943,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the plots for a PlotPlayer.
+     * Gets the plots for a PlotPlayer.
      *
      * @param player the player to retrieve the plots for
      * @return Set of Plot
@@ -965,7 +965,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the plots for a UUID.
+     * Gets the plots for a UUID.
      *
      * @param uuid the plot owner
      * @return Set of Plot's owned by the player
@@ -1000,7 +1000,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the plots for a UUID.
+     * Gets the plots for a UUID.
      *
      * @param uuid the UUID of the owner
      * @return Set of Plot
@@ -1220,7 +1220,7 @@ import java.util.zip.ZipInputStream;
                 String name = split[0];
                 PlotId pos1 = PlotId.fromString(split[1]);
                 PlotId pos2 = PlotId.fromString(split[2]);
-                if (pos1 == null || pos2 == null || name.isEmpty()) {
+                if (name.isEmpty()) {
                     throw new IllegalArgumentException("Invalid Area identifier: " + areaId
                         + ". Expected form `<name>-<x1;z1>-<x2;z2>`");
                 }
@@ -1652,8 +1652,8 @@ import java.util.zip.ZipInputStream;
             Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
                 .toHexString(version.hash);
             System.out.println("Version is " + this.version);
-        } catch (Throwable ignore) {
-            ignore.printStackTrace();
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
         }
         Settings.save(configFile);
         config = YamlConfiguration.loadConfiguration(configFile);
@@ -1815,7 +1815,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the Java version.
+     * Gets the Java version.
      *
      * @return the java version
      */
@@ -1889,7 +1889,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get a list of PlotArea objects.
+     * Gets a list of PlotArea objects.
      *
      * @param world the world
      * @return Collection of PlotArea objects
@@ -1901,7 +1901,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the relevant plot area for a specified location.
+     * Gets the relevant plot area for a specified location.
      * <ul>
      * <li>If there is only one plot area globally that will be returned.
      * <li>If there is only one plot area in the world, it will return that.
@@ -1922,7 +1922,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get the {@code PlotArea} which contains a location.
+     * Gets the {@code PlotArea} which contains a location.
      * <ul>
      * <li>If the plot area does not contain a location, null
      * will be returned.
@@ -1964,7 +1964,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Get Plots based on alias
+     * Gets Plots based on alias
      *
      * @param alias     to search plots
      * @param worldname to filter alias to a specific world [optional] null means all worlds
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index 9145d1b3d..4cb20487b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -84,10 +84,13 @@ import java.util.UUID;
                 if (currentClusters >= player.getAllowedPlots()) {
                     return sendMessage(player, C.CANT_CLAIM_MORE_CLUSTERS);
                 }
+                PlotId pos1;
+                PlotId pos2;
                 // check pos1 / pos2
-                PlotId pos1 = PlotId.fromString(args[2]);
-                PlotId pos2 = PlotId.fromString(args[3]);
-                if (pos1 == null || pos2 == null) {
+                try{
+                    pos1 = PlotId.fromString(args[2]);
+                    pos2 = PlotId.fromString(args[3]);
+                } catch (IllegalArgumentException ignored) {
                     MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
@@ -209,10 +212,13 @@ import java.util.UUID;
                         "/plot cluster resize <pos1> <pos2>");
                     return false;
                 }
+                PlotId pos1;
+                PlotId pos2;
                 // check pos1 / pos2
-                PlotId pos1 = PlotId.fromString(args[1]);
-                PlotId pos2 = PlotId.fromString(args[2]);
-                if (pos1 == null || pos2 == null) {
+                try{
+                    pos1 = PlotId.fromString(args[2]);
+                    pos2 = PlotId.fromString(args[3]);
+                } catch (IllegalArgumentException ignored) {
                     MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
                     return false;
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
index 775450517..9755d7150 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
@@ -33,7 +33,13 @@ public class Comment extends SubCommand {
             return false;
         }
         Location loc = player.getLocation();
-        PlotId id = PlotId.fromString(args[1]);
+        PlotId id;
+        try {
+            id = PlotId.fromString(args[1]);
+        } catch (IllegalArgumentException ignored) {
+            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            return false;
+        }
         Plot plot = MainUtil.getPlotFromString(player, args[1], false);
         int index;
         if (plot == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
index b8b38e298..9500dec73 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -56,8 +56,9 @@ import java.util.UUID;
                     break;
                 case "plotid":
                 case "id":
-                    id = PlotId.fromString(split[1]);
-                    if (id == null) {
+                    try {
+                        id = PlotId.fromString(split[1]);
+                    } catch (IllegalArgumentException ignored) {
                         C.NOT_VALID_PLOT_ID.send(player, split[1]);
                         return false;
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
index facea4952..412927526 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
@@ -182,8 +182,9 @@ import java.util.Map.Entry;
                 MainUtil.sendMessage(player, "&6What should be the minimum Plot Id?");
                 break;
             case 3:  // min
-                object.min = PlotId.fromString(args[0]);
-                if (object.min == null) {
+                try {
+                    object.min = PlotId.fromString(args[0]);
+                } catch (IllegalArgumentException ignored) {
                     MainUtil.sendMessage(player, "&cYou must choose a valid minimum PlotId!");
                     return false;
                 }
@@ -192,8 +193,10 @@ import java.util.Map.Entry;
                 break;
             case 4:
                 // max
-                PlotId id = PlotId.fromString(args[0]);
-                if (id == null) {
+                PlotId id;
+                try {
+                    id = PlotId.fromString(args[0]);
+                } catch (IllegalArgumentException ignored) {
                     MainUtil.sendMessage(player, "&cYou must choose a valid maximum PlotId!");
                     return false;
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 85349cd55..69d0e63ab 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -41,14 +41,13 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class Plot {
 
+    private static final int MAX_HEIGHT = 256;
     /**
      * @deprecated raw access is deprecated
      */
     @Deprecated private static HashSet<Plot> connected_cache;
     private static HashSet<RegionWrapper> regions_cache;
-    /**
-     * The {@link PlotId}.
-     */
+
     private final PlotId id;
     /**
      * plot owner
@@ -91,9 +90,7 @@ public class Plot {
      * - The methods are more likely to be left unchanged from version changes<br>
      */
     private PlotSettings settings;
-    /**
-     * The {@link PlotArea}.
-     */
+
     private PlotArea area;
     /**
      * Session only plot metadata (session is until the server stops)<br>
@@ -188,7 +185,7 @@ public class Plot {
     }
 
     /**
-     * Get a plot from a string e.g. [area];[id]
+     * Gets a plot from a string e.g. [area];[id]
      *
      * @param defaultArea If no area is specified
      * @param string      plot id/area + id
@@ -199,7 +196,7 @@ public class Plot {
         if (split.length == 2) {
             if (defaultArea != null) {
                 PlotId id = PlotId.fromString(split[0] + ';' + split[1]);
-                return id != null ? defaultArea.getPlotAbs(id) : null;
+                return defaultArea.getPlotAbs(id);
             }
         } else if (split.length == 3) {
             PlotArea pa = PlotSquared.get().getPlotArea(split[0], null);
@@ -253,7 +250,7 @@ public class Plot {
     }
 
     /**
-     * Get the metadata for a key<br>
+     * Gets the metadata for a key<br>
      * <br>
      * For persistent metadata use the flag system
      *
@@ -281,7 +278,7 @@ public class Plot {
     }
 
     /**
-     * Get the cluster this plot is associated with
+     * Gets the cluster this plot is associated with
      *
      * @return the PlotCluster object, or null
      */
@@ -299,9 +296,9 @@ public class Plot {
     public List<PlotPlayer> getPlayersInPlot() {
         ArrayList<PlotPlayer> players = new ArrayList<>();
         for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
-            PlotPlayer pp = entry.getValue();
-            if (this.equals(pp.getCurrentPlot())) {
-                players.add(pp);
+            PlotPlayer plotPlayer = entry.getValue();
+            if (this.equals(plotPlayer.getCurrentPlot())) {
+                players.add(plotPlayer);
             }
         }
         return players;
@@ -330,12 +327,7 @@ public class Plot {
             return false;
         }
         Set<Plot> connected = getConnectedPlots();
-        for (Plot current : connected) {
-            if (uuid.equals(current.owner)) {
-                return true;
-            }
-        }
-        return false;
+        return connected.stream().anyMatch(current -> uuid.equals(current.owner));
     }
 
     public boolean isOwnerAbs(UUID uuid) {
@@ -343,7 +335,7 @@ public class Plot {
     }
 
     /**
-     * Get a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
+     * Gets a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
      *
      * @return the plot owners
      */
@@ -406,14 +398,16 @@ public class Plot {
     }
 
     /**
-     * Get the {@link PlotId}.
+     * Gets the {@link PlotId} of this plot.
+     *
+     * @return the PlotId for this plot
      */
     public PlotId getId() {
         return this.id;
     }
 
     /**
-     * Get the plot world object for this plot<br>
+     * Gets the plot world object for this plot<br>
      * - The generic PlotArea object can be casted to its respective class for more control (e.g. HybridPlotWorld)
      *
      * @return PlotArea
@@ -441,7 +435,7 @@ public class Plot {
     }
 
     /**
-     * Get the plot manager object for this plot<br>
+     * Gets the plot manager object for this plot<br>
      * - The generic PlotManager object can be casted to its respective class for more control (e.g. HybridPlotManager)
      *
      * @return PlotManager
@@ -451,7 +445,7 @@ public class Plot {
     }
 
     /**
-     * Get or create plot settings.
+     * Gets or create plot settings.
      *
      * @return PlotSettings
      * @deprecated use equivalent plot method;
@@ -518,7 +512,7 @@ public class Plot {
     }
 
     /**
-     * Get the timestamp of when the plot was created (unreliable)<br>
+     * Gets the timestamp of when the plot was created (unreliable)<br>
      * - not accurate if the plot was created before this was implemented<br>
      * - Milliseconds since the epoch<br>
      *
@@ -532,7 +526,7 @@ public class Plot {
     }
 
     /**
-     * Get if the plot is merged in a direction<br>
+     * Gets if the plot is merged in a direction<br>
      * ------- Actual -------<br>
      * 0 = north<br>
      * 1 = east<br>
@@ -586,7 +580,7 @@ public class Plot {
     }
 
     /**
-     * Get the denied users.
+     * Gets the denied users.
      *
      * @return a set of denied users
      */
@@ -598,7 +592,7 @@ public class Plot {
     }
 
     /**
-     * Set the denied users for this plot.
+     * Sets the denied users for this plot.
      *
      * @param uuids uuids to deny
      */
@@ -618,7 +612,7 @@ public class Plot {
     }
 
     /**
-     * Get the trusted users.
+     * Gets the trusted users.
      *
      * @return a set of trusted users
      */
@@ -630,7 +624,7 @@ public class Plot {
     }
 
     /**
-     * Set the trusted users for this plot.
+     * Sets the trusted users for this plot.
      *
      * @param uuids uuids to trust
      */
@@ -650,7 +644,7 @@ public class Plot {
     }
 
     /**
-     * Get the members
+     * Gets the members
      *
      * @return a set of members
      */
@@ -662,7 +656,7 @@ public class Plot {
     }
 
     /**
-     * Set the members for this plot
+     * Sets the members for this plot.
      *
      * @param uuids uuids to set member status for
      */
@@ -721,7 +715,7 @@ public class Plot {
     }
 
     /**
-     * Set the plot owner (and update the database)
+     * Sets the plot owner (and update the database)
      *
      * @param owner uuid to set as owner
      */
@@ -747,7 +741,7 @@ public class Plot {
     }
 
     /**
-     * Set the plot owner (and update the database)
+     * Sets the plot owner (and update the database)
      *
      * @param owner     uuid to set as owner
      * @param initiator player initiating set owner
@@ -845,7 +839,7 @@ public class Plot {
     }
 
     /**
-     * Set the biome for a plot asynchronously
+     * Sets the biome for a plot asynchronously.
      *
      * @param biome    The biome e.g. "forest"
      * @param whenDone The task to run when finished, or null
@@ -947,7 +941,7 @@ public class Plot {
     }
 
     /**
-     * Set the sign for a plot to a specific name
+     * Sets the sign for a plot to a specific name
      *
      * @param name name
      */
@@ -992,7 +986,7 @@ public class Plot {
     }
 
     /**
-     * Set a flag for this plot
+     * Sets a flag for this plot
      *
      * @param flag  Flag to set
      * @param value Flag value
@@ -1015,7 +1009,7 @@ public class Plot {
     }
 
     /**
-     * Get the flag for a given key
+     * Gets the flag for a given key
      *
      * @param key Flag to get value for
      */
@@ -1024,7 +1018,7 @@ public class Plot {
     }
 
     /**
-     * Get the flag for a given key
+     * Gets the flag for a given key
      *
      * @param key          the flag
      * @param defaultValue if the key is null, the value to return
@@ -1118,7 +1112,7 @@ public class Plot {
     }
 
     /**
-     * Get the number of tracked running tasks for this plot<br>
+     * Gets the number of tracked running tasks for this plot<br>
      * - Used to track/limit the number of things a player can do on the plot at once
      *
      * @return number of tasks (int)
@@ -1217,7 +1211,7 @@ public class Plot {
     }
 
     /**
-     * Set the home location
+     * Sets the home location
      *
      * @param location location to set as home
      */
@@ -1235,7 +1229,7 @@ public class Plot {
     }
 
     /**
-     * Get the default home location for a plot<br>
+     * Gets the default home location for a plot<br>
      * - Ignores any home location set for that specific plot
      *
      * @return Location
@@ -1276,27 +1270,24 @@ public class Plot {
         for (RegionWrapper region : getRegions()) {
             count +=
                 (region.maxX - (double) region.minX + 1) * (region.maxZ - (double) region.minZ + 1)
-                    * 256;
+                    * MAX_HEIGHT;
         }
         return count;
     }
 
     /**
-     * Get the average rating of the plot. This is the value displayed in /plot info
+     * Gets the average rating of the plot. This is the value displayed in /plot info
      *
      * @return average rating as double
      */
     public double getAverageRating() {
-        double sum = 0;
         Collection<Rating> ratings = this.getRatings().values();
-        for (Rating rating : ratings) {
-            sum += rating.getAverageRating();
-        }
+        double sum = ratings.stream().mapToDouble(Rating::getAverageRating).sum();
         return sum / ratings.size();
     }
 
     /**
-     * Set a rating for a user<br>
+     * Sets a rating for a user<br>
      * - If the user has already rated, the following will return false
      *
      * @param uuid   uuid of rater
@@ -1328,7 +1319,7 @@ public class Plot {
     }
 
     /**
-     * Get the ratings associated with a plot<br>
+     * Gets the ratings associated with a plot<br>
      * - The rating object may contain multiple categories
      *
      * @return Map of user who rated to the rating
@@ -1383,7 +1374,7 @@ public class Plot {
     }
 
     /**
-     * Set the plot sign if plot signs are enabled.
+     * Sets the plot sign if plot signs are enabled.
      */
     public void setSign() {
         if (this.owner == null) {
@@ -1502,7 +1493,7 @@ public class Plot {
     }
 
     /**
-     * Set components such as border, wall, floor.
+     * Sets components such as border, wall, floor.
      * (components are generator specific)
      */
     public boolean setComponent(String component, String blocks) {
@@ -1531,10 +1522,10 @@ public class Plot {
         return top;
     }
 
+    //TODO Better documentation needed.
     /**
      * Return the bottom location for the plot.
      *
-     * @return
      */
     public Location getBottomAbs() {
         Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
@@ -1543,7 +1534,7 @@ public class Plot {
     }
 
     /**
-     * Swap the settings for two plots.
+     * Swaps the settings for two plots.
      *
      * @param plot     the plot to swap data with
      * @param whenDone the task to run at the end of this method.
@@ -1676,7 +1667,7 @@ public class Plot {
             Location bot = other.getBottomAbs();
             Location top = this.getTopAbs();
             Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
-            Location pos2 = new Location(this.getWorldName(), bot.getX(), 256, top.getZ());
+            Location pos2 = new Location(this.getWorldName(), bot.getX(), MAX_HEIGHT, top.getZ());
             ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
         } else {
             this.area.getPlotManager().removeRoadEast(this.area, this);
@@ -1729,7 +1720,7 @@ public class Plot {
     }
 
     /**
-     * Get plot display name.
+     * Gets plot display name.
      *
      * @return alias if set, else id
      */
@@ -1898,7 +1889,7 @@ public class Plot {
     }
 
     /**
-     * Get the plot hashcode<br>
+     * Gets the plot hashcode<br>
      * Note: The hashcode is unique if:<br>
      * - Plots are in the same world<br>
      * - The x,z coordinates are between Short.MIN_VALUE and Short.MAX_VALUE<br>
@@ -1910,7 +1901,7 @@ public class Plot {
     }
 
     /**
-     * Get the flags specific to this plot<br>
+     * Gets the flags specific to this plot<br>
      * - Does not take default flags into account<br>
      *
      * @return
@@ -1920,7 +1911,7 @@ public class Plot {
     }
 
     /**
-     * Set a flag for this plot.
+     * Sets a flag for this plot.
      *
      * @param flags
      */
@@ -1929,7 +1920,7 @@ public class Plot {
     }
 
     /**
-     * Get the plot alias.
+     * Gets the plot alias.
      * - Returns an empty string if no alias is set
      *
      * @return The plot alias
@@ -1942,7 +1933,7 @@ public class Plot {
     }
 
     /**
-     * Set the plot alias.
+     * Sets the plot alias.
      *
      * @param alias The alias
      */
@@ -1961,7 +1952,7 @@ public class Plot {
     }
 
     /**
-     * Set the raw merge data<br>
+     * Sets the raw merge data<br>
      * - Updates DB<br>
      * - Does not modify terrain<br>
      * ----------<br>
@@ -1999,7 +1990,7 @@ public class Plot {
     }
 
     /**
-     * Get the merged array.
+     * Gets the merged array.
      *
      * @return boolean [ north, east, south, west ]
      */
@@ -2008,10 +1999,10 @@ public class Plot {
     }
 
     /**
-     * Set the raw merge data<br>
+     * Sets the raw merge data<br>
      * - Updates DB<br>
      * - Does not modify terrain<br>
-     * Get if the plot is merged in a direction<br>
+     * Gets if the plot is merged in a direction<br>
      * ----------<br>
      * 0 = north<br>
      * 1 = east<br>
@@ -2038,7 +2029,7 @@ public class Plot {
     }
 
     /**
-     * Get the set home location or 0,0,0 if no location is set<br>
+     * Gets the set home location or 0,0,0 if no location is set<br>
      * - Does not take the default home location into account
      *
      * @return
@@ -2145,7 +2136,7 @@ public class Plot {
             Location bot = other.getBottomAbs();
             Location top = this.getTopAbs();
             Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
-            Location pos2 = new Location(this.getWorldName(), top.getX(), 256, bot.getZ());
+            Location pos2 = new Location(this.getWorldName(), top.getX(), MAX_HEIGHT, bot.getZ());
             ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
         } else {
             this.getManager().removeRoadSouth(this.area, this);
@@ -2248,11 +2239,11 @@ public class Plot {
      * Merge the plot settings<br>
      * - Used when a plot is merged<br>
      *
-     * @param b
+     * @param plot
      */
-    public void mergeData(Plot b) {
+    public void mergeData(Plot plot) {
         HashMap<Flag<?>, Object> flags1 = this.getFlags();
-        HashMap<Flag<?>, Object> flags2 = b.getFlags();
+        HashMap<Flag<?>, Object> flags2 = plot.getFlags();
         if ((!flags1.isEmpty() || !flags2.isEmpty()) && !flags1.equals(flags2)) {
             boolean greater = flags1.size() > flags2.size();
             if (greater) {
@@ -2262,30 +2253,30 @@ public class Plot {
             }
             HashMap<Flag<?>, Object> net = (greater ? flags1 : flags2);
             this.setFlags(net);
-            b.setFlags(net);
+            plot.setFlags(net);
         }
         if (!this.getAlias().isEmpty()) {
-            b.setAlias(this.getAlias());
-        } else if (!b.getAlias().isEmpty()) {
-            this.setAlias(b.getAlias());
+            plot.setAlias(this.getAlias());
+        } else if (!plot.getAlias().isEmpty()) {
+            this.setAlias(plot.getAlias());
         }
         for (UUID uuid : this.getTrusted()) {
-            b.addTrusted(uuid);
+            plot.addTrusted(uuid);
         }
-        for (UUID uuid : b.getTrusted()) {
+        for (UUID uuid : plot.getTrusted()) {
             this.addTrusted(uuid);
         }
         for (UUID uuid : this.getMembers()) {
-            b.addMember(uuid);
+            plot.addMember(uuid);
         }
-        for (UUID uuid : b.getMembers()) {
+        for (UUID uuid : plot.getMembers()) {
             this.addMember(uuid);
         }
 
         for (UUID uuid : this.getDenied()) {
-            b.addDenied(uuid);
+            plot.addDenied(uuid);
         }
-        for (UUID uuid : b.getDenied()) {
+        for (UUID uuid : plot.getDenied()) {
             this.addDenied(uuid);
         }
     }
@@ -2302,7 +2293,7 @@ public class Plot {
             Location pos1 = this.getTopAbs().add(1, 0, 1);
             Location pos2 = other.getBottomAbs().subtract(1, 0, 1);
             pos1.setY(0);
-            pos2.setY(256);
+            pos2.setY(MAX_HEIGHT);
             ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
         } else {
             this.area.getPlotManager().removeRoadSouthEast(this.area, this);
@@ -2310,7 +2301,7 @@ public class Plot {
     }
 
     /**
-     * Get the plot in a relative location<br>
+     * Gets the plot in a relative location<br>
      * Note: May be null if the partial plot area does not include the relative location
      *
      * @param x
@@ -2326,7 +2317,7 @@ public class Plot {
     }
 
     /**
-     * Get the plot in a relative direction<br>
+     * Gets the plot in a relative direction<br>
      * 0 = north<br>
      * 1 = east<br>
      * 2 = south<br>
@@ -2341,7 +2332,7 @@ public class Plot {
     }
 
     /**
-     * Get a set of plots connected (and including) this plot<br>
+     * Gets a set of plots connected (and including) this plot<br>
      * - This result is cached globally
      *
      * @return
@@ -2640,7 +2631,7 @@ public class Plot {
     }
 
     /**
-     * Get all the corners of the plot (supports non-rectangular shapes).
+     * Gets all the corners of the plot (supports non-rectangular shapes).
      *
      * @return A list of the plot corners
      */
@@ -2722,7 +2713,7 @@ public class Plot {
     }
 
     /**
-     * Set a component for a plot to the provided blocks<br>
+     * Sets a component for a plot to the provided blocks<br>
      * - E.g. floor, wall, border etc.<br>
      * - The available components depend on the generator being used<br>
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
index 113495512..821a22327 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
@@ -1,5 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public class PlotId {
@@ -30,22 +31,13 @@ public class PlotId {
      * @param string to create id from
      * @return null if the string is invalid
      */
-    public static PlotId fromString(String string) {
-        if (string == null) {
-            return null;
-        }
+    public static PlotId fromString(@Nonnull String string) {
         String[] parts = string.split("[;|,]");
         if (parts.length < 2) {
-            return null;
-        }
-        int x;
-        int y;
-        try {
-            x = Integer.parseInt(parts[0]);
-            y = Integer.parseInt(parts[1]);
-        } catch (NumberFormatException ignored) {
-            return null;
+            throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
         }
+        int x = Integer.parseInt(parts[0]);
+        int y = Integer.parseInt(parts[1]);
         return new PlotId(x, y);
     }
 
@@ -54,7 +46,7 @@ public class PlotId {
     }
 
     /**
-     * Get the PlotId from the HashCode<br>
+     * Gets the PlotId from the HashCode<br>
      * Note: Only accurate for small x,z values (short)
      *
      * @param hash

From 7e7f14a66bc4ae2cd9c2105da3001bbdadf9a29c Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 6 Feb 2019 14:10:34 +0000
Subject: [PATCH 024/210] Update build ci offset

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 953cfea8c..d9443d1ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2048;  // Offset to match CI
+    index = -2049;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From e41060ad65e5f7c1aed68bc7222faec0eb468ec9 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 6 Feb 2019 14:12:50 +0000
Subject: [PATCH 025/210] And again

Because the ci built, but using a specific commit (to split Matt's previous commits into separate builds)
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d9443d1ec..953cfea8c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2049;  // Offset to match CI
+    index = -2048;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 6711788dd04915b63f80ab694d7d23e3b4074d94 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 6 Feb 2019 16:38:01 +0000
Subject: [PATCH 026/210] Fix ClassCastException in runEntityTask

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index d58443025..1580d8d09 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -365,8 +365,12 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                         if (meta.isEmpty()) {
                                             continue;
                                         }
-                                        Plot origin = (Plot) meta.get(0).value();
-                                        if (!plot.equals(origin.getBasePlot(false))) {
+                                        PlotId originPlotId = (PlotId) meta.get(0).value();
+                                        if (originPlotId == null) {
+                                            iterator.remove();
+                                            entity.remove();
+                                        }
+                                        if (!plot.getId().equals(originPlotId)) {
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }

From d6a801d854b14dd4ffc28fd0a540d1826012978b Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 6 Feb 2019 16:42:27 +0000
Subject: [PATCH 027/210] Reformat

---
 .../plotsquared/plot/PlotSquared.java         | 15 +++---
 .../plotsquared/plot/commands/Cluster.java    |  4 +-
 .../plotsquared/plot/commands/Database.java   |  4 +-
 .../plotsquared/plot/database/SQLManager.java | 46 +++++++++----------
 .../plotsquared/plot/flag/FlagManager.java    |  5 +-
 .../plotsquared/plot/object/Plot.java         |  2 +-
 .../plot/object/PlotInventory.java            |  2 +
 .../plot/util/expiry/ExpireManager.java       | 20 ++++----
 8 files changed, 52 insertions(+), 46 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index c686b21de..991cc9706 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -214,8 +214,8 @@ import java.util.zip.ZipInputStream;
             }
             // Economy
             if (Settings.Enabled_Components.ECONOMY) {
-                TaskManager.runTask(
-                    () -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
+                TaskManager
+                    .runTask(() -> EconHandler.manager = PlotSquared.this.IMP.getEconomyHandler());
             }
 
 /*            // Check for updates
@@ -250,8 +250,9 @@ import java.util.zip.ZipInputStream;
                             continue;
                         }
                         if (!WorldUtil.IMP.isWorld(world) && !world.equals("*")) {
-                            debug("&c`" + world + "` was not properly loaded - " + IMP
-                                .getPluginName() + " will now try to load it properly: ");
+                            debug(
+                                "&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
+                                    + " will now try to load it properly: ");
                             debug(
                                 "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
                             debug(
@@ -1873,8 +1874,8 @@ import java.util.zip.ZipInputStream;
     }
 
     public int getPlotCount() {
-        return Arrays.stream(this.plotAreaManager.getAllPlotAreas()).mapToInt(PlotArea::getPlotCount)
-            .sum();
+        return Arrays.stream(this.plotAreaManager.getAllPlotAreas())
+            .mapToInt(PlotArea::getPlotCount).sum();
     }
 
     public Set<PlotArea> getPlotAreas() {
@@ -1968,7 +1969,7 @@ import java.util.zip.ZipInputStream;
      *
      * @param alias     to search plots
      * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
+     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
      */
     public Set<Plot> getPlotsByAlias(@Nullable final String alias,
         @NonNull final String worldname) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index 4cb20487b..914b04c3c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -87,7 +87,7 @@ import java.util.UUID;
                 PlotId pos1;
                 PlotId pos2;
                 // check pos1 / pos2
-                try{
+                try {
                     pos1 = PlotId.fromString(args[2]);
                     pos2 = PlotId.fromString(args[3]);
                 } catch (IllegalArgumentException ignored) {
@@ -215,7 +215,7 @@ import java.util.UUID;
                 PlotId pos1;
                 PlotId pos2;
                 // check pos1 / pos2
-                try{
+                try {
                     pos1 = PlotId.fromString(args[2]);
                     pos2 = PlotId.fromString(args[3]);
                 } catch (IllegalArgumentException ignored) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
index 039959916..e94850121 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -39,8 +39,8 @@ import java.util.Map.Entry;
                     manager.close();
                 });
             } catch (Exception e) {
-                MainUtil.sendMessage(player,
-                    "Failed to insert plot objects, see stacktrace for info");
+                MainUtil
+                    .sendMessage(player, "Failed to insert plot objects, see stacktrace for info");
                 e.printStackTrace();
             }
         });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 8629efd17..e1099076e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -557,20 +557,18 @@ import java.util.concurrent.atomic.AtomicInteger;
                                     @Override public void run() {
                                         createTiers(trusted, "trusted", new Runnable() {
                                             @Override public void run() {
-                                                createTiers(denied, "denied",
-                                                    new Runnable() {
-                                                        @Override public void run() {
-                                                            try {
-                                                                SQLManager.this.connection
-                                                                    .commit();
-                                                            } catch (SQLException e) {
-                                                                e.printStackTrace();
-                                                            }
-                                                            if (whenDone != null) {
-                                                                whenDone.run();
-                                                            }
+                                                createTiers(denied, "denied", new Runnable() {
+                                                    @Override public void run() {
+                                                        try {
+                                                            SQLManager.this.connection.commit();
+                                                        } catch (SQLException e) {
+                                                            e.printStackTrace();
                                                         }
-                                                    });
+                                                        if (whenDone != null) {
+                                                            whenDone.run();
+                                                        }
+                                                    }
+                                                });
                                             }
                                         });
                                     }
@@ -2091,8 +2089,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                 try (ResultSet r = stmt.executeQuery()) {
                     ids = new HashSet<>();
                     while (r.next()) {
-                        PlotId plot_id =
-                            new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
+                        PlotId plot_id = new PlotId(r.getInt("plot_id_x"), r.getInt("plot_id_z"));
                         if (plots.contains(plot_id)) {
                             ids.add(r.getInt("id"));
                         }
@@ -2562,7 +2559,8 @@ import java.util.concurrent.atomic.AtomicInteger;
                     }
                     cluster = new PlotCluster(null, pos1, pos2, user, id);
                     clusters.put(id, cluster);
-                    Set<PlotCluster> set = newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
+                    Set<PlotCluster> set =
+                        newClusters.computeIfAbsent(areaid, k -> new HashSet<>());
                     set.add(cluster);
                 }
                 //Getting helpers
@@ -3039,17 +3037,17 @@ import java.util.concurrent.atomic.AtomicInteger;
                     "UPDATE `" + SQLManager.this.prefix + "cluster_invited` SET `user_uuid` = '"
                         + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
                 stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now
-                        .toString() + "' WHERE `owner` = '" + old.toString() + '\'');
+                    "UPDATE `" + SQLManager.this.prefix + "plot` SET `owner` = '" + now.toString()
+                        + "' WHERE `owner` = '" + old.toString() + '\'');
                 stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    "UPDATE `" + SQLManager.this.prefix + "plot_denied` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
                 stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    "UPDATE `" + SQLManager.this.prefix + "plot_helpers` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
                 stmt.executeUpdate(
-                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '"
-                        + now.toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
+                    "UPDATE `" + SQLManager.this.prefix + "plot_trusted` SET `user_uuid` = '" + now
+                        .toString() + "' WHERE `user_uuid` = '" + old.toString() + '\'');
             } catch (SQLException e) {
                 e.printStackTrace();
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
index b35d96a43..6dc4aa2ff 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/FlagManager.java
@@ -2,7 +2,10 @@ package com.github.intellectualsites.plotsquared.plot.flag;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
 import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.google.common.collect.ImmutableSet;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 69d0e63ab..44b731ec5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1523,9 +1523,9 @@ public class Plot {
     }
 
     //TODO Better documentation needed.
+
     /**
      * Return the bottom location for the plot.
-     *
      */
     public Location getBottomAbs() {
         Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
index 5280d6459..4598a2fff 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java
@@ -12,12 +12,14 @@ public class PlotInventory {
     private final PlotItemStack[] items;
     private String title;
     private boolean open = false;
+
     public PlotInventory(PlotPlayer player) {
         this.size = 4;
         this.title = null;
         this.player = player;
         this.items = InventoryUtil.manager.getItems(player);
     }
+
     public PlotInventory(PlotPlayer player, int size, String name) {
         this.size = size;
         this.title = name == null ? "" : name;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index 4614cfe25..a4f64c2a2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -101,19 +101,19 @@ public class ExpireManager {
                         pp.setMeta("ignoreExpireTask", true);
                         pp.teleport(current.getCenter());
                         pp.deleteMeta("ignoreExpireTask");
-                        PlotMessage msg = new PlotMessage().text(
-                            num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
+                        PlotMessage msg = new PlotMessage()
+                            .text(num + " " + (num > 1 ? "plots are" : "plot is") + " expired: ")
                             .color("$1").text(current.toString()).color("$2")
                             .suggest("/plot list expired").tooltip("/plot list expired")
                             //.text("\n - ").color("$3").text("Delete all (/plot delete expired)").color("$2").command("/plot delete expired")
                             .text("\n - ").color("$3").text("Delete this (/plot delete)")
                             .color("$2").suggest("/plot delete").tooltip("/plot delete")
                             .text("\n - ").color("$3").text("Remind later (/plot set keep 1d)")
-                            .color("$2").suggest("/plot set keep 1d")
-                            .tooltip("/plot set keep 1d").text("\n - ").color("$3")
-                            .text("Keep this (/plot set keep true)").color("$2")
-                            .suggest("/plot set keep true").tooltip("/plot set keep true")
-                            .text("\n - ").color("$3").text("Don't show me this").color("$2")
+                            .color("$2").suggest("/plot set keep 1d").tooltip("/plot set keep 1d")
+                            .text("\n - ").color("$3").text("Keep this (/plot set keep true)")
+                            .color("$2").suggest("/plot set keep true")
+                            .tooltip("/plot set keep true").text("\n - ").color("$3")
+                            .text("Don't show me this").color("$2")
                             .suggest("/plot toggle clear-confirmation")
                             .tooltip("/plot toggle clear-confirmation");
                         msg.send(pp);
@@ -271,7 +271,8 @@ public class ExpireManager {
                     }
                     for (ExpiryTask expiryTask : expired) {
                         if (!expiryTask.needsAnalysis()) {
-                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1), expiryTask.requiresConfirmation());
+                            expiredTask.run(newPlot, () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                                expiryTask.requiresConfirmation());
                             return;
                         }
                     }
@@ -281,7 +282,8 @@ public class ExpireManager {
                                 passesComplexity(changed, expired, new RunnableVal<Boolean>() {
                                     @Override public void run(Boolean confirmation) {
                                         expiredTask.run(newPlot,
-                                            () -> TaskManager.IMP.taskLaterAsync(task, 1), confirmation);
+                                            () -> TaskManager.IMP.taskLaterAsync(task, 1),
+                                            confirmation);
                                     }
                                 }, () -> {
                                     FlagManager

From 6ec6c26a10c6391c3a55f2d7ec24364ae284f49c Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 6 Feb 2019 12:02:20 -0500
Subject: [PATCH 028/210] Guava needs to be in sync with Minecraft

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 953cfea8c..954072b9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -64,7 +64,8 @@ subprojects {
             exclude(module: 'mockito-core')
             exclude(module: 'dummypermscompat')
         }
-        compile 'com.google.guava:guava:27.0.1-jre'
+        //Minecraft uses Guava 21 as of 1.13.
+        compile 'com.google.guava:guava:21.0'
         compileOnly 'org.projectlombok:lombok:1.18.4'
         testImplementation "junit:junit:4.12"
     }

From 9101cb92184f545963a058884f2d6d67ecb20735 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 6 Feb 2019 12:33:14 -0500
Subject: [PATCH 029/210] PlotComment API tweaks.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/plot/commands/Inbox.java      | 17 +++----
 .../plotsquared/plot/object/Plot.java         | 21 ++++++++
 .../plotsquared/plot/object/PlotSettings.java | 40 +++++++---------
 .../plot/object/comment/InboxOwner.java       | 13 +++--
 .../plot/object/comment/InboxPublic.java      | 12 ++---
 .../plotsquared/plot/util/CommentManager.java | 48 +++++++++----------
 6 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
index 5c7cfc0ac..5e8a5550c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -11,14 +11,10 @@ import com.github.intellectualsites.plotsquared.plot.util.CommentManager;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
-@CommandDeclaration(command = "inbox", description = "Review the comments for a plot",
-    usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox",
-    category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Inbox
-    extends SubCommand {
+@CommandDeclaration(command = "inbox", description = "Review the comments for a plot", usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox", category = CommandCategory.CHAT, requiredType = RequiredType.NONE)
+public class Inbox extends SubCommand {
 
     public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
         if (oldComments == null || oldComments.isEmpty()) {
@@ -150,7 +146,7 @@ import java.util.Optional;
                             }
                             PlotComment comment = value.get(index - 1);
                             inbox.removeComment(plot, comment);
-                            plot.getSettings().removeComment(comment);
+                            plot.removeComment(comment);
                             MainUtil.sendMessage(player, C.COMMENT_REMOVED, comment.comment);
                         }
                     })) {
@@ -163,10 +159,9 @@ import java.util.Optional;
                         sendMessage(player, C.NO_PERM_INBOX_MODIFY);
                     }
                     inbox.clearInbox(plot);
-                    Optional<ArrayList<PlotComment>> comments =
-                        plot.getSettings().getComments(inbox.toString());
-                    if (comments.isPresent()) {
-                        plot.getSettings().removeComments(comments.get());
+                    List<PlotComment> comments = plot.getComments(inbox.toString());
+                    if (!comments.isEmpty()) {
+                        plot.removeComments(comments);
                     }
                     MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
                     return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 44b731ec5..fd1e11a90 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -10,6 +10,7 @@ import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.generator.SquarePlotWorld;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
@@ -2991,4 +2992,24 @@ public class Plot {
     public boolean hasFlag(Flag<?> flag) {
         return getFlags().containsKey(flag);
     }
+
+    @SuppressWarnings("deprecation") public boolean removeComment(PlotComment comment) {
+        return getSettings().removeComment(comment);
+    }
+
+    @SuppressWarnings("deprecation") public void removeComments(List<PlotComment> comments) {
+        getSettings().removeComments(comments);
+    }
+
+    @SuppressWarnings("deprecation") public List<PlotComment> getComments(String inbox) {
+        return getSettings().getComments(inbox);
+    }
+
+    @SuppressWarnings("deprecation") public void addComment(PlotComment comment) {
+        getSettings().addComment(comment);
+    }
+
+    @SuppressWarnings("deprecation") public void setComments(List<PlotComment> list) {
+        getSettings().setComments(list);
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
index 4f3701f56..f6c479471 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -3,6 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.object;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
+import com.google.common.collect.ImmutableList;
 
 import java.util.*;
 
@@ -25,12 +26,8 @@ public class PlotSettings {
      * @deprecated Raw access
      */
     @Deprecated public String alias = "";
-    /**
-     * Comments.
-     *
-     * @deprecated Raw access
-     */
-    @Deprecated public List<PlotComment> comments = null;
+
+    private List<PlotComment> comments = null;
 
     /**
      * The ratings for a plot.
@@ -142,36 +139,31 @@ public class PlotSettings {
         }
     }
 
-    public Optional<ArrayList<PlotComment>> getComments(String inbox) {
-        ArrayList<PlotComment> c = new ArrayList<>();
+    @SuppressWarnings({"UnstableApiUsage"}) public List<PlotComment> getComments(String inbox) {
         if (this.comments == null) {
-            return Optional.empty();
+            return Collections.emptyList();
         }
-        for (PlotComment comment : this.comments) {
-            if (comment.inbox.equals(inbox)) {
-                c.add(comment);
-            }
-        }
-        return Optional.of(c);
+
+        return this.comments.stream().filter(comment -> comment.inbox.equals(inbox))
+            .collect(ImmutableList.toImmutableList());
     }
 
-    public void setComments(List<PlotComment> comments) {
+    void setComments(List<PlotComment> comments) {
         this.comments = comments;
     }
 
-    public void removeComment(PlotComment comment) {
-        if (this.comments.contains(comment)) {
-            this.comments.remove(comment);
+    boolean removeComment(PlotComment comment) {
+        if (this.comments == null) {
+            return false;
         }
+        return this.comments.remove(comment);
     }
 
-    public void removeComments(List<PlotComment> comments) {
-        for (PlotComment comment : comments) {
-            removeComment(comment);
-        }
+    void removeComments(List<PlotComment> comments) {
+        comments.forEach(this::removeComment);
     }
 
-    public void addComment(PlotComment comment) {
+    void addComment(PlotComment comment) {
         if (this.comments == null) {
             this.comments = new ArrayList<>();
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
index d3a80013e..426a5ab49 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
@@ -7,15 +7,14 @@ import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class InboxOwner extends CommentInbox {
 
     @Override
     public boolean getComments(final Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
-        Optional<ArrayList<PlotComment>> comments = plot.getSettings().getComments(toString());
-        if (comments.isPresent()) {
-            whenDone.value = comments.get();
+        List<PlotComment> comments = plot.getComments(toString());
+        if (!comments.isEmpty()) {
+            whenDone.value = comments;
             TaskManager.runTask(whenDone);
             return true;
         }
@@ -24,10 +23,10 @@ public class InboxOwner extends CommentInbox {
                 whenDone.value = value;
                 if (value != null) {
                     for (PlotComment comment : value) {
-                        plot.getSettings().addComment(comment);
+                        plot.addComment(comment);
                     }
                 } else {
-                    plot.getSettings().setComments(new ArrayList<PlotComment>());
+                    plot.setComments(new ArrayList<>());
                 }
                 TaskManager.runTask(whenDone);
             }
@@ -39,7 +38,7 @@ public class InboxOwner extends CommentInbox {
         if (plot.owner == null) {
             return false;
         }
-        plot.getSettings().addComment(comment);
+        plot.addComment(comment);
         DBFunc.setComment(plot, comment);
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
index a14954e28..598904b0f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxPublic.java
@@ -5,17 +5,15 @@ import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 public class InboxPublic extends CommentInbox {
 
     @Override
     public boolean getComments(final Plot plot, final RunnableVal<List<PlotComment>> whenDone) {
-        Optional<ArrayList<PlotComment>> comments = plot.getSettings().getComments(toString());
-        if (comments.isPresent()) {
-            whenDone.value = comments.get();
+        List<PlotComment> comments = plot.getComments(toString());
+        if (!comments.isEmpty()) {
+            whenDone.value = comments;
             TaskManager.runTask(whenDone);
             return true;
         }
@@ -24,7 +22,7 @@ public class InboxPublic extends CommentInbox {
                 whenDone.value = value;
                 if (value != null) {
                     for (PlotComment comment : value) {
-                        plot.getSettings().addComment(comment);
+                        plot.addComment(comment);
                     }
                 }
                 TaskManager.runTask(whenDone);
@@ -34,7 +32,7 @@ public class InboxPublic extends CommentInbox {
     }
 
     @Override public boolean addComment(Plot plot, PlotComment comment) {
-        plot.getSettings().addComment(comment);
+        plot.addComment(comment);
         DBFunc.setComment(plot, comment);
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index 3dc43fe06..cc5021c57 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -20,34 +20,32 @@ public class CommentManager {
         if (!Settings.Enabled_Components.COMMENT_NOTIFIER || !plot.isOwner(player.getUUID())) {
             return;
         }
-        TaskManager.runTaskLaterAsync(new Runnable() {
-            @Override public void run() {
-                Collection<CommentInbox> boxes = CommentManager.inboxes.values();
-                final AtomicInteger count = new AtomicInteger(0);
-                final AtomicInteger size = new AtomicInteger(boxes.size());
-                for (final CommentInbox inbox : inboxes.values()) {
-                    inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
-                        @Override public void run(List<PlotComment> value) {
-                            int total;
-                            if (value != null) {
-                                int num = 0;
-                                for (PlotComment comment : value) {
-                                    if (comment.timestamp > getTimestamp(player,
-                                        inbox.toString())) {
-                                        num++;
-                                    }
+        TaskManager.runTaskLaterAsync(() -> {
+            Collection<CommentInbox> boxes = CommentManager.inboxes.values();
+            final AtomicInteger count = new AtomicInteger(0);
+            final AtomicInteger size = new AtomicInteger(boxes.size());
+            for (final CommentInbox inbox : inboxes.values()) {
+                inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
+                    @Override public void run(List<PlotComment> value) {
+                        int total;
+                        if (value != null) {
+                            int num = 0;
+                            for (PlotComment comment : value) {
+                                if (comment.timestamp > getTimestamp(player,
+                                    inbox.toString())) {
+                                    num++;
                                 }
-                                total = count.addAndGet(num);
-                            } else {
-                                total = count.get();
-                            }
-                            if ((size.decrementAndGet() == 0) && (total > 0)) {
-                                AbstractTitle.sendTitle(player, "",
-                                    C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
                             }
+                            total = count.addAndGet(num);
+                        } else {
+                            total = count.get();
                         }
-                    });
-                }
+                        if ((size.decrementAndGet() == 0) && (total > 0)) {
+                            AbstractTitle.sendTitle(player, "",
+                                C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
+                        }
+                    }
+                });
             }
         }, 20);
     }

From 3d8179a4e6a327f20fc0564e55d4b84b8f12b35f Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 6 Feb 2019 17:30:25 -0500
Subject: [PATCH 030/210] Small tweaks

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/plot/commands/Auto.java       |  4 +--
 .../plotsquared/plot/commands/Claim.java      | 26 ++++++-------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index 5035c1480..da71e8912 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -11,9 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 import javax.annotation.Nullable;
 import java.util.Set;
 
-@CommandDeclaration(command = "auto", permission = "plots.auto",
-    category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE,
-    description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length,width]")
+@CommandDeclaration(command = "auto", permission = "plots.auto", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length,width]")
 public class Auto extends SubCommand {
 
     @Deprecated public static PlotId getNextPlotId(PlotId id, int step) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
index 88f102967..ce7ee4c26 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
@@ -10,9 +10,7 @@ import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 
-@CommandDeclaration(command = "claim", aliases = "c",
-    description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
+@CommandDeclaration(command = "claim", aliases = "c", description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
 public class Claim extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
@@ -82,22 +80,14 @@ public class Claim extends SubCommand {
         if (plot.canClaim(player)) {
             plot.owner = player.getUUID();
             final String finalSchematic = schematic;
-            DBFunc.createPlotSafe(plot, new Runnable() {
-                @Override public void run() {
-                    TaskManager.IMP.sync(new RunnableVal<Object>() {
-                        @Override public void run(Object value) {
-                            plot.claim(player, true, finalSchematic, false);
-                            if (area.AUTO_MERGE) {
-                                plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
-                            }
-                        }
-                    });
+            DBFunc.createPlotSafe(plot, () -> TaskManager.IMP.sync(new RunnableVal<Object>() {
+                @Override public void run(Object value) {
+                    plot.claim(player, true, finalSchematic, false);
+                    if (area.AUTO_MERGE) {
+                        plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
+                    }
                 }
-            }, new Runnable() {
-                @Override public void run() {
-                    sendMessage(player, C.PLOT_NOT_CLAIMED);
-                }
-            });
+            }), () -> sendMessage(player, C.PLOT_NOT_CLAIMED));
             return true;
         } else {
             sendMessage(player, C.PLOT_NOT_CLAIMED);

From b39ea1b68b89e701c4e2f021b30ca6a94a67f68f Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 6 Feb 2019 21:29:51 -0500
Subject: [PATCH 031/210] Cleaning and API clarifications

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/plot/PlotSquared.java         | 22 ++++-----
 .../plotsquared/plot/database/SQLManager.java | 47 ++++++++-----------
 .../plotsquared/plot/object/PlotArea.java     | 43 +++++++++++------
 3 files changed, 57 insertions(+), 55 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 991cc9706..7a9abb000 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -49,7 +49,7 @@ import java.util.zip.ZipInputStream;
  */
 @SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
     private static final Set<Plot> EMPTY_SET =
-        Collections.unmodifiableSet(Collections.<Plot>emptySet());
+        Collections.unmodifiableSet(Collections.emptySet());
     private static PlotSquared instance;
     // Implementation
     public final IPlotMain IMP;
@@ -394,7 +394,7 @@ import java.util.zip.ZipInputStream;
 
     /**
      * Gets the server platform this plugin is running on this is running on.
-     * <p>
+     *
      * <p>This will be either <b>Bukkit</b> or <b>Sponge</b></p>
      *
      * @return the server implementation
@@ -1526,9 +1526,9 @@ import java.util.zip.ZipInputStream;
         for (PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
             Map<PlotId, Plot> map2 = map.get(area.toString());
             if (map2 == null) {
-                map.put(area.toString(), area.getPlotsRaw());
+                map.put(area.toString(), area.getPlotsMap());
             } else {
-                map2.putAll(area.getPlotsRaw());
+                map2.putAll(area.getPlotsMap());
             }
         }
         return map;
@@ -1554,8 +1554,8 @@ import java.util.zip.ZipInputStream;
             // Close the connection
             DBFunc.close();
             UUIDHandler.handleShutdown();
-        } catch (NullPointerException ignored) {
-            ignored.printStackTrace();
+        } catch (NullPointerException throwable) {
+            throwable.printStackTrace();
             PlotSquared.log("&cCould not close database connection!");
         }
     }
@@ -1638,22 +1638,20 @@ import java.util.zip.ZipInputStream;
             }
         }
         Settings.load(configFile);
-        try {
-            InputStream stream = getClass().getResourceAsStream("/plugin.properties");
-            BufferedReader br = new BufferedReader(new InputStreamReader(stream));
+        try (InputStream stream = getClass().getResourceAsStream("/plugin.properties");
+            BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
             //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
             String versionString = br.readLine();
             String commitString = br.readLine();
             String dateString = br.readLine();
             //scanner.close();
-            br.close();
             this.version = PlotVersion.tryParse(versionString, commitString, dateString);
             Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
             Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
             Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
                 .toHexString(version.hash);
             System.out.println("Version is " + this.version);
-        } catch (Throwable throwable) {
+        } catch (IOException throwable) {
             throwable.printStackTrace();
         }
         Settings.save(configFile);
@@ -1969,7 +1967,7 @@ import java.util.zip.ZipInputStream;
      *
      * @param alias     to search plots
      * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
+     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
      */
     public Set<Plot> getPlotsByAlias(@Nullable final String alias,
         @NonNull final String worldname) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index e1099076e..1c3395b56 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -34,10 +34,12 @@ import java.util.concurrent.atomic.AtomicInteger;
     public final String CREATE_PLOT;
     public final String CREATE_PLOT_SAFE;
     public final String CREATE_CLUSTER;
-    private final String prefix;
+
     // Private Final
+    private final String prefix;
     private final Database database;
     private final boolean mySQL;
+
     /**
      * important tasks
      */
@@ -67,6 +69,7 @@ import java.util.concurrent.atomic.AtomicInteger;
      * cluster_settings
      */
     public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
+
     // Private
     private Connection connection;
     private boolean closed = false;
@@ -75,11 +78,11 @@ import java.util.concurrent.atomic.AtomicInteger;
      * Constructor
      *
      * @param database
-     * @param p        prefix
+     * @param prefix   prefix
      * @throws SQLException
      * @throws ClassNotFoundException
      */
-    public SQLManager(final Database database, String p, boolean debug)
+    public SQLManager(final Database database, String prefix, boolean debug)
         throws SQLException, ClassNotFoundException {
         // Private final
         this.database = database;
@@ -90,7 +93,7 @@ import java.util.concurrent.atomic.AtomicInteger;
         this.plotTasks = new ConcurrentHashMap<>();
         this.playerTasks = new ConcurrentHashMap<>();
         this.clusterTasks = new ConcurrentHashMap<>();
-        this.prefix = p;
+        this.prefix = prefix;
         this.SET_OWNER = "UPDATE `" + this.prefix
             + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
         this.GET_ALL_PLOTS =
@@ -551,30 +554,18 @@ import java.util.concurrent.atomic.AtomicInteger;
                                 }
                             }
                         }
-                        createSettings(settings, new Runnable() {
-                            @Override public void run() {
-                                createTiers(helpers, "helpers", new Runnable() {
-                                    @Override public void run() {
-                                        createTiers(trusted, "trusted", new Runnable() {
-                                            @Override public void run() {
-                                                createTiers(denied, "denied", new Runnable() {
-                                                    @Override public void run() {
-                                                        try {
-                                                            SQLManager.this.connection.commit();
-                                                        } catch (SQLException e) {
-                                                            e.printStackTrace();
-                                                        }
-                                                        if (whenDone != null) {
-                                                            whenDone.run();
-                                                        }
-                                                    }
-                                                });
-                                            }
-                                        });
+                        createSettings(settings, () -> createTiers(helpers, "helpers",
+                            () -> createTiers(trusted, "trusted",
+                                () -> createTiers(denied, "denied", () -> {
+                                    try {
+                                        SQLManager.this.connection.commit();
+                                    } catch (SQLException e) {
+                                        e.printStackTrace();
                                     }
-                                });
-                            }
-                        });
+                                    if (whenDone != null) {
+                                        whenDone.run();
+                                    }
+                                }))));
                     } catch (SQLException e) {
                         e.printStackTrace();
                         PlotSquared.debug("&7[WARN] Failed to set all helpers for plots");
@@ -1354,7 +1345,7 @@ import java.util.concurrent.atomic.AtomicInteger;
     }
 
     /**
-     * Create plot settings
+     * Creates plot settings
      *
      * @param id
      * @param plot
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 48ebb759a..a1ae29904 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -14,6 +14,8 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -525,17 +527,8 @@ public abstract class PlotArea {
     }
 
     @Nonnull public Set<Plot> getPlots(@Nonnull final UUID uuid) {
-        final Set<Plot> myplots = new HashSet<>();
-        for (final Plot plot : getPlots()) {
-            if (plot.isBasePlot() && plot.isOwner(uuid)) {
-                myplots.add(plot);
-            }
-        }
-        return myplots;
-    }
-
-    public Set<Plot> getPlots(@Nonnull final PlotPlayer player) {
-        return getPlots(player.getUUID());
+        return getPlots().stream().filter(plot -> plot.isBasePlot() && plot.isOwner(uuid))
+            .collect(ImmutableSet.toImmutableSet());
     }
 
     /**
@@ -560,6 +553,15 @@ public abstract class PlotArea {
         return getPlotsAbs(uuid).size();
     }
 
+    /**
+     * Retrieves the plots for the player in this PlotArea.
+     *
+     * @deprecated Use {@link #getPlots(UUID)}
+     */
+    @Deprecated public Set<Plot> getPlots(@Nonnull final PlotPlayer player) {
+        return getPlots(player.getUUID());
+    }
+
     public boolean hasPlot(@Nonnull final UUID uuid) {
         for (Entry<PlotId, Plot> entry : this.plots.entrySet()) {
             if (entry.getValue().isOwner(uuid))
@@ -685,8 +687,20 @@ public abstract class PlotArea {
         }
     }
 
-    @Nonnull public Map<PlotId, Plot> getPlotsRaw() {
-        return this.plots;
+    /**
+     * Returns an ImmutableMap of PlotId's and Plots in this PlotArea.
+     */
+    public Map<PlotId, Plot> getPlotsMap() {
+        return ImmutableMap.copyOf(plots);
+    }
+
+    /**
+     * Returns an ImmutableMap of PlotId's and Plots in this PlotArea.
+     * @deprecated Use {@link #getPlotsMap()}
+     */
+    //todo eventually remove
+    @Deprecated @Nonnull public Map<PlotId, Plot> getPlotsRaw() {
+        return ImmutableMap.copyOf(plots);
     }
 
     @Nonnull public Set<Entry<PlotId, Plot>> getPlotEntries() {
@@ -714,14 +728,13 @@ public abstract class PlotArea {
             center = new PlotId(0, 0);
             plots = Integer.MAX_VALUE;
         }
-        PlotId currentId;
         for (int i = 0; i < plots; i++) {
             if (start == null) {
                 start = getMeta("lastPlot", new PlotId(0, 0));
             } else {
                 start = start.getNextId(1);
             }
-            currentId = new PlotId(center.x + start.x, center.y + start.y);
+            PlotId currentId = new PlotId(center.x + start.x, center.y + start.y);
             Plot plot = getPlotAbs(currentId);
             if (plot != null && plot.canClaim(player)) {
                 setMeta("lastPlot", currentId);

From e891873d2881cd85bf153bef3ae2c3d1fd4ecee7 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 8 Feb 2019 11:21:53 -0500
Subject: [PATCH 032/210] Cleaning and scope changes

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/plot/Platform.java            |  2 +-
 .../plotsquared/plot/commands/ListCmd.java    | 67 ++++++++--------
 .../plotsquared/plot/commands/Rate.java       | 68 ++++++++---------
 .../plotsquared/plot/database/MySQL.java      |  6 +-
 .../plotsquared/plot/database/SQLManager.java |  2 +-
 .../plotsquared/plot/object/PlotArea.java     |  1 +
 .../plotsquared/plot/object/PlotPlayer.java   | 54 ++++++-------
 .../plotsquared/plot/object/PlotSettings.java |  3 +-
 .../object/worlds/DefaultPlotAreaManager.java |  2 +-
 .../plotsquared/plot/util/ChunkManager.java   | 22 +++---
 .../plot/util/UUIDHandlerImplementation.java  | 76 +++++++++----------
 .../plot/util/expiry/ExpiryTask.java          |  8 +-
 12 files changed, 142 insertions(+), 169 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
index b7eb33b83..9dfbf2ffb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot;
 
 public enum Platform {
-    Bukkit, Sponge, Spigot, Cauldron
+    Bukkit, Sponge, Spigot
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
index 9df74d30b..c4b095f8d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -165,18 +165,16 @@ public class ListCmd extends SubCommand {
                         plots.add(plot);
                     }
                 }
-                Collections.sort(plots, new Comparator<Plot>() {
-                    @Override public int compare(Plot a, Plot b) {
-                        String va = "" + a.getFlags().get(Flags.DONE);
-                        String vb = "" + b.getFlags().get(Flags.DONE);
-                        if (MathMan.isInteger(va)) {
-                            if (MathMan.isInteger(vb)) {
-                                return Integer.parseInt(vb) - Integer.parseInt(va);
-                            }
-                            return -1;
+                plots.sort((a, b) -> {
+                    String va = "" + a.getFlags().get(Flags.DONE);
+                    String vb = "" + b.getFlags().get(Flags.DONE);
+                    if (MathMan.isInteger(va)) {
+                        if (MathMan.isInteger(vb)) {
+                            return Integer.parseInt(vb) - Integer.parseInt(va);
                         }
-                        return 1;
+                        return -1;
                     }
+                    return 1;
                 });
                 sort = false;
                 break;
@@ -186,33 +184,30 @@ public class ListCmd extends SubCommand {
                     return false;
                 }
                 plots = new ArrayList<>(PlotSquared.get().getPlots());
-                Collections.sort(plots, new Comparator<Plot>() {
-                    @Override public int compare(Plot p1, Plot p2) {
-                        double v1 = 0;
-                        int p1s = p1.getSettings().getRatings().size();
-                        int p2s = p2.getRatings().size();
-                        if (!p1.getSettings().getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                double av = entry.getValue().getAverageRating();
-                                v1 += av * av;
-                            }
-                            v1 /= p1s;
-                            v1 += p1s;
-                        }
-                        double v2 = 0;
-                        if (!p2.getSettings().getRatings().isEmpty()) {
-                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                double av = entry.getValue().getAverageRating();
-                                v2 += av * av;
-                            }
-                            v2 /= p2s;
-                            v2 += p2s;
-                        }
-                        if (v2 == v1 && v2 != 0) {
-                            return p2s - p1s;
-                        }
-                        return (int) Math.signum(v2 - v1);
+                plots.sort((p1, p2) -> {
+                    double v1 = 0;
+                    int p1s = p1.getSettings().getRatings().size();
+                    int p2s = p2.getRatings().size();
+                    if (!p1.getSettings().getRatings().isEmpty()) {
+                        v1 = p1.getRatings().entrySet().stream()
+                            .mapToDouble(entry -> entry.getValue().getAverageRating())
+                            .map(av -> av * av).sum();
+                        v1 /= p1s;
+                        v1 += p1s;
                     }
+                    double v2 = 0;
+                    if (!p2.getSettings().getRatings().isEmpty()) {
+                        for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                            double av = entry.getValue().getAverageRating();
+                            v2 += av * av;
+                        }
+                        v2 /= p2s;
+                        v2 += p2s;
+                    }
+                    if (v2 == v1 && v2 != 0) {
+                        return p2s - p1s;
+                    }
+                    return (int) Math.signum(v2 - v1);
                 });
                 sort = false;
                 break;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 7141df96e..59e2b2d43 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -22,25 +22,23 @@ import java.util.Map.Entry;
             switch (args[0].toLowerCase()) {
                 case "next": {
                     ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getBasePlots());
-                    Collections.sort(plots, new Comparator<Plot>() {
-                        @Override public int compare(Plot p1, Plot p2) {
-                            double v1 = 0;
-                            if (!p1.getRatings().isEmpty()) {
-                                for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
-                                    v1 -= 11 - entry.getValue().getAverageRating();
-                                }
+                    plots.sort((p1, p2) -> {
+                        double v1 = 0;
+                        if (!p1.getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p1.getRatings().entrySet()) {
+                                v1 -= 11 - entry.getValue().getAverageRating();
                             }
-                            double v2 = 0;
-                            if (!p2.getRatings().isEmpty()) {
-                                for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                                    v2 -= 11 - entry.getValue().getAverageRating();
-                                }
-                            }
-                            if (v1 == v2) {
-                                return -0;
-                            }
-                            return v2 > v1 ? 1 : -1;
                         }
+                        double v2 = 0;
+                        if (!p2.getRatings().isEmpty()) {
+                            for (Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                                v2 -= 11 - entry.getValue().getAverageRating();
+                            }
+                        }
+                        if (v1 == v2) {
+                            return -0;
+                        }
+                        return v2 > v1 ? 1 : -1;
                     });
                     UUID uuid = player.getUUID();
                     for (Plot p : plots) {
@@ -137,11 +135,9 @@ import java.util.Map.Entry;
             };
             if (plot.getSettings().ratings == null) {
                 if (!Settings.Enabled_Components.RATING_CACHE) {
-                    TaskManager.runTaskAsync(new Runnable() {
-                        @Override public void run() {
-                            plot.getSettings().ratings = DBFunc.getRatings(plot);
-                            run.run();
-                        }
+                    TaskManager.runTaskAsync(() -> {
+                        plot.getSettings().ratings = DBFunc.getRatings(plot);
+                        run.run();
                     });
                     return true;
                 }
@@ -167,26 +163,22 @@ import java.util.Map.Entry;
             return false;
         }
         final UUID uuid = player.getUUID();
-        final Runnable run = new Runnable() {
-            @Override public void run() {
-                if (plot.getRatings().containsKey(uuid)) {
-                    sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
-                    return;
-                }
-                Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
-                if (result != null) {
-                    plot.addRating(uuid, result);
-                    sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
-                }
+        final Runnable run = () -> {
+            if (plot.getRatings().containsKey(uuid)) {
+                sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                return;
+            }
+            Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
+            if (result != null) {
+                plot.addRating(uuid, result);
+                sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
             }
         };
         if (plot.getSettings().ratings == null) {
             if (!Settings.Enabled_Components.RATING_CACHE) {
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        plot.getSettings().ratings = DBFunc.getRatings(plot);
-                        run.run();
-                    }
+                TaskManager.runTaskAsync(() -> {
+                    plot.getSettings().ratings = DBFunc.getRatings(plot);
+                    run.run();
                 });
                 return true;
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
index 7e7df9124..d5943d1ac 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/MySQL.java
@@ -45,7 +45,7 @@ public class MySQL extends Database {
         return this.connection;
     }
 
-    @Override public Connection openConnection() throws SQLException, ClassNotFoundException {
+    @Override public Connection openConnection() throws SQLException {
         if (checkConnection()) {
             return this.connection;
         }
@@ -69,7 +69,7 @@ public class MySQL extends Database {
         return true;
     }
 
-    @Override public ResultSet querySQL(String query) throws SQLException, ClassNotFoundException {
+    @Override public ResultSet querySQL(String query) throws SQLException {
         if (checkConnection()) {
             openConnection();
         }
@@ -78,7 +78,7 @@ public class MySQL extends Database {
         }
     }
 
-    @Override public int updateSQL(String query) throws SQLException, ClassNotFoundException {
+    @Override public int updateSQL(String query) throws SQLException {
         if (checkConnection()) {
             openConnection();
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 1c3395b56..013b2c7ca 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -2616,7 +2616,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                                 } catch (Exception ignored) {
                                 }
                         }
-                        Integer m = resultSet.getInt("merged");
+                        int m = resultSet.getInt("merged");
                         boolean[] merged = new boolean[4];
                         for (int i = 0; i < 4; i++) {
                             merged[3 - i] = (m & 1 << i) != 0;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index a1ae29904..5fe7e27ee 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -696,6 +696,7 @@ public abstract class PlotArea {
 
     /**
      * Returns an ImmutableMap of PlotId's and Plots in this PlotArea.
+     *
      * @deprecated Use {@link #getPlotsMap()}
      */
     //todo eventually remove
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index d535c625e..b8ad261ee 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -168,11 +168,11 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
             return Integer.MAX_VALUE;
         }
         String[] nodes = stub.split("\\.");
-        StringBuilder n = new StringBuilder();
+        StringBuilder builder = new StringBuilder();
         for (int i = 0; i < (nodes.length - 1); i++) {
-            n.append(nodes[i]).append(".");
-            if (!stub.equals(n + C.PERMISSION_STAR.s())) {
-                if (hasPermission(n + C.PERMISSION_STAR.s())) {
+            builder.append(nodes[i]).append(".");
+            if (!stub.equals(builder + C.PERMISSION_STAR.s())) {
+                if (hasPermission(builder + C.PERMISSION_STAR.s())) {
                     return Integer.MAX_VALUE;
                 }
             }
@@ -222,7 +222,6 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
             return getClusterCount(getLocation().getWorld());
         }
         final AtomicInteger count = new AtomicInteger(0);
-        final UUID uuid = getUUID();
         PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
             @Override public void run(PlotArea value) {
                 for (PlotCluster cluster : value.getClusters()) {
@@ -510,14 +509,9 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      * @return
      */
     public int getPlayerClusterCount(String world) {
-        UUID uuid = getUUID();
-        int count = 0;
-        for (PlotCluster cluster : PlotSquared.get().getClusters(world)) {
-            if (uuid.equals(cluster.owner)) {
-                count += cluster.getArea();
-            }
-        }
-        return count;
+        return PlotSquared.get().getClusters(world).stream()
+            .filter(cluster -> getUUID().equals(cluster.owner)).mapToInt(PlotCluster::getArea)
+            .sum();
     }
 
     /**
@@ -580,31 +574,27 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                                                 final Location loc =
                                                     new Location(plot.getWorldName(), x, y, z);
                                                 if (plot.isLoaded()) {
-                                                    TaskManager.runTask(new Runnable() {
-                                                        @Override public void run() {
-                                                            if (getMeta("teleportOnLogin", true)) {
-                                                                teleport(loc);
-                                                                sendMessage(C.TELEPORTED_TO_PLOT.f()
-                                                                    + " (quitLoc) (" + plotX + ","
-                                                                    + plotZ + ")");
-                                                            }
+                                                    TaskManager.runTask(() -> {
+                                                        if (getMeta("teleportOnLogin", true)) {
+                                                            teleport(loc);
+                                                            sendMessage(C.TELEPORTED_TO_PLOT.f()
+                                                                + " (quitLoc) (" + plotX + ","
+                                                                + plotZ + ")");
                                                         }
                                                     });
                                                 } else if (!PlotSquared.get()
                                                     .isMainThread(Thread.currentThread())) {
                                                     if (getMeta("teleportOnLogin", true)) {
                                                         if (plot.teleportPlayer(PlotPlayer.this)) {
-                                                            TaskManager.runTask(new Runnable() {
-                                                                @Override public void run() {
-                                                                    if (getMeta("teleportOnLogin",
-                                                                        true)) {
-                                                                        teleport(loc);
-                                                                        sendMessage(
-                                                                            C.TELEPORTED_TO_PLOT.f()
-                                                                                + " (quitLoc-unloaded) ("
-                                                                                + plotX + ","
-                                                                                + plotZ + ")");
-                                                                    }
+                                                            TaskManager.runTask(() -> {
+                                                                if (getMeta("teleportOnLogin",
+                                                                    true)) {
+                                                                    teleport(loc);
+                                                                    sendMessage(
+                                                                        C.TELEPORTED_TO_PLOT.f()
+                                                                            + " (quitLoc-unloaded) ("
+                                                                            + plotX + "," + plotZ
+                                                                            + ")");
                                                                 }
                                                             });
                                                         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
index f6c479471..86b41dc45 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -6,6 +6,7 @@ import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 import com.google.common.collect.ImmutableList;
 
 import java.util.*;
+import java.util.stream.IntStream;
 
 /**
  * Generic settings class.
@@ -63,7 +64,7 @@ public class PlotSettings {
      * Returns true if the plot is merged (i.e. if it's a mega plot)
      */
     public boolean isMerged() {
-        return this.merged[0] || this.merged[1] || this.merged[2] || this.merged[3];
+        return IntStream.of(0, 1, 2, 3).anyMatch(i -> this.merged[i]);
     }
 
     public boolean[] getMerged() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
index 989948f0c..0c2fea165 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -10,7 +10,7 @@ import java.util.*;
 
 public class DefaultPlotAreaManager implements PlotAreaManager {
 
-    protected final PlotArea[] noPlotAreas = new PlotArea[0];
+    final PlotArea[] noPlotAreas = new PlotArea[0];
     // All plot areas mapped by world
     private final HashMap<String, PlotArea[]> plotAreaMap = new HashMap<>();
     // All plot areas mapped by position
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index e863e1302..380565b17 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -239,20 +239,18 @@ public abstract class ChunkManager {
 
     public void deleteRegionFiles(final String world, final Collection<ChunkLoc> chunks,
         final Runnable whenDone) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                for (ChunkLoc loc : chunks) {
-                    String directory =
-                        world + File.separator + "region" + File.separator + "r." + loc.x + "."
-                            + loc.z + ".mca";
-                    File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
-                    PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
-                    if (file.exists()) {
-                        file.delete();
-                    }
+        TaskManager.runTaskAsync(() -> {
+            for (ChunkLoc loc : chunks) {
+                String directory =
+                    world + File.separator + "region" + File.separator + "r." + loc.x + "."
+                        + loc.z + ".mca";
+                File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
+                PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
+                if (file.exists()) {
+                    file.delete();
                 }
-                TaskManager.runTask(whenDone);
             }
+            TaskManager.runTask(whenDone);
         });
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
index b5fbb8b65..347bc48e6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
@@ -15,12 +15,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class UUIDHandlerImplementation {
 
-    public final ConcurrentHashMap<String, PlotPlayer> players;
+    private final ConcurrentHashMap<String, PlotPlayer> players;
     public final HashSet<UUID> unknown = new HashSet<>();
-    public UUIDWrapper uuidWrapper;
+    protected UUIDWrapper uuidWrapper;
     private boolean cached = false;
     private BiMap<StringWrapper, UUID> uuidMap =
-        HashBiMap.create(new HashMap<StringWrapper, UUID>());
+        HashBiMap.create(new HashMap<>());
     //    private BiMap<UUID, StringWrapper> nameMap = uuidMap.inverse();
 
     public UUIDHandlerImplementation(UUIDWrapper wrapper) {
@@ -106,51 +106,47 @@ public abstract class UUIDHandlerImplementation {
          *   PlotMe conversion
          */
         if (!Settings.UUID.OFFLINE && !this.unknown.isEmpty()) {
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    UUID offline = UUID.nameUUIDFromBytes(
-                        ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-                    if (!UUIDHandlerImplementation.this.unknown.contains(offline) && !name.value
-                        .equals(name.value.toLowerCase())) {
-                        offline = UUID.nameUUIDFromBytes(
-                            ("OfflinePlayer:" + name.value.toLowerCase()).getBytes(Charsets.UTF_8));
-                        if (!UUIDHandlerImplementation.this.unknown.contains(offline)) {
-                            offline = null;
-                        }
+            TaskManager.runTaskAsync(() -> {
+                UUID offline = UUID.nameUUIDFromBytes(
+                    ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
+                if (!UUIDHandlerImplementation.this.unknown.contains(offline) && !name.value
+                    .equals(name.value.toLowerCase())) {
+                    offline = UUID.nameUUIDFromBytes(
+                        ("OfflinePlayer:" + name.value.toLowerCase()).getBytes(Charsets.UTF_8));
+                    if (!UUIDHandlerImplementation.this.unknown.contains(offline)) {
+                        offline = null;
                     }
-                    if (offline != null && !offline.equals(uuid)) {
-                        UUIDHandlerImplementation.this.unknown.remove(offline);
-                        Set<Plot> plots = PlotSquared.get().getPlotsAbs(offline);
-                        if (!plots.isEmpty()) {
-                            for (Plot plot : plots) {
-                                plot.owner = uuid;
-                            }
-                            DBFunc.replaceUUID(offline, uuid);
-                            PlotSquared.debug("&cDetected invalid UUID stored for: " + name.value);
-                            PlotSquared.debug(
-                                "&7 - Did you recently switch to online-mode storage without running `uuidconvert`?");
-                            PlotSquared.debug("&6" + PlotSquared.imp().getPluginName()
-                                + " will update incorrect entries when the user logs in, or you can reconstruct your database.");
+                }
+                if (offline != null && !offline.equals(uuid)) {
+                    UUIDHandlerImplementation.this.unknown.remove(offline);
+                    Set<Plot> plots = PlotSquared.get().getPlotsAbs(offline);
+                    if (!plots.isEmpty()) {
+                        for (Plot plot : plots) {
+                            plot.owner = uuid;
                         }
+                        DBFunc.replaceUUID(offline, uuid);
+                        PlotSquared.debug("&cDetected invalid UUID stored for: " + name.value);
+                        PlotSquared.debug(
+                            "&7 - Did you recently switch to online-mode storage without running `uuidconvert`?");
+                        PlotSquared.debug("&6" + PlotSquared.imp().getPluginName()
+                            + " will update incorrect entries when the user logs in, or you can reconstruct your database.");
                     }
                 }
             });
         } else if (Settings.UUID.FORCE_LOWERCASE && !this.unknown.isEmpty() && !name.value
             .equals(name.value.toLowerCase())) {
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    UUID offlineUpper = UUID.nameUUIDFromBytes(
-                        ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-                    if (UUIDHandlerImplementation.this.unknown.contains(offlineUpper)
-                        && !offlineUpper.equals(uuid)) {
-                        UUIDHandlerImplementation.this.unknown.remove(offlineUpper);
-                        Set<Plot> plots = PlotSquared.get().getPlotsAbs(offlineUpper);
-                        if (!plots.isEmpty()) {
-                            for (Plot plot : plots) {
-                                plot.owner = uuid;
-                            }
-                            replace(offlineUpper, uuid, name.value);
+            TaskManager.runTaskAsync(() -> {
+                UUID offlineUpper = UUID.nameUUIDFromBytes(
+                    ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
+                if (UUIDHandlerImplementation.this.unknown.contains(offlineUpper)
+                    && !offlineUpper.equals(uuid)) {
+                    UUIDHandlerImplementation.this.unknown.remove(offlineUpper);
+                    Set<Plot> plots = PlotSquared.get().getPlotsAbs(offlineUpper);
+                    if (!plots.isEmpty()) {
+                        for (Plot plot : plots) {
+                            plot.owner = uuid;
                         }
+                        replace(offlineUpper, uuid, name.value);
                     }
                 }
             });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
index df1244a12..dbf9d9fa9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
@@ -11,6 +11,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public class ExpiryTask {
     private final Settings.Auto_Clear settings;
@@ -47,10 +48,9 @@ public class ExpiryTask {
                         min = false;
                         diff = settings.REQUIRED_PLOTS - plots.size();
                     }
-                    List<Long> entireList = new ArrayList<>();
-                    for (Plot plot : plots) {
-                        entireList.add(ExpireManager.IMP.getAge(plot));
-                    }
+                    List<Long> entireList =
+                        plots.stream().map(plot -> ExpireManager.IMP.getAge(plot))
+                            .collect(Collectors.toList());
                     List<Long> top = new ArrayList<>(diff + 1);
                     if (diff > 1000) {
                         Collections.sort(entireList);

From 17027e62921b00b4f2777fe66a0ce0ac9e4e6c60 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 8 Feb 2019 14:49:37 -0500
Subject: [PATCH 033/210] Javadoc changes and cleaning of old unused code

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/BukkitMain.java        | 16 +---
 .../bukkit/listeners/EntitySpawnListener.java |  2 +-
 .../plotsquared/plot/IPlotMain.java           | 79 +++++++------------
 .../plotsquared/plot/PlotSquared.java         | 10 +--
 .../plotsquared/plot/commands/DebugPaste.java |  9 +--
 .../plotsquared/plot/database/AbstractDB.java | 54 ++++++-------
 .../plotsquared/plot/object/PlotId.java       |  5 +-
 .../plot/object/worlds/SinglePlotArea.java    | 12 ---
 .../plotsquared/plot/util/ChunkManager.java   | 56 +++++++------
 .../plotsquared/plot/util/MainUtil.java       | 77 ++++++++----------
 10 files changed, 128 insertions(+), 192 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 1580d8d09..49ac0febb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -251,10 +251,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         this.getServer().getPluginManager().disablePlugin(this);
     }
 
-    @Override public void disable() {
-        onDisable();
-    }
-
     @Override public int[] getPluginVersion() {
         String ver = getDescription().getVersion();
         if (ver.contains("-")) {
@@ -555,17 +551,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     @Override public void registerPlayerEvents() {
         final PlayerEvents main = new PlayerEvents();
         getServer().getPluginManager().registerEvents(main, this);
-        try {
-            getServer().getClass().getMethod("spigot");
-            Class.forName("org.bukkit.event.entity.EntitySpawnEvent");
-            getServer().getPluginManager().registerEvents(new EntitySpawnListener(), this);
-        } catch (final NoSuchMethodException | ClassNotFoundException ignored) {
-            PlotSquared.debug("Not running Spigot. Skipping EntitySpawnListener event.");
-        }
-    }
-
-    @Override public void registerInventoryEvents() {
-        // Part of PlayerEvents - can be moved if necessary
+        getServer().getPluginManager().registerEvents(new EntitySpawnListener(), this);
     }
 
     @Override public void registerPlotPlusEvents() {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 443e07025..6d4fd5844 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -25,7 +25,7 @@ import org.bukkit.plugin.Plugin;
 
 import java.util.List;
 
-@SuppressWarnings("unused") public class EntitySpawnListener implements Listener {
+public class EntitySpawnListener implements Listener {
 
     private static boolean ignoreTP = false;
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
index e50ec9e8e..6ca241dcd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -15,28 +15,28 @@ import java.util.List;
 public interface IPlotMain extends ILogger {
 
     /**
-     * Log a message to console.
+     * Logs a message to console.
      *
-     * @param message The message to log
+     * @param message the message to log
      */
     void log(String message);
 
     /**
-     * Get the `PlotSquared` directory.
+     * Gets the directory which contains PlotSquared files. The directory may not exist.
      *
-     * @return The plugin directory
+     * @return the PlotSquared directory
      */
     File getDirectory();
 
     /**
-     * Get the directory containing all the worlds.
+     * Gets the folder where all world data is stored.
      *
-     * @return The directory containing the worlds
+     * @return the world folder
      */
     File getWorldContainer();
 
     /**
-     * Wrap a player into a PlotPlayer object.
+     * Wraps a player into a PlotPlayer object.
      *
      * @param player The player to convert to a PlotPlayer
      * @return A PlotPlayer
@@ -44,70 +44,56 @@ public interface IPlotMain extends ILogger {
     PlotPlayer wrapPlayer(Object player);
 
     /**
-     * Disable the implementation.
-     *
-     * <ul>
-     * <li>If a full disable isn't feasibly, just disable what it can.
-     * </ul>
-     */
-    void disable();
-
-    /**
-     * Completely shut down the plugin
+     * Completely shuts down the plugin.
      */
     void shutdown();
 
     /**
-     * Get the version of the PlotSquared being used.
+     * Gets the version of the PlotSquared being used.
      *
      * @return the plugin version
      */
     int[] getPluginVersion();
 
     /**
-     * Get the version of the PlotSquared being used as a string.
+     * Gets the version of the PlotSquared being used as a string.
      *
      * @return the plugin version as a string
      */
     String getPluginVersionString();
 
-    /**
-     * Usually PlotSquared
-     *
-     * @return
-     */
     String getPluginName();
 
     /**
-     * Get the version of Minecraft that is running.
+     * Gets the version of Minecraft that is running.
      *
      * @return
      */
     int[] getServerVersion();
 
     /**
-     * Get the server implementation name and version
+     * Gets the server implementation name and version
      */
     String getServerImplementation();
 
     /**
-     * Get the NMS package prefix.
+     * Gets the NMS package prefix.
      *
      * @return The NMS package prefix
      */
     String getNMSPackage();
 
     /**
-     * Get the schematic handler.
+     * Gets the schematic handler.
      *
      * @return The {@link SchematicHandler}
      */
     SchematicHandler initSchematicHandler();
 
     /**
-     * Get the Chat Manager.
+     * Starts the {@link ChatManager}.
      *
-     * @return The {@link ChatManager}
+     * @return the ChatManager
      */
     ChatManager initChatManager();
 
@@ -124,7 +110,7 @@ public interface IPlotMain extends ILogger {
     void runEntityTask();
 
     /**
-     * Register the implementation specific commands.
+     * Registerss the implementation specific commands.
      */
     void registerCommands();
 
@@ -133,11 +119,6 @@ public interface IPlotMain extends ILogger {
      */
     void registerPlayerEvents();
 
-    /**
-     * Register inventory related events.
-     */
-    void registerInventoryEvents();
-
     /**
      * Register plot plus related events.
      */
@@ -149,54 +130,54 @@ public interface IPlotMain extends ILogger {
     void registerForceFieldEvents();
 
     /**
-     * Register the WorldEdit hook.
+     * Registers the WorldEdit hook.
      */
     boolean initWorldEdit();
 
     /**
-     * Get the economy provider.
+     * Gets the economy provider.
      *
      * @return
      */
     EconHandler getEconomyHandler();
 
     /**
-     * Get the {@link QueueProvider} class.
+     * Gets the {@link QueueProvider} class.
      *
      * @return
      */
     QueueProvider initBlockQueue();
 
     /**
-     * Get the {@link WorldUtil} class.
+     * Gets the {@link WorldUtil} class.
      *
      * @return
      */
     WorldUtil initWorldUtil();
 
     /**
-     * Get the EventUtil class.
+     * Gets the EventUtil class.
      *
      * @return
      */
     EventUtil initEventUtil();
 
     /**
-     * Get the chunk manager.
+     * Gets the chunk manager.
      *
      * @return
      */
     ChunkManager initChunkManager();
 
     /**
-     * Get the {@link SetupUtils} class.
+     * Gets the {@link SetupUtils} class.
      *
      * @return
      */
     SetupUtils initSetupUtils();
 
     /**
-     * Get {@link HybridUtils} class.
+     * Gets {@link HybridUtils} class.
      *
      * @return
      */
@@ -215,7 +196,7 @@ public interface IPlotMain extends ILogger {
     void setGenerator(String world);
 
     /**
-     * Get the {@link UUIDHandlerImplementation} which will cache and
+     * Gets the {@link UUIDHandlerImplementation} which will cache and
      * provide UUIDs.
      *
      * @return
@@ -223,7 +204,7 @@ public interface IPlotMain extends ILogger {
     UUIDHandlerImplementation initUUIDHandler();
 
     /**
-     * Get the {@link InventoryUtil} class (used for implementation specific
+     * Gets the {@link InventoryUtil} class (used for implementation specific
      * inventory guis).
      *
      * @return
@@ -231,14 +212,14 @@ public interface IPlotMain extends ILogger {
     InventoryUtil initInventoryUtil();
 
     /**
-     * Unregister a PlotPlayer from cache e.g. if they have logged off.
+     * Unregisters a {@link PlotPlayer} from cache e.g. if they have logged off.
      *
      * @param player
      */
     void unregister(PlotPlayer player);
 
     /**
-     * Get the generator wrapper for a world (world) and generator (name).
+     * Gets the generator wrapper for a world (world) and generator (name).
      *
      * @param world
      * @param name
@@ -268,7 +249,7 @@ public interface IPlotMain extends ILogger {
     IndependentPlotGenerator getDefaultGenerator();
 
     /**
-     * Get the class that will manage player titles.
+     * Gets the class that will manage player titles.
      *
      * @return
      */
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 7a9abb000..fb39d5938 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -30,6 +30,7 @@ import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.*;
 import java.net.MalformedURLException;
@@ -150,7 +151,6 @@ import java.util.zip.ZipInputStream;
             }
             if (Settings.Enabled_Components.EVENTS) {
                 this.IMP.registerPlayerEvents();
-                this.IMP.registerInventoryEvents();
                 this.IMP.registerPlotPlusEvents();
             }
             // Required
@@ -1145,7 +1145,7 @@ import java.util.zip.ZipInputStream;
                 if (type == 2) {
                     Set<PlotCluster> clusters = this.clusters_tmp != null ?
                         this.clusters_tmp.get(world) :
-                        new HashSet<PlotCluster>();
+                        new HashSet<>();
                     if (clusters == null) {
                         throw new IllegalArgumentException("No cluster exists for world: " + world);
                     }
@@ -1577,7 +1577,7 @@ import java.util.zip.ZipInputStream;
                 database = new SQLite(file);
             } else {
                 PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
-                this.IMP.disable();
+                this.IMP.shutdown(); //shutdown used instead of disable because no database is set
                 return;
             }
             DBFunc.dbManager = new SQLManager(database, Storage.PREFIX, false);
@@ -1607,7 +1607,7 @@ import java.util.zip.ZipInputStream;
             PlotSquared.log("&d==== End of stacktrace ====");
             PlotSquared.log("&6Please go to the " + IMP.getPluginName()
                 + " 'storage.yml' and configure the database correctly.");
-            this.IMP.disable();
+            this.IMP.shutdown(); //shutdown used instead of disable because of database error
         }
     }
 
@@ -1822,7 +1822,7 @@ import java.util.zip.ZipInputStream;
         return Double.parseDouble(System.getProperty("java.specification.version"));
     }
 
-    public void foreachPlotArea(@NonNull final RunnableVal<PlotArea> runnable) {
+    public void foreachPlotArea(@Nonnull final RunnableVal<PlotArea> runnable) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
             runnable.run(area);
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
index eedba15cf..b191ac323 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
@@ -18,8 +18,8 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste",
     description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your latest.log to https://incendo.org",
@@ -28,12 +28,9 @@ import java.util.List;
 
     private static String readFile(@NonNull final File file) throws IOException {
         final StringBuilder content = new StringBuilder();
-        final List<String> lines = new ArrayList<>();
+        final List<String> lines;
         try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
+            lines = reader.lines().collect(Collectors.toList());
         }
         for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
             content.append(lines.get(i)).append("\n");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
index e5341103d..ae4a1fa76 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -14,7 +14,7 @@ public interface AbstractDB {
     UUID everyone = UUID.fromString("1-1-3-3-7");
 
     /**
-     * Set Plot owner.
+     * Sets Plot owner.
      *
      * @param plot the plot
      * @param uuid the uuid of the new owner
@@ -22,7 +22,7 @@ public interface AbstractDB {
     void setOwner(Plot plot, UUID uuid);
 
     /**
-     * Create all settings, and create default helpers, trusted + denied lists.
+     * Creates all settings, and create default helpers, trusted + denied lists.
      *
      * @param plots    Plots for which the default table entries should be created
      * @param whenDone the task to run when the method is finished executing
@@ -30,7 +30,7 @@ public interface AbstractDB {
     void createPlotsAndData(List<Plot> plots, Runnable whenDone);
 
     /**
-     * Create a plot.
+     * Creates a plot.
      *
      * @param plot the plot to create
      */
@@ -44,7 +44,7 @@ public interface AbstractDB {
     void createTables() throws Exception;
 
     /**
-     * Delete a plot.
+     * Deletess a plot.
      *
      * @param plot the plot to delete
      */
@@ -57,14 +57,14 @@ public interface AbstractDB {
     void deleteTrusted(Plot plot);
 
     /**
-     * Remove all denied players from the plot.
+     * Removes all denied players from the plot.
      *
      * @param plot the plot
      */
     void deleteDenied(Plot plot);
 
     /**
-     * Delete all comments from the plot.
+     * Deletes all comments from the plot.
      *
      * @param plot the plot
      */
@@ -81,7 +81,7 @@ public interface AbstractDB {
     void getPersistentMeta(UUID uuid, RunnableVal<Map<String, byte[]>> result);
 
     /**
-     * Create the plot settings.
+     * Creates the plot settings.
      *
      * @param id   the plot entry id
      * @param plot the plot
@@ -89,7 +89,7 @@ public interface AbstractDB {
     void createPlotSettings(int id, Plot plot);
 
     /**
-     * Get the table entry ID.
+     * Gets the table entry ID.
      *
      * @param plot the plot
      * @return {@code Integer} = Plot Entry Id
@@ -97,7 +97,7 @@ public interface AbstractDB {
     int getId(Plot plot);
 
     /**
-     * Get the id of a given plot cluster.
+     * Gets the id of a given plot cluster.
      *
      * @param cluster PlotCluster Object
      * @return Integer = Cluster Entry Id
@@ -120,7 +120,7 @@ public interface AbstractDB {
     HashMap<String, Set<PlotCluster>> getClusters();
 
     /**
-     * Set the merged status for a plot.
+     * Sets the merged status for a plot.
      *
      * @param plot   The plot to set the merged status of
      * @param merged boolean[]
@@ -128,7 +128,7 @@ public interface AbstractDB {
     void setMerged(Plot plot, boolean[] merged);
 
     /**
-     * Swap the settings, helpers etc. of two plots.
+     * Swaps the settings, helpers etc. of two plots.
      *
      * @param plot1 Plot1
      * @param plot2 Plot2
@@ -136,7 +136,7 @@ public interface AbstractDB {
     void swapPlots(Plot plot1, Plot plot2);
 
     /**
-     * Set plot flags.
+     * Sets plot flags.
      *
      * @param plot  Plot Object
      * @param flags flags to set
@@ -144,7 +144,7 @@ public interface AbstractDB {
     void setFlags(Plot plot, HashMap<Flag<?>, Object> flags);
 
     /**
-     * Rename a cluster to the given name.
+     * Renames a cluster to the given name.
      *
      * @param cluster the cluster to rename
      * @param name    the new cluster name
@@ -152,7 +152,7 @@ public interface AbstractDB {
     void setClusterName(PlotCluster cluster, String name);
 
     /**
-     * Set the plot alias.
+     * Sets the plot alias.
      *
      * @param plot  Plot for which the alias should be set
      * @param alias Plot Alias
@@ -160,14 +160,14 @@ public interface AbstractDB {
     void setAlias(Plot plot, String alias);
 
     /**
-     * Purge a plot.
+     * Purges a plot.
      *
      * @param uniqueIds list of plot id (db) to be purged
      */
     void purgeIds(Set<Integer> uniqueIds);
 
     /**
-     * Purge a whole world.
+     * Purges a whole world.
      *
      * @param area    World in which the plots should be purged
      * @param plotIds the {@code PlotId}s of {@code Plot}s to purge
@@ -175,7 +175,7 @@ public interface AbstractDB {
     void purge(PlotArea area, Set<PlotId> plotIds);
 
     /**
-     * Set the plot home position.
+     * Sets the plot home position.
      *
      * @param plot     the plot
      * @param position the position of plot home
@@ -239,7 +239,7 @@ public interface AbstractDB {
     void setInvited(PlotCluster cluster, UUID uuid);
 
     /**
-     * Remove the specified player from the denied list of the specified plot.
+     * Removes the specified player from the denied list of the specified plot.
      *
      * @param plot the plot
      * @param uuid the uuid of the player to remove
@@ -247,7 +247,7 @@ public interface AbstractDB {
     void removeDenied(Plot plot, UUID uuid);
 
     /**
-     * Deny the specified player from the given plot.
+     * Denies the specified player from the given plot.
      *
      * @param plot the plot
      * @param uuid the uuid of the player to deny
@@ -255,7 +255,7 @@ public interface AbstractDB {
     void setDenied(Plot plot, UUID uuid);
 
     /**
-     * Get the ratings from the specified plot.
+     * Gets the ratings from the specified plot.
      *
      * @param plot the plot
      * @return the plot ratings (pre-calculated)
@@ -263,7 +263,7 @@ public interface AbstractDB {
     HashMap<UUID, Integer> getRatings(Plot plot);
 
     /**
-     * Set a rating for a plot.
+     * Sets a rating for a plot.
      *
      * @param plot
      * @param rater
@@ -272,7 +272,7 @@ public interface AbstractDB {
     void setRating(Plot plot, UUID rater, int value);
 
     /**
-     * Remove the specified comment from the given plot.
+     * Removes the specified comment from the given plot.
      *
      * @param plot    the plot
      * @param comment the comment to remove
@@ -280,7 +280,7 @@ public interface AbstractDB {
     void removeComment(Plot plot, PlotComment comment);
 
     /**
-     * Clear the specified inbox on the given plot.
+     * Clears the specified inbox on the given plot.
      *
      * @param plot  the plot
      * @param inbox the inbox to clear
@@ -288,7 +288,7 @@ public interface AbstractDB {
     void clearInbox(Plot plot, String inbox);
 
     /**
-     * Add the specified comment to the given plot.
+     * Adds the specified comment to the given plot.
      *
      * @param plot    the plot
      * @param comment the comment to add
@@ -296,7 +296,7 @@ public interface AbstractDB {
     void setComment(Plot plot, PlotComment comment);
 
     /**
-     * Get Plot Comments.
+     * Gets Plot Comments.
      *
      * @param plot The Plot to get comments from
      */
@@ -311,7 +311,7 @@ public interface AbstractDB {
     void movePlot(Plot originalPlot, Plot newPlot);
 
     /**
-     * Replace a old uuid with a new one in the database.
+     * Replaces a old uuid with a new one in the database.
      *
      * <ul>
      * <li> Useful for replacing a few uuids (not the entire database).</li>
@@ -331,7 +331,7 @@ public interface AbstractDB {
     boolean deleteTables();
 
     /**
-     * Close the database. Generally not recommended to be used by add-ons.
+     * Closes the database. Generally not recommended to be used by add-ons.
      */
     void close();
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
index 821a22327..1f883cb08 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
@@ -29,9 +29,10 @@ public class PlotId {
      * Get a Plot Id based on a string
      *
      * @param string to create id from
-     * @return null if the string is invalid
+     * @return the PlotId representation of the arguement
+     * @throws IllegalArgumentException if the string does not contain a valid PlotId
      */
-    public static PlotId fromString(@Nonnull String string) {
+    @Nonnull public static PlotId fromString(@Nonnull String string) {
         String[] parts = string.split("[;|,]");
         if (parts.length < 2) {
             throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index 1cc49f682..037e081bc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -63,34 +63,22 @@ public class SinglePlotArea extends GridPlotWorld {
 
     @Nullable @Override public Plot getOwnedPlot(@Nonnull final Location location) {
         PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
         Plot plot = this.plots.get(pid);
         return plot == null ? null : plot.getBasePlot(false);
     }
 
     @Nullable @Override public Plot getOwnedPlotAbs(@Nonnull Location location) {
         PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
         return plots.get(pid);
     }
 
     @Nullable @Override public Plot getPlot(@Nonnull final Location location) {
         PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
         return getPlot(pid);
     }
 
     @Nullable @Override public Plot getPlotAbs(@Nonnull final Location location) {
         final PlotId pid = PlotId.fromString(location.getWorld());
-        if (pid == null) {
-            return null;
-        }
         return getPlotAbs(pid);
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index 380565b17..d27dc7597 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -71,41 +71,39 @@ public abstract class ChunkManager {
 
     public static void largeRegionTask(final String world, final RegionWrapper region,
         final RunnableVal<ChunkLoc> task, final Runnable whenDone) {
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                HashSet<ChunkLoc> chunks = new HashSet<>();
-                Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
-                for (ChunkLoc mcr : mcrs) {
-                    int bx = mcr.x << 9;
-                    int bz = mcr.z << 9;
-                    int tx = bx + 511;
-                    int tz = bz + 511;
-                    if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
-                        && tz >= region.minZ) {
-                        for (int x = bx >> 4; x <= (tx >> 4); x++) {
-                            int cbx = x << 4;
-                            int ctx = cbx + 15;
-                            if (cbx <= region.maxX && ctx >= region.minX) {
-                                for (int z = bz >> 4; z <= (tz >> 4); z++) {
-                                    int cbz = z << 4;
-                                    int ctz = cbz + 15;
-                                    if (cbz <= region.maxZ && ctz >= region.minZ) {
-                                        chunks.add(new ChunkLoc(x, z));
-                                    }
+        TaskManager.runTaskAsync(() -> {
+            HashSet<ChunkLoc> chunks = new HashSet<>();
+            Set<ChunkLoc> mcrs = manager.getChunkChunks(world);
+            for (ChunkLoc mcr : mcrs) {
+                int bx = mcr.x << 9;
+                int bz = mcr.z << 9;
+                int tx = bx + 511;
+                int tz = bz + 511;
+                if (bx <= region.maxX && tx >= region.minX && bz <= region.maxZ
+                    && tz >= region.minZ) {
+                    for (int x = bx >> 4; x <= (tx >> 4); x++) {
+                        int cbx = x << 4;
+                        int ctx = cbx + 15;
+                        if (cbx <= region.maxX && ctx >= region.minX) {
+                            for (int z = bz >> 4; z <= (tz >> 4); z++) {
+                                int cbz = z << 4;
+                                int ctz = cbz + 15;
+                                if (cbz <= region.maxZ && ctz >= region.minZ) {
+                                    chunks.add(new ChunkLoc(x, z));
                                 }
                             }
                         }
                     }
                 }
-                TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
-
-                    @Override public void run(ChunkLoc value) {
-                        if (manager.loadChunk(world, value, false)) {
-                            task.run(value);
-                        }
-                    }
-                }, whenDone);
             }
+            TaskManager.objectTask(chunks, new RunnableVal<ChunkLoc>() {
+
+                @Override public void run(ChunkLoc value) {
+                    if (manager.loadChunk(world, value, false)) {
+                        task.run(value);
+                    }
+                }
+            }, whenDone);
         });
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index 906c70595..68fd5ece2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -12,6 +12,7 @@ import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.stream.AbstractDelegateOutputStream;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 
+import javax.annotation.Nonnull;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
@@ -22,6 +23,8 @@ import java.nio.file.Paths;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * plot functions
@@ -324,7 +327,7 @@ public class MainUtil {
      * @param owner
      * @return The player's name, None, Everyone or Unknown
      */
-    public static String getName(UUID owner) {
+    @Nonnull public static String getName(UUID owner) {
         if (owner == null) {
             return C.NONE.s();
         }
@@ -346,7 +349,7 @@ public class MainUtil {
      * @return
      * @see Plot#getCorners()
      */
-    public static Location[] getCorners(String world, Collection<RegionWrapper> regions) {
+    @Nonnull public static Location[] getCorners(String world, Collection<RegionWrapper> regions) {
         Location min = null;
         Location max = null;
         for (RegionWrapper region : regions) {
@@ -399,20 +402,12 @@ public class MainUtil {
                 uuids.add(uuid);
             } catch (Exception ignored) {
                 id = PlotId.fromString(term);
-                if (id != null) {
-                    continue;
-                }
-                area = PlotSquared.get().getPlotAreaByString(term);
-                if (area == null) {
-                    alias = term;
-                }
             }
         }
 
-        ArrayList<ArrayList<Plot>> plotList = new ArrayList<>(size);
-        for (int i = 0; i < size; i++) {
-            plotList.add(new ArrayList<Plot>());
-        }
+        ArrayList<ArrayList<Plot>> plotList =
+            IntStream.range(0, size).mapToObj(i -> new ArrayList<Plot>())
+                .collect(Collectors.toCollection(() -> new ArrayList<>(size)));
 
         for (Plot plot : PlotSquared.get().getPlots()) {
             int count = 0;
@@ -505,12 +500,6 @@ public class MainUtil {
             }
             return null;
         }
-        if (id == null) {
-            if (message) {
-                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            }
-            return null;
-        }
         if (area == null) {
             if (message) {
                 MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
@@ -780,31 +769,28 @@ public class MainUtil {
         info = info.replace("%desc%", "No description set.");
         if (info.contains("%rating%")) {
             final String newInfo = info;
-            TaskManager.runTaskAsync(new Runnable() {
-                @Override public void run() {
-                    int max = 10;
-                    if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES
-                        .isEmpty()) {
-                        max = 8;
-                    }
-                    String info;
-                    if (full && Settings.Ratings.CATEGORIES != null
-                        && Settings.Ratings.CATEGORIES.size() > 1) {
-                        double[] ratings = MainUtil.getAverageRatings(plot);
-                        String rating = "";
-                        String prefix = "";
-                        for (int i = 0; i < ratings.length; i++) {
-                            rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
-                                .format("%.1f", ratings[i]);
-                            prefix = ",";
-                        }
-                        info = newInfo.replaceAll("%rating%", rating);
-                    } else {
-                        info = newInfo.replaceAll("%rating%",
-                            String.format("%.1f", plot.getAverageRating()) + '/' + max);
-                    }
-                    whenDone.run(info);
+            TaskManager.runTaskAsync(() -> {
+                int max = 10;
+                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
+                    max = 8;
                 }
+                String info1;
+                if (full && Settings.Ratings.CATEGORIES != null
+                    && Settings.Ratings.CATEGORIES.size() > 1) {
+                    double[] ratings = MainUtil.getAverageRatings(plot);
+                    String rating = "";
+                    String prefix = "";
+                    for (int i = 0; i < ratings.length; i++) {
+                        rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
+                            .format("%.1f", ratings[i]);
+                        prefix = ",";
+                    }
+                    info1 = newInfo.replaceAll("%rating%", rating);
+                } else {
+                    info1 = newInfo.replaceAll("%rating%",
+                        String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                }
+                whenDone.run(info1);
             });
             return;
         }
@@ -815,10 +801,9 @@ public class MainUtil {
         if (directory.exists()) {
             File[] files = directory.listFiles();
             if (null != files) {
-                for (int i = 0; i < files.length; i++) {
-                    File file = files[i];
+                for (File file : files) {
                     if (file.isDirectory()) {
-                        deleteDirectory(files[i]);
+                        deleteDirectory(file);
                     } else {
                         PlotSquared.debug("Deleting file: " + file + " | " + file.delete());
                     }

From cae95343ca4751c23d8190cb42f05415f8dea54c Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 10 Feb 2019 22:51:21 +0000
Subject: [PATCH 034/210] Update build offset

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 954072b9b..c8c177e39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2048;  // Offset to match CI
+    index = -2049;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From d0994f1b4b062651f5929dc851f7bf09f67e1904 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 10 Feb 2019 23:03:14 +0000
Subject: [PATCH 035/210] Fixes to EntityTask

---
 .../plotsquared/bukkit/BukkitMain.java        | 114 +++++++++---------
 1 file changed, 54 insertions(+), 60 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 49ac0febb..f08fbccaf 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -361,22 +361,16 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                         if (meta.isEmpty()) {
                                             continue;
                                         }
-                                        PlotId originPlotId = (PlotId) meta.get(0).value();
-                                        if (originPlotId == null) {
-                                            iterator.remove();
-                                            entity.remove();
-                                        }
-                                        if (!plot.getId().equals(originPlotId)) {
+                                        Plot origin = (Plot) meta.get(0).value();
+                                        if (!plot.equals(origin.getBasePlot(false))) {
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }
                                             iterator.remove();
                                             entity.remove();
                                         }
-                                        continue;
-                                    } else {
-                                        continue;
                                     }
+                                    continue;
                                 case SMALL_FIREBALL:
                                 case FIREBALL:
                                 case DRAGON_FIREBALL:
@@ -392,6 +386,57 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                 case FALLING_BLOCK:
                                     // managed elsewhere
                                     continue;
+                                case SHULKER: {
+                                    if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
+                                        LivingEntity livingEntity = (LivingEntity) entity;
+                                        List<MetadataValue> meta = entity.getMetadata("plot");
+                                        if (meta != null && !meta.isEmpty()) {
+                                            if (livingEntity.isLeashed())
+                                                continue;
+                                            List<MetadataValue> keep = entity.getMetadata("keep");
+                                            if (keep != null && !keep.isEmpty())
+                                                continue;
+
+                                            PlotId originalPlotId = (PlotId) meta.get(0).value();
+                                            if (originalPlotId != null) {
+                                                com.github.intellectualsites.plotsquared.plot.object.Location
+                                                    pLoc =
+                                                    BukkitUtil.getLocation(entity.getLocation());
+                                                PlotArea area = pLoc.getPlotArea();
+                                                if (area != null) {
+                                                    PlotId currentPlotId =
+                                                        PlotId.of(area.getPlotAbs(pLoc));
+                                                    if (!originalPlotId.equals(currentPlotId) && (
+                                                        currentPlotId == null || !area
+                                                            .getPlot(originalPlotId)
+                                                            .equals(area.getPlot(currentPlotId)))) {
+                                                        if (entity.hasMetadata("ps-tmp-teleport")) {
+                                                            continue;
+                                                        }
+                                                        iterator.remove();
+                                                        entity.remove();
+                                                    }
+                                                }
+                                            }
+                                        } else {
+                                            //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java)
+                                            com.github.intellectualsites.plotsquared.plot.object.Location
+                                                pLoc = BukkitUtil.getLocation(entity.getLocation());
+                                            PlotArea area = pLoc.getPlotArea();
+                                            if (area != null) {
+                                                PlotId currentPlotId =
+                                                    PlotId.of(area.getPlotAbs(pLoc));
+                                                if (currentPlotId != null) {
+                                                    entity.setMetadata("plot",
+                                                        new FixedMetadataValue(
+                                                            (Plugin) PlotSquared.get().IMP,
+                                                            currentPlotId));
+                                                }
+                                            }
+                                        }
+                                    }
+                                    continue;
+                                }
                                 case LLAMA:
                                 case DONKEY:
                                 case MULE:
@@ -474,57 +519,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                     }
                                     continue;
                                 }
-                                case SHULKER: {
-                                    if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
-                                        LivingEntity livingEntity = (LivingEntity) entity;
-                                        List<MetadataValue> meta = entity.getMetadata("plot");
-                                        if (meta != null && !meta.isEmpty()) {
-                                            if (livingEntity.isLeashed())
-                                                continue;
-
-                                            List<MetadataValue> keep = entity.getMetadata("keep");
-                                            if (keep != null && !keep.isEmpty())
-                                                continue;
-
-                                            PlotId originalPlotId = (PlotId) meta.get(0).value();
-                                            if (originalPlotId != null) {
-                                                com.github.intellectualsites.plotsquared.plot.object.Location
-                                                    pLoc =
-                                                    BukkitUtil.getLocation(entity.getLocation());
-                                                PlotArea area = pLoc.getPlotArea();
-                                                if (area != null) {
-                                                    PlotId currentPlotId =
-                                                        PlotId.of(area.getPlotAbs(pLoc));
-                                                    if (!originalPlotId.equals(currentPlotId) && (
-                                                        currentPlotId == null || !area
-                                                            .getPlot(originalPlotId)
-                                                            .equals(area.getPlot(currentPlotId)))) {
-                                                        if (entity.hasMetadata("ps-tmp-teleport")) {
-                                                            continue;
-                                                        }
-                                                        iterator.remove();
-                                                        entity.remove();
-                                                    }
-                                                }
-                                            }
-                                        } else {
-                                            //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java)
-                                            com.github.intellectualsites.plotsquared.plot.object.Location
-                                                pLoc = BukkitUtil.getLocation(entity.getLocation());
-                                            PlotArea area = pLoc.getPlotArea();
-                                            if (area != null) {
-                                                PlotId currentPlotId =
-                                                    PlotId.of(area.getPlotAbs(pLoc));
-                                                if (currentPlotId != null) {
-                                                    entity.setMetadata("plot",
-                                                        new FixedMetadataValue(
-                                                            (Plugin) PlotSquared.get().IMP,
-                                                            currentPlotId));
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
                             }
                         }
                     } catch (Throwable e) {

From dae7bbdf9dc2c80bb259e157df5404328d953df2 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 13:26:19 +0000
Subject: [PATCH 036/210] Fix dropped items being removed from plots

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index f08fbccaf..9c2bc49db 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -375,7 +375,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                 case FIREBALL:
                                 case DRAGON_FIREBALL:
                                 case DROPPED_ITEM:
-                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS || plotArea
+                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS && plotArea
                                         .getOwnedPlotAbs(
                                             BukkitUtil.getLocation(entity.getLocation())) == null) {
                                         entity.remove();
@@ -386,7 +386,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                 case FALLING_BLOCK:
                                     // managed elsewhere
                                     continue;
-                                case SHULKER: {
+                                case SHULKER:
                                     if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
                                         LivingEntity livingEntity = (LivingEntity) entity;
                                         List<MetadataValue> meta = entity.getMetadata("plot");
@@ -436,7 +436,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                         }
                                     }
                                     continue;
-                                }
                                 case LLAMA:
                                 case DONKEY:
                                 case MULE:

From 3e8308ecd74769191e718228d7142bbb6170d096 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 13:35:19 +0000
Subject: [PATCH 037/210] Catch statement already being null

---
 .../intellectualsites/plotsquared/plot/database/SQLManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 013b2c7ca..2995a448d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -351,7 +351,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                             task.set(statement);
                             task.addBatch(statement);
                             try {
-                                if (statement.isClosed()) {
+                                if (statement != null && statement.isClosed()) {
                                     statement = null;
                                 }
                             } catch (AbstractMethodError ignore) {

From 8710f2f83be0cbd5954d14f3966b1604ae76ef6c Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 13:43:22 +0000
Subject: [PATCH 038/210] Fix NPE when right-clicking a >1.13 block

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 890d82f85..93d462d32 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1876,10 +1876,14 @@ import java.util.regex.Pattern;
                         eventType = PlayerBlockEventType.TELEPORT_OBJECT;
                         break;
                     default:
-                        int blockId = ((LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
-                            .fromStringToLegacy(blockType.name())).id;
-                        if (blockId > 197) {
-                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                        LegacyPlotBlock legacyPlotBlock =
+                            (LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
+                                .fromStringToLegacy(blockType.name());
+                        if (legacyPlotBlock != null) {
+                            int blockId = legacyPlotBlock.id;
+                            if (blockId > 197) {
+                                eventType = PlayerBlockEventType.INTERACT_BLOCK;
+                            }
                         }
                         break;
                 }

From 35493662da1611a4881590934c20992036d0e88e Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 13 Feb 2019 12:05:28 -0500
Subject: [PATCH 039/210] Cleanup

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/chat/FancyMessage.java |  33 +--
 .../bukkit/commands/DebugUUID.java            | 206 +++++++++---------
 .../bukkit/generator/BukkitPlotGenerator.java |   4 +-
 .../bukkit/listeners/EntitySpawnListener.java |   5 +-
 .../bukkit/listeners/PlotPlusListener.java    |   3 +-
 .../bukkit/object/BukkitPlayer.java           |   4 +-
 .../entity/ReplicatingEntityWrapper.java      |  23 +-
 .../bukkit/titles/TitleManager_1_11.java      |  10 +-
 .../bukkit/util/BukkitChatManager.java        |   9 +-
 .../bukkit/util/BukkitChunkManager.java       |   4 +-
 .../bukkit/util/BukkitInventoryUtil.java      |  18 +-
 .../bukkit/util/BukkitLegacyMappings.java     |   2 +-
 .../plotsquared/bukkit/util/BukkitUtil.java   |  12 +-
 .../plotsquared/bukkit/util/SendChunk.java    |  31 +--
 .../plotsquared/bukkit/util/SetGenCB.java     |  10 +-
 .../bukkit/uuid/DefaultUUIDWrapper.java       |   7 +-
 .../bukkit/uuid/FileUUIDHandler.java          |   3 +-
 .../bukkit/uuid/OfflineUUIDWrapper.java       |  13 +-
 .../bukkit/uuid/SQLUUIDHandler.java           |   2 +-
 .../plotsquared/commands/Command.java         |  22 +-
 .../configuration/file/FileConfiguration.java |  11 +-
 .../plotsquared/json/JSONObject.java          |   7 +-
 .../plotsquared/plot/PlotSquared.java         |   9 +-
 .../plotsquared/plot/commands/Auto.java       |   7 +-
 .../plotsquared/plot/commands/Purge.java      |  37 ++--
 .../plotsquared/plot/database/StmtMod.java    |   9 +-
 .../plot/generator/HybridUtils.java           |   9 +-
 .../plotsquared/plot/object/Plot.java         |  11 +-
 .../plotsquared/plot/object/PlotArea.java     |  15 +-
 .../plotsquared/plot/object/PlotPlayer.java   |  17 +-
 .../plotsquared/plot/object/Rating.java       |  15 +-
 .../object/worlds/DefaultPlotAreaManager.java |  18 +-
 .../plot/object/worlds/PlotAreaManager.java   |  20 +-
 .../plot/util/LegacyConverter.java            |   7 +-
 .../plotsquared/plot/util/MainUtil.java       |   7 +-
 .../plot/util/block/GlobalBlockQueue.java     |   6 +-
 .../plot/util/expiry/PlotAnalysis.java        |   6 +-
 37 files changed, 239 insertions(+), 393 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
index 41ec91e49..4411aa0a5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
@@ -320,34 +320,6 @@ public class FancyMessage
         return this;
     }
 
-    /**
-     * Set the behavior of the current editing component to display information about an achievement when the client hovers over the text.
-     * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
-     *
-     * @param which The achievement to display.
-     * @return This builder instance.
-     */
-    public FancyMessage achievementTooltip(final Achievement which) {
-        try {
-            Object achievement = Reflection
-                .getMethod(Reflection.getOBCClass("CraftStatistic"), "getNMSAchievement",
-                    Achievement.class).invoke(null, which);
-            return achievementTooltip(
-                (String) Reflection.getField(Reflection.getNMSClass("Achievement"), "name")
-                    .get(achievement));
-        } catch (IllegalAccessException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Could not access method.", e);
-            return this;
-        } catch (IllegalArgumentException e) {
-            Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e);
-            return this;
-        } catch (InvocationTargetException e) {
-            Bukkit.getLogger()
-                .log(Level.WARNING, "A error has occurred during invoking of method.", e);
-            return this;
-        }
-    }
-
     /**
      * Set the behavior of the current editing component to display information about a parameterless statistic when the client hovers over the text.
      * <p>Tooltips do not inherit display characteristics, such as color and styles, from the message component on which they are applied.</p>
@@ -648,9 +620,7 @@ public class FancyMessage
      * @return This builder instance.
      */
     public FancyMessage translationReplacements(final FancyMessage... replacements) {
-        for (FancyMessage str : replacements) {
-            latest().translationReplacements.add(str);
-        }
+        Collections.addAll(latest().translationReplacements, replacements);
 
         dirty = true;
 
@@ -869,7 +839,6 @@ public class FancyMessage
      * <li>The core text of the message part.</li>
      * </ol>
      * The primary omissions are tooltips and clickable actions. Consequently, this method should be used only as a last resort.
-     * </p>
      * <p>
      * Color and formatting can be removed from the returned string by using {@link ChatColor#stripColor(String)}.</p>
      *
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
index 0dfcf1a18..ef5b6bdcd 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
@@ -171,126 +171,114 @@ import java.util.Map.Entry;
         }
 
         MainUtil.sendMessage(player, "&7 - Replacing cache");
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                for (Entry<UUID, UUID> entry : uCMap.entrySet()) {
-                    String name = UUIDHandler.getName(entry.getKey());
-                    if (name != null) {
-                        UUIDHandler.add(new StringWrapper(name), entry.getValue());
-                    }
+        TaskManager.runTaskAsync(() -> {
+            for (Entry<UUID, UUID> entry : uCMap.entrySet()) {
+                String name = UUIDHandler.getName(entry.getKey());
+                if (name != null) {
+                    UUIDHandler.add(new StringWrapper(name), entry.getValue());
                 }
+            }
 
-                MainUtil.sendMessage(player, "&7 - Scanning for applicable files (uuids.txt)");
-
-                File file = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
-                if (file.exists()) {
-                    try {
-                        List<String> lines =
-                            Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
-                        for (String line : lines) {
-                            try {
-                                line = line.trim();
-                                if (line.isEmpty()) {
-                                    continue;
-                                }
-                                line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
-                                String[] split = line.split("\\|");
-                                String name = split[0];
-                                if (name.isEmpty() || name.length() > 16 || !StringMan
-                                    .isAlphanumericUnd(name)) {
-                                    continue;
-                                }
-                                UUID old = currentUUIDWrapper.getUUID(name);
-                                if (old == null) {
-                                    continue;
-                                }
-                                UUID now = newWrapper.getUUID(name);
-                                UUIDHandler.add(new StringWrapper(name), now);
-                                uCMap.put(old, now);
-                                uCReverse.put(now, old);
-                            } catch (Exception e2) {
-                                e2.printStackTrace();
-                            }
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-
-                MainUtil.sendMessage(player, "&7 - Replacing wrapper");
-                UUIDHandler.setUUIDWrapper(newWrapper);
-
-                MainUtil.sendMessage(player, "&7 - Updating plot objects");
-
-                for (Plot plot : PlotSquared.get().getPlots()) {
-                    UUID value = uCMap.get(plot.owner);
-                    if (value != null) {
-                        plot.owner = value;
-                    }
-                    plot.getTrusted().clear();
-                    plot.getMembers().clear();
-                    plot.getDenied().clear();
-                }
-
-                MainUtil.sendMessage(player, "&7 - Deleting database");
-                boolean result = DBFunc.deleteTables();
-
-                MainUtil.sendMessage(player, "&7 - Creating tables");
+            MainUtil.sendMessage(player, "&7 - Scanning for applicable files (uuids.txt)");
 
+            File file = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
+            if (file.exists()) {
                 try {
-                    DBFunc.createTables();
-                    if (!result) {
-                        MainUtil.sendMessage(player, "&cConversion failed! Attempting recovery");
-                        for (Plot plot : PlotSquared.get().getPlots()) {
-                            UUID value = uCReverse.get(plot.owner);
-                            if (value != null) {
-                                plot.owner = value;
+                    List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
+                    for (String line : lines) {
+                        try {
+                            line = line.trim();
+                            if (line.isEmpty()) {
+                                continue;
                             }
+                            line = line.replaceAll("[\\|][0-9]+[\\|][0-9]+[\\|]", "");
+                            String[] split = line.split("\\|");
+                            String name = split[0];
+                            if (name.isEmpty() || name.length() > 16 || !StringMan
+                                .isAlphanumericUnd(name)) {
+                                continue;
+                            }
+                            UUID old = currentUUIDWrapper.getUUID(name);
+                            if (old == null) {
+                                continue;
+                            }
+                            UUID now = newWrapper.getUUID(name);
+                            UUIDHandler.add(new StringWrapper(name), now);
+                            uCMap.put(old, now);
+                            uCReverse.put(now, old);
+                        } catch (Exception e2) {
+                            e2.printStackTrace();
                         }
-                        DBFunc.createPlotsAndData(new ArrayList<>(PlotSquared.get().getPlots()),
-                            new Runnable() {
-                                @Override public void run() {
-                                    MainUtil.sendMessage(player, "&6Recovery was successful!");
-                                }
-                            });
-                        return;
                     }
-                } catch (Exception e) {
+                } catch (IOException e) {
                     e.printStackTrace();
+                }
+            }
+
+            MainUtil.sendMessage(player, "&7 - Replacing wrapper");
+            UUIDHandler.setUUIDWrapper(newWrapper);
+
+            MainUtil.sendMessage(player, "&7 - Updating plot objects");
+
+            for (Plot plot : PlotSquared.get().getPlots()) {
+                UUID value = uCMap.get(plot.owner);
+                if (value != null) {
+                    plot.owner = value;
+                }
+                plot.getTrusted().clear();
+                plot.getMembers().clear();
+                plot.getDenied().clear();
+            }
+
+            MainUtil.sendMessage(player, "&7 - Deleting database");
+            boolean result = DBFunc.deleteTables();
+
+            MainUtil.sendMessage(player, "&7 - Creating tables");
+
+            try {
+                DBFunc.createTables();
+                if (!result) {
+                    MainUtil.sendMessage(player, "&cConversion failed! Attempting recovery");
+                    for (Plot plot : PlotSquared.get().getPlots()) {
+                        UUID value = uCReverse.get(plot.owner);
+                        if (value != null) {
+                            plot.owner = value;
+                        }
+                    }
+                    DBFunc.createPlotsAndData(new ArrayList<>(PlotSquared.get().getPlots()),
+                        () -> MainUtil.sendMessage(player, "&6Recovery was successful!"));
                     return;
                 }
-
-                if (newWrapper instanceof OfflineUUIDWrapper) {
-                    PlotSquared.get().worlds.set("UUID.force-lowercase", false);
-                    PlotSquared.get().worlds.set("UUID.offline", true);
-                } else if (newWrapper instanceof DefaultUUIDWrapper) {
-                    PlotSquared.get().worlds.set("UUID.force-lowercase", false);
-                    PlotSquared.get().worlds.set("UUID.offline", false);
-                }
-                try {
-                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-                } catch (IOException ignored) {
-                    MainUtil.sendMessage(player,
-                        "Could not save configuration. It will need to be manual set!");
-                }
-
-                MainUtil.sendMessage(player, "&7 - Populating tables");
-
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots());
-                        DBFunc.createPlotsAndData(plots, new Runnable() {
-                            @Override public void run() {
-                                MainUtil.sendMessage(player, "&aConversion complete!");
-                            }
-                        });
-                    }
-                });
-
-                MainUtil.sendMessage(player, "&aIt is now safe for players to join");
-                MainUtil.sendMessage(player,
-                    "&cConversion is still in progress, you will be notified when it is complete");
+            } catch (Exception e) {
+                e.printStackTrace();
+                return;
             }
+
+            if (newWrapper instanceof OfflineUUIDWrapper) {
+                PlotSquared.get().worlds.set("UUID.force-lowercase", false);
+                PlotSquared.get().worlds.set("UUID.offline", true);
+            } else if (newWrapper instanceof DefaultUUIDWrapper) {
+                PlotSquared.get().worlds.set("UUID.force-lowercase", false);
+                PlotSquared.get().worlds.set("UUID.offline", false);
+            }
+            try {
+                PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+            } catch (IOException ignored) {
+                MainUtil.sendMessage(player,
+                    "Could not save configuration. It will need to be manual set!");
+            }
+
+            MainUtil.sendMessage(player, "&7 - Populating tables");
+
+            TaskManager.runTaskAsync(() -> {
+                ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots());
+                DBFunc.createPlotsAndData(plots,
+                    () -> MainUtil.sendMessage(player, "&aConversion complete!"));
+            });
+
+            MainUtil.sendMessage(player, "&aIt is now safe for players to join");
+            MainUtil.sendMessage(player,
+                "&cConversion is still in progress, you will be notified when it is complete");
         });
         return true;
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index 9280f94f1..6be860b32 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -46,12 +46,12 @@ public class BukkitPlotGenerator extends ChunkGenerator
 
             private LocalBlockQueue queue;
 
-            @Override public void populate(World world, Random r, Chunk c) {
+            @Override public void populate(World world, Random random, Chunk source) {
                 if (queue == null) {
                     queue = GlobalBlockQueue.IMP.getNewQueue(world.getName(), false);
                 }
                 PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null);
-                ChunkWrapper wrap = new ChunkWrapper(area.worldname, c.getX(), c.getZ());
+                ChunkWrapper wrap = new ChunkWrapper(area.worldname, source.getX(), source.getZ());
                 ScopedLocalBlockQueue chunk = queue.getForChunk(wrap.x, wrap.z);
                 if (BukkitPlotGenerator.this.plotGenerator.populateChunk(chunk, area)) {
                     queue.flush();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 6d4fd5844..c256c17b8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -135,9 +135,8 @@ public class EntitySpawnListener implements Listener {
     }
 
     @EventHandler public void spawn(CreatureSpawnEvent event) {
-        switch (event.getEntityType()) {
-            case ARMOR_STAND:
-                test(event.getEntity());
+        if (event.getEntityType() == EntityType.ARMOR_STAND) {
+            test(event.getEntity());
         }
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index d95a7c199..4e7c11af7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -105,8 +105,7 @@ import java.util.UUID;
         if (event.getEntityType() != EntityType.PLAYER) {
             return;
         }
-        Player player = (Player) event.getEntity();
-        Plot plot = BukkitUtil.getLocation(player).getOwnedPlot();
+        Plot plot = BukkitUtil.getLocation(event.getEntity()).getOwnedPlot();
         if (plot == null) {
             return;
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index dddf43738..60c1351d0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 public class BukkitPlayer extends PlotPlayer {
 
     public final Player player;
-    public boolean offline;
+    private boolean offline;
     private UUID uuid;
     private String name;
 
@@ -147,7 +147,7 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override public void sendMessage(String message) {
-        if (!StringMan.isEqual(this.<String>getMeta("lastMessage"), message) || (
+        if (!StringMan.isEqual(this.getMeta("lastMessage"), message) || (
             System.currentTimeMillis() - this.<Long>getMeta("lastMessageTime") > 5000)) {
             setMeta("lastMessage", message);
             setMeta("lastMessageTime", System.currentTimeMillis());
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index e71373771..6c1eab0c7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -38,7 +38,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         if (depth == 0) {
             return;
         }
-        Entity passenger = entity.getPassenger();
+        Entity passenger = entity.getPassengers().get(0);
         if (passenger != null) {
             this.base.passenger = new ReplicatingEntityWrapper(passenger, depth);
         }
@@ -174,13 +174,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeLiving((LivingEntity) entity);
                 return;
             // END AGEABLE //
+            //todo this needs to be fixed
             case GUARDIAN:
-                this.dataByte = (byte) (((Guardian) entity).isElder() ? 1 : 0);
+            case ELDER_GUARDIAN:
                 storeLiving((LivingEntity) entity);
                 return;
+            //todo this needs to be fixed
             case SKELETON:
-                this.dataByte = getOrdinal(Skeleton.SkeletonType.values(),
-                    ((Skeleton) entity).getSkeletonType());
+            case WITHER_SKELETON:
                 storeLiving((LivingEntity) entity);
                 return;
             case ARMOR_STAND:
@@ -425,7 +426,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
         if (this.base.passenger != null) {
             try {
-                entity.setPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
+                entity.addPassenger(this.base.passenger.spawn(world, xOffset, zOffset));
             } catch (Exception ignored) {
             }
         }
@@ -509,6 +510,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
+            //todo this needs to be fixed
             case HORSE:
                 Horse horse = (Horse) entity;
                 horse.setJumpStrength(this.horse.jump);
@@ -558,17 +560,12 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreLiving((LivingEntity) entity);
                 return entity;
             case GUARDIAN:
-                if (this.dataByte != 0) {
-                    ((Guardian) entity).setElder(true);
-                }
+            case ELDER_GUARDIAN:
                 restoreLiving((LivingEntity) entity);
                 return entity;
             case SKELETON:
-                if (this.dataByte != 0) {
-                    ((Skeleton) entity)
-                        .setSkeletonType(Skeleton.SkeletonType.values()[this.dataByte]);
-                }
-                storeLiving((LivingEntity) entity);
+            case WITHER_SKELETON:
+                restoreLiving((LivingEntity) entity);
                 return entity;
             case ARMOR_STAND:
                 // CHECK positions
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
index 92155ba45..53a91363a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
@@ -8,6 +8,7 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.IntStream;
 
 /**
  * Minecraft 1.8 Title
@@ -17,8 +18,7 @@ import java.util.Map;
  * @version 1.1.0
  */
 public class TitleManager_1_11 {
-    private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES =
-        new HashMap<Class<?>, Class<?>>();
+    private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
     /* Title packet */
     private static Class<?> packetTitle;
     /* Title packet actions ENUM */
@@ -111,10 +111,8 @@ public class TitleManager_1_11 {
     private static boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
         if (a.length != o.length)
             return false;
-        for (int i = 0; i < a.length; i++)
-            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i]))
-                return false;
-        return true;
+        return IntStream.range(0, a.length)
+            .noneMatch(i -> !a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i]));
     }
 
     /**
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
index a133d9630..009b87ae5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
@@ -10,8 +10,9 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
 import org.bukkit.ChatColor;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class BukkitChatManager extends ChatManager<FancyMessage> {
 
@@ -24,10 +25,8 @@ public class BukkitChatManager extends ChatManager<FancyMessage> {
     }
 
     @Override public void tooltip(PlotMessage message, PlotMessage... tooltips) {
-        List<FancyMessage> lines = new ArrayList<>();
-        for (PlotMessage tooltip : tooltips) {
-            lines.add(tooltip.$(this));
-        }
+        List<FancyMessage> lines =
+            Arrays.stream(tooltips).map(tooltip -> tooltip.$(this)).collect(Collectors.toList());
         message.$(this).formattedTooltip(lines);
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 1a388e9b5..47ebce636 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -106,9 +106,7 @@ public class BukkitChunkManager extends ChunkManager {
         Set<ChunkLoc> chunks = super.getChunkChunks(world);
         for (Chunk chunk : Bukkit.getWorld(world).getLoadedChunks()) {
             ChunkLoc loc = new ChunkLoc(chunk.getX() >> 5, chunk.getZ() >> 5);
-            if (!chunks.contains(loc)) {
-                chunks.add(loc);
-            }
+            chunks.add(loc);
         }
         return chunks;
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
index c40e13d09..f2b4188e3 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
@@ -17,6 +17,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.IntStream;
 
 public class BukkitInventoryUtil extends InventoryUtil {
 
@@ -94,7 +95,7 @@ public class BukkitInventoryUtil extends InventoryUtil {
             }
             if (meta.hasLore()) {
                 List<String> itemLore = meta.getLore();
-                lore = itemLore.toArray(new String[itemLore.size()]);
+                lore = itemLore.toArray(new String[0]);
             }
         }
         return new PlotItemStack(id.name(), amount, name, lore);
@@ -103,20 +104,17 @@ public class BukkitInventoryUtil extends InventoryUtil {
     @Override public PlotItemStack[] getItems(PlotPlayer player) {
         BukkitPlayer bp = (BukkitPlayer) player;
         PlayerInventory inv = bp.player.getInventory();
-        PlotItemStack[] items = new PlotItemStack[36];
-        for (int i = 0; i < 36; i++) {
-            items[i] = getItem(inv.getItem(i));
-        }
-        return items;
+        return IntStream.range(0, 36).mapToObj(i -> getItem(inv.getItem(i)))
+            .toArray(PlotItemStack[]::new);
     }
 
-    @Override public boolean isOpen(PlotInventory inv) {
-        if (!inv.isOpen()) {
+    @Override public boolean isOpen(PlotInventory plotInventory) {
+        if (!plotInventory.isOpen()) {
             return false;
         }
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
+        BukkitPlayer bp = (BukkitPlayer) plotInventory.player;
         InventoryView opened = bp.player.getOpenInventory();
-        return inv.isOpen() && opened.getType() == InventoryType.CRAFTING
+        return plotInventory.isOpen() && opened.getType() == InventoryType.CRAFTING
             && opened.getTitle() == null;
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index bc5265114..f31acd04f 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -669,7 +669,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
     private static final Map<String, PlotBlock> NEW_STRING_TO_LEGACY_PLOT_BLOCK = new HashMap<>();
     private static final Map<String, PlotBlock> OLD_STRING_TO_STRING_PLOT_BLOCK = new HashMap<>();
 
-    public BukkitLegacyMappings() {
+    @SuppressWarnings("deprecation") public BukkitLegacyMappings() {
         this.addAll(Arrays.asList(BLOCKS));
         // Make sure to add new blocks as well
         final List<LegacyBlock> missing = new ArrayList<>();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index dcee95c67..e03969273 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -343,10 +343,8 @@ import java.util.*;
                         return y;
                     air = 0;
                 } else {
-                    switch (type) {
-                        case WATER:
-                        case LAVA:
-                            return y;
+                    if (block.isLiquid()) {
+                        return y;
                     }
                     air++;
                 }
@@ -366,11 +364,7 @@ import java.util.*;
 
     @Override public String[] getBiomeList() {
         final Biome[] biomes = Biome.values();
-        final String[] list = new String[biomes.length];
-        for (int i = 0; i < biomes.length; i++) {
-            list[i] = biomes[i].name();
-        }
-        return list;
+        return Arrays.stream(biomes).map(Enum::name).toArray(String[]::new);
     }
 
     @Override
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
index f0987b219..cecea15ff 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
@@ -65,11 +65,7 @@ public class SendChunk {
         int view = Bukkit.getServer().getViewDistance();
         for (Chunk chunk : chunks) {
             String world = chunk.getWorld().getName();
-            ArrayList<Chunk> list = map.get(world);
-            if (list == null) {
-                list = new ArrayList<>();
-                map.put(world, list);
-            }
+            ArrayList<Chunk> list = map.computeIfAbsent(world, k -> new ArrayList<>());
             list.add(chunk);
             Object c = this.methodGetHandleChunk.of(chunk).call();
             this.methodInitLighting.of(c).call();
@@ -118,20 +114,17 @@ public class SendChunk {
             }
         }
         for (final Chunk chunk : chunks) {
-            TaskManager.runTask(new Runnable() {
-                @Override public void run() {
-                    try {
-                        chunk.unload(true, false);
-                    } catch (Throwable ignored) {
-                        String worldName = chunk.getWorld().getName();
-                        PlotSquared.debug(
-                            "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";"
-                                + chunk.getZ());
-                        PlotSquared
-                            .debug("$3 - $4File may be open in another process (e.g. MCEdit)");
-                        PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
-                            + "/level_old.dat may be corrupt (try repairing or removing these)");
-                    }
+            TaskManager.runTask(() -> {
+                try {
+                    chunk.unload(true, false);
+                } catch (Throwable ignored) {
+                    String worldName = chunk.getWorld().getName();
+                    PlotSquared.debug(
+                        "$4Could not save chunk: " + worldName + ';' + chunk.getX() + ";" + chunk
+                            .getZ());
+                    PlotSquared.debug("$3 - $4File may be open in another process (e.g. MCEdit)");
+                    PlotSquared.debug("$3 - $4" + worldName + "/level.dat or " + worldName
+                        + "/level_old.dat may be corrupt (try repairing or removing these)");
                 }
             });
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java
index 110635f2d..45814d639 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java
@@ -5,12 +5,10 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
 import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
 import org.bukkit.World;
-import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 public class SetGenCB {
 
@@ -45,12 +43,8 @@ public class SetGenCB {
             }
         }
         if (!set) {
-            Iterator<BlockPopulator> iterator = world.getPopulators().iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next() instanceof BukkitAugmentedGenerator) {
-                    iterator.remove();
-                }
-            }
+            world.getPopulators()
+                .removeIf(blockPopulator -> blockPopulator instanceof BukkitAugmentedGenerator);
         }
         PlotSquared.get()
             .loadWorld(world.getName(), PlotSquared.get().IMP.getGenerator(world.getName(), null));
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index 3660bef92..ce058b691 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -8,6 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 
+import java.util.Arrays;
 import java.util.UUID;
 
 public class DefaultUUIDWrapper extends UUIDWrapper {
@@ -30,11 +31,7 @@ public class DefaultUUIDWrapper extends UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
-        for (int i = 0; i < ops.length; i++) {
-            toReturn[i] = new BukkitOfflinePlayer(ops[i]);
-        }
-        return toReturn;
+        return Arrays.stream(ops).map(BukkitOfflinePlayer::new).toArray(BukkitOfflinePlayer[]::new);
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index edb08b763..23887799c 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -80,8 +80,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                     e.printStackTrace();
                 }
             }
-            HashBiMap<StringWrapper, UUID> toAdd =
-                HashBiMap.create(new HashMap<StringWrapper, UUID>());
+            HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<>());
             if (Settings.UUID.NATIVE_UUID_PROVIDER) {
                 HashSet<UUID> all = UUIDHandler.getAllUUIDS();
                 PlotSquared.debug("&aFast mode UUID caching enabled!");
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index c44fa6e72..6686c09f1 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -16,6 +16,7 @@ import org.bukkit.entity.Player;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.UUID;
 
@@ -70,7 +71,7 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
     public Player[] getOnlinePlayers() {
         if (this.getOnline == null) {
             Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
-            return onlinePlayers.toArray(new Player[onlinePlayers.size()]);
+            return onlinePlayers.toArray(new Player[0]);
         }
         try {
             Object players = this.getOnline.invoke(Bukkit.getServer(), this.arg);
@@ -79,13 +80,13 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
             } else {
                 @SuppressWarnings("unchecked") Collection<? extends Player> p =
                     (Collection<? extends Player>) players;
-                return p.toArray(new Player[p.size()]);
+                return p.toArray(new Player[0]);
             }
         } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {
             PlotSquared.debug("Failed to resolve online players");
             this.getOnline = null;
             Collection<? extends Player> onlinePlayers = Bukkit.getOnlinePlayers();
-            return onlinePlayers.toArray(new Player[onlinePlayers.size()]);
+            return onlinePlayers.toArray(new Player[0]);
         }
     }
 
@@ -95,11 +96,7 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
 
     @Override public OfflinePlotPlayer[] getOfflinePlayers() {
         OfflinePlayer[] ops = Bukkit.getOfflinePlayers();
-        BukkitOfflinePlayer[] toReturn = new BukkitOfflinePlayer[ops.length];
-        for (int i = 0; i < ops.length; i++) {
-            toReturn[i] = new BukkitOfflinePlayer(ops[i]);
-        }
-        return toReturn;
+        return Arrays.stream(ops).map(BukkitOfflinePlayer::new).toArray(BukkitOfflinePlayer[]::new);
     }
 
     @Override public OfflinePlotPlayer getOfflinePlayer(String name) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index fc366c305..99b3e7bf6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -114,7 +114,7 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                     TaskManager.runTaskAsync(() -> {
                         while (!toFetch.isEmpty()) {
                             try {
-                                for (int i = 0; i < Math.min(500, toFetch.size()); i++) {
+                                for (int i = 0; i < Math.min(MAX_REQUESTS, toFetch.size()); i++) {
                                     UUID uuid = toFetch.pop();
                                     HttpURLConnection connection = (HttpURLConnection) new URL(
                                         SQLUUIDHandler.this.PROFILE_URL + uuid.toString()
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
index 6bac09a26..51509501e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
@@ -114,12 +114,7 @@ public abstract class Command {
     public List<Command> getCommands(CommandCategory cat, PlotPlayer player) {
         List<Command> commands = getCommands(player);
         if (cat != null) {
-            Iterator<Command> iterator = commands.iterator();
-            while (iterator.hasNext()) {
-                if (iterator.next().category != cat) {
-                    iterator.remove();
-                }
-            }
+            commands.removeIf(command -> command.category != cat);
         }
         return commands;
     }
@@ -306,11 +301,8 @@ public abstract class Command {
                     .sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
                 return;
             }
-            HashSet<String> setargs = new HashSet<>(args.length);
-            for (String arg : args) {
-                setargs.add(arg.toLowerCase());
-            }
-            String[] allargs = setargs.toArray(new String[setargs.size()]);
+            String[] allargs =
+                Arrays.stream(args).map(String::toLowerCase).distinct().toArray(String[]::new);
             int best = 0;
             for (Command current : commands) {
                 int match = getMatch(allargs, current);
@@ -360,14 +352,10 @@ public abstract class Command {
     }
 
     public int getMatch(String[] args, Command cmd) {
-        int count = 0;
         String perm = cmd.getPermission();
         HashSet<String> desc = new HashSet<>();
-        for (String alias : cmd.getAliases()) {
-            if (alias.startsWith(args[0])) {
-                count += 5;
-            }
-        }
+        int count = cmd.getAliases().stream().filter(alias -> alias.startsWith(args[0]))
+            .mapToInt(alias -> 5).sum();
         Collections.addAll(desc, cmd.getDescription().split(" "));
         for (String arg : args) {
             if (perm.startsWith(arg)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
index 668509bf3..442668ee1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
@@ -6,6 +6,7 @@ import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguratio
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.util.stream.Collectors;
 
 /**
  * This is a base class for all File based implementations of {@link
@@ -103,20 +104,16 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      */
     public void load(Reader reader) throws IOException, InvalidConfigurationException {
 
-        StringBuilder builder = new StringBuilder();
+        String builder;
 
         try (BufferedReader input = reader instanceof BufferedReader ?
             (BufferedReader) reader :
             new BufferedReader(reader)) {
-            String line;
 
-            while ((line = input.readLine()) != null) {
-                builder.append(line);
-                builder.append('\n');
-            }
+            builder = input.lines().map(line -> line + '\n').collect(Collectors.joining());
         }
 
-        loadFromString(builder.toString());
+        loadFromString(builder);
     }
 
     /**
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
index 9a84920dc..cd67bb158 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/json/JSONObject.java
@@ -9,6 +9,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.stream.IntStream;
 
 /**
  * A JSONObject is an unordered collection of name/value pairs. Its external form is a string wrapped in curly braces
@@ -296,11 +297,7 @@ public class JSONObject {
         if (length == 0) {
             return null;
         }
-        String[] names = new String[length];
-        for (int i = 0; i < length; i += 1) {
-            names[i] = fields[i].getName();
-        }
-        return names;
+        return IntStream.range(0, length).mapToObj(i -> fields[i].getName()).toArray(String[]::new);
     }
 
     /**
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index fb39d5938..73ad60982 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1305,12 +1305,9 @@ import java.util.zip.ZipInputStream;
                     "w=", "wall=", "b=", "border=");
 
             // Calculate the number of expected arguments
-            int expected = 0;
-            for (final String validArgument : validArguments) {
-                if (args.toLowerCase(Locale.ENGLISH).contains(validArgument)) {
-                    expected += 1;
-                }
-            }
+            int expected = (int) validArguments.stream()
+                .filter(validArgument -> args.toLowerCase(Locale.ENGLISH).contains(validArgument))
+                .count();
 
             String[] split = args.toLowerCase(Locale.ENGLISH).split(",");
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index da71e8912..b205fd957 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -127,11 +127,8 @@ public class Auto extends SubCommand {
         }
         whenDone.value = plot;
         plot.owner = player.getUUID();
-        DBFunc.createPlotSafe(plot, whenDone, new Runnable() {
-            @Override public void run() {
-                autoClaimFromDatabase(player, area, plot.getId(), whenDone);
-            }
-        });
+        DBFunc.createPlotSafe(plot, whenDone,
+            () -> autoClaimFromDatabase(player, area, plot.getId(), whenDone));
     }
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
index 9500dec73..40d4bf763 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -18,11 +18,8 @@ import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.UUID;
 
-@CommandDeclaration(
-    usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false]",
-    command = "purge", permission = "plots.admin", description = "Purge all plots for a world",
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE,
-    confirmation = true) public class Purge extends SubCommand {
+@CommandDeclaration(usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false]", command = "purge", permission = "plots.admin", description = "Purge all plots for a world", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE, confirmation = true)
+public class Purge extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 0) {
@@ -109,9 +106,7 @@ import java.util.UUID;
             if (unknown && UUIDHandler.getName(plot.owner) != null) {
                 continue;
             }
-            for (Plot current : plot.getConnectedPlots()) {
-                toDelete.add(current);
-            }
+            toDelete.addAll(plot.getConnectedPlots());
         }
         if (PlotSquared.get().plots_tmp != null) {
             for (Entry<String, HashMap<PlotId, Plot>> entry : PlotSquared.get().plots_tmp
@@ -144,23 +139,21 @@ import java.util.UUID;
         }
         String cmd =
             "/plot purge " + StringMan.join(args, " ") + " (" + toDelete.size() + " plots)";
-        Runnable run = new Runnable() {
-            @Override public void run() {
-                PlotSquared.debug("Calculating plots to purge, please wait...");
-                HashSet<Integer> ids = new HashSet<>();
-                for (Plot plot : toDelete) {
-                    if (plot.temp != Integer.MAX_VALUE) {
-                        ids.add(plot.temp);
-                        plot.getArea().removePlot(plot.getId());
-                        for (PlotPlayer pp : plot.getPlayersInPlot()) {
-                            PlotListener.plotEntry(pp, plot);
-                        }
-                        plot.removeSign();
+        Runnable run = () -> {
+            PlotSquared.debug("Calculating plots to purge, please wait...");
+            HashSet<Integer> ids = new HashSet<>();
+            for (Plot plot : toDelete) {
+                if (plot.temp != Integer.MAX_VALUE) {
+                    ids.add(plot.temp);
+                    plot.getArea().removePlot(plot.getId());
+                    for (PlotPlayer pp : plot.getPlayersInPlot()) {
+                        PlotListener.plotEntry(pp, plot);
                     }
+                    plot.removeSign();
                 }
-                DBFunc.purgeIds(ids);
-                C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
             }
+            DBFunc.purgeIds(ids);
+            C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, cmd, run);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
index 2f3b5217f..837d3a66a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/StmtMod.java
@@ -4,6 +4,8 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public abstract class StmtMod<T> {
 
@@ -19,12 +21,9 @@ public abstract class StmtMod<T> {
     }
 
     public String getCreateSQLite(int size, String query, int params) {
-        StringBuilder statement = new StringBuilder(query);
         String modParams = StringMan.repeat(",?", params).substring(1);
-        for (int i = 0; i < size - 1; i++) {
-            statement.append("UNION SELECT ").append(modParams).append(' ');
-        }
-        return statement.toString();
+        return IntStream.range(0, size - 1).mapToObj(i -> "UNION SELECT " + modParams + ' ')
+            .collect(Collectors.joining("", query, ""));
     }
 
     public abstract String getCreateSQLite(int size);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 4d46205ad..df1abbb9a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -97,13 +97,8 @@ public abstract class HybridUtils {
             for (int x = x1; x <= x2; x++) {
                 for (int z = z1; z <= z2; z++) {
                     PlotBlock block = queue.getBlock(x, y, z);
-                    boolean same = false;
-                    for (PlotBlock p : blocks) {
-                        if (WorldUtil.IMP.isBlockSame(block, p)) {
-                            same = true;
-                            break;
-                        }
-                    }
+                    boolean same =
+                        Arrays.stream(blocks).anyMatch(p -> WorldUtil.IMP.isBlockSame(block, p));
                     if (!same) {
                         count++;
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index fd1e11a90..b3e4c88af 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -31,6 +31,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 /**
  * The plot class<br>
@@ -2166,11 +2167,9 @@ public class Plot {
             return false;
         }
         HashSet<Plot> visited = new HashSet<>();
-        HashSet<PlotId> merged = new HashSet<>();
+        HashSet<PlotId> merged;
         Set<Plot> connected = this.getConnectedPlots();
-        for (Plot current : connected) {
-            merged.add(current.getId());
-        }
+        merged = connected.stream().map(Plot::getId).collect(Collectors.toCollection(HashSet::new));
         ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
         Plot current;
         boolean toReturn = false;
@@ -2554,9 +2553,7 @@ public class Plot {
             }
             Location gtopabs = this.area.getPlotAbs(top).getTopAbs();
             Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs();
-            for (PlotId id : MainUtil.getPlotSelectionIds(bot, top)) {
-                visited.add(id);
-            }
+            visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
             for (int x = bot.x; x <= top.x; x++) {
                 Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
                 if (plot.getMerged(2)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 5fe7e27ee..7d0c84255 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -542,13 +542,8 @@ public abstract class PlotArea {
 
     public int getPlotCount(@Nonnull final UUID uuid) {
         if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-            int count = 0;
-            for (Plot plot : getPlotsAbs(uuid)) {
-                if (!plot.hasFlag(Flags.DONE)) {
-                    count++;
-                }
-            }
-            return count;
+            return (int) getPlotsAbs(uuid).stream().filter(plot -> !plot.hasFlag(Flags.DONE))
+                .count();
         }
         return getPlotsAbs(uuid).size();
     }
@@ -563,11 +558,7 @@ public abstract class PlotArea {
     }
 
     public boolean hasPlot(@Nonnull final UUID uuid) {
-        for (Entry<PlotId, Plot> entry : this.plots.entrySet()) {
-            if (entry.getValue().isOwner(uuid))
-                return true;
-        }
-        return false;
+        return this.plots.entrySet().stream().anyMatch(entry -> entry.getValue().isOwner(uuid));
     }
 
     public int getPlotCount(@Nullable final PlotPlayer player) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index b8ad261ee..d2767e90d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -18,6 +18,7 @@ import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * The abstract class supporting {@code BukkitPlayer} and {@code SpongePlayer}.
@@ -245,11 +246,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
         int count = 0;
         for (PlotArea area : PlotSquared.get().getPlotAreas(world)) {
             if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-                for (Plot plot : area.getPlotsAbs(uuid)) {
-                    if (!plot.getFlag(Flags.DONE).isPresent()) {
-                        count++;
-                    }
-                }
+                count += area.getPlotsAbs(uuid).stream()
+                    .filter(plot -> !plot.getFlag(Flags.DONE).isPresent()).count();
             } else {
                 count += area.getPlotsAbs(uuid).size();
             }
@@ -537,13 +535,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      */
     public Set<Plot> getPlots(String world) {
         UUID uuid = getUUID();
-        HashSet<Plot> plots = new HashSet<>();
-        for (Plot plot : PlotSquared.get().getPlots(world)) {
-            if (plot.isOwner(uuid)) {
-                plots.add(plot);
-            }
-        }
-        return plots;
+        return PlotSquared.get().getPlots(world).stream().filter(plot -> plot.isOwner(uuid))
+            .collect(Collectors.toCollection(HashSet::new));
     }
 
     public void populatePersistentMetaMap() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
index 874b6155c..8d327188a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
@@ -6,6 +6,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.stream.IntStream;
 
 public class Rating {
     /**
@@ -43,10 +44,7 @@ public class Rating {
     }
 
     public double getAverageRating() {
-        double total = 0;
-        for (Entry<String, Integer> entry : this.ratingMap.entrySet()) {
-            total += entry.getValue();
-        }
+        double total = this.ratingMap.entrySet().stream().mapToDouble(Entry::getValue).sum();
         return total / this.ratingMap.size();
     }
 
@@ -67,12 +65,9 @@ public class Rating {
             return this.initial;
         }
         if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
-            int val = 0;
-            for (int i = 0; i < Settings.Ratings.CATEGORIES.size(); i++) {
-                val +=
-                    (i + 1) * Math.pow(10, this.ratingMap.get(Settings.Ratings.CATEGORIES.get(i)));
-            }
-            return val;
+            return IntStream.range(0, Settings.Ratings.CATEGORIES.size()).map(
+                i -> (int) ((i + 1) * Math
+                    .pow(10, this.ratingMap.get(Settings.Ratings.CATEGORIES.get(i))))).sum();
         } else {
             return this.ratingMap.get(null);
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
index 0c2fea165..9a9abca74 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -88,9 +88,8 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         HashSet<PlotArea> globalAreas = new HashSet<>(Arrays.asList(plotAreas));
         localAreas.add(plotArea);
         globalAreas.add(plotArea);
-        this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
-        this.plotAreaMap
-            .put(plotArea.worldname, localAreas.toArray(new PlotArea[localAreas.size()]));
+        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
+        this.plotAreaMap.put(plotArea.worldname, localAreas.toArray(new PlotArea[0]));
         QuadMap<PlotArea> map = this.plotAreaGrid.get(plotArea.worldname);
         if (map == null) {
             map = new QuadMap<PlotArea>(Integer.MAX_VALUE, 0, 0) {
@@ -104,15 +103,14 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
     }
 
     @Override public void removePlotArea(PlotArea area) {
-        ArrayList<PlotArea> globalAreas = new ArrayList<PlotArea>(Arrays.asList(plotAreas));
+        ArrayList<PlotArea> globalAreas = new ArrayList<>(Arrays.asList(plotAreas));
         globalAreas.remove(area);
-        this.plotAreas = globalAreas.toArray(new PlotArea[globalAreas.size()]);
+        this.plotAreas = globalAreas.toArray(new PlotArea[0]);
         if (globalAreas.isEmpty()) {
             this.plotAreaMap.remove(area.worldname);
             this.plotAreaGrid.remove(area.worldname);
         } else {
-            this.plotAreaMap
-                .put(area.worldname, globalAreas.toArray(new PlotArea[globalAreas.size()]));
+            this.plotAreaMap.put(area.worldname, globalAreas.toArray(new PlotArea[0]));
             this.plotAreaGrid.get(area.worldname).remove(area);
         }
     }
@@ -206,7 +204,7 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
             return noPlotAreas;
         } else {
             Set<PlotArea> found = areas.get(region);
-            return found.toArray(new PlotArea[found.size()]);
+            return found.toArray(new PlotArea[0]);
         }
     }
 
@@ -217,14 +215,14 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
         Set<String> tmp = new LinkedHashSet<>();
         Collections.addAll(tmp, worlds);
         tmp.add(worldName);
-        worlds = tmp.toArray(new String[tmp.size()]);
+        worlds = tmp.toArray(new String[0]);
     }
 
     @Override public void removeWorld(String worldName) {
         Set<String> tmp = new LinkedHashSet<>();
         Collections.addAll(tmp, worlds);
         tmp.remove(worldName);
-        worlds = tmp.toArray(new String[tmp.size()]);
+        worlds = tmp.toArray(new String[0]);
     }
 
     @Override public String[] getAllWorlds() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
index aef7f53a8..7a59dab9d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java
@@ -5,24 +5,24 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
 
 public interface PlotAreaManager {
-    public PlotArea getApplicablePlotArea(Location location);
+    PlotArea getApplicablePlotArea(Location location);
 
-    public PlotArea getPlotArea(Location location);
+    PlotArea getPlotArea(Location location);
 
-    public PlotArea getPlotArea(String world, String id);
+    PlotArea getPlotArea(String world, String id);
 
-    public PlotArea[] getPlotAreas(String world, RegionWrapper region);
+    PlotArea[] getPlotAreas(String world, RegionWrapper region);
 
-    public PlotArea[] getAllPlotAreas();
+    PlotArea[] getAllPlotAreas();
 
-    public String[] getAllWorlds();
+    String[] getAllWorlds();
 
-    public void addPlotArea(PlotArea area);
+    void addPlotArea(PlotArea area);
 
-    public void removePlotArea(PlotArea area);
+    void removePlotArea(PlotArea area);
 
-    public void addWorld(String worldName);
+    void addWorld(String worldName);
 
-    public void removeWorld(String worldName);
+    void removeWorld(String worldName);
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
index 13c2647cd..807da4a54 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -76,11 +76,8 @@ import java.util.Map;
     }
 
     private PlotBlock[] splitBlockList(@NonNull final List<String> list) {
-        final PlotBlock[] entries = new PlotBlock[list.size()];
-        for (int i = 0; i < list.size(); i++) {
-            entries[i] = WorldUtil.IMP.getClosestBlock(list.get(i)).best;
-        }
-        return entries;
+        return list.stream().map(s -> WorldUtil.IMP.getClosestBlock(s).best)
+            .toArray(PlotBlock[]::new);
     }
 
     private void convertBlock(@NonNull final ConfigurationSection section,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index 68fd5ece2..eef5eca17 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -825,11 +825,8 @@ public class MainUtil {
         if (l.size() < 1) {
             return C.NONE.s();
         }
-        List<String> users = new ArrayList<>();
-        for (UUID u : l) {
-            users.add(getName(u));
-        }
-        Collections.sort(users);
+        List<String> users =
+            l.stream().map(MainUtil::getName).sorted().collect(Collectors.toList());
         String c = C.PLOT_USER_LIST.s();
         StringBuilder list = new StringBuilder();
         for (int x = 0; x < users.size(); x++) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
index 3991cd78d..a448eb127 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -106,7 +106,7 @@ public class GlobalBlockQueue {
                     if (PARALLEL_THREADS <= 1) {
                         SET_TASK.run();
                     } else {
-                        ArrayList<Thread> threads = new ArrayList<Thread>();
+                        ArrayList<Thread> threads = new ArrayList<>();
                         for (int i = 0; i < PARALLEL_THREADS; i++) {
                             threads.add(new Thread(SET_TASK));
                         }
@@ -168,7 +168,7 @@ public class GlobalBlockQueue {
 
     public List<LocalBlockQueue> getAllQueues() {
         ArrayList<LocalBlockQueue> list =
-            new ArrayList<LocalBlockQueue>(activeQueues.size() + inactiveQueues.size());
+            new ArrayList<>(activeQueues.size() + inactiveQueues.size());
         list.addAll(inactiveQueues);
         list.addAll(activeQueues);
         return list;
@@ -197,7 +197,7 @@ public class GlobalBlockQueue {
             if (PARALLEL_THREADS <= 1) {
                 SET_TASK.run();
             } else {
-                ArrayList<Thread> threads = new ArrayList<Thread>();
+                ArrayList<Thread> threads = new ArrayList<>();
                 for (int i = 0; i < PARALLEL_THREADS; i++) {
                     threads.add(new Thread(SET_TASK));
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
index b17f3ce47..429a71035 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/PlotAnalysis.java
@@ -414,11 +414,7 @@ public class PlotAnalysis {
      * @return
      */
     public static int sum(int[] array) {
-        int sum = 0;
-        for (int value : array) {
-            sum += value;
-        }
-        return sum;
+        return Arrays.stream(array).sum();
     }
 
     /**

From 477e698f7ecb693e836933563868ac8b68d372f3 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 17:13:57 +0000
Subject: [PATCH 040/210] Reformat

---
 .../plotsquared/bukkit/chat/FancyMessage.java |  5 ++++-
 .../bukkit/uuid/FileUUIDHandler.java          | 13 +++++-------
 .../bukkit/uuid/SQLUUIDHandler.java           | 20 ++++++++-----------
 Core/build.gradle                             |  2 --
 .../plotsquared/plot/PlotSquared.java         | 10 ++++------
 .../plotsquared/plot/commands/Auto.java       |  4 +++-
 .../plotsquared/plot/commands/Claim.java      |  4 +++-
 .../plotsquared/plot/commands/Inbox.java      |  6 ++++--
 .../plotsquared/plot/commands/Purge.java      |  7 +++++--
 .../plotsquared/plot/commands/Rate.java       |  4 +++-
 .../plotsquared/plot/object/PlotSettings.java |  5 +----
 .../plotsquared/plot/util/ChunkManager.java   |  4 ++--
 .../plotsquared/plot/util/CommentManager.java |  3 +--
 .../plot/util/UUIDHandlerImplementation.java  |  9 ++++-----
 14 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
index 4411aa0a5..56635abb0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java
@@ -5,7 +5,10 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonWriter;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.Statistic;
 import org.bukkit.Statistic.Type;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.serialization.ConfigurationSerializable;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index 23887799c..42a83f466 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -84,8 +84,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             if (Settings.UUID.NATIVE_UUID_PROVIDER) {
                 HashSet<UUID> all = UUIDHandler.getAllUUIDS();
                 PlotSquared.debug("&aFast mode UUID caching enabled!");
-                File playerDataFolder =
-                    new File(container, world + File.separator + "playerdata");
+                File playerDataFolder = new File(container, world + File.separator + "playerdata");
                 String[] dat = playerDataFolder.list(new DatFileFilter());
                 boolean check = all.isEmpty();
                 if (dat != null) {
@@ -127,8 +126,8 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                     }
                     return;
                 } else {
-                    PlotSquared.debug("Failed to cache: " + all.size()
-                        + " uuids - slowly processing all files");
+                    PlotSquared.debug(
+                        "Failed to cache: " + all.size() + " uuids - slowly processing all files");
                 }
             }
             HashSet<String> worlds1 = Sets.newHashSet(world, "world");
@@ -137,8 +136,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             File playerDataFolder = null;
             for (String worldName : worlds1) {
                 // Getting UUIDs
-                playerDataFolder =
-                    new File(container, worldName + File.separator + "playerdata");
+                playerDataFolder = new File(container, worldName + File.separator + "playerdata");
                 String[] dat = playerDataFolder.list(new DatFileFilter());
                 if ((dat != null) && (dat.length != 0)) {
                     for (String current : dat) {
@@ -212,8 +210,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             }
 
             if (getUUIDMap().isEmpty()) {
-                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper
-                    .getOfflinePlayers()) {
+                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper.getOfflinePlayers()) {
                     long last = op.getLastPlayed();
                     if (last != 0) {
                         String name = op.getName();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 99b3e7bf6..8df215693 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -73,14 +73,12 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         }
         TaskManager.runTaskAsync(() -> {
             try {
-                HashBiMap<StringWrapper, UUID> toAdd =
-                    HashBiMap.create(new HashMap<>());
+                HashBiMap<StringWrapper, UUID> toAdd = HashBiMap.create(new HashMap<>());
                 try (PreparedStatement statement = getConnection()
                     .prepareStatement("SELECT `uuid`, `username` FROM `usercache`");
                     ResultSet resultSet = statement.executeQuery()) {
                     while (resultSet.next()) {
-                        StringWrapper username =
-                            new StringWrapper(resultSet.getString("username"));
+                        StringWrapper username = new StringWrapper(resultSet.getString("username"));
                         UUID uuid = UUID.fromString(resultSet.getString("uuid"));
                         toAdd.put(new StringWrapper(username.value), uuid);
                     }
@@ -99,8 +97,7 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                     }
                     return;
                 }
-                FileUUIDHandler fileHandler =
-                    new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
+                FileUUIDHandler fileHandler = new FileUUIDHandler(SQLUUIDHandler.this.uuidWrapper);
                 fileHandler.startCaching(() -> {
                     // If the file based UUID handler didn't cache it, then we can't cache offline mode
                     // Also, trying to cache based on files again, is useless as that's what the file based uuid cacher does
@@ -203,13 +200,12 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         // Ignoring duplicates
         if (super.add(name, uuid)) {
             TaskManager.runTaskAsync(() -> {
-                try (PreparedStatement statement = getConnection().prepareStatement(
-                    "REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
+                try (PreparedStatement statement = getConnection()
+                    .prepareStatement("REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
                     statement.setString(1, uuid.toString());
                     statement.setString(2, name.toString());
                     statement.execute();
-                    PlotSquared
-                        .debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
+                    PlotSquared.debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
                 } catch (SQLException e) {
                     e.printStackTrace();
                 }
@@ -230,8 +226,8 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                 statement.setString(1, name.value);
                 statement.setString(2, uuid.toString());
                 statement.execute();
-                PlotSquared.debug(
-                    C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
+                PlotSquared
+                    .debug(C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
             } catch (SQLException e) {
                 e.printStackTrace();
             }
diff --git a/Core/build.gradle b/Core/build.gradle
index 14bda6198..2327ddf81 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -1,5 +1,3 @@
-import org.ajoberstar.grgit.Grgit
-
 dependencies {
     testCompile 'junit:junit:4.12'
     compile 'org.yaml:snakeyaml:1.23'
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 73ad60982..44ba326c8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -49,8 +49,7 @@ import java.util.zip.ZipInputStream;
  * An implementation of the core, with a static getter for easy access.
  */
 @SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
-    private static final Set<Plot> EMPTY_SET =
-        Collections.unmodifiableSet(Collections.emptySet());
+    private static final Set<Plot> EMPTY_SET = Collections.unmodifiableSet(Collections.emptySet());
     private static PlotSquared instance;
     // Implementation
     public final IPlotMain IMP;
@@ -1143,9 +1142,8 @@ import java.util.zip.ZipInputStream;
                 PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
                 String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
                 if (type == 2) {
-                    Set<PlotCluster> clusters = this.clusters_tmp != null ?
-                        this.clusters_tmp.get(world) :
-                        new HashSet<>();
+                    Set<PlotCluster> clusters =
+                        this.clusters_tmp != null ? this.clusters_tmp.get(world) : new HashSet<>();
                     if (clusters == null) {
                         throw new IllegalArgumentException("No cluster exists for world: " + world);
                     }
@@ -1964,7 +1962,7 @@ import java.util.zip.ZipInputStream;
      *
      * @param alias     to search plots
      * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
+     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
      */
     public Set<Plot> getPlotsByAlias(@Nullable final String alias,
         @NonNull final String worldname) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index b205fd957..fb4eca2e9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -11,7 +11,9 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 import javax.annotation.Nullable;
 import java.util.Set;
 
-@CommandDeclaration(command = "auto", permission = "plots.auto", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length,width]")
+@CommandDeclaration(command = "auto", permission = "plots.auto",
+    category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE,
+    description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length,width]")
 public class Auto extends SubCommand {
 
     @Deprecated public static PlotId getNextPlotId(PlotId id, int step) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
index ce7ee4c26..e49155b8d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
@@ -10,7 +10,9 @@ import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 
-@CommandDeclaration(command = "claim", aliases = "c", description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
+@CommandDeclaration(command = "claim", aliases = "c",
+    description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.NONE, permission = "plots.claim", usage = "/plot claim")
 public class Claim extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
index 5e8a5550c..b8ffd4261 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -13,8 +13,10 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 import java.util.List;
 
-@CommandDeclaration(command = "inbox", description = "Review the comments for a plot", usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox", category = CommandCategory.CHAT, requiredType = RequiredType.NONE)
-public class Inbox extends SubCommand {
+@CommandDeclaration(command = "inbox", description = "Review the comments for a plot",
+    usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox",
+    category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Inbox
+    extends SubCommand {
 
     public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
         if (oldComments == null || oldComments.isEmpty()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
index 40d4bf763..a50ffbc90 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -18,8 +18,11 @@ import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.UUID;
 
-@CommandDeclaration(usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false]", command = "purge", permission = "plots.admin", description = "Purge all plots for a world", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE, confirmation = true)
-public class Purge extends SubCommand {
+@CommandDeclaration(
+    usage = "/plot purge world:<world> area:<area> id:<id> owner:<owner> shared:<shared> unknown:[true|false]",
+    command = "purge", permission = "plots.admin", description = "Purge all plots for a world",
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE,
+    confirmation = true) public class Purge extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 59e2b2d43..8446b62a3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -10,8 +10,10 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Map.Entry;
+import java.util.UUID;
 
 @CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
     usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
index 86b41dc45..74c371d17 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -27,22 +27,19 @@ public class PlotSettings {
      * @deprecated Raw access
      */
     @Deprecated public String alias = "";
-
-    private List<PlotComment> comments = null;
-
     /**
      * The ratings for a plot.
      *
      * @deprecated Raw access
      */
     @Deprecated public HashMap<UUID, Integer> ratings;
-
     /**
      * Flags.
      *
      * @deprecated Raw access
      */
     @Deprecated public HashMap<Flag<?>, Object> flags = new HashMap<>();
+    private List<PlotComment> comments = null;
     /**
      * Home Position.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index d27dc7597..cf2ca96ed 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -240,8 +240,8 @@ public abstract class ChunkManager {
         TaskManager.runTaskAsync(() -> {
             for (ChunkLoc loc : chunks) {
                 String directory =
-                    world + File.separator + "region" + File.separator + "r." + loc.x + "."
-                        + loc.z + ".mca";
+                    world + File.separator + "region" + File.separator + "r." + loc.x + "." + loc.z
+                        + ".mca";
                 File file = new File(PlotSquared.get().IMP.getWorldContainer(), directory);
                 PlotSquared.log("&6 - Deleting file: " + file.getName() + " (max 1024 chunks)");
                 if (file.exists()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index cc5021c57..524ea7f67 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -31,8 +31,7 @@ public class CommentManager {
                         if (value != null) {
                             int num = 0;
                             for (PlotComment comment : value) {
-                                if (comment.timestamp > getTimestamp(player,
-                                    inbox.toString())) {
+                                if (comment.timestamp > getTimestamp(player, inbox.toString())) {
                                     num++;
                                 }
                             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
index 347bc48e6..69e252474 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
@@ -15,12 +15,11 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class UUIDHandlerImplementation {
 
-    private final ConcurrentHashMap<String, PlotPlayer> players;
     public final HashSet<UUID> unknown = new HashSet<>();
+    private final ConcurrentHashMap<String, PlotPlayer> players;
     protected UUIDWrapper uuidWrapper;
     private boolean cached = false;
-    private BiMap<StringWrapper, UUID> uuidMap =
-        HashBiMap.create(new HashMap<>());
+    private BiMap<StringWrapper, UUID> uuidMap = HashBiMap.create(new HashMap<>());
     //    private BiMap<UUID, StringWrapper> nameMap = uuidMap.inverse();
 
     public UUIDHandlerImplementation(UUIDWrapper wrapper) {
@@ -138,8 +137,8 @@ public abstract class UUIDHandlerImplementation {
             TaskManager.runTaskAsync(() -> {
                 UUID offlineUpper = UUID.nameUUIDFromBytes(
                     ("OfflinePlayer:" + name.value).getBytes(Charsets.UTF_8));
-                if (UUIDHandlerImplementation.this.unknown.contains(offlineUpper)
-                    && !offlineUpper.equals(uuid)) {
+                if (UUIDHandlerImplementation.this.unknown.contains(offlineUpper) && !offlineUpper
+                    .equals(uuid)) {
                     UUIDHandlerImplementation.this.unknown.remove(offlineUpper);
                     Set<Plot> plots = PlotSquared.get().getPlotsAbs(offlineUpper);
                     if (!plots.isEmpty()) {

From 130e1b63008c9e8f66bc86a65aae29910527cdf2 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 21:47:54 +0000
Subject: [PATCH 041/210] Fix armorstands, boats etc being placeable on players
 plots with "use 0" flag

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java  | 13 +++----------
 .../bukkit/util/BukkitLegacyMappings.java           |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 93d462d32..ea5f96be0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1876,23 +1876,16 @@ import java.util.regex.Pattern;
                         eventType = PlayerBlockEventType.TELEPORT_OBJECT;
                         break;
                     default:
-                        LegacyPlotBlock legacyPlotBlock =
-                            (LegacyPlotBlock) PlotSquared.get().IMP.getLegacyMappings()
-                                .fromStringToLegacy(blockType.name());
-                        if (legacyPlotBlock != null) {
-                            int blockId = legacyPlotBlock.id;
-                            if (blockId > 197) {
-                                eventType = PlayerBlockEventType.INTERACT_BLOCK;
-                            }
+                        if (blockType.isInteractable()) {
+                            eventType = PlayerBlockEventType.INTERACT_BLOCK;
                         }
-                        break;
                 }
                 lb = new BukkitLazyBlock(PlotBlock.get(block.getType().toString()));
-                ItemStack hand = player.getInventory().getItemInMainHand();
                 if (eventType != null && (eventType != PlayerBlockEventType.INTERACT_BLOCK
                     || !player.isSneaking())) {
                     break;
                 }
+                ItemStack hand = player.getInventory().getItemInMainHand();
                 Material type = (hand == null) ? null : hand.getType();
                 if (type == Material.AIR) {
                     eventType = PlayerBlockEventType.INTERACT_BLOCK;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index f31acd04f..bf75a93e5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -675,7 +675,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
         final List<LegacyBlock> missing = new ArrayList<>();
         for (final Material material : Material.values()) {
             final String materialName = material.name().toLowerCase(Locale.ENGLISH);
-            if (OLD_STRING_TO_STRING_PLOT_BLOCK.get(materialName) == null) {
+            if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.get(materialName) == null) {
                 final LegacyBlock missingBlock =
                     new LegacyBlock(material.getId(), materialName, materialName);
                 missing.add(missingBlock);

From 57981a870e5d830988f2f6726a2dc8cbb9f0b3dd Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 21:53:11 +0000
Subject: [PATCH 042/210] Update version offset to match ci

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c8c177e39..649fd4c06 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2049;  // Offset to match CI
+    index = -2046;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 745fd58e2e38cf40192bd41d035f0bf7d2317f2e Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Feb 2019 21:54:13 +0000
Subject: [PATCH 043/210] *

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 649fd4c06..b4aabdbf5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2046;  // Offset to match CI
+    index = -2045;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From b999cb4195e9b436d71fb00639c08ed01b756f0d Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 14 Feb 2019 17:38:36 +0000
Subject: [PATCH 044/210] Fix players being able to place boats, armorstands
 etc using offhand

---
 .../bukkit/listeners/PlayerEvents.java           | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index ea5f96be0..8d98ddb03 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1886,23 +1886,29 @@ import java.util.regex.Pattern;
                     break;
                 }
                 ItemStack hand = player.getInventory().getItemInMainHand();
+                ItemStack offHand = player.getInventory().getItemInOffHand();
                 Material type = (hand == null) ? null : hand.getType();
-                if (type == Material.AIR) {
+                Material offType = (offHand == null) ? null : offHand.getType();
+                if ((type == Material.AIR && offType != Material.AIR && !player.isSneaking()
+                    && blockType.isInteractable()) || (type == Material.AIR
+                    && offType == Material.AIR)) {
                     eventType = PlayerBlockEventType.INTERACT_BLOCK;
                     break;
                 }
+                if (!(type != null && type.equals(offType))) {
+                    type = offType;
+                }
                 if (type == null || type.isBlock()) {
                     location = BukkitUtil
                         .getLocation(block.getRelative(event.getBlockFace()).getLocation());
                     eventType = PlayerBlockEventType.PLACE_BLOCK;
                     break;
                 }
-                Material handType = hand.getType();
-                lb = new BukkitLazyBlock(PlotBlock.get(handType.toString()));
-                if (handType.toString().endsWith("egg")) {
+                lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
+                if (type.toString().endsWith("egg")) {
                     eventType = PlayerBlockEventType.SPAWN_MOB;
                 } else {
-                    switch (handType) {
+                    switch (type) {
                         case FIREWORK_ROCKET:
                         case FIREWORK_STAR:
                             eventType = PlayerBlockEventType.SPAWN_MOB;

From a64d764cc14d465c9bbd5affe9e20d1d99c8e6eb Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 15 Feb 2019 12:50:43 -0500
Subject: [PATCH 045/210] New API method, more 1.13 entity support, and
 cleanup.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/BukkitMain.java        | 437 +++++++++---------
 .../bukkit/generator/BukkitPlotGenerator.java |  18 +-
 .../entity/ReplicatingEntityWrapper.java      |  58 ++-
 .../plotsquared/bukkit/util/NbtFactory.java   |  25 +-
 .../bukkit/util/block/GenChunk.java           |  10 +-
 .../configuration/file/FileConfiguration.java |  22 +-
 .../plotsquared/plot/PlotSquared.java         |   7 +
 .../plotsquared/plot/object/Plot.java         |  14 +-
 .../plotsquared/plot/object/PlotPlayer.java   |   2 +-
 .../plot/object/schematic/Schematic.java      |   8 +-
 .../plot/util/SchematicHandler.java           |  18 +-
 .../plotsquared/plot/util/WorldUtil.java      |  13 +-
 12 files changed, 319 insertions(+), 313 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 9c2bc49db..5060e4f4a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -30,6 +30,7 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extension.platform.Capability;
 import lombok.Getter;
 import lombok.NonNull;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.*;
 import org.bukkit.Location;
 import org.bukkit.command.PluginCommand;
@@ -287,244 +288,248 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
     @Override @SuppressWarnings("deprecation") public void runEntityTask() {
         PlotSquared.log(C.PREFIX + "KillAllEntities started.");
-        TaskManager
-            .runTaskRepeat(() -> PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-                @Override public void run(PlotArea plotArea) {
-                    final World world = Bukkit.getWorld(plotArea.worldname);
-                    try {
-                        if (world == null) {
-                            return;
-                        }
-                        List<Entity> entities = world.getEntities();
-                        Iterator<Entity> iterator = entities.iterator();
-                        while (iterator.hasNext()) {
-                            Entity entity = iterator.next();
-                            switch (entity.getType()) {
-                                case EGG:
-                                case COMPLEX_PART:
-                                case FISHING_HOOK:
-                                case ENDER_SIGNAL:
-                                case LINGERING_POTION:
-                                case AREA_EFFECT_CLOUD:
-                                case EXPERIENCE_ORB:
-                                case LEASH_HITCH:
-                                case FIREWORK:
-                                case WEATHER:
-                                case LIGHTNING:
-                                case WITHER_SKULL:
-                                case UNKNOWN:
-                                case PLAYER:
-                                    // non moving / unmovable
+        TaskManager.runTaskRepeat(() -> PlotSquared.get().forEachPlotArea(plotArea -> {
+            final World world = Bukkit.getWorld(plotArea.worldname);
+            try {
+                if (world == null) {
+                    return;
+                }
+                List<Entity> entities = world.getEntities();
+                Iterator<Entity> iterator = entities.iterator();
+                while (iterator.hasNext()) {
+                    Entity entity = iterator.next();
+                    switch (entity.getType()) {
+                        case EGG:
+                        case COMPLEX_PART:
+                        case FISHING_HOOK:
+                        case ENDER_SIGNAL:
+                        case LINGERING_POTION:
+                        case AREA_EFFECT_CLOUD:
+                        case EXPERIENCE_ORB:
+                        case LEASH_HITCH:
+                        case FIREWORK:
+                        case WEATHER:
+                        case LIGHTNING:
+                        case WITHER_SKULL:
+                        case UNKNOWN:
+                        case PLAYER:
+                            // non moving / unmovable
+                            continue;
+                        case THROWN_EXP_BOTTLE:
+                        case SPLASH_POTION:
+                        case SNOWBALL:
+                        case SHULKER_BULLET:
+                        case SPECTRAL_ARROW:
+                        case TIPPED_ARROW:
+                        case ENDER_PEARL:
+                        case ARROW:
+                        case LLAMA_SPIT:
+                        case TRIDENT:
+                            // managed elsewhere | projectile
+                            continue;
+                        case ITEM_FRAME:
+                        case PAINTING:
+                            // Not vehicles
+                            continue;
+                        case ARMOR_STAND:
+                            // Temporarily classify as vehicle
+                        case MINECART:
+                        case MINECART_CHEST:
+                        case MINECART_COMMAND:
+                        case MINECART_FURNACE:
+                        case MINECART_HOPPER:
+                        case MINECART_MOB_SPAWNER:
+                        case ENDER_CRYSTAL:
+                        case MINECART_TNT:
+                        case BOAT:
+                            if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+                                com.github.intellectualsites.plotsquared.plot.object.Location
+                                    location = BukkitUtil.getLocation(entity.getLocation());
+                                Plot plot = location.getPlot();
+                                if (plot == null) {
+                                    if (location.isPlotArea()) {
+                                        if (entity.hasMetadata("ps-tmp-teleport")) {
+                                            continue;
+                                        }
+                                        iterator.remove();
+                                        entity.remove();
+                                    }
                                     continue;
-                                case THROWN_EXP_BOTTLE:
-                                case SPLASH_POTION:
-                                case SNOWBALL:
-                                case SHULKER_BULLET:
-                                case SPECTRAL_ARROW:
-                                case TIPPED_ARROW:
-                                case ENDER_PEARL:
-                                case ARROW:
-                                case LLAMA_SPIT:
-                                case TRIDENT:
-                                    // managed elsewhere | projectile
+                                }
+                                List<MetadataValue> meta = entity.getMetadata("plot");
+                                if (meta.isEmpty()) {
                                     continue;
-                                case ITEM_FRAME:
-                                case PAINTING:
-                                    // Not vehicles
-                                    continue;
-                                case ARMOR_STAND:
-                                    // Temporarily classify as vehicle
-                                case MINECART:
-                                case MINECART_CHEST:
-                                case MINECART_COMMAND:
-                                case MINECART_FURNACE:
-                                case MINECART_HOPPER:
-                                case MINECART_MOB_SPAWNER:
-                                case ENDER_CRYSTAL:
-                                case MINECART_TNT:
-                                case BOAT:
-                                    if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
+                                }
+                                Plot origin = (Plot) meta.get(0).value();
+                                if (!plot.equals(origin.getBasePlot(false))) {
+                                    if (entity.hasMetadata("ps-tmp-teleport")) {
+                                        continue;
+                                    }
+                                    iterator.remove();
+                                    entity.remove();
+                                }
+                            }
+                            continue;
+                        case SMALL_FIREBALL:
+                        case FIREBALL:
+                        case DRAGON_FIREBALL:
+                        case DROPPED_ITEM:
+                            if (Settings.Enabled_Components.KILL_ROAD_ITEMS && plotArea
+                                .getOwnedPlotAbs(BukkitUtil.getLocation(entity.getLocation()))
+                                == null) {
+                                entity.remove();
+                            }
+                            // dropped item
+                            continue;
+                        case PRIMED_TNT:
+                        case FALLING_BLOCK:
+                            // managed elsewhere
+                            continue;
+                        case SHULKER:
+                            if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
+                                LivingEntity livingEntity = (LivingEntity) entity;
+                                List<MetadataValue> meta = entity.getMetadata("plot");
+                                if (meta != null && !meta.isEmpty()) {
+                                    if (livingEntity.isLeashed()) {
+                                        continue;
+                                    }
+                                    List<MetadataValue> keep = entity.getMetadata("keep");
+                                    if (keep != null && !keep.isEmpty()) {
+                                        continue;
+                                    }
+
+                                    PlotId originalPlotId = (PlotId) meta.get(0).value();
+                                    if (originalPlotId != null) {
                                         com.github.intellectualsites.plotsquared.plot.object.Location
-                                            location = BukkitUtil.getLocation(entity.getLocation());
-                                        Plot plot = location.getPlot();
-                                        if (plot == null) {
-                                            if (location.isPlotArea()) {
+                                            pLoc = BukkitUtil.getLocation(entity.getLocation());
+                                        PlotArea area = pLoc.getPlotArea();
+                                        if (area != null) {
+                                            PlotId currentPlotId = PlotId.of(area.getPlotAbs(pLoc));
+                                            if (!originalPlotId.equals(currentPlotId) && (
+                                                currentPlotId == null || !area
+                                                    .getPlot(originalPlotId)
+                                                    .equals(area.getPlot(currentPlotId)))) {
                                                 if (entity.hasMetadata("ps-tmp-teleport")) {
                                                     continue;
                                                 }
                                                 iterator.remove();
                                                 entity.remove();
                                             }
-                                            continue;
                                         }
-                                        List<MetadataValue> meta = entity.getMetadata("plot");
-                                        if (meta.isEmpty()) {
-                                            continue;
+                                    }
+                                } else {
+                                    //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java)
+                                    com.github.intellectualsites.plotsquared.plot.object.Location
+                                        pLoc = BukkitUtil.getLocation(entity.getLocation());
+                                    PlotArea area = pLoc.getPlotArea();
+                                    if (area != null) {
+                                        PlotId currentPlotId = PlotId.of(area.getPlotAbs(pLoc));
+                                        if (currentPlotId != null) {
+                                            entity.setMetadata("plot", new FixedMetadataValue(
+                                                (Plugin) PlotSquared.get().IMP, currentPlotId));
                                         }
-                                        Plot origin = (Plot) meta.get(0).value();
-                                        if (!plot.equals(origin.getBasePlot(false))) {
+                                    }
+                                }
+                            }
+                            continue;
+                        case LLAMA:
+                        case DONKEY:
+                        case MULE:
+                        case ZOMBIE_HORSE:
+                        case SKELETON_HORSE:
+                        case HUSK:
+                        case ELDER_GUARDIAN:
+                        case WITHER_SKELETON:
+                        case STRAY:
+                        case ZOMBIE_VILLAGER:
+                        case EVOKER:
+                        case EVOKER_FANGS:
+                        case VEX:
+                        case VINDICATOR:
+                        case POLAR_BEAR:
+                        case BAT:
+                        case BLAZE:
+                        case CAVE_SPIDER:
+                        case CHICKEN:
+                        case COW:
+                        case CREEPER:
+                        case ENDERMAN:
+                        case ENDERMITE:
+                        case ENDER_DRAGON:
+                        case GHAST:
+                        case GIANT:
+                        case GUARDIAN:
+                        case HORSE:
+                        case IRON_GOLEM:
+                        case MAGMA_CUBE:
+                        case MUSHROOM_COW:
+                        case OCELOT:
+                        case PIG:
+                        case PIG_ZOMBIE:
+                        case RABBIT:
+                        case SHEEP:
+                        case SILVERFISH:
+                        case SKELETON:
+                        case SLIME:
+                        case SNOWMAN:
+                        case SPIDER:
+                        case SQUID:
+                        case VILLAGER:
+                        case WITCH:
+                        case WITHER:
+                        case WOLF:
+                        case ZOMBIE:
+                        case PARROT:
+                        case SALMON:
+                        case DOLPHIN:
+                        case TROPICAL_FISH:
+                        case DROWNED:
+                        case COD:
+                        case TURTLE:
+                        case PUFFERFISH:
+                        case PHANTOM:
+                        case ILLUSIONER:
+                        default: {
+                            if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
+                                Location location = entity.getLocation();
+                                if (BukkitUtil.getLocation(location).isPlotRoad()) {
+                                    if (entity instanceof LivingEntity) {
+                                        LivingEntity livingEntity = (LivingEntity) entity;
+                                        if (!livingEntity.isLeashed() || !entity
+                                            .hasMetadata("keep")) {
+                                            Entity passenger = entity.getPassenger();
+                                            if (!(passenger instanceof Player) && entity
+                                                .getMetadata("keep").isEmpty()) {
+                                                if (entity.hasMetadata("ps-tmp-teleport")) {
+                                                    continue;
+                                                }
+                                                iterator.remove();
+                                                entity.remove();
+                                                continue;
+                                            }
+                                        }
+                                    } else {
+                                        Entity passenger = entity.getPassenger();
+                                        if (!(passenger instanceof Player) && entity
+                                            .getMetadata("keep").isEmpty()) {
                                             if (entity.hasMetadata("ps-tmp-teleport")) {
                                                 continue;
                                             }
                                             iterator.remove();
                                             entity.remove();
+                                            continue;
                                         }
                                     }
-                                    continue;
-                                case SMALL_FIREBALL:
-                                case FIREBALL:
-                                case DRAGON_FIREBALL:
-                                case DROPPED_ITEM:
-                                    if (Settings.Enabled_Components.KILL_ROAD_ITEMS && plotArea
-                                        .getOwnedPlotAbs(
-                                            BukkitUtil.getLocation(entity.getLocation())) == null) {
-                                        entity.remove();
-                                    }
-                                    // dropped item
-                                    continue;
-                                case PRIMED_TNT:
-                                case FALLING_BLOCK:
-                                    // managed elsewhere
-                                    continue;
-                                case SHULKER:
-                                    if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
-                                        LivingEntity livingEntity = (LivingEntity) entity;
-                                        List<MetadataValue> meta = entity.getMetadata("plot");
-                                        if (meta != null && !meta.isEmpty()) {
-                                            if (livingEntity.isLeashed())
-                                                continue;
-                                            List<MetadataValue> keep = entity.getMetadata("keep");
-                                            if (keep != null && !keep.isEmpty())
-                                                continue;
-
-                                            PlotId originalPlotId = (PlotId) meta.get(0).value();
-                                            if (originalPlotId != null) {
-                                                com.github.intellectualsites.plotsquared.plot.object.Location
-                                                    pLoc =
-                                                    BukkitUtil.getLocation(entity.getLocation());
-                                                PlotArea area = pLoc.getPlotArea();
-                                                if (area != null) {
-                                                    PlotId currentPlotId =
-                                                        PlotId.of(area.getPlotAbs(pLoc));
-                                                    if (!originalPlotId.equals(currentPlotId) && (
-                                                        currentPlotId == null || !area
-                                                            .getPlot(originalPlotId)
-                                                            .equals(area.getPlot(currentPlotId)))) {
-                                                        if (entity.hasMetadata("ps-tmp-teleport")) {
-                                                            continue;
-                                                        }
-                                                        iterator.remove();
-                                                        entity.remove();
-                                                    }
-                                                }
-                                            }
-                                        } else {
-                                            //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java)
-                                            com.github.intellectualsites.plotsquared.plot.object.Location
-                                                pLoc = BukkitUtil.getLocation(entity.getLocation());
-                                            PlotArea area = pLoc.getPlotArea();
-                                            if (area != null) {
-                                                PlotId currentPlotId =
-                                                    PlotId.of(area.getPlotAbs(pLoc));
-                                                if (currentPlotId != null) {
-                                                    entity.setMetadata("plot",
-                                                        new FixedMetadataValue(
-                                                            (Plugin) PlotSquared.get().IMP,
-                                                            currentPlotId));
-                                                }
-                                            }
-                                        }
-                                    }
-                                    continue;
-                                case LLAMA:
-                                case DONKEY:
-                                case MULE:
-                                case ZOMBIE_HORSE:
-                                case SKELETON_HORSE:
-                                case HUSK:
-                                case ELDER_GUARDIAN:
-                                case WITHER_SKELETON:
-                                case STRAY:
-                                case ZOMBIE_VILLAGER:
-                                case EVOKER:
-                                case EVOKER_FANGS:
-                                case VEX:
-                                case VINDICATOR:
-                                case POLAR_BEAR:
-                                case BAT:
-                                case BLAZE:
-                                case CAVE_SPIDER:
-                                case CHICKEN:
-                                case COW:
-                                case CREEPER:
-                                case ENDERMAN:
-                                case ENDERMITE:
-                                case ENDER_DRAGON:
-                                case GHAST:
-                                case GIANT:
-                                case GUARDIAN:
-                                case HORSE:
-                                case IRON_GOLEM:
-                                case MAGMA_CUBE:
-                                case MUSHROOM_COW:
-                                case OCELOT:
-                                case PIG:
-                                case PIG_ZOMBIE:
-                                case RABBIT:
-                                case SHEEP:
-                                case SILVERFISH:
-                                case SKELETON:
-                                case SLIME:
-                                case SNOWMAN:
-                                case SPIDER:
-                                case SQUID:
-                                case VILLAGER:
-                                case WITCH:
-                                case WITHER:
-                                case WOLF:
-                                case ZOMBIE:
-                                default: {
-                                    if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
-                                        Location location = entity.getLocation();
-                                        if (BukkitUtil.getLocation(location).isPlotRoad()) {
-                                            if (entity instanceof LivingEntity) {
-                                                LivingEntity livingEntity = (LivingEntity) entity;
-                                                if (!livingEntity.isLeashed() || !entity
-                                                    .hasMetadata("keep")) {
-                                                    Entity passenger = entity.getPassenger();
-                                                    if (!(passenger instanceof Player) && entity
-                                                        .getMetadata("keep").isEmpty()) {
-                                                        if (entity.hasMetadata("ps-tmp-teleport")) {
-                                                            continue;
-                                                        }
-                                                        iterator.remove();
-                                                        entity.remove();
-                                                        continue;
-                                                    }
-                                                }
-                                            } else {
-                                                Entity passenger = entity.getPassenger();
-                                                if (!(passenger instanceof Player) && entity
-                                                    .getMetadata("keep").isEmpty()) {
-                                                    if (entity.hasMetadata("ps-tmp-teleport")) {
-                                                        continue;
-                                                    }
-                                                    iterator.remove();
-                                                    entity.remove();
-                                                    continue;
-                                                }
-                                            }
-                                        }
-                                    }
-                                    continue;
                                 }
                             }
+                            continue;
                         }
-                    } catch (Throwable e) {
-                        e.printStackTrace();
                     }
                 }
-            }), 20);
+            } catch (Throwable e) {
+                e.printStackTrace();
+            }
+        }), 20);
     }
 
     @Override @Nullable
@@ -701,7 +706,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         }
         System.setProperty("bstats.relocatecheck",
             "false"); // We do not want to relocate the package...
-        new org.bstats.bukkit.Metrics(this); // bstats
+        Metrics metrics = new Metrics(this);// bstats
         PlotSquared.log(C.PREFIX + "&6Metrics enabled.");
         this.metricsStarted = true;
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index 6be860b32..affb0461e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -128,7 +128,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
                         result.setBiome(x, z, biome.name());
                     }
 
-                    @Override public Biome getBiome(int arg0, int arg1) {
+                    @Override public Biome getBiome(int x, int z) {
                         return Biome.FOREST;
                     }
                 };
@@ -142,7 +142,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
                 }
                 /* TODO: Redo this
                 // Populator spillage
-                short[][] tmp = cg.generateExtBlockSections(w, r, cx, cz, grid);
+                short[][] tmp = cg.generateExtBlockSections(w, r, cx, cz, biomeGrid);
                 if (tmp != null) {
                     for (int i = 0; i < tmp.length; i++) {
                         short[] section = tmp[i];
@@ -235,30 +235,30 @@ public class BukkitPlotGenerator extends ChunkGenerator
     }
 
     @Override
-    public ChunkData generateChunkData(World world, Random random, int cx, int cz, BiomeGrid grid) {
+    public ChunkData generateChunkData(World world, Random random, int x, int z, BiomeGrid biome) {
         GenChunk result = this.chunkSetter;
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getCd() != null) {
-                for (int x = 0; x < 16; x++) {
-                    for (int z = 0; z < 16; z++) {
-                        grid.setBiome(x, z, Biome.PLAINS);
+                for (int cx = 0; cx < 16; cx++) {
+                    for (int cz = 0; cz < 16; cz++) {
+                        biome.setBiome(cx, cz, Biome.PLAINS);
                     }
                 }
                 return result.getCd();
             }
         }
         // Set the chunk location
-        result.setChunk(new ChunkWrapper(world.getName(), cx, cz));
+        result.setChunk(new ChunkWrapper(world.getName(), x, z));
         // Set the result data
         result.setCd(createChunkData(world));
-        result.grid = grid;
+        result.biomeGrid = biome;
         result.result = null;
 
         // Catch any exceptions (as exceptions usually thrown)
         try {
             // Fill the result data if necessary
             if (this.platformGenerator != this) {
-                return this.platformGenerator.generateChunkData(world, random, cx, cz, grid);
+                return this.platformGenerator.generateChunkData(world, random, x, z, biome);
             } else {
                 generate(world, result);
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index 6c1eab0c7..dfcf03a9a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -16,7 +16,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
     private final int hash;
     private final EntityBaseStats base = new EntityBaseStats();
 
-    public ItemStack[] inventory;
+    private ItemStack[] inventory;
     // Extended
     private ItemStack stack;
     private byte dataByte;
@@ -94,6 +94,8 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case DRAGON_FIREBALL:
             case LINGERING_POTION:
             case AREA_EFFECT_CLOUD:
+            case TRIDENT:
+            case LLAMA_SPIT:
                 // Do this stuff later
                 return;
             // MISC //
@@ -132,13 +134,21 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // START AGEABLE //
             // START TAMEABLE //
             case HORSE:
-                Horse horse = (Horse) entity;
+            case DONKEY:
+            case LLAMA:
+            case MULE:
+            case SKELETON_HORSE:
+                AbstractHorse horse = (AbstractHorse) entity;
                 this.horse = new HorseStats();
                 this.horse.jump = horse.getJumpStrength();
-                this.horse.chest = horse.isCarryingChest();
-                this.horse.variant = horse.getVariant();
-                this.horse.style = horse.getStyle();
-                this.horse.color = horse.getColor();
+                if (horse instanceof ChestedHorse) {
+                    ChestedHorse horse1 = (ChestedHorse) horse;
+                    this.horse.chest = horse1.isCarryingChest();
+                }
+                //todo these horse feeatures need fixing
+                //this.horse.variant = horse.getVariant();
+                //this.horse.style = horse.getStyle();
+                //this.horse.color = horse.getColor();
                 storeTameable(horse);
                 storeAgeable(horse);
                 storeLiving(horse);
@@ -164,6 +174,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case COW:
             case MUSHROOM_COW:
             case PIG:
+            case TURTLE:
             case POLAR_BEAR:
                 storeAgeable((Ageable) entity);
                 storeLiving((LivingEntity) entity);
@@ -174,16 +185,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeLiving((LivingEntity) entity);
                 return;
             // END AGEABLE //
-            //todo this needs to be fixed
-            case GUARDIAN:
-            case ELDER_GUARDIAN:
-                storeLiving((LivingEntity) entity);
-                return;
-            //todo this needs to be fixed
-            case SKELETON:
-            case WITHER_SKELETON:
-                storeLiving((LivingEntity) entity);
-                return;
             case ARMOR_STAND:
                 ArmorStand stand = (ArmorStand) entity;
                 this.inventory =
@@ -249,6 +250,10 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 EnderDragon entity1 = (EnderDragon) entity;
                 this.dataByte = (byte) entity1.getPhase().ordinal();
                 return;
+            case SKELETON:
+            case WITHER_SKELETON:
+            case GUARDIAN:
+            case ELDER_GUARDIAN:
             case GHAST:
             case MAGMA_CUBE:
             case SQUID:
@@ -487,6 +492,8 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case DRAGON_FIREBALL:
             case WITHER_SKULL:
             case MINECART_FURNACE:
+            case LLAMA_SPIT:
+            case TRIDENT:
             case UNKNOWN:
                 // Do this stuff later
                 return entity;
@@ -510,14 +517,20 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // START LIVING ENTITY //
             // START AGEABLE //
             // START TAMEABLE //
-            //todo this needs to be fixed
             case HORSE:
-                Horse horse = (Horse) entity;
+            case LLAMA:
+            case SKELETON_HORSE:
+            case DONKEY:
+            case MULE:
+                AbstractHorse horse = (AbstractHorse) entity;
                 horse.setJumpStrength(this.horse.jump);
-                horse.setCarryingChest(this.horse.chest);
-                horse.setVariant(this.horse.variant);
-                horse.setStyle(this.horse.style);
-                horse.setColor(this.horse.color);
+                if (horse instanceof ChestedHorse) {
+                    ((ChestedHorse) horse).setCarryingChest(this.horse.chest);
+                }
+                //todo broken as of 1.13
+                //horse.setVariant(this.horse.variant);
+                //horse.setStyle(this.horse.style);
+                //horse.setColor(this.horse.color);
                 restoreTameable(horse);
                 restoreAgeable(horse);
                 restoreLiving(horse);
@@ -545,6 +558,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case VILLAGER:
             case CHICKEN:
             case COW:
+            case TURTLE:
             case POLAR_BEAR:
             case MUSHROOM_COW:
             case PIG:
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
index ffc69edfc..6a9017cf8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
@@ -154,7 +154,7 @@ public class NbtFactory {
      * @return The decoded NBT compound.
      * @throws IOException If anything went wrong.
      */
-    public static NbtCompound fromStream(InputStream input, StreamOptions option)
+    @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed", "resource"}) public static NbtCompound fromStream(InputStream input, StreamOptions option)
         throws IOException {
         DataInputStream data = null;
         boolean suppress = true;
@@ -189,24 +189,11 @@ public class NbtFactory {
      */
     public static void saveStream(NbtCompound source, ByteSink stream, StreamOptions option)
         throws IOException {
-        OutputStream output = null;
-        DataOutputStream data = null;
-        boolean suppress = true;
-
-        try {
-            output = stream.openStream();
-            data = new DataOutputStream(
-                option == StreamOptions.GZIP_COMPRESSION ? new GZIPOutputStream(output) : output);
 
+        try (OutputStream output = stream.openStream();
+            DataOutputStream data = new DataOutputStream(
+                option == StreamOptions.GZIP_COMPRESSION ? new GZIPOutputStream(output) : output)) {
             invokeMethod(get().SAVE_COMPOUND, null, source.getHandle(), data);
-            suppress = false;
-
-        } finally {
-            if (data != null) {
-                Closeables.close(data, suppress);
-            } else if (output != null) {
-                Closeables.close(output, suppress);
-            }
         }
     }
 
@@ -540,9 +527,7 @@ public class NbtFactory {
      *
      * @author Kristian
      */
-    public enum StreamOptions {
-        NO_COMPRESSION, GZIP_COMPRESSION,
-    }
+    public enum StreamOptions {NO_COMPRESSION, GZIP_COMPRESSION,}
 
 
     private enum NbtType {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
index b905c2d5b..90a42db9b 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
@@ -23,7 +23,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
 
     public final Biome[] biomes;
     public PlotBlock[][] result;
-    public BiomeGrid grid;
+    public BiomeGrid biomeGrid;
     public Chunk chunk;
     public String world;
     public int cx;
@@ -57,13 +57,13 @@ public class GenChunk extends ScopedLocalBlockQueue {
     }
 
     @Override public void fillBiome(String biomeName) {
-        if (grid == null) {
+        if (biomeGrid == null) {
             return;
         }
         Biome biome = Biome.valueOf(biomeName.toUpperCase());
         for (int x = 0; x < 16; x++) {
             for (int z = 0; z < 16; z++) {
-                this.grid.setBiome(x, z, biome);
+                this.biomeGrid.setBiome(x, z, biome);
             }
         }
     }
@@ -96,8 +96,8 @@ public class GenChunk extends ScopedLocalBlockQueue {
     }
 
     public boolean setBiome(int x, int z, Biome biome) {
-        if (this.grid != null) {
-            this.grid.setBiome(x, z, biome);
+        if (this.biomeGrid != null) {
+            this.biomeGrid.setBiome(x, z, biome);
             return true;
         }
         return false;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
index 442668ee1..a56c65901 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java
@@ -15,13 +15,13 @@ import java.util.stream.Collectors;
 public abstract class FileConfiguration extends MemoryConfiguration {
 
     /**
-     * Creates an empty {@link FileConfiguration} with no default values.
+     * Creates an empty FileConfiguration with no default values.
      */
     FileConfiguration() {
     }
 
     /**
-     * Creates an empty {@link FileConfiguration} using the specified {@link
+     * Creates an empty FileConfiguration using the specified {@link
      * Configuration} as a source for all default values.
      *
      * @param defaults Default value provider
@@ -31,7 +31,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     }
 
     /**
-     * Saves this {@link FileConfiguration} to the specified location.
+     * Saves this FileConfiguration to the specified location.
      *
      * <p>If the file does not exist, it will be created. If already exists, it
      * will be overwritten. If it cannot be overwritten or created, an
@@ -59,14 +59,14 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     }
 
     /**
-     * Saves this {@link FileConfiguration} to a string, and returns it.
+     * Saves this FileConfiguration to a string, and returns it.
      *
      * @return String containing this configuration.
      */
     public abstract String saveToString();
 
     /**
-     * Loads this {@link FileConfiguration} from the specified location.
+     * Loads this FileConfiguration from the specified location.
      *
      * <p>All the values contained within this configuration will be removed,
      * leaving only settings and defaults, and the new values will be loaded
@@ -85,13 +85,13 @@ public abstract class FileConfiguration extends MemoryConfiguration {
      */
     public void load(File file) throws IOException, InvalidConfigurationException {
 
-        FileInputStream stream = new FileInputStream(file);
-
-        load(new InputStreamReader(stream, StandardCharsets.UTF_8));
+        try (FileInputStream stream = new FileInputStream(file)) {
+            load(new InputStreamReader(stream, StandardCharsets.UTF_8));
+        }
     }
 
     /**
-     * Loads this {@link FileConfiguration} from the specified reader.
+     * Loads this FileConfiguration from the specified reader.
      *
      * <p>All the values contained within this configuration will be removed,
      * leaving only settings and defaults, and the new values will be loaded
@@ -117,7 +117,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     }
 
     /**
-     * Loads this {@link FileConfiguration} from the specified string, as
+     * Loads this FileConfiguration from the specified string, as
      * opposed to from file.
      *
      * <p>All the values contained within this configuration will be removed,
@@ -133,7 +133,7 @@ public abstract class FileConfiguration extends MemoryConfiguration {
     public abstract void loadFromString(String contents) throws InvalidConfigurationException;
 
     /**
-     * Compiles the header for this {@link FileConfiguration} and returns the
+     * Compiles the header for this FileConfiguration and returns the
      * result.
      *
      * <p>This will use the header from {@link #options()} -> {@link
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 44ba326c8..87f8f209d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -41,6 +41,7 @@ import java.nio.file.Files;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
@@ -1817,6 +1818,12 @@ import java.util.zip.ZipInputStream;
         return Double.parseDouble(System.getProperty("java.specification.version"));
     }
 
+    public void forEachPlotArea(Consumer<? super PlotArea> action) {
+        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
+            action.accept(area);
+        }
+    }
+
     public void foreachPlotArea(@Nonnull final RunnableVal<PlotArea> runnable) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
             runnable.run(area);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index b3e4c88af..53b74d402 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1513,6 +1513,7 @@ public class Plot {
         return WorldUtil.IMP.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
     }
 
+    //TODO Better documentation needed.
     /**
      * Return the top location for the plot.
      *
@@ -1525,7 +1526,6 @@ public class Plot {
     }
 
     //TODO Better documentation needed.
-
     /**
      * Return the bottom location for the plot.
      */
@@ -1573,7 +1573,7 @@ public class Plot {
     }
 
     /**
-     * Move the settings for a plot.
+     * Moves the settings for a plot.
      *
      * @param plot     the plot to move
      * @param whenDone
@@ -1710,7 +1710,7 @@ public class Plot {
     }
 
     /**
-     * Move the plot to an empty location<br>
+     * Moves the plot to an empty location<br>
      * - The location must be empty
      *
      * @param destination Where to move the plot
@@ -2616,6 +2616,7 @@ public class Plot {
     }
 
     /**
+     *
      * Do the plot entry tasks for each player in the plot<br>
      * - Usually called when the plot state changes (unclaimed/claimed/flag change etc)
      */
@@ -2735,12 +2736,9 @@ public class Plot {
     }
 
     /**
-     * Expand the world border to include the provided plot (if applicable).
+     * Expands the world border to include this plot if it is beyond the current border.
      */
     public void updateWorldBorder() {
-        if (this.owner == null) {
-            return;
-        }
         int border = this.area.getBorder();
         if (border == Integer.MAX_VALUE) {
             return;
@@ -2811,7 +2809,7 @@ public class Plot {
     }
 
     /**
-     * Move a plot physically, as well as the corresponding settings.
+     * Moves a plot physically, as well as the corresponding settings.
      *
      * @param destination Plot moved to
      * @param whenDone    task when done
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index d2767e90d..3e41d1cb5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -655,7 +655,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
         }
     }
 
-    public interface PlotPlayerConverter<BaseObject> {
+    @FunctionalInterface public interface PlotPlayerConverter<BaseObject> {
         PlotPlayer convert(BaseObject object);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
index df20b3300..b67b16b58 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java
@@ -39,9 +39,9 @@ public class Schematic {
     }
 
     public void save(File file) throws IOException {
-        SpongeSchematicWriter ssw =
-            new SpongeSchematicWriter(new NBTOutputStream(new FileOutputStream(file)));
-        ssw.write(clipboard);
-        ssw.close();
+        try (SpongeSchematicWriter ssw = new SpongeSchematicWriter(
+            new NBTOutputStream(new FileOutputStream(file)))) {
+            ssw.write(clipboard);
+        }
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index 6957e858a..38869c2ee 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -87,7 +87,7 @@ public abstract class SchematicHandler {
                                 } else {
                                     MainUtil.sendMessage(null, "&7 - &a  success: " + plot.getId());
                                 }
-                                TaskManager.runTask(THIS::run);
+                                TaskManager.runTask(THIS);
                             });
                         }
                     }
@@ -104,7 +104,6 @@ public abstract class SchematicHandler {
      * @param plot      plot to paste in
      * @param xOffset   offset x to paste it from plot origin
      * @param zOffset   offset z to paste it from plot origin
-     * @return boolean true if succeeded
      */
     public void paste(final Schematic schematic, final Plot plot, final int xOffset,
         final int yOffset, final int zOffset, final boolean autoHeight,
@@ -126,7 +125,7 @@ public abstract class SchematicHandler {
                     if (!flags.isEmpty()) {
                         for (Map.Entry<String, Tag> entry : flags.entrySet()) {
                             plot.setFlag(Flags.getFlag(entry.getKey()),
-                                StringTag.class.cast(entry.getValue()).getValue());
+                                ((StringTag) entry.getValue()).getValue());
                         }
 
                     }
@@ -341,20 +340,17 @@ public abstract class SchematicHandler {
     }
 
     public List<String> getSaves(UUID uuid) {
-        StringBuilder rawJSON = new StringBuilder();
+        String rawJSON = "";
         try {
             String website = Settings.Web.URL + "list.php?" + uuid.toString();
             URL url = new URL(website);
             URLConnection connection = new URL(url.toString()).openConnection();
             connection.setRequestProperty("User-Agent", "Mozilla/5.0");
-            BufferedReader reader =
-                new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                rawJSON.append(line);
+            try (BufferedReader reader = new BufferedReader(
+                new InputStreamReader(connection.getInputStream()))) {
+                rawJSON = reader.lines().collect(Collectors.joining());
             }
-            reader.close();
-            JSONArray array = new JSONArray(rawJSON.toString());
+            JSONArray array = new JSONArray(rawJSON);
             List<String> schematics = new ArrayList<>();
             for (int i = 0; i < array.length(); i++) {
                 String schematic = array.getString(i);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
index bb376f431..2e05542aa 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
@@ -78,13 +78,14 @@ public abstract class WorldUtil {
                             map.put("SpawnX", new IntTag(home.getX()));
                             map.put("SpawnY", new IntTag(home.getY()));
                             map.put("SpawnZ", new IntTag(home.getZ()));
-                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                            try (NBTOutputStream out = new NBTOutputStream(
-                                new GZIPOutputStream(baos, true))) {
-                                //TODO Find what this should be called
-                                out.writeNamedTag("Schematic????", tag);
+                            try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+                                try (NBTOutputStream out = new NBTOutputStream(
+                                    new GZIPOutputStream(baos, true))) {
+                                    //TODO Find what this should be called
+                                    out.writeNamedTag("Schematic????", tag);
+                                }
+                                zos.write(baos.toByteArray());
                             }
-                            zos.write(baos.toByteArray());
                         }
                     }
                     setSpawn(spawn);

From 2e22dfe0562100cfafb5dba4be179448d4c8c0c0 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sat, 16 Feb 2019 22:06:31 +0000
Subject: [PATCH 046/210] Update offset to match CI

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b4aabdbf5..388b6406d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2045;  // Offset to match CI
+    index = -2044;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From b7aeeb151d0f70a3b24777f1e8e6329204dbcac5 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 19 Feb 2019 18:39:43 -0500
Subject: [PATCH 047/210] Replace RunnableVal with java Consumer

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/commands/Argument.java        |   8 +-
 .../plotsquared/plot/PlotSquared.java         | 116 +++++++-----------
 .../plotsquared/plot/commands/Buy.java        |  36 +++---
 .../plotsquared/plot/commands/Owner.java      |   4 +-
 .../plotsquared/plot/commands/Reload.java     |  86 +++++++------
 .../plotsquared/plot/commands/Trust.java      |  22 ++--
 .../plotsquared/plot/flag/Flags.java          |  60 ++++-----
 .../plotsquared/plot/object/Plot.java         |   4 +-
 .../plotsquared/plot/object/PlotArea.java     |  17 ++-
 .../plotsquared/plot/object/PlotPlayer.java   |  32 ++---
 .../plotsquared/plot/util/ArrayUtil.java      |   4 +-
 .../plotsquared/plot/util/UUIDHandler.java    |  19 +--
 12 files changed, 174 insertions(+), 234 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
index dd5221a3a..bcd2932af 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
@@ -2,6 +2,8 @@ package com.github.intellectualsites.plotsquared.commands;
 
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
 
+import java.util.stream.Stream;
+
 public abstract class Argument<T> {
 
     public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
@@ -17,11 +19,9 @@ public abstract class Argument<T> {
     public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
         @Override public Boolean parse(String in) {
             Boolean value = null;
-            if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in
-                .equalsIgnoreCase("1")) {
+            if (Stream.of("true", "Yes", "1").anyMatch(in::equalsIgnoreCase)) {
                 value = true;
-            } else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in
-                .equalsIgnoreCase("0")) {
+            } else if (Stream.of("false", "No", "0").anyMatch(in::equalsIgnoreCase)) {
                 value = false;
             }
             return value;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 87f8f209d..f465b1987 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -30,7 +30,6 @@ import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.io.*;
 import java.net.MalformedURLException;
@@ -342,12 +341,10 @@ import java.util.zip.ZipInputStream;
             debug("Starting UUID caching");
             UUIDHandler.startCaching(() -> {
                 UUIDHandler.add(new StringWrapper("*"), DBFunc.EVERYONE);
-                foreachPlotRaw(new RunnableVal<Plot>() {
-                    @Override public void run(Plot plot) {
-                        if (plot.hasOwner() && plot.temp != -1) {
-                            if (UUIDHandler.getName(plot.owner) == null) {
-                                UUIDHandler.implementation.unknown.add(plot.owner);
-                            }
+                forEachPlotRaw(plot -> {
+                    if (plot.hasOwner() && plot.temp != -1) {
+                        if (UUIDHandler.getName(plot.owner) == null) {
+                            UUIDHandler.implementation.unknown.add(plot.owner);
                         }
                     }
                 });
@@ -516,14 +513,12 @@ import java.util.zip.ZipInputStream;
     public Set<Plot> getBasePlots() {
         int size = getPlotCount();
         final Set<Plot> result = new HashSet<>(size);
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (Plot plot : value.getPlots()) {
-                    if (!plot.isBasePlot()) {
-                        continue;
-                    }
-                    result.add(plot);
+        forEachPlotArea(value -> {
+            for (Plot plot : value.getPlots()) {
+                if (!plot.isBasePlot()) {
+                    continue;
                 }
+                result.add(plot);
             }
         });
         return Collections.unmodifiableSet(result);
@@ -784,23 +779,21 @@ import java.util.zip.ZipInputStream;
      */
     public Set<Plot> getPlots(final PlotFilter... filters) {
         final HashSet<Plot> set = new HashSet<>();
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
+        forEachPlotArea(value -> {
+            for (PlotFilter filter : filters) {
+                if (!filter.allowsArea(value)) {
+                    return;
+                }
+            }
+            loop:
+            for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
+                Plot plot = entry2.getValue();
                 for (PlotFilter filter : filters) {
-                    if (!filter.allowsArea(value)) {
-                        return;
+                    if (!filter.allowsPlot(plot)) {
+                        continue loop;
                     }
                 }
-                loop:
-                for (Entry<PlotId, Plot> entry2 : value.getPlotEntries()) {
-                    Plot plot = entry2.getValue();
-                    for (PlotFilter filter : filters) {
-                        if (!filter.allowsPlot(plot)) {
-                            continue loop;
-                        }
-                    }
-                    set.add(plot);
-                }
+                set.add(plot);
             }
         });
         return set;
@@ -814,11 +807,7 @@ import java.util.zip.ZipInputStream;
     public Set<Plot> getPlots() {
         int size = getPlotCount();
         final Set<Plot> result = new HashSet<>(size);
-        foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                result.addAll(value.getPlots());
-            }
-        });
+        forEachPlotArea(value -> result.addAll(value.getPlots()));
         return result;
     }
 
@@ -935,11 +924,7 @@ import java.util.zip.ZipInputStream;
 
     public Collection<Plot> getPlots(String world) {
         final Set<Plot> set = new HashSet<>();
-        foreachPlotArea(world, new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                set.addAll(value.getPlots());
-            }
-        });
+        forEachPlotArea(world, value -> set.addAll(value.getPlots()));
         return set;
     }
 
@@ -973,11 +958,9 @@ import java.util.zip.ZipInputStream;
      */
     public Set<Plot> getPlots(final UUID uuid) {
         final Set<Plot> plots = new HashSet<>();
-        foreachPlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwnerAbs(uuid)) {
-                    plots.add(value);
-                }
+        forEachPlot(value -> {
+            if (value.isOwnerAbs(uuid)) {
+                plots.add(value);
             }
         });
         return Collections.unmodifiableSet(plots);
@@ -990,11 +973,9 @@ import java.util.zip.ZipInputStream;
 
     public Set<Plot> getBasePlots(final UUID uuid) {
         final Set<Plot> plots = new HashSet<>();
-        foreachBasePlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwner(uuid)) {
-                    plots.add(value);
-                }
+        forEachBasePlot(value -> {
+            if (value.isOwner(uuid)) {
+                plots.add(value);
             }
         });
         return Collections.unmodifiableSet(plots);
@@ -1008,11 +989,9 @@ import java.util.zip.ZipInputStream;
      */
     public Set<Plot> getPlotsAbs(final UUID uuid) {
         final Set<Plot> plots = new HashSet<>();
-        foreachPlot(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (value.isOwnerAbs(uuid)) {
-                    plots.add(value);
-                }
+        forEachPlot(value -> {
+            if (value.isOwnerAbs(uuid)) {
+                plots.add(value);
             }
         });
         return Collections.unmodifiableSet(plots);
@@ -1538,11 +1517,7 @@ import java.util.zip.ZipInputStream;
             // Validate that all data in the db is correct
             final HashSet<Plot> plots = new HashSet<>();
             try {
-                foreachPlotRaw(new RunnableVal<Plot>() {
-                    @Override public void run(Plot value) {
-                        plots.add(value);
-                    }
-                });
+                forEachPlotRaw(plots::add);
             } catch (final Exception ignored) {
             }
             DBFunc.validatePlots(plots);
@@ -1824,43 +1799,36 @@ import java.util.zip.ZipInputStream;
         }
     }
 
-    public void foreachPlotArea(@Nonnull final RunnableVal<PlotArea> runnable) {
-        for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            runnable.run(area);
-        }
-    }
-
-    public void foreachPlotArea(@NonNull final String world,
-        @NonNull final RunnableVal<PlotArea> runnable) {
+    public void forEachPlotArea(@NonNull final String world, Consumer<PlotArea> runnable) {
         final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
         if (array == null) {
             return;
         }
         for (final PlotArea area : array) {
-            runnable.run(area);
+            runnable.accept(area);
         }
     }
 
-    public void foreachPlot(@NonNull final RunnableVal<Plot> runnable) {
+    public void forEachPlot(Consumer<Plot> runnable) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable::run);
+            area.getPlots().forEach(runnable);
         }
     }
 
-    public void foreachPlotRaw(@NonNull final RunnableVal<Plot> runnable) {
+    public void forEachPlotRaw(Consumer<Plot> runnable) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable::run);
+            area.getPlots().forEach(runnable);
         }
         if (this.plots_tmp != null) {
             for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
-                entry.values().forEach(runnable::run);
+                entry.values().forEach(runnable);
             }
         }
     }
 
-    public void foreachBasePlot(@NonNull final RunnableVal<Plot> run) {
+    public void forEachBasePlot(Consumer<Plot> run) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.foreachBasePlot(run);
+            area.forEachBasePlot(run);
         }
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
index 25f9484b1..8ba07d900 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
@@ -46,27 +46,23 @@ import java.util.Set;
         final double price = flag.get();
         checkTrue(player.getMoney() >= price, C.CANNOT_AFFORD_PLOT);
         player.withdraw(price);
-        confirm.run(this, new Runnable() {
-            @Override // Success
-            public void run() {
-                C.REMOVED_BALANCE.send(player, price);
-                EconHandler.manager
-                    .depositMoney(UUIDHandler.getUUIDWrapper().getOfflinePlayer(plot.owner), price);
-                PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
-                if (owner != null) {
-                    C.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
-                }
-                plot.removeFlag(Flags.PRICE);
-                plot.setOwner(player.getUUID());
-                C.CLAIMED.send(player);
-                whenDone.run(Buy.this, CommandResult.SUCCESS);
-            }
-        }, new Runnable() {
-            @Override // Failure
-            public void run() {
-                player.deposit(price);
-                whenDone.run(Buy.this, CommandResult.FAILURE);
+        // Failure
+        // Success
+        confirm.run(this, () -> {
+            C.REMOVED_BALANCE.send(player, price);
+            EconHandler.manager
+                .depositMoney(UUIDHandler.getUUIDWrapper().getOfflinePlayer(plot.owner), price);
+            PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
+            if (owner != null) {
+                C.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
             }
+            plot.removeFlag(Flags.PRICE);
+            plot.setOwner(player.getUUID());
+            C.CLAIMED.send(player);
+            whenDone.run(Buy.this, CommandResult.SUCCESS);
+        }, () -> {
+            player.deposit(price);
+            whenDone.run(Buy.this, CommandResult.FAILURE);
         });
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
index 4095c15c9..2ef7ece5b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
@@ -9,6 +9,7 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Stream;
 
 @CommandDeclaration(command = "setowner", permission = "plots.set.owner",
     description = "Set the plot owner", usage = "/plot setowner <player>",
@@ -31,8 +32,7 @@ import java.util.UUID;
             name = name == null ? value : name;
         }
         if (uuid == null || value.equalsIgnoreCase("-")) {
-            if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
-                .equalsIgnoreCase("-")) {
+            if (Stream.of("none", "null", "-").anyMatch(value::equalsIgnoreCase)) {
                 if (!Permissions
                     .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
                     return false;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
index 71ee2e840..bee93e15d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
@@ -6,9 +6,7 @@ import com.github.intellectualsites.plotsquared.configuration.MemorySection;
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.C;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 
 import java.io.IOException;
@@ -24,53 +22,51 @@ import java.util.Objects;
             // loaded during startup unfortunately.
             PlotSquared.get().setupConfigs();
             C.load(PlotSquared.get().translationFile);
-            PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-                @Override public void run(PlotArea area) {
-                    ConfigurationSection worldSection = PlotSquared.get().worlds
-                        .getConfigurationSection("worlds." + area.worldname);
-                    if (worldSection == null) {
-                        return;
+            PlotSquared.get().forEachPlotArea(area -> {
+                ConfigurationSection worldSection =
+                    PlotSquared.get().worlds.getConfigurationSection("worlds." + area.worldname);
+                if (worldSection == null) {
+                    return;
+                }
+                if (area.TYPE != 2 || !worldSection.contains("areas")) {
+                    area.saveConfiguration(worldSection);
+                    area.loadDefaultConfiguration(worldSection);
+                } else {
+                    ConfigurationSection areaSection = worldSection.getConfigurationSection(
+                        "areas." + area.id + "-" + area.getMin() + "-" + area.getMax());
+                    YamlConfiguration clone = new YamlConfiguration();
+                    for (String key : areaSection.getKeys(true)) {
+                        if (areaSection.get(key) instanceof MemorySection) {
+                            continue;
+                        }
+                        if (!clone.contains(key)) {
+                            clone.set(key, areaSection.get(key));
+                        }
                     }
-                    if (area.TYPE != 2 || !worldSection.contains("areas")) {
-                        area.saveConfiguration(worldSection);
-                        area.loadDefaultConfiguration(worldSection);
-                    } else {
-                        ConfigurationSection areaSection = worldSection.getConfigurationSection(
-                            "areas." + area.id + "-" + area.getMin() + "-" + area.getMax());
-                        YamlConfiguration clone = new YamlConfiguration();
-                        for (String key : areaSection.getKeys(true)) {
-                            if (areaSection.get(key) instanceof MemorySection) {
-                                continue;
-                            }
-                            if (!clone.contains(key)) {
-                                clone.set(key, areaSection.get(key));
-                            }
+                    for (String key : worldSection.getKeys(true)) {
+                        if (worldSection.get(key) instanceof MemorySection) {
+                            continue;
                         }
-                        for (String key : worldSection.getKeys(true)) {
-                            if (worldSection.get(key) instanceof MemorySection) {
-                                continue;
-                            }
-                            if (!key.startsWith("areas") && !clone.contains(key)) {
-                                clone.set(key, worldSection.get(key));
-                            }
+                        if (!key.startsWith("areas") && !clone.contains(key)) {
+                            clone.set(key, worldSection.get(key));
                         }
-                        area.saveConfiguration(clone);
-                        // netSections is the combination of
-                        for (String key : clone.getKeys(true)) {
-                            if (clone.get(key) instanceof MemorySection) {
-                                continue;
-                            }
-                            if (!worldSection.contains(key)) {
-                                worldSection.set(key, clone.get(key));
-                            } else {
-                                Object value = worldSection.get(key);
-                                if (Objects.equals(value, clone.get(key))) {
-                                    areaSection.set(key, clone.get(key));
-                                }
-                            }
-                        }
-                        area.loadDefaultConfiguration(clone);
                     }
+                    area.saveConfiguration(clone);
+                    // netSections is the combination of
+                    for (String key : clone.getKeys(true)) {
+                        if (clone.get(key) instanceof MemorySection) {
+                            continue;
+                        }
+                        if (!worldSection.contains(key)) {
+                            worldSection.set(key, clone.get(key));
+                        } else {
+                            Object value = worldSection.get(key);
+                            if (Objects.equals(value, clone.get(key))) {
+                                areaSection.set(key, clone.get(key));
+                            }
+                        }
+                    }
+                    area.loadDefaultConfiguration(clone);
                 }
             });
             PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
index 6e6f0c5ab..c8c7ef77b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
@@ -61,21 +61,19 @@ import java.util.UUID;
         checkTrue(!uuids.isEmpty(), null);
         checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
             .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
-        confirm.run(this, new Runnable() {
-            @Override // Success
-            public void run() {
-                for (UUID uuid : uuids) {
-                    if (uuid != DBFunc.EVERYONE) {
-                        if (!plot.removeMember(uuid)) {
-                            if (plot.getDenied().contains(uuid)) {
-                                plot.removeDenied(uuid);
-                            }
+        // Success
+        confirm.run(this, () -> {
+            for (UUID uuid : uuids) {
+                if (uuid != DBFunc.EVERYONE) {
+                    if (!plot.removeMember(uuid)) {
+                        if (plot.getDenied().contains(uuid)) {
+                            plot.removeDenied(uuid);
                         }
                     }
-                    plot.addTrusted(uuid);
-                    EventUtil.manager.callTrusted(player, plot, uuid, true);
-                    MainUtil.sendMessage(player, C.TRUSTED_ADDED);
                 }
+                plot.addTrusted(uuid);
+                EventUtil.manager.callTrusted(player, plot, uuid, true);
+                MainUtil.sendMessage(player, C.TRUSTED_ADDED);
             }
         }, null);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
index 6b86a890a..7c57b2dc1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
@@ -1,9 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.flag;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
@@ -163,42 +160,37 @@ public final class Flags {
     public static void registerFlag(final Flag<?> flag) {
         final Flag<?> duplicate = flags.put(flag.getName(), flag);
         if (duplicate != null) {
-            PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-                @Override public void run(PlotArea value) {
-                    Object remove;
-                    if (value.DEFAULT_FLAGS.containsKey(duplicate)) {
-                        remove = value.DEFAULT_FLAGS.remove(duplicate);
-                        try {
-                            if (remove instanceof Collection
-                                && remove.getClass().getMethod("toString").getDeclaringClass()
-                                == Object.class) {
-                                value.DEFAULT_FLAGS.put(flag,
-                                    flag.parseValue(StringMan.join((Collection) remove, ',')));
-                            } else {
-                                value.DEFAULT_FLAGS.put(flag, flag.parseValue("" + remove));
-                            }
-                        } catch (NoSuchMethodException neverHappens) {
-                            neverHappens.printStackTrace();
+            PlotSquared.get().forEachPlotArea(value -> {
+                if (value.DEFAULT_FLAGS.containsKey(duplicate)) {
+                    Object remove = value.DEFAULT_FLAGS.remove(duplicate);
+                    try {
+                        if (remove instanceof Collection
+                            && remove.getClass().getMethod("toString").getDeclaringClass()
+                            == Object.class) {
+                            value.DEFAULT_FLAGS.put(flag,
+                                flag.parseValue(StringMan.join((Collection) remove, ',')));
+                        } else {
+                            value.DEFAULT_FLAGS.put(flag, flag.parseValue("" + remove));
                         }
+                    } catch (NoSuchMethodException neverHappens) {
+                        neverHappens.printStackTrace();
                     }
                 }
             });
-            PlotSquared.get().foreachPlotRaw(new RunnableVal<Plot>() {
-                @Override public void run(Plot value) {
-                    if (value.getFlags().containsKey(duplicate)) {
-                        Object remove = value.getFlags().remove(duplicate);
-                        try {
-                            if (remove instanceof Collection
-                                && remove.getClass().getMethod("toString").getDeclaringClass()
-                                == Object.class) {
-                                value.getFlags().put(flag,
-                                    flag.parseValue(StringMan.join((Collection) remove, ',')));
-                            } else {
-                                value.getFlags().put(flag, flag.parseValue("" + remove));
-                            }
-                        } catch (NoSuchMethodException neverHappens) {
-                            neverHappens.printStackTrace();
+            PlotSquared.get().forEachPlotRaw(value -> {
+                if (value.getFlags().containsKey(duplicate)) {
+                    Object remove = value.getFlags().remove(duplicate);
+                    try {
+                        if (remove instanceof Collection
+                            && remove.getClass().getMethod("toString").getDeclaringClass()
+                            == Object.class) {
+                            value.getFlags().put(flag,
+                                flag.parseValue(StringMan.join((Collection) remove, ',')));
+                        } else {
+                            value.getFlags().put(flag, flag.parseValue("" + remove));
                         }
+                    } catch (NoSuchMethodException neverHappens) {
+                        neverHappens.printStackTrace();
                     }
                 }
             });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 53b74d402..23f561233 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -32,6 +32,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * The plot class<br>
@@ -509,8 +510,7 @@ public class Plot {
      * @return is the plot merged or not
      */
     public boolean isMerged() {
-        return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
-            .getMerged(1) || getSettings().getMerged(3);
+        return IntStream.of(0, 2, 1, 3).anyMatch(i -> getSettings().getMerged(i));
     }
 
     /**
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 7d0c84255..bcfdfb967 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -22,6 +22,7 @@ import javax.annotation.Nullable;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
 
 /**
  * @author Jesse Boyd, Alexander Söderberg
@@ -516,11 +517,9 @@ public abstract class PlotArea {
             return Collections.emptySet();
         }
         final HashSet<Plot> myPlots = new HashSet<>();
-        foreachPlotAbs(new RunnableVal<Plot>() {
-            @Override public void run(Plot value) {
-                if (uuid.equals(value.owner)) {
-                    myPlots.add(value);
-                }
+        forEachPlotAbs(value -> {
+            if (uuid.equals(value.owner)) {
+                myPlots.add(value);
             }
         });
         return myPlots;
@@ -664,16 +663,16 @@ public abstract class PlotArea {
         return myPlots;
     }
 
-    private void foreachPlotAbs(@Nonnull final RunnableVal<Plot> run) {
+    private void forEachPlotAbs(Consumer<Plot> run) {
         for (final Entry<PlotId, Plot> entry : this.plots.entrySet()) {
-            run.run(entry.getValue());
+            run.accept(entry.getValue());
         }
     }
 
-    public void foreachBasePlot(@Nonnull final RunnableVal<Plot> run) {
+    public void forEachBasePlot(Consumer<Plot> run) {
         for (final Plot plot : getPlots()) {
             if (plot.isBasePlot()) {
-                run.run(plot);
+                run.accept(plot);
             }
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index 3e41d1cb5..c0d9ec726 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -202,17 +202,15 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
         }
         final AtomicInteger count = new AtomicInteger(0);
         final UUID uuid = getUUID();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
-                    for (Plot plot : value.getPlotsAbs(uuid)) {
-                        if (!plot.hasFlag(Flags.DONE)) {
-                            count.incrementAndGet();
-                        }
+        PlotSquared.get().forEachPlotArea(value -> {
+            if (!Settings.Done.COUNTS_TOWARDS_LIMIT) {
+                for (Plot plot : value.getPlotsAbs(uuid)) {
+                    if (!plot.hasFlag(Flags.DONE)) {
+                        count.incrementAndGet();
                     }
-                } else {
-                    count.addAndGet(value.getPlotsAbs(uuid).size());
                 }
+            } else {
+                count.addAndGet(value.getPlotsAbs(uuid).size());
             }
         });
         return count.get();
@@ -223,12 +221,10 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
             return getClusterCount(getLocation().getWorld());
         }
         final AtomicInteger count = new AtomicInteger(0);
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                for (PlotCluster cluster : value.getClusters()) {
-                    if (cluster.isOwner(getUUID())) {
-                        count.incrementAndGet();
-                    }
+        PlotSquared.get().forEachPlotArea(value -> {
+            for (PlotCluster cluster : value.getClusters()) {
+                if (cluster.isOwner(getUUID())) {
+                    count.incrementAndGet();
                 }
             }
         });
@@ -519,11 +515,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      */
     public int getPlayerClusterCount() {
         final AtomicInteger count = new AtomicInteger();
-        PlotSquared.get().foreachPlotArea(new RunnableVal<PlotArea>() {
-            @Override public void run(PlotArea value) {
-                count.addAndGet(value.getClusters().size());
-            }
-        });
+        PlotSquared.get().forEachPlotArea(value -> count.addAndGet(value.getClusters().size()));
         return count.get();
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
index 6052c2a93..e902faffd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
@@ -5,9 +5,7 @@ import java.util.Arrays;
 public class ArrayUtil {
     public static final <T> T[] concatAll(T[] first, T[]... rest) {
         int totalLength = first.length;
-        for (T[] array : rest) {
-            totalLength += array.length;
-        }
+        totalLength += Arrays.stream(rest).mapToInt(array -> array.length).sum();
         T[] result = Arrays.copyOf(first, totalLength);
         int offset = first.length;
         for (T[] array : rest) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
index aafba9da9..c2aebe971 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
@@ -1,7 +1,10 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.google.common.collect.BiMap;
 
@@ -52,14 +55,12 @@ public class UUIDHandler {
 
     public static HashSet<UUID> getAllUUIDS() {
         final HashSet<UUID> uuids = new HashSet<>();
-        PlotSquared.get().foreachPlotRaw(new RunnableVal<Plot>() {
-            @Override public void run(Plot plot) {
-                if (plot.hasOwner()) {
-                    uuids.add(plot.owner);
-                    uuids.addAll(plot.getTrusted());
-                    uuids.addAll(plot.getMembers());
-                    uuids.addAll(plot.getDenied());
-                }
+        PlotSquared.get().forEachPlotRaw(plot -> {
+            if (plot.hasOwner()) {
+                uuids.add(plot.owner);
+                uuids.addAll(plot.getTrusted());
+                uuids.addAll(plot.getMembers());
+                uuids.addAll(plot.getDenied());
             }
         });
         return uuids;

From df47697ca63e362fc27f71814d71a96ecc909884 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 19 Feb 2019 19:00:37 -0500
Subject: [PATCH 048/210] CLeaning of code

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/object/BukkitPlayer.java           |  3 ++-
 .../plotsquared/plot/database/AbstractDB.java |  3 ++-
 .../plotsquared/plot/database/SQLManager.java |  3 ++-
 .../plot/object/ConsolePlayer.java            |  3 ++-
 .../plotsquared/plot/object/Plot.java         | 21 +++++++++++++------
 .../plotsquared/plot/object/PlotPlayer.java   |  3 ++-
 .../plotsquared/plot/util/UUIDHandler.java    |  6 ++----
 .../plot/database/AbstractDBTest.java         |  5 +++--
 8 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 60c1351d0..888de164a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -19,6 +19,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.RegisteredListener;
 
+import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
@@ -53,7 +54,7 @@ public class BukkitPlayer extends PlotPlayer {
         return location == null ? BukkitUtil.getLocation(this.player) : location;
     }
 
-    @Override public UUID getUUID() {
+    @Nonnull @Override public UUID getUUID() {
         if (this.uuid == null) {
             this.uuid = UUIDHandler.getUUID(this);
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
index ae4a1fa76..0eecd6539 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -4,6 +4,7 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 
+import javax.annotation.Nonnull;
 import java.util.*;
 
 public interface AbstractDB {
@@ -300,7 +301,7 @@ public interface AbstractDB {
      *
      * @param plot The Plot to get comments from
      */
-    void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone);
+    void getComments(@Nonnull Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone);
 
     void createPlotAndSettings(Plot plot, Runnable whenDone);
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 2995a448d..876a29121 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -13,6 +13,7 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.google.common.base.Charsets;
 
+import javax.annotation.Nonnull;
 import java.sql.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -2168,7 +2169,7 @@ import java.util.concurrent.atomic.AtomicInteger;
         });
     }
 
-    @Override public void getComments(final Plot plot, final String inbox,
+    @Override public void getComments(@Nonnull Plot plot, final String inbox,
         final RunnableVal<List<PlotComment>> whenDone) {
         addPlotTask(plot, new UniqueStatement("getComments_" + plot) {
             @Override public void set(PreparedStatement statement) throws SQLException {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
index 18a0ce7bc..6f386b3cb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
@@ -6,6 +6,7 @@ import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
 import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
 
+import javax.annotation.Nonnull;
 import java.util.UUID;
 
 public class ConsolePlayer extends PlotPlayer {
@@ -45,7 +46,7 @@ public class ConsolePlayer extends PlotPlayer {
         return getLocation();
     }
 
-    @Override public UUID getUUID() {
+    @Nonnull @Override public UUID getUUID() {
         return DBFunc.EVERYONE;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 23f561233..fd76d9c87 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -21,6 +21,7 @@ import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableSet;
 import com.sk89q.jnbt.CompoundTag;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.awt.geom.Area;
 import java.awt.geom.PathIterator;
@@ -322,7 +323,7 @@ public class Plot {
      * @param uuid the player uuid
      * @return if the provided uuid is the owner of the plot
      */
-    public boolean isOwner(UUID uuid) {
+    public boolean isOwner(@Nonnull UUID uuid) {
         if (uuid.equals(this.owner)) {
             return true;
         }
@@ -339,6 +340,9 @@ public class Plot {
 
     /**
      * Gets a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
+     * <p>
+     * This method cannot be used to add or remove owners from a plot.
+     * </p>
      *
      * @return the plot owners
      */
@@ -752,8 +756,9 @@ public class Plot {
     public boolean setOwner(UUID owner, PlotPlayer initiator) {
         boolean result = EventUtil.manager
             .callOwnerChange(initiator, this, owner, hasOwner() ? this.owner : null, hasOwner());
-        if (!result)
+        if (!result) {
             return false;
+        }
         if (!hasOwner()) {
             this.owner = owner;
             create();
@@ -948,8 +953,9 @@ public class Plot {
      * @param name name
      */
     public void setSign(final String name) {
-        if (!isLoaded())
+        if (!isLoaded()) {
             return;
+        }
         if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
             TaskManager.runTask(() -> Plot.this.setSign(name));
             return;
@@ -1165,8 +1171,9 @@ public class Plot {
         Location bot = corners[1];
         Location loc = new Location(this.getWorldName(), MathMan.average(bot.getX(), top.getX()),
             MathMan.average(bot.getY(), top.getY()), MathMan.average(bot.getZ(), top.getZ()));
-        if (!isLoaded())
+        if (!isLoaded()) {
             return loc;
+        }
         int y =
             isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
         if (area.ALLOW_SIGNS) {
@@ -1201,8 +1208,9 @@ public class Plot {
             Location bot = this.getBottomAbs();
             Location loc = new Location(bot.getWorld(), bot.getX() + home.x, bot.getY() + home.y,
                 bot.getZ() + home.z, home.yaw, home.pitch);
-            if (!isLoaded())
+            if (!isLoaded()) {
                 return loc;
+            }
             if (!WorldUtil.IMP.getBlock(loc).isAir()) {
                 loc.setY(Math.max(
                     1 + WorldUtil.IMP.getHighestBlock(this.getWorldName(), loc.getX(), loc.getZ()),
@@ -1514,6 +1522,7 @@ public class Plot {
     }
 
     //TODO Better documentation needed.
+
     /**
      * Return the top location for the plot.
      *
@@ -1526,6 +1535,7 @@ public class Plot {
     }
 
     //TODO Better documentation needed.
+
     /**
      * Return the bottom location for the plot.
      */
@@ -2616,7 +2626,6 @@ public class Plot {
     }
 
     /**
-     *
      * Do the plot entry tasks for each player in the plot<br>
      * - Usually called when the plot state changes (unclaimed/claimed/flag change etc)
      */
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index c0d9ec726..b3df60558 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -14,6 +14,7 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 import lombok.NonNull;
 
+import javax.annotation.Nonnull;
 import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -326,7 +327,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      *
      * @return UUID
      */
-    @Override public abstract UUID getUUID();
+    @Override @Nonnull public abstract UUID getUUID();
 
     public boolean canTeleport(Location loc) {
         Location current = getLocationFull();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
index c2aebe971..6696edbd5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
@@ -8,6 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.google.common.collect.BiMap;
 
+import javax.annotation.Nonnull;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -82,10 +83,7 @@ public class UUIDHandler {
         implementation.add(toAdd);
     }
 
-    public static UUID getUUID(PlotPlayer player) {
-        if (implementation == null) {
-            return null;
-        }
+    @Nonnull public static UUID getUUID(PlotPlayer player) {
         return implementation.getUUID(player);
     }
 
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
index 1ef04abba..1ef5c92ec 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDBTest.java
@@ -4,6 +4,7 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 
+import javax.annotation.Nonnull;
 import java.util.*;
 
 public class AbstractDBTest implements AbstractDB {
@@ -148,8 +149,8 @@ public class AbstractDBTest implements AbstractDB {
     @Override public void setComment(Plot plot, PlotComment comment) {
     }
 
-    @Override
-    public void getComments(Plot plot, String inbox, RunnableVal<List<PlotComment>> whenDone) {
+    @Override public void getComments(@Nonnull Plot plot, String inbox,
+        RunnableVal<List<PlotComment>> whenDone) {
     }
 
     @Override public void createPlotAndSettings(Plot plot, Runnable whenDone) {

From 099a807ce01b17b74be489a9a3ddc8fcf5022d5f Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 19 Feb 2019 22:29:27 -0500
Subject: [PATCH 049/210] CLeaning of code

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/plot/object/Plot.java         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 53b74d402..7399f8fea 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -307,7 +307,7 @@ public class Plot {
     }
 
     /**
-     * Check if the plot has an owner.
+     * Checks if the plot has an owner.
      *
      * @return false if there is no owner
      */
@@ -316,7 +316,7 @@ public class Plot {
     }
 
     /**
-     * Check if a UUID is a plot owner (merged plots may have multiple owners)
+     * Checks if a UUID is a plot owner (merged plots may have multiple owners)
      *
      * @param uuid the player uuid
      * @return if the provided uuid is the owner of the plot
@@ -364,7 +364,7 @@ public class Plot {
     }
 
     /**
-     * Check if the player is either the owner or on the trusted/added list.
+     * Checks if the player is either the owner or on the trusted/added list.
      *
      * @param uuid uuid to check
      * @return true if the player is added/trusted or is the owner
@@ -389,7 +389,7 @@ public class Plot {
     }
 
     /**
-     * Should the player be denied from entering.
+     * Checks if the player is not permitted on this plot.
      *
      * @param uuid uuid to check
      * @return boolean false if the player is allowed to enter
@@ -419,9 +419,11 @@ public class Plot {
     }
 
     /**
-     * Assign this plot to a plot area.<br>
+     * Assigns this plot to a plot area.<br>
      * (Mostly used during startup when worlds are being created)<br>
-     * Note: Using this when it doesn't make sense will result in strange behavior
+     * <p>
+     * Do not use this unless you absolutely know what you are doing.
+     * </p>
      *
      * @param area area to assign to
      */
@@ -504,9 +506,9 @@ public class Plot {
     }
 
     /**
-     * Check if the plot is merged in any direction.
+     * Checks if this plot is merged in any direction.
      *
-     * @return is the plot merged or not
+     * @return true if this plot is merged, otherwise false
      */
     public boolean isMerged() {
         return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
@@ -678,7 +680,7 @@ public class Plot {
     }
 
     /**
-     * Deny someone (updates database as well)
+     * Denies a player from this plot. (updates database as well)
      *
      * @param uuid the uuid of the player to deny.
      */

From c5d9412c6c7a9b9e9569787d492e0539c1b17f2d Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 19 Feb 2019 22:57:35 -0500
Subject: [PATCH 050/210] Cleaning and API Addition Begins the process of
 removing "magic values" for directions in the plugin.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/plot/object/Direction.java    | 26 +++++++++
 .../plotsquared/plot/object/Plot.java         | 57 +++++++++----------
 2 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
new file mode 100644
index 000000000..0c7de4905
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
@@ -0,0 +1,26 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+public enum Direction {
+    NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, "west"), NORTHEAST(4,
+        "northeast"), SOUTHEAST(5, "southeast"), SOUTHWEST(6, "southwest"), NORTHWEST(7,
+        "northwest"),
+    ;
+
+
+    private int index;
+    private String name;
+
+    Direction(int index, String name) {
+
+        this.index = index;
+        this.name = name;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 6a7713e3c..15954f8a3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -546,23 +546,24 @@ public class Plot {
      * 6 = south-west<br>
      * 7 = north-west<br>
      * ----------<br>
+     * //todo these artificial values are way too confusing.
      * Note: A plot that is merged north and east will not be merged northeast if the northeast plot is not part of the same group<br>
      *
-     * @param direction direction to check for merged plot
+     * @param dir direction to check for merged plot
      * @return true if merged in that direction
      */
-    public boolean getMerged(int direction) {
+    public boolean getMerged(int dir) {
         if (this.settings == null) {
             return false;
         }
-        switch (direction) {
+        switch (dir) {
             case 0:
             case 1:
             case 2:
             case 3:
-                return this.getSettings().getMerged(direction);
+                return this.getSettings().getMerged(dir);
             case 7:
-                int i = direction - 4;
+                int i = dir - 4;
                 int i2 = 0;
                 if (this.getSettings().getMerged(i2)) {
                     if (this.getSettings().getMerged(i)) {
@@ -577,8 +578,8 @@ public class Plot {
             case 4:
             case 5:
             case 6:
-                i = direction - 4;
-                i2 = direction - 3;
+                i = dir - 4;
+                i2 = dir - 3;
                 return this.getSettings().getMerged(i2) && this.getSettings().getMerged(i)
                     && this.area.getPlotAbs(this.id.getRelative(i)).getMerged(i2) && this.area
                     .getPlotAbs(this.id.getRelative(i2)).getMerged(i);
@@ -954,7 +955,7 @@ public class Plot {
      *
      * @param name name
      */
-    public void setSign(final String name) {
+    public void setSign(@Nonnull String name) {
         if (!isLoaded()) {
             return;
         }
@@ -962,10 +963,6 @@ public class Plot {
             TaskManager.runTask(() -> Plot.this.setSign(name));
             return;
         }
-        if (name == null) {
-            PlotSquared.log("Attempted to add null name to sign at plot: " + getId());
-            return;
-        }
         PlotManager manager = this.area.getPlotManager();
         if (this.area.ALLOW_SIGNS) {
             Location loc = manager.getSignLoc(this.area, this);
@@ -1393,7 +1390,12 @@ public class Plot {
             this.setSign("unknown");
             return;
         }
-        this.setSign(UUIDHandler.getName(this.owner));
+        String name = UUIDHandler.getName(this.owner);
+        if (name == null) {
+            this.setSign("unknown");
+        } else {
+            this.setSign(name);
+        }
     }
 
     /**
@@ -1471,10 +1473,7 @@ public class Plot {
      * @param notify notify
      * @return true if plot was created successfully
      */
-    public boolean create(final UUID uuid, final boolean notify) {
-        if (uuid == null) {
-            throw new IllegalArgumentException("UUID cannot be null");
-        }
+    public boolean create(@Nonnull UUID uuid, final boolean notify) {
         this.owner = uuid;
         Plot existing = this.area.getOwnedPlotAbs(this.id);
         if (existing != null) {
@@ -1526,9 +1525,7 @@ public class Plot {
     //TODO Better documentation needed.
 
     /**
-     * Return the top location for the plot.
-     *
-     * @return
+     * Returns the top location for the plot.
      */
     public Location getTopAbs() {
         Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
@@ -1539,7 +1536,7 @@ public class Plot {
     //TODO Better documentation needed.
 
     /**
-     * Return the bottom location for the plot.
+     * Returns the bottom location for the plot.
      */
     public Location getBottomAbs() {
         Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
@@ -1623,11 +1620,11 @@ public class Plot {
         if (!this.isMerged()) {
             return top;
         }
-        if (this.getMerged(2)) {
-            top.setZ(this.getRelative(2).getBottomAbs().getZ() - 1);
+        if (this.getMerged(Direction.SOUTH.getIndex())) {
+            top.setZ(this.getRelative(Direction.SOUTH.getIndex()).getBottomAbs().getZ() - 1);
         }
-        if (this.getMerged(1)) {
-            top.setX(this.getRelative(1).getBottomAbs().getX() - 1);
+        if (this.getMerged(Direction.EAST.getIndex())) {
+            top.setX(this.getRelative(Direction.SOUTH.getIndex()).getBottomAbs().getX() - 1);
         }
         return top;
     }
@@ -1644,11 +1641,11 @@ public class Plot {
         if (!this.isMerged()) {
             return bot;
         }
-        if (this.getMerged(0)) {
-            bot.setZ(this.getRelative(0).getTopAbs().getZ() + 1);
+        if (this.getMerged(Direction.NORTH.getIndex())) {
+            bot.setZ(this.getRelative(Direction.NORTH.getIndex()).getTopAbs().getZ() + 1);
         }
-        if (this.getMerged(3)) {
-            bot.setX(this.getRelative(3).getTopAbs().getX() + 1);
+        if (this.getMerged(Direction.WEST.getIndex())) {
+            bot.setX(this.getRelative(Direction.WEST.getIndex()).getTopAbs().getX() + 1);
         }
         return bot;
     }
@@ -1677,7 +1674,7 @@ public class Plot {
             if (this.area.TERRAIN == 3) {
                 return;
             }
-            Plot other = this.getRelative(1);
+            Plot other = this.getRelative(Direction.EAST.getIndex());
             Location bot = other.getBottomAbs();
             Location top = this.getTopAbs();
             Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());

From 0ef8b4ad1416234979c4e387d4a7d2db7ce4b064 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 20 Feb 2019 11:55:39 +0000
Subject: [PATCH 051/210] Update to WorldEdit's *breaking* Biome handling
 changes

---
 .../plotsquared/plot/listener/ProcessedWEExtent.java          | 4 ++--
 .../intellectualsites/plotsquared/plot/listener/WEExtent.java | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
index 431c2c378..d7ebf1c86 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
@@ -13,7 +13,7 @@ import com.sk89q.worldedit.extent.NullExtent;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -171,7 +171,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
         return null;
     }
 
-    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
+    @Override public boolean setBiome(BlockVector2 position, BiomeType biome) {
         return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
             .setBiome(position, biome);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
index ac0503886..073819fa3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
@@ -9,7 +9,7 @@ import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -42,7 +42,7 @@ public class WEExtent extends AbstractDelegateExtent {
         return null;
     }
 
-    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
+    @Override public boolean setBiome(BlockVector2 position, BiomeType biome) {
         return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
             .setBiome(position, biome);
     }

From 72b031e3e50f24286350f7f9156311aaeb65d062 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 20 Feb 2019 11:59:39 +0000
Subject: [PATCH 052/210] Update offset to match CI

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 388b6406d..699a14d3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2044;  // Offset to match CI
+    index = -2042;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 350e1512149032b2fe4dc634697fb42500475306 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 20 Feb 2019 14:50:49 +0000
Subject: [PATCH 053/210] Don't use streams as they're lower performance for
 our use cases. Some minor reformating too.

---
 .../plotsquared/bukkit/util/NbtFactory.java               | 7 +++++--
 .../intellectualsites/plotsquared/commands/Argument.java  | 8 ++++----
 .../plotsquared/plot/commands/Owner.java                  | 4 ++--
 .../plotsquared/plot/object/Direction.java                | 3 +--
 .../intellectualsites/plotsquared/plot/object/Plot.java   | 4 ++--
 .../plotsquared/plot/util/ArrayUtil.java                  | 4 +++-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
index 6a9017cf8..acf0f82fa 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/NbtFactory.java
@@ -154,7 +154,8 @@ public class NbtFactory {
      * @return The decoded NBT compound.
      * @throws IOException If anything went wrong.
      */
-    @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed", "resource"}) public static NbtCompound fromStream(InputStream input, StreamOptions option)
+    @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed", "resource"})
+    public static NbtCompound fromStream(InputStream input, StreamOptions option)
         throws IOException {
         DataInputStream data = null;
         boolean suppress = true;
@@ -527,7 +528,9 @@ public class NbtFactory {
      *
      * @author Kristian
      */
-    public enum StreamOptions {NO_COMPRESSION, GZIP_COMPRESSION,}
+    public enum StreamOptions {
+        NO_COMPRESSION, GZIP_COMPRESSION,
+    }
 
 
     private enum NbtType {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
index bcd2932af..dd5221a3a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java
@@ -2,8 +2,6 @@ package com.github.intellectualsites.plotsquared.commands;
 
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
 
-import java.util.stream.Stream;
-
 public abstract class Argument<T> {
 
     public static final Argument<Integer> Integer = new Argument<Integer>("int", 16) {
@@ -19,9 +17,11 @@ public abstract class Argument<T> {
     public static final Argument<Boolean> Boolean = new Argument<Boolean>("boolean", true) {
         @Override public Boolean parse(String in) {
             Boolean value = null;
-            if (Stream.of("true", "Yes", "1").anyMatch(in::equalsIgnoreCase)) {
+            if (in.equalsIgnoreCase("true") || in.equalsIgnoreCase("Yes") || in
+                .equalsIgnoreCase("1")) {
                 value = true;
-            } else if (Stream.of("false", "No", "0").anyMatch(in::equalsIgnoreCase)) {
+            } else if (in.equalsIgnoreCase("false") || in.equalsIgnoreCase("No") || in
+                .equalsIgnoreCase("0")) {
                 value = false;
             }
             return value;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
index 2ef7ece5b..4095c15c9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
@@ -9,7 +9,6 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 
 import java.util.Set;
 import java.util.UUID;
-import java.util.stream.Stream;
 
 @CommandDeclaration(command = "setowner", permission = "plots.set.owner",
     description = "Set the plot owner", usage = "/plot setowner <player>",
@@ -32,7 +31,8 @@ import java.util.stream.Stream;
             name = name == null ? value : name;
         }
         if (uuid == null || value.equalsIgnoreCase("-")) {
-            if (Stream.of("none", "null", "-").anyMatch(value::equalsIgnoreCase)) {
+            if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
+                .equalsIgnoreCase("-")) {
                 if (!Permissions
                     .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
                     return false;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
index 0c7de4905..9ce6e1621 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
@@ -3,8 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.object;
 public enum Direction {
     NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, "west"), NORTHEAST(4,
         "northeast"), SOUTHEAST(5, "southeast"), SOUTHWEST(6, "southwest"), NORTHWEST(7,
-        "northwest"),
-    ;
+        "northwest"),;
 
 
     private int index;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 15954f8a3..ce1798c3a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -33,7 +33,6 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
 
 /**
  * The plot class<br>
@@ -516,7 +515,8 @@ public class Plot {
      * @return true if this plot is merged, otherwise false
      */
     public boolean isMerged() {
-        return IntStream.of(0, 2, 1, 3).anyMatch(i -> getSettings().getMerged(i));
+        return getSettings().getMerged(0) || getSettings().getMerged(2) || getSettings()
+            .getMerged(1) || getSettings().getMerged(3);
     }
 
     /**
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
index e902faffd..6052c2a93 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ArrayUtil.java
@@ -5,7 +5,9 @@ import java.util.Arrays;
 public class ArrayUtil {
     public static final <T> T[] concatAll(T[] first, T[]... rest) {
         int totalLength = first.length;
-        totalLength += Arrays.stream(rest).mapToInt(array -> array.length).sum();
+        for (T[] array : rest) {
+            totalLength += array.length;
+        }
         T[] result = Arrays.copyOf(first, totalLength);
         int offset = first.length;
         for (T[] array : rest) {

From 2f18ef6828e028f6afe06857817eea18debcddb0 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 21 Feb 2019 21:14:48 -0500
Subject: [PATCH 054/210] Critical bug fixes, reformatting, and cleaning

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .github/auto-comment.yml                      |   2 +-
 .../bukkit/listeners/EntitySpawnListener.java |   3 +-
 .../bukkit/listeners/PlayerEvents.java        |  21 ++--
 .../bukkit/listeners/SingleWorldListener.java |  18 ++-
 .../bukkit/object/BukkitPlayer.java           |   6 +-
 .../entity/ReplicatingEntityWrapper.java      |   2 +-
 .../bukkit/titles/TitleManager_1_11.java      |  24 ++--
 .../bukkit/util/BukkitChunkManager.java       |   8 ++
 .../bukkit/util/BukkitHybridUtils.java        |   3 +-
 .../bukkit/util/BukkitLegacyMappings.java     |  10 +-
 .../plotsquared/bukkit/util/BukkitUtil.java   |  92 +++++++-------
 .../plotsquared/plot/PlotSquared.java         |   5 +-
 .../plotsquared/plot/commands/Area.java       | 119 ++++++++----------
 .../plotsquared/plot/commands/Auto.java       |   6 +-
 .../plotsquared/plot/commands/Toggle.java     |   2 +-
 .../plotsquared/plot/commands/Visit.java      |   3 +-
 .../plotsquared/plot/database/AbstractDB.java |   2 +-
 .../plotsquared/plot/database/SQLManager.java |   6 +-
 .../plot/generator/ClassicPlotManager.java    |  42 ++++---
 .../plot/generator/HybridPlotWorld.java       |  10 +-
 .../plot/generator/SquarePlotManager.java     |  18 +--
 .../plot/listener/ProcessedWEExtent.java      |  19 +--
 .../plotsquared/plot/listener/WEExtent.java   |  24 ++--
 .../plotsquared/plot/object/Plot.java         |   4 +
 .../plotsquared/plot/object/PlotArea.java     |   3 +-
 .../plotsquared/plot/object/PlotSettings.java |   8 --
 .../plot/object/worlds/SinglePlotArea.java    |   3 +-
 .../object/worlds/SinglePlotAreaManager.java  |  24 ++--
 .../plot/object/worlds/SinglePlotManager.java |   6 +-
 .../plotsquared/plot/util/ChunkManager.java   |   5 +-
 .../plotsquared/plot/util/CmdConfirm.java     |   3 +-
 .../plotsquared/plot/util/MathMan.java        |   3 +-
 .../plot/util/block/BasicLocalBlockQueue.java |   3 +-
 .../plot/util/expiry/ExpireManager.java       |   3 +-
 .../plot/util/expiry/ExpiryTask.java          |   3 +-
 35 files changed, 274 insertions(+), 239 deletions(-)

diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml
index 4aef8cae8..f7584d42e 100644
--- a/.github/auto-comment.yml
+++ b/.github/auto-comment.yml
@@ -2,7 +2,7 @@
 issueOpened: >
   Thank your for raising a issue. We will try and get back to you as soon as possible.
 
-  Please make sure that you followed the issue template, and provied all neccessary information.
+  Please make sure that you followed the issue template, and provided all neccessary information.
   Failure to do so will prevent us from resolving the issue in a timely manner. 
   
   Please note that suggestions are now to be submitted to https://git.io/fN5B4 rather than this issue tracker!
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index c256c17b8..0faf0c198 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -125,8 +125,9 @@ public class EntitySpawnListener implements Listener {
 
     @EventHandler public void onTeleport(EntityTeleportEvent event) {
         Entity ent = event.getEntity();
-        if (ent instanceof Vehicle || ent instanceof ArmorStand)
+        if (ent instanceof Vehicle || ent instanceof ArmorStand) {
             test(event.getEntity());
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 8d98ddb03..358605994 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -672,8 +672,9 @@ import java.util.regex.Pattern;
                 if (passenger instanceof Player) {
                     final Player player = (Player) passenger;
                     // reset
-                    if (moveTmp == null)
+                    if (moveTmp == null) {
                         moveTmp = new PlayerMoveEvent(null, from, to);
+                    }
                     moveTmp.setFrom(from);
                     moveTmp.setTo(to);
                     moveTmp.setCancelled(false);
@@ -859,8 +860,9 @@ import java.util.regex.Pattern;
     }
 
     @EventHandler(priority = EventPriority.LOW) public void onChat(AsyncPlayerChatEvent event) {
-        if (event.isCancelled())
+        if (event.isCancelled()) {
             return;
+        }
 
         PlotPlayer plotPlayer = BukkitUtil.getPlayer(event.getPlayer());
         Location location = plotPlayer.getLocation();
@@ -1077,8 +1079,9 @@ import java.util.regex.Pattern;
             PlotArea area = location.getPlotArea();
             if (area != null) {
                 Plot plot = area.getOwnedPlot(location);
-                if (plot != null && Flags.MOB_BREAK.isTrue(plot))
+                if (plot != null && Flags.MOB_BREAK.isTrue(plot)) {
                     return;
+                }
                 event.setCancelled(true);
             }
         }
@@ -1446,8 +1449,9 @@ import java.util.regex.Pattern;
         switch (type) {
             case WATER_BUCKET:
             case LAVA_BUCKET: {
-                if (event.getBlock().getType() == Material.DROPPER)
+                if (event.getBlock().getType() == Material.DROPPER) {
                     return;
+                }
                 BlockFace targetFace =
                     ((Directional) event.getBlock().getState().getData()).getFacing();
                 Location location =
@@ -1570,8 +1574,9 @@ import java.util.regex.Pattern;
             switch (newItem.getType()) {
                 case LEGACY_BANNER:
                 case PLAYER_HEAD:
-                    if (newMeta != null)
+                    if (newMeta != null) {
                         break;
+                    }
                 default:
                     return;
             }
@@ -1587,11 +1592,13 @@ import java.util.regex.Pattern;
             switch (stateType) {
                 case LEGACY_STANDING_BANNER:
                 case LEGACY_WALL_BANNER:
-                    if (itemType == Material.LEGACY_BANNER)
+                    if (itemType == Material.LEGACY_BANNER) {
                         break;
+                    }
                 case LEGACY_SKULL:
-                    if (itemType == Material.LEGACY_SKULL_ITEM)
+                    if (itemType == Material.LEGACY_SKULL_ITEM) {
                         break;
+                    }
                 default:
                     return;
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index 6a3e26d59..ed585483d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -42,14 +42,18 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
     public void markChunkAsClean(Chunk chunk) {
         try {
             Object nmsChunk = methodGetHandleChunk.invoke(chunk);
-            if (done != null)
+            if (done != null) {
                 this.done.set(nmsChunk, true);
-            if (mustSave != null)
+            }
+            if (mustSave != null) {
                 this.mustSave.set(nmsChunk, false);
-            if (lit != null)
+            }
+            if (lit != null) {
                 this.lit.set(nmsChunk, false);
-            if (s != null)
+            }
+            if (s != null) {
                 this.s.set(nmsChunk, false);
+            }
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -59,10 +63,12 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         World world = event.getWorld();
         String name = world.getName();
         PlotAreaManager man = PlotSquared.get().getPlotAreaManager();
-        if (!(man instanceof SinglePlotAreaManager))
+        if (!(man instanceof SinglePlotAreaManager)) {
             return;
-        if (!isPlotId(name))
+        }
+        if (!isPlotId(name)) {
             return;
+        }
 
         markChunkAsClean(event.getChunk());
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 888de164a..6de22d4a0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -126,10 +126,12 @@ public class BukkitPlayer extends PlotPlayer {
                     String end = perm.substring(stubPlus.length());
                     if (MathMan.isInteger(end)) {
                         int val = Integer.parseInt(end);
-                        if (val > range)
+                        if (val > range) {
                             return val;
-                        if (val > max)
+                        }
+                        if (val > max) {
                             max = val;
+                        }
                     }
                 }
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index dfcf03a9a..d59fabf1c 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -145,7 +145,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     ChestedHorse horse1 = (ChestedHorse) horse;
                     this.horse.chest = horse1.isCarryingChest();
                 }
-                //todo these horse feeatures need fixing
+                //todo these horse features need fixing
                 //this.horse.variant = horse.getVariant();
                 //this.horse.style = horse.getStyle();
                 //this.horse.color = horse.getColor();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
index 53a91363a..4832a1eac 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
@@ -109,8 +109,9 @@ public class TitleManager_1_11 {
     }
 
     private static boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
-        if (a.length != o.length)
+        if (a.length != o.length) {
             return false;
+        }
         return IntStream.range(0, a.length)
             .noneMatch(i -> !a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i]));
     }
@@ -202,8 +203,9 @@ public class TitleManager_1_11 {
                         Integer.TYPE).newInstance(actions[3], null, fadeInTime * (ticks ? 1 : 20),
                         stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
                 // Send if set
-                if (fadeInTime != -1 && fadeOutTime != -1 && stayTime != -1)
+                if (fadeInTime != -1 && fadeOutTime != -1 && stayTime != -1) {
                     sendPacket.invoke(connection, packet);
+                }
 
                 Object serialized;
                 if (!subtitle.equals("")) {
@@ -339,8 +341,9 @@ public class TitleManager_1_11 {
     private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
         int a = classes != null ? classes.length : 0;
         Class<?>[] types = new Class<?>[a];
-        for (int i = 0; i < a; i++)
+        for (int i = 0; i < a; i++) {
             types[i] = getPrimitiveType(classes[i]);
+        }
         return types;
     }
 
@@ -357,8 +360,9 @@ public class TitleManager_1_11 {
         Class<?>[] t = toPrimitiveTypeArray(paramTypes);
         for (Method m : clazz.getMethods()) {
             Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-            if (m.getName().equals(name) && equalsTypeArray(types, t))
+            if (m.getName().equals(name) && equalsTypeArray(types, t)) {
                 return m;
+            }
         }
         return null;
     }
@@ -403,24 +407,26 @@ public class TitleManager_1_11 {
     }
 
     private Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-        for (Method m : clazz.getMethods())
-            if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args,
-                m.getParameterTypes()))) {
+        for (Method m : clazz.getMethods()) {
+            if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args, m.getParameterTypes()))) {
                 m.setAccessible(true);
                 return m;
             }
+        }
         return null;
     }
 
     private boolean ClassListEqual(Class<?>[] l1, Class<?>[] l2) {
         boolean equal = true;
-        if (l1.length != l2.length)
+        if (l1.length != l2.length) {
             return false;
-        for (int i = 0; i < l1.length; i++)
+        }
+        for (int i = 0; i < l1.length; i++) {
             if (l1[i] != l2[i]) {
                 equal = false;
                 break;
             }
+        }
         return equal;
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 47ebce636..9063e13a5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -476,6 +476,7 @@ public class BukkitChunkManager extends ChunkManager {
             case SNOWBALL:
             case ENDER_PEARL:
             case ARROW:
+            case TRIDENT:
             case TIPPED_ARROW:
             case SHULKER_BULLET:
             case SPECTRAL_ARROW:
@@ -537,6 +538,13 @@ public class BukkitChunkManager extends ChunkManager {
             case SKELETON_HORSE:
             case ZOMBIE_HORSE:
             case MULE:
+            case DOLPHIN:
+            case TURTLE:
+            case COD:
+            case PARROT:
+            case SALMON:
+            case PUFFERFISH:
+            case TROPICAL_FISH:
                 // animal
                 count[3]++;
                 count[1]++;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index 3c2c75d2b..068bbd89b 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -70,8 +70,9 @@ public class BukkitHybridUtils extends HybridUtils {
 
             PlotArea area = PlotSquared.get().getPlotArea(world, null);
 
-            if (!(area instanceof HybridPlotWorld))
+            if (!(area instanceof HybridPlotWorld)) {
                 return;
+            }
 
             HybridPlotWorld hpw = (HybridPlotWorld) area;
             final BlockBucket[][] result = hpw.getBlockBucketChunk();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index bf75a93e5..abe7ab793 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -74,7 +74,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(19, 1, "sponge", "wet_sponge"), new LegacyBlock(20, "glass"),
             new LegacyBlock(21, "lapis_ore"), new LegacyBlock(22, "lapis_block"),
             new LegacyBlock(23, "dispenser"), new LegacyBlock(24, "sandstone"),
-            new LegacyBlock(24, 1, "sandstone", "chisled_sandstone"),
+            new LegacyBlock(24, 1, "sandstone", "chiseled_sandstone"),
             new LegacyBlock(24, 2, "sandstone", "cut_sandstone"), new LegacyBlock(25, "note_block"),
             new LegacyBlock(26, "bed_block"), new LegacyBlock(27, "powered_rail"),
             new LegacyBlock(28, "detector_rail"),
@@ -181,10 +181,10 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(95, 15, "stained_glass", "black_stained_glass"),
             new LegacyBlock(96, "trap_door", "oak_trapdoor"),
             new LegacyBlock(97, "monster_eggs", "infested_stone"),
-            new LegacyBlock(97, 1, "monster_eggs", "infested_coblestone"),
+            new LegacyBlock(97, 1, "monster_eggs", "infested_cobblestone"),
             new LegacyBlock(97, 2, "monster_eggs", "infested_stone_bricks"),
             new LegacyBlock(97, 3, "monster_eggs", "infested_mossy_stone_bricks"),
-            new LegacyBlock(97, 4, "monster_eggs", "infested_crcked_stone_bricks"),
+            new LegacyBlock(97, 4, "monster_eggs", "infested_cracked_stone_bricks"),
             new LegacyBlock(97, 5, "monster_eggs", "infested_chiseled_stone_bricks"),
             new LegacyBlock(98, "smooth_brick", "stone_bricks"),
             new LegacyBlock(98, 1, "smooth_brick", "mossy_stone_bricks"),
@@ -207,7 +207,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(100, 10, "huge_mushroom_2", "mushroom_stem"),
             new LegacyBlock(100, 14, "huge_mushroom_2"),
             new LegacyBlock(100, 15, "huge_mushroom_2"),
-            new LegacyBlock(101, "iron_fence", "ironbars"),
+            new LegacyBlock(101, "iron_fence", "iron_bars"),
             new LegacyBlock(102, "thin_glass", "glass_pane"), new LegacyBlock(103, "melon_block"),
             new LegacyBlock(104, "pumpkin_stem"), new LegacyBlock(105, "melon_stem"),
             new LegacyBlock(106, "vine"), new LegacyBlock(107, "fence_gate", "oak_fence_gate"),
@@ -540,7 +540,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(383, 5, "monster_egg", "wither_skeleton_spawn_egg"),
             new LegacyBlock(383, 6, "monster_egg", "stray_spawn_egg"),
             new LegacyBlock(383, 23, "monster_egg", "husk_spawn_egg"),
-            new LegacyBlock(383, 27, "monster_egg", "zombe_villager_spawn_egg"),
+            new LegacyBlock(383, 27, "monster_egg", "zombie_villager_spawn_egg"),
             new LegacyBlock(383, 28, "monster_egg", "skeleton_horse_spawn_egg"),
             new LegacyBlock(383, 29, "monster_egg", "zombie_horse_spawn_egg"),
             new LegacyBlock(383, 31, "monster_egg", "donkey_spawn_egg"),
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index e03969273..46dd6b6a8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -264,34 +264,28 @@ import java.util.*;
         return getWorld(world).getBiome(x, z).name();
     }
 
-    @Override @SuppressWarnings("deprecation")
-    public void setSign(@NonNull final String worldName, final int x, final int y, final int z,
-        @NonNull final String[] lines) {
-        final World world = getWorld(worldName);
-        final Block block = world.getBlockAt(x, y, z);
-        //        block.setType(Material.AIR);
-        final Material type = block.getType();
-        if (type != Material.SIGN && type != Material.WALL_SIGN) {
-            BlockFace facing = BlockFace.EAST;
-            if (world.getBlockAt(x, y, z + 1).getType().isSolid())
-                facing = BlockFace.NORTH;
-            else if (world.getBlockAt(x + 1, y, z).getType().isSolid())
-                facing = BlockFace.WEST;
-            else if (world.getBlockAt(x, y, z - 1).getType().isSolid())
-                facing = BlockFace.SOUTH;
-            block.setType(Material.WALL_SIGN, false);
-            final WallSign sign = (WallSign) block.getBlockData();
-            sign.setFacing(facing);
-            block.setBlockData(sign, false);
-        }
-        final BlockState blockstate = block.getState();
-        if (blockstate instanceof Sign) {
-            final Sign sign = (Sign) blockstate;
-            for (int i = 0; i < lines.length; i++) {
-                sign.setLine(i, lines[i]);
+    @Override public int getHighestBlock(@NonNull final String world, final int x, final int z) {
+        final World bukkitWorld = getWorld(world);
+        // Skip top and bottom block
+        int air = 1;
+        for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
+            Block block = bukkitWorld.getBlockAt(x, y, z);
+            if (block != null) {
+                Material type = block.getType();
+                if (type.isSolid()) {
+                    if (air > 1) {
+                        return y;
+                    }
+                    air = 0;
+                } else {
+                    if (block.isLiquid()) {
+                        return y;
+                    }
+                    air++;
+                }
             }
-            sign.update(true);
         }
+        return bukkitWorld.getMaxHeight() - 1;
     }
 
     @Override @Nullable public String[] getSign(@NonNull final Location location) {
@@ -330,27 +324,35 @@ import java.util.*;
         }
     }
 
-    @Override public int getHighestBlock(@NonNull final String world, final int x, final int z) {
-        final World bukkitWorld = getWorld(world);
-        // Skip top and bottom block
-        int air = 1;
-        for (int y = bukkitWorld.getMaxHeight() - 1; y >= 0; y--) {
-            Block block = bukkitWorld.getBlockAt(x, y, z);
-            if (block != null) {
-                Material type = block.getType();
-                if (type.isSolid()) {
-                    if (air > 1)
-                        return y;
-                    air = 0;
-                } else {
-                    if (block.isLiquid()) {
-                        return y;
-                    }
-                    air++;
-                }
+    @Override @SuppressWarnings("deprecation")
+    public void setSign(@NonNull final String worldName, final int x, final int y, final int z,
+        @NonNull final String[] lines) {
+        final World world = getWorld(worldName);
+        final Block block = world.getBlockAt(x, y, z);
+        //        block.setType(Material.AIR);
+        final Material type = block.getType();
+        if (type != Material.SIGN && type != Material.WALL_SIGN) {
+            BlockFace facing = BlockFace.EAST;
+            if (world.getBlockAt(x, y, z + 1).getType().isSolid()) {
+                facing = BlockFace.NORTH;
+            } else if (world.getBlockAt(x + 1, y, z).getType().isSolid()) {
+                facing = BlockFace.WEST;
+            } else if (world.getBlockAt(x, y, z - 1).getType().isSolid()) {
+                facing = BlockFace.SOUTH;
             }
+            block.setType(Material.WALL_SIGN, false);
+            final WallSign sign = (WallSign) block.getBlockData();
+            sign.setFacing(facing);
+            block.setBlockData(sign, false);
+        }
+        final BlockState blockstate = block.getState();
+        if (blockstate instanceof Sign) {
+            final Sign sign = (Sign) blockstate;
+            for (int i = 0; i < lines.length; i++) {
+                sign.setLine(i, lines[i]);
+            }
+            sign.update(true);
         }
-        return bukkitWorld.getMaxHeight() - 1;
     }
 
     @Override public int getBiomeFromString(@NonNull final String biomeString) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index f465b1987..b82192e96 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -49,7 +49,8 @@ import java.util.zip.ZipInputStream;
  * An implementation of the core, with a static getter for easy access.
  */
 @SuppressWarnings({"unused", "WeakerAccess"}) public class PlotSquared {
-    private static final Set<Plot> EMPTY_SET = Collections.unmodifiableSet(Collections.emptySet());
+    private static final Set<Plot> EMPTY_SET = Collections.
+        unmodifiableSet(Collections.emptySet());
     private static PlotSquared instance;
     // Implementation
     public final IPlotMain IMP;
@@ -1937,7 +1938,7 @@ import java.util.zip.ZipInputStream;
      *
      * @param alias     to search plots
      * @param worldname to filter alias to a specific world [optional] null means all worlds
-     * @return Set<{                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               @                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               link                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               Plot                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               }> empty if nothing found
+     * @return Set<{ @ link Plot }> empty if nothing found
      */
     public Set<Plot> getPlotsByAlias(@Nullable final String alias,
         @NonNull final String worldname) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
index 9dc5ce20e..0427b8926 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -15,11 +15,8 @@ import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Set;
 
-@CommandDeclaration(command = "area", permission = "plots.area",
-    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
-    description = "Create a new PlotArea", aliases = "world",
-    usage = "/plot area <create|info|list|tp|regen>", confirmation = true) public class Area
-    extends SubCommand {
+@CommandDeclaration(command = "area", permission = "plots.area", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE, description = "Create a new PlotArea", aliases = "world", usage = "/plot area <create|info|list|tp|regen>", confirmation = true)
+public class Area extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 0) {
@@ -104,36 +101,34 @@ import java.util.Set;
                                 final String path =
                                     "worlds." + area.worldname + ".areas." + area.id + '-'
                                         + object.min + '-' + object.max;
-                                Runnable run = new Runnable() {
-                                    @Override public void run() {
-                                        if (offsetX != 0) {
-                                            PlotSquared.get().worlds
-                                                .set(path + ".road.offset.x", offsetX);
-                                        }
-                                        if (offsetZ != 0) {
-                                            PlotSquared.get().worlds
-                                                .set(path + ".road.offset.z", offsetZ);
-                                        }
-                                        final String world = SetupUtils.manager.setupWorld(object);
-                                        if (WorldUtil.IMP.isWorld(world)) {
-                                            PlotSquared.get().loadWorld(world, null);
-                                            C.SETUP_FINISHED.send(player);
-                                            player.teleport(WorldUtil.IMP.getSpawn(world));
-                                            if (area.TERRAIN != 3) {
-                                                ChunkManager.largeRegionTask(world, region,
-                                                    new RunnableVal<ChunkLoc>() {
-                                                        @Override public void run(ChunkLoc value) {
-                                                            AugmentedUtils
-                                                                .generate(world, value.x, value.z,
-                                                                    null);
-                                                        }
-                                                    }, null);
-                                            }
-                                        } else {
-                                            MainUtil.sendMessage(player,
-                                                "An error occurred while creating the world: "
-                                                    + area.worldname);
+                                Runnable run = () -> {
+                                    if (offsetX != 0) {
+                                        PlotSquared.get().worlds
+                                            .set(path + ".road.offset.x", offsetX);
+                                    }
+                                    if (offsetZ != 0) {
+                                        PlotSquared.get().worlds
+                                            .set(path + ".road.offset.z", offsetZ);
+                                    }
+                                    final String world = SetupUtils.manager.setupWorld(object);
+                                    if (WorldUtil.IMP.isWorld(world)) {
+                                        PlotSquared.get().loadWorld(world, null);
+                                        C.SETUP_FINISHED.send(player);
+                                        player.teleport(WorldUtil.IMP.getSpawn(world));
+                                        if (area.TERRAIN != 3) {
+                                            ChunkManager.largeRegionTask(world, region,
+                                                new RunnableVal<ChunkLoc>() {
+                                                    @Override public void run(ChunkLoc value) {
+                                                        AugmentedUtils
+                                                            .generate(world, value.x, value.z,
+                                                                null);
+                                                    }
+                                                }, null);
                                         }
+                                    } else {
+                                        MainUtil.sendMessage(player,
+                                            "An error occurred while creating the world: "
+                                                + area.worldname);
                                     }
                                 };
                                 if (hasConfirmation(player)) {
@@ -228,32 +223,30 @@ import java.util.Set;
                                 C.SETUP_WORLD_TAKEN.send(player, pa.worldname);
                                 return false;
                             }
-                            Runnable run = new Runnable() {
-                                @Override public void run() {
-                                    String path = "worlds." + pa.worldname;
-                                    if (!PlotSquared.get().worlds.contains(path)) {
-                                        PlotSquared.get().worlds.createSection(path);
-                                    }
-                                    ConfigurationSection section =
-                                        PlotSquared.get().worlds.getConfigurationSection(path);
-                                    pa.saveConfiguration(section);
-                                    pa.loadConfiguration(section);
-                                    object.plotManager = PlotSquared.imp().getPluginName();
-                                    object.setupGenerator = PlotSquared.imp().getPluginName();
-                                    String world = SetupUtils.manager.setupWorld(object);
-                                    if (WorldUtil.IMP.isWorld(world)) {
-                                        C.SETUP_FINISHED.send(player);
-                                        player.teleport(WorldUtil.IMP.getSpawn(world));
-                                    } else {
-                                        MainUtil.sendMessage(player,
-                                            "An error occurred while creating the world: "
-                                                + pa.worldname);
-                                    }
-                                    try {
-                                        PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-                                    } catch (IOException e) {
-                                        e.printStackTrace();
-                                    }
+                            Runnable run = () -> {
+                                String path = "worlds." + pa.worldname;
+                                if (!PlotSquared.get().worlds.contains(path)) {
+                                    PlotSquared.get().worlds.createSection(path);
+                                }
+                                ConfigurationSection section =
+                                    PlotSquared.get().worlds.getConfigurationSection(path);
+                                pa.saveConfiguration(section);
+                                pa.loadConfiguration(section);
+                                object.plotManager = PlotSquared.imp().getPluginName();
+                                object.setupGenerator = PlotSquared.imp().getPluginName();
+                                String world = SetupUtils.manager.setupWorld(object);
+                                if (WorldUtil.IMP.isWorld(world)) {
+                                    C.SETUP_FINISHED.send(player);
+                                    player.teleport(WorldUtil.IMP.getSpawn(world));
+                                } else {
+                                    MainUtil.sendMessage(player,
+                                        "An error occurred while creating the world: "
+                                            + pa.worldname);
+                                }
+                                try {
+                                    PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
+                                } catch (IOException e) {
+                                    e.printStackTrace();
                                 }
                             };
                             if (hasConfirmation(player)) {
@@ -422,11 +415,7 @@ import java.util.Set;
                         @Override public void run(ChunkLoc value) {
                             AugmentedUtils.generate(area.worldname, value.x, value.z, null);
                         }
-                    }, new Runnable() {
-                        @Override public void run() {
-                            player.sendMessage("Regen complete");
-                        }
-                    });
+                    }, () -> player.sendMessage("Regen complete"));
                 return true;
             }
             case "goto":
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index fb4eca2e9..690c1098f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -22,8 +22,9 @@ public class Auto extends SubCommand {
 
     private static boolean checkAllowedPlots(PlotPlayer player, PlotArea plotarea,
         @Nullable Integer allowed_plots, int size_x, int size_z) {
-        if (allowed_plots == null)
+        if (allowed_plots == null) {
             allowed_plots = player.getAllowedPlots();
+        }
         int currentPlots =
             Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plotarea.worldname);
         int diff = currentPlots - allowed_plots;
@@ -189,8 +190,9 @@ public class Auto extends SubCommand {
         }
         final int allowed_plots = player.getAllowedPlots();
         if (player.getMeta(Auto.class.getName(), false) || !checkAllowedPlots(player, plotarea,
-            allowed_plots, size_x, size_z))
+            allowed_plots, size_x, size_z)) {
             return false;
+        }
 
         if (schematic != null && !schematic.isEmpty()) {
             if (!plotarea.SCHEMATICS.contains(schematic.toLowerCase())) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
index 4a324e879..cf2f99bc9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
@@ -70,7 +70,7 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
         PlotArea area = player.getApplicablePlotArea();
-        boolean chat = area == null ? false : area.PLOT_CHAT;
+        boolean chat = area != null && area.PLOT_CHAT;
         if (toggle(player, "disabletitles") != chat) {
             MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
         } else {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
index 8f1e50f16..90afd6f8c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
@@ -64,8 +64,9 @@ import java.util.*;
                 page = Integer.parseInt(args[1]);
             case 1:
                 UUID user = args[0].length() >= 2 ? UUIDHandler.getUUIDFromString(args[0]) : null;
-                if (user != null && !PlotSquared.get().hasPlot(user))
+                if (user != null && !PlotSquared.get().hasPlot(user)) {
                     user = null;
+                }
                 if (page == Integer.MIN_VALUE && user == null && MathMan.isInteger(args[0])) {
                     page = Integer.parseInt(args[0]);
                     unsorted = PlotSquared.get().getBasePlots(player);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
index 0eecd6539..d812413ea 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/AbstractDB.java
@@ -45,7 +45,7 @@ public interface AbstractDB {
     void createTables() throws Exception;
 
     /**
-     * Deletess a plot.
+     * Deletes a plot.
      *
      * @param plot the plot to delete
      */
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index 876a29121..fac357c46 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -1001,14 +1001,16 @@ import java.util.concurrent.atomic.AtomicInteger;
                                             + "plot_settings`(`plot_plot_id`) VALUES(?)");
                                 }
                             });
-                            if (success != null)
+                            if (success != null) {
                                 addNotifyTask(success);
+                            }
                             return;
                         }
                     }
                 }
-                if (failure != null)
+                if (failure != null) {
                     failure.run();
+                }
             }
         });
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index a553140b2..988a6a7b4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -145,7 +145,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         Location top = plot.getExtendedTopAbs();
         LocalBlockQueue queue = plotArea.getQueue(false);
         int maxY = plotArea.getPlotManager().getWorldHeight();
-        if (!plot.getMerged(0)) {
+        if (!plot.getMerged(Direction.NORTH)) {
             int z = bottom.getZ();
             for (int x = bottom.getX(); x <= top.getX(); x++) {
                 for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
@@ -153,7 +153,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                 }
             }
         }
-        if (!plot.getMerged(3)) {
+        if (!plot.getMerged(Direction.WEST)) {
             int x = bottom.getX();
             for (int z = bottom.getZ(); z <= top.getZ(); z++) {
                 for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
@@ -162,7 +162,7 @@ public class ClassicPlotManager extends SquarePlotManager {
             }
         }
 
-        if (!plot.getMerged(2)) {
+        if (!plot.getMerged(Direction.SOUTH)) {
             int z = top.getZ();
             for (int x = bottom.getX(); x <= top.getX(); x++) {
                 for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
@@ -170,7 +170,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                 }
             }
         }
-        if (!plot.getMerged(1)) {
+        if (!plot.getMerged(Direction.EAST)) {
             int x = top.getX();
             for (int z = bottom.getZ(); z <= top.getZ(); z++) {
                 for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
@@ -196,10 +196,11 @@ public class ClassicPlotManager extends SquarePlotManager {
         }
         Plot plot = plotArea.getPlotAbs(plotId);
         Location bot = plot.getExtendedBottomAbs()
-            .subtract(plot.getMerged(3) ? 0 : 1, 0, plot.getMerged(0) ? 0 : 1);
+            .subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0,
+                plot.getMerged(Direction.NORTH) ? 0 : 1);
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
         LocalBlockQueue queue = plotArea.getQueue(false);
-        if (!plot.getMerged(0)) {
+        if (!plot.getMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
                 for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
@@ -207,7 +208,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                 }
             }
         }
-        if (!plot.getMerged(3)) {
+        if (!plot.getMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
                 for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
@@ -215,17 +216,19 @@ public class ClassicPlotManager extends SquarePlotManager {
                 }
             }
         }
-        if (!plot.getMerged(2)) {
+        if (!plot.getMerged(Direction.SOUTH)) {
             int z = top.getZ();
-            for (int x = bot.getX(); x < top.getX() + (plot.getMerged(1) ? 0 : 1); x++) {
+            for (int x = bot.getX();
+                 x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
                 for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
         }
-        if (!plot.getMerged(1)) {
+        if (!plot.getMerged(Direction.EAST)) {
             int x = top.getX();
-            for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(2) ? 0 : 1); z++) {
+            for (int z = bot.getZ();
+                 z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
                 for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
@@ -242,32 +245,35 @@ public class ClassicPlotManager extends SquarePlotManager {
         }
         Plot plot = plotArea.getPlotAbs(plotId);
         Location bot = plot.getExtendedBottomAbs()
-            .subtract(plot.getMerged(3) ? 0 : 1, 0, plot.getMerged(0) ? 0 : 1);
+            .subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0,
+                plot.getMerged(Direction.NORTH) ? 0 : 1);
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
         PseudoRandom random = new PseudoRandom();
         LocalBlockQueue queue = plotArea.getQueue(false);
         int y = dpw.WALL_HEIGHT + 1;
-        if (!plot.getMerged(0)) {
+        if (!plot.getMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
         }
-        if (!plot.getMerged(3)) {
+        if (!plot.getMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
         }
-        if (!plot.getMerged(2)) {
+        if (!plot.getMerged(Direction.SOUTH)) {
             int z = top.getZ();
-            for (int x = bot.getX(); x < top.getX() + (plot.getMerged(1) ? 0 : 1); x++) {
+            for (int x = bot.getX();
+                 x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
         }
-        if (!plot.getMerged(1)) {
+        if (!plot.getMerged(Direction.EAST)) {
             int x = top.getX();
-            for (int z = bot.getZ(); z < top.getZ() + (plot.getMerged(2) ? 0 : 1); z++) {
+            for (int z = bot.getZ();
+                 z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index ea3a23691..6419fbda8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -95,9 +95,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             return bot.add(-1, 0, -2);
         } else {
             bot.setY(0);
-            Location loc =
-                bot.add(SIGN_LOCATION.getX(), SIGN_LOCATION.getY(), SIGN_LOCATION.getZ());
-            return loc;
+            return bot.add(SIGN_LOCATION.getX(), SIGN_LOCATION.getY(), SIGN_LOCATION.getZ());
         }
     }
 
@@ -277,11 +275,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             id = rotate(id);
         }
         int pair = MathMan.pair(x, z);
-        BaseBlock[] existing = this.G_SCH.get(pair);
-        if (existing == null) {
-            existing = new BaseBlock[height];
-            this.G_SCH.put(pair, existing);
-        }
+        BaseBlock[] existing = this.G_SCH.computeIfAbsent(pair, k -> new BaseBlock[height]);
         existing[y] = id;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
index d65e4940e..5be65a394 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
@@ -173,28 +173,28 @@ public abstract class SquarePlotManager extends GridPlotManager {
             switch (hash) {
                 case 8:
                     // north
-                    return plot.getMerged(0) ? id : null;
+                    return plot.getMerged(Direction.NORTH) ? id : null;
                 case 4:
                     // east
-                    return plot.getMerged(1) ? id : null;
+                    return plot.getMerged(Direction.EAST) ? id : null;
                 case 2:
                     // south
-                    return plot.getMerged(2) ? id : null;
+                    return plot.getMerged(Direction.SOUTH) ? id : null;
                 case 1:
                     // west
-                    return plot.getMerged(3) ? id : null;
+                    return plot.getMerged(Direction.WEST) ? id : null;
                 case 12:
-                    // northest
-                    return plot.getMerged(4) ? id : null;
+                    // northeast
+                    return plot.getMerged(Direction.NORTHEAST) ? id : null;
                 case 6:
                     // southeast
-                    return plot.getMerged(5) ? id : null;
+                    return plot.getMerged(Direction.SOUTHEAST) ? id : null;
                 case 3:
                     // southwest
-                    return plot.getMerged(6) ? id : null;
+                    return plot.getMerged(Direction.SOUTHWEST) ? id : null;
                 case 9:
                     // northwest
-                    return plot.getMerged(7) ? id : null;
+                    return plot.getMerged(Direction.NORTHWEST) ? id : null;
             }
             PlotSquared.debug("invalid location: " + Arrays.toString(merged));
         } catch (Exception ignored) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
index 431c2c378..79e6209a2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
@@ -13,7 +13,7 @@ import com.sk89q.worldedit.extent.NullExtent;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -46,21 +46,22 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
         this.parent = parent;
     }
 
-    @Override public BlockState getBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getBlock(location);
+    @Override public BlockState getBlock(BlockVector3 position) {
+        if (WEManager.maskContains(this.mask, position.getX(), position.getY(), position.getZ())) {
+            return super.getBlock(position);
         }
         return WEExtent.AIRSTATE;
     }
 
-    @Override public BaseBlock getFullBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getFullBlock(location);
+    @Override public BaseBlock getFullBlock(BlockVector3 position) {
+        if (WEManager.maskContains(this.mask, position.getX(), position.getY(), position.getZ())) {
+            return super.getFullBlock(position);
         }
         return WEExtent.AIRBASE;
     }
 
-    @Override public boolean setBlock(BlockVector3 location, BlockStateHolder block)
+    @Override
+    public <T extends BlockStateHolder<T>> boolean setBlock(BlockVector3 location, T block)
         throws WorldEditException {
         String id = block.getBlockType().getId();
         switch (id) {
@@ -171,7 +172,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
         return null;
     }
 
-    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
+    @Override public boolean setBiome(BlockVector2 position, BiomeType biome) {
         return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
             .setBiome(position, biome);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
index ac0503886..077bda932 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEExtent.java
@@ -9,7 +9,7 @@ import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.util.Location;
-import com.sk89q.worldedit.world.biome.BaseBiome;
+import com.sk89q.worldedit.world.biome.BiomeType;
 import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -42,22 +42,22 @@ public class WEExtent extends AbstractDelegateExtent {
         return null;
     }
 
-    @Override public boolean setBiome(BlockVector2 position, BaseBiome biome) {
-        return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
-            .setBiome(position, biome);
-    }
-
-    @Override public BlockState getBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getBlock(location);
+    @Override public BlockState getBlock(BlockVector3 position) {
+        if (WEManager.maskContains(this.mask, position.getX(), position.getY(), position.getZ())) {
+            return super.getBlock(position);
         }
         return AIRSTATE;
     }
 
-    @Override public BaseBlock getFullBlock(BlockVector3 location) {
-        if (WEManager.maskContains(this.mask, location.getX(), location.getY(), location.getZ())) {
-            return super.getFullBlock(location);
+    @Override public BaseBlock getFullBlock(BlockVector3 position) {
+        if (WEManager.maskContains(this.mask, position.getX(), position.getY(), position.getZ())) {
+            return super.getFullBlock(position);
         }
         return AIRBASE;
     }
+
+    @Override public boolean setBiome(BlockVector2 position, BiomeType biome) {
+        return WEManager.maskContains(this.mask, position.getX(), position.getZ()) && super
+            .setBiome(position, biome);
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 15954f8a3..775bde234 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -3015,4 +3015,8 @@ public class Plot {
     @SuppressWarnings("deprecation") public void setComments(List<PlotComment> list) {
         getSettings().setComments(list);
     }
+
+    public boolean getMerged(Direction direction) {
+        return getMerged(direction.getIndex());
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index bcfdfb967..594da7962 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -713,8 +713,9 @@ public abstract class PlotArea {
         if (TYPE == 2) {
             center = new PlotId(MathMan.average(min.x, max.x), MathMan.average(min.y, max.y));
             plots = Math.max(max.x - min.x, max.y - min.y) + 1;
-            if (start != null)
+            if (start != null) {
                 start = new PlotId(start.x - center.x, start.y - center.y);
+            }
         } else {
             center = new PlotId(0, 0);
             plots = Integer.MAX_VALUE;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
index 74c371d17..829e42dbd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java
@@ -6,7 +6,6 @@ import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 import com.google.common.collect.ImmutableList;
 
 import java.util.*;
-import java.util.stream.IntStream;
 
 /**
  * Generic settings class.
@@ -57,13 +56,6 @@ public class PlotSettings {
         return this.merged[direction];
     }
 
-    /**
-     * Returns true if the plot is merged (i.e. if it's a mega plot)
-     */
-    public boolean isMerged() {
-        return IntStream.of(0, 1, 2, 3).anyMatch(i -> this.merged[i]);
-    }
-
     public boolean[] getMerged() {
         return this.merged;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index 037e081bc..ad3210094 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -30,8 +30,9 @@ public class SinglePlotArea extends GridPlotWorld {
         TaskManager.IMP.sync(new RunnableVal<Object>() {
             @Override public void run(Object value) {
                 String worldName = id.toCommaSeparatedString();
-                if (WorldUtil.IMP.isWorld(worldName))
+                if (WorldUtil.IMP.isWorld(worldName)) {
                     return;
+                }
                 SetupObject setup = new SetupObject();
                 setup.plotManager = "PlotSquared:single";
                 setup.setupGenerator = "PlotSquared:single";
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index adc462f4e..afd5f9f5f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -70,32 +70,36 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
 
     @Override public PlotArea getApplicablePlotArea(Location location) {
         PlotArea found = super.getApplicablePlotArea(location);
-        if (found != null)
+        if (found != null) {
             return found;
+        }
         String world = location.getWorld();
         return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
             area :
             null;
     }
 
-    @Override public PlotArea getPlotArea(Location location) {
-        PlotArea found = super.getPlotArea(location);
-        if (found != null)
-            return found;
-        return isWorld(location.getWorld()) || location.getWorld().equals("*") ? area : null;
-    }
-
     @Override public PlotArea getPlotArea(String world, String id) {
         PlotArea found = super.getPlotArea(world, id);
-        if (found != null)
+        if (found != null) {
             return found;
+        }
         return isWorld(world) || world.equals("*") ? area : null;
     }
 
+    @Override public PlotArea getPlotArea(Location location) {
+        PlotArea found = super.getPlotArea(location);
+        if (found != null) {
+            return found;
+        }
+        return isWorld(location.getWorld()) || location.getWorld().equals("*") ? area : null;
+    }
+
     @Override public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
         PlotArea[] found = super.getPlotAreas(world, region);
-        if (found != null && found.length != 0)
+        if (found != null && found.length != 0) {
             return found;
+        }
         return isWorld(world) || world.equals("*") ? array : noPlotAreas;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index 8e5a6da12..b7b4a1f8a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -33,8 +33,9 @@ public class SinglePlotManager extends PlotManager {
         TaskManager.IMP.taskAsync(new Runnable() {
             @Override public void run() {
                 MainUtil.deleteDirectory(worldFolder);
-                if (whenDone != null)
+                if (whenDone != null) {
                     whenDone.run();
+                }
             }
         });
         return true;
@@ -46,8 +47,9 @@ public class SinglePlotManager extends PlotManager {
     }
 
     @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
-        if (whenDone != null)
+        if (whenDone != null) {
             whenDone.run();
+        }
         return true;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index cf2ca96ed..b692dc04e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -264,10 +264,7 @@ public abstract class ChunkManager {
         }
         Location top = new Location(world, x2, 0, z2);
         plot = top.getOwnedPlotAbs();
-        if (plot != null) {
-            return plot;
-        }
-        return null;
+        return plot;
     }
 
     /**
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
index 11c157320..56a4d51b5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
@@ -17,8 +17,9 @@ public class CmdConfirm {
     public static void addPending(final PlotPlayer player, String commandStr,
         final Runnable runnable) {
         removePending(player);
-        if (commandStr != null)
+        if (commandStr != null) {
             MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
+        }
         TaskManager.runTaskLater(new Runnable() {
             @Override public void run() {
                 CmdInstance cmd = new CmdInstance(runnable);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
index 2e65e9305..852521817 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
@@ -181,8 +181,9 @@ public class MathMan {
 
     public static int floorMod(int x, int y) {
         int i = x % y;
-        if (i < 0)
+        if (i < 0) {
             i += y;
+        }
         return i;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index 8784ebf35..99c0386cf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -171,8 +171,9 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         GlobalBlockQueue.IMP.dequeue(this);
         TaskManager.IMP.sync(new RunnableVal<Object>() {
             @Override public void run(Object value) {
-                while (next())
+                while (next()) {
                     ;
+                }
             }
         });
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index a4f64c2a2..36dcd9cff 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -329,8 +329,9 @@ public class ExpireManager {
             long diff = time - existing;
             if (diff > 0) {
                 Long account_age = this.account_age_cache.get(uuid);
-                if (account_age != null)
+                if (account_age != null) {
                     this.account_age_cache.put(uuid, account_age + diff);
+                }
             }
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
index dbf9d9fa9..e959948b4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpiryTask.java
@@ -106,8 +106,9 @@ public class ExpiryTask {
     }
 
     public boolean appliesAccountAge(long accountAge) {
-        if (settings.SKIP_ACCOUNT_AGE_DAYS != -1)
+        if (settings.SKIP_ACCOUNT_AGE_DAYS != -1) {
             return accountAge <= TimeUnit.DAYS.toMillis(settings.SKIP_ACCOUNT_AGE_DAYS);
+        }
         return false;
     }
 

From bfc6b62213b81e668c996bab8b1460b72f719f7d Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 21 Feb 2019 21:31:12 -0500
Subject: [PATCH 055/210] Stupid docs

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../intellectualsites/plotsquared/api/PlotAPI.java   | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
index a93f2fa26..76abc8c7c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
@@ -47,7 +47,7 @@ import java.util.UUID;
     }
 
     /**
-     * Return all plots for a player.
+     * Gets all plots for a player.
      *
      * @param player Player, whose plots to search for
      * @return all plots that a player owns
@@ -86,16 +86,6 @@ import java.util.UUID;
         return PlotSquared.get().storage;
     }
 
-    /**
-     * Gets the main class for this plugin. Only use this if you really need it.
-     *
-     * @return PlotSquared PlotSquared Main Class
-     * @see PlotSquared
-     */
-    public PlotSquared getMain() {
-        return PlotSquared.get();
-    }
-
     /**
      * ChunkManager class contains several useful methods.
      * <ul>

From be51d8e1597650e3f30d75787283845435a6d636 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 22 Feb 2019 14:38:18 +0000
Subject: [PATCH 056/210] Correct artifact id for maven

---
 Core/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/build.gradle b/Core/build.gradle
index 2327ddf81..af9efd311 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -26,14 +26,14 @@ task createPom {
         pom {
             project {
                 groupId 'com.github.intellectualsites.plotsquared'
-                artifactId 'Plotsquared'
+                artifactId 'Plotsquared-Api'
                 version project.parent.version
             }
         }.writeTo("../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/${project.parent.version}/Plotsquared-Api-${project.parent.version}.pom")
         pom {
             project {
                 groupId 'com.github.intellectualsites.plotsquared'
-                artifactId 'Plotsquared'
+                artifactId 'Plotsquared-Api'
                 version 'latest'
             }
         }.writeTo("../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/latest/Plotsquared-Api-latest.pom")

From 7aebd9b74bd3d18a459a7dfd8fd4865da9994608 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 22 Feb 2019 15:11:35 +0000
Subject: [PATCH 057/210] Set wall filling on merge

---
 .../plotsquared/plot/generator/ClassicPlotManager.java          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index 988a6a7b4..5a44f30b2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -432,7 +432,9 @@ public class ClassicPlotManager extends SquarePlotManager {
      */
     @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
         final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
+        final BlockBucket wallBlock = ((ClassicPlotWorld) plotArea).WALL_FILLING;
         plotIds.forEach(id -> setWall(plotArea, id, block));
+        plotIds.forEach(id -> setWallFilling(plotArea, id, wallBlock));
         return true;
     }
 

From 53e732b4fe6f8af434dcc0dfa666a1dcc2f97dee Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 22 Feb 2019 15:21:44 +0000
Subject: [PATCH 058/210] Make replacing wall on merge configurable In case
 people are doing fun things with road schematics etc :)

---
 .../plotsquared/plot/config/Settings.java                  | 1 +
 .../plotsquared/plot/generator/ClassicPlotManager.java     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 1f7f6a88d..281e35caf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -224,6 +224,7 @@ public class Settings extends Config {
 
     @Comment("General settings") public static final class General {
         @Comment("Display scientific numbers (4.2E8)") public static boolean SCIENTIFIC = false;
+        @Comment("Replace wall when merging") public static boolean MERGE_REPLACE_WALL = true;
     }
 
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index 5a44f30b2..fffe38966 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -1,5 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.generator;
 
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
@@ -432,9 +433,11 @@ public class ClassicPlotManager extends SquarePlotManager {
      */
     @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
         final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        final BlockBucket wallBlock = ((ClassicPlotWorld) plotArea).WALL_FILLING;
         plotIds.forEach(id -> setWall(plotArea, id, block));
-        plotIds.forEach(id -> setWallFilling(plotArea, id, wallBlock));
+        if (Settings.General.MERGE_REPLACE_WALL) {
+            final BlockBucket wallBlock = ((ClassicPlotWorld) plotArea).WALL_FILLING;
+            plotIds.forEach(id -> setWallFilling(plotArea, id, wallBlock));
+        }
         return true;
     }
 

From 25530ed7f0af64bd729de84818600a890394ac0e Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 22 Feb 2019 11:51:06 -0500
Subject: [PATCH 059/210] Doc Updates, Renaming, Reformatting, and a Test

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/BukkitMain.java        | 120 +++----
 .../bukkit/commands/DebugUUID.java            |  12 +-
 .../bukkit/listeners/ChunkListener.java       |  20 +-
 .../bukkit/listeners/ForceFieldListener.java  |   8 +-
 .../bukkit/listeners/PlayerEvents.java        | 297 ++++++++++--------
 .../bukkit/object/BukkitPlayer.java           |   8 +-
 .../bukkit/object/schematic/StateWrapper.java |   4 +-
 .../bukkit/util/BukkitChatManager.java        |   4 +-
 .../plotsquared/bukkit/util/BukkitUtil.java   |   6 +-
 .../bukkit/uuid/FileUUIDHandler.java          |  12 +-
 .../bukkit/uuid/SQLUUIDHandler.java           |  47 +--
 .../plotsquared/api/PlotAPI.java              |  20 +-
 .../plotsquared/commands/Command.java         |  38 +--
 .../plotsquared/plot/PlotSquared.java         | 130 ++++----
 .../plotsquared/plot/commands/Add.java        |  28 +-
 .../plotsquared/plot/commands/Alias.java      |  42 +--
 .../plotsquared/plot/commands/Area.java       |  69 ++--
 .../plotsquared/plot/commands/Auto.java       |  37 +--
 .../plotsquared/plot/commands/Biome.java      |  12 +-
 .../plotsquared/plot/commands/Buy.java        |  24 +-
 .../plotsquared/plot/commands/Claim.java      |  33 +-
 .../plotsquared/plot/commands/Clear.java      |  17 +-
 .../plotsquared/plot/commands/Cluster.java    | 278 ++++++++--------
 .../plotsquared/plot/commands/Comment.java    |  18 +-
 .../plotsquared/plot/commands/Confirm.java    |   6 +-
 .../plotsquared/plot/commands/Continue.java   |  17 +-
 .../plotsquared/plot/commands/Copy.java       |  20 +-
 .../plot/commands/CreateRoadSchematic.java    |   6 +-
 .../plotsquared/plot/commands/Debug.java      |  12 +-
 .../plot/commands/DebugAllowUnsafe.java       |   6 +-
 .../plot/commands/DebugClaimTest.java         |   4 +-
 .../plotsquared/plot/commands/DebugExec.java  |  28 +-
 .../plot/commands/DebugFixFlags.java          |   4 +-
 .../plotsquared/plot/commands/DebugPaste.java |   5 +-
 .../plot/commands/DebugRoadRegen.java         |   8 +-
 .../plot/commands/DebugSaveTest.java          |  10 +-
 .../plotsquared/plot/commands/Delete.java     |  18 +-
 .../plotsquared/plot/commands/Deny.java       |  28 +-
 .../plotsquared/plot/commands/Desc.java       |   8 +-
 .../plotsquared/plot/commands/Done.java       |  18 +-
 .../plotsquared/plot/commands/Download.java   |  32 +-
 .../plotsquared/plot/commands/FlagCmd.java    | 116 +++----
 .../plot/commands/GenerateDocs.java           |   8 +-
 .../plotsquared/plot/commands/Grant.java      |  14 +-
 .../plotsquared/plot/commands/Help.java       |  13 +-
 .../plotsquared/plot/commands/Inbox.java      |  44 +--
 .../plotsquared/plot/commands/Info.java       |  35 ++-
 .../plotsquared/plot/commands/Kick.java       |  24 +-
 .../plotsquared/plot/commands/Leave.java      |  16 +-
 .../plotsquared/plot/commands/ListCmd.java    | 140 +++++----
 .../plotsquared/plot/commands/Load.java       |  36 +--
 .../plot/commands/MainCommand.java            |  13 +-
 .../plotsquared/plot/commands/Merge.java      |  63 ++--
 .../plotsquared/plot/commands/Middle.java     |   6 +-
 .../plotsquared/plot/commands/Move.java       |  22 +-
 .../plotsquared/plot/commands/Music.java      |  12 +-
 .../plotsquared/plot/commands/Near.java       |   6 +-
 .../plotsquared/plot/commands/Owner.java      |  27 +-
 .../plotsquared/plot/commands/Purge.java      |  18 +-
 .../plotsquared/plot/commands/Rate.java       |  40 +--
 .../plot/commands/RegenAllRoads.java          |  15 +-
 .../plotsquared/plot/commands/Relight.java    |   6 +-
 .../plotsquared/plot/commands/Reload.java     |   8 +-
 .../plotsquared/plot/commands/Remove.java     |  14 +-
 .../plotsquared/plot/commands/Save.java       |  18 +-
 .../plot/commands/SchematicCmd.java           |  65 ++--
 .../plotsquared/plot/commands/Set.java        |  30 +-
 .../plotsquared/plot/commands/SetCommand.java |  22 +-
 .../plotsquared/plot/commands/SetHome.java    |   8 +-
 .../plotsquared/plot/commands/Setup.java      |  32 +-
 .../plotsquared/plot/commands/SubCommand.java |   4 +-
 .../plotsquared/plot/commands/Swap.java       |  20 +-
 .../plotsquared/plot/commands/Target.java     |   8 +-
 .../plotsquared/plot/commands/Template.java   |  20 +-
 .../plotsquared/plot/commands/Toggle.java     |  22 +-
 .../plotsquared/plot/commands/Trim.java       |   8 +-
 .../plotsquared/plot/commands/Trust.java      |  28 +-
 .../plotsquared/plot/commands/Unlink.java     |  16 +-
 .../plotsquared/plot/commands/Visit.java      |  34 +-
 .../plot/config/{C.java => Captions.java}     |  22 +-
 .../plot/generator/HybridPlotWorld.java       |   4 +-
 .../plot/generator/HybridUtils.java           |   4 +-
 .../plot/listener/PlotListener.java           |  29 +-
 .../plot/listener/ProcessedWEExtent.java      |   7 +-
 .../plot/listener/WESubscriber.java           |   4 +-
 .../plotsquared/plot/object/BlockBucket.java  |   4 +-
 .../plotsquared/plot/object/Plot.java         |  31 +-
 .../plotsquared/plot/object/PlotMessage.java  |   4 +-
 .../plotsquared/plot/object/PlotPlayer.java   |  14 +-
 .../plot/object/chat/PlainChatManager.java    |   4 +-
 .../plot/object/worlds/SinglePlot.java        |   4 +-
 .../plotsquared/plot/util/CmdConfirm.java     |   4 +-
 .../plotsquared/plot/util/CommentManager.java |   4 +-
 .../plotsquared/plot/util/EventUtil.java      | 166 ++++++----
 .../plot/util/LegacyConverter.java            |   8 +-
 .../plotsquared/plot/util/MainUtil.java       |  52 +--
 .../plotsquared/plot/util/Permissions.java    |  16 +-
 .../plot/util/UUIDHandlerImplementation.java  |   5 +-
 .../plot/util/expiry/ExpireManager.java       |   6 +-
 .../plot/util/helpmenu/HelpObject.java        |   4 +-
 .../plot/util/helpmenu/HelpPage.java          |  10 +-
 .../util/UUIDHandlerImplementationTest.java   |  25 ++
 102 files changed, 1590 insertions(+), 1386 deletions(-)
 rename Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/{C.java => Captions.java} (98%)
 create mode 100644 Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 5060e4f4a..de00937f6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -9,7 +9,7 @@ import com.github.intellectualsites.plotsquared.bukkit.uuid.*;
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.IPlotMain;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
@@ -140,7 +140,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         if (Settings.Enabled_Components.METRICS) {
             this.startMetrics();
         } else {
-            PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(getPluginName()));
+            PlotSquared.log(Captions.CONSOLE_PLEASE_ENABLE_METRICS.f(getPluginName()));
         }
         if (Settings.Enabled_Components.WORLDS) {
             TaskManager.IMP.taskRepeat(this::unload, 20);
@@ -238,7 +238,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
     @Override public void log(@NonNull String message) {
         try {
-            message = C.color(message);
+            message = Captions.color(message);
             if (!Settings.Chat.CONSOLE_COLOR) {
                 message = ChatColor.stripColor(message);
             }
@@ -287,7 +287,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override @SuppressWarnings("deprecation") public void runEntityTask() {
-        PlotSquared.log(C.PREFIX + "KillAllEntities started.");
+        PlotSquared.log(Captions.PREFIX + "KillAllEntities started.");
         TaskManager.runTaskRepeat(() -> PlotSquared.get().forEachPlotArea(plotArea -> {
             final World world = Bukkit.getWorld(plotArea.worldname);
             try {
@@ -621,55 +621,15 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return new BukkitSetupUtils();
     }
 
-    @Override public UUIDHandlerImplementation initUUIDHandler() {
-        boolean checkVersion = false;
-        try {
-            OfflinePlayer.class.getDeclaredMethod("getUniqueId");
-            checkVersion = true;
-        } catch (Throwable ignore) {
-        }
-        final UUIDWrapper wrapper;
-        if (Settings.UUID.OFFLINE) {
-            if (Settings.UUID.FORCE_LOWERCASE) {
-                wrapper = new LowerOfflineUUIDWrapper();
-            } else {
-                wrapper = new OfflineUUIDWrapper();
-            }
-            Settings.UUID.OFFLINE = true;
-        } else if (checkVersion) {
-            wrapper = new DefaultUUIDWrapper();
-            Settings.UUID.OFFLINE = false;
-        } else {
-            if (Settings.UUID.FORCE_LOWERCASE) {
-                wrapper = new LowerOfflineUUIDWrapper();
-            } else {
-                wrapper = new OfflineUUIDWrapper();
-            }
-            Settings.UUID.OFFLINE = true;
-        }
-        if (!checkVersion) {
-            PlotSquared.log(C.PREFIX
-                + " &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature.");
-            Settings.TITLES = false;
-        } else {
-            AbstractTitle.TITLE_CLASS = new DefaultTitle_111();
-            if (wrapper instanceof DefaultUUIDWrapper
-                || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
-                Settings.UUID.NATIVE_UUID_PROVIDER = true;
-            }
-        }
-        if (Settings.UUID.OFFLINE) {
-            PlotSquared.log(C.PREFIX + " &6" + getPluginName()
-                + " is using Offline Mode UUIDs either because of user preference, or because you are using an old version of "
-                + "Bukkit");
-        } else {
-            PlotSquared.log(C.PREFIX + " &6" + getPluginName() + " is using online UUIDs");
-        }
-        if (Settings.UUID.USE_SQLUUIDHANDLER) {
-            return new SQLUUIDHandler(wrapper);
-        } else {
-            return new FileUUIDHandler(wrapper);
+    @Override public void startMetrics() {
+        if (this.metricsStarted) {
+            return;
         }
+        System.setProperty("bstats.relocatecheck",
+            "false"); // We do not want to relocate the package...
+        Metrics metrics = new Metrics(this);// bstats
+        PlotSquared.log(Captions.PREFIX + "&6Metrics enabled.");
+        this.metricsStarted = true;
     }
 
     @Override public ChunkManager initChunkManager() {
@@ -700,15 +660,55 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return new BukkitInventoryUtil();
     }
 
-    @Override public void startMetrics() {
-        if (this.metricsStarted) {
-            return;
+    @Override public UUIDHandlerImplementation initUUIDHandler() {
+        boolean checkVersion = false;
+        try {
+            OfflinePlayer.class.getDeclaredMethod("getUniqueId");
+            checkVersion = true;
+        } catch (Throwable ignore) {
+        }
+        final UUIDWrapper wrapper;
+        if (Settings.UUID.OFFLINE) {
+            if (Settings.UUID.FORCE_LOWERCASE) {
+                wrapper = new LowerOfflineUUIDWrapper();
+            } else {
+                wrapper = new OfflineUUIDWrapper();
+            }
+            Settings.UUID.OFFLINE = true;
+        } else if (checkVersion) {
+            wrapper = new DefaultUUIDWrapper();
+            Settings.UUID.OFFLINE = false;
+        } else {
+            if (Settings.UUID.FORCE_LOWERCASE) {
+                wrapper = new LowerOfflineUUIDWrapper();
+            } else {
+                wrapper = new OfflineUUIDWrapper();
+            }
+            Settings.UUID.OFFLINE = true;
+        }
+        if (!checkVersion) {
+            PlotSquared.log(Captions.PREFIX
+                + " &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature.");
+            Settings.TITLES = false;
+        } else {
+            AbstractTitle.TITLE_CLASS = new DefaultTitle_111();
+            if (wrapper instanceof DefaultUUIDWrapper
+                || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
+                Settings.UUID.NATIVE_UUID_PROVIDER = true;
+            }
+        }
+        if (Settings.UUID.OFFLINE) {
+            PlotSquared.log(Captions.PREFIX + " &6" + getPluginName()
+                + " is using Offline Mode UUIDs either because of user preference, or because you are using an old version of "
+                + "Bukkit");
+        } else {
+            PlotSquared.log(Captions.PREFIX + " &6" + getPluginName() + " is using online UUIDs");
+        }
+        if (Settings.UUID.USE_SQLUUIDHANDLER) {
+            return new SQLUUIDHandler(wrapper);
+        } else {
+            return new FileUUIDHandler(wrapper);
         }
-        System.setProperty("bstats.relocatecheck",
-            "false"); // We do not want to relocate the package...
-        Metrics metrics = new Metrics(this);// bstats
-        PlotSquared.log(C.PREFIX + "&6Metrics enabled.");
-        this.metricsStarted = true;
     }
 
     @Override public void setGenerator(@NonNull final String worldName) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
index ef5b6bdcd..fdee5edf6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java
@@ -10,7 +10,7 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
 import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
 import com.github.intellectualsites.plotsquared.plot.commands.SubCommand;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -55,14 +55,15 @@ import java.util.Map.Entry;
                     Class<?> clazz = Class.forName(args[0]);
                     newWrapper = (UUIDWrapper) clazz.newInstance();
                 } catch (ClassNotFoundException | IllegalAccessException | InstantiationException ignored) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                         "/plot uuidconvert <lower|offline|online>");
                     return false;
                 }
         }
 
         if (args.length != 2 || !"-o".equals(args[1])) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot uuidconvert " + args[0] + " - o");
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                "/plot uuidconvert " + args[0] + " - o");
             MainUtil.sendMessage(player, "&cBe aware of the following!");
             MainUtil.sendMessage(player,
                 "&8 - &cUse the database command or another method to backup your plots beforehand");
@@ -109,7 +110,8 @@ import java.util.Map.Entry;
                         UUID uuid = UUID.fromString(s);
                         uuids.add(uuid);
                     } catch (Exception ignored) {
-                        MainUtil.sendMessage(player, C.PREFIX + "Invalid playerdata: " + current);
+                        MainUtil.sendMessage(player,
+                            Captions.PREFIX + "Invalid playerdata: " + current);
                     }
                 }
             }
@@ -137,7 +139,7 @@ import java.util.Map.Entry;
                 }
             } catch (Throwable ignored) {
                 MainUtil.sendMessage(player,
-                    C.PREFIX + "&6Invalid playerdata: " + uuid.toString() + ".dat");
+                    Captions.PREFIX + "&6Invalid playerdata: " + uuid.toString() + ".dat");
             }
         }
         for (String name : names) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index af9ed712a..ca389cd30 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.bukkit.listeners;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -227,8 +227,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                 if (!chunk.isLoaded()) {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
-                    PlotSquared
-                        .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                    PlotSquared.debug(
+                        Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
                     chunk.unload(true, true);
                     return;
                 }
@@ -236,8 +236,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                 if (tiles.length == 0) {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
-                    PlotSquared
-                        .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                    PlotSquared.debug(
+                        Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
                     chunk.unload(true, true);
                     return;
                 }
@@ -247,8 +247,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                     if (i >= tiles.length) {
                         Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                         TaskManager.tasks.remove(currentIndex);
-                        PlotSquared
-                            .debug(C.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                        PlotSquared.debug(
+                            Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
                         chunk.unload(true, true);
                         return;
                     }
@@ -273,13 +273,15 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                 }
             }
             PlotSquared.debug(
-                C.PREFIX.s() + "&a detected unsafe chunk and processed: " + (chunk.getX() << 4)
+                Captions.PREFIX.s() + "&a detected unsafe chunk and processed: " + (chunk.getX()
+                    << 4)
                     + "," + (chunk.getX() << 4));
         }
         if (tiles.length > Settings.Chunk_Processor.MAX_TILES) {
             if (unload) {
                 PlotSquared.debug(
-                    C.PREFIX.s() + "&c detected unsafe chunk: " + (chunk.getX() << 4) + "," + (
+                    Captions.PREFIX.s() + "&c detected unsafe chunk: " + (chunk.getX() << 4) + ","
+                        + (
                         chunk.getX() << 4));
                 cleanChunk(chunk);
                 return true;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
index 97d1bb7d7..d2d588970 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.listeners;
 
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -85,7 +85,8 @@ import java.util.UUID;
             if (plot.isAdded(uuid)) {
                 Set<PlotPlayer> players = getNearbyPlayers(player, plot);
                 for (PlotPlayer oPlayer : players) {
-                    if (!Permissions.hasPermission(oPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+                    if (!Permissions
+                        .hasPermission(oPlayer, Captions.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
                         ((BukkitPlayer) oPlayer).player
                             .setVelocity(calculateVelocity(plotPlayer, oPlayer));
                     }
@@ -95,7 +96,8 @@ import java.util.UUID;
                 if (oPlayer == null) {
                     return;
                 }
-                if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
+                if (!Permissions
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_ENTRY_FORCEFIELD)) {
                     player.setVelocity(calculateVelocity(oPlayer, plotPlayer));
                 }
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 358605994..5812e4e27 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -5,7 +5,7 @@ import com.github.intellectualsites.plotsquared.bukkit.object.BukkitLazyBlock;
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
@@ -453,14 +453,14 @@ import java.util.regex.Pattern;
         if (shooter instanceof Player) {
             PlotPlayer pp = BukkitUtil.getPlayer((Player) shooter);
             if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_PROJECTILE_UNOWNED)) {
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_PROJECTILE_UNOWNED)) {
                     entity.remove();
                     return false;
                 }
                 return true;
             }
             if (plot.isAdded(pp.getUUID()) || Permissions
-                .hasPermission(pp, C.PERMISSION_PROJECTILE_OTHER)) {
+                .hasPermission(pp, Captions.PERMISSION_PROJECTILE_OTHER)) {
                 return true;
             }
             entity.remove();
@@ -508,7 +508,7 @@ import java.util.regex.Pattern;
                 case "worldedit:up":
                 case "worldedit:/up":
                     if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
-                        .hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER, true))) {
+                        .hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER, true))) {
                         event.setCancelled(true);
                         return;
                     }
@@ -519,7 +519,7 @@ import java.util.regex.Pattern;
         }
         Optional<List<String>> flag = plot.getFlag(Flags.BLOCKED_CMDS);
         if (flag.isPresent() && !Permissions
-            .hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
+            .hasPermission(pp, Captions.PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS)) {
             List<String> blocked_cmds = flag.get();
             String part = parts[0];
             if (parts[0].contains(":")) {
@@ -569,7 +569,7 @@ import java.util.regex.Pattern;
                         perm = "plots.admin.command.blocked-cmds.other";
                     }
                     if (!Permissions.hasPermission(pp, perm)) {
-                        MainUtil.sendMessage(pp, C.COMMAND_BLOCKED);
+                        MainUtil.sendMessage(pp, Captions.COMMAND_BLOCKED);
                         event.setCancelled(true);
                     }
                     return;
@@ -637,8 +637,8 @@ import java.util.regex.Pattern;
                 if (plot != null) {
                     final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
                     if (!result) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
-                            C.PERMISSION_ADMIN_ENTRY_DENIED);
+                        MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                            Captions.PERMISSION_ADMIN_ENTRY_DENIED);
                         event.setCancelled(true);
                         if (lastLoc != null) {
                             pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
@@ -760,7 +760,8 @@ import java.util.regex.Pattern;
             if (now == null) {
                 if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
                     .getMeta("kick", false)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_EXIT_DENIED);
                     this.tmpTeleport = false;
                     if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
                         player.teleport(from);
@@ -774,7 +775,8 @@ import java.util.regex.Pattern;
             } else if (now.equals(lastPlot)) {
                 ForceFieldListener.handleForcefield(player, pp, now);
             } else if (!plotEntry(pp, now) && this.tmpTeleport) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_ENTRY_DENIED);
                 this.tmpTeleport = false;
                 to.setX(from.getBlockX());
                 to.setY(from.getBlockY());
@@ -789,14 +791,14 @@ import java.util.regex.Pattern;
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
+                MainUtil.sendMessage(pp, Captions.BORDER);
             }
             if (x2 < -border && this.tmpTeleport) {
                 to.setX(-border + 1);
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
+                MainUtil.sendMessage(pp, Captions.BORDER);
             }
         }
         int z2;
@@ -818,7 +820,8 @@ import java.util.regex.Pattern;
             if (now == null) {
                 if (lastPlot != null && !plotExit(pp, lastPlot) && this.tmpTeleport && !pp
                     .getMeta("kick", false)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_EXIT_DENIED);
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_EXIT_DENIED);
                     this.tmpTeleport = false;
                     if (lastPlot.equals(BukkitUtil.getLocation(from).getPlot())) {
                         player.teleport(from);
@@ -832,7 +835,8 @@ import java.util.regex.Pattern;
             } else if (now.equals(lastPlot)) {
                 ForceFieldListener.handleForcefield(player, pp, now);
             } else if (!plotEntry(pp, now) && this.tmpTeleport) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_ENTRY_DENIED);
                 this.tmpTeleport = false;
                 player.teleport(from);
                 to.setX(from.getBlockX());
@@ -848,13 +852,13 @@ import java.util.regex.Pattern;
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
+                MainUtil.sendMessage(pp, Captions.BORDER);
             } else if (z2 < -border && this.tmpTeleport) {
                 to.setZ(-border + 1);
                 this.tmpTeleport = false;
                 player.teleport(event.getTo());
                 this.tmpTeleport = true;
-                MainUtil.sendMessage(pp, C.BORDER);
+                MainUtil.sendMessage(pp, Captions.BORDER);
             }
         }
     }
@@ -876,7 +880,7 @@ import java.util.regex.Pattern;
         }
         event.setCancelled(true);
         String message = event.getMessage();
-        String format = C.PLOT_CHAT_FORMAT.s();
+        String format = Captions.PLOT_CHAT_FORMAT.s();
         String sender = event.getPlayer().getDisplayName();
         PlotId id = plot.getId();
         Set<Player> recipients = event.getRecipients();
@@ -896,14 +900,15 @@ import java.util.regex.Pattern;
         String partial = ChatColor.translateAlternateColorCodes('&',
             format.replace("%plot_id%", id.x + ";" + id.y).replace("%sender%", sender));
         if (plotPlayer.hasPermission("plots.chat.color")) {
-            message = C.color(message);
+            message = Captions.color(message);
         }
         String full = partial.replace("%msg%", message);
         for (Player receiver : recipients) {
             receiver.sendMessage(full);
         }
         if (!spies.isEmpty()) {
-            String spyMessage = C.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
+            String spyMessage =
+                Captions.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
                 .replace("%sender%", sender).replace("%msg%", message);
             for (Player player : spies) {
                 player.sendMessage(spyMessage);
@@ -924,26 +929,27 @@ import java.util.regex.Pattern;
             PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
             if (event.getBlock().getY() == 0) {
                 if (!Permissions
-                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                        C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL);
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL);
                     event.setCancelled(true);
                     return;
                 }
             } else if (
                 (location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
                     && !Permissions
-                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
                 event.setCancelled(true);
-                MainUtil.sendMessage(plotPlayer,
-                    C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+                MainUtil.sendMessage(plotPlayer, Captions.HEIGHT_LIMIT.s()
+                    .replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
             }
             if (!plot.hasOwner()) {
-                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                if (Permissions
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
                     return;
                 }
-                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                    C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_DESTROY_UNOWNED);
                 event.setCancelled(true);
                 return;
             }
@@ -954,16 +960,17 @@ import java.util.regex.Pattern;
                     .contains(PlotBlock.get(block.getType().name()))) {
                     return;
                 }
-                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                if (Permissions
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_DESTROY_OTHER)) {
                     return;
                 }
-                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                    C.PERMISSION_ADMIN_DESTROY_OTHER);
+                MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_DESTROY_OTHER);
                 event.setCancelled(true);
             } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-                if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
-                        C.PERMISSION_ADMIN_BUILD_OTHER);
+                if (!Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_OTHER);
                     event.setCancelled(true);
                     return;
                 }
@@ -971,7 +978,7 @@ import java.util.regex.Pattern;
             return;
         }
         PlotPlayer pp = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+        if (Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_DESTROY_ROAD)) {
             return;
         }
         if (PlotSquared.get().worldedit != null && pp.getAttribute("worldedit")) {
@@ -980,7 +987,8 @@ import java.util.regex.Pattern;
                 return;
             }
         }
-        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+        MainUtil
+            .sendMessage(pp, Captions.NO_PERMISSION_EVENT, Captions.PERMISSION_ADMIN_DESTROY_ROAD);
         event.setCancelled(true);
     }
 
@@ -1051,7 +1059,7 @@ import java.util.regex.Pattern;
             plotExit(pp, plot);
         }
         if (PlotSquared.get().worldedit != null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_WORLDEDIT_BYPASS)) {
+            if (!Permissions.hasPermission(pp, Captions.PERMISSION_WORLDEDIT_BYPASS)) {
                 if (pp.getAttribute("worldedit")) {
                     pp.removeAttribute("worldedit");
                 }
@@ -1224,7 +1232,8 @@ import java.util.regex.Pattern;
             }
             if (!plot.hasOwner()) {
                 PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-                if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                if (Permissions
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
                     return;
                 }
                 event.setCancelled(true);
@@ -1236,7 +1245,7 @@ import java.util.regex.Pattern;
                 Block block = event.getBlock();
                 if (destroy.isPresent() && destroy.get()
                     .contains(PlotBlock.get(block.getType().name())) || Permissions
-                    .hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_DESTROY_OTHER)) {
                     return;
                 }
                 event.setCancelled(true);
@@ -1245,7 +1254,7 @@ import java.util.regex.Pattern;
             return;
         }
         PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
-        if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+        if (Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_DESTROY_ROAD)) {
             return;
         }
         event.setCancelled(true);
@@ -1612,19 +1621,21 @@ import java.util.regex.Pattern;
         boolean cancelled = false;
         if (plot == null) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.road");
                 cancelled = true;
             }
         } else if (!plot.hasOwner()) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+                MainUtil
+                    .sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
                 cancelled = true;
             }
         } else {
             UUID uuid = pp.getUUID();
             if (!plot.isAdded(uuid)) {
                 if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.interact.other");
                     cancelled = true;
                 }
             }
@@ -1672,12 +1683,13 @@ import java.util.regex.Pattern;
         PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
         if (plot == null) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.road");
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.road");
                 e.setCancelled(true);
             }
         } else if (!plot.hasOwner()) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+                MainUtil
+                    .sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
                 e.setCancelled(true);
             }
         } else {
@@ -1687,7 +1699,8 @@ import java.util.regex.Pattern;
                     return;
                 }
                 if (!Permissions.hasPermission(pp, "plots.admin.interact.other")) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.interact.other");
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.interact.other");
                     e.setCancelled(true);
                 }
             }
@@ -2161,19 +2174,21 @@ import java.util.regex.Pattern;
         if (player != null) {
             PlotPlayer pp = BukkitUtil.getPlayer(player);
             if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_ROAD)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_ROAD);
                     event.setCancelled(true);
                 }
             } else if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_UNOWNED);
                     event.setCancelled(true);
                 }
             } else if (!plot.isAdded(pp.getUUID())) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_OTHER);
                     event.setCancelled(true);
                 }
             } else if (Flags.BLOCK_IGNITION.isFalse(plot)) {
@@ -2237,29 +2252,33 @@ import java.util.regex.Pattern;
         PlotPlayer pp = BukkitUtil.getPlayer(event.getPlayer());
         Plot plot = area.getPlot(location);
         if (plot == null) {
-            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+            if (Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_ROAD)) {
                 return;
             }
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+            MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_ROAD);
             event.setCancelled(true);
         } else if (!plot.hasOwner()) {
-            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+            if (Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_UNOWNED)) {
                 return;
             }
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+            MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_UNOWNED);
             event.setCancelled(true);
         } else if (!plot.isAdded(pp.getUUID())) {
             if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().getId(), 0))) {
                 return;
             }
-            if (Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+            if (Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                 return;
             }
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+            MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_OTHER);
             event.setCancelled(true);
         } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+            if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_BUILD_OTHER);
                 event.setCancelled(true);
             }
         }
@@ -2293,17 +2312,18 @@ import java.util.regex.Pattern;
         PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
         Plot plot = area.getPlot(location);
         if (plot == null) {
-            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_ROAD)) {
+            if (Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_ROAD)) {
                 return;
             }
-            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+            MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_ROAD);
             event.setCancelled(true);
         } else if (!plot.hasOwner()) {
-            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+            if (Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_UNOWNED)) {
                 return;
             }
-            MainUtil
-                .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+            MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_UNOWNED);
             event.setCancelled(true);
         } else if (!plot.isAdded(plotPlayer.getUUID())) {
             Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
@@ -2311,15 +2331,16 @@ import java.util.regex.Pattern;
             if (use.isPresent() && use.get().contains(PlotBlock.get(block.getType().name()))) {
                 return;
             }
-            if (Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+            if (Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                 return;
             }
-            MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+            MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_OTHER);
             event.setCancelled(true);
         } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-            if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                MainUtil
-                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+            if (!Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_BUILD_OTHER);
                 event.setCancelled(true);
             }
         }
@@ -2356,24 +2377,25 @@ import java.util.regex.Pattern;
         PlotPlayer pp = BukkitUtil.getPlayer(p);
         Plot plot = area.getPlot(location);
         if (plot == null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+            if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_ROAD)) {
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_BUILD_ROAD);
                 event.setCancelled(true);
             }
         } else {
             if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_UNOWNED);
                     event.setCancelled(true);
                 }
                 return;
             }
             if (!plot.isAdded(pp.getUUID())) {
                 if (!plot.getFlag(Flags.HANGING_PLACE, false)) {
-                    if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                        MainUtil
-                            .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                    if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                        MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                            Captions.PERMISSION_ADMIN_BUILD_OTHER);
                         event.setCancelled(true);
                     }
                     return;
@@ -2399,24 +2421,24 @@ import java.util.regex.Pattern;
             PlotPlayer pp = BukkitUtil.getPlayer(p);
             Plot plot = area.getPlot(location);
             if (plot == null) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_ROAD);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_DESTROY_ROAD)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_DESTROY_ROAD);
                     event.setCancelled(true);
                 }
             } else if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_DESTROY_UNOWNED);
                     event.setCancelled(true);
                 }
             } else if (!plot.isAdded(pp.getUUID())) {
                 if (plot.getFlag(Flags.HANGING_BREAK, false)) {
                     return;
                 }
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_DESTROY_OTHER);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_DESTROY_OTHER);
                     event.setCancelled(true);
                 }
             }
@@ -2434,17 +2456,17 @@ import java.util.regex.Pattern;
                 if (plot != null) {
                     if (!plot.hasOwner()) {
                         if (!Permissions
-                            .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
-                            MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
-                                C.PERMISSION_ADMIN_DESTROY_UNOWNED);
+                            .hasPermission(player, Captions.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+                            MainUtil.sendMessage(player, Captions.NO_PERMISSION_EVENT,
+                                Captions.PERMISSION_ADMIN_DESTROY_UNOWNED);
                             event.setCancelled(true);
                         }
                     } else if (!plot.isAdded(player.getUUID())) {
                         if (!plot.getFlag(Flags.HANGING_BREAK, false)) {
                             if (!Permissions
-                                .hasPermission(player, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
-                                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT,
-                                    C.PERMISSION_ADMIN_DESTROY_OTHER);
+                                .hasPermission(player, Captions.PERMISSION_ADMIN_DESTROY_OTHER)) {
+                                MainUtil.sendMessage(player, Captions.NO_PERMISSION_EVENT,
+                                    Captions.PERMISSION_ADMIN_DESTROY_OTHER);
                                 event.setCancelled(true);
                             }
                         }
@@ -2467,14 +2489,15 @@ import java.util.regex.Pattern;
         PlotPlayer pp = BukkitUtil.getPlayer(p);
         Plot plot = area.getPlot(location);
         if (plot == null) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_ROAD);
+            if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_INTERACT_ROAD)) {
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_INTERACT_ROAD);
                 event.setCancelled(true);
             }
         } else if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
-                MainUtil
-                    .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_UNOWNED);
+            if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED)) {
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_INTERACT_UNOWNED);
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
@@ -2501,8 +2524,9 @@ import java.util.regex.Pattern;
             if (entity instanceof ItemFrame && plot.getFlag(Flags.MISC_INTERACT, false)) {
                 return;
             }
-            if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_OTHER)) {
-                MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_INTERACT_OTHER);
+            if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_INTERACT_OTHER)) {
+                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                    Captions.PERMISSION_ADMIN_INTERACT_OTHER);
                 event.setCancelled(true);
             }
         }
@@ -2522,14 +2546,14 @@ import java.util.regex.Pattern;
             Plot plot = area.getPlot(location);
             if (plot == null) {
                 if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.road")) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, "plots.admin.vehicle.break.road");
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.vehicle.break.road");
                     event.setCancelled(true);
                 }
             } else {
                 if (!plot.hasOwner()) {
                     if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.unowned")) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                        MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
                             "plots.admin.vehicle.break.unowned");
                         event.setCancelled(true);
                         return;
@@ -2541,7 +2565,7 @@ import java.util.regex.Pattern;
                         return;
                     }
                     if (!Permissions.hasPermission(pp, "plots.admin.vehicle.break.other")) {
-                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT,
+                        MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
                             "plots.admin.vehicle.break.other");
                         event.setCancelled(true);
                     }
@@ -2680,7 +2704,7 @@ import java.util.regex.Pattern;
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                         "plots.admin.destroy." + stub);
                     return false;
                 }
@@ -2690,7 +2714,7 @@ import java.util.regex.Pattern;
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {
-                    MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                         "plots.admin.destroy." + stub);
                     return false;
                 }
@@ -2701,8 +2725,8 @@ import java.util.regex.Pattern;
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.pve." + stub);
                     return false;
                 }
             } else if (victim instanceof Tameable) { // victim is tameable
@@ -2711,15 +2735,15 @@ import java.util.regex.Pattern;
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.pve." + stub);
                     return false;
                 }
             } else if (victim instanceof Player) {
                 if (plot != null) {
                     if (Flags.PVP.isFalse(plot) && !Permissions
                         .hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-                        MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                        MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                             "plots.admin.pvp." + stub);
                         return false;
                     } else {
@@ -2727,8 +2751,8 @@ import java.util.regex.Pattern;
                     }
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.pvp." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pvp." + stub);
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.pvp." + stub);
                     return false;
                 }
             } else if (victim instanceof Creature) { // victim is animal
@@ -2737,8 +2761,8 @@ import java.util.regex.Pattern;
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.pve." + stub);
                     return false;
                 }
             } else if (victim instanceof Vehicle) { // Vehicles are managed in vehicle destroy event
@@ -2749,8 +2773,8 @@ import java.util.regex.Pattern;
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.pve." + stub)) {
-                    MainUtil
-                        .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.pve." + stub);
+                    MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.pve." + stub);
                     return false;
                 }
             }
@@ -2775,20 +2799,20 @@ import java.util.regex.Pattern;
         Plot plot = area.getPlot(location);
         if (plot == null) {
             if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.road")) {
-                MainUtil
-                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.road");
+                MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                    "plots.admin.projectile.road");
                 event.setHatching(false);
             }
         } else if (!plot.hasOwner()) {
             if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.unowned")) {
-                MainUtil.sendMessage(plotPlayer, C.NO_PERMISSION_EVENT,
+                MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                     "plots.admin.projectile.unowned");
                 event.setHatching(false);
             }
         } else if (!plot.isAdded(plotPlayer.getUUID())) {
             if (!Permissions.hasPermission(plotPlayer, "plots.admin.projectile.other")) {
-                MainUtil
-                    .sendMessage(plotPlayer, C.NO_PERMISSION_EVENT, "plots.admin.projectile.other");
+                MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
+                    "plots.admin.projectile.other");
                 event.setHatching(false);
             }
         }
@@ -2806,15 +2830,15 @@ import java.util.regex.Pattern;
         Plot plot = area.getPlot(location);
         if (plot != null) {
             if ((location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
-                && !Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+                && !Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
                 event.setCancelled(true);
-                MainUtil.sendMessage(pp,
-                    C.HEIGHT_LIMIT.s().replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
+                MainUtil.sendMessage(pp, Captions.HEIGHT_LIMIT.s()
+                    .replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
             }
             if (!plot.hasOwner()) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) {
-                    MainUtil
-                        .sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_UNOWNED)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_UNOWNED);
                     event.setCancelled(true);
                     return;
                 }
@@ -2826,14 +2850,16 @@ import java.util.regex.Pattern;
                         return;
                     }
                 }
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_OTHER);
                     event.setCancelled(true);
                     return;
                 }
             } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
-                if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) {
-                    MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER);
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        Captions.PERMISSION_ADMIN_BUILD_OTHER);
                     event.setCancelled(true);
                     return;
                 }
@@ -2844,8 +2870,9 @@ import java.util.regex.Pattern;
                     sendBlockChange(block.getLocation(), block.getBlockData());
                 }
             }
-        } else if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
-            MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD);
+        } else if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_ROAD)) {
+            MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                Captions.PERMISSION_ADMIN_BUILD_ROAD);
             event.setCancelled(true);
         }
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 6de22d4a0..f4e1b8e3c 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.object;
 
 import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -100,15 +100,15 @@ public class BukkitPlayer extends PlotPlayer {
     }
 
     @Override public int hasPermissionRange(String stub, int range) {
-        if (hasPermission(C.PERMISSION_ADMIN.s())) {
+        if (hasPermission(Captions.PERMISSION_ADMIN.s())) {
             return Integer.MAX_VALUE;
         }
         String[] nodes = stub.split("\\.");
         StringBuilder n = new StringBuilder();
         for (int i = 0; i < (nodes.length - 1); i++) {
             n.append(nodes[i]).append(".");
-            if (!stub.equals(n + C.PERMISSION_STAR.s())) {
-                if (hasPermission(n + C.PERMISSION_STAR.s())) {
+            if (!stub.equals(n + Captions.PERMISSION_STAR.s())) {
+                if (hasPermission(n + Captions.PERMISSION_STAR.s())) {
                     return Integer.MAX_VALUE;
                 }
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
index 3557f33af..aaf5f4aa5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.object.schematic;
 
 import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.sk89q.jnbt.*;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -132,7 +132,7 @@ public class StateWrapper {
             .replace("\"underlined\":true,", "&n").replace("\"italic\":true,", "&o")
             .replace("[{\"text\":\"", "&0").replace("{\"text\":\"", "&0").replace("\"},", "")
             .replace("\"}]", "").replace("\"}", "");
-        for (Entry<String, String> entry : C.replacements.entrySet()) {
+        for (Entry<String, String> entry : Captions.replacements.entrySet()) {
             str = str.replace(entry.getKey(), entry.getValue());
         }
         return str;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
index 009b87ae5..ef3af32d9 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.util;
 
 import com.github.intellectualsites.plotsquared.bukkit.chat.FancyMessage;
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
@@ -21,7 +21,7 @@ public class BukkitChatManager extends ChatManager<FancyMessage> {
     }
 
     @Override public void color(PlotMessage message, String color) {
-        message.$(this).color(ChatColor.getByChar(C.color(color).substring(1)));
+        message.$(this).color(ChatColor.getByChar(Captions.color(color).substring(1)));
     }
 
     @Override public void tooltip(PlotMessage message, PlotMessage... tooltips) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 46dd6b6a8..55d3dbc1e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.util;
 
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem;
 import com.github.intellectualsites.plotsquared.plot.util.*;
@@ -174,9 +174,9 @@ import java.util.*;
      *
      * @param player  the recipient of the message
      * @param caption the message
-     * @see MainUtil#sendMessage(PlotPlayer, C, String...)
+     * @see MainUtil#sendMessage(PlotPlayer, Captions, String...)
      */
-    public static void sendMessage(Player player, C caption) {
+    public static void sendMessage(Player player, Captions caption) {
         MainUtil.sendMessage(BukkitUtil.getPlayer(player), caption);
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index 42a83f466..8d2726bfd 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.uuid;
 
 import com.github.intellectualsites.plotsquared.bukkit.util.NbtFactory;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
@@ -48,7 +48,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             world = worlds.get(0).getName();
         }
         TaskManager.runTaskAsync(() -> {
-            PlotSquared.debug(C.PREFIX + "&6Starting player data caching for: " + world);
+            PlotSquared.debug(Captions.PREFIX + "&6Starting player data caching for: " + world);
             File uuidFile = new File(PlotSquared.get().IMP.getDirectory(), "uuids.txt");
             if (uuidFile.exists()) {
                 try {
@@ -115,7 +115,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                             }
                         } catch (Exception e) {
                             e.printStackTrace();
-                            PlotSquared.debug(C.PREFIX + "Invalid playerdata: " + current);
+                            PlotSquared.debug(Captions.PREFIX + "Invalid playerdata: " + current);
                         }
                     }
                 }
@@ -145,7 +145,7 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                             UUID uuid = UUID.fromString(s);
                             uuids.add(uuid);
                         } catch (Exception ignored) {
-                            PlotSquared.debug(C.PREFIX + "Invalid PlayerData: " + current);
+                            PlotSquared.debug(Captions.PREFIX + "Invalid PlayerData: " + current);
                         }
                     }
                     break;
@@ -199,8 +199,8 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
                         }
                     }
                 } catch (Exception ignored) {
-                    PlotSquared
-                        .debug(C.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
+                    PlotSquared.debug(
+                        Captions.PREFIX + "&6Invalid PlayerData: " + uuid.toString() + ".dat");
                 }
             }
             for (String name : names) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
index 8df215693..86cd9ae0d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.bukkit.uuid;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.SQLite;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
@@ -153,7 +153,7 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
     }
 
     @Override public void fetchUUID(final String name, final RunnableVal<UUID> ifFetch) {
-        PlotSquared.debug(C.PREFIX + "UUID for '" + name
+        PlotSquared.debug(Captions.PREFIX + "UUID for '" + name
             + "' was null. We'll cache this from the Mojang servers!");
         if (ifFetch == null) {
             return;
@@ -196,25 +196,6 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
         }
     }
 
-    @Override public boolean add(final StringWrapper name, final UUID uuid) {
-        // Ignoring duplicates
-        if (super.add(name, uuid)) {
-            TaskManager.runTaskAsync(() -> {
-                try (PreparedStatement statement = getConnection()
-                    .prepareStatement("REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
-                    statement.setString(1, uuid.toString());
-                    statement.setString(2, name.toString());
-                    statement.execute();
-                    PlotSquared.debug(C.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
-                } catch (SQLException e) {
-                    e.printStackTrace();
-                }
-            });
-            return true;
-        }
-        return false;
-    }
-
     /**
      * This is useful for name changes
      */
@@ -226,14 +207,34 @@ public class SQLUUIDHandler extends UUIDHandlerImplementation {
                 statement.setString(1, name.value);
                 statement.setString(2, uuid.toString());
                 statement.execute();
-                PlotSquared
-                    .debug(C.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
+                PlotSquared.debug(
+                    Captions.PREFIX + "Name change for '" + uuid + "' to '" + name.value + '\'');
             } catch (SQLException e) {
                 e.printStackTrace();
             }
         });
     }
 
+    @Override public boolean add(final StringWrapper name, final UUID uuid) {
+        // Ignoring duplicates
+        if (super.add(name, uuid)) {
+            TaskManager.runTaskAsync(() -> {
+                try (PreparedStatement statement = getConnection()
+                    .prepareStatement("REPLACE INTO usercache (`uuid`, `username`) VALUES(?, ?)")) {
+                    statement.setString(1, uuid.toString());
+                    statement.setString(2, name.toString());
+                    statement.execute();
+                    PlotSquared
+                        .debug(Captions.PREFIX + "&cAdded '&6" + uuid + "&c' - '&6" + name + "&c'");
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            });
+            return true;
+        }
+        return false;
+    }
+
     private class SQLUUIDHandlerException extends RuntimeException {
 
         SQLUUIDHandlerException(String s, Throwable c) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
index 76abc8c7c..d2b4e7343 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.api;
 
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -57,7 +57,7 @@ import java.util.UUID;
     }
 
     /**
-     * Add a plot world.
+     * Adds a plot world.
      *
      * @param plotArea Plot World Object
      * @see PlotSquared#addPlotArea(PlotArea)
@@ -67,13 +67,13 @@ import java.util.UUID;
     }
 
     /**
-     * Returns the PlotSquared configurations file.
+     * Gets the configuration file for this plugin.
      *
-     * @return main configuration
-     * @see PlotSquared#config
+     * @return the configuration file for PlotSquared
+     * =
      */
     public YamlConfiguration getConfig() {
-        return PlotSquared.get().config;
+        return PlotSquared.get().getConfig();
     }
 
     /**
@@ -151,20 +151,20 @@ import java.util.UUID;
      * Send a message to the console. The message supports color codes.
      *
      * @param message the message
-     * @see MainUtil#sendConsoleMessage(C, String...)
+     * @see MainUtil#sendConsoleMessage(Captions, String...)
      */
     public void sendConsoleMessage(String message) {
         PlotSquared.log(message);
     }
 
     /**
-     * Send a message to the console.
+     * Sends a message to the console.
      *
      * @param caption the message
      * @see #sendConsoleMessage(String)
-     * @see C
+     * @see Captions
      */
-    public void sendConsoleMessage(C caption) {
+    public void sendConsoleMessage(Captions caption) {
         sendConsoleMessage(caption.s());
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
index 51509501e..b637292c1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
@@ -5,7 +5,7 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
 import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
 import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
@@ -239,18 +239,19 @@ public abstract class Command {
         if (page < totalPages && page > 0) { // Back | Next
             new PlotMessage().text("<-").color("$1").command(baseCommand + " " + page).text(" | ")
                 .color("$3").text("->").color("$1").command(baseCommand + " " + (page + 2))
-                .text(C.CLICKABLE.s()).color("$2").send(player);
+                .text(Captions.CLICKABLE.s()).color("$2").send(player);
             return;
         }
         if (page == 0 && totalPages != 0) { // Next
             new PlotMessage().text("<-").color("$3").text(" | ").color("$3").text("->").color("$1")
-                .command(baseCommand + " " + (0 + 2)).text(C.CLICKABLE.s()).color("$2")
+                .command(baseCommand + " " + (0 + 2)).text(Captions.CLICKABLE.s()).color("$2")
                 .send(player);
             return;
         }
         if (page == totalPages && totalPages != 0) { // Back
             new PlotMessage().text("<-").color("$1").command(baseCommand + " " + page).text(" | ")
-                .color("$3").text("->").color("$3").text(C.CLICKABLE.s()).color("$2").send(player);
+                .color("$3").text("->").color("$3").text(Captions.CLICKABLE.s()).color("$2")
+                .send(player);
         }
     }
 
@@ -267,7 +268,7 @@ public abstract class Command {
             if (this.parent == null) {
                 MainCommand.getInstance().help.displayHelp(player, null, 0);
             } else {
-                C.COMMAND_SYNTAX.send(player, getUsage());
+                Captions.COMMAND_SYNTAX.send(player, getUsage());
             }
             return;
         }
@@ -279,7 +280,7 @@ public abstract class Command {
         Command cmd = getCommand(args[0]);
         if (cmd == null) {
             if (this.parent != null) {
-                C.COMMAND_SYNTAX.send(player, getUsage());
+                Captions.COMMAND_SYNTAX.send(player, getUsage());
                 return;
             }
             // Help command
@@ -294,11 +295,11 @@ public abstract class Command {
             } catch (IllegalArgumentException ignored) {
             }
             // Command recommendation
-            MainUtil.sendMessage(player, C.NOT_VALID_SUBCOMMAND);
+            MainUtil.sendMessage(player, Captions.NOT_VALID_SUBCOMMAND);
             List<Command> commands = getCommands(player);
             if (commands.isEmpty()) {
-                MainUtil
-                    .sendMessage(player, C.DID_YOU_MEAN, MainCommand.getInstance().help.getUsage());
+                MainUtil.sendMessage(player, Captions.DID_YOU_MEAN,
+                    MainCommand.getInstance().help.getUsage());
                 return;
             }
             String[] allargs =
@@ -313,7 +314,7 @@ public abstract class Command {
             if (cmd == null) {
                 cmd = new StringComparison<>(args[0], this.allCommands).getMatchObject();
             }
-            MainUtil.sendMessage(player, C.DID_YOU_MEAN, cmd.getUsage());
+            MainUtil.sendMessage(player, Captions.DID_YOU_MEAN, cmd.getUsage());
             return;
         }
         String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
@@ -344,7 +345,7 @@ public abstract class Command {
                 failed = failed || reqArgs[i].parse(args[i]) == null;
             }
             if (failed) {
-                C.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
+                Captions.COMMAND_SYNTAX.send(player, StringMan.join(fullSplit, " "));
                 return false;
             }
         }
@@ -426,12 +427,13 @@ public abstract class Command {
         }
         if (!this.required.allows(player)) {
             if (message) {
-                MainUtil.sendMessage(player,
-                    this.required == RequiredType.PLAYER ? C.IS_CONSOLE : C.NOT_CONSOLE);
+                MainUtil.sendMessage(player, this.required == RequiredType.PLAYER ?
+                    Captions.IS_CONSOLE :
+                    Captions.NOT_CONSOLE);
             }
         } else if (!Permissions.hasPermission(player, getPermission())) {
             if (message) {
-                C.NO_PERMISSION.send(player, getPermission());
+                Captions.NO_PERMISSION.send(player, getPermission());
             }
         } else {
             return true;
@@ -548,13 +550,13 @@ public abstract class Command {
         return this.getFullId().hashCode();
     }
 
-    public void checkTrue(boolean mustBeTrue, C message, Object... args) {
+    public void checkTrue(boolean mustBeTrue, Captions message, Object... args) {
         if (!mustBeTrue) {
             throw new CommandException(message, args);
         }
     }
 
-    public <T extends Object> T check(T object, C message, Object... args) {
+    public <T extends Object> T check(T object, Captions message, Object... args) {
         if (object == null) {
             throw new CommandException(message, args);
         }
@@ -568,9 +570,9 @@ public abstract class Command {
 
     public static class CommandException extends RuntimeException {
         private final Object[] args;
-        private final C message;
+        private final Captions message;
 
-        public CommandException(C message, Object... args) {
+        public CommandException(Captions message, Object... args) {
             this.message = message;
             this.args = args;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index b82192e96..2e76f6516 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -5,7 +5,7 @@ import com.github.intellectualsites.plotsquared.configuration.MemorySection;
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization;
 import com.github.intellectualsites.plotsquared.plot.commands.WE_Anywhere;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.config.Storage;
@@ -42,6 +42,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -64,13 +65,13 @@ import java.util.zip.ZipInputStream;
     public File commandsFile;
     public File translationFile;
     public YamlConfiguration style;
-    public YamlConfiguration config;
     public YamlConfiguration worlds;
     public YamlConfiguration storage;
     public YamlConfiguration commands;
     // Temporary hold the plots/clusters before the worlds load
     public HashMap<String, Set<PlotCluster>> clusters_tmp;
     public HashMap<String, HashMap<PlotId, Plot>> plots_tmp;
+    private YamlConfiguration config;
     // Implementation logger
     @Setter @Getter private ILogger logger;
     // Platform / Version / Update URL
@@ -129,7 +130,7 @@ import java.util.zip.ZipInputStream;
             this.translationFile = MainUtil.getFile(this.IMP.getDirectory(),
                 Settings.Paths.TRANSLATIONS + File.separator + IMP.getPluginName()
                     + ".use_THIS.yml");
-            C.load(this.translationFile);
+            Captions.load(this.translationFile);
 
             // Setup plotAreaManager
             if (Settings.Enabled_Components.WORLDS) {
@@ -158,7 +159,7 @@ import java.util.zip.ZipInputStream;
             if (Settings.Enabled_Components.METRICS) {
                 this.IMP.startMetrics();
             } else {
-                PlotSquared.log(C.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
+                PlotSquared.log(Captions.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
             }
             if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
                 this.IMP.registerChunkProcessor();
@@ -285,7 +286,7 @@ import java.util.zip.ZipInputStream;
             e.printStackTrace();
         }
 
-        PlotSquared.log(C.ENABLED.f(IMP.getPluginName()));
+        PlotSquared.log(Captions.ENABLED.f(IMP.getPluginName()));
     }
 
     /**
@@ -801,9 +802,9 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Gets all the plots in a single set.
+     * Gets all the plots across all plotworlds in one {@code Set}.
      *
-     * @return Set of Plots
+     * @return all the plots on the server loaded by this plugin
      */
     public Set<Plot> getPlots() {
         int size = getPlotCount();
@@ -886,12 +887,9 @@ import java.util.zip.ZipInputStream;
      * @return Set of plot
      */
     public Set<Plot> getPlots(String world, UUID uuid) {
-        final Set<Plot> plots = new HashSet<>();
-        for (final Plot plot : getPlots(world)) {
-            if (plot.hasOwner() && plot.isOwnerAbs(uuid)) {
-                plots.add(plot);
-            }
-        }
+        final Set<Plot> plots =
+            getPlots(world).stream().filter(plot -> plot.hasOwner() && plot.isOwnerAbs(uuid))
+                .collect(Collectors.toSet());
         return Collections.unmodifiableSet(plots);
     }
 
@@ -999,7 +997,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Unregister a plot from local memory (does not call DB).
+     * Unregisters a plot from local memory without calling the database.
      *
      * @param plot      the plot to remove
      * @param callEvent If to call an event about the plot being removed
@@ -1091,11 +1089,12 @@ import java.util.zip.ZipInputStream;
             // Conventional plot generator
             PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
             PlotManager plotManager = plotGenerator.getNewPlotManager();
-            PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
-            PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
-            PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
+            PlotSquared.log(Captions.PREFIX + "&aDetected world load for '" + world + "'");
             PlotSquared
-                .log(C.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
+                .log(Captions.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
+            PlotSquared.log(Captions.PREFIX + "&3 - plotworld: &7" + plotArea.getClass().getName());
+            PlotSquared.log(
+                Captions.PREFIX + "&3 - plotAreaManager: &7" + plotManager.getClass().getName());
             if (!this.worlds.contains(path)) {
                 this.worlds.createSection(path);
                 worldSection = this.worlds.getConfigurationSection(path);
@@ -1120,7 +1119,7 @@ import java.util.zip.ZipInputStream;
                     debug("World possibly already loaded: " + world);
                     return;
                 }
-                PlotSquared.log(C.PREFIX + "&aDetected world load for '" + world + "'");
+                PlotSquared.log(Captions.PREFIX + "&aDetected world load for '" + world + "'");
                 String gen_string = worldSection.getString("generator.plugin", IMP.getPluginName());
                 if (type == 2) {
                     Set<PlotCluster> clusters =
@@ -1137,7 +1136,7 @@ import java.util.zip.ZipInputStream;
                         worldSection.createSection("areas." + fullId);
                         DBFunc.replaceWorld(world, world + ";" + name, pos1, pos2); // NPE
 
-                        PlotSquared.log(C.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
+                        PlotSquared.log(Captions.PREFIX + "&3 - " + name + "-" + pos1 + "-" + pos2);
                         GeneratorWrapper<?> areaGen = this.IMP.getGenerator(world, gen_string);
                         if (areaGen == null) {
                             throw new IllegalArgumentException("Invalid Generator: " + gen_string);
@@ -1151,11 +1150,13 @@ import java.util.zip.ZipInputStream;
                         } catch (IOException e) {
                             e.printStackTrace();
                         }
+                        PlotSquared.log(
+                            Captions.PREFIX + "&c | &9generator: &7" + baseGenerator + ">"
+                                + areaGen);
+                        PlotSquared.log(Captions.PREFIX + "&c | &9plotworld: &7" + pa);
+                        PlotSquared.log(Captions.PREFIX + "&c | &9manager: &7" + pa);
                         PlotSquared
-                            .log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                        PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                        PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa);
-                        PlotSquared.log(C.PREFIX + "&cNote: &7Area created for cluster:" + name
+                            .log(Captions.PREFIX + "&cNote: &7Area created for cluster:" + name
                             + " (invalid or old configuration?)");
                         areaGen.getPlotGenerator().initialize(pa);
                         areaGen.augment(pa);
@@ -1178,9 +1179,10 @@ import java.util.zip.ZipInputStream;
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-                PlotSquared.log(C.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
-                PlotSquared.log(C.PREFIX + "&3 - plotworld: &7" + pa);
-                PlotSquared.log(C.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
+                PlotSquared
+                    .log(Captions.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + areaGen);
+                PlotSquared.log(Captions.PREFIX + "&3 - plotworld: &7" + pa);
+                PlotSquared.log(Captions.PREFIX + "&3 - plotAreaManager: &7" + pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);
@@ -1191,7 +1193,7 @@ import java.util.zip.ZipInputStream;
                     "Invalid type for multi-area world. Expected `2`, got `" + 1 + "`");
             }
             for (String areaId : areasSection.getKeys(false)) {
-                PlotSquared.log(C.PREFIX + "&3 - " + areaId);
+                PlotSquared.log(Captions.PREFIX + "&3 - " + areaId);
                 String[] split = areaId.split("(?<=[^;-])-");
                 if (split.length != 3) {
                     throw new IllegalArgumentException("Invalid Area identifier: " + areaId
@@ -1253,10 +1255,11 @@ import java.util.zip.ZipInputStream;
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-                PlotSquared.log(C.PREFIX + "&aDetected area load for '" + world + "'");
-                PlotSquared.log(C.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
-                PlotSquared.log(C.PREFIX + "&c | &9plotworld: &7" + pa);
-                PlotSquared.log(C.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
+                PlotSquared.log(Captions.PREFIX + "&aDetected area load for '" + world + "'");
+                PlotSquared
+                    .log(Captions.PREFIX + "&c | &9generator: &7" + baseGenerator + ">" + areaGen);
+                PlotSquared.log(Captions.PREFIX + "&c | &9plotworld: &7" + pa);
+                PlotSquared.log(Captions.PREFIX + "&c | &9manager: &7" + pa.getPlotManager());
                 areaGen.getPlotGenerator().initialize(pa);
                 areaGen.augment(pa);
                 addPlotArea(pa);
@@ -1403,20 +1406,16 @@ import java.util.zip.ZipInputStream;
 
     public String normalisedVersion(@NonNull final String version) {
         final String[] split = Pattern.compile(".", Pattern.LITERAL).split(version);
-        final StringBuilder sb = new StringBuilder();
-        for (final String s : split) {
-            sb.append(String.format("%" + 4 + 's', s));
-        }
-        return sb.toString();
+        return Arrays.stream(split).map(s -> String.format("%4s", s)).collect(Collectors.joining());
     }
 
-    public boolean update(PlotPlayer sender, URL url) {
+    private boolean update(PlotPlayer sender, URL url) {
         try {
             String name = this.jarFile.getName();
-            File newJar = new File("plugins/update/" + name);
             MainUtil.sendMessage(sender, "$1Downloading from provided URL: &7" + url);
             URLConnection con = url.openConnection();
             try (InputStream stream = con.getInputStream()) {
+                File newJar = new File("plugins/update/" + name);
                 File parent = newJar.getParentFile();
                 if (!parent.exists()) {
                     parent.mkdirs();
@@ -1443,7 +1442,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Copy a file from inside the jar to a location
+     * Copies a file from inside the jar to a location
      *
      * @param file   Name of the file inside PlotSquared.jar
      * @param folder The output location relative to /plugins/PlotSquared/
@@ -1511,7 +1510,7 @@ import java.util.zip.ZipInputStream;
     }
 
     /**
-     * Close the database connection.
+     * Safely closes the database connection.
      */
     public void disable() {
         try {
@@ -1548,7 +1547,7 @@ import java.util.zip.ZipInputStream;
                 File file = MainUtil.getFile(IMP.getDirectory(), Storage.SQLite.DB + ".db");
                 database = new SQLite(file);
             } else {
-                PlotSquared.log(C.PREFIX + "&cNo storage type is set!");
+                PlotSquared.log(Captions.PREFIX + "&cNo storage type is set!");
                 this.IMP.shutdown(); //shutdown used instead of disable because no database is set
                 return;
             }
@@ -1566,8 +1565,8 @@ import java.util.zip.ZipInputStream;
             }
             this.clusters_tmp = DBFunc.getClusters();
         } catch (ClassNotFoundException | SQLException e) {
-            PlotSquared.log(
-                C.PREFIX + "&cFailed to open DATABASE connection. The plugin will disable itself.");
+            PlotSquared.log(Captions.PREFIX
+                + "&cFailed to open DATABASE connection. The plugin will disable itself.");
             if (Storage.MySQL.USE) {
                 PlotSquared.log("$4MYSQL");
             } else if (Storage.SQLite.USE) {
@@ -1589,15 +1588,16 @@ import java.util.zip.ZipInputStream;
      * @throws IOException if the config failed to save
      */
     public void setupConfig() throws IOException {
-        String lastVersionString = this.config.getString("version");
+        String lastVersionString = this.getConfig().getString("version");
         if (lastVersionString != null) {
             String[] split = lastVersionString.split("\\.");
             int[] lastVersion = new int[] {Integer.parseInt(split[0]), Integer.parseInt(split[1]),
                 Integer.parseInt(split[2])};
             if (checkVersion(new int[] {3, 4, 0}, lastVersion)) {
                 Settings.convertLegacy(configFile);
-                if (config.contains("worlds")) {
-                    ConfigurationSection worldSection = config.getConfigurationSection("worlds");
+                if (getConfig().contains("worlds")) {
+                    ConfigurationSection worldSection =
+                        getConfig().getConfigurationSection("worlds");
                     worlds.set("worlds", worldSection);
                     try {
                         worlds.save(worldsFile);
@@ -1639,7 +1639,7 @@ import java.util.zip.ZipInputStream;
     public boolean setupConfigs() {
         File folder = new File(this.IMP.getDirectory(), "config");
         if (!folder.exists() && !folder.mkdirs()) {
-            PlotSquared.log(C.PREFIX
+            PlotSquared.log(Captions.PREFIX
                 + "&cFailed to create the /plugins/config folder. Please create it manually.");
         }
         try {
@@ -1655,11 +1655,11 @@ import java.util.zip.ZipInputStream;
                     .getString("configuration_version")
                     .equalsIgnoreCase(LegacyConverter.CONFIGURATION_VERSION)) {
                     // Conversion needed
-                    log(C.LEGACY_CONFIG_FOUND.s());
+                    log(Captions.LEGACY_CONFIG_FOUND.s());
                     try {
                         com.google.common.io.Files
                             .copy(this.worldsFile, new File(folder, "worlds.yml.old"));
-                        log(C.LEGACY_CONFIG_BACKUP.s());
+                        log(Captions.LEGACY_CONFIG_BACKUP.s());
                         final ConfigurationSection worlds =
                             this.worlds.getConfigurationSection("worlds");
                         final LegacyConverter converter = new LegacyConverter(worlds);
@@ -1668,9 +1668,9 @@ import java.util.zip.ZipInputStream;
                             .set("configuration_version", LegacyConverter.CONFIGURATION_VERSION);
                         this.worlds.set("worlds", worlds); // Redundant, but hey... ¯\_(ツ)_/¯
                         this.worlds.save(this.worldsFile);
-                        log(C.LEGACY_CONFIG_DONE.s());
+                        log(Captions.LEGACY_CONFIG_DONE.s());
                     } catch (final Exception e) {
-                        log(C.LEGACY_CONFIG_CONVERSION_FAILED.s());
+                        log(Captions.LEGACY_CONFIG_CONVERSION_FAILED.s());
                         e.printStackTrace();
                     }
                     // Disable plugin
@@ -1759,7 +1759,7 @@ import java.util.zip.ZipInputStream;
         if (Settings.DEBUG) {
             Map<String, Object> components = Settings.getFields(Settings.Enabled_Components.class);
             for (Entry<String, Object> component : components.entrySet()) {
-                PlotSquared.log(C.PREFIX + String
+                PlotSquared.log(Captions.PREFIX + String
                     .format("&cKey: &6%s&c, Value: &6%s", component.getKey(),
                         component.getValue()));
             }
@@ -1790,7 +1790,7 @@ import java.util.zip.ZipInputStream;
      *
      * @return the java version
      */
-    public double getJavaVersion() {
+    private double getJavaVersion() {
         return Double.parseDouble(System.getProperty("java.specification.version"));
     }
 
@@ -1800,36 +1800,36 @@ import java.util.zip.ZipInputStream;
         }
     }
 
-    public void forEachPlotArea(@NonNull final String world, Consumer<PlotArea> runnable) {
+    public void forEachPlotArea(@NonNull final String world, Consumer<PlotArea> consumer) {
         final PlotArea[] array = this.plotAreaManager.getPlotAreas(world, null);
         if (array == null) {
             return;
         }
         for (final PlotArea area : array) {
-            runnable.accept(area);
+            consumer.accept(area);
         }
     }
 
-    public void forEachPlot(Consumer<Plot> runnable) {
+    public void forEachPlot(Consumer<Plot> consumer) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable);
+            area.getPlots().forEach(consumer);
         }
     }
 
-    public void forEachPlotRaw(Consumer<Plot> runnable) {
+    public void forEachPlotRaw(Consumer<Plot> consumer) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.getPlots().forEach(runnable);
+            area.getPlots().forEach(consumer);
         }
         if (this.plots_tmp != null) {
             for (final HashMap<PlotId, Plot> entry : this.plots_tmp.values()) {
-                entry.values().forEach(runnable);
+                entry.values().forEach(consumer);
             }
         }
     }
 
-    public void forEachBasePlot(Consumer<Plot> run) {
+    public void forEachBasePlot(Consumer<Plot> consumer) {
         for (final PlotArea area : this.plotAreaManager.getAllPlotAreas()) {
-            area.forEachBasePlot(run);
+            area.forEachBasePlot(consumer);
         }
     }
 
@@ -1961,6 +1961,10 @@ import java.util.zip.ZipInputStream;
         return Collections.unmodifiableSet(set);
     }
 
+    public YamlConfiguration getConfig() {
+        return config;
+    }
+
     public enum SortType {
         CREATION_DATE, CREATION_DATE_TIMESTAMP, LAST_MODIFIED, DISTANCE_FROM_ORIGIN
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
index 03d27555a..b5bbbd2e0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -28,31 +28,32 @@ import java.util.UUID;
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
+        final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
+        checkTrue(plot.hasOwner(), Captions.PLOT_UNOWNED);
         checkTrue(plot.isOwner(player.getUUID()) || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.NO_PLOT_PERMS);
-        checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
+            Captions.NO_PLOT_PERMS);
+        checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
         final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-        checkTrue(!uuids.isEmpty(), C.INVALID_PLAYER, args[0]);
+        checkTrue(!uuids.isEmpty(), Captions.INVALID_PLAYER, args[0]);
         Iterator<UUID> iter = uuids.iterator();
         int size = plot.getTrusted().size() + plot.getMembers().size();
         while (iter.hasNext()) {
             UUID uuid = iter.next();
             if (uuid == DBFunc.EVERYONE && !(
-                Permissions.hasPermission(player, C.PERMISSION_TRUST_EVERYONE) || Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST))) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
+                Permissions.hasPermission(player, Captions.PERMISSION_TRUST_EVERYONE) || Permissions
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST))) {
+                MainUtil.sendMessage(player, Captions.INVALID_PLAYER, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
             if (plot.isOwner(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
+                MainUtil.sendMessage(player, Captions.ALREADY_OWNER, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
             if (plot.getMembers().contains(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
+                MainUtil.sendMessage(player, Captions.ALREADY_ADDED, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
@@ -60,7 +61,8 @@ import java.util.UUID;
         }
         checkTrue(!uuids.isEmpty(), null);
         checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
+            Captions.PLOT_MAX_MEMBERS);
         confirm.run(this, new Runnable() {
             @Override // Success
             public void run() {
@@ -74,7 +76,7 @@ import java.util.UUID;
                     }
                     plot.addMember(uuid);
                     EventUtil.manager.callMember(player, plot, uuid, true);
-                    MainUtil.sendMessage(player, C.MEMBER_ADDED);
+                    MainUtil.sendMessage(player, Captions.MEMBER_ADDED);
                 }
             }
         }, null);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
index 2eeb0a49d..3602bda5e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -21,23 +21,23 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
 
         if (args.length == 0) {
-            C.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <value>");
+            Captions.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <value>");
             return false;
         }
 
         Location loc = player.getLocation();
         Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
 
         if (!plot.hasOwner()) {
-            sendMessage(player, C.PLOT_NOT_CLAIMED);
+            sendMessage(player, Captions.PLOT_NOT_CLAIMED);
             return false;
         }
 
         if (!plot.isOwner(player.getUUID())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
 
@@ -46,25 +46,25 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
         switch (args[0].toLowerCase()) {
             case "set":
                 if (args.length != 2) {
-                    C.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
+                    Captions.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
                     return false;
                 }
 
-                if (canExecuteCommand(player, C.PERMISSION_ALIAS_SET, false) || canExecuteCommand(
-                    player, C.PERMISSION_ALIAS_SET_OBSOLETE, false)) {
+                if (canExecuteCommand(player, Captions.PERMISSION_ALIAS_SET, false)
+                    || canExecuteCommand(player, Captions.PERMISSION_ALIAS_SET_OBSOLETE, false)) {
                     result = setAlias(player, plot, args[1]);
                 } else {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION);
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION);
                 }
 
                 break;
             case "remove":
-                if (canExecuteCommand(player, C.PERMISSION_ALIAS_REMOVE, true)) {
+                if (canExecuteCommand(player, Captions.PERMISSION_ALIAS_REMOVE, true)) {
                     result = removeAlias(player, plot);
                 }
                 break;
             default:
-                C.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <alias>");
+                Captions.COMMAND_SYNTAX.send(player, "/plot alias <set|remove> <alias>");
                 result = false;
         }
 
@@ -74,47 +74,47 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 
     private boolean setAlias(PlotPlayer player, Plot plot, String alias) {
         if (alias.isEmpty()) {
-            C.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
+            Captions.COMMAND_SYNTAX.send(player, "/plot alias <set> <value>");
             return false;
         }
         if (alias.length() >= 50) {
-            MainUtil.sendMessage(player, C.ALIAS_TOO_LONG);
+            MainUtil.sendMessage(player, Captions.ALIAS_TOO_LONG);
             return false;
         }
         if (alias.contains(" ")) {
-            C.NOT_VALID_VALUE.send(player);
+            Captions.NOT_VALID_VALUE.send(player);
             return false;
         }
         if (MathMan.isInteger(alias)) {
-            C.NOT_VALID_VALUE.send(player);
+            Captions.NOT_VALID_VALUE.send(player);
             return false;
         }
         for (Plot p : PlotSquared.get().getPlots(plot.getArea())) {
             if (p.getAlias().equalsIgnoreCase(alias)) {
-                MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
+                MainUtil.sendMessage(player, Captions.ALIAS_IS_TAKEN);
                 return false;
             }
         }
         if (UUIDHandler.nameExists(new StringWrapper(alias)) || PlotSquared.get()
             .hasPlotArea(alias)) {
-            MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
+            MainUtil.sendMessage(player, Captions.ALIAS_IS_TAKEN);
             return false;
         }
         plot.setAlias(alias);
-        MainUtil.sendMessage(player, C.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
+        MainUtil.sendMessage(player, Captions.ALIAS_SET_TO.s().replaceAll("%alias%", alias));
         return true;
     }
 
     private boolean removeAlias(PlotPlayer player, Plot plot) {
         plot.setAlias(null);
-        MainUtil.sendMessage(player, C.ALIAS_REMOVED.s());
+        MainUtil.sendMessage(player, Captions.ALIAS_REMOVED.s());
         return true;
     }
 
-    private boolean canExecuteCommand(PlotPlayer player, C caption, boolean sendMessage) {
+    private boolean canExecuteCommand(PlotPlayer player, Captions caption, boolean sendMessage) {
         if (!Permissions.hasPermission(player, caption)) {
             if (sendMessage) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION);
+                MainUtil.sendMessage(player, Captions.NO_PERMISSION);
             }
             return false;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
index 0427b8926..933938e2e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
@@ -20,20 +20,20 @@ public class Area extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 0) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         switch (args[0].toLowerCase()) {
             case "c":
             case "setup":
             case "create":
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_CREATE)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_CREATE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_AREA_CREATE)) {
+                    Captions.NO_PERMISSION.send(player, Captions.PERMISSION_AREA_CREATE);
                     return false;
                 }
                 switch (args.length) {
                     case 1:
-                        C.COMMAND_SYNTAX
+                        Captions.COMMAND_SYNTAX
                             .send(player, "/plot area create [world[:id]] [<modifier>=<value>]...");
                         return false;
                     case 2:
@@ -41,13 +41,13 @@ public class Area extends SubCommand {
                             case "pos1": { // Set position 1
                                 HybridPlotWorld area = player.getMeta("area_create_area");
                                 if (area == null) {
-                                    C.COMMAND_SYNTAX.send(player,
+                                    Captions.COMMAND_SYNTAX.send(player,
                                         "/plot area create [world[:id]] [<modifier>=<value>]...");
                                     return false;
                                 }
                                 Location location = player.getLocation();
                                 player.setMeta("area_pos1", location);
-                                C.SET_ATTRIBUTE.send(player, "area_pos1",
+                                Captions.SET_ATTRIBUTE.send(player, "area_pos1",
                                     location.getX() + "," + location.getZ());
                                 MainUtil.sendMessage(player,
                                     "You will now set pos2: /plot area create pos2"
@@ -57,7 +57,7 @@ public class Area extends SubCommand {
                             case "pos2":  // Set position 2 and finish creation for type=2 (partial)
                                 final HybridPlotWorld area = player.getMeta("area_create_area");
                                 if (area == null) {
-                                    C.COMMAND_SYNTAX.send(player,
+                                    Captions.COMMAND_SYNTAX.send(player,
                                         "/plot area create [world[:id]] [<modifier>=<value>]...");
                                     return false;
                                 }
@@ -84,7 +84,7 @@ public class Area extends SubCommand {
                                 Set<PlotArea> areas =
                                     PlotSquared.get().getPlotAreas(area.worldname, region);
                                 if (!areas.isEmpty()) {
-                                    C.CLUSTER_INTERSECTION
+                                    Captions.CLUSTER_INTERSECTION
                                         .send(player, areas.iterator().next().toString());
                                     return false;
                                 }
@@ -113,7 +113,7 @@ public class Area extends SubCommand {
                                     final String world = SetupUtils.manager.setupWorld(object);
                                     if (WorldUtil.IMP.isWorld(world)) {
                                         PlotSquared.get().loadWorld(world, null);
-                                        C.SETUP_FINISHED.send(player);
+                                        Captions.SETUP_FINISHED.send(player);
                                         player.teleport(WorldUtil.IMP.getSpawn(world));
                                         if (area.TERRAIN != 3) {
                                             ChunkManager.largeRegionTask(world, region,
@@ -153,7 +153,7 @@ public class Area extends SubCommand {
                             PlotSquared.get().IMP.getDefaultGenerator(), null, null);
                         PlotArea other = PlotSquared.get().getPlotArea(pa.worldname, id);
                         if (other != null && Objects.equals(pa.id, other.id)) {
-                            C.SETUP_WORLD_TAKEN.send(player, pa.toString());
+                            Captions.SETUP_WORLD_TAKEN.send(player, pa.toString());
                             return false;
                         }
                         Set<PlotArea> areas = PlotSquared.get().getPlotAreas(pa.worldname);
@@ -165,7 +165,7 @@ public class Area extends SubCommand {
                         for (int i = 2; i < args.length; i++) {
                             String[] pair = args[i].split("=");
                             if (pair.length != 2) {
-                                C.COMMAND_SYNTAX.send(player, getCommandString()
+                                Captions.COMMAND_SYNTAX.send(player, getCommandString()
                                     + " create [world[:id]] [<modifier>=<value>]...");
                                 return false;
                             }
@@ -213,14 +213,14 @@ public class Area extends SubCommand {
                                     object.type = pa.TYPE;
                                     break;
                                 default:
-                                    C.COMMAND_SYNTAX.send(player, getCommandString()
+                                    Captions.COMMAND_SYNTAX.send(player, getCommandString()
                                         + " create [world[:id]] [<modifier>=<value>]...");
                                     return false;
                             }
                         }
                         if (pa.TYPE != 2) {
                             if (WorldUtil.IMP.isWorld(pa.worldname)) {
-                                C.SETUP_WORLD_TAKEN.send(player, pa.worldname);
+                                Captions.SETUP_WORLD_TAKEN.send(player, pa.worldname);
                                 return false;
                             }
                             Runnable run = () -> {
@@ -236,7 +236,7 @@ public class Area extends SubCommand {
                                 object.setupGenerator = PlotSquared.imp().getPluginName();
                                 String world = SetupUtils.manager.setupWorld(object);
                                 if (WorldUtil.IMP.isWorld(world)) {
-                                    C.SETUP_FINISHED.send(player);
+                                    Captions.SETUP_FINISHED.send(player);
                                     player.teleport(WorldUtil.IMP.getSpawn(world));
                                 } else {
                                     MainUtil.sendMessage(player,
@@ -258,7 +258,7 @@ public class Area extends SubCommand {
                             return true;
                         }
                         if (pa.id == null) {
-                            C.COMMAND_SYNTAX.send(player, getCommandString()
+                            Captions.COMMAND_SYNTAX.send(player, getCommandString()
                                 + " create [world[:id]] [<modifier>=<value>]...");
                             return false;
                         }
@@ -281,8 +281,8 @@ public class Area extends SubCommand {
                 return true;
             case "i":
             case "info": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_INFO)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_INFO);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_AREA_INFO)) {
+                    Captions.NO_PERMISSION.send(player, Captions.PERMISSION_AREA_INFO);
                     return false;
                 }
                 PlotArea area;
@@ -294,14 +294,14 @@ public class Area extends SubCommand {
                         area = PlotSquared.get().getPlotAreaByString(args[1]);
                         break;
                     default:
-                        C.COMMAND_SYNTAX.send(player, getCommandString() + " info [area]");
+                        Captions.COMMAND_SYNTAX.send(player, getCommandString() + " info [area]");
                         return false;
                 }
                 if (area == null) {
                     if (args.length == 2) {
-                        C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
+                        Captions.NOT_VALID_PLOT_WORLD.send(player, args[1]);
                     } else {
-                        C.NOT_IN_PLOT_WORLD.send(player);
+                        Captions.NOT_IN_PLOT_WORLD.send(player);
                     }
                     return false;
                 }
@@ -328,13 +328,14 @@ public class Area extends SubCommand {
                     + "\n$1Claimed: $2" + claimed + "\n$1Clusters: $2" + clusters + "\n$1Region: $2"
                     + region + "\n$1Generator: $2" + generator;
                 MainUtil.sendMessage(player,
-                    C.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + C.PLOT_INFO_FOOTER.s(), false);
+                    Captions.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + Captions.PLOT_INFO_FOOTER
+                        .s(), false);
                 return true;
             }
             case "l":
             case "list":
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_LIST)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_LIST);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_AREA_LIST)) {
+                    Captions.NO_PERMISSION.send(player, Captions.PERMISSION_AREA_LIST);
                     return false;
                 }
                 int page;
@@ -348,7 +349,7 @@ public class Area extends SubCommand {
                             break;
                         }
                     default:
-                        C.COMMAND_SYNTAX.send(player, getCommandString() + " list [#]");
+                        Captions.COMMAND_SYNTAX.send(player, getCommandString() + " list [#]");
                         return false;
                 }
                 ArrayList<PlotArea> areas = new ArrayList<>(PlotSquared.get().getPlotAreas());
@@ -390,19 +391,19 @@ public class Area extends SubCommand {
                                 .color("$1").text(" - ").color("$2")
                                 .text(area.TYPE + ":" + area.TERRAIN).color("$3");
                         }
-                    }, "/plot area list", C.AREA_LIST_HEADER_PAGED.s());
+                    }, "/plot area list", Captions.AREA_LIST_HEADER_PAGED.s());
                 return true;
             case "regen":
             case "clear":
             case "reset":
             case "regenerate": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_REGEN)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_REGEN);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_AREA_REGEN)) {
+                    Captions.NO_PERMISSION.send(player, Captions.PERMISSION_AREA_REGEN);
                     return false;
                 }
                 final PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                     return false;
                 }
                 if (area.TYPE != 2) {
@@ -423,17 +424,17 @@ public class Area extends SubCommand {
             case "teleport":
             case "visit":
             case "tp":
-                if (!Permissions.hasPermission(player, C.PERMISSION_AREA_TP)) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_AREA_TP);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_AREA_TP)) {
+                    Captions.NO_PERMISSION.send(player, Captions.PERMISSION_AREA_TP);
                     return false;
                 }
                 if (args.length != 2) {
-                    C.COMMAND_SYNTAX.send(player, "/plot visit [area]");
+                    Captions.COMMAND_SYNTAX.send(player, "/plot visit [area]");
                     return false;
                 }
                 PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
                 if (area == null) {
-                    C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
+                    Captions.NOT_VALID_PLOT_WORLD.send(player, args[1]);
                     return false;
                 }
                 Location center;
@@ -459,7 +460,7 @@ public class Area extends SubCommand {
                         + "\n$1Stop the server and delete it from these locations.");
                 return true;
         }
-        C.COMMAND_SYNTAX.send(player, getUsage());
+        Captions.COMMAND_SYNTAX.send(player, getUsage());
         return false;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index 690c1098f..833e02968 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -30,14 +30,14 @@ public class Auto extends SubCommand {
         int diff = currentPlots - allowed_plots;
         if (diff + size_x * size_z > 0) {
             if (diff < 0) {
-                MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS_NUM, -diff + "");
+                MainUtil.sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS_NUM, -diff + "");
                 return false;
             } else if (player.hasPersistentMeta("grantedPlots")) {
                 int grantedPlots =
                     ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
                 if (grantedPlots - diff < size_x * size_z) {
                     player.removePersistentMeta("grantedPlots");
-                    MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                    MainUtil.sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS);
                     return false;
                 } else {
                     int left = grantedPlots - diff - size_x * size_z;
@@ -47,11 +47,11 @@ public class Auto extends SubCommand {
                         player.setPersistentMeta("grantedPlots",
                             ByteArrayUtilities.integerToBytes(left));
                     }
-                    MainUtil.sendMessage(player, C.REMOVED_GRANTED_PLOT, "" + left,
+                    MainUtil.sendMessage(player, Captions.REMOVED_GRANTED_PLOT, "" + left,
                         "" + (grantedPlots - left));
                 }
             } else {
-                MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                MainUtil.sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS);
                 return false;
             }
         }
@@ -106,7 +106,7 @@ public class Auto extends SubCommand {
                     @Override public void run(Object ignore) {
                         player.deleteMeta(Auto.class.getName());
                         if (plot == null) {
-                            MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
+                            MainUtil.sendMessage(player, Captions.NO_FREE_PLOTS);
                         } else if (checkAllowedPlots(player, area, allowed_plots, 1, 1)) {
                             plot.claim(player, true, schem, false);
                             if (area.AUTO_MERGE) {
@@ -150,7 +150,7 @@ public class Auto extends SubCommand {
                 }
             }
             if (plotarea == null) {
-                MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
+                MainUtil.sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
                 return false;
             }
         }
@@ -158,7 +158,7 @@ public class Auto extends SubCommand {
         int size_z = 1;
         String schematic = null;
         if (args.length > 0) {
-            if (Permissions.hasPermission(player, C.PERMISSION_AUTO_MEGA)) {
+            if (Permissions.hasPermission(player, Captions.PERMISSION_AUTO_MEGA)) {
                 try {
                     String[] split = args[0].split(",|;");
                     size_x = Integer.parseInt(split[0]);
@@ -179,12 +179,12 @@ public class Auto extends SubCommand {
                 }
             } else {
                 schematic = args[0];
-                // PlayerFunctions.sendMessage(plr, C.NO_PERMISSION);
+                // PlayerFunctions.sendMessage(plr, Captions.NO_PERMISSION);
                 // return false;
             }
         }
         if (size_x * size_z > Settings.Claim.MAX_AUTO_AREA) {
-            MainUtil.sendMessage(player, C.CANT_CLAIM_MORE_PLOTS_NUM,
+            MainUtil.sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS_NUM,
                 Settings.Claim.MAX_AUTO_AREA + "");
             return false;
         }
@@ -196,13 +196,14 @@ public class Auto extends SubCommand {
 
         if (schematic != null && !schematic.isEmpty()) {
             if (!plotarea.SCHEMATICS.contains(schematic.toLowerCase())) {
-                sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
+                sendMessage(player, Captions.SCHEMATIC_INVALID, "non-existent: " + schematic);
                 return true;
             }
-            if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
-                && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                    C.PERMISSION_CLAIM_SCHEMATIC.f(schematic));
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
+                && !Permissions
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
+                MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                    Captions.PERMISSION_CLAIM_SCHEMATIC.f(schematic));
                 return true;
             }
         }
@@ -214,11 +215,11 @@ public class Auto extends SubCommand {
             cost = (size_x * size_z) * cost;
             if (cost > 0d) {
                 if (EconHandler.manager.getMoney(player) < cost) {
-                    sendMessage(player, C.CANNOT_AFFORD_PLOT, "" + cost);
+                    sendMessage(player, Captions.CANNOT_AFFORD_PLOT, "" + cost);
                     return true;
                 }
                 EconHandler.manager.withdrawMoney(player, cost);
-                sendMessage(player, C.REMOVED_BALANCE, cost + "");
+                sendMessage(player, Captions.REMOVED_BALANCE, cost + "");
             }
         }
         // TODO handle type 2 the same as normal worlds!
@@ -227,7 +228,7 @@ public class Auto extends SubCommand {
             return true;
         } else {
             if (plotarea.TYPE == 2) {
-                MainUtil.sendMessage(player, C.NO_FREE_PLOTS);
+                MainUtil.sendMessage(player, Captions.NO_FREE_PLOTS);
                 return false;
             }
             while (true) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
index 82a573949..6f80ba6c5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@@ -17,20 +17,20 @@ import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
         int biome = WorldUtil.IMP.getBiomeFromString(value);
         if (biome == -1) {
             String biomes =
-                StringMan.join(WorldUtil.IMP.getBiomeList(), C.BLOCK_LIST_SEPARATER.s());
-            C.NEED_BIOME.send(player);
-            MainUtil.sendMessage(player, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + biomes);
+                StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATER.s());
+            Captions.NEED_BIOME.send(player);
+            MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.s() + biomes);
             return false;
         }
         if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
             return false;
         }
         plot.addRunning();
         plot.setBiome(value.toUpperCase(), new Runnable() {
             @Override public void run() {
                 plot.removeRunning();
-                MainUtil.sendMessage(player, C.BIOME_SET_TO.s() + value.toLowerCase());
+                MainUtil.sendMessage(player, Captions.BIOME_SET_TO.s() + value.toLowerCase());
             }
         });
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
index 8ba07d900..7b1b75432 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -26,39 +26,39 @@ import java.util.Set;
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         final RunnableVal2<Command, CommandResult> whenDone) {
-        check(EconHandler.manager, C.ECON_DISABLED);
+        check(EconHandler.manager, Captions.ECON_DISABLED);
         final Plot plot;
         if (args.length != 0) {
-            checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
+            checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
             plot = check(MainUtil.getPlotFromString(player, args[0], true), null);
         } else {
-            plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+            plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
         }
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
-        checkTrue(!plot.isOwner(player.getUUID()), C.CANNOT_BUY_OWN);
+        checkTrue(plot.hasOwner(), Captions.PLOT_UNOWNED);
+        checkTrue(!plot.isOwner(player.getUUID()), Captions.CANNOT_BUY_OWN);
         Set<Plot> plots = plot.getConnectedPlots();
         checkTrue(player.getPlotCount() + plots.size() <= player.getAllowedPlots(),
-            C.CANT_CLAIM_MORE_PLOTS);
+            Captions.CANT_CLAIM_MORE_PLOTS);
         Optional<Double> flag = plot.getFlag(Flags.PRICE);
         if (!flag.isPresent()) {
-            throw new CommandException(C.NOT_FOR_SALE);
+            throw new CommandException(Captions.NOT_FOR_SALE);
         }
         final double price = flag.get();
-        checkTrue(player.getMoney() >= price, C.CANNOT_AFFORD_PLOT);
+        checkTrue(player.getMoney() >= price, Captions.CANNOT_AFFORD_PLOT);
         player.withdraw(price);
         // Failure
         // Success
         confirm.run(this, () -> {
-            C.REMOVED_BALANCE.send(player, price);
+            Captions.REMOVED_BALANCE.send(player, price);
             EconHandler.manager
                 .depositMoney(UUIDHandler.getUUIDWrapper().getOfflinePlayer(plot.owner), price);
             PlotPlayer owner = UUIDHandler.getPlayer(plot.owner);
             if (owner != null) {
-                C.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
+                Captions.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price);
             }
             plot.removeFlag(Flags.PRICE);
             plot.setOwner(player.getUUID());
-            C.CLAIMED.send(player);
+            Captions.CLAIMED.send(player);
             whenDone.run(Buy.this, CommandResult.SUCCESS);
         }, () -> {
             player.deposit(price);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
index e49155b8d..b06e0b57b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Claim.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -23,7 +23,7 @@ public class Claim extends SubCommand {
         Location loc = player.getLocation();
         final Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
+            return sendMessage(player, Captions.NOT_IN_PLOT);
         }
         int currentPlots =
             Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(loc.getWorld());
@@ -34,40 +34,43 @@ public class Claim extends SubCommand {
                     ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
                 if (grants <= 0) {
                     player.removePersistentMeta("grantedPlots");
-                    return sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                    return sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS);
                 }
             } else {
-                return sendMessage(player, C.CANT_CLAIM_MORE_PLOTS);
+                return sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS);
             }
         }
         if (!plot.canClaim(player)) {
-            return sendMessage(player, C.PLOT_IS_CLAIMED);
+            return sendMessage(player, Captions.PLOT_IS_CLAIMED);
         }
         final PlotArea area = plot.getArea();
         if (!schematic.isEmpty()) {
             if (area.SCHEMATIC_CLAIM_SPECIFY) {
                 if (!area.SCHEMATICS.contains(schematic.toLowerCase())) {
-                    return sendMessage(player, C.SCHEMATIC_INVALID, "non-existent: " + schematic);
+                    return sendMessage(player, Captions.SCHEMATIC_INVALID,
+                        "non-existent: " + schematic);
                 }
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
-                    && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
-                    return sendMessage(player, C.NO_SCHEMATIC_PERMISSION, schematic);
+                if (!Permissions
+                    .hasPermission(player, Captions.PERMISSION_CLAIM_SCHEMATIC.f(schematic))
+                    && !Permissions
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SCHEMATIC)) {
+                    return sendMessage(player, Captions.NO_SCHEMATIC_PERMISSION, schematic);
                 }
             }
         }
         int border = area.getBorder();
         if (border != Integer.MAX_VALUE && plot.getDistanceFromOrigin() > border) {
-            return !sendMessage(player, C.BORDER);
+            return !sendMessage(player, Captions.BORDER);
         }
         if ((EconHandler.manager != null) && area.USE_ECONOMY) {
             Expression<Double> costExr = area.PRICES.get("claim");
             double cost = costExr.evaluate((double) currentPlots);
             if (cost > 0d) {
                 if (EconHandler.manager.getMoney(player) < cost) {
-                    return sendMessage(player, C.CANNOT_AFFORD_PLOT, "" + cost);
+                    return sendMessage(player, Captions.CANNOT_AFFORD_PLOT, "" + cost);
                 }
                 EconHandler.manager.withdrawMoney(player, cost);
-                sendMessage(player, C.REMOVED_BALANCE, cost + "");
+                sendMessage(player, Captions.REMOVED_BALANCE, cost + "");
             }
         }
         if (grants > 0) {
@@ -77,7 +80,7 @@ public class Claim extends SubCommand {
                 player.setPersistentMeta("grantedPlots",
                     ByteArrayUtilities.integerToBytes(grants - 1));
             }
-            sendMessage(player, C.REMOVED_GRANTED_PLOT, "1", "" + (grants - 1));
+            sendMessage(player, Captions.REMOVED_GRANTED_PLOT, "1", "" + (grants - 1));
         }
         if (plot.canClaim(player)) {
             plot.owner = player.getUUID();
@@ -89,10 +92,10 @@ public class Claim extends SubCommand {
                         plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
                     }
                 }
-            }), () -> sendMessage(player, C.PLOT_NOT_CLAIMED));
+            }), () -> sendMessage(player, Captions.PLOT_NOT_CLAIMED));
             return true;
         } else {
-            sendMessage(player, C.PLOT_NOT_CLAIMED);
+            sendMessage(player, Captions.PLOT_NOT_CLAIMED);
         }
         return false;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
index efd6b1525..c16b603ac 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
@@ -28,13 +28,14 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        checkTrue(args.length == 0, C.COMMAND_SYNTAX, getUsage());
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
+        checkTrue(args.length == 0, Captions.COMMAND_SYNTAX, getUsage());
+        final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
         checkTrue(plot.isOwner(player.getUUID()) || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_CLEAR), C.NO_PLOT_PERMS);
-        checkTrue(plot.getRunning() == 0, C.WAIT_FOR_TIMER);
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_CLEAR),
+            Captions.NO_PLOT_PERMS);
+        checkTrue(plot.getRunning() == 0, Captions.WAIT_FOR_TIMER);
         checkTrue(!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot) || Permissions
-            .hasPermission(player, C.PERMISSION_CONTINUE), C.DONE_ALREADY_DONE);
+            .hasPermission(player, Captions.PERMISSION_CONTINUE), Captions.DONE_ALREADY_DONE);
         confirm.run(this, new Runnable() {
             @Override public void run() {
                 final long start = System.currentTimeMillis();
@@ -51,14 +52,14 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
                                 if (plot.getFlag(Flags.ANALYSIS).isPresent()) {
                                     FlagManager.removePlotFlag(plot, Flags.ANALYSIS);
                                 }
-                                MainUtil.sendMessage(player, C.CLEARING_DONE,
+                                MainUtil.sendMessage(player, Captions.CLEARING_DONE,
                                     "" + (System.currentTimeMillis() - start));
                             }
                         });
                     }
                 });
                 if (!result) {
-                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                    MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
                 } else {
                     plot.addRunning();
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index 914b04c3c..6ea60a37e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -25,56 +25,59 @@ import java.util.UUID;
         // list, create, delete, resize, invite, kick, leave, helpers, tp, sethome
         if (args.length == 0) {
             // return arguments
-            MainUtil.sendMessage(player, C.CLUSTER_AVAILABLE_ARGS);
+            MainUtil.sendMessage(player, Captions.CLUSTER_AVAILABLE_ARGS);
             return false;
         }
         String sub = args[0].toLowerCase();
         switch (sub) {
             case "l":
             case "list": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_LIST)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_LIST);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_LIST)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_LIST);
                     return false;
                 }
                 if (args.length != 1) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster list");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot cluster list");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                     return false;
                 }
                 Set<PlotCluster> clusters = area.getClusters();
-                MainUtil.sendMessage(player, C.CLUSTER_LIST_HEADING, clusters.size() + "");
+                MainUtil.sendMessage(player, Captions.CLUSTER_LIST_HEADING, clusters.size() + "");
                 for (PlotCluster cluster : clusters) {
                     // Ignore unmanaged clusters
                     String name = "'" + cluster.getName() + "' : " + cluster.toString();
                     if (player.getUUID().equals(cluster.owner)) {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&a" + name);
+                        MainUtil.sendMessage(player, Captions.CLUSTER_LIST_ELEMENT, "&a" + name);
                     } else if (cluster.helpers.contains(player.getUUID())) {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&3" + name);
+                        MainUtil.sendMessage(player, Captions.CLUSTER_LIST_ELEMENT, "&3" + name);
                     } else if (cluster.invited.contains(player.getUUID())) {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, "&9" + name);
+                        MainUtil.sendMessage(player, Captions.CLUSTER_LIST_ELEMENT, "&9" + name);
                     } else {
-                        MainUtil.sendMessage(player, C.CLUSTER_LIST_ELEMENT, cluster.toString());
+                        MainUtil
+                            .sendMessage(player, Captions.CLUSTER_LIST_ELEMENT, cluster.toString());
                     }
                 }
                 return true;
             }
             case "c":
             case "create": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_CREATE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_CREATE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_CREATE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_CREATE);
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                     return false;
                 }
                 if (args.length != 4) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                         "/plot cluster create <name> <id-bot> <id-top>");
                     return false;
                 }
@@ -82,7 +85,7 @@ import java.util.UUID;
                     player.getClusterCount() :
                     player.getPlotCount(player.getLocation().getWorld());
                 if (currentClusters >= player.getAllowedPlots()) {
-                    return sendMessage(player, C.CANT_CLAIM_MORE_CLUSTERS);
+                    return sendMessage(player, Captions.CANT_CLAIM_MORE_CLUSTERS);
                 }
                 PlotId pos1;
                 PlotId pos2;
@@ -91,13 +94,13 @@ import java.util.UUID;
                     pos1 = PlotId.fromString(args[2]);
                     pos2 = PlotId.fromString(args[3]);
                 } catch (IllegalArgumentException ignored) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+                    MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
                     return false;
                 }
                 // check if name is taken
                 String name = args[1];
                 if (area.getCluster(name) != null) {
-                    MainUtil.sendMessage(player, C.ALIAS_IS_TAKEN);
+                    MainUtil.sendMessage(player, Captions.ALIAS_IS_TAKEN);
                     return false;
                 }
                 if (pos2.x < pos1.x || pos2.y < pos1.y) {
@@ -108,22 +111,23 @@ import java.util.UUID;
                 //check if overlap
                 PlotCluster cluster = area.getFirstIntersectingCluster(pos1, pos2);
                 if (cluster != null) {
-                    MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, cluster.getName());
+                    MainUtil.sendMessage(player, Captions.CLUSTER_INTERSECTION, cluster.getName());
                     return false;
                 }
                 // Check if it occupies existing plots
                 if (!area.contains(pos1) || !area.contains(pos2)) {
-                    C.CLUSTER_OUTSIDE.send(player, area);
+                    Captions.CLUSTER_OUTSIDE.send(player, area);
                     return false;
                 }
                 Set<Plot> plots = area.getPlotSelectionOwned(pos1, pos2);
                 if (!plots.isEmpty()) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_CREATE_OTHER)) {
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_CREATE_OTHER)) {
                         UUID uuid = player.getUUID();
                         for (Plot plot : plots) {
                             if (!plot.isOwner(uuid)) {
-                                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                                    C.PERMISSION_CLUSTER_CREATE_OTHER);
+                                MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                                    Captions.PERMISSION_CLUSTER_CREATE_OTHER);
                                 return false;
                             }
                         }
@@ -137,11 +141,12 @@ import java.util.UUID;
                 } else {
                     current = player.getPlayerClusterCount(player.getLocation().getWorld());
                 }
-                int allowed = Permissions.hasPermissionRange(player, C.PERMISSION_CLUSTER_SIZE,
+                int allowed =
+                    Permissions.hasPermissionRange(player, Captions.PERMISSION_CLUSTER_SIZE,
                     Settings.Limit.MAX_PLOTS);
                 if (current + cluster.getArea() > allowed) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()));
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()));
                     return false;
                 }
                 // create cluster
@@ -157,58 +162,62 @@ import java.util.UUID;
                         }
                     }
                 }
-                MainUtil.sendMessage(player, C.CLUSTER_ADDED);
+                MainUtil.sendMessage(player, Captions.CLUSTER_ADDED);
                 return true;
             }
             case "disband":
             case "del":
             case "delete": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_DELETE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_DELETE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_DELETE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_DELETE);
                     return false;
                 }
                 if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster delete [name]");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot cluster delete [name]");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                     return false;
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
                     cluster = area.getCluster(args[1]);
                     if (cluster == null) {
-                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(player, Captions.INVALID_CLUSTER, args[1]);
                         return false;
                     }
                 } else {
                     cluster = area.getCluster(player.getLocation());
                     if (cluster == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
                 if (!cluster.owner.equals(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_DELETE_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_DELETE_OTHER);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_DELETE_OTHER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_DELETE_OTHER);
                         return false;
                     }
                 }
                 DBFunc.delete(cluster);
-                MainUtil.sendMessage(player, C.CLUSTER_DELETED);
+                MainUtil.sendMessage(player, Captions.CLUSTER_DELETED);
                 return true;
             }
             case "res":
             case "resize": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_RESIZE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_RESIZE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_RESIZE);
                     return false;
                 }
                 if (args.length != 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                         "/plot cluster resize <pos1> <pos2>");
                     return false;
                 }
@@ -219,7 +228,7 @@ import java.util.UUID;
                     pos1 = PlotId.fromString(args[2]);
                     pos2 = PlotId.fromString(args[3]);
                 } catch (IllegalArgumentException ignored) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+                    MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
                     return false;
                 }
                 if (pos2.x < pos1.x || pos2.y < pos1.y) {
@@ -229,25 +238,27 @@ import java.util.UUID;
                 // check if in cluster
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                     return false;
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_RESIZE_OTHER);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_RESIZE_OTHER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_RESIZE_OTHER);
                         return false;
                     }
                 }
                 //check if overlap
                 PlotCluster intersect = area.getFirstIntersectingCluster(pos1, pos2);
                 if (intersect != null) {
-                    MainUtil.sendMessage(player, C.CLUSTER_INTERSECTION, intersect.getName());
+                    MainUtil
+                        .sendMessage(player, Captions.CLUSTER_INTERSECTION, intersect.getName());
                     return false;
                 }
                 Set<Plot> existing = area.getPlotSelectionOwned(cluster.getP1(), cluster.getP2());
@@ -258,17 +269,19 @@ import java.util.UUID;
                 removed.removeAll(newPlots);
                 // Check expand / shrink
                 if (!removed.isEmpty()) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_RESIZE_SHRINK);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_RESIZE_SHRINK)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_RESIZE_SHRINK);
                         return false;
                     }
                 }
                 newPlots.removeAll(existing);
                 if (!newPlots.isEmpty()) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_RESIZE_EXPAND);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_RESIZE_EXPAND)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_RESIZE_EXPAND);
                         return false;
                     }
                 }
@@ -280,50 +293,53 @@ import java.util.UUID;
                     current = player.getPlayerClusterCount(player.getLocation().getWorld());
                 }
                 current -= cluster.getArea() + (1 + pos2.x - pos1.x) * (1 + pos2.y - pos1.y);
-                int allowed = Permissions
-                    .hasPermissionRange(player, C.PERMISSION_CLUSTER, Settings.Limit.MAX_PLOTS);
+                int allowed = Permissions.hasPermissionRange(player, Captions.PERMISSION_CLUSTER,
+                    Settings.Limit.MAX_PLOTS);
                 if (current + cluster.getArea() > allowed) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_CLUSTER.s() + "." + (current + cluster.getArea()));
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER.s() + "." + (current + cluster.getArea()));
                     return false;
                 }
                 // resize cluster
                 DBFunc.resizeCluster(cluster, pos1, pos2);
-                MainUtil.sendMessage(player, C.CLUSTER_RESIZED);
+                MainUtil.sendMessage(player, Captions.CLUSTER_RESIZED);
                 return true;
             }
             case "add":
             case "inv":
             case "invite": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INVITE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_INVITE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_INVITE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_INVITE);
                     return false;
                 }
                 if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster invite <player>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot cluster invite <player>");
                     return false;
                 }
                 // check if in cluster
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INVITE_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_INVITE_OTHER);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_INVITE_OTHER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_INVITE_OTHER);
                         return false;
                     }
                 }
                 // check uuid
                 UUID uuid = UUIDHandler.getUUID(args[1], null);
                 if (uuid == null) {
-                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[2]);
+                    MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[2]);
                     return false;
                 }
                 if (!cluster.isAdded(uuid)) {
@@ -332,49 +348,52 @@ import java.util.UUID;
                     DBFunc.setInvited(cluster, uuid);
                     PlotPlayer player2 = UUIDHandler.getPlayer(uuid);
                     if (player2 != null) {
-                        MainUtil.sendMessage(player2, C.CLUSTER_INVITED, cluster.getName());
+                        MainUtil.sendMessage(player2, Captions.CLUSTER_INVITED, cluster.getName());
                     }
                 }
-                MainUtil.sendMessage(player, C.CLUSTER_ADDED_USER);
+                MainUtil.sendMessage(player, Captions.CLUSTER_ADDED_USER);
                 return true;
             }
             case "k":
             case "remove":
             case "kick": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_KICK)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_KICK);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_KICK)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_KICK);
                     return false;
                 }
                 if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster kick <player>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot cluster kick <player>");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_KICK_OTHER)) {
-                        MainUtil
-                            .sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_KICK_OTHER);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_KICK_OTHER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_KICK_OTHER);
                         return false;
                     }
                 }
                 // check uuid
                 UUID uuid = UUIDHandler.getUUID(args[1], null);
                 if (uuid == null) {
-                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[1]);
+                    MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[1]);
                     return false;
                 }
                 // Can't kick if the player is yourself, the owner, or not added to the cluster
                 if (uuid.equals(player.getUUID()) || uuid.equals(cluster.owner) || !cluster
                     .isAdded(uuid)) {
-                    MainUtil.sendMessage(player, C.CANNOT_KICK_PLAYER, cluster.getName());
+                    MainUtil.sendMessage(player, Captions.CANNOT_KICK_PLAYER, cluster.getName());
                     return false;
                 }
                 if (cluster.helpers.contains(uuid)) {
@@ -385,7 +404,7 @@ import java.util.UUID;
                 DBFunc.removeInvited(cluster, uuid);
                 PlotPlayer player2 = UUIDHandler.getPlayer(uuid);
                 if (player2 != null) {
-                    MainUtil.sendMessage(player2, C.CLUSTER_REMOVED, cluster.getName());
+                    MainUtil.sendMessage(player2, Captions.CLUSTER_REMOVED, cluster.getName());
                 }
                 for (Plot plot : new ArrayList<>(
                     PlotSquared.get().getPlots(player2.getLocation().getWorld(), uuid))) {
@@ -394,44 +413,46 @@ import java.util.UUID;
                         plot.unclaim();
                     }
                 }
-                MainUtil.sendMessage(player2, C.CLUSTER_KICKED_USER);
+                MainUtil.sendMessage(player2, Captions.CLUSTER_KICKED_USER);
                 return true;
             }
             case "quit":
             case "leave": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_LEAVE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_LEAVE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_LEAVE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_LEAVE);
                     return false;
                 }
                 if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster leave [name]");
+                    MainUtil
+                        .sendMessage(player, Captions.COMMAND_SYNTAX, "/plot cluster leave [name]");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
                     cluster = area.getCluster(args[1]);
                     if (cluster == null) {
-                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(player, Captions.INVALID_CLUSTER, args[1]);
                         return false;
                     }
                 } else {
                     cluster = area.getCluster(player.getLocation());
                     if (cluster == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
                 UUID uuid = player.getUUID();
                 if (!cluster.isAdded(uuid)) {
-                    MainUtil.sendMessage(player, C.CLUSTER_NOT_ADDED);
+                    MainUtil.sendMessage(player, Captions.CLUSTER_NOT_ADDED);
                     return false;
                 }
                 if (uuid.equals(cluster.owner)) {
-                    MainUtil.sendMessage(player, C.CLUSTER_CANNOT_LEAVE);
+                    MainUtil.sendMessage(player, Captions.CLUSTER_CANNOT_LEAVE);
                     return false;
                 }
                 if (cluster.helpers.contains(uuid)) {
@@ -440,7 +461,7 @@ import java.util.UUID;
                 }
                 cluster.invited.remove(uuid);
                 DBFunc.removeInvited(cluster, uuid);
-                MainUtil.sendMessage(player, C.CLUSTER_REMOVED, cluster.getName());
+                MainUtil.sendMessage(player, Captions.CLUSTER_REMOVED, cluster.getName());
                 for (Plot plot : new ArrayList<>(
                     PlotSquared.get().getPlots(player.getLocation().getWorld(), uuid))) {
                     PlotCluster current = plot.getCluster();
@@ -455,102 +476,107 @@ import java.util.UUID;
             case "admin":
             case "helper":
             case "helpers": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_HELPERS)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_HELPERS);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_HELPERS)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_HELPERS);
                     return false;
                 }
                 if (args.length != 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                         "/plot cluster helpers <add|remove> <player>");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                     return false;
                 }
                 UUID uuid = UUIDHandler.getUUID(args[2], null);
                 if (uuid == null) {
-                    MainUtil.sendMessage(player, C.INVALID_PLAYER, args[2]);
+                    MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[2]);
                     return false;
                 }
                 if (args[1].equalsIgnoreCase("add")) {
                     cluster.helpers.add(uuid);
                     DBFunc.setHelper(cluster, uuid);
-                    return MainUtil.sendMessage(player, C.CLUSTER_ADDED_HELPER);
+                    return MainUtil.sendMessage(player, Captions.CLUSTER_ADDED_HELPER);
                 }
                 if (args[1].equalsIgnoreCase("remove")) {
                     cluster.helpers.remove(uuid);
                     DBFunc.removeHelper(cluster, uuid);
-                    return MainUtil.sendMessage(player, C.CLUSTER_REMOVED_HELPER);
+                    return MainUtil.sendMessage(player, Captions.CLUSTER_REMOVED_HELPER);
                 }
-                MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                     "/plot cluster helpers <add|remove> <player>");
                 return false;
             }
             case "spawn":
             case "home":
             case "tp": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_TP)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_TP);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_TP)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_TP);
                     return false;
                 }
                 if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster tp <name>");
+                    MainUtil
+                        .sendMessage(player, Captions.COMMAND_SYNTAX, "/plot cluster tp <name>");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                     return false;
                 }
                 PlotCluster cluster = area.getCluster(args[1]);
                 if (cluster == null) {
-                    MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                    MainUtil.sendMessage(player, Captions.INVALID_CLUSTER, args[1]);
                     return false;
                 }
                 UUID uuid = player.getUUID();
                 if (!cluster.isAdded(uuid)) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_TP_OTHER)) {
-                        MainUtil
-                            .sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_TP_OTHER);
+                    if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_TP_OTHER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_TP_OTHER);
                         return false;
                     }
                 }
                 player.teleport(cluster.getHome());
-                return MainUtil.sendMessage(player, C.CLUSTER_TELEPORTING);
+                return MainUtil.sendMessage(player, Captions.CLUSTER_TELEPORTING);
             }
             case "i":
             case "info":
             case "show":
             case "information": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_INFO)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_INFO);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_INFO)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_INFO);
                     return false;
                 }
                 if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster info [name]");
+                    MainUtil
+                        .sendMessage(player, Captions.COMMAND_SYNTAX, "/plot cluster info [name]");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                 }
                 PlotCluster cluster;
                 if (args.length == 2) {
                     cluster = area.getCluster(args[1]);
                     if (cluster == null) {
-                        MainUtil.sendMessage(player, C.INVALID_CLUSTER, args[1]);
+                        MainUtil.sendMessage(player, Captions.INVALID_CLUSTER, args[1]);
                         return false;
                     }
                 } else {
                     cluster = area.getCluster(player.getLocation());
                     if (cluster == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                        MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                         return false;
                     }
                 }
@@ -563,7 +589,7 @@ import java.util.UUID;
                 String size = (cluster.getP2().x - cluster.getP1().x + 1) + "x" + (
                     cluster.getP2().y - cluster.getP1().y + 1);
                 String rights = cluster.isAdded(player.getUUID()) + "";
-                String message = C.CLUSTER_INFO.s();
+                String message = Captions.CLUSTER_INFO.s();
                 message = message.replaceAll("%id%", id);
                 message = message.replaceAll("%owner%", owner);
                 message = message.replaceAll("%name%", name);
@@ -575,27 +601,29 @@ import java.util.UUID;
             case "sh":
             case "setspawn":
             case "sethome":
-                if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_SETHOME)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_CLUSTER_SETHOME);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_CLUSTER_SETHOME)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_CLUSTER_SETHOME);
                     return false;
                 }
                 if (args.length != 1 && args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot cluster sethome");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot cluster sethome");
                     return false;
                 }
                 PlotArea area = player.getApplicablePlotArea();
                 if (area == null) {
-                    C.NOT_IN_PLOT_WORLD.send(player);
+                    Captions.NOT_IN_PLOT_WORLD.send(player);
                 }
                 PlotCluster cluster = area.getCluster(player.getLocation());
                 if (cluster == null) {
-                    MainUtil.sendMessage(player, C.NOT_IN_CLUSTER);
+                    MainUtil.sendMessage(player, Captions.NOT_IN_CLUSTER);
                     return false;
                 }
                 if (!cluster.hasHelperRights(player.getUUID())) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_CLUSTER_SETHOME_OTHER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_CLUSTER_SETHOME_OTHER);
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_CLUSTER_SETHOME_OTHER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_CLUSTER_SETHOME_OTHER);
                         return false;
                     }
                 }
@@ -605,9 +633,9 @@ import java.util.UUID;
                 cluster.settings.setPosition(blockloc);
                 DBFunc.setPosition(cluster,
                     relative.getX() + "," + relative.getY() + "," + relative.getZ());
-                return MainUtil.sendMessage(player, C.POSITION_SET);
+                return MainUtil.sendMessage(player, Captions.POSITION_SET);
         }
-        MainUtil.sendMessage(player, C.CLUSTER_AVAILABLE_ARGS);
+        MainUtil.sendMessage(player, Captions.CLUSTER_AVAILABLE_ARGS);
         return false;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
index 9755d7150..a4441658b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
@@ -22,13 +22,13 @@ public class Comment extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         if (args.length < 2) {
-            sendMessage(player, C.COMMENT_SYNTAX,
+            sendMessage(player, Captions.COMMENT_SYNTAX,
                 StringMan.join(CommentManager.inboxes.keySet(), "|"));
             return false;
         }
         CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
         if (inbox == null) {
-            sendMessage(player, C.COMMENT_SYNTAX,
+            sendMessage(player, Captions.COMMENT_SYNTAX,
                 StringMan.join(CommentManager.inboxes.keySet(), "|"));
             return false;
         }
@@ -37,7 +37,7 @@ public class Comment extends SubCommand {
         try {
             id = PlotId.fromString(args[1]);
         } catch (IllegalArgumentException ignored) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
             return false;
         }
         Plot plot = MainUtil.getPlotFromString(player, args[1], false);
@@ -47,14 +47,14 @@ public class Comment extends SubCommand {
             plot = loc.getPlotAbs();
         } else {
             if (args.length < 4) {
-                sendMessage(player, C.COMMENT_SYNTAX,
+                sendMessage(player, Captions.COMMENT_SYNTAX,
                     StringMan.join(CommentManager.inboxes.keySet(), "|"));
                 return false;
             }
             index = 2;
         }
         if (!inbox.canWrite(plot, player)) {
-            sendMessage(player, C.NO_PERM_INBOX, "");
+            sendMessage(player, Captions.NO_PERM_INBOX, "");
             return false;
         }
         String message = StringMan.join(Arrays.copyOfRange(args, index, args.length), " ");
@@ -63,8 +63,8 @@ public class Comment extends SubCommand {
                 System.currentTimeMillis());
         boolean result = inbox.addComment(plot, comment);
         if (!result) {
-            sendMessage(player, C.NO_PLOT_INBOX, "");
-            sendMessage(player, C.COMMENT_SYNTAX,
+            sendMessage(player, Captions.NO_PLOT_INBOX, "");
+            sendMessage(player, Captions.COMMENT_SYNTAX,
                 StringMan.join(CommentManager.inboxes.keySet(), "|"));
             return false;
         }
@@ -74,7 +74,7 @@ public class Comment extends SubCommand {
                 MainUtil.sendMessage(pp, "/plot comment " + StringMan.join(args, " "));
             }
         }
-        sendMessage(player, C.COMMENT_ADDED);
+        sendMessage(player, Captions.COMMENT_ADDED);
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
index b33bd4dab..75a4709b8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Confirm.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.CmdInstance;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -16,13 +16,13 @@ import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         CmdInstance command = CmdConfirm.getPending(player);
         if (command == null) {
-            MainUtil.sendMessage(player, C.FAILED_CONFIRM);
+            MainUtil.sendMessage(player, Captions.FAILED_CONFIRM);
             return false;
         }
         CmdConfirm.removePending(player);
         if ((System.currentTimeMillis() - command.timestamp)
             > Settings.Confirmation.CONFIRMATION_TIMEOUT_SECONDS * 1000) {
-            MainUtil.sendMessage(player, C.EXPIRED_CONFIRM);
+            MainUtil.sendMessage(player, Captions.EXPIRED_CONFIRM);
             return false;
         }
         TaskManager.runTask(command.command);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
index 68bf8c786..4aec2d6d0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Continue.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -17,29 +17,30 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         Plot plot = player.getCurrentPlot();
         if ((plot == null) || !plot.hasOwner()) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_CONTINUE)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (!plot.hasFlag(Flags.DONE)) {
-            MainUtil.sendMessage(player, C.DONE_NOT_DONE);
+            MainUtil.sendMessage(player, Captions.DONE_NOT_DONE);
             return false;
         }
         int size = plot.getConnectedPlots().size();
         if (Settings.Done.COUNTS_TOWARDS_LIMIT && (player.getAllowedPlots()
             < player.getPlotCount() + size)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_ADMIN_COMMAND_CONTINUE);
+            MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                Captions.PERMISSION_ADMIN_COMMAND_CONTINUE);
             return false;
         }
         if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
             return false;
         }
         plot.removeFlag(Flags.DONE);
-        MainUtil.sendMessage(player, C.DONE_REMOVED);
+        MainUtil.sendMessage(player, Captions.DONE_REMOVED);
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
index 8303ef042..f925720f1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -16,15 +16,15 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
         Location loc = player.getLocation();
         Plot plot1 = loc.getPlotAbs();
         if (plot1 == null) {
-            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            return !MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot1.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (args.length != 1) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
@@ -32,22 +32,22 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
             return false;
         }
         if (plot1.equals(plot2)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         if (!plot1.getArea().isCompatible(plot2.getArea())) {
-            C.PLOTWORLD_INCOMPATIBLE.send(player);
+            Captions.PLOTWORLD_INCOMPATIBLE.send(player);
             return false;
         }
         if (plot1.copy(plot2, new Runnable() {
             @Override public void run() {
-                MainUtil.sendMessage(player, C.COPY_SUCCESS);
+                MainUtil.sendMessage(player, Captions.COPY_SUCCESS);
             }
         })) {
             return true;
         } else {
-            MainUtil.sendMessage(player, C.REQUIRES_UNOWNED);
+            MainUtil.sendMessage(player, Captions.REQUIRES_UNOWNED);
             return false;
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
index acc47a64e..26962781c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CreateRoadSchematic.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
@@ -19,10 +19,10 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         Location loc = player.getLocation();
         Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
+            return sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!(loc.getPlotArea() instanceof HybridPlotWorld)) {
-            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            return sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
         }
         HybridUtils.manager.setupRoadSchematic(plot);
         MainUtil.sendMessage(player,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
index 28594982c..527b67819 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Debug.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
@@ -14,23 +14,23 @@ public class Debug extends SubCommand {
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         if ((args.length > 0) && args[0].equalsIgnoreCase("msg")) {
             StringBuilder msg = new StringBuilder();
-            for (C caption : C.values()) {
+            for (Captions caption : Captions.values()) {
                 msg.append(caption.s()).append("\n");
             }
             MainUtil.sendMessage(player, msg.toString());
             return true;
         }
         StringBuilder information = new StringBuilder();
-        String header = C.DEBUG_HEADER.s();
-        String line = C.DEBUG_LINE.s();
-        String section = C.DEBUG_SECTION.s();
+        String header = Captions.DEBUG_HEADER.s();
+        String line = Captions.DEBUG_LINE.s();
+        String section = Captions.DEBUG_SECTION.s();
         information.append(header);
         information.append(getSection(section, "PlotArea"));
         information.append(
             getLine(line, "Plot Worlds", StringMan.join(PlotSquared.get().getPlotAreas(), ", ")));
         information.append(getLine(line, "Owned Plots", PlotSquared.get().getPlots().size()));
         information.append(getSection(section, "Messages"));
-        information.append(getLine(line, "Total Messages", C.values().length));
+        information.append(getLine(line, "Total Messages", Captions.values().length));
         information.append(getLine(line, "View all captions", "/plot debug msg"));
         MainUtil.sendMessage(player, information.toString());
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
index cbfacfae6..8413eae22 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugAllowUnsafe.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
 import java.util.ArrayList;
@@ -19,10 +19,10 @@ import java.util.UUID;
 
         if (unsafeAllowed.contains(player.getUUID())) {
             unsafeAllowed.remove(player.getUUID());
-            sendMessage(player, C.DEBUGALLOWUNSAFE_OFF);
+            sendMessage(player, Captions.DEBUGALLOWUNSAFE_OFF);
         } else {
             unsafeAllowed.add(player.getUUID());
-            sendMessage(player, C.DEBUGALLOWUNSAFE_ON);
+            sendMessage(player, Captions.DEBUGALLOWUNSAFE_ON);
         }
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
index 01a344369..9d5dc9d3d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
@@ -29,7 +29,7 @@ public class DebugClaimTest extends SubCommand {
         }
         PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
         if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
-            C.NOT_VALID_PLOT_WORLD.send(player, args[0]);
+            Captions.NOT_VALID_PLOT_WORLD.send(player, args[0]);
             return false;
         }
         PlotId min, max;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
index 01cd1fefc..623b989ea 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
@@ -111,7 +111,7 @@ import java.util.*;
         this.scope.put("MainCommand", MainCommand.getInstance());
 
         // enums
-        for (Enum<?> value : C.values()) {
+        for (Enum<?> value : Captions.values()) {
             this.scope.put("C_" + value.name(), value);
         }
     }
@@ -129,7 +129,7 @@ import java.util.*;
                 case "analyze": {
                     Plot plot = player.getCurrentPlot();
                     if (plot == null) {
-                        MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+                        MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
                         return false;
                     }
                     PlotAnalysis analysis = plot.getComplexity(null);
@@ -148,7 +148,7 @@ import java.util.*;
                 }
                 case "calibrate-analysis":
                     if (args.length != 2) {
-                        MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                             "/plot debugexec analyze <threshold>");
                         MainUtil.sendMessage(player,
                             "$1<threshold> $2= $1The percentage of plots you want to clear (100 clears 100% of plots so no point calibrating "
@@ -174,7 +174,7 @@ import java.util.*;
                     return MainUtil.sendMessage(player, "Cancelled task.");
                 case "remove-flag":
                     if (args.length != 2) {
-                        MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                        MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                             "/plot debugexec remove-flag <flag>");
                         return false;
                     }
@@ -194,7 +194,7 @@ import java.util.*;
                     }
                     PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
                     if (area == null) {
-                        MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[1]);
+                        MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_WORLD, args[1]);
                         return false;
                     }
                     boolean result;
@@ -274,15 +274,15 @@ import java.util.*;
                                     DebugExec.this.engine.eval(cmd, DebugExec.this.scope);
                                 } catch (ScriptException e) {
                                     e.printStackTrace();
-                                    MainUtil.sendMessage(player, C.COMMAND_WENT_WRONG);
+                                    MainUtil.sendMessage(player, Captions.COMMAND_WENT_WRONG);
                                 }
                             }
                         };
                         return true;
                     } catch (IOException e) {
                         e.printStackTrace();
-                        MainUtil
-                            .sendMessage(player, C.COMMAND_SYNTAX, "/plot debugexec addcmd <file>");
+                        MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                            "/plot debugexec addcmd <file>");
                         return false;
                     }
                 case "runasync":
@@ -322,7 +322,8 @@ import java.util.*;
                                 break;
                             }
                         default:
-                            C.COMMAND_SYNTAX.send(player, "/plot debugexec list-scripts [#]");
+                            Captions.COMMAND_SYNTAX
+                                .send(player, "/plot debugexec list-scripts [#]");
                             return false;
                     }
 
@@ -339,7 +340,7 @@ import java.util.*;
                     return true;
                 case "allcmd":
                     if (args.length < 3) {
-                        C.COMMAND_SYNTAX
+                        Captions.COMMAND_SYNTAX
                             .send(player, "/plot debugexec allcmd <condition> <command>");
                         return false;
                     }
@@ -379,7 +380,8 @@ import java.util.*;
                     break;
                 case "all":
                     if (args.length < 3) {
-                        C.COMMAND_SYNTAX.send(player, "/plot debugexec all <condition> <code>");
+                        Captions.COMMAND_SYNTAX
+                            .send(player, "/plot debugexec all <condition> <code>");
                         return false;
                     }
                     script =
@@ -392,7 +394,7 @@ import java.util.*;
                     script = StringMan.join(args, " ");
             }
             if (!(player instanceof ConsolePlayer)) {
-                MainUtil.sendMessage(player, C.NOT_CONSOLE);
+                MainUtil.sendMessage(player, Captions.NOT_CONSOLE);
                 return false;
             }
             init();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
index da1e27e61..ca848a6bb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugFixFlags.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -28,7 +28,7 @@ public class DebugFixFlags extends SubCommand {
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
         if (area == null || !WorldUtil.IMP.isWorld(area.worldname)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD, args[0]);
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_WORLD, args[0]);
             return false;
         }
         MainUtil.sendMessage(player, "&8--- &6Starting task &8 ---");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
index b191ac323..e442f596f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.IncendoPaster;
@@ -123,7 +123,8 @@ import java.util.stream.Collectors;
                         final String pasteId = jsonObject.get("paste_id").getAsString();
                         final String link =
                             String.format("https://incendo.org/paste/view/%s", pasteId);
-                        player.sendMessage(C.DEBUG_REPORT_CREATED.s().replace("%url%", link));
+                        player
+                            .sendMessage(Captions.DEBUG_REPORT_CREATED.s().replace("%url%", link));
                     } else {
                         final String responseMessage = jsonObject.get("response").getAsString();
                         MainUtil.sendMessage(player, String
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
index 84489e88b..fd0b29657 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
@@ -20,13 +20,13 @@ public class DebugRoadRegen extends SubCommand {
         Location loc = player.getLocation();
         PlotArea plotArea = loc.getPlotArea();
         if (!(plotArea instanceof HybridPlotWorld)) {
-            return sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            return sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
         }
         Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            C.NOT_IN_PLOT.send(player);
+            Captions.NOT_IN_PLOT.send(player);
         } else if (plot.isMerged()) {
-            C.REQUIRES_UNMERGED.send(player);
+            Captions.REQUIRES_UNMERGED.send(player);
         } else {
             HybridPlotManager manager = (HybridPlotManager) plotArea.getPlotManager();
             manager.createRoadEast(plotArea, plot);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
index fbbc3267c..0c544d096 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugSaveTest.java
@@ -16,14 +16,10 @@ import java.util.ArrayList;
 public class DebugSaveTest extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
-        ArrayList<Plot> plots = new ArrayList<Plot>();
-        plots.addAll(PlotSquared.get().getPlots());
+        ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots());
         MainUtil.sendMessage(player, "&6Starting `DEBUGSAVETEST`");
-        DBFunc.createPlotsAndData(plots, new Runnable() {
-            @Override public void run() {
-                MainUtil.sendMessage(player, "&6Database sync finished!");
-            }
-        });
+        DBFunc.createPlotsAndData(plots,
+            () -> MainUtil.sendMessage(player, "&6Database sync finished!"));
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
index b399f5752..16f10b7b0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
@@ -19,14 +19,14 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
         Location loc = player.getLocation();
         final Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            return !sendMessage(player, C.PLOT_UNOWNED);
+            return !sendMessage(player, Captions.PLOT_UNOWNED);
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DELETE)) {
-            return !sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_DELETE)) {
+            return !sendMessage(player, Captions.NO_PLOT_PERMS);
         }
         final PlotArea plotArea = plot.getArea();
         final java.util.Set<Plot> plots = plot.getConnectedPlots();
@@ -35,7 +35,7 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
         Runnable run = new Runnable() {
             @Override public void run() {
                 if (plot.getRunning() > 0) {
-                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                    MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
                     return;
                 }
                 final long start = System.currentTimeMillis();
@@ -47,17 +47,17 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
                             double value = plots.size() * valueExr.evaluate((double) currentPlots);
                             if (value > 0d) {
                                 EconHandler.manager.depositMoney(player, value);
-                                sendMessage(player, C.ADDED_BALANCE, String.valueOf(value));
+                                sendMessage(player, Captions.ADDED_BALANCE, String.valueOf(value));
                             }
                         }
-                        MainUtil.sendMessage(player, C.DELETING_DONE,
+                        MainUtil.sendMessage(player, Captions.DELETING_DONE,
                             System.currentTimeMillis() - start);
                     }
                 });
                 if (result) {
                     plot.addRunning();
                 } else {
-                    MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                    MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
                 }
             }
         };
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
index e586f0656..fe917e08a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -28,38 +28,38 @@ import java.util.UUID;
         Location location = player.getLocation();
         Plot plot = location.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DENY)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_DENY)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return true;
         }
         Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
         if (uuids.isEmpty()) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
             return false;
         }
         Iterator<UUID> iter = uuids.iterator();
         while (iter.hasNext()) {
             UUID uuid = iter.next();
             if (uuid == DBFunc.EVERYONE && !(
-                Permissions.hasPermission(player, C.PERMISSION_DENY_EVERYONE) || Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DENY))) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
+                Permissions.hasPermission(player, Captions.PERMISSION_DENY_EVERYONE) || Permissions
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_DENY))) {
+                MainUtil.sendMessage(player, Captions.INVALID_PLAYER, MainUtil.getName(uuid));
                 continue;
             }
             if (plot.isOwner(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
+                MainUtil.sendMessage(player, Captions.ALREADY_OWNER, MainUtil.getName(uuid));
                 return false;
             }
 
             if (plot.getDenied().contains(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
+                MainUtil.sendMessage(player, Captions.ALREADY_ADDED, MainUtil.getName(uuid));
                 return false;
             }
             if (uuid != DBFunc.EVERYONE) {
@@ -77,7 +77,7 @@ import java.util.UUID;
             }
         }
         if (!uuids.isEmpty()) {
-            MainUtil.sendMessage(player, C.DENIED_ADDED);
+            MainUtil.sendMessage(player, Captions.DENIED_ADDED);
         }
         return true;
     }
@@ -97,13 +97,13 @@ import java.util.UUID;
         }
         Location loc = player.getLocation();
         Location spawn = WorldUtil.IMP.getSpawn(loc.getWorld());
-        MainUtil.sendMessage(player, C.YOU_GOT_DENIED);
+        MainUtil.sendMessage(player, Captions.YOU_GOT_DENIED);
         if (plot.equals(spawn.getPlot())) {
             Location newSpawn =
                 WorldUtil.IMP.getSpawn(PlotSquared.get().getPlotAreaManager().getAllWorlds()[0]);
             if (plot.equals(newSpawn.getPlot())) {
                 // Kick from server if you can't be teleported to spawn
-                player.kick(C.YOU_GOT_DENIED.s());
+                player.kick(Captions.YOU_GOT_DENIED.s());
             } else {
                 player.teleport(newSpawn);
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
index 687eef002..ec62e299c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -16,15 +16,15 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
     @Override public boolean set(PlotPlayer player, Plot plot, String desc) {
         if (desc.isEmpty()) {
             plot.removeFlag(Flags.DESCRIPTION);
-            MainUtil.sendMessage(player, C.DESC_UNSET);
+            MainUtil.sendMessage(player, Captions.DESC_UNSET);
             return true;
         }
         boolean result = FlagManager.addPlotFlag(plot, Flags.DESCRIPTION, desc);
         if (!result) {
-            MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+            MainUtil.sendMessage(player, Captions.FLAG_NOT_ADDED);
             return false;
         }
-        MainUtil.sendMessage(player, C.DESC_SET);
+        MainUtil.sendMessage(player, Captions.DESC_SET);
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
index a37c187cc..8ef920565 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Done.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
@@ -22,23 +22,23 @@ import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
         Location loc = player.getLocation();
         final Plot plot = loc.getPlotAbs();
         if ((plot == null) || !plot.hasOwner()) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DONE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_DONE)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (plot.hasFlag(Flags.DONE)) {
-            MainUtil.sendMessage(player, C.DONE_ALREADY_DONE);
+            MainUtil.sendMessage(player, Captions.DONE_ALREADY_DONE);
             return false;
         }
         if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
             return false;
         }
         plot.addRunning();
-        MainUtil.sendMessage(player, C.GENERATING_LINK);
+        MainUtil.sendMessage(player, Captions.GENERATING_LINK);
         final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
         if (ExpireManager.IMP == null || doneRequirements == null) {
             finish(plot, player, true);
@@ -60,9 +60,9 @@ import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
         if (success) {
             long flagValue = System.currentTimeMillis() / 1000;
             plot.setFlag(Flags.DONE, flagValue);
-            MainUtil.sendMessage(pp, C.DONE_SUCCESS);
+            MainUtil.sendMessage(pp, Captions.DONE_SUCCESS);
         } else {
-            MainUtil.sendMessage(pp, C.DONE_INSUFFICIENT_COMPLEXITY);
+            MainUtil.sendMessage(pp, Captions.DONE_INSUFFICIENT_COMPLEXITY);
         }
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
index 7dd7b7acd..43560b81f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Download.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -21,34 +21,34 @@ import java.net.URL;
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         String world = player.getLocation().getWorld();
         if (!PlotSquared.get().hasPlotArea(world)) {
-            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            return !sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
         }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         if ((Settings.Done.REQUIRED_FOR_DOWNLOAD && (!plot.getFlag(Flags.DONE).isPresent()))
-            && !Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) {
-            MainUtil.sendMessage(player, C.DONE_NOT_DONE);
+            && !Permissions.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_DOWNLOAD)) {
+            MainUtil.sendMessage(player, Captions.DONE_NOT_DONE);
             return false;
         }
         if ((!plot.isOwner(player.getUUID())) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
             return false;
         }
         if (args.length == 0 || (args.length == 1 && StringMan
             .isEqualIgnoreCaseToAny(args[0], "sch", "schem", "schematic"))) {
             if (plot.getVolume() > Integer.MAX_VALUE) {
-                C.SCHEMATIC_TOO_LARGE.send(player);
+                Captions.SCHEMATIC_TOO_LARGE.send(player);
                 return false;
             }
             plot.addRunning();
@@ -58,7 +58,7 @@ import java.net.URL;
                     SchematicHandler.manager.upload(value, null, null, new RunnableVal<URL>() {
                         @Override public void run(URL url) {
                             if (url == null) {
-                                MainUtil.sendMessage(player, C.GENERATING_LINK_FAILED);
+                                MainUtil.sendMessage(player, Captions.GENERATING_LINK_FAILED);
                                 return;
                             }
                             MainUtil.sendMessage(player, url.toString());
@@ -68,8 +68,8 @@ import java.net.URL;
             });
         } else if (args.length == 1 && StringMan
             .isEqualIgnoreCaseToAny(args[0], "mcr", "world", "mca")) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_DOWNLOAD_WORLD)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_DOWNLOAD_WORLD);
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_DOWNLOAD_WORLD)) {
+                Captions.NO_PERMISSION.send(player, Captions.PERMISSION_DOWNLOAD_WORLD);
                 return false;
             }
             MainUtil.sendMessage(player, "&cNote: The `.mca` files are 512x512");
@@ -79,17 +79,17 @@ import java.net.URL;
                 @Override public void run(URL url) {
                     plot.removeRunning();
                     if (url == null) {
-                        MainUtil.sendMessage(player, C.GENERATING_LINK_FAILED);
+                        MainUtil.sendMessage(player, Captions.GENERATING_LINK_FAILED);
                         return;
                     }
                     MainUtil.sendMessage(player, url.toString());
                 }
             });
         } else {
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
-        MainUtil.sendMessage(player, C.GENERATING_LINK);
+        MainUtil.sendMessage(player, Captions.GENERATING_LINK);
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
index 9d0435c07..a732df9a7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.*;
@@ -22,7 +22,8 @@ import java.util.*;
     private boolean checkPermValue(PlotPlayer player, Flag flag, String key, String value) {
         key = key.toLowerCase();
         value = value.toLowerCase();
-        String perm = C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase());
+        String perm =
+            Captions.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase());
         if (flag instanceof IntegerFlag && MathMan.isInteger(value)) {
             try {
                 int numeric = Integer.parseInt(value);
@@ -33,8 +34,8 @@ import java.util.*;
                         Settings.Limit.MAX_PLOTS;
                     final boolean result = player.hasPermissionRange(perm, checkRange) >= numeric;
                     if (!result) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_SET_FLAG_KEY_VALUE
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_SET_FLAG_KEY_VALUE
                                 .f(key.toLowerCase(), value.toLowerCase()));
                     }
                     return result;
@@ -46,12 +47,13 @@ import java.util.*;
             final PlotBlockListFlag blockListFlag = (PlotBlockListFlag) flag;
             final HashSet<PlotBlock> parsedBlocks = blockListFlag.parseValue(value);
             for (final PlotBlock block : parsedBlocks) {
-                final String permission = C.PERMISSION_SET_FLAG_KEY_VALUE
+                final String permission = Captions.PERMISSION_SET_FLAG_KEY_VALUE
                     .f(key.toLowerCase(), block.getRawId().toString().toLowerCase());
                 final boolean result = Permissions.hasPermission(player, permission);
                 if (!result) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_SET_FLAG_KEY_VALUE
+                            .f(key.toLowerCase(), value.toLowerCase()));
                     return false;
                 }
             }
@@ -59,8 +61,8 @@ import java.util.*;
         }
         final boolean result = Permissions.hasPermission(player, perm);
         if (!result) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION,
-                C.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
+            MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                Captions.PERMISSION_SET_FLAG_KEY_VALUE.f(key.toLowerCase(), value.toLowerCase()));
         }
         return result;
     }
@@ -75,22 +77,24 @@ import java.util.*;
          *  plot flag list
          */
         if (args.length == 0) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                "/plot flag <set|remove|add|list|info>");
             return false;
         }
         Location loc = player.getLocation();
         Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
             return false;
         }
         if (!plot.hasOwner()) {
-            sendMessage(player, C.PLOT_NOT_CLAIMED);
+            sendMessage(player, Captions.PLOT_NOT_CLAIMED);
             return false;
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_SET_FLAG_OTHER)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG_OTHER);
+            .hasPermission(player, Captions.PERMISSION_SET_FLAG_OTHER)) {
+            MainUtil
+                .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_SET_FLAG_OTHER);
             return false;
         }
         Flag<?> flag = null;
@@ -103,41 +107,43 @@ import java.util.*;
                         new StringComparison<>(args[1], Flags.getFlags());
                     String best = stringComparison.getBestMatch();
                     if (best != null) {
-                        MainUtil.sendMessage(player, C.NOT_VALID_FLAG_SUGGESTED, best);
+                        MainUtil.sendMessage(player, Captions.NOT_VALID_FLAG_SUGGESTED, best);
                         suggested = true;
                     }
                 } catch (final Exception ignored) { /* Happens sometimes because of mean code */ }
                 if (!suggested) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_FLAG);
+                    MainUtil.sendMessage(player, Captions.NOT_VALID_FLAG);
                 }
                 return false;
             }
         }
         switch (args[0].toLowerCase()) {
             case "info": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SET_FLAG)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.flag.info");
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_SET_FLAG)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION, "plots.flag.info");
                     return false;
                 }
                 if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag info <flag>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot flag info <flag>");
                     return false;
                 }
                 // flag key
-                MainUtil.sendMessage(player, C.FLAG_KEY, flag.getName());
+                MainUtil.sendMessage(player, Captions.FLAG_KEY, flag.getName());
                 // flag type
-                MainUtil.sendMessage(player, C.FLAG_TYPE, flag.getClass().getSimpleName());
+                MainUtil.sendMessage(player, Captions.FLAG_TYPE, flag.getClass().getSimpleName());
                 // Flag type description
-                MainUtil.sendMessage(player, C.FLAG_DESC, flag.getValueDescription());
+                MainUtil.sendMessage(player, Captions.FLAG_DESC, flag.getValueDescription());
                 return true;
             }
             case "set": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SET_FLAG)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SET_FLAG);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_SET_FLAG)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_SET_FLAG);
                     return false;
                 }
                 if (args.length < 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag set <flag> <value>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot flag set <flag> <value>");
                     return false;
                 }
                 String value = StringMan.join(Arrays.copyOfRange(args, 2, args.length), " ");
@@ -151,27 +157,28 @@ import java.util.*;
                 }
                 boolean result = plot.setFlag(flag, parsed);
                 if (!result) {
-                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+                    MainUtil.sendMessage(player, Captions.FLAG_NOT_ADDED);
                     return false;
                 }
-                MainUtil.sendMessage(player, C.FLAG_ADDED);
+                MainUtil.sendMessage(player, Captions.FLAG_ADDED);
                 return true;
             }
             case "remove": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_REMOVE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_REMOVE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_FLAG_REMOVE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_FLAG_REMOVE);
                     return false;
                 }
                 if (args.length != 2 && args.length != 3) {
-                    MainUtil
-                        .sendMessage(player, C.COMMAND_SYNTAX, "/plot flag remove <flag> [values]");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot flag remove <flag> [values]");
                     return false;
                 }
-                if (!Permissions
-                    .hasPermission(player, C.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()))) {
+                if (!Permissions.hasPermission(player,
+                    Captions.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()))) {
                     if (args.length != 3) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()));
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_SET_FLAG_KEY.f(args[1].toLowerCase()));
                         return false;
                     }
                     for (String entry : args[2].split(",")) {
@@ -190,16 +197,16 @@ import java.util.*;
                             if (flag1.get().isEmpty()) {
                                 final boolean result = plot.removeFlag(flag);
                                 if (result) {
-                                    MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                                    MainUtil.sendMessage(player, Captions.FLAG_REMOVED);
                                 } else {
-                                    MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                                    MainUtil.sendMessage(player, Captions.FLAG_NOT_REMOVED);
                                 }
                                 return true;
                             } else {
-                                MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                                MainUtil.sendMessage(player, Captions.FLAG_REMOVED);
                             }
                         } else {
-                            MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                            MainUtil.sendMessage(player, Captions.FLAG_NOT_REMOVED);
                             return false;
                         }
                     }
@@ -208,7 +215,7 @@ import java.util.*;
                 } else {
                     boolean result = plot.removeFlag(flag);
                     if (!result) {
-                        MainUtil.sendMessage(player, C.FLAG_NOT_REMOVED);
+                        MainUtil.sendMessage(player, Captions.FLAG_NOT_REMOVED);
                         return false;
                     }
                 }
@@ -217,17 +224,18 @@ import java.util.*;
                 } else if (flag == Flags.WEATHER) {
                     player.setWeather(PlotWeather.RESET);
                 }
-                MainUtil.sendMessage(player, C.FLAG_REMOVED);
+                MainUtil.sendMessage(player, Captions.FLAG_REMOVED);
                 return true;
             }
             case "add":
-                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_ADD)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_ADD);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_FLAG_ADD)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_FLAG_ADD);
                     return false;
                 }
                 if (args.length < 3) {
-                    MainUtil
-                        .sendMessage(player, C.COMMAND_SYNTAX, "/plot flag add <flag> <values>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot flag add <flag> <values>");
                     return false;
                 }
                 for (String entry : args[2].split(",")) {
@@ -248,28 +256,29 @@ import java.util.*;
                     if (flag1.isPresent()) {
                         boolean o = flag1.get().addAll((Collection) parsed);
                         if (o) {
-                            MainUtil.sendMessage(player, C.FLAG_ADDED);
+                            MainUtil.sendMessage(player, Captions.FLAG_ADDED);
                             val = flag1.get();
                         } else {
-                            MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+                            MainUtil.sendMessage(player, Captions.FLAG_NOT_ADDED);
                             return false;
                         }
                     }
                 }
                 boolean result = plot.setFlag(flag, val);
                 if (!result) {
-                    MainUtil.sendMessage(player, C.FLAG_NOT_ADDED);
+                    MainUtil.sendMessage(player, Captions.FLAG_NOT_ADDED);
                     return false;
                 }
-                MainUtil.sendMessage(player, C.FLAG_ADDED);
+                MainUtil.sendMessage(player, Captions.FLAG_ADDED);
                 return true;
             case "list":
-                if (!Permissions.hasPermission(player, C.PERMISSION_FLAG_LIST)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_FLAG_LIST);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_FLAG_LIST)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_FLAG_LIST);
                     return false;
                 }
                 if (args.length > 1) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag list");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot flag list");
                     return false;
                 }
                 HashMap<String, ArrayList<String>> flags = new HashMap<>();
@@ -293,7 +302,8 @@ import java.util.*;
                 MainUtil.sendMessage(player, message.toString());
                 return true;
         }
-        MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
+        MainUtil
+            .sendMessage(player, Captions.COMMAND_SYNTAX, "/plot flag <set|remove|add|list|info>");
         return false;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
index 5a69479b5..83161d73a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/GenerateDocs.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 import java.io.File;
@@ -142,7 +142,7 @@ public class GenerateDocs {
 
             Matcher m2 = p2.matcher(line);
             while (m2.find()) {
-                perms.add(C.valueOf("PERMISSION_" + m2.group(1)).s());
+                perms.add(Captions.valueOf("PERMISSION_" + m2.group(1)).s());
             }
             if (line.contains("Permissions.hasPermission(")) {
                 String[] split = line.split("Permissions.hasPermission");
@@ -151,7 +151,7 @@ public class GenerateDocs {
                     String perm = method.split("[,|)]")[1].trim();
                     if (!perm.equalsIgnoreCase(perm)) {
                         if (perm.startsWith("C.")) {
-                            perm = C.valueOf(perm.split("\\.")[1]).s();
+                            perm = Captions.valueOf(perm.split("\\.")[1]).s();
                         } else {
                             continue;
                         }
@@ -181,7 +181,7 @@ public class GenerateDocs {
                     String perm = method.split("[,|)]")[1].trim();
                     if (!perm.equalsIgnoreCase(perm)) {
                         if (perm.startsWith("C.")) {
-                            perm = C.valueOf(perm.split("\\.")[1]).s();
+                            perm = Captions.valueOf(perm.split("\\.")[1]).s();
                         } else {
                             continue;
                         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
index d29bd76bb..ed3cc9856 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
@@ -26,13 +26,13 @@ import java.util.UUID;
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        checkTrue(args.length >= 1 && args.length <= 2, C.COMMAND_SYNTAX, getUsage());
+        checkTrue(args.length >= 1 && args.length <= 2, Captions.COMMAND_SYNTAX, getUsage());
         final String arg0 = args[0].toLowerCase();
         switch (arg0) {
             case "add":
             case "check":
-                if (!Permissions.hasPermission(player, C.PERMISSION_GRANT.f(arg0))) {
-                    C.NO_PERMISSION.send(player, C.PERMISSION_GRANT.f(arg0));
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_GRANT.f(arg0))) {
+                    Captions.NO_PERMISSION.send(player, Captions.PERMISSION_GRANT.f(arg0));
                     return;
                 }
                 if (args.length > 2) {
@@ -41,7 +41,7 @@ import java.util.UUID;
                 final UUID uuid =
                     args.length == 2 ? UUIDHandler.getUUIDFromString(args[1]) : player.getUUID();
                 if (uuid == null) {
-                    C.INVALID_PLAYER.send(player, args[1]);
+                    Captions.INVALID_PLAYER.send(player, args[1]);
                     return;
                 }
                 MainUtil.getPersistentMeta(uuid, "grantedPlots", new RunnableVal<byte[]>() {
@@ -49,7 +49,7 @@ import java.util.UUID;
                         if (arg0.equals("check")) { // check
                             int granted =
                                 array == null ? 0 : ByteArrayUtilities.bytesToInteger(array);
-                            C.GRANTED_PLOTS.send(player, granted);
+                            Captions.GRANTED_PLOTS.send(player, granted);
                         } else { // add
                             int amount =
                                 1 + (array == null ? 0 : ByteArrayUtilities.bytesToInteger(array));
@@ -66,6 +66,6 @@ import java.util.UUID;
                     }
                 });
         }
-        C.COMMAND_SYNTAX.send(player, getUsage());
+        Captions.COMMAND_SYNTAX.send(player, getUsage());
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
index f0ff64af1..674ba4fe9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
@@ -50,7 +50,7 @@ public class Help extends Command {
                 }
                 return;
             default:
-                C.COMMAND_SYNTAX.send(player, getUsage());
+                Captions.COMMAND_SYNTAX.send(player, getUsage());
         }
     }
 
@@ -74,15 +74,16 @@ public class Help extends Command {
         }
         if (cat == null && page == 0) {
             StringBuilder builder = new StringBuilder();
-            builder.append(C.HELP_HEADER.s());
+            builder.append(Captions.HELP_HEADER.s());
             for (CommandCategory c : CommandCategory.values()) {
                 builder.append("\n" + StringMan
-                    .replaceAll(C.HELP_INFO_ITEM.s(), "%category%", c.toString().toLowerCase(),
+                    .replaceAll(Captions.HELP_INFO_ITEM.s(), "%category%",
+                        c.toString().toLowerCase(),
                         "%category_desc%", c.toString()));
             }
-            builder.append("\n").append(C.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
+            builder.append("\n").append(Captions.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
                 .replaceAll("%category_desc%", "Display all commands"));
-            builder.append("\n" + C.HELP_FOOTER.s());
+            builder.append("\n" + Captions.HELP_FOOTER.s());
             MainUtil.sendMessage(player, builder.toString(), false);
             return;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
index b8ffd4261..259395b5a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
@@ -20,7 +20,7 @@ import java.util.List;
 
     public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
         if (oldComments == null || oldComments.isEmpty()) {
-            MainUtil.sendMessage(player, C.INBOX_EMPTY);
+            MainUtil.sendMessage(player, Captions.INBOX_EMPTY);
             return;
         }
         PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
@@ -40,7 +40,7 @@ import java.util.List;
         }
         StringBuilder string = new StringBuilder();
         string.append(StringMan
-            .replaceAll(C.COMMENT_LIST_HEADER_PAGED.s(), "%amount%", comments.length, "%cur",
+            .replaceAll(Captions.COMMENT_LIST_HEADER_PAGED.s(), "%amount%", comments.length, "%cur",
                 page + 1, "%max", totalPages + 1, "%word", "all") + '\n');
 
         // This might work xD
@@ -62,15 +62,15 @@ import java.util.List;
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            sendMessage(player, C.NOT_IN_PLOT);
+            sendMessage(player, Captions.NOT_IN_PLOT);
             return false;
         }
         if (!plot.hasOwner()) {
-            sendMessage(player, C.PLOT_UNOWNED);
+            sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         if (args.length == 0) {
-            sendMessage(player, C.COMMAND_SYNTAX,
+            sendMessage(player, Captions.COMMAND_SYNTAX,
                 "/plot inbox [inbox] [delete <index>|clear|page]");
             for (final CommentInbox inbox : CommentManager.inboxes.values()) {
                 if (inbox.canRead(plot, player)) {
@@ -93,16 +93,16 @@ import java.util.List;
                                     } else {
                                         color = "";
                                     }
-                                    sendMessage(player, C.INBOX_ITEM,
+                                    sendMessage(player, Captions.INBOX_ITEM,
                                         color + inbox.toString() + " (" + total + '/' + unread
                                             + ')');
                                     return;
                                 }
                             }
-                            sendMessage(player, C.INBOX_ITEM, inbox.toString());
+                            sendMessage(player, Captions.INBOX_ITEM, inbox.toString());
                         }
                     })) {
-                        sendMessage(player, C.INBOX_ITEM, inbox.toString());
+                        sendMessage(player, Captions.INBOX_ITEM, inbox.toString());
                     }
                 }
             }
@@ -110,7 +110,7 @@ import java.util.List;
         }
         final CommentInbox inbox = CommentManager.inboxes.get(args[0].toLowerCase());
         if (inbox == null) {
-            sendMessage(player, C.INVALID_INBOX,
+            sendMessage(player, Captions.INVALID_INBOX,
                 StringMan.join(CommentManager.inboxes.keySet(), ", "));
             return false;
         }
@@ -120,22 +120,22 @@ import java.util.List;
             switch (args[1].toLowerCase()) {
                 case "delete":
                     if (!inbox.canModify(plot, player)) {
-                        sendMessage(player, C.NO_PERM_INBOX_MODIFY);
+                        sendMessage(player, Captions.NO_PERM_INBOX_MODIFY);
                         return false;
                     }
                     if (args.length != 3) {
-                        sendMessage(player, C.COMMAND_SYNTAX,
+                        sendMessage(player, Captions.COMMAND_SYNTAX,
                             "/plot inbox " + inbox.toString() + " delete <index>");
                     }
                     final int index;
                     try {
                         index = Integer.parseInt(args[2]);
                         if (index < 1) {
-                            sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
+                            sendMessage(player, Captions.NOT_VALID_INBOX_INDEX, index + "");
                             return false;
                         }
                     } catch (NumberFormatException ignored) {
-                        sendMessage(player, C.COMMAND_SYNTAX,
+                        sendMessage(player, Captions.COMMAND_SYNTAX,
                             "/plot inbox " + inbox.toString() + " delete <index>");
                         return false;
                     }
@@ -143,35 +143,35 @@ import java.util.List;
                     if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
                         @Override public void run(List<PlotComment> value) {
                             if (index > value.size()) {
-                                sendMessage(player, C.NOT_VALID_INBOX_INDEX, index + "");
+                                sendMessage(player, Captions.NOT_VALID_INBOX_INDEX, index + "");
                                 return;
                             }
                             PlotComment comment = value.get(index - 1);
                             inbox.removeComment(plot, comment);
                             plot.removeComment(comment);
-                            MainUtil.sendMessage(player, C.COMMENT_REMOVED, comment.comment);
+                            MainUtil.sendMessage(player, Captions.COMMENT_REMOVED, comment.comment);
                         }
                     })) {
-                        sendMessage(player, C.NOT_IN_PLOT);
+                        sendMessage(player, Captions.NOT_IN_PLOT);
                         return false;
                     }
                     return true;
                 case "clear":
                     if (!inbox.canModify(plot, player)) {
-                        sendMessage(player, C.NO_PERM_INBOX_MODIFY);
+                        sendMessage(player, Captions.NO_PERM_INBOX_MODIFY);
                     }
                     inbox.clearInbox(plot);
                     List<PlotComment> comments = plot.getComments(inbox.toString());
                     if (!comments.isEmpty()) {
                         plot.removeComments(comments);
                     }
-                    MainUtil.sendMessage(player, C.COMMENT_REMOVED, "*");
+                    MainUtil.sendMessage(player, Captions.COMMENT_REMOVED, "*");
                     return true;
                 default:
                     try {
                         page = Integer.parseInt(args[1]);
                     } catch (NumberFormatException ignored) {
-                        sendMessage(player, C.COMMAND_SYNTAX,
+                        sendMessage(player, Captions.COMMAND_SYNTAX,
                             "/plot inbox [inbox] [delete <index>|clear|page]");
                         return false;
                     }
@@ -180,7 +180,7 @@ import java.util.List;
             page = 1;
         }
         if (!inbox.canRead(plot, player)) {
-            sendMessage(player, C.NO_PERM_INBOX);
+            sendMessage(player, Captions.NO_PERM_INBOX);
             return false;
         }
         if (!inbox.getComments(plot, new RunnableVal<List<PlotComment>>() {
@@ -188,7 +188,7 @@ import java.util.List;
                 displayComments(player, value, page);
             }
         })) {
-            sendMessage(player, C.PLOT_UNOWNED);
+            sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
index 6241e1d51..09f3e9c8b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@@ -50,7 +50,7 @@ import java.util.UUID;
             plot = player.getCurrentPlot();
         }
         if (plot == null) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT.s());
+            MainUtil.sendMessage(player, Captions.NOT_IN_PLOT.s());
             return false;
         }
         if (arg != null) {
@@ -97,11 +97,11 @@ import java.util.UUID;
         boolean trustedEveryone = plot.getMembers().contains(DBFunc.EVERYONE);
         // Unclaimed?
         if (!hasOwner && !containsEveryone && !trustedEveryone) {
-            MainUtil
-                .sendMessage(player, C.PLOT_INFO_UNCLAIMED, plot.getId().x + ";" + plot.getId().y);
+            MainUtil.sendMessage(player, Captions.PLOT_INFO_UNCLAIMED,
+                plot.getId().x + ";" + plot.getId().y);
             return true;
         }
-        String info = C.PLOT_INFO.s();
+        String info = Captions.PLOT_INFO.s();
         boolean full;
         if (arg != null) {
             info = getCaption(arg);
@@ -118,7 +118,8 @@ import java.util.UUID;
         MainUtil.format(info, plot, player, full, new RunnableVal<String>() {
             @Override public void run(String value) {
                 MainUtil.sendMessage(player,
-                    C.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + C.PLOT_INFO_FOOTER.s(), false);
+                    Captions.PLOT_INFO_HEADER.s() + '\n' + value + '\n' + Captions.PLOT_INFO_FOOTER
+                        .s(), false);
             }
         });
         return true;
@@ -127,27 +128,27 @@ import java.util.UUID;
     private String getCaption(String string) {
         switch (string) {
             case "trusted":
-                return C.PLOT_INFO_TRUSTED.s();
+                return Captions.PLOT_INFO_TRUSTED.s();
             case "alias":
-                return C.PLOT_INFO_ALIAS.s();
+                return Captions.PLOT_INFO_ALIAS.s();
             case "biome":
-                return C.PLOT_INFO_BIOME.s();
+                return Captions.PLOT_INFO_BIOME.s();
             case "denied":
-                return C.PLOT_INFO_DENIED.s();
+                return Captions.PLOT_INFO_DENIED.s();
             case "flags":
-                return C.PLOT_INFO_FLAGS.s();
+                return Captions.PLOT_INFO_FLAGS.s();
             case "id":
-                return C.PLOT_INFO_ID.s();
+                return Captions.PLOT_INFO_ID.s();
             case "size":
-                return C.PLOT_INFO_SIZE.s();
+                return Captions.PLOT_INFO_SIZE.s();
             case "members":
-                return C.PLOT_INFO_MEMBERS.s();
+                return Captions.PLOT_INFO_MEMBERS.s();
             case "owner":
-                return C.PLOT_INFO_OWNER.s();
+                return Captions.PLOT_INFO_OWNER.s();
             case "rating":
-                return C.PLOT_INFO_RATING.s();
+                return Captions.PLOT_INFO_RATING.s();
             case "seen":
-                return C.PLOT_INFO_SEEN.s();
+                return Captions.PLOT_INFO_SEEN.s();
             default:
                 return null;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
index fc16db715..88e69f556 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -29,16 +29,16 @@ import java.util.UUID;
         Location location = player.getLocation();
         Plot plot = location.getPlot();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if ((!plot.hasOwner() || !plot.isOwner(player.getUUID())) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_KICK)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_KICK)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
         if (uuids.isEmpty()) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
             return false;
         }
         Set<PlotPlayer> players = new HashSet<>();
@@ -46,7 +46,7 @@ import java.util.UUID;
             if (uuid == DBFunc.EVERYONE) {
                 for (PlotPlayer pp : plot.getPlayersInPlot()) {
                     if (pp == player || Permissions
-                        .hasPermission(pp, C.PERMISSION_ADMIN_ENTRY_DENIED)) {
+                        .hasPermission(pp, Captions.PERMISSION_ADMIN_ENTRY_DENIED)) {
                         continue;
                     }
                     players.add(pp);
@@ -60,26 +60,26 @@ import java.util.UUID;
         }
         players.remove(player); // Don't ever kick the calling player
         if (players.isEmpty()) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
             return false;
         }
         for (PlotPlayer player2 : players) {
             if (!plot.equals(player2.getCurrentPlot())) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+                MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
                 return false;
             }
-            if (Permissions.hasPermission(player2, C.PERMISSION_ADMIN_ENTRY_DENIED)) {
-                C.CANNOT_KICK_PLAYER.send(player, player2.getName());
+            if (Permissions.hasPermission(player2, Captions.PERMISSION_ADMIN_ENTRY_DENIED)) {
+                Captions.CANNOT_KICK_PLAYER.send(player, player2.getName());
                 return false;
             }
             Location spawn = WorldUtil.IMP.getSpawn(location.getWorld());
-            C.YOU_GOT_KICKED.send(player2);
+            Captions.YOU_GOT_KICKED.send(player2);
             if (plot.equals(spawn.getPlot())) {
                 Location newSpawn = WorldUtil.IMP
                     .getSpawn(PlotSquared.get().getPlotAreaManager().getAllWorlds()[0]);
                 if (plot.equals(newSpawn.getPlot())) {
                     // Kick from server if you can't be teleported to spawn
-                    player2.kick(C.YOU_GOT_KICKED.s());
+                    player2.kick(Captions.YOU_GOT_KICKED.s());
                 } else {
                     player2.plotkick(newSpawn);
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
index 5504ce777..be29265bf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Leave.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
@@ -23,12 +23,12 @@ import java.util.UUID;
     @Override public void execute(PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
-        checkTrue(plot.isAdded(player.getUUID()), C.NO_PLOT_PERMS);
-        checkTrue(args.length == 0, C.COMMAND_SYNTAX, getUsage());
+        final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
+        checkTrue(plot.hasOwner(), Captions.PLOT_UNOWNED);
+        checkTrue(plot.isAdded(player.getUUID()), Captions.NO_PLOT_PERMS);
+        checkTrue(args.length == 0, Captions.COMMAND_SYNTAX, getUsage());
         if (plot.isOwner(player.getUUID())) {
-            checkTrue(plot.hasOwner(), C.ALREADY_OWNER);
+            checkTrue(plot.hasOwner(), Captions.ALREADY_OWNER);
             // TODO setowner, other
         } else {
             UUID uuid = player.getUUID();
@@ -39,9 +39,9 @@ import java.util.UUID;
                 if (plot.removeMember(uuid)) {
                     EventUtil.manager.callMember(player, plot, uuid, false);
                 }
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+                MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
             } else {
-                MainUtil.sendMessage(player, C.REMOVED_PLAYERS, 1);
+                MainUtil.sendMessage(player, Captions.REMOVED_PLAYERS, 1);
             }
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
index c4b095f8d..725e4ed2b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared.SortType;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
@@ -20,43 +20,43 @@ public class ListCmd extends SubCommand {
     private String[] getArgumentList(PlotPlayer player) {
         List<String> args = new ArrayList<>();
         if (EconHandler.manager != null && Permissions
-            .hasPermission(player, C.PERMISSION_LIST_FORSALE)) {
+            .hasPermission(player, Captions.PERMISSION_LIST_FORSALE)) {
             args.add("forsale");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_MINE)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_MINE)) {
             args.add("mine");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_SHARED)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_SHARED)) {
             args.add("shared");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_WORLD)) {
             args.add("world");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_TOP)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_TOP)) {
             args.add("top");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_ALL)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_ALL)) {
             args.add("all");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_UNOWNED)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_UNOWNED)) {
             args.add("unowned");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_UNKNOWN)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_UNKNOWN)) {
             args.add("unknown");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_PLAYER)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_PLAYER)) {
             args.add("<player>");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_WORLD)) {
             args.add("<world>");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_DONE)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_DONE)) {
             args.add("done");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_EXPIRED)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_EXPIRED)) {
             args.add("expired");
         }
-        if (Permissions.hasPermission(player, C.PERMISSION_LIST_FUZZY)) {
+        if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_FUZZY)) {
             args.add("fuzzy <search...>");
         }
         return args.toArray(new String[args.size()]);
@@ -64,7 +64,7 @@ public class ListCmd extends SubCommand {
 
     public void noArgs(PlotPlayer player) {
         MainUtil.sendMessage(player,
-            C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + Arrays.toString(getArgumentList(player)));
+            Captions.SUBCOMMAND_SET_OPTIONS_HEADER.s() + Arrays.toString(getArgumentList(player)));
     }
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
@@ -93,16 +93,18 @@ public class ListCmd extends SubCommand {
         boolean sort = true;
         switch (arg) {
             case "mine":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_MINE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_MINE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_MINE)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_LIST_MINE);
                     return false;
                 }
                 sort = false;
                 plots = PlotSquared.get().sortPlotsByTemp(PlotSquared.get().getBasePlots(player));
                 break;
             case "shared":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_SHARED)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_SHARED);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_SHARED)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_SHARED);
                     return false;
                 }
                 plots = new ArrayList<>();
@@ -114,20 +116,23 @@ public class ListCmd extends SubCommand {
                 }
                 break;
             case "world":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_WORLD);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_WORLD)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_WORLD);
                     return false;
                 }
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(world))) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_LIST_WORLD_NAME.f(world));
+                if (!Permissions
+                    .hasPermission(player, Captions.PERMISSION_LIST_WORLD_NAME.f(world))) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_WORLD_NAME.f(world));
                     return false;
                 }
                 plots = new ArrayList<>(PlotSquared.get().getPlots(world));
                 break;
             case "expired":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_EXPIRED)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_EXPIRED);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_EXPIRED)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_EXPIRED);
                     return false;
                 }
                 plots = ExpireManager.IMP == null ?
@@ -135,27 +140,31 @@ public class ListCmd extends SubCommand {
                     new ArrayList<>(ExpireManager.IMP.getPendingExpired());
                 break;
             case "area":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_AREA)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_AREA);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_AREA)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_LIST_AREA);
                     return false;
                 }
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(world))) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION,
-                        C.PERMISSION_LIST_WORLD_NAME.f(world));
+                if (!Permissions
+                    .hasPermission(player, Captions.PERMISSION_LIST_WORLD_NAME.f(world))) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_WORLD_NAME.f(world));
                     return false;
                 }
                 plots = area == null ? new ArrayList<Plot>() : new ArrayList<>(area.getPlots());
                 break;
             case "all":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_ALL)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_ALL);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_ALL)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_LIST_ALL);
                     return false;
                 }
                 plots = new ArrayList<>(PlotSquared.get().getPlots());
                 break;
             case "done":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_DONE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_DONE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_DONE)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_LIST_DONE);
                     return false;
                 }
                 plots = new ArrayList<>();
@@ -179,8 +188,9 @@ public class ListCmd extends SubCommand {
                 sort = false;
                 break;
             case "top":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_TOP)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_TOP);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_TOP)) {
+                    MainUtil
+                        .sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_LIST_TOP);
                     return false;
                 }
                 plots = new ArrayList<>(PlotSquared.get().getPlots());
@@ -212,8 +222,9 @@ public class ListCmd extends SubCommand {
                 sort = false;
                 break;
             case "forsale":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_FORSALE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_FORSALE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_FORSALE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_FORSALE);
                     return false;
                 }
                 if (EconHandler.manager == null) {
@@ -228,8 +239,9 @@ public class ListCmd extends SubCommand {
                 }
                 break;
             case "unowned":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_UNOWNED)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_UNOWNED);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_UNOWNED)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_UNOWNED);
                     return false;
                 }
                 plots = new ArrayList<>();
@@ -240,8 +252,9 @@ public class ListCmd extends SubCommand {
                 }
                 break;
             case "unknown":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_UNKNOWN)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_UNKNOWN);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_UNKNOWN)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_UNKNOWN);
                     return false;
                 }
                 plots = new ArrayList<>();
@@ -255,12 +268,13 @@ public class ListCmd extends SubCommand {
                 }
                 break;
             case "fuzzy":
-                if (!Permissions.hasPermission(player, C.PERMISSION_LIST_FUZZY)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_FUZZY);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_FUZZY)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_LIST_FUZZY);
                     return false;
                 }
                 if (args.length < (page == -1 ? 2 : 3)) {
-                    C.COMMAND_SYNTAX.send(player, "/plot list fuzzy <search...> [#]");
+                    Captions.COMMAND_SYNTAX.send(player, "/plot list fuzzy <search...> [#]");
                     return false;
                 }
                 String term;
@@ -274,14 +288,15 @@ public class ListCmd extends SubCommand {
                 break;
             default:
                 if (PlotSquared.get().hasPlotArea(args[0])) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_LIST_WORLD)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_WORLD);
+                    if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_WORLD)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_LIST_WORLD);
                         return false;
                     }
                     if (!Permissions
-                        .hasPermission(player, C.PERMISSION_LIST_WORLD_NAME.f(args[0]))) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION,
-                            C.PERMISSION_LIST_WORLD_NAME.f(args[0]));
+                        .hasPermission(player, Captions.PERMISSION_LIST_WORLD_NAME.f(args[0]))) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_LIST_WORLD_NAME.f(args[0]));
                         return false;
                     }
                     plots = new ArrayList<>(PlotSquared.get().getPlots(args[0]));
@@ -295,8 +310,9 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 if (uuid != null) {
-                    if (!Permissions.hasPermission(player, C.PERMISSION_LIST_PLAYER)) {
-                        MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_LIST_PLAYER);
+                    if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_PLAYER)) {
+                        MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                            Captions.PERMISSION_LIST_PLAYER);
                         return false;
                     }
                     sort = false;
@@ -306,14 +322,14 @@ public class ListCmd extends SubCommand {
         }
 
         if (plots == null) {
-            sendMessage(player, C.DID_YOU_MEAN,
+            sendMessage(player, Captions.DID_YOU_MEAN,
                 new StringComparison<>(args[0], new String[] {"mine", "shared", "world", "all"})
                     .getBestMatch());
             return false;
         }
 
         if (plots.isEmpty()) {
-            MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
+            MainUtil.sendMessage(player, Captions.FOUND_NO_PLOTS);
             return false;
         }
         displayPlots(player, plots, 12, page, area, args, sort);
@@ -347,18 +363,20 @@ public class ListCmd extends SubCommand {
                     } else {
                         color = "$1";
                     }
-                    PlotMessage trusted = new PlotMessage().text(C.color(C.PLOT_INFO_TRUSTED.s()
+                    PlotMessage trusted =
+                        new PlotMessage().text(Captions.color(Captions.PLOT_INFO_TRUSTED.s()
                         .replaceAll("%trusted%", MainUtil.getPlayerList(plot.getTrusted()))))
                         .color("$1");
-                    PlotMessage members = new PlotMessage().text(C.color(C.PLOT_INFO_MEMBERS.s()
+                    PlotMessage members =
+                        new PlotMessage().text(Captions.color(Captions.PLOT_INFO_MEMBERS.s()
                         .replaceAll("%members%", MainUtil.getPlayerList(plot.getMembers()))))
                         .color("$1");
                     String strFlags = StringMan.join(plot.getFlags().values(), ",");
                     if (strFlags.isEmpty()) {
-                        strFlags = C.NONE.s();
+                        strFlags = Captions.NONE.s();
                     }
-                    PlotMessage flags = new PlotMessage()
-                        .text(C.color(C.PLOT_INFO_FLAGS.s().replaceAll("%flags%", strFlags)))
+                    PlotMessage flags = new PlotMessage().text(Captions
+                        .color(Captions.PLOT_INFO_FLAGS.s().replaceAll("%flags%", strFlags)))
                         .color("$1");
                     message.text("[").color("$3").text(i + "")
                         .command("/plot visit " + plot.getArea() + ";" + plot.getId())
@@ -386,7 +404,7 @@ public class ListCmd extends SubCommand {
                         prefix = ", ";
                     }
                 }
-            }, "/plot list " + args[0], C.PLOT_LIST_HEADER_PAGED.s());
+            }, "/plot list " + args[0], Captions.PLOT_LIST_HEADER_PAGED.s());
     }
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
index cc9106d28..234568fda 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
@@ -22,23 +22,23 @@ import java.util.List;
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         String world = player.getLocation().getWorld();
         if (!PlotSquared.get().hasPlotArea(world)) {
-            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            return !sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
         }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_LOAD)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_LOAD)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
             return false;
         }
 
@@ -47,7 +47,7 @@ import java.util.List;
                 List<String> schematics = player.getMeta("plot_schematics");
                 if (schematics == null) {
                     // No schematics found:
-                    MainUtil.sendMessage(player, C.LOAD_NULL);
+                    MainUtil.sendMessage(player, Captions.LOAD_NULL);
                     return false;
                 }
                 String schem;
@@ -55,8 +55,8 @@ import java.util.List;
                     schem = schematics.get(Integer.parseInt(args[0]) - 1);
                 } catch (Exception ignored) {
                     // use /plot load <index>
-                    MainUtil
-                        .sendMessage(player, C.NOT_VALID_NUMBER, "(1, " + schematics.size() + ')');
+                    MainUtil.sendMessage(player, Captions.NOT_VALID_NUMBER,
+                        "(1, " + schematics.size() + ')');
                     return false;
                 }
                 final URL url;
@@ -64,16 +64,16 @@ import java.util.List;
                     url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schem);
                 } catch (MalformedURLException e) {
                     e.printStackTrace();
-                    MainUtil.sendMessage(player, C.LOAD_FAILED);
+                    MainUtil.sendMessage(player, Captions.LOAD_FAILED);
                     return false;
                 }
                 plot.addRunning();
-                MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
+                MainUtil.sendMessage(player, Captions.GENERATING_COMPONENT);
                 TaskManager.runTaskAsync(() -> {
                     Schematic schematic = SchematicHandler.manager.getSchematic(url);
                     if (schematic == null) {
                         plot.removeRunning();
-                        sendMessage(player, C.SCHEMATIC_INVALID,
+                        sendMessage(player, Captions.SCHEMATIC_INVALID,
                             "non-existent or not in gzip format");
                         return;
                     }
@@ -84,9 +84,9 @@ import java.util.List;
                                 @Override public void run(Boolean value) {
                                     plot.removeRunning();
                                     if (value) {
-                                        sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                                        sendMessage(player, Captions.SCHEMATIC_PASTE_SUCCESS);
                                     } else {
-                                        sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                                        sendMessage(player, Captions.SCHEMATIC_PASTE_FAILED);
                                     }
                                 }
                             });
@@ -94,7 +94,7 @@ import java.util.List;
                 return true;
             }
             plot.removeRunning();
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot load <index>");
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot load <index>");
             return false;
         }
 
@@ -107,7 +107,7 @@ import java.util.List;
                 List<String> schematics1 = SchematicHandler.manager.getSaves(player.getUUID());
                 plot.removeRunning();
                 if ((schematics1 == null) || schematics1.isEmpty()) {
-                    MainUtil.sendMessage(player, C.LOAD_FAILED);
+                    MainUtil.sendMessage(player, Captions.LOAD_FAILED);
                     return;
                 }
                 player.setMeta("plot_schematics", schematics1);
@@ -141,7 +141,7 @@ import java.util.List;
                 e.printStackTrace();
             }
         }
-        MainUtil.sendMessage(player, C.LOAD_LIST);
+        MainUtil.sendMessage(player, Captions.LOAD_LIST);
     }
 
     public String secToTime(long time) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
index 0e1630e76..6f3ba0d28 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
 import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
@@ -200,7 +200,8 @@ public class MainCommand extends Command {
             PlotArea area = player.getApplicablePlotArea();
             Plot newPlot = Plot.fromString(area, args[0]);
             if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
-                .equals(area) || Permissions.hasPermission(player, C.PERMISSION_ADMIN)) && !newPlot
+                .equals(area) || Permissions.hasPermission(player, Captions.PERMISSION_ADMIN))
+                && !newPlot
                 .isDenied(player.getUUID())) {
                 Location newLoc = newPlot.getCenter();
                 if (player.canTeleport(newLoc)) {
@@ -212,7 +213,7 @@ public class MainCommand extends Command {
                     player.setMeta(PlotPlayer.META_LOCATION, newLoc);
                     player.setMeta(PlotPlayer.META_LAST_PLOT, newPlot);
                 } else {
-                    C.BORDER.send(player);
+                    Captions.BORDER.send(player);
                 }
                 // Trim command
                 args = Arrays.copyOfRange(args, 1, args.length);
@@ -247,7 +248,7 @@ public class MainCommand extends Command {
                         args = Arrays.copyOfRange(args, 1, args.length);
                         break;
                     default:
-                        C.INVALID_COMMAND_FLAG.send(player);
+                        Captions.INVALID_COMMAND_FLAG.send(player);
                         return;
                 }
             }
@@ -260,9 +261,9 @@ public class MainCommand extends Command {
             e.printStackTrace();
             String message = e.getLocalizedMessage();
             if (message != null) {
-                C.ERROR.send(player, message);
+                Captions.ERROR.send(player, message);
             } else {
-                C.ERROR.send(player);
+                Captions.ERROR.send(player);
             }
         }
         // Reset command scope //
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
index a944be561..970a0d35c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
@@ -43,16 +43,16 @@ public class Merge extends SubCommand {
         Location loc = player.getLocationFull();
         final Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         UUID uuid = player.getUUID();
         if (!plot.isOwner(uuid)) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_MERGE)) {
-                MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_MERGE)) {
+                MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
                 return false;
             } else {
                 uuid = plot.guessOwner();
@@ -65,13 +65,13 @@ public class Merge extends SubCommand {
         final double price = priceExr == null ? 0d : priceExr.evaluate((double) size);
         if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d
             && EconHandler.manager.getMoney(player) < price) {
-            sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
+            sendMessage(player, Captions.CANNOT_AFFORD_MERGE, String.valueOf(price));
             return false;
         }
         final int maxSize =
             Permissions.hasPermissionRange(player, "plots.merge", Settings.Limit.MAX_PLOTS);
         if (size - 1 > maxSize) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, "plots.merge." + (size + 1));
+            MainUtil.sendMessage(player, Captions.NO_PERMISSION, "plots.merge." + (size + 1));
             return false;
         }
         int direction = -1;
@@ -96,19 +96,21 @@ public class Merge extends SubCommand {
                 if (args.length == 2) {
                     terrain = "true".equalsIgnoreCase(args[1]);
                 }
-                if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
+                if (!terrain && !Permissions
+                    .hasPermission(player, Captions.PERMISSION_MERGE_KEEPROAD)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_MERGE_KEEPROAD.s());
                     return true;
                 }
                 if (plot.autoMerge(-1, maxSize, uuid, terrain)) {
                     if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
                         EconHandler.manager.withdrawMoney(player, price);
-                        sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
+                        sendMessage(player, Captions.REMOVED_BALANCE, String.valueOf(price));
                     }
-                    MainUtil.sendMessage(player, C.SUCCESS_MERGE);
+                    MainUtil.sendMessage(player, Captions.SUCCESS_MERGE);
                     return true;
                 }
-                MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
+                MainUtil.sendMessage(player, Captions.NO_AVAILABLE_AUTOMERGE);
                 return false;
 
             }
@@ -120,10 +122,10 @@ public class Merge extends SubCommand {
             }
         }
         if (direction == -1) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                 "/plot merge <" + StringMan.join(values, "|") + "> [removeroads]");
-            MainUtil
-                .sendMessage(player, C.DIRECTION.s().replaceAll("%dir%", direction(loc.getYaw())));
+            MainUtil.sendMessage(player,
+                Captions.DIRECTION.s().replaceAll("%dir%", direction(loc.getYaw())));
             return false;
         }
         final boolean terrain;
@@ -132,26 +134,27 @@ public class Merge extends SubCommand {
         } else {
             terrain = true;
         }
-        if (!terrain && !Permissions.hasPermission(player, C.PERMISSION_MERGE_KEEPROAD)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_KEEPROAD.s());
+        if (!terrain && !Permissions.hasPermission(player, Captions.PERMISSION_MERGE_KEEPROAD)) {
+            MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                Captions.PERMISSION_MERGE_KEEPROAD.s());
             return true;
         }
         if (plot.autoMerge(direction, maxSize - size, uuid, terrain)) {
             if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
                 EconHandler.manager.withdrawMoney(player, price);
-                sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
+                sendMessage(player, Captions.REMOVED_BALANCE, String.valueOf(price));
             }
-            MainUtil.sendMessage(player, C.SUCCESS_MERGE);
+            MainUtil.sendMessage(player, Captions.SUCCESS_MERGE);
             return true;
         }
         Plot adjacent = plot.getRelative(direction);
         if (adjacent == null || !adjacent.hasOwner() || adjacent.getMerged((direction + 2) % 4)
             || adjacent.isOwner(uuid)) {
-            MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
+            MainUtil.sendMessage(player, Captions.NO_AVAILABLE_AUTOMERGE);
             return false;
         }
-        if (!Permissions.hasPermission(player, C.PERMISSION_MERGE_OTHER)) {
-            MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_MERGE_OTHER);
+        if (!Permissions.hasPermission(player, Captions.PERMISSION_MERGE_OTHER)) {
+            MainUtil.sendMessage(player, Captions.NO_PERMISSION, Captions.PERMISSION_MERGE_OTHER);
             return false;
         }
         java.util.Set<UUID> uuids = adjacent.getOwners();
@@ -164,35 +167,35 @@ public class Merge extends SubCommand {
             isOnline = true;
             final int dir = direction;
             Runnable run = () -> {
-                MainUtil.sendMessage(accepter, C.MERGE_ACCEPTED);
+                MainUtil.sendMessage(accepter, Captions.MERGE_ACCEPTED);
                 plot.autoMerge(dir, maxSize - size, owner, terrain);
                 PlotPlayer plotPlayer = UUIDHandler.getPlayer(player.getUUID());
                 if (plotPlayer == null) {
-                    sendMessage(accepter, C.MERGE_NOT_VALID);
+                    sendMessage(accepter, Captions.MERGE_NOT_VALID);
                     return;
                 }
                 if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d) {
                     if (EconHandler.manager.getMoney(player) < price) {
-                        sendMessage(player, C.CANNOT_AFFORD_MERGE, String.valueOf(price));
+                        sendMessage(player, Captions.CANNOT_AFFORD_MERGE, String.valueOf(price));
                         return;
                     }
                     EconHandler.manager.withdrawMoney(player, price);
-                    sendMessage(player, C.REMOVED_BALANCE, String.valueOf(price));
+                    sendMessage(player, Captions.REMOVED_BALANCE, String.valueOf(price));
                 }
-                MainUtil.sendMessage(player, C.SUCCESS_MERGE);
+                MainUtil.sendMessage(player, Captions.SUCCESS_MERGE);
             };
             if (hasConfirmation(player)) {
                 CmdConfirm.addPending(accepter,
-                    C.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", player.getName()), run);
+                    Captions.MERGE_REQUEST_CONFIRM.s().replaceAll("%s", player.getName()), run);
             } else {
                 run.run();
             }
         }
         if (!isOnline) {
-            MainUtil.sendMessage(player, C.NO_AVAILABLE_AUTOMERGE);
+            MainUtil.sendMessage(player, Captions.NO_AVAILABLE_AUTOMERGE);
             return false;
         }
-        MainUtil.sendMessage(player, C.MERGE_REQUESTED);
+        MainUtil.sendMessage(player, Captions.MERGE_REQUESTED);
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
index f4f184cc1..8fbec1ecb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Middle.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -18,10 +18,10 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
         Location location = player.getLocation();
         Plot plot = location.getPlot();
         if (plot == null) {
-            return sendMessage(player, C.NOT_IN_PLOT);
+            return sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            return sendMessage(player, C.PLOT_UNOWNED);
+            return sendMessage(player, Captions.PLOT_UNOWNED);
         }
         player.teleport(plot.getCenter());
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
index 289a3c4a6..814d6b9cc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
@@ -18,11 +18,11 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
         Location loc = player.getLocation();
         Plot plot1 = loc.getPlotAbs();
         if (plot1 == null) {
-            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            return !MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot1.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         boolean override = false;
@@ -31,7 +31,7 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
             override = true;
         }
         if (args.length != 1) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
@@ -45,19 +45,19 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
             plot2 = area.getPlotAbs(plot1.getId());
         }
         if (plot1.equals(plot2)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot copy <X;Z>");
             return false;
         }
         if (!plot1.getArea().isCompatible(plot2.getArea()) && (!override || !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s()))) {
-            C.PLOTWORLD_INCOMPATIBLE.send(player);
+            .hasPermission(player, Captions.PERMISSION_ADMIN.s()))) {
+            Captions.PLOTWORLD_INCOMPATIBLE.send(player);
             return false;
         }
-        if (plot1.move(plot2, () -> MainUtil.sendMessage(player, C.MOVE_SUCCESS), false)) {
+        if (plot1.move(plot2, () -> MainUtil.sendMessage(player, Captions.MOVE_SUCCESS), false)) {
             return true;
         } else {
-            MainUtil.sendMessage(player, C.REQUIRES_UNOWNED);
+            MainUtil.sendMessage(player, Captions.REQUIRES_UNOWNED);
             return false;
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
index b2e5170e5..e773879ae 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 
@@ -23,10 +23,10 @@ import java.util.Locale;
         Location loc = player.getLocation();
         final Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.isAdded(player.getUUID())) {
-            sendMessage(player, C.NO_PLOT_PERMS);
+            sendMessage(player, Captions.NO_PLOT_PERMS);
             return true;
         }
         PlotInventory inv = new PlotInventory(player, 2, "Plot Jukebox") {
@@ -37,12 +37,12 @@ import java.util.Locale;
                 }
                 if (item.getPlotBlock().equalsAny(7, "bedrock")) {
                     plot.removeFlag(Flags.MUSIC);
-                    C.FLAG_REMOVED.send(player);
+                    Captions.FLAG_REMOVED.send(player);
                 } else if (item.name.toLowerCase(Locale.ENGLISH).contains("disc")) {
                     plot.setFlag(Flags.MUSIC, item.getPlotBlock().getRawId());
-                    C.FLAG_ADDED.send(player);
+                    Captions.FLAG_ADDED.send(player);
                 } else {
-                    C.FLAG_NOT_ADDED.send(player);
+                    Captions.FLAG_NOT_ADDED.send(player);
                 }
                 return false;
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
index c3e9c5f9e..0223245fc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
@@ -18,7 +18,7 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
     @Override public void execute(PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        C.PLOT_NEAR.send(player, StringMan.join(plot.getPlayersInPlot(), ", "));
+        final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
+        Captions.PLOT_NEAR.send(player, StringMan.join(plot.getPlayersInPlot(), ", "));
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
index 4095c15c9..0e692748f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -34,7 +34,7 @@ import java.util.UUID;
             if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
                 .equalsIgnoreCase("-")) {
                 if (!Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
                     return false;
                 }
                 Set<Plot> connected = plot.getConnectedPlots();
@@ -43,20 +43,20 @@ import java.util.UUID;
                     current.unclaim();
                     current.removeSign();
                 }
-                MainUtil.sendMessage(player, C.SET_OWNER);
+                MainUtil.sendMessage(player, Captions.SET_OWNER);
                 return true;
             }
-            C.INVALID_PLAYER.send(player, value);
+            Captions.INVALID_PLAYER.send(player, value);
             return false;
         }
         final PlotPlayer other = UUIDHandler.getPlayer(uuid);
         if (plot.isOwner(uuid)) {
-            C.ALREADY_OWNER.send(player, MainUtil.getName(uuid));
+            Captions.ALREADY_OWNER.send(player, MainUtil.getName(uuid));
             return false;
         }
-        if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SETOWNER)) {
+        if (!Permissions.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SETOWNER)) {
             if (other == null) {
-                C.INVALID_PLAYER_OFFLINE.send(player, value);
+                Captions.INVALID_PLAYER_OFFLINE.send(player, value);
                 return false;
             }
             int size = plots.size();
@@ -64,7 +64,7 @@ import java.util.UUID;
                 other.getPlotCount() :
                 other.getPlotCount(plot.getWorldName())) + size;
             if (currentPlots > other.getAllowedPlots()) {
-                sendMessage(player, C.CANT_TRANSFER_MORE_PLOTS);
+                sendMessage(player, Captions.CANT_TRANSFER_MORE_PLOTS);
                 return false;
             }
         }
@@ -77,13 +77,14 @@ import java.util.UUID;
                     if (removeDenied)
                         plot.removeDenied(finalUUID);
                     plot.setSign(finalName);
-                    MainUtil.sendMessage(player, C.SET_OWNER);
+                    MainUtil.sendMessage(player, Captions.SET_OWNER);
                     if (other != null) {
-                        MainUtil
-                            .sendMessage(other, C.NOW_OWNER, plot.getArea() + ";" + plot.getId());
+                        MainUtil.sendMessage(other, Captions.NOW_OWNER,
+                            plot.getArea() + ";" + plot.getId());
                     }
-                } else
-                    MainUtil.sendMessage(player, C.SET_OWNER_CANCELLED);
+                } else {
+                    MainUtil.sendMessage(player, Captions.SET_OWNER_CANCELLED);
+                }
             }
         };
         if (hasConfirmation(player)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
index a50ffbc90..0825b9610 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Purge.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -38,7 +38,7 @@ import java.util.UUID;
         for (String arg : args) {
             String[] split = arg.split(":");
             if (split.length != 2) {
-                C.COMMAND_SYNTAX.send(player, getUsage());
+                Captions.COMMAND_SYNTAX.send(player, getUsage());
                 return false;
             }
             switch (split[0].toLowerCase()) {
@@ -50,7 +50,7 @@ import java.util.UUID;
                 case "a":
                     area = PlotSquared.get().getPlotAreaByString(split[1]);
                     if (area == null) {
-                        C.NOT_VALID_PLOT_WORLD.send(player, split[1]);
+                        Captions.NOT_VALID_PLOT_WORLD.send(player, split[1]);
                         return false;
                     }
                     break;
@@ -59,7 +59,7 @@ import java.util.UUID;
                     try {
                         id = PlotId.fromString(split[1]);
                     } catch (IllegalArgumentException ignored) {
-                        C.NOT_VALID_PLOT_ID.send(player, split[1]);
+                        Captions.NOT_VALID_PLOT_ID.send(player, split[1]);
                         return false;
                     }
                     break;
@@ -67,7 +67,7 @@ import java.util.UUID;
                 case "o":
                     owner = UUIDHandler.getUUID(split[1], null);
                     if (owner == null) {
-                        C.INVALID_PLAYER.send(player, split[1]);
+                        Captions.INVALID_PLAYER.send(player, split[1]);
                         return false;
                     }
                     break;
@@ -75,7 +75,7 @@ import java.util.UUID;
                 case "s":
                     added = UUIDHandler.getUUID(split[1], null);
                     if (added == null) {
-                        C.INVALID_PLAYER.send(player, split[1]);
+                        Captions.INVALID_PLAYER.send(player, split[1]);
                         return false;
                     }
                     break;
@@ -85,7 +85,7 @@ import java.util.UUID;
                     unknown = Boolean.parseBoolean(split[1]);
                     break;
                 default:
-                    C.COMMAND_SYNTAX.send(player, getUsage());
+                    Captions.COMMAND_SYNTAX.send(player, getUsage());
                     return false;
             }
         }
@@ -137,7 +137,7 @@ import java.util.UUID;
             }
         }
         if (toDelete.isEmpty()) {
-            C.FOUND_NO_PLOTS.send(player);
+            Captions.FOUND_NO_PLOTS.send(player);
             return false;
         }
         String cmd =
@@ -156,7 +156,7 @@ import java.util.UUID;
                 }
             }
             DBFunc.purgeIds(ids);
-            C.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
+            Captions.PURGE_SUCCESS.send(player, ids.size() + "/" + toDelete.size());
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, cmd, run);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 8446b62a3..7c9705475 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
@@ -48,48 +48,50 @@ import java.util.UUID;
                             .isBasePlot() && (!p.getRatings().containsKey(uuid)) && !p
                             .isAdded(uuid)) {
                             p.teleportPlayer(player);
-                            MainUtil.sendMessage(player, C.RATE_THIS);
+                            MainUtil.sendMessage(player, Captions.RATE_THIS);
                             return true;
                         }
                     }
-                    MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
+                    MainUtil.sendMessage(player, Captions.FOUND_NO_PLOTS);
                     return false;
                 }
                 case "purge": {
                     final Plot plot = player.getCurrentPlot();
                     if (plot == null) {
-                        return !sendMessage(player, C.NOT_IN_PLOT);
+                        return !sendMessage(player, Captions.NOT_IN_PLOT);
                     }
-                    if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND_RATE, true)) {
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_RATE, true)) {
                         return false;
                     }
                     plot.clearRatings();
-                    C.RATINGS_PURGED.send(player);
+                    Captions.RATINGS_PURGED.send(player);
                     return true;
                 }
             }
         }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            sendMessage(player, C.RATING_NOT_OWNED);
+            sendMessage(player, Captions.RATING_NOT_OWNED);
             return false;
         }
         if (plot.isOwner(player.getUUID())) {
-            sendMessage(player, C.RATING_NOT_YOUR_OWN);
+            sendMessage(player, Captions.RATING_NOT_YOUR_OWN);
             return false;
         }
         if (Settings.Done.REQUIRED_FOR_RATINGS && !plot.hasFlag(Flags.DONE)) {
-            sendMessage(player, C.RATING_NOT_DONE);
+            sendMessage(player, Captions.RATING_NOT_DONE);
             return false;
         }
         if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
             final Runnable run = new Runnable() {
                 @Override public void run() {
                     if (plot.getRatings().containsKey(player.getUUID())) {
-                        sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                        sendMessage(player, Captions.RATING_ALREADY_EXISTS,
+                            plot.getId().toString());
                         return;
                     }
                     final MutableInt index = new MutableInt(0);
@@ -105,14 +107,14 @@ import java.util.UUID;
                                     EventUtil.manager.callRating(this.player, plot, new Rating(rV));
                                 if (result != null) {
                                     plot.addRating(this.player.getUUID(), result);
-                                    sendMessage(this.player, C.RATING_APPLIED,
+                                    sendMessage(this.player, Captions.RATING_APPLIED,
                                         plot.getId().toString());
                                     if (Permissions
-                                        .hasPermission(this.player, C.PERMISSION_COMMENT)) {
+                                        .hasPermission(this.player, Captions.PERMISSION_COMMENT)) {
                                         Command command =
                                             MainCommand.getInstance().getCommand(Comment.class);
                                         if (command != null) {
-                                            MainUtil.sendMessage(this.player, C.COMMENT_THIS,
+                                            MainUtil.sendMessage(this.player, Captions.COMMENT_THIS,
                                                 command.getUsage());
                                         }
                                     }
@@ -149,7 +151,7 @@ import java.util.UUID;
             return true;
         }
         if (args.length < 1) {
-            sendMessage(player, C.RATING_NOT_VALID);
+            sendMessage(player, Captions.RATING_NOT_VALID);
             return true;
         }
         String arg = args[0];
@@ -157,23 +159,23 @@ import java.util.UUID;
         if (MathMan.isInteger(arg) && arg.length() < 3 && !arg.isEmpty()) {
             rating = Integer.parseInt(arg);
             if (rating > 10 || rating < 1) {
-                sendMessage(player, C.RATING_NOT_VALID);
+                sendMessage(player, Captions.RATING_NOT_VALID);
                 return false;
             }
         } else {
-            sendMessage(player, C.RATING_NOT_VALID);
+            sendMessage(player, Captions.RATING_NOT_VALID);
             return false;
         }
         final UUID uuid = player.getUUID();
         final Runnable run = () -> {
             if (plot.getRatings().containsKey(uuid)) {
-                sendMessage(player, C.RATING_ALREADY_EXISTS, plot.getId().toString());
+                sendMessage(player, Captions.RATING_ALREADY_EXISTS, plot.getId().toString());
                 return;
             }
             Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
             if (result != null) {
                 plot.addRating(uuid, result);
-                sendMessage(player, C.RATING_APPLIED, plot.getId().toString());
+                sendMessage(player, Captions.RATING_APPLIED, plot.getId().toString());
             }
         };
         if (plot.getSettings().ratings == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
index 9edf20a62..9fcdc811d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RegenAllRoads.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
@@ -22,24 +22,25 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
             try {
                 height = Integer.parseInt(args[1]);
             } catch (NumberFormatException ignored) {
-                MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0, 256)");
-                MainUtil
-                    .sendMessage(player, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
+                MainUtil.sendMessage(player, Captions.NOT_VALID_NUMBER, "(0, 256)");
+                MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                    "/plot regenallroads <world> [height]");
                 return false;
             }
         } else if (args.length != 1) {
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot regenallroads <world> [height]");
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                "/plot regenallroads <world> [height]");
             return false;
         }
         PlotArea area = PlotSquared.get().getPlotAreaByString(args[0]);
         if (area == null) {
-            C.NOT_VALID_PLOT_WORLD.send(player, args[0]);
+            Captions.NOT_VALID_PLOT_WORLD.send(player, args[0]);
             return false;
         }
         String name = args[0];
         PlotManager manager = area.getPlotManager();
         if (!(manager instanceof HybridPlotManager)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_WORLD);
             return false;
         }
         //Set<ChunkLoc> chunks = ChunkManager.manager.getChunkChunks(name);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
index 79a87b887..65656117a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Relight.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
@@ -20,7 +20,7 @@ import java.util.HashSet;
         RunnableVal2<Command, CommandResult> whenDone) {
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            C.NOT_IN_PLOT.send(player);
+            Captions.NOT_IN_PLOT.send(player);
             return;
         }
         HashSet<RegionWrapper> regions = plot.getRegions();
@@ -32,7 +32,7 @@ import java.util.HashSet;
         }, new Runnable() {
             @Override public void run() {
                 plot.refreshChunks();
-                C.SET_BLOCK_ACTION_FINISHED.send(player);
+                Captions.SET_BLOCK_ACTION_FINISHED.send(player);
             }
         }, 5);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
index bee93e15d..db900e91e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
@@ -5,7 +5,7 @@ import com.github.intellectualsites.plotsquared.configuration.ConfigurationSecti
 import com.github.intellectualsites.plotsquared.configuration.MemorySection;
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 
@@ -21,7 +21,7 @@ import java.util.Objects;
             // The following won't affect world generation, as that has to be
             // loaded during startup unfortunately.
             PlotSquared.get().setupConfigs();
-            C.load(PlotSquared.get().translationFile);
+            Captions.load(PlotSquared.get().translationFile);
             PlotSquared.get().forEachPlotArea(area -> {
                 ConfigurationSection worldSection =
                     PlotSquared.get().worlds.getConfigurationSection("worlds." + area.worldname);
@@ -70,10 +70,10 @@ import java.util.Objects;
                 }
             });
             PlotSquared.get().worlds.save(PlotSquared.get().worldsFile);
-            MainUtil.sendMessage(player, C.RELOADED_CONFIGS);
+            MainUtil.sendMessage(player, Captions.RELOADED_CONFIGS);
         } catch (IOException e) {
             e.printStackTrace();
-            MainUtil.sendMessage(player, C.RELOAD_FAILED);
+            MainUtil.sendMessage(player, Captions.RELOAD_FAILED);
         }
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
index bf027f20d..30c364671 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -30,15 +30,15 @@ import java.util.UUID;
         Location location = player.getLocation();
         Plot plot = location.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_REMOVE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_REMOVE)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return true;
         }
         int count = 0;
@@ -98,10 +98,10 @@ import java.util.UUID;
                 break;
         }
         if (count == 0) {
-            MainUtil.sendMessage(player, C.INVALID_PLAYER, args[0]);
+            MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
             return false;
         } else {
-            MainUtil.sendMessage(player, C.REMOVED_PLAYERS, count + "");
+            MainUtil.sendMessage(player, Captions.REMOVED_PLAYERS, count + "");
         }
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
index aec9543ed..d408ce2fa 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
@@ -21,23 +21,23 @@ import java.util.UUID;
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         String world = player.getLocation().getWorld();
         if (!PlotSquared.get().hasPlotArea(world)) {
-            return !sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            return !sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
         }
         final Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+            MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
             return false;
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SAVE)) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SAVE)) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (plot.getRunning() > 0) {
-            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
             return false;
         }
         plot.addRunning();
@@ -58,10 +58,10 @@ import java.util.UUID;
                         @Override public void run(URL url) {
                             plot.removeRunning();
                             if (url == null) {
-                                MainUtil.sendMessage(player, C.SAVE_FAILED);
+                                MainUtil.sendMessage(player, Captions.SAVE_FAILED);
                                 return;
                             }
-                            MainUtil.sendMessage(player, C.SAVE_SUCCESS);
+                            MainUtil.sendMessage(player, Captions.SAVE_SUCCESS);
                             List<String> schematics = player.getMeta("plot_schematics");
                             if (schematics != null) {
                                 schematics.add(file + ".schematic");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
index 110992543..48f0a8a1c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
@@ -22,32 +22,33 @@ public class SchematicCmd extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length < 1) {
-            sendMessage(player, C.SCHEMATIC_MISSING_ARG);
+            sendMessage(player, Captions.SCHEMATIC_MISSING_ARG);
             return true;
         }
         String arg = args[0].toLowerCase();
         switch (arg) {
             case "paste": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_PASTE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_PASTE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_SCHEMATIC_PASTE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_SCHEMATIC_PASTE);
                     return false;
                 }
                 if (args.length < 2) {
-                    sendMessage(player, C.SCHEMATIC_MISSING_ARG);
+                    sendMessage(player, Captions.SCHEMATIC_MISSING_ARG);
                     break;
                 }
                 Location loc = player.getLocation();
                 final Plot plot = loc.getPlotAbs();
                 if (plot == null) {
-                    return !sendMessage(player, C.NOT_IN_PLOT);
+                    return !sendMessage(player, Captions.NOT_IN_PLOT);
                 }
                 if (!plot.hasOwner()) {
-                    MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+                    MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
                     return false;
                 }
                 if (!plot.isOwner(player.getUUID()) && !Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE)) {
-                    MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
                     return false;
                 }
                 if (this.running) {
@@ -66,7 +67,7 @@ public class SchematicCmd extends SubCommand {
                             schematic = SchematicHandler.manager.getSchematic(url);
                         } catch (Exception e) {
                             e.printStackTrace();
-                            sendMessage(player, C.SCHEMATIC_INVALID,
+                            sendMessage(player, Captions.SCHEMATIC_INVALID,
                                 "non-existent url: " + location);
                             SchematicCmd.this.running = false;
                             return;
@@ -80,7 +81,7 @@ public class SchematicCmd extends SubCommand {
                     }
                     if (schematic == null) {
                         SchematicCmd.this.running = false;
-                        sendMessage(player, C.SCHEMATIC_INVALID,
+                        sendMessage(player, Captions.SCHEMATIC_INVALID,
                             "non-existent or not in gzip format");
                         return;
                     }
@@ -89,9 +90,9 @@ public class SchematicCmd extends SubCommand {
                             @Override public void run(Boolean value) {
                                 SchematicCmd.this.running = false;
                                 if (value) {
-                                    sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                                    sendMessage(player, Captions.SCHEMATIC_PASTE_SUCCESS);
                                 } else {
-                                    sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                                    sendMessage(player, Captions.SCHEMATIC_PASTE_FAILED);
                                 }
                             }
                         });
@@ -101,39 +102,39 @@ public class SchematicCmd extends SubCommand {
             //            TODO test
             //            case "test": {
             //                if (!Permissions.hasPermission(plr, "plots.schematic.test")) {
-            //                    MainUtil.sendMessage(plr, C.NO_PERMISSION, "plots.schematic.test");
+            //                    MainUtil.sendMessage(plr, Captions.NO_PERMISSION, "plots.schematic.test");
             //                    return false;
             //                }
             //                if (args.length < 2) {
-            //                    sendMessage(plr, C.SCHEMATIC_MISSING_ARG);
+            //                    sendMessage(plr, Captions.SCHEMATIC_MISSING_ARG);
             //                    return false;
             //                }
             //                final Location loc = plr.getLocation();
             //                final Plot plot = MainUtil.getPlot(loc);
             //                if (plot == null) {
-            //                    sendMessage(plr, C.NOT_IN_PLOT);
+            //                    sendMessage(plr, Captions.NOT_IN_PLOT);
             //                    return false;
             //                }
             //                file = args[1];
             //                schematic = SchematicHandler.manager.getSchematic(file);
             //                if (schematic == null) {
-            //                    sendMessage(plr, C.SCHEMATIC_INVALID, "non-existent");
+            //                    sendMessage(plr, Captions.SCHEMATIC_INVALID, "non-existent");
             //                    return false;
             //                }
             //                final int l1 = schematic.getSchematicDimension().getX();
             //                final int l2 = schematic.getSchematicDimension().getZ();
             //                final int length = MainUtil.getPlotWidth(loc.getWorld(), plot.id);
             //                if ((l1 < length) || (l2 < length)) {
-            //                    sendMessage(plr, C.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
+            //                    sendMessage(plr, Captions.SCHEMATIC_INVALID, String.format("Wrong size (x: %s, z: %d) vs %d ", l1, l2, length));
             //                    break;
             //                }
-            //                sendMessage(plr, C.SCHEMATIC_VALID);
+            //                sendMessage(plr, Captions.SCHEMATIC_VALID);
             //                break;
             //            }
             case "saveall":
             case "exportall": {
                 if (!(player instanceof ConsolePlayer)) {
-                    MainUtil.sendMessage(player, C.NOT_CONSOLE);
+                    MainUtil.sendMessage(player, Captions.NOT_CONSOLE);
                     return false;
                 }
                 if (args.length != 2) {
@@ -143,7 +144,7 @@ public class SchematicCmd extends SubCommand {
                 }
                 PlotArea area = PlotSquared.get().getPlotAreaByString(args[1]);
                 if (area == null) {
-                    C.NOT_VALID_PLOT_WORLD.send(player, args[1]);
+                    Captions.NOT_VALID_PLOT_WORLD.send(player, args[1]);
                     return false;
                 }
                 Collection<Plot> plots = area.getPlots();
@@ -167,8 +168,9 @@ public class SchematicCmd extends SubCommand {
             }
             case "export":
             case "save":
-                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_SAVE)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_SAVE);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_SCHEMATIC_SAVE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_SCHEMATIC_SAVE);
                     return false;
                 }
                 if (this.running) {
@@ -178,15 +180,15 @@ public class SchematicCmd extends SubCommand {
                 Location location = player.getLocation();
                 Plot plot = location.getPlotAbs();
                 if (plot == null) {
-                    return !sendMessage(player, C.NOT_IN_PLOT);
+                    return !sendMessage(player, Captions.NOT_IN_PLOT);
                 }
                 if (!plot.hasOwner()) {
-                    MainUtil.sendMessage(player, C.PLOT_UNOWNED);
+                    MainUtil.sendMessage(player, Captions.PLOT_UNOWNED);
                     return false;
                 }
                 if (!plot.isOwner(player.getUUID()) && !Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE)) {
-                    MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE)) {
+                    MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
                     return false;
                 }
                 location.getWorld();
@@ -204,17 +206,18 @@ public class SchematicCmd extends SubCommand {
                 }
                 break;
             case "list": {
-                if (!Permissions.hasPermission(player, C.PERMISSION_SCHEMATIC_LIST)) {
-                    MainUtil.sendMessage(player, C.NO_PERMISSION, C.PERMISSION_SCHEMATIC_LIST);
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_SCHEMATIC_LIST)) {
+                    MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                        Captions.PERMISSION_SCHEMATIC_LIST);
                     return false;
                 }
                 final String string =
                     StringMan.join(SchematicHandler.manager.getShematicNames(), "$2, $1");
-                C.SCHEMATIC_LIST.send(player, string);
+                Captions.SCHEMATIC_LIST.send(player, string);
             }
             break;
             default:
-                sendMessage(player, C.SCHEMATIC_MISSING_ARG);
+                sendMessage(player, Captions.SCHEMATIC_MISSING_ARG);
                 break;
         }
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
index 6d8dc9c22..6f9277166 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration.UnknownBlockException;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
@@ -47,17 +47,17 @@ import java.util.stream.IntStream;
 
                 for (String component : components) {
                     if (component.equalsIgnoreCase(args[0])) {
-                        if (!Permissions
-                            .hasPermission(player, C.PERMISSION_SET_COMPONENT.f(component))) {
-                            MainUtil.sendMessage(player, C.NO_PERMISSION,
-                                C.PERMISSION_SET_COMPONENT.f(component));
+                        if (!Permissions.hasPermission(player,
+                            Captions.PERMISSION_SET_COMPONENT.f(component))) {
+                            MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                                Captions.PERMISSION_SET_COMPONENT.f(component));
                             return false;
                         }
                         // PlotBlock[] blocks;
                         BlockBucket bucket;
                         try {
                             if (args.length < 2) {
-                                MainUtil.sendMessage(player, C.NEED_BLOCK);
+                                MainUtil.sendMessage(player, Captions.NEED_BLOCK);
                                 return true;
                             }
                             String[] split = material.split(",");
@@ -67,14 +67,14 @@ import java.util.stream.IntStream;
                                 bucket = Configuration.BLOCK_BUCKET.parseString(material);
                             } catch (final UnknownBlockException unknownBlockException) {
                                 final String unknownBlock = unknownBlockException.getUnknownValue();
-                                C.NOT_VALID_BLOCK.send(player, unknownBlock);
+                                Captions.NOT_VALID_BLOCK.send(player, unknownBlock);
                                 StringComparison<PlotBlock>.ComparisonResult match =
                                     WorldUtil.IMP.getClosestBlock(unknownBlock);
                                 if (match != null) {
                                     final String found =
                                         WorldUtil.IMP.getClosestMatchingName(match.best);
                                     if (found != null) {
-                                        MainUtil.sendMessage(player, C.DID_YOU_MEAN,
+                                        MainUtil.sendMessage(player, Captions.DID_YOU_MEAN,
                                             found.toLowerCase());
                                     }
                                 }
@@ -84,24 +84,24 @@ import java.util.stream.IntStream;
                             if (!allowUnsafe) {
                                 for (final PlotBlock block : bucket.getBlocks()) {
                                     if (!block.isAir() && !WorldUtil.IMP.isBlockSolid(block)) {
-                                        C.NOT_ALLOWED_BLOCK.send(player, block.toString());
+                                        Captions.NOT_ALLOWED_BLOCK.send(player, block.toString());
                                         return false;
                                     }
                                 }
                             }
                         } catch (Exception ignored) {
-                            MainUtil.sendMessage(player, C.NOT_VALID_BLOCK, material);
+                            MainUtil.sendMessage(player, Captions.NOT_VALID_BLOCK, material);
                             return false;
                         }
                         if (plot.getRunning() > 0) {
-                            MainUtil.sendMessage(player, C.WAIT_FOR_TIMER);
+                            MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
                             return false;
                         }
                         plot.addRunning();
                         for (Plot current : plot.getConnectedPlots()) {
                             current.setComponent(component, bucket);
                         }
-                        MainUtil.sendMessage(player, C.GENERATING_COMPONENT);
+                        MainUtil.sendMessage(player, Captions.GENERATING_COMPONENT);
                         GlobalBlockQueue.IMP.addTask(plot::removeRunning);
                         return true;
                     }
@@ -119,8 +119,8 @@ import java.util.stream.IntStream;
             newValues.addAll(
                 Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
         }
-        MainUtil.sendMessage(player, C.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan
-            .join(newValues, C.BLOCK_LIST_SEPARATER.formatted()));
+        MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan
+            .join(newValues, Captions.BLOCK_LIST_SEPARATER.formatted()));
         return false;
     }
 
@@ -139,7 +139,7 @@ import java.util.stream.IntStream;
         // Additional checks
         Plot plot = player.getCurrentPlot();
         if (plot == null) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
             return false;
         }
         // components
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
index aaa1adfa2..bc64f0244 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetCommand.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -14,21 +14,23 @@ public abstract class SetCommand extends SubCommand {
         Location loc = player.getLocation();
         Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                    C.PERMISSION_ADMIN_COMMAND.f(getFullId()));
-                MainUtil.sendMessage(player, C.PLOT_NOT_CLAIMED);
+            if (!Permissions
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
+                MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                    Captions.PERMISSION_ADMIN_COMMAND.f(getFullId()));
+                MainUtil.sendMessage(player, Captions.PLOT_NOT_CLAIMED);
                 return false;
             }
         }
         if (!plot.isOwner(player.getUUID())) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION,
-                    C.PERMISSION_ADMIN_COMMAND.f(getFullId()));
-                MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            if (!Permissions
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND.f(getFullId()))) {
+                MainUtil.sendMessage(player, Captions.NO_PERMISSION,
+                    Captions.PERMISSION_ADMIN_COMMAND.f(getFullId()));
+                MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
                 return false;
             }
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
index fc92cc550..af0968a92 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SetHome.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.BlockLoc;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -21,7 +21,7 @@ public class SetHome extends SetCommand {
             case "none": {
                 Plot base = plot.getBasePlot(false);
                 base.setHome(null);
-                return MainUtil.sendMessage(player, C.POSITION_UNSET);
+                return MainUtil.sendMessage(player, Captions.POSITION_UNSET);
             }
             case "":
                 Plot base = plot.getBasePlot(false);
@@ -31,9 +31,9 @@ public class SetHome extends SetCommand {
                     new BlockLoc(loc.getX() - bot.getX(), loc.getY(), loc.getZ() - bot.getZ(),
                         loc.getYaw(), loc.getPitch());
                 base.setHome(rel);
-                return MainUtil.sendMessage(player, C.POSITION_SET);
+                return MainUtil.sendMessage(player, Captions.POSITION_SET);
             default:
-                MainUtil.sendMessage(player, C.HOME_ARGUMENT);
+                MainUtil.sendMessage(player, Captions.HOME_ARGUMENT);
                 return false;
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
index 412927526..5dc5973d4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
 import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
@@ -43,7 +43,7 @@ import java.util.Map.Entry;
             object = new SetupObject();
             player.setMeta("setup", object);
             SetupUtils.manager.updateGenerators();
-            sendMessage(player, C.SETUP_INIT);
+            sendMessage(player, Captions.SETUP_INIT);
             displayGenerators(player);
             return false;
         }
@@ -57,7 +57,8 @@ import java.util.Map.Entry;
                 if (object.setup_index > 0) {
                     object.setup_index--;
                     ConfigurationNode node = object.step[object.setup_index];
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, node.getDescription(),
+                    sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
+                        node.getDescription(),
                         node.getType().getType(), String.valueOf(node.getDefaultValue()));
                     return false;
                 } else if (object.current > 0) {
@@ -75,7 +76,7 @@ import java.util.Map.Entry;
                             .join(SetupUtils.generators.keySet(), prefix)
                             .replaceAll(PlotSquared.imp().getPluginName(),
                                 "&2" + PlotSquared.imp().getPluginName()));
-                    sendMessage(player, C.SETUP_INIT);
+                    sendMessage(player, Captions.SETUP_INIT);
                     return false;
                 }
                 object.setupGenerator = args[0];
@@ -129,7 +130,8 @@ import java.util.Map.Entry;
                         return true;
                     }
                     ConfigurationNode step = object.step[object.setup_index];
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                    sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
+                        step.getDescription(),
                         step.getType().getType(), String.valueOf(step.getDefaultValue()));
                 } else {
                     if (gen.isFull()) {
@@ -231,7 +233,8 @@ import java.util.Map.Entry;
                         .getSettingNodes();
                 }
                 ConfigurationNode step = object.step[object.setup_index];
-                sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
+                    step.getDescription(),
                     step.getType().getType(), String.valueOf(step.getDefaultValue()));
                 break;
             }
@@ -244,7 +247,8 @@ import java.util.Map.Entry;
                 }
                 ConfigurationNode step = object.step[object.setup_index];
                 if (args.length < 1) {
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                    sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
+                        step.getDescription(),
                         step.getType().getType(), String.valueOf(step.getDefaultValue()));
                     return false;
                 }
@@ -253,10 +257,10 @@ import java.util.Map.Entry;
                 try {
                     valid = step.isValid(args[0]);
                 } catch (final Configuration.UnsafeBlockException e) {
-                    C.NOT_ALLOWED_BLOCK.send(player, e.getUnsafeBlock().toString());
+                    Captions.NOT_ALLOWED_BLOCK.send(player, e.getUnsafeBlock().toString());
                 }
                 if (valid) {
-                    sendMessage(player, C.SETUP_VALID_ARG, step.getConstant(), args[0]);
+                    sendMessage(player, Captions.SETUP_VALID_ARG, step.getConstant(), args[0]);
                     step.setValue(args[0]);
                     object.setup_index++;
                     if (object.setup_index == object.step.length) {
@@ -264,12 +268,14 @@ import java.util.Map.Entry;
                         return false;
                     }
                     step = object.step[object.setup_index];
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                    sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
+                        step.getDescription(),
                         step.getType().getType(), String.valueOf(step.getDefaultValue()));
                     return false;
                 } else {
-                    sendMessage(player, C.SETUP_INVALID_ARG, args[0], step.getConstant());
-                    sendMessage(player, C.SETUP_STEP, object.setup_index + 1, step.getDescription(),
+                    sendMessage(player, Captions.SETUP_INVALID_ARG, args[0], step.getConstant());
+                    sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
+                        step.getDescription(),
                         step.getType().getType(), String.valueOf(step.getDefaultValue()));
                     return false;
                 }
@@ -302,7 +308,7 @@ import java.util.Map.Entry;
                     player.sendMessage("&cAn error occurred. See console for more information");
                     e.printStackTrace();
                 }
-                sendMessage(player, C.SETUP_FINISHED, object.world);
+                sendMessage(player, Captions.SETUP_FINISHED, object.world);
         }
         return false;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
index 396185e29..82bb3a17d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
@@ -32,7 +32,7 @@ public abstract class SubCommand extends Command {
 
     public abstract boolean onCommand(PlotPlayer player, String[] args);
 
-    public boolean sendMessage(PlotPlayer player, C message, Object... args) {
+    public boolean sendMessage(PlotPlayer player, Captions message, Object... args) {
         message.send(player, args);
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
index 80a96dfb6..d911ae3a5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -16,15 +16,15 @@ public class Swap extends SubCommand {
         Location loc = player.getLocation();
         Plot plot1 = loc.getPlotAbs();
         if (plot1 == null) {
-            return !MainUtil.sendMessage(player, C.NOT_IN_PLOT);
+            return !MainUtil.sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot1.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN.s())) {
-            MainUtil.sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN.s())) {
+            MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
             return false;
         }
         if (args.length != 1) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         Plot plot2 = MainUtil.getPlotFromString(player, args[0], true);
@@ -32,22 +32,22 @@ public class Swap extends SubCommand {
             return false;
         }
         if (plot1.equals(plot2)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot copy <X;Z>");
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX, "/plot copy <X;Z>");
             return false;
         }
         if (!plot1.getArea().isCompatible(plot2.getArea())) {
-            C.PLOTWORLD_INCOMPATIBLE.send(player);
+            Captions.PLOTWORLD_INCOMPATIBLE.send(player);
             return false;
         }
         if (plot1.move(plot2, new Runnable() {
             @Override public void run() {
-                MainUtil.sendMessage(player, C.SWAP_SUCCESS);
+                MainUtil.sendMessage(player, Captions.SWAP_SUCCESS);
             }
         }, true)) {
             return true;
         } else {
-            MainUtil.sendMessage(player, C.SWAP_OVERLAP);
+            MainUtil.sendMessage(player, Captions.SWAP_OVERLAP);
             return false;
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
index 03879463a..4dd37bdb0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Target.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -22,7 +22,7 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         Location location = player.getLocation();
         if (!location.isPlotArea()) {
-            MainUtil.sendMessage(player, C.NOT_IN_PLOT_WORLD);
+            MainUtil.sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
             return false;
         }
         Plot target = null;
@@ -36,14 +36,14 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan;
                 }
             }
             if (target == null) {
-                MainUtil.sendMessage(player, C.FOUND_NO_PLOTS);
+                MainUtil.sendMessage(player, Captions.FOUND_NO_PLOTS);
                 return false;
             }
         } else if ((target = MainUtil.getPlotFromString(player, args[0], true)) == null) {
             return false;
         }
         player.setCompassTarget(target.getCenter());
-        MainUtil.sendMessage(player, C.COMPASS_TARGET);
+        MainUtil.sendMessage(player, Captions.COMPASS_TARGET);
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
index aed9c5ca6..424878e27 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
@@ -5,7 +5,7 @@ import com.github.intellectualsites.plotsquared.configuration.ConfigurationSecti
 import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException;
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -107,15 +107,16 @@ import java.util.zip.ZipOutputStream;
         if (args.length != 2 && args.length != 3) {
             if (args.length == 1) {
                 if (args[0].equalsIgnoreCase("export")) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot template export <world>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot template export <world>");
                     return true;
                 } else if (args[0].equalsIgnoreCase("import")) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                         "/plot template import <world> <template>");
                     return true;
                 }
             }
-            MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                 "/plot template <import|export> <world> [template]");
             return true;
         }
@@ -123,12 +124,12 @@ import java.util.zip.ZipOutputStream;
         switch (args[0].toLowerCase()) {
             case "import": {
                 if (args.length != 3) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX,
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
                         "/plot template import <world> <template>");
                     return false;
                 }
                 if (PlotSquared.get().hasPlotArea(world)) {
-                    MainUtil.sendMessage(player, C.SETUP_WORLD_TAKEN, world);
+                    MainUtil.sendMessage(player, Captions.SETUP_WORLD_TAKEN, world);
                     return false;
                 }
                 boolean result = extractAllFiles(world, args[2]);
@@ -171,12 +172,13 @@ import java.util.zip.ZipOutputStream;
             }
             case "export":
                 if (args.length != 2) {
-                    MainUtil.sendMessage(player, C.COMMAND_SYNTAX, "/plot template export <world>");
+                    MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                        "/plot template export <world>");
                     return false;
                 }
                 final PlotArea area = PlotSquared.get().getPlotAreaByString(world);
                 if (area == null) {
-                    MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+                    MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_WORLD);
                     return false;
                 }
                 final PlotManager manager = area.getPlotManager();
@@ -194,7 +196,7 @@ import java.util.zip.ZipOutputStream;
                 });
                 return true;
             default:
-                C.COMMAND_SYNTAX.send(player, getUsage());
+                Captions.COMMAND_SYNTAX.send(player, getUsage());
         }
         return false;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
index cf2f99bc9..d9bd9bd99 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Toggle.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
@@ -22,9 +22,9 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
         if (toggle(player, "chatspy")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_DISABLED, command.toString());
         } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_ENABLED, command.toString());
         }
     }
 
@@ -34,9 +34,9 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
         if (toggle(player, "worldedit")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_DISABLED, command.toString());
         } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_ENABLED, command.toString());
         }
     }
 
@@ -46,9 +46,9 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
         if (toggle(player, "chat")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_DISABLED, command.toString());
         } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_ENABLED, command.toString());
         }
     }
 
@@ -58,9 +58,9 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
         if (toggle(player, "ignoreExpireTask")) {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_DISABLED, command.toString());
         } else {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_ENABLED, command.toString());
         }
     }
 
@@ -72,9 +72,9 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
         PlotArea area = player.getApplicablePlotArea();
         boolean chat = area != null && area.PLOT_CHAT;
         if (toggle(player, "disabletitles") != chat) {
-            MainUtil.sendMessage(player, C.TOGGLE_ENABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_ENABLED, command.toString());
         } else {
-            MainUtil.sendMessage(player, C.TOGGLE_DISABLED, command.toString());
+            MainUtil.sendMessage(player, Captions.TOGGLE_DISABLED, command.toString());
         }
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
index f1a063dcb..e9b0da288 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@@ -128,16 +128,16 @@ import java.util.Set;
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 0) {
-            C.COMMAND_SYNTAX.send(player, getUsage());
+            Captions.COMMAND_SYNTAX.send(player, getUsage());
             return false;
         }
         final String world = args[0];
         if (!WorldUtil.IMP.isWorld(world) || !PlotSquared.get().hasPlotArea(world)) {
-            MainUtil.sendMessage(player, C.NOT_VALID_WORLD);
+            MainUtil.sendMessage(player, Captions.NOT_VALID_WORLD);
             return false;
         }
         if (Trim.TASK) {
-            C.TRIM_IN_PROGRESS.send(player);
+            Captions.TRIM_IN_PROGRESS.send(player);
             return false;
         }
         Trim.TASK = true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
index c8c7ef77b..b8191dd72 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -28,31 +28,32 @@ import java.util.UUID;
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), C.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), C.PLOT_UNOWNED);
+        final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
+        checkTrue(plot.hasOwner(), Captions.PLOT_UNOWNED);
         checkTrue(plot.isOwner(player.getUUID()) || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.NO_PLOT_PERMS);
-        checkTrue(args.length == 1, C.COMMAND_SYNTAX, getUsage());
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
+            Captions.NO_PLOT_PERMS);
+        checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
         final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
-        checkTrue(!uuids.isEmpty(), C.INVALID_PLAYER, args[0]);
+        checkTrue(!uuids.isEmpty(), Captions.INVALID_PLAYER, args[0]);
         Iterator<UUID> iter = uuids.iterator();
         int size = plot.getTrusted().size() + plot.getMembers().size();
         while (iter.hasNext()) {
             UUID uuid = iter.next();
             if (uuid == DBFunc.EVERYONE && !(
-                Permissions.hasPermission(player, C.PERMISSION_TRUST_EVERYONE) || Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST))) {
-                MainUtil.sendMessage(player, C.INVALID_PLAYER, MainUtil.getName(uuid));
+                Permissions.hasPermission(player, Captions.PERMISSION_TRUST_EVERYONE) || Permissions
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST))) {
+                MainUtil.sendMessage(player, Captions.INVALID_PLAYER, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
             if (plot.isOwner(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_OWNER, MainUtil.getName(uuid));
+                MainUtil.sendMessage(player, Captions.ALREADY_OWNER, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
             if (plot.getTrusted().contains(uuid)) {
-                MainUtil.sendMessage(player, C.ALREADY_ADDED, MainUtil.getName(uuid));
+                MainUtil.sendMessage(player, Captions.ALREADY_ADDED, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
@@ -60,7 +61,8 @@ import java.util.UUID;
         }
         checkTrue(!uuids.isEmpty(), null);
         checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_TRUST), C.PLOT_MAX_MEMBERS);
+                .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
+            Captions.PLOT_MAX_MEMBERS);
         // Success
         confirm.run(this, () -> {
             for (UUID uuid : uuids) {
@@ -73,7 +75,7 @@ import java.util.UUID;
                 }
                 plot.addTrusted(uuid);
                 EventUtil.manager.callTrusted(player, plot, uuid, true);
-                MainUtil.sendMessage(player, C.TRUSTED_ADDED);
+                MainUtil.sendMessage(player, Captions.TRUSTED_ADDED);
             }
         }, null);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
index 19414ac90..3a4d034eb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -17,22 +17,22 @@ public class Unlink extends SubCommand {
         Location loc = player.getLocation();
         final Plot plot = loc.getPlotAbs();
         if (plot == null) {
-            return !sendMessage(player, C.NOT_IN_PLOT);
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
         }
         if (!plot.hasOwner()) {
-            return !sendMessage(player, C.PLOT_UNOWNED);
+            return !sendMessage(player, Captions.PLOT_UNOWNED);
         }
         if (!plot.isOwner(player.getUUID()) && !Permissions
-            .hasPermission(player, C.PERMISSION_ADMIN_COMMAND_UNLINK)) {
-            return sendMessage(player, C.NO_PLOT_PERMS);
+            .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_UNLINK)) {
+            return sendMessage(player, Captions.NO_PLOT_PERMS);
         }
         if (!plot.isMerged()) {
-            return sendMessage(player, C.UNLINK_IMPOSSIBLE);
+            return sendMessage(player, Captions.UNLINK_IMPOSSIBLE);
         }
         final boolean createRoad;
         if (args.length != 0) {
             if (args.length != 1 || !StringMan.isEqualIgnoreCaseToAny(args[0], "true", "false")) {
-                C.COMMAND_SYNTAX.send(player, getUsage());
+                Captions.COMMAND_SYNTAX.send(player, getUsage());
                 return false;
             }
             createRoad = Boolean.parseBoolean(args[0]);
@@ -45,7 +45,7 @@ public class Unlink extends SubCommand {
                     MainUtil.sendMessage(player, "&cUnlink has been cancelled");
                     return;
                 }
-                MainUtil.sendMessage(player, C.UNLINK_SUCCESS);
+                MainUtil.sendMessage(player, Captions.UNLINK_SUCCESS);
             }
         };
         if (hasConfirmation(player)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
index 90afd6f8c..d262ca343 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@@ -39,8 +39,8 @@ import java.util.*;
         switch (args.length) {
             case 3:
                 if (!MathMan.isInteger(args[1])) {
-                    C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
-                    C.COMMAND_SYNTAX.send(player, getUsage());
+                    Captions.NOT_VALID_NUMBER.send(player, "(1, ∞)");
+                    Captions.COMMAND_SYNTAX.send(player, getUsage());
                     return;
                 }
                 page = Integer.parseInt(args[2]);
@@ -48,13 +48,13 @@ import java.util.*;
                 if (page != Integer.MIN_VALUE || !MathMan.isInteger(args[1])) {
                     sortByArea = PlotSquared.get().getPlotAreaByString(args[1]);
                     if (sortByArea == null) {
-                        C.NOT_VALID_NUMBER.send(player, "(1, ∞)");
-                        C.COMMAND_SYNTAX.send(player, getUsage());
+                        Captions.NOT_VALID_NUMBER.send(player, "(1, ∞)");
+                        Captions.COMMAND_SYNTAX.send(player, getUsage());
                         return;
                     }
                     UUID user = UUIDHandler.getUUIDFromString(args[0]);
                     if (user == null) {
-                        C.COMMAND_SYNTAX.send(player, getUsage());
+                        Captions.COMMAND_SYNTAX.send(player, getUsage());
                         return;
                     }
                     unsorted = PlotSquared.get().getBasePlots(user);
@@ -92,13 +92,13 @@ import java.util.*;
             page = 1;
         }
         if (unsorted == null || unsorted.isEmpty()) {
-            C.FOUND_NO_PLOTS.send(player);
+            Captions.FOUND_NO_PLOTS.send(player);
             return;
         }
         unsorted = new ArrayList<>(unsorted);
         unsorted.removeIf(plot -> !plot.isBasePlot());
         if (page < 1 || page > unsorted.size()) {
-            C.NOT_VALID_NUMBER.send(player, "(1, " + unsorted.size() + ")");
+            Captions.NOT_VALID_NUMBER.send(player, "(1, " + unsorted.size() + ")");
             return;
         }
         List<Plot> plots;
@@ -110,24 +110,24 @@ import java.util.*;
         }
         final Plot plot = plots.get(page - 1);
         if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_UNOWNED)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_UNOWNED);
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_VISIT_UNOWNED)) {
+                Captions.NO_PERMISSION.send(player, Captions.PERMISSION_VISIT_UNOWNED);
                 return;
             }
         } else if (plot.isOwner(player.getUUID())) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_OWNED) && !Permissions
-                .hasPermission(player, C.PERMISSION_HOME)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_OWNED);
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_VISIT_OWNED) && !Permissions
+                .hasPermission(player, Captions.PERMISSION_HOME)) {
+                Captions.NO_PERMISSION.send(player, Captions.PERMISSION_VISIT_OWNED);
                 return;
             }
         } else if (plot.isAdded(player.getUUID())) {
-            if (!Permissions.hasPermission(player, C.PERMISSION_SHARED)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_SHARED);
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_SHARED)) {
+                Captions.NO_PERMISSION.send(player, Captions.PERMISSION_SHARED);
                 return;
             }
         } else {
-            if (!Permissions.hasPermission(player, C.PERMISSION_VISIT_OTHER)) {
-                C.NO_PERMISSION.send(player, C.PERMISSION_VISIT_OTHER);
+            if (!Permissions.hasPermission(player, Captions.PERMISSION_VISIT_OTHER)) {
+                Captions.NO_PERMISSION.send(player, Captions.PERMISSION_VISIT_OTHER);
                 return;
             }
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
similarity index 98%
rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
rename to Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index d3045c568..c735ccd08 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/C.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -13,7 +13,7 @@ import java.util.*;
 /**
  * Captions class.
  */
-public enum C {
+public enum Captions {
 
     /*
      * Static flags
@@ -896,7 +896,7 @@ public enum C {
      * @param def    default
      * @param prefix use prefix
      */
-    C(String def, boolean prefix, String category) {
+    Captions(String def, boolean prefix, String category) {
         this.def = def;
         this.s = def;
         this.prefix = prefix;
@@ -908,7 +908,7 @@ public enum C {
      *
      * @param def default
      */
-    C(String def, String category) {
+    Captions(String def, String category) {
         this(def, true, category.toLowerCase());
     }
 
@@ -923,7 +923,7 @@ public enum C {
                 if (arg == null || arg.isEmpty()) {
                     map.put("%s" + i, "");
                 } else {
-                    arg = C.color(arg);
+                    arg = Captions.color(arg);
                     map.put("%s" + i, arg);
                 }
                 if (i == 0) {
@@ -935,9 +935,9 @@ public enum C {
         return m;
     }
 
-    public static String format(C caption, Object... args) {
+    public static String format(Captions caption, Object... args) {
         if (caption.usePrefix() && caption.s.length() > 0) {
-            return C.PREFIX.s() + format(caption.s, args);
+            return Captions.PREFIX.s() + format(caption.s, args);
         } else {
             return format(caption.s, args);
         }
@@ -955,15 +955,15 @@ public enum C {
             }
             YamlConfiguration yml = YamlConfiguration.loadConfiguration(file);
             Set<String> keys = yml.getKeys(true);
-            EnumSet<C> allEnums = EnumSet.allOf(C.class);
+            EnumSet<Captions> allEnums = EnumSet.allOf(Captions.class);
             HashSet<String> allNames = new HashSet<>();
             HashSet<String> categories = new HashSet<>();
             HashSet<String> toRemove = new HashSet<>();
-            for (C caption : allEnums) {
+            for (Captions caption : allEnums) {
                 allNames.add(caption.name());
                 categories.add(caption.category.toLowerCase());
             }
-            HashSet<C> captions = new HashSet<>();
+            HashSet<Captions> captions = new HashSet<>();
             boolean changed = false;
             for (String key : keys) {
                 if (!yml.isString(key)) {
@@ -974,7 +974,7 @@ public enum C {
                 }
                 String[] split = key.split("\\.");
                 String node = split[split.length - 1].toUpperCase();
-                C caption;
+                Captions caption;
                 if (allNames.contains(node)) {
                     caption = valueOf(node);
                 } else {
@@ -1013,7 +1013,7 @@ public enum C {
             replacements.put("\\\\n", "\n");
             replacements.put("\\n", "\n");
             replacements.put("&-", "\n");
-            for (C caption : allEnums) {
+            for (Captions caption : allEnums) {
                 if (!captions.contains(caption)) {
                     if (caption.getCategory().startsWith("static")) {
                         continue;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 6419fbda8..63b4e0c16 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
@@ -214,7 +214,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             }*/
         }
         if (schematic1 == null || schematic2 == null || this.ROAD_WIDTH == 0) {
-            PlotSquared.debug(C.PREFIX + "&3 - schematic: &7false");
+            PlotSquared.debug(Captions.PREFIX + "&3 - schematic: &7false");
             return;
         }
         this.ROAD_SCHEMATIC_ENABLED = true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index df1abbb9a..9b1018dbb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.WEExtent;
@@ -153,7 +153,7 @@ public abstract class HybridUtils {
                 }
                 if (regions.isEmpty() && chunks.isEmpty()) {
                     HybridUtils.UPDATE = false;
-                    PlotSquared.debug(C.PREFIX.s() + "Finished road conversion");
+                    PlotSquared.debug(Captions.PREFIX.s() + "Finished road conversion");
                     // CANCEL TASK
                 } else {
                     final Runnable task = this;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
index ed8b42f57..c5cddf740 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.listener;
 
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
@@ -52,7 +52,7 @@ public class PlotListener {
                 Optional<String> greetingFlag = plot.getFlag(Flags.GREETING);
                 if (greetingFlag.isPresent()) {
                     greeting = greetingFlag.get();
-                    MainUtil.format(C.PREFIX_GREETING.s() + greeting, plot, player, false,
+                    MainUtil.format(Captions.PREFIX_GREETING.s() + greeting, plot, player, false,
                         new RunnableVal<String>() {
                             @Override public void run(String value) {
                                 MainUtil.sendMessage(player, value);
@@ -68,7 +68,7 @@ public class PlotListener {
                             PlotPlayer owner = UUIDHandler.getPlayer(uuid);
                             if (owner != null && !owner.getUUID().equals(player.getUUID())) {
                                 MainUtil.sendMessage(owner,
-                                    C.NOTIFY_ENTER.s().replace("%player", player.getName())
+                                    Captions.NOTIFY_ENTER.s().replace("%player", player.getName())
                                         .replace("%plot", plot.getId().toString()));
                             }
                         }
@@ -94,7 +94,8 @@ public class PlotListener {
                             player.setGameMode(gamemodeFlag.get());
                         } else {
                             MainUtil.sendMessage(player, StringMan
-                                .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.getId(),
+                                .replaceAll(Captions.GAMEMODE_WAS_BYPASSED.s(), "{plot}",
+                                    plot.getId(),
                                     "{gamemode}", gamemodeFlag.get()));
                         }
                     }
@@ -107,7 +108,8 @@ public class PlotListener {
                             player.setGameMode(guestGamemodeFlag.get());
                         } else {
                             MainUtil.sendMessage(player, StringMan
-                                .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.getId(),
+                                .replaceAll(Captions.GAMEMODE_WAS_BYPASSED.s(), "{plot}",
+                                    plot.getId(),
                                     "{gamemode}", guestGamemodeFlag.get()));
                         }
                     }
@@ -155,7 +157,8 @@ public class PlotListener {
                 CommentManager.sendTitle(player, plot);
             }
             if (titles) {
-                if (!C.TITLE_ENTERED_PLOT.s().isEmpty() || !C.TITLE_ENTERED_PLOT_SUB.s()
+                if (!Captions.TITLE_ENTERED_PLOT.s().isEmpty() || !Captions.TITLE_ENTERED_PLOT_SUB
+                    .s()
                     .isEmpty()) {
                     TaskManager.runTaskLaterAsync(() -> {
                         Plot lastPlot = player.getMeta(PlotPlayer.META_LAST_PLOT);
@@ -167,10 +170,10 @@ public class PlotListener {
                             replacements.put("%greeting%", greeting);
                             replacements.put("%alias", plot.toString());
                             replacements.put("%s", MainUtil.getName(plot.owner));
-                            String main =
-                                StringMan.replaceFromMap(C.TITLE_ENTERED_PLOT.s(), replacements);
+                            String main = StringMan
+                                .replaceFromMap(Captions.TITLE_ENTERED_PLOT.s(), replacements);
                             String sub = StringMan
-                                .replaceFromMap(C.TITLE_ENTERED_PLOT_SUB.s(), replacements);
+                                .replaceFromMap(Captions.TITLE_ENTERED_PLOT_SUB.s(), replacements);
                             AbstractTitle.sendTitle(player, main, sub);
                         }
                     }, 20);
@@ -202,14 +205,16 @@ public class PlotListener {
                         player.setGameMode(pw.GAMEMODE);
                     } else {
                         MainUtil.sendMessage(player, StringMan
-                            .replaceAll(C.GAMEMODE_WAS_BYPASSED.s(), "{plot}", plot.toString(),
+                            .replaceAll(Captions.GAMEMODE_WAS_BYPASSED.s(), "{plot}",
+                                plot.toString(),
                                 "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
                     }
                 }
             }
             Optional<String> farewell = plot.getFlag(Flags.FAREWELL);
             farewell.ifPresent(s -> MainUtil
-                .format(C.PREFIX_FAREWELL.s() + s, plot, player, false, new RunnableVal<String>() {
+                .format(Captions.PREFIX_FAREWELL.s() + s, plot, player, false,
+                    new RunnableVal<String>() {
                     @Override public void run(String value) {
                         MainUtil.sendMessage(player, value);
                     }
@@ -221,7 +226,7 @@ public class PlotListener {
                         PlotPlayer owner = UUIDHandler.getPlayer(uuid);
                         if ((owner != null) && !owner.getUUID().equals(player.getUUID())) {
                             MainUtil.sendMessage(owner,
-                                C.NOTIFY_LEAVE.s().replace("%player", player.getName())
+                                Captions.NOTIFY_LEAVE.s().replace("%player", player.getName())
                                     .replace("%plot", plot.getId().toString()));
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
index 79e6209a2..14247f792 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.listener;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
 import com.sk89q.worldedit.WorldEditException;
@@ -107,7 +107,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
                 if (this.BScount > Settings.Chunk_Processor.MAX_TILES) {
                     this.BSblocked = true;
                     PlotSquared.debug(
-                        C.PREFIX + "&cdetected unsafe WorldEdit: " + location.getX() + ","
+                        Captions.PREFIX + "&cdetected unsafe WorldEdit: " + location.getX() + ","
                             + location.getZ());
                 }
                 if (WEManager
@@ -162,7 +162,8 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
         if (this.Ecount > Settings.Chunk_Processor.MAX_ENTITIES) {
             this.Eblocked = true;
             PlotSquared.debug(
-                C.PREFIX + "&cdetected unsafe WorldEdit: " + location.getBlockX() + "," + location
+                Captions.PREFIX + "&cdetected unsafe WorldEdit: " + location.getBlockX() + ","
+                    + location
                     .getBlockZ());
         }
         if (WEManager.maskContains(this.mask, location.getBlockX(), location.getBlockY(),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
index f86b9f53c..8b3c5c624 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WESubscriber.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.listener;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -54,7 +54,7 @@ public class WESubscriber {
                 mask = WEManager.getMask(pp);
                 if (mask.isEmpty()) {
                     if (Permissions.hasPermission(pp, "plots.worldedit.bypass")) {
-                        MainUtil.sendMessage(pp, C.WORLDEDIT_BYPASS);
+                        MainUtil.sendMessage(pp, Captions.WORLDEDIT_BYPASS);
                     }
                     if (PlotSquared.get().hasPlotArea(world)) {
                         event.setExtent(new NullExtent());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
index 3278b62d3..071b2bfcd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.google.common.collect.ImmutableMap;
 import lombok.EqualsAndHashCode;
@@ -159,7 +159,7 @@ import java.util.Map.Entry;
                 }
             }
         } else if (!unassigned.isEmpty()) {
-            C.BUCKET_ENTRIES_IGNORED.send(ConsolePlayer.getConsole());
+            Captions.BUCKET_ENTRIES_IGNORED.send(ConsolePlayer.getConsole());
         }
         //
         // If the sum adds up to more than 100, divide all values
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 4a8adabf7..0b161b082 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
@@ -967,10 +967,14 @@ public class Plot {
         if (this.area.ALLOW_SIGNS) {
             Location loc = manager.getSignLoc(this.area, this);
             String id = this.id.x + ";" + this.id.y;
-            String[] lines = new String[] {C.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
-                C.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-                C.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll("%plr%", name),
-                C.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll("%plr%", name)};
+            String[] lines =
+                new String[] {Captions.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
+                    Captions.OWNER_SIGN_LINE_2.formatted().replaceAll("%id%", id).replaceAll(
+                        "%plr%", name),
+                    Captions.OWNER_SIGN_LINE_3.formatted().replaceAll("%id%", id).replaceAll(
+                        "%plr%", name),
+                    Captions.OWNER_SIGN_LINE_4.formatted().replaceAll("%id%", id).replaceAll(
+                        "%plr%", name)};
             WorldUtil.IMP.setSign(this.getWorldName(), loc.getX(), loc.getY(), loc.getZ(), lines);
         }
     }
@@ -1428,7 +1432,7 @@ public class Plot {
             area.addPlot(this);
         }
         setSign(player.getName());
-        MainUtil.sendMessage(player, C.CLAIMED);
+        MainUtil.sendMessage(player, Captions.CLAIMED);
         if (teleport) {
             teleportPlayer(player);
         }
@@ -1452,9 +1456,9 @@ public class Plot {
                 new RunnableVal<Boolean>() {
                     @Override public void run(Boolean value) {
                         if (value) {
-                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_SUCCESS);
+                            MainUtil.sendMessage(player, Captions.SCHEMATIC_PASTE_SUCCESS);
                         } else {
-                            MainUtil.sendMessage(player, C.SCHEMATIC_PASTE_FAILED);
+                            MainUtil.sendMessage(player, Captions.SCHEMATIC_PASTE_FAILED);
                         }
                     }
                 });
@@ -2093,7 +2097,7 @@ public class Plot {
             }
             loop:
             for (int i = 4; i > 0; i--) {
-                String caption = C.valueOf("OWNER_SIGN_LINE_" + i).s();
+                String caption = Captions.valueOf("OWNER_SIGN_LINE_" + i).s();
                 int index = caption.indexOf("%plr%");
                 if (index < 0) {
                     continue;
@@ -2681,21 +2685,22 @@ public class Plot {
             }
             if (Settings.Teleport.DELAY == 0 || Permissions
                 .hasPermission(player, "plots.teleport.delay.bypass")) {
-                MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+                MainUtil.sendMessage(player, Captions.TELEPORTED_TO_PLOT);
                 player.teleport(location);
                 return true;
             }
-            MainUtil.sendMessage(player, C.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
+            MainUtil
+                .sendMessage(player, Captions.TELEPORT_IN_SECONDS, Settings.Teleport.DELAY + "");
             final String name = player.getName();
             TaskManager.TELEPORT_QUEUE.add(name);
             TaskManager.runTaskLater(() -> {
                 if (!TaskManager.TELEPORT_QUEUE.contains(name)) {
-                    MainUtil.sendMessage(player, C.TELEPORT_FAILED);
+                    MainUtil.sendMessage(player, Captions.TELEPORT_FAILED);
                     return;
                 }
                 TaskManager.TELEPORT_QUEUE.remove(name);
                 if (player.isOnline()) {
-                    MainUtil.sendMessage(player, C.TELEPORTED_TO_PLOT);
+                    MainUtil.sendMessage(player, Captions.TELEPORTED_TO_PLOT);
                     player.teleport(location);
                 }
             }, Settings.Teleport.DELAY * 20);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
index 47069a38e..64e6fedb3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotMessage.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager;
 import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
 
@@ -59,7 +59,7 @@ public class PlotMessage {
     }
 
     public PlotMessage color(String color) {
-        ChatManager.manager.color(this, C.color(color));
+        ChatManager.manager.color(this, Captions.color(color));
         return this;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index b3df60558..47d4f20e1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -3,7 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.object;
 import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.RequiredType;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
@@ -166,15 +166,15 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     }
 
     public int hasPermissionRange(String stub, int range) {
-        if (hasPermission(C.PERMISSION_ADMIN.s())) {
+        if (hasPermission(Captions.PERMISSION_ADMIN.s())) {
             return Integer.MAX_VALUE;
         }
         String[] nodes = stub.split("\\.");
         StringBuilder builder = new StringBuilder();
         for (int i = 0; i < (nodes.length - 1); i++) {
             builder.append(nodes[i]).append(".");
-            if (!stub.equals(builder + C.PERMISSION_STAR.s())) {
-                if (hasPermission(builder + C.PERMISSION_STAR.s())) {
+            if (!stub.equals(builder + Captions.PERMISSION_STAR.s())) {
+                if (hasPermission(builder + Captions.PERMISSION_STAR.s())) {
                     return Integer.MAX_VALUE;
                 }
             }
@@ -563,7 +563,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                                                     TaskManager.runTask(() -> {
                                                         if (getMeta("teleportOnLogin", true)) {
                                                             teleport(loc);
-                                                            sendMessage(C.TELEPORTED_TO_PLOT.f()
+                                                            sendMessage(
+                                                                Captions.TELEPORTED_TO_PLOT.f()
                                                                 + " (quitLoc) (" + plotX + ","
                                                                 + plotZ + ")");
                                                         }
@@ -577,7 +578,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                                                                     true)) {
                                                                     teleport(loc);
                                                                     sendMessage(
-                                                                        C.TELEPORTED_TO_PLOT.f()
+                                                                        Captions.TELEPORTED_TO_PLOT
+                                                                            .f()
                                                                             + " (quitLoc-unloaded) ("
                                                                             + plotX + "," + plotZ
                                                                             + ")");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
index 0972a4449..0353eb313 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/chat/PlainChatManager.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.object.chat;
 
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.ChatManager;
@@ -26,7 +26,7 @@ public class PlainChatManager extends ChatManager<List<StringBuilder>> {
     }
 
     @Override public void text(PlotMessage message, String text) {
-        message.$(this).add(new StringBuilder(C.color(text)));
+        message.$(this).add(new StringBuilder(Captions.color(text)));
     }
 
     @Override public void send(PlotMessage plotMessage, PlotPlayer player) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
index 5e153c02e..8dfdeaaac 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.object.worlds;
 
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 
@@ -48,7 +48,7 @@ public class SinglePlot extends Plot {
         if (isLoaded()) {
             return super.teleportPlayer(player);
         } else {
-            C.NOT_LOADED.send(player);
+            Captions.NOT_LOADED.send(player);
             return false;
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
index 56a4d51b5..e6cdc4134 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CmdConfirm.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.CmdInstance;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
@@ -18,7 +18,7 @@ public class CmdConfirm {
         final Runnable runnable) {
         removePending(player);
         if (commandStr != null) {
-            MainUtil.sendMessage(player, C.REQUIRES_CONFIRM, commandStr);
+            MainUtil.sendMessage(player, Captions.REQUIRES_CONFIRM, commandStr);
         }
         TaskManager.runTaskLater(new Runnable() {
             @Override public void run() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index 524ea7f67..416f0aa46 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -41,7 +41,7 @@ public class CommentManager {
                         }
                         if ((size.decrementAndGet() == 0) && (total > 0)) {
                             AbstractTitle.sendTitle(player, "",
-                                C.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
+                                Captions.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
                         }
                     }
                 });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index 0c608c0e9..92e3bdcb3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
@@ -71,7 +71,7 @@ public abstract class EventUtil {
         }
         if (PlotSquared.get().worldedit != null) {
             if (player.getAttribute("worldedit")) {
-                MainUtil.sendMessage(player, C.WORLDEDIT_BYPASSED);
+                MainUtil.sendMessage(player, Captions.WORLDEDIT_BYPASSED);
             }
         }
         final Plot plot = player.getCurrentPlot();
@@ -82,7 +82,7 @@ public abstract class EventUtil {
                 }
             });
             MainUtil.sendMessage(player,
-                C.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
+                Captions.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
                     .getId().y + ")");
         }
     }
@@ -91,7 +91,7 @@ public abstract class EventUtil {
         final Plot plot = player.getCurrentPlot();
         if (Settings.Teleport.ON_DEATH && plot != null) {
             TaskManager.runTask(() -> plot.teleportPlayer(player));
-            MainUtil.sendMessage(player, C.TELEPORTED_TO_ROAD);
+            MainUtil.sendMessage(player, Captions.TELEPORTED_TO_ROAD);
         }
     }
 
@@ -120,11 +120,12 @@ public abstract class EventUtil {
             case BREAK_BLOCK:
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 Optional<HashSet<PlotBlock>> use = plot.getFlag(Flags.USE);
@@ -144,69 +145,80 @@ public abstract class EventUtil {
                     }
                 }
                 if (Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
                     return true;
                 }
-                return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                    C.FLAG_USE.s() + '/' + C.FLAG_BREAK.s()));
+                return !(!notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                    Captions.FLAG_USE.s() + '/' + Captions.FLAG_BREAK.s()));
             case BREAK_HANGING:
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (plot.getFlag(Flags.HANGING_BREAK).orElse(false)) {
                     return true;
                 }
                 if (plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
-                        !notifyPerms || MainUtil
-                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_HANGING_BREAK.s()));
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)
+                        || !(
+                        !notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_HANGING_BREAK.s()));
                 }
                 return Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        notifyPerms);
             case BREAK_MISC:
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (plot.getFlag(Flags.MISC_BREAK).orElse(false)) {
                     return true;
                 }
                 if (plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
-                        !notifyPerms || MainUtil
-                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_MISC_BREAK.s()));
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)
+                        || !(
+                        !notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_MISC_BREAK.s()));
                 }
                 return Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        notifyPerms);
             case BREAK_VEHICLE:
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (plot.getFlag(Flags.VEHICLE_BREAK).orElse(false)) {
                     return true;
                 }
                 if (plot.hasOwner()) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
                     return !(!notifyPerms || MainUtil
-                        .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_VEHICLE_BREAK.s()));
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_VEHICLE_BREAK.s()));
                 }
                 return Permissions
-                    .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), notifyPerms);
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        notifyPerms);
             case INTERACT_BLOCK: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.USE);
@@ -214,42 +226,47 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false) || !(
-                        !notifyPerms || MainUtil
-                            .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_USE.s()));
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)
+                        || !(
+                        !notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_USE.s()));
                 }
                 return true;
             }
             case PLACE_BLOCK: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_BUILD_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_UNOWNED.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_BUILD_UNOWNED.s(),
+                            notifyPerms);
                 }
                 Optional<HashSet<PlotBlock>> flagValue = plot.getFlag(Flags.PLACE);
                 HashSet<PlotBlock> value = flagValue.orElse(null);
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_BUILD_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_BUILD_OTHER.s(), false)) {
                         return true;
                     }
                     return !(!notifyPerms || MainUtil
-                        .sendMessage(player, C.FLAG_TUTORIAL_USAGE, C.FLAG_PLACE.s()));
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_PLACE.s()));
                 }
                 return true;
             }
             case TRIGGER_PHYSICAL: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), false);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(), false);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(), false);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                            false);
                 }
                 if (plot.getFlag(Flags.DEVICE_INTERACT).orElse(false)) {
                     return true;
@@ -259,7 +276,8 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
                     return false;
@@ -269,11 +287,12 @@ public abstract class EventUtil {
             case INTERACT_HANGING: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 if (plot.getFlag(Flags.HOSTILE_INTERACT).orElse(false)) {
@@ -284,22 +303,25 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_USE.s() + '/' + C.FLAG_HANGING_INTERACT.s()));
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_USE.s() + '/' + Captions.FLAG_HANGING_INTERACT.s()));
                 }
                 return true;
             }
             case INTERACT_MISC: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 if (plot.getFlag(Flags.MISC_INTERACT).orElse(false)) {
@@ -310,22 +332,25 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_USE.s() + '/' + C.FLAG_MISC_INTERACT.s()));
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_USE.s() + '/' + Captions.FLAG_MISC_INTERACT.s()));
                 }
                 return true;
             }
             case INTERACT_VEHICLE: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 if (plot.getFlag(Flags.VEHICLE_USE).orElse(false)) {
@@ -336,22 +361,25 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_USE.s() + '/' + C.FLAG_VEHICLE_USE.s()));
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_USE.s() + '/' + Captions.FLAG_VEHICLE_USE.s()));
                 }
                 return true;
             }
             case SPAWN_MOB: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 if (plot.getFlag(Flags.MOB_PLACE).orElse(false)) {
@@ -362,11 +390,13 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_MOB_PLACE.s() + '/' + C.FLAG_PLACE.s()));
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_MOB_PLACE.s() + '/' + Captions.FLAG_PLACE.s()));
                 }
                 return true;
             }
@@ -375,11 +405,12 @@ public abstract class EventUtil {
             case PLACE_MISC: {
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 if (plot.getFlag(Flags.MISC_PLACE).orElse(false)) {
@@ -390,11 +421,13 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_MISC_PLACE.s() + '/' + C.FLAG_PLACE.s()));
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_MISC_PLACE.s() + '/' + Captions.FLAG_PLACE.s()));
                 }
 
                 return true;
@@ -402,11 +435,12 @@ public abstract class EventUtil {
             case PLACE_VEHICLE:
                 if (plot == null) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_ROAD.s(), notifyPerms);
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_ROAD.s(),
+                            notifyPerms);
                 }
                 if (!plot.hasOwner()) {
                     return Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_UNOWNED.s(),
                             notifyPerms);
                 }
                 if (plot.getFlag(Flags.VEHICLE_PLACE).orElse(false)) {
@@ -417,11 +451,13 @@ public abstract class EventUtil {
                 if (value == null || !PlotBlock.containsEverything(value) && !value
                     .contains(block.getPlotBlock())) {
                     if (Permissions
-                        .hasPermission(player, C.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)) {
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(),
+                            false)) {
                         return true;
                     }
-                    return !(!notifyPerms || MainUtil.sendMessage(player, C.FLAG_TUTORIAL_USAGE,
-                        C.FLAG_VEHICLE_PLACE.s() + '/' + C.FLAG_PLACE.s()));
+                    return !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                            Captions.FLAG_VEHICLE_PLACE.s() + '/' + Captions.FLAG_PLACE.s()));
                 }
                 return true;
             default:
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
index 807da4a54..a12b82c95 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import lombok.NonNull;
@@ -84,7 +84,7 @@ import java.util.Map;
         @NonNull final String key, @NonNull final String block) {
         final BlockBucket bucket = this.blockToBucket(block);
         this.setString(section, key, bucket);
-        PlotSquared.log(C.LEGACY_CONFIG_REPLACED.f(block, bucket.toString()));
+        PlotSquared.log(Captions.LEGACY_CONFIG_REPLACED.f(block, bucket.toString()));
     }
 
     private void convertBlockList(@NonNull final ConfigurationSection section,
@@ -92,8 +92,8 @@ import java.util.Map;
         final PlotBlock[] blocks = this.splitBlockList(blockList);
         final BlockBucket bucket = this.blockListToBucket(blocks);
         this.setString(section, key, bucket);
-        PlotSquared
-            .log(C.LEGACY_CONFIG_REPLACED.f(plotBlockArrayString(blocks), bucket.toString()));
+        PlotSquared.log(
+            Captions.LEGACY_CONFIG_REPLACED.f(plotBlockArrayString(blocks), bucket.toString()));
     }
 
     private String plotBlockArrayString(@NonNull final PlotBlock[] blocks) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index eef5eca17..f7fd8dc76 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.DoubleFlag;
@@ -86,8 +86,8 @@ public class MainUtil {
 
     public static void sendAdmin(final String s) {
         for (final PlotPlayer player : UUIDHandler.getPlayers().values()) {
-            if (player.hasPermission(C.PERMISSION_ADMIN.s())) {
-                player.sendMessage(C.color(s));
+            if (player.hasPermission(Captions.PERMISSION_ADMIN.s())) {
+                player.sendMessage(Captions.color(s));
             }
         }
         PlotSquared.debug(s);
@@ -329,14 +329,14 @@ public class MainUtil {
      */
     @Nonnull public static String getName(UUID owner) {
         if (owner == null) {
-            return C.NONE.s();
+            return Captions.NONE.s();
         }
         if (owner.equals(DBFunc.EVERYONE)) {
-            return C.EVERYONE.s();
+            return Captions.EVERYONE.s();
         }
         String name = UUIDHandler.getName(owner);
         if (name == null) {
-            return C.UNKNOWN.s();
+            return Captions.UNKNOWN.s();
         }
         return name;
     }
@@ -457,7 +457,7 @@ public class MainUtil {
         if (arg == null) {
             if (player == null) {
                 if (message) {
-                    PlotSquared.log(C.NOT_VALID_PLOT_WORLD);
+                    PlotSquared.log(Captions.NOT_VALID_PLOT_WORLD);
                 }
                 return null;
             }
@@ -496,13 +496,13 @@ public class MainUtil {
                 }
             }
             if (message) {
-                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_ID);
+                MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_ID);
             }
             return null;
         }
         if (area == null) {
             if (message) {
-                MainUtil.sendMessage(player, C.NOT_VALID_PLOT_WORLD);
+                MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_WORLD);
             }
             return null;
         }
@@ -564,7 +564,7 @@ public class MainUtil {
      * @param caption
      * @param args
      */
-    public static void sendConsoleMessage(C caption, String... args) {
+    public static void sendConsoleMessage(Captions caption, String... args) {
         sendMessage(null, caption, args);
     }
 
@@ -579,10 +579,10 @@ public class MainUtil {
     public static boolean sendMessage(PlotPlayer player, String msg, boolean prefix) {
         if (!msg.isEmpty()) {
             if (player == null) {
-                String message = (prefix ? C.PREFIX.s() : "") + msg;
+                String message = (prefix ? Captions.PREFIX.s() : "") + msg;
                 PlotSquared.log(message);
             } else {
-                player.sendMessage((prefix ? C.PREFIX.s() : "") + C.color(msg));
+                player.sendMessage((prefix ? Captions.PREFIX.s() : "") + Captions.color(msg));
             }
         }
         return true;
@@ -595,7 +595,7 @@ public class MainUtil {
      * @param caption the message to send
      * @return boolean success
      */
-    public static boolean sendMessage(PlotPlayer player, C caption, String... args) {
+    public static boolean sendMessage(PlotPlayer player, Captions caption, String... args) {
         return sendMessage(player, caption, (Object[]) args);
     }
 
@@ -606,14 +606,14 @@ public class MainUtil {
      * @param caption the message to send
      * @return boolean success
      */
-    public static boolean sendMessage(final PlotPlayer player, final C caption,
+    public static boolean sendMessage(final PlotPlayer player, final Captions caption,
         final Object... args) {
         if (caption.s().isEmpty()) {
             return true;
         }
         TaskManager.runTaskAsync(new Runnable() {
             @Override public void run() {
-                String m = C.format(caption, args);
+                String m = Captions.format(caption, args);
                 if (player == null) {
                     PlotSquared.log(m);
                 } else {
@@ -706,7 +706,7 @@ public class MainUtil {
     public static void format(String info, final Plot plot, PlotPlayer player, final boolean full,
         final RunnableVal<String> whenDone) {
         int num = plot.getConnectedPlots().size();
-        String alias = !plot.getAlias().isEmpty() ? plot.getAlias() : C.NONE.s();
+        String alias = !plot.getAlias().isEmpty() ? plot.getAlias() : Captions.NONE.s();
         Location bot = plot.getCorners()[0];
         String biome = WorldUtil.IMP.getBiome(plot.getWorldName(), bot.getX(), bot.getZ());
         String trusted = getPlayerList(plot.getTrusted());
@@ -715,28 +715,27 @@ public class MainUtil {
         String seen;
         if (Settings.Enabled_Components.PLOT_EXPIRY && ExpireManager.IMP != null) {
             if (plot.isOnline()) {
-                seen = C.NOW.s();
+                seen = Captions.NOW.s();
             } else {
                 int time = (int) (ExpireManager.IMP.getAge(plot) / 1000);
                 if (time != 0) {
                     seen = MainUtil.secToTime(time);
                 } else {
-                    seen = C.UNKNOWN.s();
+                    seen = Captions.UNKNOWN.s();
                 }
             }
         } else {
-            seen = C.NEVER.s();
+            seen = Captions.NEVER.s();
         }
         Optional<String> descriptionFlag = plot.getFlag(Flags.DESCRIPTION);
-        String description = !descriptionFlag.isPresent() ?
-            C.NONE.s() :
+        String description = !descriptionFlag.isPresent() ? Captions.NONE.s() :
             Flags.DESCRIPTION.valueToString(descriptionFlag.get());
 
         StringBuilder flags = new StringBuilder();
         HashMap<Flag<?>, Object> flagMap =
             FlagManager.getPlotFlags(plot.getArea(), plot.getSettings(), true);
         if (flagMap.isEmpty()) {
-            flags.append(C.NONE.s());
+            flags.append(Captions.NONE.s());
         } else {
             String prefix = "";
             for (Entry<Flag<?>, Object> entry : flagMap.entrySet()) {
@@ -746,7 +745,8 @@ public class MainUtil {
                     df.setMaximumFractionDigits(340);
                     value = df.format(value);
                 }
-                flags.append(prefix).append(C.PLOT_FLAG_LIST.f(entry.getKey().getName(), value));
+                flags.append(prefix)
+                    .append(Captions.PLOT_FLAG_LIST.f(entry.getKey().getName(), value));
                 prefix = ", ";
             }
         }
@@ -815,7 +815,7 @@ public class MainUtil {
 
     /**
      * Get a list of names given a list of uuids.<br>
-     * - Uses the format {@link C#PLOT_USER_LIST} for the returned string
+     * - Uses the format {@link Captions#PLOT_USER_LIST} for the returned string
      *
      * @param uuids
      * @return
@@ -823,11 +823,11 @@ public class MainUtil {
     public static String getPlayerList(Collection<UUID> uuids) {
         ArrayList<UUID> l = new ArrayList<>(uuids);
         if (l.size() < 1) {
-            return C.NONE.s();
+            return Captions.NONE.s();
         }
         List<String> users =
             l.stream().map(MainUtil::getName).sorted().collect(Collectors.toList());
-        String c = C.PLOT_USER_LIST.s();
+        String c = Captions.PLOT_USER_LIST.s();
         StringBuilder list = new StringBuilder();
         for (int x = 0; x < users.size(); x++) {
             if (x + 1 == l.size()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
index bcd71b186..82f3eb879 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/Permissions.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.commands.CommandCaller;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
@@ -14,18 +14,18 @@ import java.util.HashMap;
  */
 public class Permissions {
 
-    public static boolean hasPermission(PlotPlayer player, C caption, boolean notify) {
+    public static boolean hasPermission(PlotPlayer player, Captions caption, boolean notify) {
         return hasPermission(player, caption.s(), notify);
     }
 
     /**
-     * Check if a player has a permission (C class helps keep track of permissions).
+     * Check if a player has a permission (Captions class helps keep track of permissions).
      *
      * @param player
      * @param caption
      * @return
      */
-    public static boolean hasPermission(PlotPlayer player, C caption) {
+    public static boolean hasPermission(PlotPlayer player, Captions caption) {
         return hasPermission(player, caption.s());
     }
 
@@ -68,7 +68,7 @@ public class Permissions {
         } else if (caller.isPermissionSet(permission)) {
             return false;
         }
-        if (caller.hasPermission(C.PERMISSION_ADMIN.s())) {
+        if (caller.hasPermission(Captions.PERMISSION_ADMIN.s())) {
             return true;
         }
         permission = permission.toLowerCase().replaceAll("^[^a-z|0-9|\\.|_|-]", "");
@@ -76,7 +76,7 @@ public class Permissions {
         StringBuilder n = new StringBuilder();
         for (int i = 0; i <= (nodes.length - 1); i++) {
             n.append(nodes[i] + ".");
-            String combined = n + C.PERMISSION_STAR.s();
+            String combined = n + Captions.PERMISSION_STAR.s();
             if (!permission.equals(combined)) {
                 if (caller.hasPermission(combined)) {
                     return true;
@@ -99,14 +99,14 @@ public class Permissions {
     public static boolean hasPermission(PlotPlayer player, String permission, boolean notify) {
         if (!hasPermission(player, permission)) {
             if (notify) {
-                MainUtil.sendMessage(player, C.NO_PERMISSION_EVENT, permission);
+                MainUtil.sendMessage(player, Captions.NO_PERMISSION_EVENT, permission);
             }
             return false;
         }
         return true;
     }
 
-    public static int hasPermissionRange(PlotPlayer player, C perm, int range) {
+    public static int hasPermissionRange(PlotPlayer player, Captions perm, int range) {
         return hasPermissionRange(player, perm.s(), range);
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
index 69e252474..baf7523ca 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -81,7 +81,8 @@ public abstract class UUIDHandlerImplementation {
             }
             this.uuidMap.put(name, uuid);
         }
-        PlotSquared.debug(C.PREFIX + "&6Cached a total of: " + this.uuidMap.size() + " UUIDs");
+        PlotSquared
+            .debug(Captions.PREFIX + "&6Cached a total of: " + this.uuidMap.size() + " UUIDs");
     }
 
     public boolean add(final StringWrapper name, final UUID uuid) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index 36dcd9cff..c9b75bf67 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.util.expiry;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
@@ -351,13 +351,13 @@ public class ExpireManager {
         for (UUID helper : plot.getTrusted()) {
             PlotPlayer player = UUIDHandler.getPlayer(helper);
             if (player != null) {
-                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+                MainUtil.sendMessage(player, Captions.PLOT_REMOVED_USER, plot.toString());
             }
         }
         for (UUID helper : plot.getMembers()) {
             PlotPlayer player = UUIDHandler.getPlayer(helper);
             if (player != null) {
-                MainUtil.sendMessage(player, C.PLOT_REMOVED_USER, plot.toString());
+                MainUtil.sendMessage(player, Captions.PLOT_REMOVED_USER, plot.toString());
             }
         }
         Set<Plot> plots = plot.getConnectedPlots();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
index f972f5d8e..f753b21e9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpObject.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
 
 import com.github.intellectualsites.plotsquared.commands.Argument;
 import com.github.intellectualsites.plotsquared.commands.Command;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 public class HelpObject {
@@ -10,7 +10,7 @@ public class HelpObject {
     private final String _rendered;
 
     public HelpObject(final Command command, final String label) {
-        _rendered = StringMan.replaceAll(C.HELP_ITEM.s(), "%usage%",
+        _rendered = StringMan.replaceAll(Captions.HELP_ITEM.s(), "%usage%",
             command.getUsage().replaceAll("\\{label\\}", label), "[%alias%]",
             !command.getAliases().isEmpty() ?
                 "(" + StringMan.join(command.getAliases(), "|") + ")" :
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
index 6d521627b..ab0ac49a1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
 
 import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
-import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
@@ -16,17 +16,17 @@ public class HelpPage {
 
     public HelpPage(CommandCategory category, int currentPage, int maxPages) {
         this.helpObjects = new ArrayList<>();
-        this.header = C.HELP_PAGE_HEADER.s()
+        this.header = Captions.HELP_PAGE_HEADER.s()
             .replace("%category%", category == null ? "ALL" : category.toString())
             .replace("%current%", (currentPage + 1) + "").replace("%max%", (maxPages + 1) + "");
     }
 
     public void render(PlotPlayer player) {
         if (this.helpObjects.size() < 1) {
-            MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0)");
+            MainUtil.sendMessage(player, Captions.NOT_VALID_NUMBER, "(0)");
         } else {
-            String message = C.HELP_HEADER.s() + "\n" + this.header + "\n" + StringMan
-                .join(this.helpObjects, "\n") + "\n" + C.HELP_FOOTER.s();
+            String message = Captions.HELP_HEADER.s() + "\n" + this.header + "\n" + StringMan
+                .join(this.helpObjects, "\n") + "\n" + Captions.HELP_FOOTER.s();
             MainUtil.sendMessage(player, message, false);
         }
     }
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java
new file mode 100644
index 000000000..58e43ff65
--- /dev/null
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java
@@ -0,0 +1,25 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import com.github.intellectualsites.plotsquared.plot.database.AbstractDBTest;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
+import org.junit.Before;
+
+import java.util.UUID;
+
+public class UUIDHandlerImplementationTest extends UUIDHandlerImplementation {
+
+    public UUIDHandlerImplementationTest(UUIDWrapper wrapper) {
+        super(wrapper);
+    }
+
+    @Before public void setUp() throws Exception {
+        EventUtil.manager = new EventUtilTest();
+        DBFunc.dbManager = new AbstractDBTest();
+    }
+
+    @Override public void fetchUUID(String name, RunnableVal<UUID> ifFetch) {
+
+    }
+}

From f93cfb9f8bb0f8b10b5a2865cd48168255578af1 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 22 Feb 2019 16:53:11 +0000
Subject: [PATCH 060/210] Update build offset

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 699a14d3d..3ffd8f071 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2042;  // Offset to match CI
+    index = -2041;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 4c8457ad141c1ae454a7b303aaab210236861bdc Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 22 Feb 2019 11:54:13 -0500
Subject: [PATCH 061/210] OCD

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 Core/build.gradle | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Core/build.gradle b/Core/build.gradle
index af9efd311..3a8864cfa 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -19,34 +19,34 @@ processResources {
     }
 }
 
-jar.archiveName = "Plotsquared-Api-${project.parent.version}.jar"
-jar.destinationDir = file '../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/' + project.parent.version
+jar.archiveName = "PlotSquared-API-${project.parent.version}.jar"
+jar.destinationDir = file '../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/' + project.parent.version
 task createPom {
     doLast {
         pom {
             project {
                 groupId 'com.github.intellectualsites.plotsquared'
-                artifactId 'Plotsquared-Api'
+                artifactId 'PlotSquared-API'
                 version project.parent.version
             }
-        }.writeTo("../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/${project.parent.version}/Plotsquared-Api-${project.parent.version}.pom")
+        }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/${project.parent.version}/PlotSquared-API-${project.parent.version}.pom")
         pom {
             project {
                 groupId 'com.github.intellectualsites.plotsquared'
-                artifactId 'Plotsquared-Api'
+                artifactId 'PlotSquared-API'
                 version 'latest'
             }
-        }.writeTo("../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/latest/Plotsquared-Api-latest.pom")
+        }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/latest/PlotSquared-API-latest.pom")
     }
 }
 
 task copyFiles {
     doLast {
         copy {
-            from "../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/${project.parent.version}/"
-            into '../mvn/com/github/intellectualsites/plotsquared/Plotsquared-Api/latest/'
+            from "../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/${project.parent.version}/"
+            into '../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/latest/'
             include('*.jar')
-            rename("Plotsquared-Api-${project.parent.version}.jar", 'Plotsquared-Api-latest.jar')
+            rename("PlotSquared-API-${project.parent.version}.jar", 'PlotSquared-API-latest.jar')
         }
     }
 }

From 56c24a6a56fa442d532ec6393b72555d2d14d058 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 6 Mar 2019 12:47:38 -0500
Subject: [PATCH 062/210] Type weakening and Direction changes

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/chat/MessagePart.java  |   2 +-
 .../plotsquared/bukkit/util/BukkitUtil.java   |   2 +-
 .../plotsquared/commands/Command.java         |  37 +++--
 .../plotsquared/plot/commands/Buy.java        |   1 +
 .../plotsquared/plot/commands/Chat.java       |   4 +-
 .../plot/commands/CommandCategory.java        |   2 +
 .../plotsquared/plot/commands/DebugExec.java  |   3 +
 .../plotsquared/plot/commands/Help.java       |   5 +-
 .../plot/commands/MainCommand.java            |  43 +++---
 .../plotsquared/plot/commands/Rate.java       |   4 +-
 .../plot/commands/RequiredType.java           |   8 +-
 .../plotsquared/plot/commands/Trust.java      |  31 +++--
 .../plotsquared/plot/commands/Unlink.java     |   3 +-
 .../plotsquared/plot/commands/Visit.java      |   4 +-
 .../plotsquared/plot/object/Plot.java         | 127 ++++++++++--------
 .../plotsquared/plot/object/PlotArea.java     |   7 +-
 .../plotsquared/plot/object/PlotId.java       |   3 +
 .../plotsquared/plot/util/MainUtil.java       |  21 ++-
 .../plot/util/helpmenu/HelpMenu.java          |  15 ++-
 .../plot/util/helpmenu/HelpPage.java          |   4 +-
 20 files changed, 171 insertions(+), 155 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java
index 6c2e838d6..43cf15e08 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java
@@ -134,7 +134,7 @@ final class MessagePart implements JsonRepresentedObject, ConfigurationSerializa
             json.endObject();
         } catch (IOException e) {
             Bukkit.getLogger()
-                .log(Level.WARNING, "A problem occured during writing of JSON string", e);
+                .log(Level.WARNING, "A problem occurred during writing of JSON string", e);
         }
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 55d3dbc1e..a1a358737 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -174,7 +174,7 @@ import java.util.*;
      *
      * @param player  the recipient of the message
      * @param caption the message
-     * @see MainUtil#sendMessage(PlotPlayer, Captions, String...)
+     * @see MainUtil#sendMessage(com.github.intellectualsites.plotsquared.commands.CommandCaller, Captions, String...)
      */
     public static void sendMessage(Player player, Captions caption) {
         MainUtil.sendMessage(BukkitUtil.getPlayer(player), caption);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
index b637292c1..bf803d712 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
@@ -13,7 +13,6 @@ import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
 import java.io.IOException;
-import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
@@ -56,10 +55,9 @@ public abstract class Command {
     public Command(Command parent, boolean isStatic) {
         this.parent = parent;
         this.isStatic = isStatic;
-        Annotation cdAnnotation = getClass().getAnnotation(CommandDeclaration.class);
+        CommandDeclaration cdAnnotation = getClass().getAnnotation(CommandDeclaration.class);
         if (cdAnnotation != null) {
-            CommandDeclaration declaration = (CommandDeclaration) cdAnnotation;
-            init(declaration);
+            init(cdAnnotation);
         }
         for (final Method method : getClass().getDeclaredMethods()) {
             if (method.isAnnotationPresent(CommandDeclaration.class)) {
@@ -101,7 +99,7 @@ public abstract class Command {
         return this.id;
     }
 
-    public List<Command> getCommands(PlotPlayer player) {
+    public List<Command> getCommands(CommandCaller player) {
         List<Command> commands = new ArrayList<>();
         for (Command cmd : this.allCommands) {
             if (cmd.canExecute(player, false)) {
@@ -111,10 +109,10 @@ public abstract class Command {
         return commands;
     }
 
-    public List<Command> getCommands(CommandCategory cat, PlotPlayer player) {
+    public List<Command> getCommands(CommandCategory category, CommandCaller player) {
         List<Command> commands = getCommands(player);
-        if (cat != null) {
-            commands.removeIf(command -> command.category != cat);
+        if (category != null) {
+            commands.removeIf(command -> command.category != category);
         }
         return commands;
     }
@@ -123,7 +121,7 @@ public abstract class Command {
         return this.allCommands;
     }
 
-    public boolean hasConfirmation(PlotPlayer player) {
+    public boolean hasConfirmation(CommandCaller player) {
         return this.confirmation && !player.hasPermission(getPermission() + ".confirm.bypass");
     }
 
@@ -272,7 +270,7 @@ public abstract class Command {
             }
             return;
         }
-        if (this.allCommands == null || this.allCommands.isEmpty()) {
+        if (this.allCommands.isEmpty()) {
             player.sendMessage(
                 "Not Implemented: https://github.com/IntellectualSites/PlotSquared/issues/new");
             return;
@@ -285,13 +283,13 @@ public abstract class Command {
             }
             // Help command
             try {
-                if (args.length == 0 || MathMan.isInteger(args[0])
-                    || CommandCategory.valueOf(args[0].toUpperCase()) != null) {
-                    // This will default certain syntax to the help command
-                    // e.g. /plot, /plot 1, /plot claiming
-                    MainCommand.getInstance().help.execute(player, args, null, null);
-                    return;
+                if (!MathMan.isInteger(args[0])) {
+                    CommandCategory.valueOf(args[0].toUpperCase());
                 }
+                // This will default certain syntax to the help command
+                // e.g. /plot, /plot 1, /plot claiming
+                MainCommand.getInstance().help.execute(player, args, null, null);
+                return;
             } catch (IllegalArgumentException ignored) {
             }
             // Command recommendation
@@ -328,7 +326,7 @@ public abstract class Command {
         }
     }
 
-    public boolean checkArgs(PlotPlayer player, String[] args) {
+    public boolean checkArgs(CommandCaller player, String[] args) {
         Argument<?>[] reqArgs = getRequiredArguments();
         if (reqArgs != null && reqArgs.length > 0) {
             boolean failed = args.length < reqArgs.length;
@@ -421,7 +419,7 @@ public abstract class Command {
         return null;
     }
 
-    public boolean canExecute(PlotPlayer player, boolean message) {
+    public boolean canExecute(CommandCaller player, boolean message) {
         if (player == null) {
             return true;
         }
@@ -447,7 +445,6 @@ public abstract class Command {
     }
 
     public String getCommandString() {
-        String base;
         if (this.parent == null) {
             return "/" + toString();
         } else {
@@ -577,7 +574,7 @@ public abstract class Command {
             this.args = args;
         }
 
-        public void perform(PlotPlayer player) {
+        public void perform(CommandCaller player) {
             if (player != null && message != null) {
                 message.send(player, args);
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
index 7b1b75432..6398b30be 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Buy.java
@@ -26,6 +26,7 @@ import java.util.Set;
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         final RunnableVal2<Command, CommandResult> whenDone) {
+
         check(EconHandler.manager, Captions.ECON_DISABLED);
         final Plot plot;
         if (args.length != 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
index 453a6a8ac..2b988c85d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
@@ -4,8 +4,8 @@ import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
 @CommandDeclaration(command = "chat", description = "Toggle plot chat on or off",
-    usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT,
-    requiredType = RequiredType.NONE) public class Chat extends SubCommand {
+    usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT, requiredType = RequiredType.PLAYER)
+public class Chat extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         MainCommand.getInstance().toggle.chat(this, player, new String[0], null, null);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
index 4aeacf85c..f0ffc71a8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
@@ -50,6 +50,8 @@ public enum CommandCategory {
         this.name = name;
     }
 
+
+
     @Override public String toString() {
         return this.name;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
index 623b989ea..d75084407 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
@@ -31,6 +31,8 @@ import java.util.*;
     private Bindings scope;
 
     public DebugExec() {
+        init();
+/*
         try {
             if (PlotSquared.get() != null) {
                 File file = new File(PlotSquared.get().IMP.getDirectory(),
@@ -49,6 +51,7 @@ import java.util.*;
         } catch (IOException | ScriptException ignored) {
             ignored.printStackTrace();
         }
+*/
     }
 
     public ScriptEngine getEngine() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
index 674ba4fe9..f186f3219 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -1,6 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -18,7 +19,7 @@ public class Help extends Command {
         super(parent, true);
     }
 
-    @Override public boolean canExecute(PlotPlayer player, boolean message) {
+    @Override public boolean canExecute(CommandCaller player, boolean message) {
         return true;
     }
 
@@ -54,7 +55,7 @@ public class Help extends Command {
         }
     }
 
-    public void displayHelp(PlotPlayer player, String cat, int page) {
+    public void displayHelp(CommandCaller player, String cat, int page) {
         CommandCategory catEnum = null;
         if (cat != null) {
             if (StringMan.isEqualIgnoreCase(cat, "all")) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
index 6f3ba0d28..ccb4558fb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
@@ -1,8 +1,8 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
@@ -126,27 +126,23 @@ public class MainCommand extends Command {
                 @Override
                 public void run(final Command cmd, final Runnable success, final Runnable failure) {
                     if (cmd.hasConfirmation(player)) {
-                        CmdConfirm.addPending(player, cmd.getUsage(), new Runnable() {
-                            @Override public void run() {
-                                if (EconHandler.manager != null) {
-                                    PlotArea area = player.getApplicablePlotArea();
-                                    if (area != null) {
-                                        Expression<Double> priceEval =
-                                            area.PRICES.get(cmd.getFullId());
-                                        Double price =
-                                            priceEval != null ? priceEval.evaluate(0d) : 0d;
-                                        if (price != null
-                                            && EconHandler.manager.getMoney(player) < price) {
-                                            if (failure != null) {
-                                                failure.run();
-                                            }
-                                            return;
+                        CmdConfirm.addPending(player, cmd.getUsage(), () -> {
+                            if (EconHandler.manager != null) {
+                                PlotArea area = player.getApplicablePlotArea();
+                                if (area != null) {
+                                    Expression<Double> priceEval = area.PRICES.get(cmd.getFullId());
+                                    Double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
+                                    if (price != null
+                                        && EconHandler.manager.getMoney(player) < price) {
+                                        if (failure != null) {
+                                            failure.run();
                                         }
+                                        return;
                                     }
                                 }
-                                if (success != null) {
-                                    success.run();
-                                }
+                            }
+                            if (success != null) {
+                                success.run();
                             }
                         });
                         return;
@@ -180,13 +176,6 @@ public class MainCommand extends Command {
         return true;
     }
 
-    @Deprecated
-    /**
-     * @Deprecated legacy
-     */ public void addCommand(SubCommand command) {
-        PlotSquared.debug("Command registration is now done during instantiation");
-    }
-
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
@@ -281,7 +270,7 @@ public class MainCommand extends Command {
         }
     }
 
-    @Override public boolean canExecute(PlotPlayer player, boolean message) {
+    @Override public boolean canExecute(CommandCaller player, boolean message) {
         return true;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 7c9705475..66f4fc06b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -16,8 +16,8 @@ import java.util.Map.Entry;
 import java.util.UUID;
 
 @CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
-    usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
-    requiredType = RequiredType.NONE) public class Rate extends SubCommand {
+    usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
+public class Rate extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 1) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
index 3f13368de..2dc75f919 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/RequiredType.java
@@ -6,11 +6,9 @@ public enum RequiredType {
     CONSOLE, PLAYER, NONE;
 
     public boolean allows(CommandCaller player) {
-        switch (this) {
-            case NONE:
-                return true;
-            default:
-                return this == player.getSuperCaller();
+        if (this == RequiredType.NONE) {
+            return true;
         }
+        return this == player.getSuperCaller();
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
index b8191dd72..6724efdda 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
@@ -16,7 +16,7 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.UUID;
 
-@CommandDeclaration(command = "trust", aliases = {"t"}, requiredType = RequiredType.NONE,
+@CommandDeclaration(command = "trust", aliases = {"t"}, requiredType = RequiredType.PLAYER,
     usage = "/plot trust <player>",
     description = "Allow a user to build in a plot while you are offline",
     category = CommandCategory.SETTINGS) public class Trust extends Command {
@@ -28,16 +28,19 @@ import java.util.UUID;
     @Override public void execute(final PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) throws CommandException {
-        final Plot plot = check(player.getCurrentPlot(), Captions.NOT_IN_PLOT);
-        checkTrue(plot.hasOwner(), Captions.PLOT_UNOWNED);
-        checkTrue(plot.isOwner(player.getUUID()) || Permissions
+        final Plot currentPlot = player.getCurrentPlot();
+        if (currentPlot == null) {
+            throw new CommandException(Captions.NOT_IN_PLOT);
+        }
+        checkTrue(currentPlot.hasOwner(), Captions.PLOT_UNOWNED);
+        checkTrue(currentPlot.isOwner(player.getUUID()) || Permissions
                 .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
             Captions.NO_PLOT_PERMS);
         checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
         final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
         checkTrue(!uuids.isEmpty(), Captions.INVALID_PLAYER, args[0]);
         Iterator<UUID> iter = uuids.iterator();
-        int size = plot.getTrusted().size() + plot.getMembers().size();
+        int size = currentPlot.getTrusted().size() + currentPlot.getMembers().size();
         while (iter.hasNext()) {
             UUID uuid = iter.next();
             if (uuid == DBFunc.EVERYONE && !(
@@ -47,34 +50,34 @@ import java.util.UUID;
                 iter.remove();
                 continue;
             }
-            if (plot.isOwner(uuid)) {
+            if (currentPlot.isOwner(uuid)) {
                 MainUtil.sendMessage(player, Captions.ALREADY_OWNER, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
-            if (plot.getTrusted().contains(uuid)) {
+            if (currentPlot.getTrusted().contains(uuid)) {
                 MainUtil.sendMessage(player, Captions.ALREADY_ADDED, MainUtil.getName(uuid));
                 iter.remove();
                 continue;
             }
-            size += plot.getMembers().contains(uuid) ? 0 : 1;
+            size += currentPlot.getMembers().contains(uuid) ? 0 : 1;
         }
         checkTrue(!uuids.isEmpty(), null);
-        checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
+        checkTrue(size <= currentPlot.getArea().MAX_PLOT_MEMBERS || Permissions
                 .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
             Captions.PLOT_MAX_MEMBERS);
         // Success
         confirm.run(this, () -> {
             for (UUID uuid : uuids) {
                 if (uuid != DBFunc.EVERYONE) {
-                    if (!plot.removeMember(uuid)) {
-                        if (plot.getDenied().contains(uuid)) {
-                            plot.removeDenied(uuid);
+                    if (!currentPlot.removeMember(uuid)) {
+                        if (currentPlot.getDenied().contains(uuid)) {
+                            currentPlot.removeDenied(uuid);
                         }
                     }
                 }
-                plot.addTrusted(uuid);
-                EventUtil.manager.callTrusted(player, plot, uuid, true);
+                currentPlot.addTrusted(uuid);
+                EventUtil.manager.callTrusted(player, currentPlot, uuid, true);
                 MainUtil.sendMessage(player, Captions.TRUSTED_ADDED);
             }
         }, null);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
index 3a4d034eb..abca00a79 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
@@ -8,8 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
 @CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
-    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]",
-    requiredType = RequiredType.NONE, category = CommandCategory.SETTINGS, confirmation = true)
+    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
 public class Unlink extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
index d262ca343..e8ebfa642 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
@@ -14,8 +14,8 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 import java.util.*;
 
 @CommandDeclaration(command = "visit", permission = "plots.visit",
-    description = "Visit someones plot", usage = "/plot visit [<player>|<alias>|<world>|<id>] [#]",
-    aliases = {"v", "tp", "teleport", "goto", "home", "h"}, requiredType = RequiredType.NONE,
+    description = "Visit someones plot", usage = "/plot visit [<player>|<alias>|<world>|<id>] [#]", aliases = {
+    "v", "tp", "teleport", "goto", "home", "h"}, requiredType = RequiredType.PLAYER,
     category = CommandCategory.TELEPORT) public class Visit extends Command {
 
     public Visit() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 0b161b082..88ac6dc31 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -920,15 +920,15 @@ public class Plot {
         }
         if (this.area.TERRAIN != 3 && createRoad) {
             for (Plot current : plots) {
-                if (current.getMerged(1)) {
+                if (current.getMerged(Direction.EAST)) {
                     manager.createRoadEast(current.area, current);
-                    if (current.getMerged(2)) {
+                    if (getMerged(Direction.SOUTH)) {
                         manager.createRoadSouth(current.area, current);
-                        if (current.getMerged(5)) {
+                        if (getMerged(Direction.SOUTHEAST)) {
                             manager.createRoadSouthEast(current.area, current);
                         }
                     }
-                } else if (current.getMerged(2)) {
+                } else if (getMerged(Direction.SOUTH)) {
                     manager.createRoadSouth(current.area, current);
                 }
             }
@@ -1624,11 +1624,11 @@ public class Plot {
         if (!this.isMerged()) {
             return top;
         }
-        if (this.getMerged(Direction.SOUTH.getIndex())) {
-            top.setZ(this.getRelative(Direction.SOUTH.getIndex()).getBottomAbs().getZ() - 1);
+        if (this.getMerged(Direction.SOUTH)) {
+            top.setZ(this.getRelative(Direction.SOUTH).getBottomAbs().getZ() - 1);
         }
-        if (this.getMerged(Direction.EAST.getIndex())) {
-            top.setX(this.getRelative(Direction.SOUTH.getIndex()).getBottomAbs().getX() - 1);
+        if (this.getMerged(Direction.EAST)) {
+            top.setX(this.getRelative(Direction.SOUTH).getBottomAbs().getX() - 1);
         }
         return top;
     }
@@ -1645,11 +1645,11 @@ public class Plot {
         if (!this.isMerged()) {
             return bot;
         }
-        if (this.getMerged(Direction.NORTH.getIndex())) {
-            bot.setZ(this.getRelative(Direction.NORTH.getIndex()).getTopAbs().getZ() + 1);
+        if (this.getMerged(Direction.NORTH)) {
+            bot.setZ(this.getRelative(Direction.NORTH).getTopAbs().getZ() + 1);
         }
-        if (this.getMerged(Direction.WEST.getIndex())) {
-            bot.setX(this.getRelative(Direction.WEST.getIndex()).getTopAbs().getX() + 1);
+        if (this.getMerged(Direction.WEST)) {
+            bot.setX(this.getRelative(Direction.WEST).getTopAbs().getX() + 1);
         }
         return bot;
     }
@@ -1678,7 +1678,7 @@ public class Plot {
             if (this.area.TERRAIN == 3) {
                 return;
             }
-            Plot other = this.getRelative(Direction.EAST.getIndex());
+            Plot other = this.getRelative(Direction.EAST);
             Location bot = other.getBottomAbs();
             Location top = this.getTopAbs();
             Location pos1 = new Location(this.getWorldName(), top.getX(), 0, bot.getZ());
@@ -2147,7 +2147,7 @@ public class Plot {
             if (this.area.TERRAIN == 3) {
                 return;
             }
-            Plot other = this.getRelative(2);
+            Plot other = this.getRelative(Direction.SOUTH);
             Location bot = other.getBottomAbs();
             Location top = this.getTopAbs();
             Location pos1 = new Location(this.getWorldName(), bot.getX(), 0, top.getZ());
@@ -2192,8 +2192,8 @@ public class Plot {
             }
             visited.add(current);
             Set<Plot> plots;
-            if ((dir == -1 || dir == 0) && !current.getMerged(0)) {
-                Plot other = current.getRelative(0);
+            if ((dir == -1 || dir == 0) && !getMerged(Direction.NORTH)) {
+                Plot other = current.getRelative(Direction.NORTH);
                 if (other != null && other.isOwner(uuid) && (
                     other.getBasePlot(false).equals(current.getBasePlot(false))
                         || (plots = other.getConnectedPlots()).size() <= max && frontier
@@ -2204,8 +2204,8 @@ public class Plot {
                     toReturn = true;
                 }
             }
-            if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(1)) {
-                Plot other = current.getRelative(1);
+            if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(Direction.EAST)) {
+                Plot other = current.getRelative(Direction.EAST);
                 if (other != null && other.isOwner(uuid) && (
                     other.getBasePlot(false).equals(current.getBasePlot(false))
                         || (plots = other.getConnectedPlots()).size() <= max && frontier
@@ -2216,8 +2216,8 @@ public class Plot {
                     toReturn = true;
                 }
             }
-            if (max >= 0 && (dir == -1 || dir == 2) && !current.getMerged(2)) {
-                Plot other = current.getRelative(2);
+            if (max >= 0 && (dir == -1 || dir == 2) && !getMerged(Direction.SOUTH)) {
+                Plot other = current.getRelative(Direction.SOUTH);
                 if (other != null && other.isOwner(uuid) && (
                     other.getBasePlot(false).equals(current.getBasePlot(false))
                         || (plots = other.getConnectedPlots()).size() <= max && frontier
@@ -2228,8 +2228,8 @@ public class Plot {
                     toReturn = true;
                 }
             }
-            if (max >= 0 && (dir == -1 || dir == 3) && !current.getMerged(3)) {
-                Plot other = current.getRelative(3);
+            if (max >= 0 && (dir == -1 || dir == 3) && !getMerged(Direction.WEST)) {
+                Plot other = current.getRelative(Direction.WEST);
                 if (other != null && other.isOwner(uuid) && (
                     other.getBasePlot(false).equals(current.getBasePlot(false))
                         || (plots = other.getConnectedPlots()).size() <= max && frontier
@@ -2344,6 +2344,21 @@ public class Plot {
         return this.area.getPlotAbs(this.id.getRelative(direction));
     }
 
+    /**
+     * Gets the plot in a relative direction<br>
+     * 0 = north<br>
+     * 1 = east<br>
+     * 2 = south<br>
+     * 3 = west<br>
+     * Note: May be null if the partial plot area does not include the relative location
+     *
+     * @param direction
+     * @return
+     */
+    public Plot getRelative(Direction direction) {
+        return this.area.getPlotAbs(this.id.getRelative(direction));
+    }
+
     /**
      * Gets a set of plots connected (and including) this plot<br>
      * - This result is cached globally
@@ -2370,8 +2385,8 @@ public class Plot {
         tmpSet.add(this);
         Plot tmp;
         if (merged[0]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(0));
-            if (!tmp.getMerged(2)) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.NORTH));
+            if (!tmp.getMerged(Direction.SOUTH)) {
                 // invalid merge
                 PlotSquared.debug("Fixing invalid merge: " + this);
                 if (tmp.isOwnerAbs(this.owner)) {
@@ -2386,8 +2401,8 @@ public class Plot {
             frontier.add(tmp);
         }
         if (merged[1]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(1));
-            if (!tmp.getMerged(3)) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.EAST));
+            if (!tmp.getMerged(Direction.WEST)) {
                 // invalid merge
                 PlotSquared.debug("Fixing invalid merge: " + this);
                 if (tmp.isOwnerAbs(this.owner)) {
@@ -2402,8 +2417,8 @@ public class Plot {
             frontier.add(tmp);
         }
         if (merged[2]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(2));
-            if (!tmp.getMerged(0)) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.SOUTH));
+            if (!tmp.getMerged(Direction.NORTH)) {
                 // invalid merge
                 PlotSquared.debug("Fixing invalid merge: " + this);
                 if (tmp.isOwnerAbs(this.owner)) {
@@ -2418,8 +2433,8 @@ public class Plot {
             frontier.add(tmp);
         }
         if (merged[3]) {
-            tmp = this.area.getPlotAbs(this.id.getRelative(3));
-            if (!tmp.getMerged(1)) {
+            tmp = this.area.getPlotAbs(this.id.getRelative(Direction.WEST));
+            if (!tmp.getMerged(Direction.EAST)) {
                 // invalid merge
                 PlotSquared.debug("Fixing invalid merge: " + this);
                 if (tmp.isOwnerAbs(this.owner)) {
@@ -2446,28 +2461,28 @@ public class Plot {
             queuecache.remove(current);
             merged = current.getMerged();
             if (merged[0]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(0));
+                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.NORTH));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
                 }
             }
             if (merged[1]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(1));
+                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.EAST));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
                 }
             }
             if (merged[2]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(2));
+                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.SOUTH));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
                 }
             }
             if (merged[3]) {
-                tmp = current.area.getPlotAbs(current.id.getRelative(3));
+                tmp = current.area.getPlotAbs(current.id.getRelative(Direction.WEST));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
@@ -2516,7 +2531,8 @@ public class Plot {
                 boolean tmp = true;
                 for (PlotId id : ids) {
                     Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(2) || visited.contains(plot.getId())) {
+                    if (plot == null || !plot.getMerged(Direction.SOUTH) || visited
+                        .contains(plot.getId())) {
                         tmp = false;
                     }
                 }
@@ -2529,7 +2545,8 @@ public class Plot {
                 tmp = true;
                 for (PlotId id : ids) {
                     Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(3) || visited.contains(plot.getId())) {
+                    if (plot == null || !plot.getMerged(Direction.WEST) || visited
+                        .contains(plot.getId())) {
                         tmp = false;
                     }
                 }
@@ -2542,7 +2559,8 @@ public class Plot {
                 tmp = true;
                 for (PlotId id : ids) {
                     Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(0) || visited.contains(plot.getId())) {
+                    if (plot == null || !plot.getMerged(Direction.NORTH) || visited
+                        .contains(plot.getId())) {
                         tmp = false;
                     }
                 }
@@ -2555,7 +2573,8 @@ public class Plot {
                 tmp = true;
                 for (PlotId id : ids) {
                     Plot plot = this.area.getPlotAbs(id);
-                    if (plot == null || !plot.getMerged(1) || visited.contains(plot.getId())) {
+                    if (plot == null || !plot.getMerged(Direction.EAST) || visited
+                        .contains(plot.getId())) {
                         tmp = false;
                     }
                 }
@@ -2569,14 +2588,14 @@ public class Plot {
             visited.addAll(MainUtil.getPlotSelectionIds(bot, top));
             for (int x = bot.x; x <= top.x; x++) {
                 Plot plot = this.area.getPlotAbs(new PlotId(x, top.y));
-                if (plot.getMerged(2)) {
+                if (plot.getMerged(Direction.SOUTH)) {
                     // south wedge
                     Location toploc = plot.getExtendedTopAbs();
                     Location botabs = plot.getBottomAbs();
                     Location topabs = plot.getTopAbs();
                     regions.add(new RegionWrapper(botabs.getX(), topabs.getX(), topabs.getZ() + 1,
                         toploc.getZ()));
-                    if (plot.getMerged(5)) {
+                    if (plot.getMerged(Direction.SOUTHEAST)) {
                         regions.add(
                             new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
                                 toploc.getZ()));
@@ -2587,14 +2606,14 @@ public class Plot {
 
             for (int y = bot.y; y <= top.y; y++) {
                 Plot plot = this.area.getPlotAbs(new PlotId(top.x, y));
-                if (plot.getMerged(1)) {
+                if (plot.getMerged(Direction.EAST)) {
                     // east wedge
                     Location toploc = plot.getExtendedTopAbs();
                     Location botabs = plot.getBottomAbs();
                     Location topabs = plot.getTopAbs();
                     regions.add(new RegionWrapper(topabs.getX() + 1, toploc.getX(), botabs.getZ(),
                         topabs.getZ()));
-                    if (plot.getMerged(5)) {
+                    if (plot.getMerged(Direction.SOUTHEAST)) {
                         regions.add(
                             new RegionWrapper(topabs.getX() + 1, toploc.getX(), topabs.getZ() + 1,
                                 toploc.getZ()));
@@ -2776,7 +2795,7 @@ public class Plot {
                 lesserPlot = greaterPlot;
                 greaterPlot = tmp;
             }
-            if (!lesserPlot.getMerged(2)) {
+            if (!lesserPlot.getMerged(Direction.SOUTH)) {
                 lesserPlot.clearRatings();
                 greaterPlot.clearRatings();
                 lesserPlot.setMerged(2, true);
@@ -2784,13 +2803,13 @@ public class Plot {
                 lesserPlot.mergeData(greaterPlot);
                 if (removeRoads) {
                     lesserPlot.removeRoadSouth();
-                    Plot diagonal = greaterPlot.getRelative(1);
-                    if (diagonal.getMerged(7)) {
+                    Plot diagonal = greaterPlot.getRelative(Direction.EAST);
+                    if (diagonal.getMerged(Direction.NORTHWEST)) {
                         lesserPlot.removeRoadSouthEast();
                     }
-                    Plot below = greaterPlot.getRelative(3);
-                    if (below.getMerged(4)) {
-                        below.getRelative(0).removeRoadSouthEast();
+                    Plot below = greaterPlot.getRelative(Direction.WEST);
+                    if (below.getMerged(Direction.NORTHEAST)) {
+                        below.getRelative(Direction.NORTH).removeRoadSouthEast();
                     }
                 }
             }
@@ -2800,22 +2819,22 @@ public class Plot {
                 lesserPlot = greaterPlot;
                 greaterPlot = tmp;
             }
-            if (!lesserPlot.getMerged(1)) {
+            if (!lesserPlot.getMerged(Direction.EAST)) {
                 lesserPlot.clearRatings();
                 greaterPlot.clearRatings();
                 lesserPlot.setMerged(1, true);
                 greaterPlot.setMerged(3, true);
                 lesserPlot.mergeData(greaterPlot);
                 if (removeRoads) {
-                    Plot diagonal = greaterPlot.getRelative(2);
-                    if (diagonal.getMerged(7)) {
+                    Plot diagonal = greaterPlot.getRelative(Direction.SOUTH);
+                    if (diagonal.getMerged(Direction.NORTHWEST)) {
                         lesserPlot.removeRoadSouthEast();
                     }
                     lesserPlot.removeRoadEast();
                 }
-                Plot below = greaterPlot.getRelative(0);
-                if (below.getMerged(6)) {
-                    below.getRelative(3).removeRoadSouthEast();
+                Plot below = greaterPlot.getRelative(Direction.NORTH);
+                if (below.getMerged(Direction.SOUTHWEST)) {
+                    below.getRelative(Direction.WEST).removeRoadSouthEast();
                 }
             }
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 594da7962..f5cc16779 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -560,6 +560,7 @@ public abstract class PlotArea {
         return this.plots.entrySet().stream().anyMatch(entry -> entry.getValue().isOwner(uuid));
     }
 
+    //todo check if this method is needed in this class
     public int getPlotCount(@Nullable final PlotPlayer player) {
         return player != null ? getPlotCount(player.getUUID()) : 0;
     }
@@ -876,19 +877,19 @@ public abstract class PlotArea {
                 Plot plot2;
                 if (lx) {
                     if (ly) {
-                        if (!plot.getMerged(1) || !plot.getMerged(2)) {
+                        if (!plot.getMerged(Direction.EAST) || !plot.getMerged(Direction.SOUTH)) {
                             if (removeRoads) {
                                 plot.removeRoadSouthEast();
                             }
                         }
                     }
-                    if (!plot.getMerged(1)) {
+                    if (!plot.getMerged(Direction.EAST)) {
                         plot2 = plot.getRelative(1, 0);
                         plot.mergePlot(plot2, removeRoads);
                     }
                 }
                 if (ly) {
-                    if (!plot.getMerged(2)) {
+                    if (!plot.getMerged(Direction.SOUTH)) {
                         plot2 = plot.getRelative(0, 1);
                         plot.mergePlot(plot2, removeRoads);
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
index 1f883cb08..8c4b78445 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
@@ -86,6 +86,9 @@ public class PlotId {
         }
     }
 
+    public PlotId getRelative(Direction direction) {
+        return getRelative(direction.getIndex());
+    }
     /**
      * Get the PlotId in a relative direction
      * 0 = north<br>
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index f7fd8dc76..fa1a527fd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -1,5 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
@@ -576,7 +577,7 @@ public class MainUtil {
      * @param prefix If the message should be prefixed with the configured prefix
      * @return
      */
-    public static boolean sendMessage(PlotPlayer player, String msg, boolean prefix) {
+    public static boolean sendMessage(CommandCaller player, String msg, boolean prefix) {
         if (!msg.isEmpty()) {
             if (player == null) {
                 String message = (prefix ? Captions.PREFIX.s() : "") + msg;
@@ -595,7 +596,7 @@ public class MainUtil {
      * @param caption the message to send
      * @return boolean success
      */
-    public static boolean sendMessage(PlotPlayer player, Captions caption, String... args) {
+    public static boolean sendMessage(CommandCaller player, Captions caption, String... args) {
         return sendMessage(player, caption, (Object[]) args);
     }
 
@@ -606,19 +607,17 @@ public class MainUtil {
      * @param caption the message to send
      * @return boolean success
      */
-    public static boolean sendMessage(final PlotPlayer player, final Captions caption,
+    public static boolean sendMessage(final CommandCaller player, final Captions caption,
         final Object... args) {
         if (caption.s().isEmpty()) {
             return true;
         }
-        TaskManager.runTaskAsync(new Runnable() {
-            @Override public void run() {
-                String m = Captions.format(caption, args);
-                if (player == null) {
-                    PlotSquared.log(m);
-                } else {
-                    player.sendMessage(m);
-                }
+        TaskManager.runTaskAsync(() -> {
+            String m = Captions.format(caption, args);
+            if (player == null) {
+                PlotSquared.log(m);
+            } else {
+                player.sendMessage(m);
             }
         });
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
index c4716b8ef..c10d9507b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpMenu.java
@@ -1,24 +1,24 @@
 package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
 
 import com.github.intellectualsites.plotsquared.commands.Command;
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
 import com.github.intellectualsites.plotsquared.plot.commands.MainCommand;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
 import java.util.List;
 
 public class HelpMenu {
 
-    public static final int PER_PAGE = 5;
+    private static final int PER_PAGE = 5;
 
-    private final PlotPlayer player;
+    private final CommandCaller commandCaller;
     private HelpPage page = new HelpPage(CommandCategory.INFO, 0, 0);
     private int maxPage;
     private CommandCategory commandCategory;
     private List<Command> commands;
 
-    public HelpMenu(PlotPlayer player) {
-        this.player = player;
+    public HelpMenu(CommandCaller commandCaller) {
+        this.commandCaller = commandCaller;
     }
 
     public HelpMenu setCategory(CommandCategory commandCategory) {
@@ -27,7 +27,8 @@ public class HelpMenu {
     }
 
     public HelpMenu getCommands() {
-        this.commands = MainCommand.getInstance().getCommands(this.commandCategory, this.player);
+        this.commands =
+            MainCommand.getInstance().getCommands(this.commandCategory, this.commandCaller);
         return this;
     }
 
@@ -52,7 +53,7 @@ public class HelpMenu {
     }
 
     public void render() {
-        this.page.render(this.player);
+        this.page.render(this.commandCaller);
     }
 
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
index ab0ac49a1..3f29aefb1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/helpmenu/HelpPage.java
@@ -1,8 +1,8 @@
 package com.github.intellectualsites.plotsquared.plot.util.helpmenu;
 
+import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.plot.commands.CommandCategory;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
@@ -21,7 +21,7 @@ public class HelpPage {
             .replace("%current%", (currentPage + 1) + "").replace("%max%", (maxPages + 1) + "");
     }
 
-    public void render(PlotPlayer player) {
+    public void render(CommandCaller player) {
         if (this.helpObjects.size() < 1) {
             MainUtil.sendMessage(player, Captions.NOT_VALID_NUMBER, "(0)");
         } else {

From 1d327ec3464024563e715ba721f70e6d9cee0725 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 7 Mar 2019 18:38:21 -0500
Subject: [PATCH 063/210] Fixes an issue with boats

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/listeners/PlayerEvents.java        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 5812e4e27..adadc2e55 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -35,6 +35,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.player.*;
 import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
+import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
 import org.bukkit.event.vehicle.VehicleMoveEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.help.HelpTopic;
@@ -235,6 +236,33 @@ import java.util.regex.Pattern;
         }
     }
 
+    @EventHandler public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
+        if (e.getVehicle().getType() == EntityType.BOAT) {
+            Location location = BukkitUtil.getLocation(e.getEntity());
+            if (location.getPlotArea() == null) {
+                //we don't care about events that happen outside of a plot area.
+                return;
+            }
+            if (e.getEntity() instanceof Player) {
+                PlotPlayer player = BukkitUtil.getPlayer((Player) e.getEntity());
+                Plot plot = player.getCurrentPlot();
+                if (plot != null) {
+                    if (!plot.isAdded(player.getUUID())) {
+                        //Here the event is only canceled if the player is not the owner
+                        //of the property on which he is located.
+                        e.setCancelled(true);
+                    }
+                } else {
+                    e.setCancelled(true);
+                }
+            } else {
+                //Here the event is cancelled too, otherwise you can move the
+                //boat with EchoPets or other mobs running around on the plot.
+                e.setCancelled(true);
+            }
+        }
+    }
+
     @EventHandler public void onRedstoneEvent(BlockRedstoneEvent event) {
         Block block = event.getBlock();
 /*        switch (block.getType()) {

From ed10877431fd77b5af5aa61f5678735e61071041 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 8 Mar 2019 23:04:38 +0000
Subject: [PATCH 064/210] Should fix IndexOutOfBoundsException when copying
 fixes#2290

---
 .../bukkit/object/entity/ReplicatingEntityWrapper.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index d59fabf1c..f05555947 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -10,6 +10,8 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.EulerAngle;
 import org.bukkit.util.Vector;
 
+import java.util.List;
+
 public final class ReplicatingEntityWrapper extends EntityWrapper {
 
     private final short depth;
@@ -38,9 +40,9 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         if (depth == 0) {
             return;
         }
-        Entity passenger = entity.getPassengers().get(0);
-        if (passenger != null) {
-            this.base.passenger = new ReplicatingEntityWrapper(passenger, depth);
+        List<Entity> passengers = entity.getPassengers();
+        if (passengers.size() > 0) {
+            this.base.passenger = new ReplicatingEntityWrapper(passengers.get(0), depth);
         }
         this.base.fall = entity.getFallDistance();
         this.base.fire = (short) entity.getFireTicks();

From aa894b8ad91fed8b7f83ccbfac0d43708f21f239 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sat, 9 Mar 2019 00:12:21 +0000
Subject: [PATCH 065/210] Fixes #2245 Also some minor fixes to
 PlayerInteractEvent main/off hand logic

---
 .../bukkit/listeners/PlayerEvents.java        | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 5812e4e27..a259e62b1 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -10,12 +10,10 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
@@ -909,7 +907,7 @@ import java.util.regex.Pattern;
         if (!spies.isEmpty()) {
             String spyMessage =
                 Captions.PLOT_CHAT_SPY_FORMAT.s().replace("%plot_id%", id.x + ";" + id.y)
-                .replace("%sender%", sender).replace("%msg%", message);
+                    .replace("%sender%", sender).replace("%msg%", message);
             for (Player player : spies) {
                 player.sendMessage(spyMessage);
             }
@@ -1734,7 +1732,32 @@ import java.util.regex.Pattern;
             blox -> !plot.equals(area.getOwnedPlot(BukkitUtil.getLocation(blox.getLocation()))));
     }
 
-    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.LOW)
+    public void onCancelledInteract(PlayerInteractEvent event) {
+        if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) {
+            Player player = event.getPlayer();
+            PlotPlayer pp = BukkitUtil.getPlayer(player);
+            PlotArea area = pp.getPlotAreaAbs();
+            if (area == null) {
+                return;
+            }
+            Material type = player.getInventory().getItemInMainHand().getType();
+            if (type.toString().toLowerCase().endsWith("egg")) {
+                Block block = player.getTargetBlockExact(5, FluidCollisionMode.SOURCE_ONLY);
+                if (block != null && block.getType() != Material.AIR) {
+                    Location location = BukkitUtil.getLocation(block.getLocation());
+                    if (!EventUtil.manager
+                        .checkPlayerBlockEvent(pp, PlayerBlockEventType.SPAWN_MOB, location,
+                            new BukkitLazyBlock(PlotBlock.get(type.toString())), true)) {
+                        event.setCancelled(true);
+                        event.setUseItemInHand(Event.Result.DENY);
+                    }
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = false)
     public void onInteract(PlayerInteractEvent event) {
         Player player = event.getPlayer();
         PlotPlayer pp = BukkitUtil.getPlayer(player);
@@ -1907,25 +1930,25 @@ import java.util.regex.Pattern;
                 }
                 ItemStack hand = player.getInventory().getItemInMainHand();
                 ItemStack offHand = player.getInventory().getItemInOffHand();
-                Material type = (hand == null) ? null : hand.getType();
-                Material offType = (offHand == null) ? null : offHand.getType();
+                Material type = (hand == null) ? Material.AIR : hand.getType();
+                Material offType = (offHand == null) ? Material.AIR : offHand.getType();
                 if ((type == Material.AIR && offType != Material.AIR && !player.isSneaking()
                     && blockType.isInteractable()) || (type == Material.AIR
                     && offType == Material.AIR)) {
                     eventType = PlayerBlockEventType.INTERACT_BLOCK;
                     break;
                 }
-                if (!(type != null && type.equals(offType))) {
+                if (type == Material.AIR) {
                     type = offType;
                 }
-                if (type == null || type.isBlock()) {
+                if (type.isBlock()) {
                     location = BukkitUtil
                         .getLocation(block.getRelative(event.getBlockFace()).getLocation());
                     eventType = PlayerBlockEventType.PLACE_BLOCK;
                     break;
                 }
                 lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
-                if (type.toString().endsWith("egg")) {
+                if (type.toString().toLowerCase().endsWith("egg")) {
                     eventType = PlayerBlockEventType.SPAWN_MOB;
                 } else {
                     switch (type) {

From ed3cadd43992e1ca7a37c085a288faed50b2f7e6 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 8 Mar 2019 19:25:59 -0500
Subject: [PATCH 066/210] Formatting fixes and minor performance improvement

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../bukkit/listeners/ChunkListener.java       |  8 +++----
 .../bukkit/listeners/EntitySpawnListener.java |  2 +-
 .../plotsquared/plot/commands/Auto.java       | 18 ++++++++--------
 .../plot/generator/HybridPlotManager.java     |  7 +++----
 .../plotsquared/plot/object/Plot.java         | 21 +++++++++++++------
 .../plot/object/worlds/SinglePlot.java        | 12 +++++------
 6 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index ca389cd30..5abbbd378 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -111,7 +111,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         }
         Object c = this.methodGetHandleChunk.of(chunk).call();
         RefField.RefExecutor field = this.mustSave.of(c);
-        if ((Boolean) field.get() == true) {
+        if ((Boolean) field.get()) {
             field.set(false);
             if (chunk.isLoaded()) {
                 ignoreUnload = true;
@@ -122,9 +122,9 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         return true;
     }
 
-    public boolean shouldSave(String world, int X, int Z) {
-        int x = X << 4;
-        int z = Z << 4;
+    public boolean shouldSave(String world, int chunkX, int chunkZ) {
+        int x = chunkX << 4;
+        int z = chunkZ << 4;
         int x2 = x + 15;
         int z2 = z + 15;
         Plot plot = new Location(world, x, 1, z).getOwnedPlotAbs();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 0faf0c198..6e167d548 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -131,7 +131,7 @@ public class EntitySpawnListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void vehicleMove(VehicleMoveEvent event) throws IllegalAccessException {
+    public void vehicleMove(VehicleMoveEvent event) {
         test(event.getVehicle());
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index 833e02968..11d9c30f4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -21,26 +21,26 @@ public class Auto extends SubCommand {
     }
 
     private static boolean checkAllowedPlots(PlotPlayer player, PlotArea plotarea,
-        @Nullable Integer allowed_plots, int size_x, int size_z) {
-        if (allowed_plots == null) {
-            allowed_plots = player.getAllowedPlots();
+        @Nullable Integer allowedPlots, int sizeX, int sizeZ) {
+        if (allowedPlots == null) {
+            allowedPlots = player.getAllowedPlots();
         }
         int currentPlots =
             Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plotarea.worldname);
-        int diff = currentPlots - allowed_plots;
-        if (diff + size_x * size_z > 0) {
+        int diff = currentPlots - allowedPlots;
+        if (diff + sizeX * sizeZ > 0) {
             if (diff < 0) {
                 MainUtil.sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS_NUM, -diff + "");
                 return false;
             } else if (player.hasPersistentMeta("grantedPlots")) {
                 int grantedPlots =
                     ByteArrayUtilities.bytesToInteger(player.getPersistentMeta("grantedPlots"));
-                if (grantedPlots - diff < size_x * size_z) {
+                if (grantedPlots - diff < sizeX * sizeZ) {
                     player.removePersistentMeta("grantedPlots");
                     MainUtil.sendMessage(player, Captions.CANT_CLAIM_MORE_PLOTS);
                     return false;
                 } else {
-                    int left = grantedPlots - diff - size_x * size_z;
+                    int left = grantedPlots - diff - sizeX * sizeZ;
                     if (left == 0) {
                         player.removePersistentMeta("grantedPlots");
                     } else {
@@ -98,7 +98,7 @@ public class Auto extends SubCommand {
      * @param schem
      */
     public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem, @Nullable final Integer allowed_plots) {
+        final String schem, @Nullable final Integer allowedPlots) {
         player.setMeta(Auto.class.getName(), true);
         autoClaimFromDatabase(player, area, start, new RunnableVal<Plot>() {
             @Override public void run(final Plot plot) {
@@ -107,7 +107,7 @@ public class Auto extends SubCommand {
                         player.deleteMeta(Auto.class.getName());
                         if (plot == null) {
                             MainUtil.sendMessage(player, Captions.NO_FREE_PLOTS);
-                        } else if (checkAllowedPlots(player, area, allowed_plots, 1, 1)) {
+                        } else if (checkAllowedPlots(player, area, allowedPlots, 1, 1)) {
                             plot.claim(player, true, schem, false);
                             if (area.AUTO_MERGE) {
                                 plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 1f6429dbd..b95913102 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -9,12 +9,12 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.google.common.collect.Sets;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import java.util.Collections;
 import java.util.HashSet;
 
 public class HybridPlotManager extends ClassicPlotManager {
@@ -22,9 +22,8 @@ public class HybridPlotManager extends ClassicPlotManager {
     public static boolean REGENERATIVE_CLEAR = true;
 
     @Override public void exportTemplate(PlotArea plotArea) throws IOException {
-        HashSet<FileBytes> files = new HashSet<>(Collections.singletonList(
-            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml",
-                Template.getBytes(plotArea))));
+        HashSet<FileBytes> files = Sets.newHashSet(
+            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml", Template.getBytes(plotArea)));
         String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator
             + plotArea.worldname + File.separator;
         String newDir =
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 88ac6dc31..9733918f3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -19,6 +19,7 @@ import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import com.sk89q.jnbt.CompoundTag;
 
 import javax.annotation.Nonnull;
@@ -607,8 +608,17 @@ public class Plot {
      */
     public void setDenied(Set<UUID> uuids) {
         boolean larger = uuids.size() > getDenied().size();
-        HashSet<UUID> intersection = new HashSet<>(larger ? getDenied() : uuids);
-        intersection.retainAll(larger ? uuids : getDenied());
+        HashSet<UUID> intersection;
+        if (larger) {
+            intersection = new HashSet<>(getDenied());
+        } else {
+            intersection = new HashSet<>(uuids);
+        }
+        if (larger) {
+            intersection.retainAll(uuids);
+        } else {
+            intersection.retainAll(getDenied());
+        }
         uuids.removeAll(intersection);
         HashSet<UUID> toRemove = new HashSet<>(getDenied());
         toRemove.removeAll(intersection);
@@ -2500,16 +2510,15 @@ public class Plot {
      *
      * @return
      */
-    public HashSet<RegionWrapper> getRegions() {
+    @Nonnull public HashSet<RegionWrapper> getRegions() {
         if (regions_cache != null && connected_cache != null && connected_cache.contains(this)) {
             return regions_cache;
         }
         if (!this.isMerged()) {
             Location pos1 = this.getBottomAbs();
             Location pos2 = this.getTopAbs();
-            connected_cache = new HashSet<>(Collections.singletonList(this));
-            regions_cache = new HashSet<>(1);
-            regions_cache.add(
+            connected_cache = Sets.newHashSet(this);
+            regions_cache = Sets.newHashSet(
                 new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getY(), pos2.getY(), pos1.getZ(),
                     pos2.getZ()));
             return regions_cache;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
index 8dfdeaaac..36d23c8f6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java
@@ -3,19 +3,17 @@ package com.github.intellectualsites.plotsquared.plot.object.worlds;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.google.common.collect.Sets;
 
+import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.UUID;
 
 public class SinglePlot extends Plot {
-    private HashSet<RegionWrapper> regions;
-
-    {
-        regions = new HashSet<>();
-        regions.add(new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
+    private HashSet<RegionWrapper> regions = Sets.newHashSet(
+        new RegionWrapper(Integer.MIN_VALUE, Integer.MAX_VALUE, Integer.MIN_VALUE,
             Integer.MAX_VALUE));
-    }
 
     public SinglePlot(PlotArea area, PlotId id, UUID owner) {
         super(area, id, owner);
@@ -62,7 +60,7 @@ public class SinglePlot extends Plot {
         return super.isLoaded();
     }
 
-    @Override public HashSet<RegionWrapper> getRegions() {
+    @Nonnull @Override public HashSet<RegionWrapper> getRegions() {
         return regions;
     }
 

From dffbaf89a383c05ee4e32c8c837dd3b0bf0388c1 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sat, 9 Mar 2019 00:28:21 +0000
Subject: [PATCH 067/210] Fix for offhandedness

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index a259e62b1..dd2878fa6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1741,7 +1741,13 @@ import java.util.regex.Pattern;
             if (area == null) {
                 return;
             }
-            Material type = player.getInventory().getItemInMainHand().getType();
+            ItemStack hand = player.getInventory().getItemInMainHand();
+            ItemStack offHand = player.getInventory().getItemInOffHand();
+            Material type = (hand == null) ? Material.AIR : hand.getType();
+            Material offType = (offHand == null) ? Material.AIR : offHand.getType();
+            if (type == Material.AIR) {
+                type = offType;
+            }
             if (type.toString().toLowerCase().endsWith("egg")) {
                 Block block = player.getTargetBlockExact(5, FluidCollisionMode.SOURCE_ONLY);
                 if (block != null && block.getType() != Material.AIR) {

From cf1764723f20d4fc804b57ccd6ccdb55a6559850 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 12 Mar 2019 16:56:51 -0400
Subject: [PATCH 068/210] Fixes #2291

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/listeners/PlayerEvents.java         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index a56cf5b29..ac51d4c84 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1769,6 +1769,13 @@ import java.util.regex.Pattern;
             if (area == null) {
                 return;
             }
+            if (event.getAction() == Action.RIGHT_CLICK_AIR) {
+                Material item = event.getItem().getType();
+                if (item.toString().toLowerCase().endsWith("egg")) {
+                    event.setCancelled(true);
+                    event.setUseItemInHand(Event.Result.DENY);
+                }
+            }
             ItemStack hand = player.getInventory().getItemInMainHand();
             ItemStack offHand = player.getInventory().getItemInOffHand();
             Material type = (hand == null) ? Material.AIR : hand.getType();

From e146b6a88dd4512082ecb7db59a241873b3c8474 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 13 Mar 2019 13:21:09 +0000
Subject: [PATCH 069/210] Update offset to match CI

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3ffd8f071..39fb59087 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2041;  // Offset to match CI
+    index = -2043;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 7f14e88c4c9c77539dc8d0c278ec66a6354d3ddd Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 14 Mar 2019 21:49:33 -0400
Subject: [PATCH 070/210] last commit before 4.0.0

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/BukkitMain.java        |   2 +-
 .../plotsquared/bukkit/chat/Reflection.java   |   4 +-
 .../generator/BukkitAugmentedGenerator.java   |   4 +-
 .../bukkit/generator/BukkitPlotGenerator.java |   6 +-
 .../bukkit/listeners/ChunkListener.java       | 117 +++++-----
 .../bukkit/listeners/EntitySpawnListener.java |   4 +-
 .../bukkit/listeners/PlayerEvents.java        |  64 +++---
 .../bukkit/listeners/PlotPlusListener.java    |  70 +++---
 .../bukkit/listeners/SingleWorldListener.java |   4 +-
 .../bukkit/util/BukkitChunkManager.java       | 211 +++++++++---------
 .../bukkit/util/block/BukkitLocalQueue.java   |   7 +-
 .../plotsquared/plot/commands/DebugExec.java  |  10 +-
 .../plotsquared/plot/commands/Move.java       |   4 +-
 .../plotsquared/plot/commands/Near.java       |   4 +-
 .../plotsquared/plot/commands/Trim.java       |   4 +-
 .../plot/generator/ClassicPlotManager.java    |   2 +-
 .../plotsquared/plot/object/Location.java     |  20 +-
 .../plotsquared/plot/object/Plot.java         |  18 +-
 .../plotsquared/plot/object/PlotManager.java  |   2 +-
 .../plot/object/StringPlotBlock.java          |   5 +-
 .../plot/object/worlds/SinglePlotManager.java |   2 +-
 .../plotsquared/plot/util/EventUtil.java      |  24 +-
 .../util/block/DelegateLocalBlockQueue.java   |   4 +-
 .../plotsquared/plot/object/LocationTest.java |  21 ++
 24 files changed, 303 insertions(+), 310 deletions(-)
 create mode 100644 Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index de00937f6..5036afae0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -73,7 +73,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS);
         } catch (final Throwable throwable) {
             throw new IllegalStateException(
-                "Failed to force load WorldEdit." + " Road schematics will fail to generate",
+                "Failed to force load WorldEdit. Road schematics will fail to generate",
                 throwable);
         }
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
index 79c445dcc..a92515221 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
@@ -181,13 +181,13 @@ public final class Reflection {
      */
     public synchronized static Method getMethod(Class<?> clazz, String name, Class<?>... args) {
         if (!_loadedMethods.containsKey(clazz)) {
-            _loadedMethods.put(clazz, new HashMap<String, Map<ArrayWrapper<Class<?>>, Method>>());
+            _loadedMethods.put(clazz, new HashMap<>());
         }
 
         Map<String, Map<ArrayWrapper<Class<?>>, Method>> loadedMethodNames =
             _loadedMethods.get(clazz);
         if (!loadedMethodNames.containsKey(name)) {
-            loadedMethodNames.put(name, new HashMap<ArrayWrapper<Class<?>>, Method>());
+            loadedMethodNames.put(name, new HashMap<>());
         }
 
         Map<ArrayWrapper<Class<?>>, Method> loadedSignatures = loadedMethodNames.get(name);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
index 6022632eb..6942bf6ab 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
@@ -24,7 +24,7 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
         return generator;
     }
 
-    @Override public void populate(World world, Random r, Chunk chunk) {
-        AugmentedUtils.generate(world.getName(), chunk.getX(), chunk.getZ(), null);
+    @Override public void populate(World world, Random random, Chunk source) {
+        AugmentedUtils.generate(world.getName(), source.getX(), source.getZ(), null);
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index affb0461e..947f1c3bb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -69,12 +69,10 @@ public class BukkitPlotGenerator extends ChunkGenerator
                 + " is already a BukkitPlotGenerator!");
         }
         this.full = false;
-        PlotSquared.debug("BukkitPlotGenerator does not fully support: " + cg);
+        //todo figure out why this was put here in the first place:
+        //PlotSquared.debug("BukkitPlotGenerator does not fully support: " + cg);
         this.platformGenerator = cg;
         this.plotGenerator = new IndependentPlotGenerator() {
-            @Override public void processSetup(SetupObject setup) {
-            }
-
             @Override public void initialize(PlotArea area) {
             }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index 5abbbd378..902aa86b5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -59,48 +59,45 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         for (World world : Bukkit.getWorlds()) {
             world.setAutoSave(false);
         }
-        TaskManager.runTaskRepeat(new Runnable() {
-            @Override public void run() {
-                try {
-                    HashSet<Chunk> toUnload = new HashSet<>();
-                    for (World world : Bukkit.getWorlds()) {
-                        String worldName = world.getName();
-                        if (!PlotSquared.get().hasPlotArea(worldName)) {
+        TaskManager.runTaskRepeat(() -> {
+            try {
+                HashSet<Chunk> toUnload = new HashSet<>();
+                for (World world : Bukkit.getWorlds()) {
+                    String worldName = world.getName();
+                    if (!PlotSquared.get().hasPlotArea(worldName)) {
+                        continue;
+                    }
+                    Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
+                    Object chunkMap = w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
+                    Method methodIsChunkInUse =
+                        chunkMap.getClass().getDeclaredMethod("isChunkInUse", int.class, int.class);
+                    Chunk[] chunks = world.getLoadedChunks();
+                    for (Chunk chunk : chunks) {
+                        if ((boolean) methodIsChunkInUse
+                            .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
                             continue;
                         }
-                        Object w = world.getClass().getDeclaredMethod("getHandle").invoke(world);
-                        Object chunkMap =
-                            w.getClass().getDeclaredMethod("getPlayerChunkMap").invoke(w);
-                        Method methodIsChunkInUse = chunkMap.getClass()
-                            .getDeclaredMethod("isChunkInUse", int.class, int.class);
-                        Chunk[] chunks = world.getLoadedChunks();
-                        for (Chunk chunk : chunks) {
-                            if ((boolean) methodIsChunkInUse
-                                .invoke(chunkMap, chunk.getX(), chunk.getZ())) {
-                                continue;
-                            }
-                            int x = chunk.getX();
-                            int z = chunk.getZ();
-                            if (!shouldSave(worldName, x, z)) {
-                                unloadChunk(worldName, chunk, false);
-                                continue;
-                            }
-                            toUnload.add(chunk);
+                        int x = chunk.getX();
+                        int z = chunk.getZ();
+                        if (!shouldSave(worldName, x, z)) {
+                            unloadChunk(worldName, chunk, false);
+                            continue;
                         }
+                        toUnload.add(chunk);
                     }
-                    if (toUnload.isEmpty()) {
+                }
+                if (toUnload.isEmpty()) {
+                    return;
+                }
+                long start = System.currentTimeMillis();
+                for (Chunk chunk : toUnload) {
+                    if (System.currentTimeMillis() - start > 5) {
                         return;
                     }
-                    long start = System.currentTimeMillis();
-                    for (Chunk chunk : toUnload) {
-                        if (System.currentTimeMillis() - start > 5) {
-                            return;
-                        }
-                        chunk.unload(true, false);
-                    }
-                } catch (Throwable e) {
-                    e.printStackTrace();
+                    chunk.unload(true, false);
                 }
+            } catch (Throwable e) {
+                e.printStackTrace();
             }
         }, 1);
     }
@@ -222,9 +219,28 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
     private void cleanChunk(final Chunk chunk) {
         TaskManager.index.incrementAndGet();
         final Integer currentIndex = TaskManager.index.get();
-        Integer task = TaskManager.runTaskRepeat(new Runnable() {
-            @Override public void run() {
-                if (!chunk.isLoaded()) {
+        Integer task = TaskManager.runTaskRepeat(() -> {
+            if (!chunk.isLoaded()) {
+                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
+                TaskManager.tasks.remove(currentIndex);
+                PlotSquared
+                    .debug(Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                chunk.unload(true, true);
+                return;
+            }
+            BlockState[] tiles = chunk.getTileEntities();
+            if (tiles.length == 0) {
+                Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
+                TaskManager.tasks.remove(currentIndex);
+                PlotSquared
+                    .debug(Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
+                chunk.unload(true, true);
+                return;
+            }
+            long start = System.currentTimeMillis();
+            int i = 0;
+            while (System.currentTimeMillis() - start < 250) {
+                if (i >= tiles.length) {
                     Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
                     TaskManager.tasks.remove(currentIndex);
                     PlotSquared.debug(
@@ -232,29 +248,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                     chunk.unload(true, true);
                     return;
                 }
-                BlockState[] tiles = chunk.getTileEntities();
-                if (tiles.length == 0) {
-                    Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                    TaskManager.tasks.remove(currentIndex);
-                    PlotSquared.debug(
-                        Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                    chunk.unload(true, true);
-                    return;
-                }
-                long start = System.currentTimeMillis();
-                int i = 0;
-                while (System.currentTimeMillis() - start < 250) {
-                    if (i >= tiles.length) {
-                        Bukkit.getScheduler().cancelTask(TaskManager.tasks.get(currentIndex));
-                        TaskManager.tasks.remove(currentIndex);
-                        PlotSquared.debug(
-                            Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                        chunk.unload(true, true);
-                        return;
-                    }
-                    tiles[i].getBlock().setType(Material.AIR, false);
-                    i++;
-                }
+                tiles[i].getBlock().setType(Material.AIR, false);
+                i++;
             }
         }, 5);
         TaskManager.tasks.put(currentIndex, task);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 6e167d548..53066f0de 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -65,10 +65,10 @@ public class EntitySpawnListener implements Listener {
         Entity entity = event.getEntity();
         Location location = BukkitUtil.getLocation(entity.getLocation());
         PlotArea area = location.getPlotArea();
-        if (area == null) {
+        if (!location.isPlotArea()) {
             return;
         }
-        Plot plot = area.getOwnedPlotAbs(location);
+        Plot plot = location.getOwnedPlotAbs();
         if (plot == null) {
             if (!area.MOB_SPAWNING) {
                 EntityType type = entity.getType();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index ac51d4c84..09c9363b8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -237,26 +237,24 @@ import java.util.regex.Pattern;
     @EventHandler public void onVehicleEntityCollision(VehicleEntityCollisionEvent e) {
         if (e.getVehicle().getType() == EntityType.BOAT) {
             Location location = BukkitUtil.getLocation(e.getEntity());
-            if (location.getPlotArea() == null) {
-                //we don't care about events that happen outside of a plot area.
-                return;
-            }
-            if (e.getEntity() instanceof Player) {
-                PlotPlayer player = BukkitUtil.getPlayer((Player) e.getEntity());
-                Plot plot = player.getCurrentPlot();
-                if (plot != null) {
-                    if (!plot.isAdded(player.getUUID())) {
-                        //Here the event is only canceled if the player is not the owner
-                        //of the property on which he is located.
+            if (location.isPlotArea()) {
+                if (e.getEntity() instanceof Player) {
+                    PlotPlayer player = BukkitUtil.getPlayer((Player) e.getEntity());
+                    Plot plot = player.getCurrentPlot();
+                    if (plot != null) {
+                        if (!plot.isAdded(player.getUUID())) {
+                            //Here the event is only canceled if the player is not the owner
+                            //of the property on which he is located.
+                            e.setCancelled(true);
+                        }
+                    } else {
                         e.setCancelled(true);
                     }
                 } else {
+                    //Here the event is cancelled too, otherwise you can move the
+                    //boat with EchoPets or other mobs running around on the plot.
                     e.setCancelled(true);
                 }
-            } else {
-                //Here the event is cancelled too, otherwise you can move the
-                //boat with EchoPets or other mobs running around on the plot.
-                e.setCancelled(true);
             }
         }
     }
@@ -315,7 +313,7 @@ import java.util.regex.Pattern;
         if (area == null) {
             return;
         }
-        Plot plot = area.getOwnedPlot(loc);
+        Plot plot = loc.getOwnedPlot();
         if (plot == null) {
             return;
         }
@@ -655,7 +653,7 @@ import java.util.regex.Pattern;
                 Player player = event.getPlayer();
                 PlotPlayer pp = PlotPlayer.wrap(player);
                 Location loc = BukkitUtil.getLocation(to);
-                PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
+                PlotArea area = loc.getPlotArea();
                 if (area == null) {
                     return;
                 }
@@ -1029,7 +1027,7 @@ import java.util.regex.Pattern;
             Iterator<Block> iterator = event.blockList().iterator();
             while (iterator.hasNext()) {
                 iterator.next();
-                if (location.getPlotArea() != null) {
+                if (location.isPlotArea()) {
                     iterator.remove();
                 }
             }
@@ -1095,13 +1093,12 @@ import java.util.regex.Pattern;
             pp.deleteMeta("perm");
         }
         Location loc = pp.getLocation();
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(loc);
-        if (area == null) {
-            return;
-        }
-        plot = area.getPlot(loc);
-        if (plot != null) {
-            plotEntry(pp, plot);
+        PlotArea area = loc.getPlotArea();
+        if (loc.isPlotArea()) {
+            plot = loc.getPlot();
+            if (plot != null) {
+                plotEntry(pp, plot);
+            }
         }
     }
 
@@ -1372,8 +1369,7 @@ import java.util.regex.Pattern;
                 return;
             }
             for (Block block1 : event.getBlocks()) {
-                if (BukkitUtil.getLocation(block1.getLocation().add(relative)).getPlotArea()
-                    != null) {
+                if (BukkitUtil.getLocation(block1.getLocation().add(relative)).isPlotArea()) {
                     event.setCancelled(true);
                     return;
                 }
@@ -1414,7 +1410,7 @@ import java.util.regex.Pattern;
                 try {
                     for (Block pulled : event.getBlocks()) {
                         location = BukkitUtil.getLocation(pulled.getLocation());
-                        if (location.getPlotArea() != null) {
+                        if (location.isPlotArea()) {
                             event.setCancelled(true);
                             return;
                         }
@@ -1427,7 +1423,7 @@ import java.util.regex.Pattern;
                 BlockFace dir = event.getDirection();
                 location = BukkitUtil.getLocation(block.getLocation()
                     .add(dir.getModX() * 2, dir.getModY() * 2, dir.getModZ() * 2));
-                if (location.getPlotArea() != null) {
+                if (location.isPlotArea()) {
                     event.setCancelled(true);
                     return;
                 }
@@ -1512,7 +1508,7 @@ import java.util.regex.Pattern;
         if (area == null) {
             for (int i = blocks.size() - 1; i >= 0; i--) {
                 location = BukkitUtil.getLocation(blocks.get(i).getLocation());
-                if (location.getPlotArea() != null) {
+                if (location.isPlotArea()) {
                     blocks.remove(i);
                 }
             }
@@ -1746,7 +1742,7 @@ import java.util.regex.Pattern;
             Iterator<Block> iterator = event.blockList().iterator();
             while (iterator.hasNext()) {
                 location = BukkitUtil.getLocation(iterator.next().getLocation());
-                if (location.getPlotArea() != null) {
+                if (location.isPlotArea()) {
                     iterator.remove();
                 }
             }
@@ -2054,12 +2050,6 @@ import java.util.regex.Pattern;
                         case TNT_MINECART:
                             eventType = PlayerBlockEventType.PLACE_VEHICLE;
                             break;
-                        case ITEM_FRAME:
-                        case PAINTING:
-                            location = BukkitUtil
-                                .getLocation(block.getRelative(event.getBlockFace()).getLocation());
-                            eventType = PlayerBlockEventType.PLACE_HANGING;
-                            break;
                         default:
                             eventType = PlayerBlockEventType.INTERACT_BLOCK;
                             break;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index 4e7c11af7..b4dafdfc2 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -36,45 +36,43 @@ import java.util.UUID;
     private static final HashMap<UUID, Interval> healRunnable = new HashMap<>();
 
     public static void startRunnable(JavaPlugin plugin) {
-        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
-            @Override public void run() {
-                if (!healRunnable.isEmpty()) {
-                    for (Iterator<Entry<UUID, Interval>> iterator =
-                         healRunnable.entrySet().iterator(); iterator.hasNext(); ) {
-                        Entry<UUID, Interval> entry = iterator.next();
-                        Interval value = entry.getValue();
-                        ++value.count;
-                        if (value.count == value.interval) {
-                            value.count = 0;
-                            Player player = Bukkit.getPlayer(entry.getKey());
-                            if (player == null) {
-                                iterator.remove();
-                                continue;
-                            }
-                            double level = player.getHealth();
-                            if (level != value.max) {
-                                player.setHealth(Math.min(level + value.amount, value.max));
-                            }
+        plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
+            if (!healRunnable.isEmpty()) {
+                for (Iterator<Entry<UUID, Interval>> iterator =
+                     healRunnable.entrySet().iterator(); iterator.hasNext(); ) {
+                    Entry<UUID, Interval> entry = iterator.next();
+                    Interval value = entry.getValue();
+                    ++value.count;
+                    if (value.count == value.interval) {
+                        value.count = 0;
+                        Player player = Bukkit.getPlayer(entry.getKey());
+                        if (player == null) {
+                            iterator.remove();
+                            continue;
+                        }
+                        double level = player.getHealth();
+                        if (level != value.max) {
+                            player.setHealth(Math.min(level + value.amount, value.max));
                         }
                     }
                 }
-                if (!feedRunnable.isEmpty()) {
-                    for (Iterator<Entry<UUID, Interval>> iterator =
-                         feedRunnable.entrySet().iterator(); iterator.hasNext(); ) {
-                        Entry<UUID, Interval> entry = iterator.next();
-                        Interval value = entry.getValue();
-                        ++value.count;
-                        if (value.count == value.interval) {
-                            value.count = 0;
-                            Player player = Bukkit.getPlayer(entry.getKey());
-                            if (player == null) {
-                                iterator.remove();
-                                continue;
-                            }
-                            int level = player.getFoodLevel();
-                            if (level != value.max) {
-                                player.setFoodLevel(Math.min(level + value.amount, value.max));
-                            }
+            }
+            if (!feedRunnable.isEmpty()) {
+                for (Iterator<Entry<UUID, Interval>> iterator =
+                     feedRunnable.entrySet().iterator(); iterator.hasNext(); ) {
+                    Entry<UUID, Interval> entry = iterator.next();
+                    Interval value = entry.getValue();
+                    ++value.count;
+                    if (value.count == value.interval) {
+                        value.count = 0;
+                        Player player = Bukkit.getPlayer(entry.getKey());
+                        if (player == null) {
+                            iterator.remove();
+                            continue;
+                        }
+                        int level = player.getFoodLevel();
+                        if (level != value.max) {
+                            player.setFoodLevel(Math.min(level + value.amount, value.max));
                         }
                     }
                 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index ed585483d..14567a9b4 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -33,8 +33,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
             this.done = classChunk.getField("done").getRealField();
             this.lit = classChunk.getField("lit").getRealField();
             this.s = classChunk.getField("s").getRealField();
-        } catch (Throwable ignore) {
-            ignore.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         Bukkit.getPluginManager().registerEvents(this, plugin);
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 9063e13a5..c8e5ef3ce 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -111,10 +111,82 @@ public class BukkitChunkManager extends ChunkManager {
         return chunks;
     }
 
-    @Override
-    public boolean copyRegion(com.github.intellectualsites.plotsquared.plot.object.Location pos1,
-        com.github.intellectualsites.plotsquared.plot.object.Location pos2,
-        com.github.intellectualsites.plotsquared.plot.object.Location newPos,
+    @Override public int[] countEntities(Plot plot) {
+        int[] existing = (int[]) plot.getMeta("EntityCount");
+        if (existing != null && (System.currentTimeMillis() - (long) plot.getMeta("EntityCountTime")
+            < 1000)) {
+            return existing;
+        }
+        PlotArea area = plot.getArea();
+        World world = BukkitUtil.getWorld(area.worldname);
+
+        Location bot = plot.getBottomAbs();
+        Location top = plot.getTopAbs();
+        int bx = bot.getX() >> 4;
+        int bz = bot.getZ() >> 4;
+
+        int tx = top.getX() >> 4;
+        int tz = top.getZ() >> 4;
+
+        int size = tx - bx << 4;
+
+        Set<Chunk> chunks = new HashSet<>();
+        for (int X = bx; X <= tx; X++) {
+            for (int Z = bz; Z <= tz; Z++) {
+                if (world.isChunkLoaded(X, Z)) {
+                    chunks.add(world.getChunkAt(X, Z));
+                }
+            }
+        }
+
+        boolean doWhole = false;
+        List<Entity> entities = null;
+        if (size > 200 && chunks.size() > 200) {
+            entities = world.getEntities();
+            if (entities.size() < 16 + size / 8) {
+                doWhole = true;
+            }
+        }
+
+        int[] count = new int[6];
+        if (doWhole) {
+            for (Entity entity : entities) {
+                org.bukkit.Location location = entity.getLocation();
+                Chunk chunk = location.getChunk();
+                if (chunks.contains(chunk)) {
+                    int X = chunk.getX();
+                    int Z = chunk.getZ();
+                    if (X > bx && X < tx && Z > bz && Z < tz) {
+                        count(count, entity);
+                    } else {
+                        Plot other = area.getPlot(BukkitUtil.getLocation(location));
+                        if (plot.equals(other)) {
+                            count(count, entity);
+                        }
+                    }
+                }
+            }
+        } else {
+            for (Chunk chunk : chunks) {
+                int X = chunk.getX();
+                int Z = chunk.getZ();
+                Entity[] entities1 = chunk.getEntities();
+                for (Entity entity : entities1) {
+                    if (X == bx || X == tx || Z == bz || Z == tz) {
+                        Plot other = area.getPlot(BukkitUtil.getLocation(entity));
+                        if (plot.equals(other)) {
+                            count(count, entity);
+                        }
+                    } else {
+                        count(count, entity);
+                    }
+                }
+            }
+        }
+        return count;
+    }
+
+    @Override public boolean copyRegion(Location pos1, Location pos2, Location newPos,
         final Runnable whenDone) {
         final int relX = newPos.getX() - pos1.getX();
         final int relZ = newPos.getZ() - pos1.getZ();
@@ -140,7 +212,7 @@ public class BukkitChunkManager extends ChunkManager {
                 map.saveEntitiesIn(chunk, region);
                 for (int x = bx & 15; x <= (tx & 15); x++) {
                     for (int z = bz & 15; z <= (tz & 15); z++) {
-                        map.saveBlocks(oldBukkitWorld, 256, cxx + x, czz + z, relX, relZ);
+                        map.saveBlocks(oldBukkitWorld, cxx + x, czz + z, relX, relZ);
                     }
                 }
             }
@@ -165,9 +237,7 @@ public class BukkitChunkManager extends ChunkManager {
         return true;
     }
 
-    @Override public boolean regenerateRegion(
-        final com.github.intellectualsites.plotsquared.plot.object.Location pos1,
-        final com.github.intellectualsites.plotsquared.plot.object.Location pos2,
+    @Override public boolean regenerateRegion(final Location pos1, final Location pos2,
         final boolean ignoreAugment, final Runnable whenDone) {
         final String world = pos1.getWorld();
 
@@ -275,8 +345,7 @@ public class BukkitChunkManager extends ChunkManager {
                     AugmentedUtils.bypass(ignoreAugment,
                         () -> setChunkInPlotArea(null, new RunnableVal<ScopedLocalBlockQueue>() {
                             @Override public void run(ScopedLocalBlockQueue value) {
-                                com.github.intellectualsites.plotsquared.plot.object.Location min =
-                                    value.getMin();
+                                Location min = value.getMin();
                                 int bx = min.getX();
                                 int bz = min.getZ();
                                 for (int x1 = 0; x1 < 16; x1++) {
@@ -317,9 +386,22 @@ public class BukkitChunkManager extends ChunkManager {
         return true;
     }
 
-    @Override
-    public void clearAllEntities(com.github.intellectualsites.plotsquared.plot.object.Location pos1,
-        com.github.intellectualsites.plotsquared.plot.object.Location pos2) {
+    @Override public boolean loadChunk(String world, ChunkLoc loc, boolean force) {
+        return BukkitUtil.getWorld(world).getChunkAt(loc.x, loc.z).load(force);
+    }
+
+    @SuppressWarnings("deprecation") @Override
+    public void unloadChunk(final String world, final ChunkLoc loc, final boolean save,
+        final boolean safe) {
+        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+            TaskManager
+                .runTask(() -> BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe));
+        } else {
+            BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe);
+        }
+    }
+
+    @Override public void clearAllEntities(Location pos1, Location pos2) {
         String world = pos1.getWorld();
         List<Entity> entities = BukkitUtil.getEntities(world);
         int bx = pos1.getX();
@@ -340,25 +422,7 @@ public class BukkitChunkManager extends ChunkManager {
         }
     }
 
-    @Override public boolean loadChunk(String world, ChunkLoc loc, boolean force) {
-        return BukkitUtil.getWorld(world).getChunkAt(loc.x, loc.z).load(force);
-    }
-
-    @SuppressWarnings("deprecation") @Override
-    public void unloadChunk(final String world, final ChunkLoc loc, final boolean save,
-        final boolean safe) {
-        if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-            TaskManager
-                .runTask(() -> BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe));
-        } else {
-            BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe);
-        }
-    }
-
-    @Override public void swap(com.github.intellectualsites.plotsquared.plot.object.Location bot1,
-        com.github.intellectualsites.plotsquared.plot.object.Location top1,
-        com.github.intellectualsites.plotsquared.plot.object.Location bot2,
-        com.github.intellectualsites.plotsquared.plot.object.Location top2,
+    @Override public void swap(Location bot1, Location top1, Location bot2, Location top2,
         final Runnable whenDone) {
         RegionWrapper region1 =
             new RegionWrapper(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ());
@@ -387,81 +451,6 @@ public class BukkitChunkManager extends ChunkManager {
         });
     }
 
-    @Override public int[] countEntities(Plot plot) {
-        int[] existing = (int[]) plot.getMeta("EntityCount");
-        if (existing != null && (System.currentTimeMillis() - (long) plot.getMeta("EntityCountTime")
-            < 1000)) {
-            return existing;
-        }
-        PlotArea area = plot.getArea();
-        World world = BukkitUtil.getWorld(area.worldname);
-
-        com.github.intellectualsites.plotsquared.plot.object.Location bot = plot.getBottomAbs();
-        com.github.intellectualsites.plotsquared.plot.object.Location top = plot.getTopAbs();
-        int bx = bot.getX() >> 4;
-        int bz = bot.getZ() >> 4;
-
-        int tx = top.getX() >> 4;
-        int tz = top.getZ() >> 4;
-
-        int size = tx - bx << 4;
-
-        Set<Chunk> chunks = new HashSet<>();
-        for (int X = bx; X <= tx; X++) {
-            for (int Z = bz; Z <= tz; Z++) {
-                if (world.isChunkLoaded(X, Z)) {
-                    chunks.add(world.getChunkAt(X, Z));
-                }
-            }
-        }
-
-        boolean doWhole = false;
-        List<Entity> entities = null;
-        if (size > 200 && chunks.size() > 200) {
-            entities = world.getEntities();
-            if (entities.size() < 16 + size / 8) {
-                doWhole = true;
-            }
-        }
-
-        int[] count = new int[6];
-        if (doWhole) {
-            for (Entity entity : entities) {
-                org.bukkit.Location location = entity.getLocation();
-                Chunk chunk = location.getChunk();
-                if (chunks.contains(chunk)) {
-                    int X = chunk.getX();
-                    int Z = chunk.getZ();
-                    if (X > bx && X < tx && Z > bz && Z < tz) {
-                        count(count, entity);
-                    } else {
-                        Plot other = area.getPlot(BukkitUtil.getLocation(location));
-                        if (plot.equals(other)) {
-                            count(count, entity);
-                        }
-                    }
-                }
-            }
-        } else {
-            for (Chunk chunk : chunks) {
-                int X = chunk.getX();
-                int Z = chunk.getZ();
-                Entity[] entities1 = chunk.getEntities();
-                for (Entity entity : entities1) {
-                    if (X == bx || X == tx || Z == bz || Z == tz) {
-                        Plot other = area.getPlot(BukkitUtil.getLocation(entity));
-                        if (plot.equals(other)) {
-                            count(count, entity);
-                        }
-                    } else {
-                        count(count, entity);
-                    }
-                }
-            }
-        }
-        return count;
-    }
-
     private void count(int[] count, Entity entity) {
         switch (entity.getType()) {
             case PLAYER:
@@ -595,6 +584,7 @@ public class BukkitChunkManager extends ChunkManager {
         count[0]++;
     }
 
+
     public static class ContentMap {
 
         final Set<EntityWrapper> entities;
@@ -629,8 +619,7 @@ public class BukkitChunkManager extends ChunkManager {
 
         public void saveEntitiesOut(Chunk chunk, RegionWrapper region) {
             for (Entity entity : chunk.getEntities()) {
-                com.github.intellectualsites.plotsquared.plot.object.Location loc =
-                    BukkitUtil.getLocation(entity);
+                Location loc = BukkitUtil.getLocation(entity);
                 int x = loc.getX();
                 int z = loc.getZ();
                 if (isIn(region, x, z)) {
@@ -648,8 +637,7 @@ public class BukkitChunkManager extends ChunkManager {
         public void saveEntitiesIn(Chunk chunk, RegionWrapper region, int offsetX, int offsetZ,
             boolean delete) {
             for (Entity entity : chunk.getEntities()) {
-                com.github.intellectualsites.plotsquared.plot.object.Location loc =
-                    BukkitUtil.getLocation(entity);
+                Location loc = BukkitUtil.getLocation(entity);
                 int x = loc.getX();
                 int z = loc.getZ();
                 if (!isIn(region, x, z)) {
@@ -683,6 +671,7 @@ public class BukkitChunkManager extends ChunkManager {
             this.entities.clear();
         }
 
+        //todo optimize maxY
         public void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX,
             int offsetZ) {
             maxY = Math.min(255, maxY);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index 77518690d..e7e7113db 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -192,8 +192,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
             for (int x = 0; x < lc.biomes.length; x++) {
                 String[] biomes2 = lc.biomes[x];
                 if (biomes2 != null) {
-                    for (int y = 0; y < biomes2.length; y++) {
-                        String biomeStr = biomes2[y];
+                    for (String biomeStr : biomes2) {
                         if (biomeStr != null) {
                             if (last == null || !StringMan.isEqual(last, biomeStr)) {
                                 biome = Biome.valueOf(biomeStr.toUpperCase());
@@ -247,8 +246,8 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
         if (disableResult != null) {
             try {
                 fieldNeighbors.set(disableResult[0], disableResult[1]);
-            } catch (Throwable ignore) {
-                ignore.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
index d75084407..4e533fe61 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
@@ -69,7 +69,15 @@ import java.util.*;
         if (this.engine != null) {
             return;
         }
-        this.engine = new ScriptEngineManager(null).getEngineByName("nashorn");
+        //create script engine manager
+        ScriptEngineManager scriptEngineManager = new ScriptEngineManager();
+        //create nashorn engine
+        this.engine = scriptEngineManager.getEngineByName("nashorn");
+        try {
+            engine.eval("print('PlotSquared Scripting Test');");
+        } catch (ScriptException e) {
+            e.printStackTrace();
+        }
         if (this.engine == null) {
             this.engine = new ScriptEngineManager(null).getEngineByName("JavaScript");
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
index 814d6b9cc..9956b6f2e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
@@ -11,8 +11,8 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 
 @CommandDeclaration(usage = "/plot move <X;Z>", command = "move", description = "Move a plot",
-    aliases = {"debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING,
-    requiredType = RequiredType.NONE) public class Move extends SubCommand {
+    aliases = {"debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER)
+public class Move extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         Location loc = player.getLocation();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
index 0223245fc..0fa721dff 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
@@ -9,8 +9,8 @@ import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
-@CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players",
-    usage = "/plot near", category = CommandCategory.INFO) public class Near extends Command {
+@CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players", usage = "/plot near", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
+public class Near extends Command {
     public Near() {
         super(MainCommand.getInstance(), true);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
index e9b0da288..291657454 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
@@ -107,8 +107,8 @@ import java.util.Set;
         MainUtil.sendMessage(null, " - TIME ESTIMATE: 12 Parsecs");
         TaskManager.objectTask(plots, new RunnableVal<Plot>() {
             @Override public void run(Plot plot) {
-                Location pos1 = plot.getBottom();
-                Location pos2 = plot.getTop();
+                Location pos1 = plot.getCorners()[0];
+                Location pos2 = plot.getCorners()[1];
                 int ccx1 = pos1.getX() >> 9;
                 int ccz1 = pos1.getZ() >> 9;
                 int ccx2 = pos2.getX() >> 9;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index fffe38966..bd465a12f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -44,7 +44,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         return false;
     }
 
-    @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
+    @Override public boolean unClaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
         ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
         setWallFilling(dpw, plot.getId(), dpw.WALL_FILLING);
         setWall(dpw, plot.getId(), dpw.WALL_BLOCK);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
index d787d46e3..2e28594df 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java
@@ -57,7 +57,11 @@ public class Location implements Cloneable, Comparable<Location> {
     }
 
     @Override public Location clone() {
-        return new Location(this.world, this.x, this.y, this.z, this.yaw, this.pitch);
+        try {
+            return (Location) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new AssertionError(); //can't happen
+        }
     }
 
     public PlotArea getPlotArea() {
@@ -65,7 +69,7 @@ public class Location implements Cloneable, Comparable<Location> {
     }
 
     public Plot getOwnedPlot() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        PlotArea area = getPlotArea();
         if (area != null) {
             return area.getOwnedPlot(this);
         } else {
@@ -74,7 +78,7 @@ public class Location implements Cloneable, Comparable<Location> {
     }
 
     public Plot getOwnedPlotAbs() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        PlotArea area = getPlotArea();
         if (area != null) {
             return area.getOwnedPlotAbs(this);
         } else {
@@ -83,16 +87,16 @@ public class Location implements Cloneable, Comparable<Location> {
     }
 
     public boolean isPlotArea() {
-        return PlotSquared.get().getPlotAreaAbs(this) != null;
+        return getPlotArea() != null;
     }
 
     public boolean isPlotRoad() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        PlotArea area = getPlotArea();
         return area != null && area.getPlotAbs(this) == null;
     }
 
     public boolean isUnownedPlotArea() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        PlotArea area = getPlotArea();
         return area != null && area.getOwnedPlotAbs(this) == null;
     }
 
@@ -106,7 +110,7 @@ public class Location implements Cloneable, Comparable<Location> {
     }
 
     public Plot getPlotAbs() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        PlotArea area = getPlotArea();
         if (area != null) {
             return area.getPlotAbs(this);
         } else {
@@ -115,7 +119,7 @@ public class Location implements Cloneable, Comparable<Location> {
     }
 
     public Plot getPlot() {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(this);
+        PlotArea area = getPlotArea();
         if (area != null) {
             return area.getPlot(this);
         } else {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 9733918f3..b6971b44f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -226,7 +226,7 @@ public class Plot {
      * @see PlotPlayer#getCurrentPlot() if a player is expected here.
      */
     public static Plot getPlot(Location location) {
-        PlotArea pa = PlotSquared.get().getPlotAreaAbs(location);
+        PlotArea pa = location.getPlotArea();
         if (pa != null) {
             return pa.getPlot(location);
         }
@@ -457,7 +457,7 @@ public class Plot {
      * Gets or create plot settings.
      *
      * @return PlotSettings
-     * @deprecated use equivalent plot method;
+     * @deprecated use equivalent plot method; please file github issue if one does not exist.
      */
     @Deprecated public PlotSettings getSettings() {
         if (this.settings == null) {
@@ -837,7 +837,7 @@ public class Plot {
                     };
                     for (Plot current : plots) {
                         if (isDelete || current.owner == null) {
-                            manager.unclaimPlot(Plot.this.area, current, null);
+                            manager.unClaimPlot(Plot.this.area, current, null);
                         } else {
                             manager.claimPlot(Plot.this.area, current);
                         }
@@ -1567,13 +1567,19 @@ public class Plot {
      */
     public boolean swapData(Plot plot, Runnable whenDone) {
         if (this.owner == null) {
-            if (plot != null && plot.hasOwner()) {
+            if (plot == null) {
+                return false;
+            }
+            if (plot.hasOwner()) {
                 plot.moveData(this, whenDone);
                 return true;
             }
             return false;
         }
-        if (plot == null || plot.owner == null) {
+        if (plot == null) {
+            this.moveData(plot, whenDone);
+            return true;
+        } else if (plot.owner == null) {
             this.moveData(plot, whenDone);
             return true;
         }
@@ -2900,7 +2906,7 @@ public class Plot {
                         getManager().claimPlot(current.getArea(), current);
                         Plot originPlot = originArea.getPlotAbs(
                             new PlotId(current.id.x - offset.x, current.id.y - offset.y));
-                        originPlot.getManager().unclaimPlot(originArea, originPlot, null);
+                        originPlot.getManager().unClaimPlot(originArea, originPlot, null);
                     }
                     plot.setSign();
                     TaskManager.runTask(whenDone);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
index 0e99ce00a..7dc4185c8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
@@ -31,7 +31,7 @@ public abstract class PlotManager {
 
     public abstract boolean claimPlot(PlotArea plotArea, Plot plot);
 
-    public abstract boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
+    public abstract boolean unClaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
 
     public abstract Location getSignLoc(PlotArea plotArea, Plot plot);
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
index 7fcb07907..706d1ae06 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
@@ -83,10 +83,7 @@ public class StringPlotBlock extends PlotBlock {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         StringPlotBlock other = (StringPlotBlock) obj;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index b7b4a1f8a..2b389ca9b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -46,7 +46,7 @@ public class SinglePlotManager extends PlotManager {
         return true;
     }
 
-    @Override public boolean unclaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
+    @Override public boolean unClaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
         if (whenDone != null) {
             whenDone.run();
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index 92e3bdcb3..4e1d4fd87 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -76,11 +76,7 @@ public abstract class EventUtil {
         }
         final Plot plot = player.getCurrentPlot();
         if (Settings.Teleport.ON_LOGIN && plot != null) {
-            TaskManager.runTask(new Runnable() {
-                @Override public void run() {
-                    plot.teleportPlayer(player);
-                }
-            });
+            TaskManager.runTask(() -> plot.teleportPlayer(player));
             MainUtil.sendMessage(player,
                 Captions.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
                     .getId().y + ")");
@@ -97,19 +93,13 @@ public abstract class EventUtil {
 
     public boolean checkPlayerBlockEvent(PlotPlayer player, PlayerBlockEventType type,
         Location location, LazyBlock block, boolean notifyPerms) {
-        PlotArea area = PlotSquared.get().getPlotAreaAbs(location);
-        Plot plot;
-        if (area != null) {
-            plot = area.getPlot(location);
-        } else {
-            plot = null;
-        }
-        if (plot == null) {
-            if (area == null) {
+        PlotArea area = location.getPlotArea();
+        assert area != null;
+        Plot plot = area.getPlot(location);
+        if (plot != null) {
+            if (plot.isAdded(player.getUUID())) {
                 return true;
             }
-        } else if (plot.isAdded(player.getUUID())) {
-            return true;
         }
         switch (type) {
             case TELEPORT_OBJECT:
@@ -400,8 +390,6 @@ public abstract class EventUtil {
                 }
                 return true;
             }
-            case PLACE_HANGING: // Handled elsewhere
-                return true;
             case PLACE_MISC: {
                 if (plot == null) {
                     return Permissions
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
index cd3a4a81d..0c797c706 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/DelegateLocalBlockQueue.java
@@ -70,8 +70,8 @@ public class DelegateLocalBlockQueue extends LocalBlockQueue {
         return parent.getBlock(x, y, z);
     }
 
-    @Override public boolean setBiome(int x, int y, String biome) {
-        return parent.setBiome(x, y, biome);
+    @Override public boolean setBiome(int x, int z, String biome) {
+        return parent.setBiome(x, z, biome);
     }
 
     @Override public String getWorld() {
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java
new file mode 100644
index 000000000..9f83151a5
--- /dev/null
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java
@@ -0,0 +1,21 @@
+package com.github.intellectualsites.plotsquared.plot.object;
+
+import org.junit.Test;
+
+import java.util.logging.Logger;
+
+public class LocationTest {
+
+    private static final Logger logger = Logger.getLogger(LocationTest.class.getName());
+
+    @Test public void cloning() {
+        String world = "plotworld";
+        Location location1 = new Location(world, 0, 0, 0);
+        logger.info(location1.toString());
+        Location clone = location1.clone();
+        world = "normal";
+        logger.info(clone.toString());
+        location1.getBlockVector3()
+
+    }
+}

From 3956adf2918dd2a89bc7146888261392e2492ca2 Mon Sep 17 00:00:00 2001
From: Matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 15 Mar 2019 01:00:55 -0400
Subject: [PATCH 071/210] Update ISSUE_TEMPLATE.md

Added a warning about future legacy version support.
---
 .github/ISSUE_TEMPLATE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5b2fa30d2..d8d94f840 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,4 @@
+__*NOTICE: Bukkit/Spigot versions 1.7.10 to 1.12.2 are considered legacy and will receive limited support. Please consider upgrading to 1.13 for future support.*__
 # Bug report template 
 <!--- In order to create a valid issue report you have to follow this template. -->
 <!--- Incomplete reports might be marked as invalid. -->

From 61cb288382ddd067646c2e79df854b969d9a3699 Mon Sep 17 00:00:00 2001
From: matt <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 15 Mar 2019 13:39:51 -0400
Subject: [PATCH 072/210] oops sorry.

Signed-off-by: matt <4009945+MattBDev@users.noreply.github.com>
---
 .../plotsquared/bukkit/util/BukkitChunkManager.java             | 2 +-
 .../intellectualsites/plotsquared/plot/object/LocationTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index c8e5ef3ce..76c9381fb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -212,7 +212,7 @@ public class BukkitChunkManager extends ChunkManager {
                 map.saveEntitiesIn(chunk, region);
                 for (int x = bx & 15; x <= (tx & 15); x++) {
                     for (int z = bz & 15; z <= (tz & 15); z++) {
-                        map.saveBlocks(oldBukkitWorld, cxx + x, czz + z, relX, relZ);
+                        map.saveBlocks(oldBukkitWorld, 256, cxx + x, czz + z, relX, relZ);
                     }
                 }
             }
diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java
index 9f83151a5..a421137c0 100644
--- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java
+++ b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java
@@ -15,7 +15,7 @@ public class LocationTest {
         Location clone = location1.clone();
         world = "normal";
         logger.info(clone.toString());
-        location1.getBlockVector3()
+        //location1.getBlockVector3();
 
     }
 }

From a17cb735b7e1fd72f042268c367437a9633546b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?=
 <Sauilitired@users.noreply.github.com>
Date: Sun, 17 Mar 2019 12:30:14 +0100
Subject: [PATCH 073/210] Update README.md

---
 README.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 00fc1dc34..b61ee8f10 100644
--- a/README.md
+++ b/README.md
@@ -15,16 +15,15 @@ is to provide a lag-free and smooth experience.
 ## Links
 
 * [Download](https://github.com/IntellectualSites/PlotSquared/releases/tag/dev)
-* [Jenkins](https://ci.athion.net/job/PlotSquared/)
+* [[Jenkins (Dev Builds)](https://ci.athion.net/job/PlotSquared-Breaking/)][[Jenkins (Releases)](https://ci.athion.net/job/PlotSquared-Releases/)]
 * [Spigot Page](https://www.spigotmc.org/resources/plotsquared.1177/)
 * [Discord](https://discord.gg/ngZCzbU)
 * [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki)
 
 ### Developer Resources
-* [JavaDocs](http://empcraft.com/plotsquared/doc/)
-* [[Git Mirror](https://incendo.org/git/sauilitired/PlotSquared/)]
-* [[Build Server](http://ci.athion.net/job/PlotSquared/)] [[Alternative](https://incendo.org/ci/job/PlotSquared/)]
-* [[Maven Repo](http://ci.athion.net/job/PlotSquared/ws/mvn/)] [[Alternative](https://incendo.org/ci/job/PlotSquared/ws/mvn/)]
+* [[JavaDoc](https://incendo.org/javadoc/plotsquared/core/index.html)][[[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
+* [[Build Server](http://ci.athion.net/job/PlotSquared/)]
+* [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared/ws/mvn/)] [[Alternative (Incendo)](https://github.com/IntellectualSites/PlotSquared/wiki/incendo-mvn)]
 * [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/Developer-documentation-(WIP))
 
 # Building
@@ -64,4 +63,4 @@ Suggestions are welcome! We have a separate issue tracker for suggestions, that
 * [BiomeGenerator](https://www.spigotmc.org/resources/biomegenerator.1663/)
 * [PlotSquaredMG](https://www.spigotmc.org/resources/plotsquaredmg.8025/)
 * [BasicPlots](https://www.spigotmc.org/resources/basicplots.6901/)
-* [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/)
\ No newline at end of file
+* [HoloPlots](https://www.spigotmc.org/resources/holoplots.4880/)

From c44d180352df607b8f2be72072e2e5919d453334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?=
 <Sauilitired@users.noreply.github.com>
Date: Sun, 17 Mar 2019 12:31:23 +0100
Subject: [PATCH 074/210] Update README.md

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b61ee8f10..aeaf24251 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,8 @@ is to provide a lag-free and smooth experience.
 * [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki)
 
 ### Developer Resources
-* [[JavaDoc](https://incendo.org/javadoc/plotsquared/core/index.html)][[[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
-* [[Build Server](http://ci.athion.net/job/PlotSquared/)]
-* [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared/ws/mvn/)] [[Alternative (Incendo)](https://github.com/IntellectualSites/PlotSquared/wiki/incendo-mvn)]
+* [[JavaDoc (Core)](https://incendo.org/javadoc/plotsquared/core/index.html)][[JavaDoc (Bukkit)](https://incendo.org/javadoc/plotsquared/core/index.html)][[[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
+* [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/)] [[Alternative (Incendo)](https://github.com/IntellectualSites/PlotSquared/wiki/incendo-mvn)]
 * [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/Developer-documentation-(WIP))
 
 # Building

From f863dfee42f7ddeb224c047476c4ba480b194899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?=
 <Sauilitired@users.noreply.github.com>
Date: Sun, 17 Mar 2019 12:32:09 +0100
Subject: [PATCH 075/210] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index aeaf24251..8ca29317c 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@ is to provide a lag-free and smooth experience.
 ## Links
 
 * [Download](https://github.com/IntellectualSites/PlotSquared/releases/tag/dev)
-* [[Jenkins (Dev Builds)](https://ci.athion.net/job/PlotSquared-Breaking/)][[Jenkins (Releases)](https://ci.athion.net/job/PlotSquared-Releases/)]
+* [[Jenkins (Dev Builds)](https://ci.athion.net/job/PlotSquared-Breaking/)] [[Jenkins (Releases)](https://ci.athion.net/job/PlotSquared-Releases/)]
 * [Spigot Page](https://www.spigotmc.org/resources/plotsquared.1177/)
 * [Discord](https://discord.gg/ngZCzbU)
 * [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki)
 
 ### Developer Resources
-* [[JavaDoc (Core)](https://incendo.org/javadoc/plotsquared/core/index.html)][[JavaDoc (Bukkit)](https://incendo.org/javadoc/plotsquared/core/index.html)][[[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
+* [[JavaDoc (Core)](https://incendo.org/javadoc/plotsquared/core/index.html)] [[JavaDoc (Bukkit)](https://incendo.org/javadoc/plotsquared/core/index.html)] [[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
 * [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/)] [[Alternative (Incendo)](https://github.com/IntellectualSites/PlotSquared/wiki/incendo-mvn)]
 * [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/Developer-documentation-(WIP))
 

From 832d60ce87224922ccb960325b9b7c0af09a89e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20S=C3=B6derberg?=
 <Sauilitired@users.noreply.github.com>
Date: Sun, 17 Mar 2019 12:34:33 +0100
Subject: [PATCH 076/210] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8ca29317c..207497290 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@ flags. Such as: weather, time, game modes, pvp status.
 Whilst we provide a whole load of unique features, the biggest focus
 is to provide a lag-free and smooth experience.
 
+***NOTE:** This is the branch for the 1.13+ version of PlotSquared. Switch to the master branch for legacy PlotSquared.*
+
 ## Links
 
 * [Download](https://github.com/IntellectualSites/PlotSquared/releases/tag/dev)

From 0b77b863ba70d93282402d003f3a281896610065 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 18 Mar 2019 19:49:22 +0100
Subject: [PATCH 077/210] Update notifications.

---
 Bukkit/build.gradle                           |   6 +
 .../plotsquared/bukkit/BukkitMain.java        |  27 ++++
 .../bukkit/listeners/PlayerEvents.java        |  23 +++
 Core/build.gradle                             |  10 ++
 .../plotsquared/plot/PlotSquared.java         |  19 +++
 .../plotsquared/plot/config/Captions.java     |   6 +-
 .../plotsquared/plot/util/UpdateUtility.java  | 148 ++++++++++++++++++
 Core/src/main/resources/updater.properties    |   8 +
 build.gradle                                  |   1 +
 9 files changed, 245 insertions(+), 3 deletions(-)
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java
 create mode 100644 Core/src/main/resources/updater.properties

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 3bc057a45..dfb4b7055 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -37,6 +37,12 @@ shadowJar {
     dependencies {
         include(dependency(':Core'))
         include(dependency('org.bstats:bstats-bukkit:1.4'))
+        // update notification stuff
+        include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'))
+        include(dependency('com.squareup.retrofit2:retrofit:2.4.0'))
+        include(dependency('com.squareup.okhttp3:okhttp:3.14.0'))
+        include(dependency('com.squareup.okio:okio:2.2.2'))
+        include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.21'))
     }
     // relocate('org.mcstats', 'com.plotsquared.stats')
     archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 5036afae0..352326a43 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -137,6 +137,33 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         }
 
         new PlotSquared(this, "Bukkit");
+
+        // Check for updates
+        if (PlotSquared.get().getUpdateUtility() != null) {
+            final UpdateUtility updateUtility = PlotSquared.get().getUpdateUtility();
+            updateUtility.checkForUpdate(this.getPluginVersionString(), ((updateDescription, throwable) -> {
+                Bukkit.getScheduler().runTask(BukkitMain.this, () -> {
+                    getLogger().info("-------- PlotSquared Update Check --------");
+                    if (throwable != null) {
+                        getLogger().severe(String.format("Could not check for update. Reason: %s",
+                            throwable.getMessage()));
+                    } else {
+                        if (updateDescription == null) {
+                            getLogger().info("You appear to be running the latest version of PlotSquared. Congratulations!");
+                        } else {
+                            getLogger().info("There appears to be a PlotSquared update available!");
+                            getLogger().info(String.format("You are running version %s,"
+                                + " the newest available version is %s", getPluginVersionString(), updateDescription.getVersion()));
+                            getLogger().info(String.format("Update URL: %s", updateDescription.getUrl()));
+                        }
+                    }
+                    getLogger().info("-------- PlotSquared Update Check --------");
+                });
+            }));
+        } else {
+            getLogger().warning("Update checking disabled. Skipping.");
+        }
+
         if (Settings.Enabled_Components.METRICS) {
             this.startMetrics();
         } else {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 09c9363b8..86315262a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -631,6 +631,29 @@ import java.util.regex.Pattern;
             }
             EventUtil.manager.doJoinTask(pp);
         }, 20);
+
+        if (pp.hasPermission(Captions.PERMISSION_ADMIN_UPDATE_NOTIFICATION.s()) &&
+            PlotSquared.get().getUpdateUtility() != null) {
+                final UpdateUtility updateUtility = PlotSquared.get().getUpdateUtility();
+                final BukkitMain bukkitMain = BukkitMain.getPlugin(BukkitMain.class);
+                updateUtility.checkForUpdate(bukkitMain.getPluginVersionString(), ((updateDescription, throwable) -> {
+                    if (throwable != null) {
+                        bukkitMain.getLogger().severe(String.format("Could not check for update. Reason: %s",
+                            throwable.getMessage()));
+                    } else {
+                        if (updateDescription != null) {
+                            new PlotMessage("-------- ").color("$2").text("PlotSquared Update Notification").color("$1").text(" --------").color("$2")
+                                .send(pp);
+                            new PlotMessage("There appears to be a PlotSquared update available!").color("$1").send(pp);
+                            new PlotMessage(String.format("You are running version %s,"
+                                + " the newest available version is %s", bukkitMain.getPluginVersionString(), updateDescription.getVersion())).color("$1").send(pp);
+                            new PlotMessage("Update URL").color("$1").text(": ").color("$2").text(updateDescription.getUrl()).tooltip("Download update").send(pp);
+                            new PlotMessage("-------- ").color("$2").text("PlotSquared Update Notification").color("$1").text(" --------").color("$2")
+                                .send(pp);
+                        }
+                    }
+                }));
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
diff --git a/Core/build.gradle b/Core/build.gradle
index 3a8864cfa..eadb2e153 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -1,9 +1,19 @@
+repositories {
+    maven { url 'https://jitpack.io' }
+}
+
 dependencies {
     testCompile 'junit:junit:4.12'
     compile 'org.yaml:snakeyaml:1.23'
     compile 'com.google.code.gson:gson:2.8.5'
     compileOnly 'org.projectlombok:lombok:1.18.4'
+
+    compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
+    compile 'com.squareup.okhttp3:okhttp:3.14.0'
+    compile 'com.squareup.okio:okio:2.2.2'
+    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
 }
+
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 2e76f6516..e53b36042 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -76,6 +76,7 @@ import java.util.zip.ZipInputStream;
     @Setter @Getter private ILogger logger;
     // Platform / Version / Update URL
     private PlotVersion version;
+    @Nullable @Getter private UpdateUtility updateUtility;
     // Files and configuration
     @Getter private File jarFile = null; // This file
     private File storageFile;
@@ -1610,6 +1611,24 @@ import java.util.zip.ZipInputStream;
             }
         }
         Settings.load(configFile);
+        try {
+            copyFile("updater.properties", "config");
+            try (BufferedReader bufferedReader =
+                new BufferedReader(new InputStreamReader(new FileInputStream(new File(new File(this.IMP.getDirectory(),
+                    "config"), "updater.properties"))))) {
+                final Properties properties = new Properties();
+                properties.load(bufferedReader);
+                final boolean enabled = Boolean.valueOf(properties.getOrDefault("enabled", true).toString());
+                if (enabled) {
+                    this.updateUtility = new UpdateUtility(properties.getProperty("path"),
+                        properties.getProperty("job"), properties.getProperty("artifact"));
+                }
+            } catch (final IOException throwable) {
+                throwable.printStackTrace();
+            }
+        } catch (final Throwable throwable) {
+            throwable.printStackTrace();
+        }
         try (InputStream stream = getClass().getResourceAsStream("/plugin.properties");
             BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
             //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index c735ccd08..9302ed743 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -41,7 +41,8 @@ public enum Captions {
         "plots.admin.interact.blockedcommands", "static.permissions"), PERMISSION_WORLDEDIT_BYPASS(
         "plots.worldedit.bypass", "static.permissions"), PERMISSION_PLOT_TOGGLE_TITLES(
         "plots.toggle.titles", "static.permissions"), PERMISSION_PLOT_TOGGLE_CHAT(
-        "plots.toggle.chat", "static.permissions"), PERMISSION_ADMIN_EXIT_DENIED(
+        "plots.toggle.chat", "static.permissions"), PERMISSION_ADMIN_UPDATE_NOTIFICATION(
+        "plots.admin.update.notify", "static.permissions"), PERMISSION_ADMIN_EXIT_DENIED(
         "plots.admin.exit.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_DENIED(
         "plots.admin.entry.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_FORCEFIELD(
         "plots.admin.entry.forcefield", "static.permissions"), PERMISSION_COMMANDS_CHAT(
@@ -1066,5 +1067,4 @@ public enum Captions {
         } else {
             caller.sendMessage(msg);
         }
-    }
-}
+    }}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java
new file mode 100644
index 000000000..29d2126f6
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java
@@ -0,0 +1,148 @@
+package com.github.intellectualsites.plotsquared.plot.util;
+
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.incendo.jenkins.Jenkins;
+import org.incendo.jenkins.objects.ArtifactDescription;
+import org.incendo.jenkins.objects.BuildInfo;
+
+import java.util.Collection;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class UpdateUtility {
+
+    private final String jobName;
+    private final Pattern artifactPattern;
+
+    private final Jenkins jenkins;
+
+    public UpdateUtility(@NonNull final String jenkinsPath, @NonNull final String jobName,
+        @NonNull final String artifactPattern) {
+        this.jobName = jobName;
+        this.artifactPattern = Pattern.compile(artifactPattern);
+        this.jenkins = Jenkins.newBuilder().withPath(jenkinsPath).build();
+    }
+
+    private void fetchLatestBuildInfo(final BiConsumer<BuildInfo, Throwable> whenDone) {
+        this.jenkins.getJobInfo(jobName).whenCompleteAsync((jobInfo, exception) -> {
+           if (jobInfo == null && exception != null) {
+               whenDone.accept(null, exception);
+           } else if (jobInfo != null) {
+               jobInfo.getLastSuccessfulBuild().getBuildInfo()
+                   .whenComplete(whenDone);
+           } else {
+               whenDone.accept(null, new IllegalStateException(
+                   String.format("Could not fetch job info for job %s", this.jobName)));
+           }
+        });
+    }
+
+    private void getMatchingArtifact(final BiConsumer<ArtifactDescription, Throwable> whenDone) {
+        this.fetchLatestBuildInfo((buildInfo, throwable) -> {
+            if (throwable != null) {
+                whenDone.accept(null, throwable);
+            } else {
+                final Collection<ArtifactDescription> artifacts = buildInfo.getArtifacts();
+                final Optional<ArtifactDescription> artifact = artifacts.stream().filter(artifactDescription -> {
+                    final String name = artifactDescription.getFileName();
+                    final Matcher matcher = artifactPattern.matcher(name);
+                    return matcher.matches();
+                }).findAny();
+                if (artifact.isPresent()) {
+                    final ArtifactDescription artifactDescription = artifact.get();
+                    whenDone.accept(artifactDescription, null);
+                } else {
+                    whenDone.accept(null,
+                        new NullPointerException(String.format("Could not find any matching artifacts in build %d", buildInfo.getId())));
+                }
+            }
+        });
+    }
+
+    public void checkForUpdate(final String currentVersion,
+        final BiConsumer<UpdateDescription, Throwable> whenDone) {
+        this.getMatchingArtifact(((artifactDescription, throwable) -> {
+            if (throwable != null) {
+                whenDone.accept(null, new RuntimeException(
+                    String.format("Failed to read artifact description: %s", throwable.getMessage()), throwable));
+            } else {
+                try {
+                    final String version = this.isNewer(currentVersion, artifactDescription);
+                    if (version != null) {
+                        whenDone.accept(new UpdateDescription(version, artifactDescription.getUrl()),
+                            null);
+                    } else {
+                        whenDone.accept(null, null);
+                    }
+                } catch (final Throwable exception) {
+                    whenDone.accept(null,
+                        new RuntimeException(String.format("Failed to compare versions: %s",
+                            exception.getMessage()), exception));
+                }
+            }
+        }));
+    }
+
+    private String isNewer(@NonNull final String currentVersion, @NonNull final ArtifactDescription artifact) {
+        final Matcher matcher = artifactPattern.matcher(artifact.getFileName());
+        if (!matcher.matches()) {
+            throw new IllegalArgumentException("Artifact file name does not match artifact pattern");
+        }
+        final String version = matcher.group("version");
+        if (version == null) {
+            throw new IllegalArgumentException("Given artifact does not contain version");
+        }
+        return compareVersions(currentVersion, version) < 0 ? version : null;
+    }
+
+    /**
+     * Compare two given versions in the format $major.$minor
+     * @param oldVersion current version
+     * @param newVersion other version
+     * @return -1 if the current version is older, 1 is the versions are the same,
+     *         and 1 if the current version is newer
+     */
+    private int compareVersions(@NonNull final String oldVersion, @NonNull final String newVersion) {
+        // Versions look this this: major.minor :P
+        final int[] oldNums = splitVersion(oldVersion);
+        final int[] newNums = splitVersion(newVersion);
+
+        if (oldNums == null || newNums == null) {
+            throw new IllegalArgumentException("Could not extract version data");
+        }
+
+        // Compare major version
+        if (oldNums[0] != -1 && newNums[0] != -1) {
+            if (oldNums[0] < newNums[0]) {
+                return -1;
+            } else if (oldNums[0] > newNums[0]) {
+                return 1;
+            }
+        }
+
+        // Compare minor versions
+        return Integer.compare(oldNums[1], newNums[1]);
+    }
+
+    private int[] splitVersion(@NonNull final String versionString) {
+        final String[] parts = versionString.split("\\.");
+        switch (parts.length) {
+            case 0: return new int[] {-1, -1};
+            case 1: return new int[] {-1, Integer.parseInt(parts[0])};
+            case 2: return new int[] {Integer.parseInt(parts[0]), Integer.parseInt(parts[1])};
+            default: return null;
+        }
+    }
+
+    @Getter
+    @RequiredArgsConstructor
+    public static class UpdateDescription {
+        private final String version;
+        private final String url;
+    }
+
+}
diff --git a/Core/src/main/resources/updater.properties b/Core/src/main/resources/updater.properties
new file mode 100644
index 000000000..19ef0aed6
--- /dev/null
+++ b/Core/src/main/resources/updater.properties
@@ -0,0 +1,8 @@
+# Whether update notifications are enabled
+enabled=true
+# CI path
+path=https://ci.athion.net/
+# Job name
+job=PlotSquared-Releases
+# Artifact pattern
+artifact=^PlotSquared-Bukkit-(?<version>[0-9.]+).jar$
diff --git a/build.gradle b/build.gradle
index 39fb59087..1df3aaa8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,5 +76,6 @@ subprojects {
         mavenCentral()
         maven { url "http://maven.sk89q.com/repo/" }
         maven { url "http://repo.maven.apache.org/maven2" }
+        maven { url 'https://jitpack.io' }
     }
 }

From 3a761b3b5fbc62352e4bc038c445efbfc1ee24bf Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 20 Mar 2019 12:20:09 +0000
Subject: [PATCH 078/210] Update offset to match CI

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1df3aaa8e..8e2b970de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2043;  // Offset to match CI
+    index = -2042;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From c9f38430c6fb2016344ce1c6bf59c3673f4dc339 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 20 Mar 2019 17:17:45 +0000
Subject: [PATCH 079/210] Clean and fix up the fromAny method in Legacy
 Mappings it never checked for an id data pair or singular id (5, 5:2 etc)
 which is sort of the whole point. Fixes #2296

---
 .../bukkit/util/BukkitLegacyMappings.java     | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index abe7ab793..f0f6b24c8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -663,7 +663,6 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(2266, "record_11", "music_disc_11"),
             new LegacyBlock(2267, "record_12", "music_disc_wait")};
 
-    // private static final Map<Integer, PlotBlock> LEGACY_ID_TO_STRING_PLOT_BLOCK = new HashMap<>();
     private static final Map<IdDataPair, PlotBlock> LEGACY_ID_AND_DATA_TO_STRING_PLOT_BLOCK =
         new HashMap<>();
     private static final Map<String, PlotBlock> NEW_STRING_TO_LEGACY_PLOT_BLOCK = new HashMap<>();
@@ -686,13 +685,6 @@ public final class BukkitLegacyMappings extends LegacyMappings {
 
     private void addAll(@NonNull final Collection<LegacyBlock> blocks) {
         for (final LegacyBlock legacyBlock : blocks) {
-            // LEGACY_ID_TO_STRING_PLOT_BLOCK
-            //     .put(legacyBlock.getNumericalId(), legacyBlock.toStringPlotBlock());
-            /*if (legacyBlock.getDataValue() != 0) {
-                LEGACY_ID_AND_DATA_TO_STRING_PLOT_BLOCK
-                    .put(new IdDataPair(legacyBlock.getNumericalId(), legacyBlock.getDataValue()),
-                        legacyBlock.toStringPlotBlock());
-            } */
             LEGACY_ID_AND_DATA_TO_STRING_PLOT_BLOCK
                 .put(new IdDataPair(legacyBlock.getNumericalId(), legacyBlock.getDataValue()),
                     legacyBlock.toStringPlotBlock());
@@ -740,19 +732,29 @@ public final class BukkitLegacyMappings extends LegacyMappings {
         }
         String workingString = string;
         String[] parts = null;
+        IdDataPair idDataPair = null;
         if (string.contains(":")) {
             parts = string.split(":");
             if (parts.length > 1) {
                 if (parts[0].equalsIgnoreCase("minecraft")) {
                     workingString = parts[1];
                 } else {
-                    workingString = parts[0];
+                    if (parts[0].matches("^\\d+$")) {
+                        idDataPair =
+                            new IdDataPair(Integer.parseInt(parts[0]), Integer.parseInt(parts[0]));
+                    } else {
+                        workingString = parts[0];
+                    }
                 }
             }
+        } else if (string.matches("^\\d+$")) {
+            idDataPair = new IdDataPair(Integer.parseInt(parts[0]), 0);
         }
         PlotBlock plotBlock;
         if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.keySet().contains(workingString.toLowerCase())) {
             return PlotBlock.get(workingString);
+        } else if ((plotBlock = fromLegacyToString(idDataPair)) != null) {
+            return plotBlock;
         } else if ((plotBlock = fromLegacyToString(workingString)) != null) {
             return plotBlock;
         } else {
@@ -774,6 +776,13 @@ public final class BukkitLegacyMappings extends LegacyMappings {
         return LEGACY_ID_AND_DATA_TO_STRING_PLOT_BLOCK.get(new IdDataPair(id, data));
     }
 
+    public PlotBlock fromLegacyToString(IdDataPair idDataPair) {
+        if (idDataPair == null) {
+            return null;
+        }
+        return LEGACY_ID_AND_DATA_TO_STRING_PLOT_BLOCK.get(idDataPair);
+    }
+
     public PlotBlock fromLegacyToString(final String id) {
         return OLD_STRING_TO_STRING_PLOT_BLOCK.get(id);
     }

From c6ae2456f21d985ca41fbde612cf7553769b1dad Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Tue, 26 Mar 2019 09:27:20 +0100
Subject: [PATCH 080/210] Add support for Paper async chunk generation

---
 .../plotsquared/bukkit/BukkitMain.java        |   1 +
 .../bukkit/generator/BukkitPlotGenerator.java | 167 +++---------------
 .../generator/DelegatePlotGenerator.java      |  91 ++++++++++
 .../bukkit/generator/PlotBlockPopulator.java  |  34 ++++
 .../bukkit/util/block/GenChunk.java           |   5 +-
 .../plotsquared/plot/generator/HybridGen.java |   3 -
 .../plotsquared/plot/util/ChunkManager.java   |  36 ++--
 7 files changed, 173 insertions(+), 164 deletions(-)
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 352326a43..22d0b14b5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -63,6 +63,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             Settings.load(new File("plugins/PlotSquared/config/settings.yml"));
         } catch (Throwable ignored) {
         }
+
         // Force WorldEdit to load
         try {
             System.out.println("[P2] Force loading WorldEdit");
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index 947f1c3bb..14a7e400e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -4,21 +4,19 @@ import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
 import com.github.intellectualsites.plotsquared.bukkit.util.block.GenChunk;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
+import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator;
 import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
-import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
-import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +26,8 @@ import java.util.Set;
 public class BukkitPlotGenerator extends ChunkGenerator
     implements GeneratorWrapper<ChunkGenerator> {
 
-    private final GenChunk chunkSetter;
+    @SuppressWarnings("unused") public final boolean PAPER_ASYNC_SAFE = true;
+
     private final IndependentPlotGenerator plotGenerator;
     private final ChunkGenerator platformGenerator;
     private final boolean full;
@@ -41,24 +40,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
         }
         this.plotGenerator = generator;
         this.platformGenerator = this;
-        populators = new ArrayList<>();
-        this.populators.add(new BlockPopulator() {
-
-            private LocalBlockQueue queue;
-
-            @Override public void populate(World world, Random random, Chunk source) {
-                if (queue == null) {
-                    queue = GlobalBlockQueue.IMP.getNewQueue(world.getName(), false);
-                }
-                PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null);
-                ChunkWrapper wrap = new ChunkWrapper(area.worldname, source.getX(), source.getZ());
-                ScopedLocalBlockQueue chunk = queue.getForChunk(wrap.x, wrap.z);
-                if (BukkitPlotGenerator.this.plotGenerator.populateChunk(chunk, area)) {
-                    queue.flush();
-                }
-            }
-        });
-        this.chunkSetter = new GenChunk(null, null);
+        this.populators = new ArrayList<>();
+        this.populators.add(new PlotBlockPopulator(this.plotGenerator));
         this.full = true;
         MainUtil.initCache();
     }
@@ -69,108 +52,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
                 + " is already a BukkitPlotGenerator!");
         }
         this.full = false;
-        //todo figure out why this was put here in the first place:
-        //PlotSquared.debug("BukkitPlotGenerator does not fully support: " + cg);
         this.platformGenerator = cg;
-        this.plotGenerator = new IndependentPlotGenerator() {
-            @Override public void initialize(PlotArea area) {
-            }
-
-            @Override public PlotManager getNewPlotManager() {
-                return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotManager();
-            }
-
-            @Override public String getName() {
-                return cg.getClass().getName();
-            }
-
-            @Override
-            public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
-                return PlotSquared.get().IMP.getDefaultGenerator()
-                    .getNewPlotArea(world, id, min, max);
-            }
-
-            @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
-                BlockBucket[][] blockBuckets = new BlockBucket[16][];
-                HybridPlotWorld hpw = (HybridPlotWorld) settings;
-                // Bedrock
-                if (hpw.PLOT_BEDROCK) {
-                    for (short x = 0; x < 16; x++) {
-                        for (short z = 0; z < 16; z++) {
-                            blockBuckets[0][(z << 4) | x] =
-                                BlockBucket.withSingle(PlotBlock.get("bedrock"));
-                        }
-                    }
-                }
-                for (short x = 0; x < 16; x++) {
-                    for (short z = 0; z < 16; z++) {
-                        for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
-                            blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
-                        }
-                        blockBuckets[hpw.PLOT_HEIGHT >> 4][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4)
-                            | x] = hpw.MAIN_BLOCK;
-                    }
-                }
-                return blockBuckets;
-            }
-
-            @Override
-            public void generateChunk(final ScopedLocalBlockQueue result, PlotArea settings) {
-                World w = BukkitUtil.getWorld(world);
-                Location min = result.getMin();
-                int cx = min.getX() >> 4;
-                int cz = min.getZ() >> 4;
-                Random r = new Random(MathMan.pair((short) cx, (short) cz));
-                BiomeGrid grid = new BiomeGrid() {
-                    @Override public void setBiome(int x, int z, Biome biome) {
-                        result.setBiome(x, z, biome.name());
-                    }
-
-                    @Override public Biome getBiome(int x, int z) {
-                        return Biome.FOREST;
-                    }
-                };
-                try {
-                    // ChunkData will spill a bit
-                    ChunkData data = cg.generateChunkData(w, r, cx, cz, grid);
-                    if (data != null) {
-                        return;
-                    }
-                } catch (Throwable ignored) {
-                }
-                /* TODO: Redo this
-                // Populator spillage
-                short[][] tmp = cg.generateExtBlockSections(w, r, cx, cz, biomeGrid);
-                if (tmp != null) {
-                    for (int i = 0; i < tmp.length; i++) {
-                        short[] section = tmp[i];
-                        if (section == null) {
-                            if (i < 7) {
-                                for (int x = 0; x < 16; x++) {
-                                    for (int z = 0; z < 16; z++) {
-                                        for (int y = i << 4; y < (i << 4) + 16; y++) {
-                                            result.setBlock(x, y, z, PlotBlock.get("air"));
-                                        }
-                                    }
-                                }
-                            }
-                            continue;
-                        }
-                        for (int j = 0; j < section.length; j++) {
-                            int x = MainUtil.x_loc[i][j];
-                            int y = MainUtil.y_loc[i][j];
-                            int z = MainUtil.z_loc[i][j];
-                            result.setBlock(x, y, z, section[j], (byte) 0);
-                        }
-                    }
-                }
-                */
-                for (BlockPopulator populator : cg.getDefaultPopulators(w)) {
-                    populator.populate(w, r, w.getChunkAt(cx, cz));
-                }
-            }
-        };
-        this.chunkSetter = new GenChunk(null, new ChunkWrapper(world, 0, 0));
+        this.plotGenerator = new DelegatePlotGenerator(cg, world);
         MainUtil.initCache();
     }
 
@@ -190,7 +73,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return this.platformGenerator;
     }
 
-    @Override public List<BlockPopulator> getDefaultPopulators(World world) {
+    @Override @NotNull public List<BlockPopulator> getDefaultPopulators(@NotNull World world) {
         try {
             if (!this.loaded) {
                 String name = world.getName();
@@ -224,17 +107,20 @@ public class BukkitPlotGenerator extends ChunkGenerator
         if (populators == null && platformGenerator != null) {
             populators = new ArrayList<>(platformGenerator.getDefaultPopulators(world));
         }
-        for (BlockPopulator populator : this.populators) {
-            if (!existing.contains(populator)) {
-                toAdd.add(populator);
+        if (populators != null) {
+            for (BlockPopulator populator : this.populators) {
+                if (!existing.contains(populator)) {
+                    toAdd.add(populator);
+                }
             }
         }
         return toAdd;
     }
 
-    @Override
-    public ChunkData generateChunkData(World world, Random random, int x, int z, BiomeGrid biome) {
-        GenChunk result = this.chunkSetter;
+    @Override @NotNull public ChunkData generateChunkData(@NotNull World world, @NotNull Random random,
+        int x, int z, @NotNull BiomeGrid biome) {
+
+        GenChunk result =  new GenChunk();
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getCd() != null) {
                 for (int cx = 0; cx < 16; cx++) {
@@ -258,7 +144,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
             if (this.platformGenerator != this) {
                 return this.platformGenerator.generateChunkData(world, random, x, z, biome);
             } else {
-                generate(world, result);
+                generate(new ChunkLoc(x, z), world, result);
             }
         } catch (Throwable e) {
             e.printStackTrace();
@@ -267,7 +153,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return result.getCd();
     }
 
-    private void generate(World world, ScopedLocalBlockQueue result) {
+    private void generate(ChunkLoc loc, World world, ScopedLocalBlockQueue result) {
         // Load if improperly loaded
         if (!this.loaded) {
             String name = world.getName();
@@ -275,17 +161,17 @@ public class BukkitPlotGenerator extends ChunkGenerator
             this.loaded = true;
         }
         // Process the chunk
-        if (ChunkManager.preProcessChunk(result)) {
+        if (ChunkManager.preProcessChunk(loc, result)) {
             return;
         }
         PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null);
         try {
-            this.plotGenerator.generateChunk(this.chunkSetter, area);
+            this.plotGenerator.generateChunk(result, area);
         } catch (Throwable e) {
             // Recover from generator error
             e.printStackTrace();
         }
-        ChunkManager.postProcessChunk(result);
+        ChunkManager.postProcessChunk(loc, result);
     }
 
     /**
@@ -296,7 +182,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
      * @param z     Ignored
      * @return always true
      */
-    @Override public boolean canSpawn(World world, int x, int z) {
+    @Override public boolean canSpawn(@NotNull final World world, final int x, final int z) {
         return true;
     }
 
@@ -311,10 +197,11 @@ public class BukkitPlotGenerator extends ChunkGenerator
         }
     }
 
-    @Override public boolean equals(Object obj) {
+    @Override public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }
         return toString().equals(obj.toString()) || toString().equals(obj.getClass().getName());
     }
+
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
new file mode 100644
index 000000000..36ef53a5a
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@@ -0,0 +1,91 @@
+package com.github.intellectualsites.plotsquared.bukkit.generator;
+
+import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.World;
+import org.bukkit.block.Biome;
+import org.bukkit.generator.BlockPopulator;
+import org.bukkit.generator.ChunkGenerator;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Random;
+
+@RequiredArgsConstructor final class DelegatePlotGenerator extends IndependentPlotGenerator {
+
+    private final ChunkGenerator chunkGenerator;
+    private final String world;
+
+    @Override public void initialize(PlotArea area) {
+    }
+
+    @Override public PlotManager getNewPlotManager() {
+        return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotManager();
+    }
+
+    @Override public String getName() {
+        return this.chunkGenerator.getClass().getName();
+    }
+
+    @Override
+    public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
+        return PlotSquared.get().IMP.getDefaultGenerator()
+            .getNewPlotArea(world, id, min, max);
+    }
+
+    @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
+        BlockBucket[][] blockBuckets = new BlockBucket[16][];
+        HybridPlotWorld hpw = (HybridPlotWorld) settings;
+        // Bedrock
+        if (hpw.PLOT_BEDROCK) {
+            for (short x = 0; x < 16; x++) {
+                for (short z = 0; z < 16; z++) {
+                    blockBuckets[0][(z << 4) | x] =
+                        BlockBucket.withSingle(PlotBlock.get("bedrock"));
+                }
+            }
+        }
+        for (short x = 0; x < 16; x++) {
+            for (short z = 0; z < 16; z++) {
+                for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
+                    blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
+                }
+                blockBuckets[hpw.PLOT_HEIGHT >> 4][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4)
+                    | x] = hpw.MAIN_BLOCK;
+            }
+        }
+        return blockBuckets;
+    }
+
+    @Override
+    public void generateChunk(final ScopedLocalBlockQueue result, PlotArea settings) {
+        World w = BukkitUtil.getWorld(world);
+        Location min = result.getMin();
+        int cx = min.getX() >> 4;
+        int cz = min.getZ() >> 4;
+        Random r = new Random(MathMan.pair((short) cx, (short) cz));
+        ChunkGenerator.BiomeGrid grid = new ChunkGenerator.BiomeGrid() {
+            @Override public void setBiome(int x, int z, Biome biome) {
+                result.setBiome(x, z, biome.name());
+            }
+
+            @Override @NotNull public Biome getBiome(int x, int z) {
+                return Biome.FOREST;
+            }
+        };
+        try {
+            chunkGenerator.generateChunkData(w, r, cx, cz, grid);
+            return;
+        } catch (Throwable ignored) {
+        }
+        for (BlockPopulator populator : chunkGenerator.getDefaultPopulators(w)) {
+            populator.populate(w, r, w.getChunkAt(cx, cz));
+        }
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java
new file mode 100644
index 000000000..4e2fee0b5
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java
@@ -0,0 +1,34 @@
+package com.github.intellectualsites.plotsquared.bukkit.generator;
+
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
+import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
+import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.generator.BlockPopulator;
+
+import java.util.Random;
+
+@RequiredArgsConstructor final class PlotBlockPopulator extends BlockPopulator {
+
+    private final IndependentPlotGenerator plotGenerator;
+    private LocalBlockQueue queue;
+
+    @Override public void populate(final World world, final Random random, final Chunk source) {
+        if (this.queue == null) {
+            this.queue = GlobalBlockQueue.IMP.getNewQueue(world.getName(), false);
+        }
+        final PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null);
+        final ChunkWrapper wrap = new ChunkWrapper(area.worldname, source.getX(), source.getZ());
+        final ScopedLocalBlockQueue chunk = this.queue.getForChunk(wrap.x, wrap.z);
+        if (this.plotGenerator.populateChunk(chunk, area)) {
+            this.queue.flush();
+        }
+    }
+
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
index 90a42db9b..020348ec5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
@@ -30,7 +30,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
     public int cz;
     @Getter @Setter private ChunkData cd = null;
 
-    public GenChunk(Chunk chunk, ChunkWrapper wrap) {
+    public GenChunk() {
         super(null, new Location(null, 0, 0, 0), new Location(null, 15, 255, 15));
         this.biomes = Biome.values();
     }
@@ -167,8 +167,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
     }
 
     public GenChunk clone() {
-        GenChunk toReturn =
-            new GenChunk(chunk, new ChunkWrapper(getWorld(), chunk.getX(), chunk.getZ()));
+        GenChunk toReturn = new GenChunk();
         if (this.result != null) {
             for (int i = 0; i < this.result.length; i++) {
                 PlotBlock[] matrix = this.result[i];
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index f2098036d..8c6f2c765 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -7,8 +7,6 @@ import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
-import java.util.HashMap;
-
 public class HybridGen extends IndependentPlotGenerator {
 
     @Override public String getName() {
@@ -121,7 +119,6 @@ public class HybridGen extends IndependentPlotGenerator {
             }
         }
         // generation
-        HashMap<Integer, BaseBlock[]> sch = hpw.G_SCH;
         for (short x = 0; x < 16; x++) {
             if (gx[x]) {
                 for (short z = 0; z < 16; z++) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index b692dc04e..c8beb8ba5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -7,16 +7,14 @@ import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class ChunkManager {
 
     public static ChunkManager manager = null;
-    private static RunnableVal<ScopedLocalBlockQueue> CURRENT_FORCE_CHUNK;
-    private static RunnableVal<ScopedLocalBlockQueue> CURRENT_ADD_CHUNK;
+    private static final Map<ChunkLoc, RunnableVal<ScopedLocalBlockQueue>> forceChunks = new ConcurrentHashMap<>();
+    private static final Map<ChunkLoc, RunnableVal<ScopedLocalBlockQueue>> addChunks = new ConcurrentHashMap<>();
 
     public static ChunkLoc getChunkChunk(Location location) {
         int x = location.getX() >> 9;
@@ -43,27 +41,29 @@ public abstract class ChunkManager {
             }
             queue.flush();
         } else {
-            CURRENT_FORCE_CHUNK = force;
-            CURRENT_ADD_CHUNK = add;
+            forceChunks.put(loc, force);
+            addChunks.put(loc, add);
             queue.regenChunk(loc.x, loc.z);
-            CURRENT_FORCE_CHUNK = null;
-            CURRENT_ADD_CHUNK = null;
+            forceChunks.remove(loc);
+            addChunks.remove(loc);
         }
     }
 
-    public static boolean preProcessChunk(ScopedLocalBlockQueue queue) {
-        if (CURRENT_FORCE_CHUNK != null) {
-            CURRENT_FORCE_CHUNK.run(queue);
-            CURRENT_FORCE_CHUNK = null;
+    public static boolean preProcessChunk(ChunkLoc loc, ScopedLocalBlockQueue queue) {
+        final RunnableVal<ScopedLocalBlockQueue> forceChunk = forceChunks.get(loc);
+        if (forceChunk != null) {
+            forceChunk.run(queue);
+            forceChunks.remove(loc);
             return true;
         }
         return false;
     }
 
-    public static boolean postProcessChunk(ScopedLocalBlockQueue queue) {
-        if (CURRENT_ADD_CHUNK != null) {
-            CURRENT_ADD_CHUNK.run(queue);
-            CURRENT_ADD_CHUNK = null;
+    public static boolean postProcessChunk(ChunkLoc loc, ScopedLocalBlockQueue queue) {
+        final RunnableVal<ScopedLocalBlockQueue> addChunk = forceChunks.get(loc);
+        if (addChunk != null) {
+            addChunk.run(queue);
+            addChunks.remove(loc);
             return true;
         }
         return false;

From 08ebf57c90edfd97ba3e6ec160feeef68b2511e3 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Sat, 30 Mar 2019 12:50:32 +0100
Subject: [PATCH 081/210] Add hide-info flag

---
 .../plotsquared/plot/commands/Info.java       | 24 ++++++++++++++++++-
 .../plotsquared/plot/config/Captions.java     |  6 ++++-
 .../plotsquared/plot/flag/Flags.java          |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
index 09f3e9c8b..7491d11a4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -3,6 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
@@ -10,7 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 import java.util.UUID;
 
 @CommandDeclaration(command = "info", aliases = "i", description = "Display plot info",
-    usage = "/plot info <id>", category = CommandCategory.INFO) public class Info
+    usage = "/plot info <id> [-f, to force info]", category = CommandCategory.INFO) public class Info
     extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
@@ -53,6 +54,7 @@ import java.util.UUID;
             MainUtil.sendMessage(player, Captions.NOT_IN_PLOT.s());
             return false;
         }
+
         if (arg != null) {
             if (args.length == 1) {
                 args = new String[0];
@@ -60,6 +62,26 @@ import java.util.UUID;
                 args = new String[] {args[1]};
             }
         }
+
+        // hide-info flag
+        if (plot.getFlag(Flags.HIDE_INFO).orElse(false)) {
+            boolean allowed = false;
+            for (final String argument : args) {
+                if (argument.equalsIgnoreCase("-f")) {
+                    if (!player.hasPermission(Captions.PERMISSION_AREA_INFO_FORCE.s())) {
+                        Captions.NO_PERMISSION.send(player, Captions.PERMISSION_AREA_INFO_FORCE);
+                        return true;
+                    }
+                    allowed = true;
+                    break;
+                }
+            }
+            if (!allowed) {
+                Captions.PLOT_INFO_HIDDEN.send(player);
+                return true;
+            }
+        }
+
         if (args.length == 1 && args[0].equalsIgnoreCase("inv")) {
             PlotInventory inv = new PlotInventory(player) {
                 @Override public boolean onClick(int index) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index 9302ed743..abd53533e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -65,6 +65,7 @@ public enum Captions {
         "plots.admin.command.trust", "static.permissions"), PERMISSION_TRUST_EVERYONE(
         "plots.trust.everyone", "static.permissions"), PERMISSION_AREA_CREATE("plots.area.create",
         "static.permissions"), PERMISSION_AREA_INFO("plots.area.info",
+        "static.permissions"), PERMISSION_AREA_INFO_FORCE("plots.admin.info.force",
         "static.permissions"), PERMISSION_AREA_LIST("plots.area.list",
         "static.permissions"), PERMISSION_AREA_REGEN("plots.area.regen",
         "static.permissions"), PERMISSION_AREA_TP("plots.area.tp",
@@ -675,6 +676,8 @@ public enum Captions {
     PLOT_INFO_UNCLAIMED("$2Plot $1%s$2 is not yet claimed", "Info"), PLOT_INFO_HEADER(
         "$3&m---------&r $1INFO $3&m---------", false, "Info"),
 
+    PLOT_INFO_HIDDEN("$2You cannot view the information about this plot", "Info"),
+
     PLOT_INFO("$1ID: $2%id%$1&-" + "$1Alias: $2%alias%$1&-" + "$1Owner: $2%owner%$1&-"
         + "$1Biome: $2%biome%$1&-" + "$1Can Build: $2%build%$1&-" + "$1Rating: $2%rating%&-"
         + "$1Seen: $2%seen%&-" + "$1Trusted: $2%trusted%$1&-" + "$1Members: $2%members%$1&-"
@@ -1067,4 +1070,5 @@ public enum Captions {
         } else {
             caller.sendMessage(msg);
         }
-    }}
+    }
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
index 7c57b2dc1..06f5991d8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
@@ -28,6 +28,7 @@ public final class Flags {
     public static final BooleanFlag NOTIFY_LEAVE = new BooleanFlag("notify-leave");
     public static final BooleanFlag TITLES = new BooleanFlag("titles");
     public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter");
+    public static final BooleanFlag HIDE_INFO = new BooleanFlag("hide-info");
     public static final LongFlag TIME = new LongFlag("time");
     public static final PlotWeatherFlag WEATHER = new PlotWeatherFlag("weather");
     public static final DoubleFlag PRICE = new DoubleFlag("price") {

From ae572644876ac7197c8f9b5056a902bab56a2cd6 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Sat, 30 Mar 2019 13:27:18 +0100
Subject: [PATCH 082/210] Add server-plot flag, and option to disable on-claim
 teleportation

---
 .../plotsquared/bukkit/BukkitMain.java        |  2 +-
 .../plotsquared/plot/commands/Cluster.java    |  6 +--
 .../plotsquared/plot/commands/Info.java       |  2 +-
 .../plotsquared/plot/commands/ListCmd.java    |  8 ++--
 .../plotsquared/plot/config/Captions.java     |  2 +
 .../plotsquared/plot/config/Settings.java     |  1 +
 .../plotsquared/plot/database/DBFunc.java     |  1 +
 .../plotsquared/plot/flag/Flags.java          |  1 +
 .../plot/listener/PlotListener.java           |  2 +-
 .../plotsquared/plot/object/Plot.java         | 39 +++++++++++++------
 .../plot/object/comment/InboxOwner.java       |  2 +-
 .../plot/object/comment/InboxReport.java      |  2 +-
 .../plotsquared/plot/util/MainUtil.java       |  7 ++++
 .../plotsquared/plot/util/UUIDHandler.java    |  5 +++
 .../plot/util/expiry/ExpireManager.java       | 18 ++++++---
 .../nukkit/listeners/PlayerEvents.java        |  2 +-
 16 files changed, 69 insertions(+), 31 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 22d0b14b5..e09bedc47 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -217,7 +217,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                 }
                 final Plot plot = area.getOwnedPlot(id);
                 if (plot != null) {
-                    if (PlotPlayer.wrap(plot.owner) == null) {
+                    if (!MainUtil.isServerOwned(plot) || PlotPlayer.wrap(plot.getOwner()) == null) {
                         if (world.getKeepSpawnInMemory()) {
                             world.setKeepSpawnInMemory(false);
                             return;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index 6ea60a37e..50e226c33 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -156,9 +156,9 @@ import java.util.UUID;
                 // Add any existing plots to the current cluster
                 for (Plot plot : plots) {
                     if (plot.hasOwner()) {
-                        if (!cluster.isAdded(plot.owner)) {
-                            cluster.invited.add(plot.owner);
-                            DBFunc.setInvited(cluster, plot.owner);
+                        if (!cluster.isAdded(plot.getOwner())) {
+                            cluster.invited.add(plot.getOwner());
+                            DBFunc.setInvited(cluster, plot.getOwner());
                         }
                     }
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
index 7491d11a4..1bbc3bd93 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -91,7 +91,7 @@ import java.util.UUID;
                 }
             };
             UUID uuid = player.getUUID();
-            String name = MainUtil.getName(plot.owner);
+            String name = MainUtil.getName(plot.getOwner());
             inv.setItem(1, new PlotItemStack(388, (short) 0, 1, "&cPlot Info",
                 "&cID: &6" + plot.getId().toString(), "&cOwner: &6" + name,
                 "&cAlias: &6" + plot.getAlias(),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
index 725e4ed2b..ff06a036a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -246,7 +246,7 @@ public class ListCmd extends SubCommand {
                 }
                 plots = new ArrayList<>();
                 for (Plot plot : PlotSquared.get().getPlots()) {
-                    if (plot.owner == null) {
+                    if (plot.getOwner() == null) {
                         plots.add(plot);
                     }
                 }
@@ -259,10 +259,10 @@ public class ListCmd extends SubCommand {
                 }
                 plots = new ArrayList<>();
                 for (Plot plot : PlotSquared.get().getPlots()) {
-                    if (plot.owner == null) {
+                    if (plot.getOwner() == null) {
                         continue;
                     }
-                    if (UUIDHandler.getName(plot.owner) == null) {
+                    if (UUIDHandler.getName(plot.getOwner()) == null) {
                         plots.add(plot);
                     }
                 }
@@ -352,7 +352,7 @@ public class ListCmd extends SubCommand {
             new RunnableVal3<Integer, Plot, PlotMessage>() {
                 @Override public void run(Integer i, Plot plot, PlotMessage message) {
                     String color;
-                    if (plot.owner == null) {
+                    if (plot.getOwner() == null) {
                         color = "$3";
                     } else if (plot.isOwner(player.getUUID())) {
                         color = "$1";
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index abd53533e..5b2ec9ab2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -670,6 +670,8 @@ public enum Captions {
 
     NEVER("Never", "Info"), UNKNOWN("Unknown", "Info"),
 
+    SERVER("Server", "Info"),
+
     EVERYONE("Everyone", "Info"), PLOT_UNOWNED(
         "$2The current plot must have an owner to perform this action", "Info"),
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 281e35caf..790306c2c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -290,6 +290,7 @@ public class Settings extends Config {
     public static final class Teleport {
         @Comment("Teleport to your plot on death") public static boolean ON_DEATH = false;
         @Comment("Teleport to your plot on login") public static boolean ON_LOGIN = false;
+        @Comment("Teleport to your plot on claim") public static boolean ON_CLAIM = true;
         @Comment("Add a teleportation delay to all commands") public static int DELAY = 0;
         @Comment("The visit command is ordered by world instead of globally") public static boolean
             PER_WORLD_VISIT = false;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
index 46ede5d3c..abb4dad24 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/DBFunc.java
@@ -19,6 +19,7 @@ public class DBFunc {
      */
     // TODO: Use this instead. public static final UUID EVERYONE = UUID.fromString("4aa2aaa4-c06b-485c-bc58-186aa1780d9b");
     public static final UUID EVERYONE = UUID.fromString("1-1-3-3-7");
+    public static final UUID SERVER = UUID.fromString("00000000-0000-0000-0000-000000000000");
 
     /**
      * Abstract Database Manager
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
index 06f5991d8..f4be6b5d6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
@@ -29,6 +29,7 @@ public final class Flags {
     public static final BooleanFlag TITLES = new BooleanFlag("titles");
     public static final BooleanFlag NOTIFY_ENTER = new BooleanFlag("notify-enter");
     public static final BooleanFlag HIDE_INFO = new BooleanFlag("hide-info");
+    public static final BooleanFlag SERVER_PLOT = new BooleanFlag("server-plot");
     public static final LongFlag TIME = new LongFlag("time");
     public static final PlotWeatherFlag WEATHER = new PlotWeatherFlag("weather");
     public static final DoubleFlag PRICE = new DoubleFlag("price") {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
index c5cddf740..b3d15736b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
@@ -169,7 +169,7 @@ public class PlotListener {
                             replacements.put("%world%", plot.getArea().toString());
                             replacements.put("%greeting%", greeting);
                             replacements.put("%alias", plot.toString());
-                            replacements.put("%s", MainUtil.getName(plot.owner));
+                            replacements.put("%s", MainUtil.getName(plot.getOwner()));
                             String main = StringMan
                                 .replaceFromMap(Captions.TITLE_ENTERED_PLOT.s(), replacements);
                             String sub = StringMan
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index b6971b44f..bb723aef3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -53,10 +53,12 @@ public class Plot {
     private static HashSet<RegionWrapper> regions_cache;
 
     private final PlotId id;
+
     /**
      * plot owner
      * (Merged plots can have multiple owners)
      * Direct access is Deprecated: use getOwners()
+     * @deprecated
      */
     @Deprecated public UUID owner;
     /**
@@ -324,20 +326,33 @@ public class Plot {
      * @return if the provided uuid is the owner of the plot
      */
     public boolean isOwner(@Nonnull UUID uuid) {
-        if (uuid.equals(this.owner)) {
+        if (uuid.equals(this.getOwner())) {
             return true;
         }
         if (!isMerged()) {
             return false;
         }
         Set<Plot> connected = getConnectedPlots();
-        return connected.stream().anyMatch(current -> uuid.equals(current.owner));
+        return connected.stream().anyMatch(current -> uuid.equals(current.getOwner()));
     }
 
     public boolean isOwnerAbs(UUID uuid) {
         return uuid.equals(this.owner);
     }
 
+    /**
+     * plot owner
+     * (Merged plots can have multiple owners)
+     * Direct access is Deprecated: use getOwners()
+     * @deprecated
+     */
+    @Deprecated public UUID getOwner() {
+        if (MainUtil.isServerOwned(this)) {
+            return DBFunc.SERVER;
+        }
+        return this.owner;
+    }
+
     /**
      * Gets a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
      * <p>
@@ -347,25 +362,25 @@ public class Plot {
      * @return the plot owners
      */
     public Set<UUID> getOwners() {
-        if (this.owner == null) {
+        if (this.getOwner() == null) {
             return ImmutableSet.of();
         }
         if (isMerged()) {
             Set<Plot> plots = getConnectedPlots();
             Plot[] array = plots.toArray(new Plot[plots.size()]);
             ImmutableSet.Builder<UUID> owners = ImmutableSet.builder();
-            UUID last = this.owner;
-            owners.add(this.owner);
+            UUID last = this.getOwner();
+            owners.add(this.getOwner());
             for (Plot current : array) {
-                if (last == null || current.owner.getMostSignificantBits() != last
+                if (last == null || current.getOwner().getMostSignificantBits() != last
                     .getMostSignificantBits()) {
-                    owners.add(current.owner);
-                    last = current.owner;
+                    owners.add(current.getOwner());
+                    last = current.getOwner();
                 }
             }
             return owners.build();
         }
-        return ImmutableSet.of(this.owner);
+        return ImmutableSet.of(this.getOwner());
     }
 
     /**
@@ -1443,7 +1458,7 @@ public class Plot {
         }
         setSign(player.getName());
         MainUtil.sendMessage(player, Captions.CLAIMED);
-        if (teleport) {
+        if (teleport && Settings.Teleport.ON_CLAIM) {
             teleportPlayer(player);
         }
         PlotArea plotworld = getArea();
@@ -1579,7 +1594,7 @@ public class Plot {
         if (plot == null) {
             this.moveData(plot, whenDone);
             return true;
-        } else if (plot.owner == null) {
+        } else if (plot.getOwner() == null) {
             this.moveData(plot, whenDone);
             return true;
         }
@@ -2979,7 +2994,7 @@ public class Plot {
         // copy data
         for (Plot plot : plots) {
             Plot other = plot.getRelative(destination.getArea(), offset.x, offset.y);
-            other.create(plot.owner, false);
+            other.create(plot.getOwner(), false);
             if (!plot.getFlags().isEmpty()) {
                 other.getSettings().flags = plot.getFlags();
                 DBFunc.setFlags(other, plot.getFlags());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
index 426a5ab49..29cf003cf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxOwner.java
@@ -35,7 +35,7 @@ public class InboxOwner extends CommentInbox {
     }
 
     @Override public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot.owner == null) {
+        if (plot.getOwner() == null) {
             return false;
         }
         plot.addComment(comment);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
index 7c626d8e1..fa44db6c2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/comment/InboxReport.java
@@ -20,7 +20,7 @@ public class InboxReport extends CommentInbox {
     }
 
     @Override public boolean addComment(Plot plot, PlotComment comment) {
-        if (plot.owner == null) {
+        if (plot.getOwner() == null) {
             return false;
         }
         DBFunc.setComment(plot, comment);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index fa1a527fd..17366dbbb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -335,6 +335,9 @@ public class MainUtil {
         if (owner.equals(DBFunc.EVERYONE)) {
             return Captions.EVERYONE.s();
         }
+        if (owner.equals(DBFunc.SERVER)) {
+            return Captions.SERVER.s();
+        }
         String name = UUIDHandler.getName(owner);
         if (name == null) {
             return Captions.UNKNOWN.s();
@@ -342,6 +345,10 @@ public class MainUtil {
         return name;
     }
 
+    public static boolean isServerOwned(Plot plot) {
+        return plot.getFlag(Flags.SERVER_PLOT).orElse(false);
+    }
+
     /**
      * Get the corner locations for a list of regions.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
index 6696edbd5..930411c32 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
@@ -1,6 +1,8 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
@@ -98,6 +100,9 @@ public class UUIDHandler {
         if (implementation == null) {
             return null;
         }
+        if (uuid.equals(DBFunc.SERVER)) {
+            return Captions.SERVER.s();
+        }
         return implementation.getName(uuid);
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index c9b75bf67..cf4e025eb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -160,9 +160,15 @@ public class ExpireManager {
                 applicable.add(et);
             }
         }
+
         if (applicable.isEmpty()) {
             return new ArrayList<>();
         }
+
+        if (MainUtil.isServerOwned(plot)) {
+            return new ArrayList<>();
+        }
+
         boolean shouldCheckAccountAge = false;
 
         long diff = getAge(plot);
@@ -366,12 +372,12 @@ public class ExpireManager {
         int changes = changed == null ? 0 : changed.changes_sd;
         int modified = changed == null ? 0 : changed.changes;
         PlotSquared.debug(
-            "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.owner
+            "$2[&5Expire&dManager$2] &cDeleted expired plot: " + plot + " User:" + plot.getOwner()
                 + " Delta:" + changes + "/" + modified + " Connected: " + StringMan
                 .getString(plots));
         PlotSquared.debug("$4 - Area: " + plot.getArea());
         if (plot.hasOwner()) {
-            PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.owner));
+            PlotSquared.debug("$4 - Owner: " + UUIDHandler.getName(plot.getOwner()));
         } else {
             PlotSquared.debug("$4 - Owner: Unowned");
         }
@@ -406,8 +412,8 @@ public class ExpireManager {
     }
 
     public long getAccountAge(Plot plot) {
-        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.getOwner())
+            || UUIDHandler.getPlayer(plot.getOwner()) != null || plot.getRunning() > 0) {
             return Long.MAX_VALUE;
         }
         long max = 0;
@@ -419,8 +425,8 @@ public class ExpireManager {
     }
 
     public long getAge(Plot plot) {
-        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.owner)
-            || UUIDHandler.getPlayer(plot.owner) != null || plot.getRunning() > 0) {
+        if (!plot.hasOwner() || Objects.equals(DBFunc.EVERYONE, plot.getOwner())
+            || UUIDHandler.getPlayer(plot.getOwner()) != null || plot.getRunning() > 0) {
             return 0;
         }
         Optional<?> keep = plot.getFlag(Flags.KEEP);
diff --git a/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java
index 2d87746d6..c429ba0fd 100644
--- a/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java
+++ b/Nukkit/src/main/java/com/github/intellectualsites/plotsquared/nukkit/listeners/PlayerEvents.java
@@ -90,7 +90,7 @@ public class PlayerEvents extends PlotListener implements Listener {
                 return;
             }
             if (Settings.Redstone.DISABLE_OFFLINE) {
-                if (UUIDHandler.getPlayer(plot.owner) == null) {
+                if (UUIDHandler.getPlayer(plot.getOwner()) == null) {
                     boolean disable = true;
                     for (UUID trusted : plot.getTrusted()) {
                         if (UUIDHandler.getPlayer(trusted) != null) {

From 45360f09798a1641df4ab96caa11ee74e7d4acfe Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Sat, 30 Mar 2019 13:32:45 +0100
Subject: [PATCH 083/210] Make sure `/plot home` ignores server owned plots

---
 .../github/intellectualsites/plotsquared/plot/object/Plot.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index bb723aef3..ee2e23413 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -337,7 +337,7 @@ public class Plot {
     }
 
     public boolean isOwnerAbs(UUID uuid) {
-        return uuid.equals(this.owner);
+        return uuid.equals(this.getOwner());
     }
 
     /**

From 04b9b67c9d993e9ac183ca321668d536f30c68dd Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sun, 31 Mar 2019 18:31:16 +1100
Subject: [PATCH 084/210] Fixes #2288

---
 .../intellectualsites/plotsquared/plot/object/PlotArea.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index f5cc16779..9cdd5a4bd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -246,7 +246,8 @@ public abstract class PlotArea {
         this.SCHEMATIC_ON_CLAIM = config.getBoolean("schematic.on_claim");
         this.SCHEMATIC_FILE = config.getString("schematic.file");
         this.SCHEMATIC_CLAIM_SPECIFY = config.getBoolean("schematic.specify_on_claim");
-        this.SCHEMATICS = config.getStringList("schematic.schematics");
+        this.SCHEMATICS = new ArrayList<>(config.getStringList("schematic.schematics"));
+        this.SCHEMATICS.replaceAll(String::toLowerCase);
         this.USE_ECONOMY = config.getBoolean("economy.use") && EconHandler.getEconHandler() != null;
         ConfigurationSection priceSection = config.getConfigurationSection("economy.prices");
         if (this.USE_ECONOMY) {

From e396da8ee5b595e96a7cf56453eca6f824dbf744 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 Apr 2019 03:19:53 +1100
Subject: [PATCH 085/210] fix converter NPE

---
 .../plotsquared/bukkit/util/BukkitLegacyMappings.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index f0f6b24c8..85da1affc 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -748,7 +748,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
                 }
             }
         } else if (string.matches("^\\d+$")) {
-            idDataPair = new IdDataPair(Integer.parseInt(parts[0]), 0);
+            idDataPair = new IdDataPair(Integer.parseInt(string), 0);
         }
         PlotBlock plotBlock;
         if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.keySet().contains(workingString.toLowerCase())) {

From 67cf1b45ed3a18f69546c8072415e330f3d30b28 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 Apr 2019 04:43:44 +1100
Subject: [PATCH 086/210] Fix another legacy converter NPE

---
 .../plotsquared/plot/util/LegacyConverter.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
index a12b82c95..f904249dd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -113,12 +113,14 @@ import java.util.Map;
         for (final String world : worlds) {
             final ConfigurationSection worldSection = configuration.getConfigurationSection(world);
             for (final Map.Entry<String, ConfigurationType> entry : TYPE_MAP.entrySet()) {
-                if (entry.getValue() == ConfigurationType.BLOCK) {
-                    this.convertBlock(worldSection, entry.getKey(),
-                        worldSection.getString(entry.getKey()));
-                } else {
-                    this.convertBlockList(worldSection, entry.getKey(),
-                        worldSection.getStringList(entry.getKey()));
+                if (worldSection.contains(entry.getKey())) {
+                    if (entry.getValue() == ConfigurationType.BLOCK) {
+                        this.convertBlock(worldSection, entry.getKey(),
+                                worldSection.getString(entry.getKey()));
+                    } else {
+                        this.convertBlockList(worldSection, entry.getKey(),
+                                worldSection.getStringList(entry.getKey()));
+                    }
                 }
             }
         }

From f3adeeac0e74cf6af2d5fd314f4d283320a1e3af Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 Apr 2019 04:44:18 +1100
Subject: [PATCH 087/210] Fix single plot area NPEs & generator stackoverflow

---
 .../bukkit/listeners/SingleWorldListener.java | 14 +----
 .../plotsquared/plot/object/PlotId.java       | 18 +++++-
 .../worlds/DelegatePlotAreaManager.java       | 63 +++++++++++++++++++
 .../plot/object/worlds/SinglePlotArea.java    | 16 ++---
 .../object/worlds/SinglePlotAreaManager.java  | 12 ++--
 5 files changed, 93 insertions(+), 30 deletions(-)
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index 14567a9b4..88d25cd11 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -22,7 +22,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
 @SuppressWarnings("unused") public class SingleWorldListener implements Listener {
 
     private Method methodGetHandleChunk;
-    private Field mustSave, done, lit, s;
+    private Field mustSave;
 
     public SingleWorldListener(Plugin plugin) throws Exception {
         ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk");
@@ -30,9 +30,6 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
         this.mustSave = classChunk.getField("mustSave").getRealField();
         try {
-            this.done = classChunk.getField("done").getRealField();
-            this.lit = classChunk.getField("lit").getRealField();
-            this.s = classChunk.getField("s").getRealField();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -42,18 +39,9 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
     public void markChunkAsClean(Chunk chunk) {
         try {
             Object nmsChunk = methodGetHandleChunk.invoke(chunk);
-            if (done != null) {
-                this.done.set(nmsChunk, true);
-            }
             if (mustSave != null) {
                 this.mustSave.set(nmsChunk, false);
             }
-            if (lit != null) {
-                this.lit.set(nmsChunk, false);
-            }
-            if (s != null) {
-                this.s.set(nmsChunk, false);
-            }
         } catch (Throwable e) {
             e.printStackTrace();
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
index 8c4b78445..7c21df8fc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
@@ -33,12 +33,24 @@ public class PlotId {
      * @throws IllegalArgumentException if the string does not contain a valid PlotId
      */
     @Nonnull public static PlotId fromString(@Nonnull String string) {
+        PlotId plot = fromStringOrNull(string);
+        if (plot == null) throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
+        return plot;
+    }
+
+    @Nullable public static PlotId fromStringOrNull(@Nonnull String string) {
         String[] parts = string.split("[;|,]");
         if (parts.length < 2) {
-            throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
+            return null;
+        }
+        int x;
+        int y;
+        try {
+            x = Integer.parseInt(parts[0]);
+            y = Integer.parseInt(parts[1]);
+        } catch (NumberFormatException ignored) {
+            return null;
         }
-        int x = Integer.parseInt(parts[0]);
-        int y = Integer.parseInt(parts[1]);
         return new PlotId(x, y);
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java
new file mode 100644
index 000000000..52da1ade0
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java
@@ -0,0 +1,63 @@
+package com.github.intellectualsites.plotsquared.plot.object.worlds;
+
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+
+public class DelegatePlotAreaManager implements PlotAreaManager {
+    @Override
+    public PlotArea getApplicablePlotArea(Location location) {
+        return parent.getApplicablePlotArea(location);
+    }
+
+    @Override
+    public PlotArea getPlotArea(Location location) {
+        return parent.getPlotArea(location);
+    }
+
+    @Override
+    public PlotArea getPlotArea(String world, String id) {
+        return parent.getPlotArea(world, id);
+    }
+
+    @Override
+    public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
+        return parent.getPlotAreas(world, region);
+    }
+
+    @Override
+    public PlotArea[] getAllPlotAreas() {
+        return parent.getAllPlotAreas();
+    }
+
+    @Override
+    public String[] getAllWorlds() {
+        return parent.getAllWorlds();
+    }
+
+    @Override
+    public void addPlotArea(PlotArea area) {
+        parent.addPlotArea(area);
+    }
+
+    @Override
+    public void removePlotArea(PlotArea area) {
+        parent.removePlotArea(area);
+    }
+
+    @Override
+    public void addWorld(String worldName) {
+        parent.addWorld(worldName);
+    }
+
+    @Override
+    public void removeWorld(String worldName) {
+        parent.removeWorld(worldName);
+    }
+
+    private final PlotAreaManager parent;
+
+    public DelegatePlotAreaManager(PlotAreaManager parent) {
+        this.parent = parent;
+    }
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index ad3210094..101941391 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -63,24 +63,24 @@ public class SinglePlotArea extends GridPlotWorld {
     }
 
     @Nullable @Override public Plot getOwnedPlot(@Nonnull final Location location) {
-        PlotId pid = PlotId.fromString(location.getWorld());
-        Plot plot = this.plots.get(pid);
+        PlotId pid = PlotId.fromStringOrNull(location.getWorld());
+        Plot plot = pid == null ? null : this.plots.get(pid);
         return plot == null ? null : plot.getBasePlot(false);
     }
 
     @Nullable @Override public Plot getOwnedPlotAbs(@Nonnull Location location) {
-        PlotId pid = PlotId.fromString(location.getWorld());
-        return plots.get(pid);
+        PlotId pid = PlotId.fromStringOrNull(location.getWorld());
+        return pid == null ? null : plots.get(pid);
     }
 
     @Nullable @Override public Plot getPlot(@Nonnull final Location location) {
-        PlotId pid = PlotId.fromString(location.getWorld());
-        return getPlot(pid);
+        PlotId pid = PlotId.fromStringOrNull(location.getWorld());
+        return pid == null ? null : getPlot(pid);
     }
 
     @Nullable @Override public Plot getPlotAbs(@Nonnull final Location location) {
-        final PlotId pid = PlotId.fromString(location.getWorld());
-        return getPlotAbs(pid);
+        final PlotId pid = PlotId.fromStringOrNull(location.getWorld());
+        return pid == null ? null : getPlotAbs(pid);
     }
 
     public boolean addPlot(@Nonnull Plot plot) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index afd5f9f5f..7c9f16d70 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -30,11 +30,11 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
     }
 
     public boolean isWorld(String id) {
-        int mode = 0;
         char[] chars = id.toCharArray();
         if (chars.length == 1 && chars[0] == '*') {
             return true;
         }
+        int mode = 0;
         for (int i = 0; i < chars.length; i++) {
             char c = chars[i];
             switch (mode) {
@@ -65,7 +65,7 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
                     continue;
             }
         }
-        return true;
+        return mode == 3;
     }
 
     @Override public PlotArea getApplicablePlotArea(Location location) {
@@ -74,9 +74,9 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
             return found;
         }
         String world = location.getWorld();
-        return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
+        return isWorld(world) || world.equals("*") ?
             area :
-            null;
+            super.getApplicablePlotArea(location);
     }
 
     @Override public PlotArea getPlotArea(String world, String id) {
@@ -84,7 +84,7 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
         if (found != null) {
             return found;
         }
-        return isWorld(world) || world.equals("*") ? area : null;
+        return isWorld(world) || world.equals("*") ? area : super.getPlotArea(world, id);
     }
 
     @Override public PlotArea getPlotArea(Location location) {
@@ -100,7 +100,7 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
         if (found != null && found.length != 0) {
             return found;
         }
-        return isWorld(world) || world.equals("*") ? array : noPlotAreas;
+        return isWorld(world) || world.equals("*") ? array : all.length == 0 ? noPlotAreas : super.getPlotAreas(world, region);
     }
 
     @Override public PlotArea[] getAllPlotAreas() {

From 3be7511b7c2f6fc27acdc99e9f3b084e6a204285 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 Apr 2019 05:01:32 +1100
Subject: [PATCH 088/210] Fix genChunk setCuboid

---
 .../bukkit/util/block/GenChunk.java           |  2 +-
 .../worlds/DelegatePlotAreaManager.java       | 63 -------------------
 2 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
index 020348ec5..9018a3707 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
@@ -88,7 +88,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
         int maxx = Math.max(pos1.getX(), pos2.getX());
         int maxy = Math.max(pos1.getY(), pos2.getY());
         int maxz = Math.max(pos1.getZ(), pos2.getZ());
-        cd.setRegion(minx, miny, minz, maxx, maxy, maxz, block.to(Material.class));
+        cd.setRegion(minx, miny, minz, maxx + 1, maxy + 1, maxz + 1, block.to(Material.class));
     }
 
     @Override public boolean setBiome(int x, int z, String biome) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java
deleted file mode 100644
index 52da1ade0..000000000
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DelegatePlotAreaManager.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.object.worlds;
-
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
-
-public class DelegatePlotAreaManager implements PlotAreaManager {
-    @Override
-    public PlotArea getApplicablePlotArea(Location location) {
-        return parent.getApplicablePlotArea(location);
-    }
-
-    @Override
-    public PlotArea getPlotArea(Location location) {
-        return parent.getPlotArea(location);
-    }
-
-    @Override
-    public PlotArea getPlotArea(String world, String id) {
-        return parent.getPlotArea(world, id);
-    }
-
-    @Override
-    public PlotArea[] getPlotAreas(String world, RegionWrapper region) {
-        return parent.getPlotAreas(world, region);
-    }
-
-    @Override
-    public PlotArea[] getAllPlotAreas() {
-        return parent.getAllPlotAreas();
-    }
-
-    @Override
-    public String[] getAllWorlds() {
-        return parent.getAllWorlds();
-    }
-
-    @Override
-    public void addPlotArea(PlotArea area) {
-        parent.addPlotArea(area);
-    }
-
-    @Override
-    public void removePlotArea(PlotArea area) {
-        parent.removePlotArea(area);
-    }
-
-    @Override
-    public void addWorld(String worldName) {
-        parent.addWorld(worldName);
-    }
-
-    @Override
-    public void removeWorld(String worldName) {
-        parent.removeWorld(worldName);
-    }
-
-    private final PlotAreaManager parent;
-
-    public DelegatePlotAreaManager(PlotAreaManager parent) {
-        this.parent = parent;
-    }
-}

From 4152582ae088de36812e59f4522eb514aab41945 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 08:35:06 +0200
Subject: [PATCH 089/210] Fix UUID related NPE

---
 .../intellectualsites/plotsquared/plot/util/UUIDHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
index 930411c32..52e65a3fd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
@@ -100,7 +100,7 @@ public class UUIDHandler {
         if (implementation == null) {
             return null;
         }
-        if (uuid.equals(DBFunc.SERVER)) {
+        if (uuid != null && uuid.equals(DBFunc.SERVER)) {
             return Captions.SERVER.s();
         }
         return implementation.getName(uuid);

From 11689bf855a696f80f464c3aebcc77513aa81dd3 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 09:00:08 +0200
Subject: [PATCH 090/210] Configurable help categories

---
 .../plot/commands/CommandCategory.java        | 38 ++++++++-----------
 .../plotsquared/plot/config/Captions.java     | 11 ++++++
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
index f0ffc71a8..97c793be3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
@@ -1,58 +1,50 @@
 package com.github.intellectualsites.plotsquared.plot.commands;
 
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import lombok.RequiredArgsConstructor;
+
 /**
  * CommandCategory.
  */
-public enum CommandCategory {
+@RequiredArgsConstructor public enum CommandCategory {
     /**
      * Claiming CommandConfig.
      * Such as: /plot claim
      */
-    CLAIMING("Claiming"), /**
+    CLAIMING(Captions.COMMAND_CATEGORY_CLAIMING), /**
      * Teleportation CommandConfig.
      * Such as: /plot visit
      */
-    TELEPORT("Teleport"), /**
+    TELEPORT(Captions.COMMAND_CATEGORY_TELEPPORT), /**
      * Protection.
      */
-    SETTINGS("Protection"), /**
+    SETTINGS(Captions.COMMAND_CATEGORY_SETTINGS), /**
      * Chat.
      */
-    CHAT("Chat"), /**
+    CHAT(Captions.COMMAND_CATEGORY_CHAT), /**
      * Web.
      */
-    SCHEMATIC("Web"), /**
+    SCHEMATIC(Captions.COMMAND_CATEGORY_SCHEMATIC), /**
      * Cosmetic.
      */
-    APPEARANCE("Cosmetic"), /**
+    APPEARANCE(Captions.COMMAND_CATEGORY_APPEARANCE), /**
      * Information CommandConfig.
      * Such as: /plot info
      */
-    INFO("Info"), /**
+    INFO(Captions.COMMAND_CATEGORY_INFO), /**
      * Debug CommandConfig.
      * Such as: /plot debug
      */
-    DEBUG("Debug"), /**
+    DEBUG(Captions.COMMAND_CATEGORY_DEBUG), /**
      * Administration commands.
      */
-    ADMINISTRATION("Admin");
+    ADMINISTRATION(Captions.COMMAND_CATEGORY_ADMINISTRATION);
     /**
      * The category name (Readable).
      */
-    private final String name;
-
-    /**
-     * Constructor.
-     *
-     * @param name readable name
-     */
-    CommandCategory(String name) {
-        this.name = name;
-    }
-
-
+    private final Captions caption;
 
     @Override public String toString() {
-        return this.name;
+        return this.caption.s();
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index 5b2ec9ab2..b334d8dbe 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -844,6 +844,17 @@ public enum Captions {
         "$2Total bucket values add up to 1 or more. Blocks without a spcified chance will be ignored",
         "Generator_Bucket"),
 
+
+    /**
+     * Command Categories
+     */
+    COMMAND_CATEGORY_CLAIMING("Claiming", "Category"), COMMAND_CATEGORY_TELEPPORT("Teleport",
+        "Category"), COMMAND_CATEGORY_SETTINGS("Protection", "Category"), COMMAND_CATEGORY_CHAT(
+        "Chat", "Category"), COMMAND_CATEGORY_SCHEMATIC("Web",
+        "Category"), COMMAND_CATEGORY_APPEARANCE("Cosmetic", "Category"), COMMAND_CATEGORY_INFO(
+        "Info", "Category"), COMMAND_CATEGORY_DEBUG("Debug",
+        "Category"), COMMAND_CATEGORY_ADMINISTRATION("Admin", "Category"),
+
     /*
      * Direction
      */

From df3e78ee4003faab90a2ad7431fd86ec5d91ccc5 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 09:04:19 +0200
Subject: [PATCH 091/210] Make the "Display all commands" message configurable
 too

---
 .../intellectualsites/plotsquared/plot/commands/Help.java       | 2 +-
 .../intellectualsites/plotsquared/plot/config/Captions.java     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
index f186f3219..ab6fb73a3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -83,7 +83,7 @@ public class Help extends Command {
                         "%category_desc%", c.toString()));
             }
             builder.append("\n").append(Captions.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
-                .replaceAll("%category_desc%", "Display all commands"));
+                .replaceAll("%category_desc%", Captions.HELP_DISPLAY_ALL_COMMANDS.s()));
             builder.append("\n" + Captions.HELP_FOOTER.s());
             MainUtil.sendMessage(player, builder.toString(), false);
             return;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index b334d8dbe..092d5c6bb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -840,6 +840,8 @@ public enum Captions {
     HELP_INFO_ITEM("$1/plot help %category% $3- $2%category_desc%", "Help"), HELP_ITEM(
         "$1%usage% [%alias%]&- $3- $2%desc%&-", "Help"),
 
+    HELP_DISPLAY_ALL_COMMANDS("Display all commands", "Help"),
+
     BUCKET_ENTRIES_IGNORED(
         "$2Total bucket values add up to 1 or more. Blocks without a spcified chance will be ignored",
         "Generator_Bucket"),

From 14badf8cfc526994954f6b808e80125756ca7015 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 09:43:29 +0200
Subject: [PATCH 092/210] remove rogue debug message

---
 .../github/intellectualsites/plotsquared/plot/object/Plot.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index ee2e23413..674528395 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1296,7 +1296,6 @@ public class Plot {
             int y = loc.y < 1 ?
                 (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
                 loc.y;
-            PlotSquared.log("Getting home with Y " + y);
             return new Location(plot.getWorldName(), x, y, z);
         }
         // Side

From c450e4aed36b274f50352dda1277e70fbc7c767c Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 10:17:50 +0200
Subject: [PATCH 093/210] Fix interval flags (fixes #2302)

---
 .../bukkit/listeners/PlotPlusListener.java    |  9 ++++---
 .../plotsquared/plot/flag/IntervalFlag.java   | 25 +++++++++++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index b4dafdfc2..78b3dc269 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -4,6 +4,7 @@ import com.github.intellectualsites.plotsquared.bukkit.events.PlayerEnterPlotEve
 import com.github.intellectualsites.plotsquared.bukkit.events.PlayerLeavePlotEvent;
 import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.flag.IntervalFlag;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
@@ -130,12 +131,12 @@ import java.util.UUID;
     @EventHandler public void onPlotEnter(PlayerEnterPlotEvent event) {
         Player player = event.getPlayer();
         Plot plot = event.getPlot();
-        Optional<Integer[]> feed = plot.getFlag(Flags.FEED);
+        Optional<IntervalFlag.Interval> feed = plot.getFlag(Flags.FEED);
         feed.ifPresent(
-            value -> feedRunnable.put(player.getUniqueId(), new Interval(value[0], value[1], 20)));
-        Optional<Integer[]> heal = plot.getFlag(Flags.HEAL);
+            value -> feedRunnable.put(player.getUniqueId(), new Interval(value.getVal1(), value.getVal2(), 20)));
+        Optional<IntervalFlag.Interval> heal = plot.getFlag(Flags.HEAL);
         heal.ifPresent(
-            value -> healRunnable.put(player.getUniqueId(), new Interval(value[0], value[1], 20)));
+            value -> healRunnable.put(player.getUniqueId(), new Interval(value.getVal1(), value.getVal2(), 20)));
     }
 
     @EventHandler public void onPlayerQuit(PlayerQuitEvent event) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
index ab7100cb6..c8f490591 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/IntervalFlag.java
@@ -1,17 +1,20 @@
 package com.github.intellectualsites.plotsquared.plot.flag;
 
-public class IntervalFlag extends Flag<Integer[]> {
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+public class IntervalFlag extends Flag<IntervalFlag.Interval> {
 
     public IntervalFlag(String name) {
         super(name);
     }
 
     @Override public String valueToString(Object value) {
-        Integer[] value1 = (Integer[]) value;
-        return value1[0] + " " + value1[1];
+        return value.toString();
     }
 
-    @Override public Integer[] parseValue(String value) {
+    @Override public Interval parseValue(String value) {
         int seconds;
         int amount;
         String[] values = value.split(" ");
@@ -32,10 +35,22 @@ public class IntervalFlag extends Flag<Integer[]> {
         } else {
             return null;
         }
-        return new Integer[] {amount, seconds};
+        return new Interval(amount, seconds);
     }
 
     @Override public String getValueDescription() {
         return "Value(s) must be numeric. /plot set flag <flag> <interval> [amount]";
     }
+
+    @EqualsAndHashCode @RequiredArgsConstructor @Getter public static final class Interval {
+
+        private final int val1;
+        private final int val2;
+
+        public String toString() {
+            return String.format("%d %d", this.val1, this.val2);
+        }
+
+    }
+
 }

From 0f8b7cd588097d2d785561cb5b94ebd035d0edeb Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 11:14:47 +0200
Subject: [PATCH 094/210] fixes #2211

---
 .../intellectualsites/plotsquared/plot/commands/Visit.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
index e8ebfa642..9217d0523 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
@@ -96,7 +96,9 @@ import java.util.*;
             return;
         }
         unsorted = new ArrayList<>(unsorted);
-        unsorted.removeIf(plot -> !plot.isBasePlot());
+        if (unsorted.size() > 1) {
+            unsorted.removeIf(plot -> !plot.isBasePlot());
+        }
         if (page < 1 || page > unsorted.size()) {
             Captions.NOT_VALID_NUMBER.send(player, "(1, " + unsorted.size() + ")");
             return;

From 1c9c0d0207fb93a972a58b7e70674dce3774d559 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 Apr 2019 21:39:01 +1100
Subject: [PATCH 095/210] Schematic fixes

The 1.13 schematic format uses the `.schem` extension, use that instead
Support loading both legacy `.schematic` and `.schem` files for road
schematics
Fix reading road schematics with an offset
---
 .../plotsquared/plot/commands/Owner.java      |  2 +-
 .../plotsquared/plot/commands/Save.java       |  2 +-
 .../plot/generator/HybridPlotManager.java     | 12 ++++----
 .../plot/generator/HybridPlotWorld.java       | 30 +++++++++++--------
 .../plot/generator/HybridUtils.java           |  5 ++--
 .../plotsquared/plot/object/Plot.java         |  2 +-
 .../plot/util/SchematicHandler.java           | 15 ++++++----
 7 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
index 0e692748f..89416512f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
@@ -27,7 +27,7 @@ import java.util.UUID;
             }
         } else {
             uuid = UUIDHandler.getUUID(value, null);
-            name = UUIDHandler.getName(uuid);
+            name = uuid == null ? value : UUIDHandler.getName(uuid);
             name = name == null ? value : name;
         }
         if (uuid == null || value.equalsIgnoreCase("-")) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
index d408ce2fa..481acba53 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Save.java
@@ -64,7 +64,7 @@ import java.util.UUID;
                             MainUtil.sendMessage(player, Captions.SAVE_SUCCESS);
                             List<String> schematics = player.getMeta("plot_schematics");
                             if (schematics != null) {
-                                schematics.add(file + ".schematic");
+                                schematics.add(file + ".schem");
                             }
                         }
                     });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index b95913102..52dc99f82 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -31,22 +31,22 @@ public class HybridPlotManager extends ClassicPlotManager {
                 + File.separator;
         try {
             File sideroad =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "sideroad.schematic");
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "sideroad.schem");
             if (sideroad.exists()) {
-                files.add(new FileBytes(newDir + "sideroad.schematic",
+                files.add(new FileBytes(newDir + "sideroad.schem",
                     Files.readAllBytes(sideroad.toPath())));
             }
             File intersection =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "intersection.schematic");
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "intersection.schem");
             if (intersection.exists()) {
-                files.add(new FileBytes(newDir + "intersection.schematic",
+                files.add(new FileBytes(newDir + "intersection.schem",
                     Files.readAllBytes(intersection.toPath())));
             }
             File plot =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "plot.schematic");
+                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "plot.schem");
             if (plot.exists()) {
                 files.add(
-                    new FileBytes(newDir + "plot.schematic", Files.readAllBytes(plot.toPath())));
+                    new FileBytes(newDir + "plot.schem", Files.readAllBytes(plot.toPath())));
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 63b4e0c16..7c619f052 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -131,15 +131,16 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
     public void setupSchematics() throws SchematicHandler.UnsupportedFormatException {
         this.G_SCH = new HashMap<>();
-        File schematic1File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/sideroad.schematic");
-        File schematic2File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/intersection.schematic");
-        File schem3File = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname + "/plot.schematic");
+        File root = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname);
+        File schematic1File = new File(root, "sideroad.schem");
+        if (!schematic1File.exists()) schematic1File = new File(root, "sideroad.schematic");
+        File schematic2File = new File(root, "intersection.schem");
+        if (!schematic2File.exists()) schematic2File = new File(root, "intersection.schematic");
+        File schematic3File = new File(root, "plot.schem");
+        if (!schematic3File.exists()) schematic3File = new File(root, "plot.schematic");
         Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File);
         Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File);
-        Schematic schematic3 = SchematicHandler.manager.getSchematic(schem3File);
+        Schematic schematic3 = SchematicHandler.manager.getSchematic(schematic3File);
         int shift = this.ROAD_WIDTH / 2;
         int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1;
         int minY = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
@@ -169,10 +170,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
             int startY = minY - PLOT_HEIGHT;
 
+            BlockVector3 min = blockArrayClipboard3.getMinimumPoint();
             for (short x = 0; x < w3; x++) {
                 for (short z = 0; z < l3; z++) {
                     for (short y = 0; y < h3; y++) {
-                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x, y, z));
+                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                         if (!id.getBlockType().getMaterial().isAir()) {
                             addOverlayBlock((short) (x + shift + oddshift + centerShiftX),
                                 (short) (y + startY), (short) (z + shift + oddshift + centerShiftZ),
@@ -233,10 +235,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         short l2 = (short) d2.getZ();
         short h2 = (short) d2.getY();
         int startY = minY - ROAD_HEIGHT;
-        for (short x = 0; x < w1; x++) {
-            for (short z = 0; z < l1; z++) {
-                for (short y = 0; y < h1; y++) {
-                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x, y, z));
+        BlockVector3 min = blockArrayClipboard2.getMinimumPoint();
+        for (short x = 0; x < w2; x++) {
+            for (short z = 0; z < l2; z++) {
+                for (short y = 0; y < h2; y++) {
+                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + startY),
                             (short) (z + shift + oddshift), id, false, h1);
@@ -246,10 +249,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 }
             }
         }
+        min = blockArrayClipboard2.getMinimumPoint();
         for (short x = 0; x < w2; x++) {
             for (short z = 0; z < l2; z++) {
                 for (short y = 0; y < h2; y++) {
-                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x, y, z));
+                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + startY),
                             (short) (z - shift), id, false, h2);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 9b1018dbb..7214f409c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -238,13 +238,14 @@ public abstract class HybridUtils {
         final String dir =
             "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + plot.getArea()
                 .toString() + File.separator;
+
         SchematicHandler.manager.getCompoundTag(world, sideRoad, new RunnableVal<CompoundTag>() {
             @Override public void run(CompoundTag value) {
-                SchematicHandler.manager.save(value, dir + "sideroad.schematic");
+                SchematicHandler.manager.save(value, dir + "sideroad.schem");
                 SchematicHandler.manager
                     .getCompoundTag(world, intersection, new RunnableVal<CompoundTag>() {
                         @Override public void run(CompoundTag value) {
-                            SchematicHandler.manager.save(value, dir + "intersection.schematic");
+                            SchematicHandler.manager.save(value, dir + "intersection.schem");
                             plotworld.ROAD_SCHEMATIC_ENABLED = true;
                             try {
                                 plotworld.setupSchematics();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 674528395..5f8a3df0e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1882,7 +1882,7 @@ public class Plot {
                         String name = Plot.this.id + "," + Plot.this.area + ',' + MainUtil
                             .getName(Plot.this.owner);
                         boolean result = SchematicHandler.manager.save(value,
-                            Settings.Paths.SCHEMATICS + File.separator + name + ".schematic");
+                            Settings.Paths.SCHEMATICS + File.separator + name + ".schem");
                         if (whenDone != null) {
                             whenDone.value = result;
                             TaskManager.runTask(whenDone);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index 38869c2ee..522e45fa5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -80,7 +80,7 @@ public abstract class SchematicHandler {
                             TaskManager.runTaskAsync(() -> {
                                 MainUtil.sendMessage(null, "&6ID: " + plot.getId());
                                 boolean result = SchematicHandler.manager
-                                    .save(value, directory + File.separator + name + ".schematic");
+                                    .save(value, directory + File.separator + name + ".schem");
                                 if (!result) {
                                     MainUtil
                                         .sendMessage(null, "&7 - Failed to save &c" + plot.getId());
@@ -250,10 +250,13 @@ public abstract class SchematicHandler {
                 throw new RuntimeException("Could not create schematic parent directory");
             }
         }
-        File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
-            Settings.Paths.SCHEMATICS + File.separator + name + (name.endsWith(".schem") ?
-                "" :
-                ".schematic"));
+        if (!name.endsWith(".schem") && !name.endsWith(".schematic")) {
+            name = name + ".schem";
+        }
+        File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS + File.separator + name);
+        if (!file.exists()) {
+            file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS + File.separator + name + "atic");
+        }
         return getSchematic(file);
     }
 
@@ -267,7 +270,7 @@ public abstract class SchematicHandler {
             MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
         final List<String> names = new ArrayList<>();
         if (parent.exists()) {
-            final String[] rawNames = parent.list((dir, name) -> name.endsWith(".schematic"));
+            final String[] rawNames = parent.list((dir, name) -> name.endsWith(".schematic") || name.endsWith(".schem"));
             if (rawNames != null) {
                 final List<String> transformed = Arrays.stream(rawNames)
                     .map(rawName -> rawName.substring(0, rawName.length() - 10))

From b1835f099869b60058df85a8e363e303e014c67f Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 1 Apr 2019 21:45:55 +1100
Subject: [PATCH 096/210] whoops, wrong schematic

---
 .../plotsquared/plot/generator/HybridPlotWorld.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 7c619f052..8ee998111 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -249,11 +249,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 }
             }
         }
-        min = blockArrayClipboard2.getMinimumPoint();
+        min = blockArrayClipboard1.getMinimumPoint();
         for (short x = 0; x < w2; x++) {
             for (short z = 0; z < l2; z++) {
                 for (short y = 0; y < h2; y++) {
-                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
+                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + startY),
                             (short) (z - shift), id, false, h2);

From 6323fb00410871417407f7bab5802ba45dbbaf17 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Mon, 1 Apr 2019 17:39:28 +0200
Subject: [PATCH 097/210] Add plot like/dislikes

---
 .../plotsquared/plot/commands/Dislike.java    |  14 ++
 .../plotsquared/plot/commands/Info.java       |   6 +-
 .../plotsquared/plot/commands/Like.java       | 143 ++++++++++++++++++
 .../plot/commands/MainCommand.java            |  10 +-
 .../plotsquared/plot/commands/SubCommand.java |   2 +-
 .../plotsquared/plot/config/Captions.java     |   5 +
 .../plotsquared/plot/config/Settings.java     |   3 +
 .../plotsquared/plot/object/Plot.java         |  11 +-
 .../plotsquared/plot/object/Rating.java       |  47 ++++--
 .../plotsquared/plot/util/MainUtil.java       |  39 ++---
 .../plotsquared/plot/util/StringMan.java      |  10 +-
 11 files changed, 251 insertions(+), 39 deletions(-)
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java
new file mode 100644
index 000000000..ca807a263
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java
@@ -0,0 +1,14 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+
+@CommandDeclaration(command = "dislike", permission = "plots.dislike", description = "Dislike the plot",
+    usage = "/plot dislike [next|purge]", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
+public class Dislike extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        return Like.handleLike(player, args, false);
+    }
+
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
index 1bbc3bd93..4fb4d6859 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -2,6 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.*;
@@ -32,6 +33,7 @@ import java.util.UUID;
                 case "seen":
                 case "owner":
                 case "rating":
+                case "likes":
                     plot = MainUtil.getPlotFromString(player, null, false);
                     break;
                 default:
@@ -130,7 +132,7 @@ import java.util.UUID;
             if (info == null) {
                 MainUtil.sendMessage(player,
                     "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
-                        + "&aowner&7, &arating");
+                        + "&aowner&7, " + (Settings.Ratings.USE_LIKES ? " &alikes" : " &arating"));
                 return false;
             }
             full = true;
@@ -169,6 +171,8 @@ import java.util.UUID;
                 return Captions.PLOT_INFO_OWNER.s();
             case "rating":
                 return Captions.PLOT_INFO_RATING.s();
+            case "likes":
+                return Captions.PLOT_INFO_LIKES.s();
             case "seen":
                 return Captions.PLOT_INFO_SEEN.s();
             default:
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
new file mode 100644
index 000000000..d7c6223c3
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
@@ -0,0 +1,143 @@
+package com.github.intellectualsites.plotsquared.plot.commands;
+
+import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.Rating;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+
+import java.util.*;
+
+@CommandDeclaration(command = "like", permission = "plots.like", description = "Like the plot",
+    usage = "/plot like [next|purge]", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
+public class Like extends SubCommand {
+
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        return handleLike(player, args, true);
+    }
+
+    protected static boolean handleLike(final PlotPlayer player, String[] args, final boolean like) {
+        final UUID uuid = player.getUUID();
+        if (args.length == 1) {
+            switch (args[0].toLowerCase()) {
+                case "next": {
+                    final List<Plot> plots = new ArrayList<>(PlotSquared.get().getBasePlots());
+                    plots.sort((p1, p2) -> {
+                        double v1 = getLikesPercentage(p1);
+                        double v2 = getLikesPercentage(p2);
+                        if (v1 == v2) {
+                            return -0;
+                        }
+                        return v2 > v1 ? 1 : -1;
+                    });
+                    for (final Plot plot : plots) {
+                        if ((!Settings.Done.REQUIRED_FOR_RATINGS || plot.hasFlag(Flags.DONE))
+                            && plot.isBasePlot() && (!plot.getLikes().containsKey(uuid))) {
+                            plot.teleportPlayer(player);
+                            MainUtil.sendMessage(player, Captions.RATE_THIS);
+                            return true;
+                        }
+                    }
+                    MainUtil.sendMessage(player, Captions.FOUND_NO_PLOTS);
+                    return true;
+                }
+                case "purge": {
+                    final Plot plot = player.getCurrentPlot();
+                    if (plot == null) {
+                        return !sendMessage(player, Captions.NOT_IN_PLOT);
+                    }
+                    if (!Permissions
+                        .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_RATE, true)) {
+                        return false;
+                    }
+                    plot.clearRatings();
+                    Captions.RATINGS_PURGED.send(player);
+                    return true;
+                }
+            }
+        }
+        final Plot plot = player.getCurrentPlot();
+        if (plot == null) {
+            return !sendMessage(player, Captions.NOT_IN_PLOT);
+        }
+        if (!plot.hasOwner()) {
+            sendMessage(player, Captions.RATING_NOT_OWNED);
+            return false;
+        }
+        if (plot.isOwner(player.getUUID())) {
+            sendMessage(player, Captions.RATING_NOT_YOUR_OWN);
+            return false;
+        }
+        if (Settings.Done.REQUIRED_FOR_RATINGS && !plot.hasFlag(Flags.DONE)) {
+            sendMessage(player, Captions.RATING_NOT_DONE);
+            return false;
+        }
+        final Runnable run = () -> {
+            final Boolean oldRating = plot.getLikes().get(uuid);
+            if (oldRating != null) {
+                sendMessage(player, Captions.RATING_ALREADY_EXISTS, plot.getId().toString());
+                return;
+            }
+            final int rating;
+            if (like) {
+                rating = 10;
+            } else {
+                rating = 1;
+            }
+            plot.addRating(uuid, new Rating(rating));
+            final Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
+            if (result != null) {
+                plot.addRating(uuid, result);
+                sendMessage(player, like ? Captions.RATING_LIKED : Captions.RATING_DISLIKED,
+                    plot.getId().toString());
+            }
+        };
+        if (plot.getSettings().ratings == null) {
+            if (!Settings.Enabled_Components.RATING_CACHE) {
+                TaskManager.runTaskAsync(() -> {
+                    plot.getSettings().ratings = DBFunc.getRatings(plot);
+                    run.run();
+                });
+                return true;
+            }
+            plot.getSettings().ratings = new HashMap<>();
+        }
+        run.run();
+        return true;
+    }
+
+    /**
+     * Get the likes to dislike ratio of a plot as a percentage (in decimal form)
+     *
+     * @return likes to dislike ratio, returns zero if the plot has no likes
+     */
+    public static double getLikesPercentage(final Plot plot) {
+        if (!plot.hasRatings()) {
+            return 0;
+        }
+        final Collection<Boolean> reactions = plot.getLikes().values();
+        double numLikes = 0, numDislikes = 0;
+        for (final boolean reaction : reactions) {
+            if (reaction) {
+                numLikes += 1;
+            } else {
+                numDislikes += 1;
+            }
+        }
+        if (numLikes == 0 && numDislikes == 0) {
+            return 0D;
+        } else if (numDislikes == 0) {
+            return 1.0D;
+        }
+        return numLikes / (numLikes + numDislikes);
+    }
+
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
index ccb4558fb..90007b66e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
@@ -4,6 +4,7 @@ import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
 import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
@@ -68,7 +69,6 @@ public class MainCommand extends Command {
             new DebugPaste();
             new Unlink();
             new Kick();
-            new Rate();
             new DebugClaimTest();
             new Inbox();
             new Comment();
@@ -98,6 +98,14 @@ public class MainCommand extends Command {
             new SetHome();
             new Cluster();
             new DebugImportWorlds();
+
+            if (Settings.Ratings.USE_LIKES) {
+                new Like();
+                new Dislike();
+            } else {
+                new Rate();
+            }
+
             // Referenced commands
             instance.toggle = new Toggle();
             instance.help = new Help(instance);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
index 82bb3a17d..7f36f6a4a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
@@ -32,7 +32,7 @@ public abstract class SubCommand extends Command {
 
     public abstract boolean onCommand(PlotPlayer player, String[] args);
 
-    public boolean sendMessage(PlotPlayer player, Captions message, Object... args) {
+    public static boolean sendMessage(PlotPlayer player, Captions message, Object... args) {
         message.send(player, args);
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index 092d5c6bb..c163a10a4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -378,6 +378,9 @@ public enum Captions {
     RATING_ALREADY_EXISTS("$2You have already rated plot $2%s", "Ratings"), RATING_APPLIED(
         "$4You successfully rated plot $2%s", "Ratings"),
 
+    RATING_DISLIKED("$4You successfully disliked plot $2%s", "Ratings"),
+    RATING_LIKED("$4You successfully liked plot $2%s", "Ratings"),
+
     RATING_NOT_YOUR_OWN("$2You cannot rate your own plot", "Ratings"), RATING_NOT_DONE(
         "$2You can only rate finished plots.", "Ratings"),
 
@@ -693,6 +696,8 @@ public enum Captions {
 
     PLOT_INFO_BIOME("$1Biome:$2 %biome%", "Info"), PLOT_INFO_RATING("$1Rating:$2 %rating%", "Info"),
 
+    PLOT_INFO_LIKES("$1Like Ratio:$2 %likes%%", "Info"),
+
     PLOT_INFO_OWNER("$1Owner:$2 %owner%", "Info"), PLOT_INFO_ID("$1ID:$2 %id%", "Info"),
 
     PLOT_INFO_ALIAS("$1Alias:$2 %alias%", "Info"), PLOT_INFO_SIZE("$1Size:$2 %size%", "Info"),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 790306c2c..f2a669823 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -315,6 +315,9 @@ public class Settings extends Config {
 
 
     public static final class Ratings {
+        @Comment("Replace the rating system with a like system. Will add /plot like/dislike,"
+            + " and remove the rating command") public static boolean USE_LIKES = false;
+        @Comment("Rating categories")
         public static List<String> CATEGORIES = new ArrayList<>();
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 674528395..873d679e6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1344,7 +1344,7 @@ public class Plot {
     }
 
     /**
-     * Clear the ratings for this plot
+     * Clear the ratings/likes for this plot
      */
     public void clearRatings() {
         Plot base = this.getBasePlot(false);
@@ -1355,6 +1355,15 @@ public class Plot {
         }
     }
 
+    public Map<UUID, Boolean> getLikes() {
+        final Map<UUID, Boolean> map = new HashMap<>();
+        final Map<UUID, Rating> ratings = this.getRatings();
+        ratings.forEach((uuid, rating) -> {
+            map.put(uuid, rating.getLike());
+        });
+        return map;
+    }
+
     /**
      * Gets the ratings associated with a plot<br>
      * - The rating object may contain multiple categories
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
index 8d327188a..00fe5bcc2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
@@ -9,6 +9,9 @@ import java.util.Map.Entry;
 import java.util.stream.IntStream;
 
 public class Rating {
+
+    private static final String LIKE_INTERNAL = "__LIKES__";
+
     /**
      * This is a map of the rating category to the rating value
      */
@@ -17,22 +20,27 @@ public class Rating {
     private boolean changed;
 
     public Rating(int value) {
-        this.initial = value;
         this.ratingMap = new HashMap<>();
-        if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
-            if (value < 10) {
-                for (String ratingCategory : Settings.Ratings.CATEGORIES) {
-                    this.ratingMap.put(ratingCategory, value);
-                }
-                this.changed = true;
-                return;
-            }
-            for (String ratingCategory : Settings.Ratings.CATEGORIES) {
-                this.ratingMap.put(ratingCategory, value % 10 - 1);
-                value = value / 10;
-            }
+        if (Settings.Ratings.USE_LIKES) {
+            this.initial = value == 10 ? 10 : 1;
+            this.ratingMap.put(LIKE_INTERNAL, this.initial == 10 ? 10 : 1);
         } else {
-            this.ratingMap.put(null, value);
+            this.initial = value;
+            if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
+                if (value < 10) {
+                    for (String ratingCategory : Settings.Ratings.CATEGORIES) {
+                        this.ratingMap.put(ratingCategory, value);
+                    }
+                    this.changed = true;
+                    return;
+                }
+                for (String ratingCategory : Settings.Ratings.CATEGORIES) {
+                    this.ratingMap.put(ratingCategory, value % 10 - 1);
+                    value = value / 10;
+                }
+            } else {
+                this.ratingMap.put(null, value);
+            }
         }
     }
 
@@ -44,10 +52,18 @@ public class Rating {
     }
 
     public double getAverageRating() {
+        if (Settings.Ratings.USE_LIKES) {
+            return getLike() ? 10 : 1;
+        }
         double total = this.ratingMap.entrySet().stream().mapToDouble(Entry::getValue).sum();
         return total / this.ratingMap.size();
     }
 
+    public boolean getLike() {
+        final Integer rating = this.getRating(LIKE_INTERNAL);
+        return rating != null && rating == 10;
+    }
+
     public Integer getRating(String category) {
         return this.ratingMap.get(category);
     }
@@ -64,6 +80,9 @@ public class Rating {
         if (!this.changed) {
             return this.initial;
         }
+        if (Settings.Ratings.USE_LIKES) {
+            return this.ratingMap.get(LIKE_INTERNAL);
+        }
         if (Settings.Ratings.CATEGORIES != null && Settings.Ratings.CATEGORIES.size() > 1) {
             return IntStream.range(0, Settings.Ratings.CATEGORIES.size()).map(
                 i -> (int) ((i + 1) * Math
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index 17366dbbb..1ae9839b8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -2,6 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.commands.CommandCaller;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.commands.Like;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
@@ -776,25 +777,29 @@ public class MainUtil {
         if (info.contains("%rating%")) {
             final String newInfo = info;
             TaskManager.runTaskAsync(() -> {
-                int max = 10;
-                if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
-                    max = 8;
-                }
                 String info1;
-                if (full && Settings.Ratings.CATEGORIES != null
-                    && Settings.Ratings.CATEGORIES.size() > 1) {
-                    double[] ratings = MainUtil.getAverageRatings(plot);
-                    String rating = "";
-                    String prefix = "";
-                    for (int i = 0; i < ratings.length; i++) {
-                        rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
-                            .format("%.1f", ratings[i]);
-                        prefix = ",";
-                    }
-                    info1 = newInfo.replaceAll("%rating%", rating);
+                if (Settings.Ratings.USE_LIKES) {
+                    info1 = newInfo.replaceAll("%rating%", String.format("%.0f%%", Like.getLikesPercentage(plot) * 100D));
                 } else {
-                    info1 = newInfo.replaceAll("%rating%",
-                        String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                    int max = 10;
+                    if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
+                        max = 8;
+                    }
+                    if (full && Settings.Ratings.CATEGORIES != null
+                        && Settings.Ratings.CATEGORIES.size() > 1) {
+                        double[] ratings = MainUtil.getAverageRatings(plot);
+                        String rating = "";
+                        String prefix = "";
+                        for (int i = 0; i < ratings.length; i++) {
+                            rating += prefix + Settings.Ratings.CATEGORIES.get(i) + '=' + String
+                                .format("%.1f", ratings[i]);
+                            prefix = ",";
+                        }
+                        info1 = newInfo.replaceAll("%rating%", rating);
+                    } else {
+                        info1 = newInfo.replaceAll("%rating%",
+                            String.format("%.1f", plot.getAverageRating()) + '/' + max);
+                    }
                 }
                 whenDone.run(info1);
             });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
index 739c31bec..c7f30e1fa 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/StringMan.java
@@ -245,10 +245,12 @@ public class StringMan {
     }
 
     public static boolean isEqual(String a, String b) {
-        return (a == b) || ((a != null) && (b != null) && (a.length() == b.length()) && (
-            a.hashCode() == b.hashCode()) && a.equals(b));
-        // return a.equals(b) || b != null && a.length() == b.length() && a.hashCode() == b.hashCode()
-        //    && a.equals(b);
+        if ((a == null && b != null) || (a != null && b == null)) {
+            return false;
+        } else if (a == null /* implies that b is null */) {
+            return false;
+        }
+        return a.equals(b);
     }
 
     public static boolean isEqualIgnoreCase(String a, String b) {

From 6b422582a6a2e7440267f7f82d73a0fa0d6d6211 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Thu, 4 Apr 2019 00:19:59 +1100
Subject: [PATCH 098/210] Load WorldEdit onEnable

as otherwise it doesn't work
---
 .../plotsquared/bukkit/BukkitMain.java        | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index e09bedc47..0009ba553 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -48,6 +48,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Method;
+import java.net.URL;
 import java.util.*;
 
 import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
@@ -57,26 +58,9 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     @Getter private static WorldEdit worldEdit;
 
     static {
-        // Disable AWE as otherwise both fail to load
-        PluginManager manager = Bukkit.getPluginManager();
         try {
             Settings.load(new File("plugins/PlotSquared/config/settings.yml"));
-        } catch (Throwable ignored) {
-        }
-
-        // Force WorldEdit to load
-        try {
-            System.out.println("[P2] Force loading WorldEdit");
-            if (!manager.isPluginEnabled("WorldEdit")) {
-                manager.enablePlugin(WorldEditPlugin.getPlugin(WorldEditPlugin.class));
-            }
-            System.out.println("[P2] Testing platform capabilities");
-            WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS);
-        } catch (final Throwable throwable) {
-            throw new IllegalStateException(
-                "Failed to force load WorldEdit. Road schematics will fail to generate",
-                throwable);
-        }
+        } catch (Throwable ignored) {}
     }
 
     private final LegacyMappings legacyMappings = new BukkitLegacyMappings();
@@ -114,7 +98,26 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return Bukkit.getVersion();
     }
 
+    private void init() {
+        try {
+            PluginManager manager = Bukkit.getPluginManager();
+            System.out.println("[P2] Force loading WorldEdit");
+            Plugin plugin = manager.getPlugin("WorldEdit");
+            if (!manager.isPluginEnabled("WorldEdit")) {
+                manager.enablePlugin(WorldEditPlugin.getPlugin(WorldEditPlugin.class));
+            }
+            System.out.println("[P2] Testing platform capabilities");
+            WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS);
+        } catch (final Throwable throwable) {
+            throw new IllegalStateException(
+                    "Failed to force load WorldEdit. Road schematics will fail to generate",
+                    throwable);
+        }
+    }
+
     @Override public void onEnable() {
+
+
         this.pluginName = getDescription().getName();
         getServer().getName();
 

From ac2d43db68d0688f1f2ba33de1735b00ba426e59 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 3 Apr 2019 14:41:54 +0100
Subject: [PATCH 099/210] Update offset to match CI

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8e2b970de..1df3aaa8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2042;  // Offset to match CI
+    index = -2043;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 69b05932eb4ac06ad7466b027bd4fe5ca8ad1c8c Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 3 Apr 2019 17:15:09 +0100
Subject: [PATCH 100/210] Update to gradle 5. gradlew clean assemble build
 actually WORKS

---
 Bukkit/build.gradle                      |   3 +--
 Core/build.gradle                        |   6 +++++-
 build.gradle                             |  22 +++++++++-------------
 gradle/wrapper/gradle-wrapper.jar        | Bin 54413 -> 55741 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index dfb4b7055..b7c87d99c 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -7,15 +7,14 @@ repositories {
 }
 
 dependencies {
+    implementation project(':Core')
     compile project(':Core')
-    testCompile project(':Core')
     compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
     compile(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
     }
-    compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
 }
 
 sourceCompatibility = 1.8
diff --git a/Core/build.gradle b/Core/build.gradle
index eadb2e153..48fa09110 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -6,7 +6,11 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'org.yaml:snakeyaml:1.23'
     compile 'com.google.code.gson:gson:2.8.5'
-    compileOnly 'org.projectlombok:lombok:1.18.4'
+    compile("org.projectlombok:lombok:1.18.4")
+    compileOnly("org.projectlombok:lombok:1.18.4")
+    testCompileOnly("org.projectlombok:lombok:1.18.4")
+    annotationProcessor("org.projectlombok:lombok:1.18.4")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
 
     compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
     compile 'com.squareup.okhttp3:okhttp:3.14.0'
diff --git a/build.gradle b/build.gradle
index 1df3aaa8e..a6c24bba3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
-        classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:5.0.0'
     }
     configurations.all {
         resolutionStrategy {
@@ -18,7 +17,8 @@ buildscript {
 }
 
 plugins {
-    id 'io.franzbecker.gradle-lombok' version '1.14'
+    id 'maven-publish'
+    id "org.ajoberstar.grgit" version "3.1.1"
 }
 
 group = 'com.github.intellectualsites.plotsquared'
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2043;  // Offset to match CI
+    index = -2042;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }
@@ -53,11 +53,6 @@ subprojects {
 
     group = 'com.github.intellectualsites,plotsquared'
 
-    lombok {
-        version = '1.18.4'
-        sha256 = ""
-    }
-
     dependencies {
         compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '7.0.0-SNAPSHOT') {
             exclude(module: 'bukkit-classloader-check')
@@ -66,12 +61,13 @@ subprojects {
         }
         //Minecraft uses Guava 21 as of 1.13.
         compile 'com.google.guava:guava:21.0'
-        compileOnly 'org.projectlombok:lombok:1.18.4'
+        compile("org.projectlombok:lombok:1.18.4")
+        compileOnly("org.projectlombok:lombok:1.18.4")
+        testCompileOnly("org.projectlombok:lombok:1.18.4")
+        annotationProcessor("org.projectlombok:lombok:1.18.4")
+        testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
         testImplementation "junit:junit:4.12"
     }
-    clean {
-        delete file("../target")
-    }
     repositories {
         mavenCentral()
         maven { url "http://maven.sk89q.com/repo/" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0d4a9516871afd710a9d84d89e31ba77745607bd..457aad0d98108420a977756b7145c93c8910b076 100644
GIT binary patch
delta 49840
zcmZ6RQ*b3r*sU{}*c02fcP6%N+qRQEv29Om+fF97Z6`Z+a=tp};?)0F^+jKHRd>B>
zt!H&i`OoggpYZ@l-p1QGz64%%$iSvM=O0P^W_Srr?r;@r=Bqy;!NAU8ll~InB>4~F
z0%O#5G|)8AzhW~?4e=pO1cM@j0H}-+&CBX_P14=OKNx=4if$l{kwnXz&yNks++g{9
zLiaosE9h1F!8X;bFRgq<eMRwGJ!gywq6SvdFK4j5Uv4~K`8^%pSo8`&I>HH1hwldl
z{*WE_lo=6&>~1UCWv!u3A5g28rGp_U1R6p$8n-V8TnOK}Lm!)(nnhEe4s=CBLR!>Q
zAB@NkfnuX|q3z*3WQ^M>Qa1=ZHTr!#4MMjA%<8A;xPk)_rcr)dXom9iqezou;S@=A
z3eML=8{Mv1TV?RvzcolDT8>O#92Z<;?{_mMZ>kjz#80luv*@`#1dc5{6Ljky1LfZW
z?K&~i^vzud$2&R>oGr3RbbslDnnV;&5`5<7a=KNfPj|!`VT}4k7?m>NP!c`g&E=4a
zt!{{C2;GY4*UKbNT$`JO%6~spTq{0#Z8*RF^q60yONp+=;(|Ts2^rpc7|<=*lf+J=
zwow?WD<x^6Ld_q3MexwL0v9m|0tOCh$mV)1eBoF<aiTrf;m2dyxcS&y20nQF(s=D;
z^IlU)su%8O<o|cyV6&<&CZ15yXsj6$t>1iCxp@nEq|z?4p%Bq#32sz#PHnD~&xQZ3
zG+QH0V^p~h6I;O*wu19yH;5Lr?pZL<M}Xs@mQFoZr@BgA`65U!vHP#A4Ctt&=7juA
zV|JdAY*3J_HJaFQ*&U^;%G)P0t^<+{*C|uJCE+(d-9|Ui=@DtFe8J9B90q?#D$&~u
zl)%W_w~Tkl!94d`(8O%_E7^DP&EJ>t6|?*-5)Ud8R}pCqM;-r8h^)OuT=HSN)Ln9p
zLEWK7861}Cw8mtgaOX&(1>QJM=^bSv%fkCwYs}18g<^!mLoM}b*1#dJ@7|6ZN)NZb
z$QM2F4eow-=^?zgUWjxEWl128xid6#O0PC!9hZc!i#FVP%f<k(d@5=()(SF6rgBrA
zA+J#BoB{83`*+IsVhFrV+MccHohxo(I_zwT{gW`Hb|w^15+XK}z*=ryDmeF}%2-GA
zuF=eaH{}H1kj^B#5ix^($USbk^_7$1+o5HnW=KN<ZN*%`#wxvCy;P6otSG`ou3uWm
zn{6S}w?6x8MO31WnCfCz8w-Mj4wN*WD515rt`lR4DQSCghN&=DWz^Z`<l_j$jeSaj
zoRr5|Wc+BZJMT6*@Go79h%|%XM*K3=srX^bG}c)Xui%dPEfzQ$S^ToeLuv_Cp@pX<
z;-$v=WuKEaS+1ji{A|S=9JXj+?qW4IDFdtd&myX%XylkGqtQ#WVCQ+Fc<1~%+yM^J
zhKqQcQ%#YR^d=+<#-%zoMzJMa_n44_y;J-7>+z6+tu@>yV6@o&FY!Q2Mt0d7ABUmh
zUKAhtNq-UKAW8YVM4kY7?RV;z9|KM(gAa28G5)#(M)ZP%b_3df(Gor|1p2-2i~-TV
zkWogdl_AK5d-3L*;1h-+vxj8RkJzhAL979o{0avc^V}+>0|GuN)B0pm0;?`?loQzT
za}0$m@5p1Pz{Im>c;;iXDQ5YE(<~K>Pm6I{;h8h4(<wxW=V~J$;%!DkDOx_8a-8d_
z1U}(ef;?=Z^=TAg+1{>+=>DDoq10vR$v1C*zHXDit~Ei}%HPkk6!qB!nR3`fc5puF
zI)(W!gnmp{%c8=3JTwSROF0J=wyU{*Ud7H|-l6Hy<N$0Q5YyQl#}oI#2T)PwCj>ee
z7z_*;7?=>4rP7yQ!GF8?Bs(Y$U^A^dQy}~bRCl1juCT6W;A-e9YGR_Q4*-j>Pb7k7
ze;MZ(5xM7C|7H}e4_5?ggqfJ!!p9|J6H6O)L}vrrPOOK1SPzAgC&}spzA(0-XFZ#Q
zWU@*{_jiKL7#>xHH22p8gL?2>KlT}?wkH!GiCtwIrugkbak7?N`j?d?(+ROFD92tC
z0xKWOKiGekOBWT}I)MEP?0=qldAdUo4;&0kHc1JZAE<yPgwEH<V5`@nsbME}C?dF7
z;2vc#x0oJ}i<)FDsfaqbFe|^#F(J>Eqx}{oI}7dis~|$4kI1Y`1&(tTeJd;{!)NCA
z^JaU7L2vIjgd<TLfvn+jK$I4q3(X`?TSN#triv!(h7MAy(}oauPYed02lhx_h*Mb}
z8~MivCQzh--X?I*m?C=k;^{h8(cwj2^j9ruCGYw^E&GW-b2*+-lrx_6wcE;i2Z=F(
zdV6YQzaP%1a0=PBHS7R7o$^vp$9}UU1i^5YTz(){1DZtQO6oLRGIq(iumegrnVKCj
z)_A(n+>FNdJu+{22vTT}H0L!d{R<g<ZK~|bGEhIk=o+6msF7x)f_7PC!RL)jjhSD!
zh(!wb#M3z4)^dxUU9Q(bM|iF6q~OmV##@K|^a-#e`gKh=s}5w@gfLD*7WA(hR-6W^
z5qS!8an7muvtML{D?wBCGEsV=uxwZqu;rZy6aHpk1!~wUGOvv!p;RJ&z9px!V-sK*
zCV+@F%gOtuq-Q6s6A0}j6fG0x0}Ev9L%iL%SjRGbtU(anVBC;R^9al>&R`dGcJ!vF
z0^9KZLlo(+4`3k2lx6aUe~)9e)Yi`JM3P<iiDB6HBYf{D<qmC*U?&q1*%IuAd8Pt$
zuWVA6$dV_qMX>23ss?W~)#^J~c-M435P;Kn*3OIc>pA-e5L??kot@H!mu_f~4OFVs
z=a2vSZqUx<IEs+Kz#Is`z(|supa_ACCbmW{E;(AThUhC^U;b9jY}zrwn$t&j#z73O
zxY7NXoSdj>f-w1Fr0^q8#4$x7OR>B>@YHhqTnyD&!A({N<dm^FL-N_%T%2_HiK}kf
zn<dpg0J|hYtE^mm?_#+uE~Vb*r`eh&r5teY``GX9@2~Cep|qaoH72lCQWYRcRX-ic
z!(LSL<!7X|zZ%Di+I@xgCkI+D;XoP)56Yh{7{#A1cm=dU!W+AzG<8FpxuY_56IO=<
zG~7i-{7{0C0Ue<Xyd0qLM+zuS04p+U(_gG%i2C!&k7p1+Lf*d2U=((3NIo#Wv^jt(
zGWG_5+g6efg0Jm9f%KPA6d>nrp7q}^c5q64<h{Jx814`FFOFcD7XaFKjro^I&VwAs
zz1+|5^21lAC0`ki@9NBNrKwi6dxE8|eABm@h?@}RKR7Cek=V)@1M<Fe$=3c9f~e(6
z-NaMm;xK&1naX$r_o%GJ(<m}>OIh=V<D@^a5Umi#jA64Hf=kDhMS!U|4V%drB~|R?
z#^V(zp{C6=HnLik(|Qt8hfpd7B~^eUaTR-3vmhEgxpplA$0!oHP+L?@zVhS)H>xYw
zbt(9P&s-mWYmE^i4`qMj)h9iL*;xTc&z-(p&C7u6&mcc&$a%7|8+R3}9r;%gch&<{
zI(WGA4yfnrEjEx~74YOG*ZOaSN`Da#=P@XGsk;WS%yPU&CRKWnZJ{8~tuIllze&Q(
zb=^pXA35u@&Tr#EezmA6G5L&I&cYbh#(U^_7Mz93F7JJvep0m19no}Cw76%Ng0yp$
zD?_2@Qv^i%Jp;d;B1!R)6IfFMIh4sX_K_hc5-8ZpBRq!n2&7b&H!$B%J|JjTplD{i
zuFJu1=nlp`q5Apd8Cas<8UGJ`PEWCcNOTKOIg)7v;K;<D@SNVHo;9zvR~CI_*&*b2
z`IkFsV-kC~24`<Mo|EPL5!)Y-%bOOwQ4dIPWrrRl#8E0>DH)f-;U<$`S17vc!X1BR
z1$)XSa;ID(1p)w=o=-)-qcUq!aA~)RF7j7LEupgOx9%~&Uzv*!6wJgW)P_`ZP78R;
zCx`wNn%0(HH>K`e6peg1y)~eiY}t#m7|jw9W1PX8ySLHx=_R|H;pk9`kK?EpDF3kr
z9KfeyE&a~ErDEfcxn4!nt&w(oZ`ik1uy&t|Hy6=H09tVrO~t#5a8o<16S_fl2ODnT
z>o{cEDBzMC{i{Bd%ko$|8v^M9?JG`eUZtr=LqelWI&^WGsW{G2`Q_KFEH;+;%8hb<
z003&?Rno7UT*oi%a@!=ML>^WXY80-yY?<V(v75MO3=(KqmNA>NbP`d6rSdLGcO99X
zpLMOHz^6o5vF57a3T#Qpfh&q&p(`zS_2kRh)746>)0C;eVcGLN+4-lO{sId7s>^ui
z=H?@1+~Y|pLhtFvGP$-(E`sX7VmS;2nDTZKDvp9b?TmnbgZuky#rwLmawm$-%W`S*
z*LR^fhxzGQx1j_n#?e>8hOLz@^x4B3YWH=JK&&K8!axg>YFr{5_?x~#_MNsHg%$<c
zI>ki1hT+5wkd@FoIH<|!3qypzVJUutVU2Qwp<U#<sYu0L(-Zxs0ff$PKBngk_)!s0
zrN<qSlQ3^<jGJmKewN4$EVaI_Kh$3{+q2>|*`w7jf=%AFTR%>9m1?EvG(%>pgha0c
zn$})6n)W_mJNG39&D)HTP+XbJOXQKG>w0EL?clH+)=_*qi`EsT?}bI(QiY?(M&~vz
z%q7NLNo(4xSP2+P$;RTcT8_ozHy$#eV)Z2+I1eSFjU%dC?P@s_={Fq~Szl{7^Z)fm
zt{5>NbWzaq{GkECG45j}6B@$exwl#a4Cu-2@tf;s|H;tteLDA5CLUw?+g5a|F&3*?
zC7JUI;l3h#np9-bqY%<G)>*|hkJHdK7%L%-D@BR@YVNB@WKwZs9@boyUBwjJ#sZzz
zy(Z1mhOkI|aw?!kmb9FWJsnL!YqTCj&u=$YHt#Gu!XWj}DlmF|L%wC~i4jo+n40}-
z8#P}GL^3-w<|0E$o)T9)-;Ec^gX_HOvN#2se4+v;6xx<5J1)|6yF1ry=b^bT)e&7&
z=OzWIiz>Qw`TBH^Huj_vu_*a&ztQ?xE*17y_Tpm0@|GMK<Wk^vyZ%rT{<kp<5i~C?
z%SB<4OFxv^;0`%jRCt2=^#UFXR46K>S&1uQOG;ui!;Wyak9_&X$LuOON+(2@EtB!&
zJ6^WA52?z(mN&|G)D}%)p@wNqY$K2r#z7}AKDbn{>1gae;<#}28y&G;gVWB&P^X(^
ztDc3xZasZF|J#oCOxsz08cl}Q)N|(An4!^~1Y$$?UpwzIN;TcqjcWHDFhx5Ox*YXx
zUi6v)KDO{6*N0KVv6^w}X;pQ+btbLNOKaGslJ}`Z6Dv`NVBwFZ?9>O1ACRG}f$^vL
zW5&HGOfdnlmCf2BF*<OGLc<6rhrdw2zL`({SawCT?bJM~dv_=!AvkTB;>3wE;l|nr
zoyOv#b6D;^YEn|=$Xccv$f3BUT27`u^}Dgk6JDkA$4Nc{-GY|LmU8|`xvm00ae?)_
zhFYn)X>npnWa|in+U<mmZuji2spL#F4VN=DM6}0w%5yw3#K~(fK8qskO|-+}DUgPN
z`yC?@okC05DD#73(@~=sTw(3wonP%#jzc!#sJb|-bJUKh#5M~T=sq4<te2@h%w25t
z`eXZda*g9VC}!Vc-ZTMMrGqg;C5wRTuW8Ni6AE9bzd{>N4`mtFJ!-!NvRxM{ObZl@
z2M=NgaDqNR?bl}>-(df|=2q*PHF%I8P$Q^IHLo;|Qo8;Eyp|Z7eaX&zJ7mq1NM@~%
zJ>Y8`$(W?b**R2*17{2xE6g9GuyW>A3L{z1O4>2*Vs(eo`sGdewR+-9{8CEqM(sWX
zf@zr*`Du8;udC}$hPwEQODBEQt3Lc~noLODmia_hcC`9qsc6$%=0!wts%*wJdbPCl
zr9>W~?DV<BBmd?36ad_q4(Txb8Wj?E%P!<rzwj|=H7f$)fL^p!qqq-3yTsvYlDq8h
z7GSC*W4EGXTp@MdG<8Jkagd*KC%wL`AUx75t!xvY+(My6;ywpEm#C%|Ig#9jQCX`2
z+7_jB({J^sOqbvnk}kRLmKt?7)Gd{&3ReY|%4PcPT#H+3jm4YiWe$bHiuNP8imZ(q
z;#quHT_HIa-~|RmyW!-W9(2%^++j<=iJj<A`w`{MK$y%r%&aDQ9TzH0GcAo|vmEtC
z>1V?EhO*p5+CDA*^gCsOWo2-g!DF>WeThMi;C<GZj>@`Z`X%jDsP5hrPRl`5SIcd6
zdxP9(9*%1Iy+bljEUm*T?P>s{^;7|WRH(@mL-m3tkiF96dXs_one(aj+@-LcK`aMz
zFYJ~qbA?p5FV6WSuAXRDHu_TnezIbPm3r~!^ZXTbR%O*5IYN)=0aZ(a-y2Hd#H!C7
zW9FA&h&jRYbBZCMk6nHCkd7xtk{CY%TdOJ(qCs;@tFa9>kBvu;L%WkfwX?g%-N&zp
z(%8Hn$k<cea!w<wJB+9$N;KLqW9auXLT}#@ig*hevD*BYzk4%l#=5+EoVa*swf7?E
z=2UtQpqiWi0IwL#YOv%lp~|^(%ZAmL(Dc(z4Pm6O1^!|XY7(0~H*3~v;^(<1>@H=9
zdXk)SOHat8=U%TV%wTKfkILf4Qqu=4dYjGxWoFL)`XJUWnARTPy=A$aDX>)i;c45J
zitM!f>ck=D!LfXvoqL|A>8$&y_puQ}cqt_CG{5`K9Q=vBHwl5n+=s*(k2FW(_W~O_
zPoc~gME2r^u<NDVD}26!GMeUuZ!iq&i%50rwy8j~|AKk4-3Pm8B53W{t6A6lz9S(8
z#09bX<KL8swC=)og$dcjA3%0tVd2msvv%%`>ef=Udc@yYl~_ja-6eSnod3J!b@LH8
zFCVLXvGNrxu3W?#i0Jm^s!xM2r7a&cc_FS43vsoVh)I7z;g_8#>+^?fX5($!?!*0=
zg~)5an-~y>?K#jVfrx<J6aewhBDB37h>~Jiar4(EG!g0q4K>%iOl}Qsu?ySNIdp89
z%b^$)24QPnrZDUxlQ^Q<JM_=uR7hK?c=^p{72jdnII6BaMnLD)g$LMjYw^y0-KIOa
z_IKN{1LEiM!2$ajeUw7{ofVXD>@d?|zMF;11pD=+jSoh^$v_UnVajl<Or0wjaAz3I
z9&yJHk>_Bcjmp;nvojNRQ18QhZfY`nxB#EAggQ({MQ%QxP#tBh0AaK<qO}pbyD^-E
zCknd(Ew3oZiahkIl%26h<-lzTudFaG6*Fa3khJH(g_%Z*718;KbgG^wiZ4ui(5G<~
zYun({>%r9NZ!L$fVvNsE{L#umV3=|CB|;PI%6kLXrWP8ksCC;aR;@kkvxQSIM3})y
zpV>8Ug*#H}O*BLis++|wZs`7=30&9q9jX|6286`v;*XfK`mUHvD;!0Wq#r$rw9RN#
zH>T1AM#_lHF(Vn0$ZQdWMsL(UTN3b9<ij(&7GA<U4mo)yOnn(CvgSwqK&N#sz%xwu
zSJVr|6BG<e+M0@|U%ll;)Orm)AYFfEk1bhAs|`|(&D5aUB&i(K1$VZJaFZnH6p7}Y
zs-xeR@&V}<L3T7bwa3L&CbD;6`>tJk09CMg?%M_OURzqt7>;Ps?b0=O-STM1W|??o
zc*Q1o5gPv@DVYm{bxM;4lA5_Fy-jhaYSk$2SM^LWfRDMdD4!GWh*hR~{E5=IHP)Z5
zjgNqvOxjCIt^@e?rat|kuzL||$qA^d=I7W`IY&c424t@HM}G^_6YiE$Vp^mR?f1j@
zh?8SSWiixyn$)Gl%wcv$Calp<n)N3o-_uCHu%vPjS(t%f&HER$s($6pbzIHBCa*Ar
zo4iy#MT<%3E_8&zg5@oAh}Gfctt<&8Ydt_dS$j@%b`9yrCo|bh_eQhm39A{Y;#AHB
zzugQw1%F}v&zS2KAX||1j->z;+(;FRhY?eLmm(?&Cu1}D(uv~#8yCsG?v54K`8#{%
z{T8BbpfBhoUm<;{g3+1cU{+cuV@eJab~N~w{@<ZqWMDN{-jmHvo&n6Dq8j(UUM8DS
z$7i`jHR{v|M0ve#oqh|YQNAlFD#JmxShbl}1LimSz-iV*Ru`8pTWl4z46*BMEWR+7
z{QIoUYQX#dO5=q=VVgBjU|_xoNw?VCK#dI-JPn+00<HP=N;hAt3iT;Dc{oXV+v2@M
z(kztGW|h~(w)%r*3UWOes;7}ky?X6omS=Qf_z*{%fKc#3ct6ARd^S}n5W*g0`W{Yb
z@1M~g&;SBL`p#Mk{tjvh;rr$9o!9G~n|Jrmlkcx553txh3vT}4la0Rzkj;};Ku;wJ
z^t^dTAqo7M%E8j5>w-|3YELOUIk9XF86^gaW=X^}o%+8mQQRGdXN&G)gUWQa1X9Df
zqFNF^VmqANR6!Z)p3(-*82;ch1tlg38gBFl+6d>R2a976>L4w|yakX~z;s08;6a)=
zJQ`VA$xK`<rasDPZkw?_hfB*Dkp8g5Z^juD3SvD>uk<`CR={SRgJ$+v$LwtRW31v2
zHOys2TZ^8f@0lKlome!ocI;6eO1K$Z$YqtF>nej%oymanVTQJszBk)(7efkPtL1uQ
ziAA|f5cVS$gY}qP+qSTMKbuU;B!iE6F=_YazvcqHN^Om!GP8+%V<q)UU{Z+*qhws{
z$kZQV=49A|y3Oo;JQxLzody@N6`EyU1#W-))h0VLC*n?$^TvA((>aat!{*4NYUUx9
z4%5zIihypCLXqxau?43hJwycNNQxBd_BkF(^F}OM)<$U#=&v{d@al2>vZBg%zmdDs
zj7r_}2ielY)WH{#7OG`CV9tiKgq!x@hTFmhDK--Fp`1PAm~^pLDizW7<L=~SA8bmn
z)eb$QTxN=(>>w7quhL)|yRVj@#jELXYdF<_<+`?`Z11ts^Wm<nzt1oEu3FYmB-8f!
z2*|S;l;WgRJ39Ji(}pTzjWykjw80jgl$j;^vkh6ZyPlX`QV0kZ;D)*_Atd2iK-ipY
zCr9mS*<%1SS)&0g-sz~@&oHMUL84d~Y&;P*5Ni)9Xm$CTN3HQP@d3dX1AyR*SPS#e
zU0XwZ{C2gU7@(07=<mDL2LNRTI8+?zc*gX#JKXC|DOGptlLr(I+D|bS6Rap;@mamG
z>anQJFBDT^FQn-KnW~91dt^7PegZ^9b~qg|Rlwr}U{b+<Ijr@0fb@Ru3_c_BhPmMC
z13*yz#PR8{7P9Nz+3Eq`@%O}X$dOSE$@-iOd1J7$wXM3`wqH#*P`QURPh?$IyO=dL
zFZBVf%*A_DQ2vn@^rxSH0iql27y;n#gmCT0pF!*88CwKE=n+aLb4)&u->Ono)1ffA
zaLxpjm262{+;Z#<*(?)Xn>l0G>}>~d1o9E-W4689jB{XFxB@+Ri4aIvt3g@la~qys
z5#ca+SHp(x+G=^D!D?H~E!?M|S>L5*o1SdePq6?A59jDNSLd3Ox>B4ik&@J7A37uD
zXMy-mmSP?tz)UZ5QlZLPM$4$ybR_w)J7Zw50qw}Qsg=_2vpe5wKGj^!o|U~@`Oz#R
z!cBHmZT6UXom2T#g4t#E=OfOKCgKo;29(nynm~w-C9u67ohcOl!mbO6*bAlH<9`bU
z`VZZ$B;L<mQIa>?9&>l{#2>1}m`Ce_kHqVaFr6SExq$W`SL#sY1G2p|VMB2U9y98J
zPl;O==Q-I!<nVj~6opz+ZjZLuRoZ=*)_kW8Z3!KZKpBD&yQaLe13UiA$mRMA%v|M}
zSU`f}%(Tv_me`7}NK0py@S%SZP3L>=zfn>CX+^@TPef9{<U!`Y*5dWAU=lGI>)PIs
zgGx!@^rM@AJ6_z0Nx3FLxi2q9?LovJr>olX7lKQv;WkCFi5Q;M_owxnl*pc#lIOV+
zR;AIe>z|uM+lM0wos#f}kLa*`0m9xGr$s@}h(!+uCultP<kv?rh|wc_$KN-e3a-py
z1O+mDN~pgQ5U0bIlJG0^0a|1zaL}+nA%jhT5Cc-n$E20U4Im0<HOcA*d!|NVfL0;E
zF}v~l;N|z-3nUas2BAQ{Tn%CF9A<ma>LZ9K_WN*Uua`NNLpB^{8ZKsGy$`1QH$x(I
zI3G6JI}0PyE&s%OVLDu$bHKmyUB+r&#F*5JrWC3ePs{zV&L7$s{nuz*LLc}=(+Y{e
z<-q9EB0x~|?9k5X0!=}AaIYcu4Cufucz>khkeWgvi52lmfUBHje8<mbHHH(>+tHVk
z+*;C_8pHzifmiy*fOueYNoXg*&%Ej+%l>u}l#YOVi17U~Zv8M{zl&tq9Te2*RQ6H%
zNEr$Ja4*Cf9bfvZt!CQ@@iod<JWyZhgKXXBX8$L+0~z-%(wGu!%Yv=UU&aW{*^UpU
zfQP8A_P!optDrZe5rM(d@!-&ZMdDie*~q+^pG5yted8~K>An6dCqk3*h&X{8@*9FE
zeDLJ%(E*FeGH~e9G~`V~kn8jCVg-hRq`Jw1MZ98^T985YWTW{721`*8Ws-iEBE97m
z+!w(z#K?z6=1+&0lfN&v1it;hz?p*}A(f(~JSk0d`yuvGQQ?HslW%pa3`A!GX<(%w
z;YLhPNqdu781ABjwL-tlOw52zfaW9vIVQ%^=nwl5$&-~9P6Q|hH$%d#4m)lNz5}0B
zmA5`-*Q~T1c?UbZvm9Ojt$!@8^zHJ)0D}JnNKO9p1{5=88-ttMia%jsXc<G*fM6$M
zpTOx_OdsZ;9{1GNYI41%d+G>ZlEc9#Q*~jO)$5>!jY_jZcSbQozYf&>zRWmceSTOn
zY}eV_&h!~lsqxWdNP3u7{yB{jLuHN0pkYvNE1w-3?SP2{m~>_qAE1Ns>M>jip~Y!E
z$7tJS9m<T6iu9-To*QL$Qm`T~8j)6qRk&UtLe;PI4EhcASRy$0!Z7EMS03q+u5t^8
zE3$JH_f&4ZCU(stS_53K^h9Q*yBJ$H#JGQv^s8;Pzajty?tm?Ia0pXj<PotnrM2~5
zwVTcg7-7flbaO?Rdz6>rB-jh5uREQj!#P>XCm5aUGhE1ru<djwzcX)}a^}tshR@?!
zi^<~Ssj;}KQ1UM^{MdFeVfZyLWKq1T5H6pggd~?6;0I655((S`yX+^6w2t}n13@{~
z5GL*-s~2MGk5%;}zFqs{jv^DvxKbrZLykLa6DDGxhqR!I4vGd=3BSmKSF|IHCe{$Y
zP$P&!7M0Q$5qePPt3YQU94e#AATym}X&>PDgTf=!U5?^+>FF#tO?JTrH0c0tr%`p<
zzNO*w+5heNu>OD17umQ&@dyV7)`krRM*Cm+fth4TN(`ibKfE`>%b);{O>Z%?rK&;^
z0W-mKMB()O6-Is-kE}y{5$$TsUP&g$JzrGJc4og`VzrQ3RDC%jC26tl8s~b`{cJD(
zeIuX9fds1U-SzO^d4KZWnMj)9|G@skVH_06z*Sv<Uz<8%b9ko>S*xN%+h6S29SERq
z+lcb%@&pz_bV&_o-C{CrpAT=Kcj<{Wi&l;B9PV|~Zbx{~c(z7*A-(Wp@PG)%p8VUp
zG#GFGyW;KI-Jfv$r^7g~-il%jgvuZij0unth79NzBn<`~MH)17zTtdSTt(UFAZ-aK
z{Nu4qmoRBUi;3`g--Nd7rEL=^JWO><gON9a2BhT=nyK(a%~Jt+K^iF5|1wZ@qU$*v
zPNV48=z6ILtR2fUNDEUK8+4FlRPef$8#~p}_tok5C?Y96y3=E_Pusciy7j~G*oB7k
zKOK%Ezl~G-fDlNTm{I+}?^V2&`H=3fReLx9fWx~#wYUXyBO^VyJrQm$HJ08R&TN0x
z0CVks7@UUt>pDc7*C(X%(-B6**rKLy*^i*65;j6TTF#@upeJ~^KDD}qaPu_yTF+Cz
zLv?V!H_i@w&5{;0OeJUzt&=J$?=VyES^>gns%g<9aJI(kMZ~)d1kgE(63sQ^kj`(z
zH%kKuZP*i0G%;8Y$Qa0+{J5-}vcoS9fCu7TW~JR*H<wSR3D_}r(YJKWy<dX$V=b<H
z{KEbmjHBSznfEE)x_{^U!_ygfNR@(0Qx2Sx!qkT(CBy%q0^};mgf|<U_;Q(FOtflp
z_biKwxA5^6Oa|vyyE&0?Qo^QIomdkgF5qF`<SFP)Y#r29k%FEOaJ;CG+c1nifV!gV
z&Y>=+;rcn$hB8>cpD3y&o6K+-uUtJ571#8Rv9IW(GRer4*P=EHP#Tb>G*UucbJ+)^
zCdj|w03V;Pn)6pVRD<Fp*|>h5ZL`qeSSu$IWI(E)mE6YoF*fkCcyK1asjB5_qR-z*
z*&UK;XfP&9L?-LBp}adiDXA@_fP{57s+02y<}nEr%NA#Qg+32XJXshYslM}x&@r9^
z=DYy1mcQI_JTUSRik)o<%t^O(bE(9!`Ejt56BQd6cnaD`=|$`LrsUk4Ho-Cf+ET<C
z*A(bVcRk?znd(Zu23}PT)2i7>xeXf1{90J#Nv4=84$Wy42RYi*2Vv}&fsSbQi;fV0
z206X50rrm{z@kC8oN?c5DKsO~2<@xC928@9R>@MudkQa&fxVV5bYJ4xCg8=RiNAu7
z^xuKWb)mfnM7UoOK$@4<(C^(|+3~Z$&0;F?3{KqK5jNc1VHaG~HkCmdUWK5LPIPfC
z7#11BgeW<^hFXb2dd;*!Akw`kz4iIvCCT&{EF#m0oofsA*t318ajkt!3kB*3whI^I
zEw3{TMwyGy_H=G~U0Xtr>D$IgBr6HW^b~34g(9aytJ>IdWw^6kS%EMb?oTFj6%M6{
zjn&W^BlRH-7}dkXa9SmXvt#Ok(g<7@jbHcdEC%$7L&9<|!=z%mz@ms@W7uw|T;pQ0
z()(fnP9v#__><yY?b6V&GW?7YZEeIKP1?F*y|`gnI%eD1e=MN@l-To#A+AphF58ix
zR(TMfc@RjWQ}u%B8apI>MiA%fl;@fE&P^w?zsPK@j59PDhpT6Yq-myijImr)Hp`EB
zCp03sp{h0zR;dHnfzrea)Mdh~oU$}7Te#hn=VC#Wfdxv2KfQ`J<cQ6mvjmMdVI+_w
zqW1*J-I2bgGBsmt*6Q`v;ccq7WD}`(_;A9CLO5h(ve1R(8TL`t)7w;k*|67Rw$d2q
z$i8Ns1-P{QlIrG9Qa`IRUmSCY^pbvx8<|3zc2ydrWl=yF0>+MLqVr|YS&I1$%GTVn
zve})R)eMe!X+D@<huuFk<g(vKD)G%>5=q74uv`dNn7xj}9ypqk<CMnGMR~i`v)q9*
zG+U%+XdiH!9>%XR#J8@78y#)e!?UI7-LB>rm68Trv9;+rx78`wTT`!2B+y$mj}e|$
zG7S~iPcZVP0~NKFL0<#E`_J?)BB7#j<hWl`F?1t`^*xA;PSD3GFFWp8-8)HHSN>dB
z>5sNTQis|>$_ebI64j7q>->A1yh^P*qW2(pfYU>9HPZ6DxHhg3Jvvk!#P0%$YGn(#
zU!OZI=b+u+UFz%Sgf3N2D5*r@9VqF^v))1=b1u(N1EcNH47MgEt^AkRoAmU#Vq==7
z_b~>LW{tRO|C(i3%P_m&hPzc1ql6jT%*5@z2=%OGN5sr@lh!Ph9=3vXEiTOt(Z}T%
z*St2Yw({j(t9ge~O*7nOnEH|zo(FU-%y>Gk2yjY!KxIY(deJ6QeA3WU6T=?Y>vD)1
zXaOAjz!Emcv`)|OKkzX+hsW)+>tZGr(H!SPrLC5K92^UIMip<I%v(YpYfhB4hh1y=
zhOzG3y-w&1aAPwYZlGuK{9pMQyV@dg*$4Zg=v*S&xx=@2E-Ma0JS}S5)z}6Pd17m%
zz73FCGu$k;g8-(P5=jRSo}WvIL7I`ywm)_QfJ8y7$N`mYS&%93`PqJu&l)F}bnOE1
zjkTmiBt-1GwPZyh2K^3Jj^O)3ct^x5tazGH7wy(a;I8=lt@uU=Xi-D^gpswxm$y=r
za2)alrpQ<d&*;)&l#0vew?4{>Pw#xiaRWT6`zr6DygiXU=uPP63PE%fZPJ0y3i+AI
zKo@P9&*H@8lV=E(GAo9xp-uJSS`=;05HHb;yn#S;%r~!nhsU>Wxg<?;09JEqZSK&%
z`cf@aX`Sgm1O5>0nw}`CU+I1GH1v3PK2&wS;B+N*iP`GKiU2zgrekM4DL`#Ov74*G
zPfX%)3d<qxsu4zZ6QUe<48~%I<pJUcAUWqQrtRTHF@}dBoBRRXW>mFj@J^#;qaWAx
zOT<gq6*2$7$szTpb}X#uiwx8`2|vArlCanF0d>L9Iy9O|_}uf#y+D%g_`f}{SQ4ZV
z)(x)A*a4aHix*s(#0{%+4}2=@w4@gN0KSi@6K(EIqr1#u2Le9skhlE5wMO9mKq>b5
z3@b$wB+GS{6jg*%K}7DeOoA4rdjj>g0O`Ijw;@jH6sE(bzQ?nV3PWNIp6_XNQ!Neo
zRJB$AA6lEqW^<_{I)-%F!f4-_ehfV_%5ARTHgIcKV@9pS6S1|=?44m}+~po=wY(wC
zG*vQ2esFm1J7H`2G`9HG*?mVAK$?Q3R+^BhXTyAmw;B*{B!dV=e~*-HPG3u-mEJmK
z-DfmI1suPwI2A$Dh4|jO#42(Ar|UWxW+Ti+20){Zw>a>}zWVJACU0IR?#MNyC&_OH
zaTVMr(yu9TsoKDaT=Dimou3FCdH-SwjBy5aq?3ObwAb>5#BTLdF>fq40~eGWp&NZH
z$`Z7%tsmTq9glLCaH6+RP22!+!g3bcW(gr5xs9DyjrQ(=xs9g!6TaKxKQ`*Nz5)@;
zqOP|_)cgr_bTV*vnV72QSILgqMy)f7Co;~2I=VA{to{qOG!u8&^T6xXn>?e-n3+cw
zl7>q>cYm|MY;W45@GQR?1d4Y>dohM<3GH<8UL}Zo=8pJ6dhiAn!?{y~_^EzMgL$C9
z>EGhF3w|Y*=k?{BwIQz^362QmWe#k2vO)Gu^`Lv35mU`kHI|c89WX#qMu^dupH)>f
z%gia2LKy!V)@-9=FgMYbJwksQ>rO17WL8Ws0vy&=$~K~T7RNkRpnv}_DEYRJeVoL^
zAO!5csG&uG5SsJZ8egTpDqDE9CG-U&lD<?mCnh(zJDIt61A=M(y~)2IA%2OdNnYe7
zkuAx}Hu$YlU>c@}?oYE|n<MpWIyTtQElNzuTsw#Ff&S)kc&K0-4QlSrf}<80*2GRZ
z6*pJ1pLQ@x7<<_gW-zY%kk)KNg>gTT`HeX)Q-J`yUx?rkRojuFm0_vbWTCP9=Qra2
z44aOEdygj2U|_H)Nkojaz*iu?8G--yCCkE8a7h4ES_?|?>{P0$&+KvuG=mgff}D0D
zWqv+&($<-I=GY`R&&E$=UXVIE6HF<Um>A8ftxCn8g0gV9@!Br}e}3@u`{_%2&MZ6I
zPotfCAKsgHzn&eBr)FR;i1d$~rwtCC2&aTuQqokBt?U|plo4AA5M7g{EM47j6lE|u
zo69*_<M!8Dr*kneo&u-X8h#u}5E@JN5DmujcuL%VtNf)+^;Hz%c`wQNNM-7Uou3Ty
zI&EQw^MILuCECeXpVL6`R;>M_7`rFBcF3{RHML*E?EX*Se?+7s5?akyWEfy_I@EeN
z(pubnGvxUv44oHPWhmZH23|etW>bA+>T0t&c>`b&*^PW)`E1K&%}LI_L9t9_)oR>*
z%&6&0Ny)I0N9S9pm(Z=OFvZiiHZ9AOrYq7MsgKKSFQ}CH9WdQ=aIE}WV@6y2Jh<}Y
zJ~Rs#{%u=Z>3sBJ3qj#LtHqXpQ69bta+-c?x;T`^@T3fg@<=%~u#N~`iRX3J3ZHAQ
zrEFhnm9=dj@Qx+}%h(kx-Z-ws^r{%8<Pi%O?2|+9;ODj86w|-|5WGh?Pi2a~KF>;D
z*kLp7<;6m;K=b!;gL6v9JKxaJ`wEpxt1}@CX#urxG4r$v*?ux>T0?|rd>jToR$cw*
z4f&EMgXIo*R5w)O<}vR0^A>Z1xgmuAB-rk^cWUH8k%W+d^~2JF$bGi&I+wj>5z1`~
z)N;E+@qBU$jNa%i#5xw?n`)0UD3&`V2Oha0i&8t3kB^Px?};A<WE`!hZ2tj-9-oj<
zKN`4(T1|i4a6p8KxVW$;r|q%r7F~yHt4F;cBG?^}Tg6px@JYG5OY^MeNA7B!iYuGA
zqlWfx{4M3^y=@B%`cgqu1nljiBsEY`=*_+luKNKdqE4OKAm>^a(FVtZVOVI+YOxV=
zkAhBf4f_Y!C%DE+(#3Ltl^LSOAo494qQV~g;Kr4#m8bUf^X@3Fe_)=qr#PoTl8wM<
zBiuC5(i3S0UbN%B<HG7CWRpKi%exvPbA+d8I5E%#_t;T?5Wem2ZW^wC2o^_Ia2m%4
zZtolj&cAZcV}9U24c<IuqaRE<Kg6kBbW)g`y}5;k1TKPbzl!$UKC}i6KpJoWV&aU2
z3-oH+uq#gjv3Gs89id}aPb8i>hQCNS-u=LOAInEXuL8g=01=q><&fmj<XujmfAtm*
zU!}!*oFbV__oH%GIF>c+1nZ42$gR(bj_Uq%G5azzDu^tFwI<)kUmw=iL9-1vHCybA
zQ2JlyLLysNPzSG!pnS-^kl%WlLd@$vt=)#~ZH;IUZHs03Bp+=>E*d?oZl0y8*adLH
zs8Q>*GJY^@A`_JZ{>SvuP`gLLuBO-wSD8;z7dBrK3tZJZp62U+ym<}}-{h-Cor9Uv
z;1XTyR9rV{2~ZCbI;{f27ix|9m=IoxN3=L$(^=y6q*zg<-PgJaVUIsrl`{`9Sx0-=
z{*Im=7Y`uF3G0#)-u8Npf2RYq8~{mQ0l-4*7VfT^YiX=d@qOhneb%S=L4_D@W2tdf
zLx-=Ox{G8i0l5k-xveMBD}Rb&nnKz05TOI|MmF1bz5fO}s^H2I81b81TKbNV_+n2B
zhr<W&H?3xiB)x|&c&aw4uJpV*zHJJU`^V0XS`Q7O<)4-ZUAZ3H&P$nOF(6}EM$ias
zdoYs!t9@wSRCr6vI5ehVZ}sMV#-mS9lmE=<^35ymJ(Ey)FW;)nmCkQm2{iO40OiVz
zFu6mfm`Z~UX1*yeZ<He|VTKqvPTVwUCNK2SZ)wi_G`r-tKB$L!yAxanLn3~#7qYX6
z+H~LYHVFYa2Qt#n@K#1aK43O)R0(RTp5P_uH#;<2b#Q76-D+~(2fjc>8!oNUFv4;b
zQ@$P4l`e`i%W9i5l12_J`vzeEDu0ZlCDzH_?<#y<zMyi7&nAt}hv0)f)EdI1<r7eD
zgQZS3xE_VBNIt4MWL9PItLF>vaxe-q^l}YBWnbo?8{ZdW-c7C~FVLCr1|z+n@wazg
z--M!1ft!3yX_9BM1?+4x!Em9ACXf4@08<Ksgmhc}(90|la8p-f+Y)Y*QvM(}S2E{}
zTn-AR__pP-pItR~yQ$A8MmtSZG;B*Pz_TcjY-kG4>ms1m(-es&bBh@>E;|6F+gLIh
zbfdLu5f-ENl{W*S1?<S7mrKf$_%}iS`?r)jzob0BsCq7iiav$LHnGH)(3Hn4)v{rp
zX4ofb#D*x7J(dWU<b)MV=#N`4sNqH~;@r`APsqW2H+)nF<3)?TU-X4rIv^o)q4d<{
z1NYd1#m=ZN=zjtYwUcwfo=`!X7+j?C`(Q|k#aaoY1fqDPi9nz+%plCdC>(x)E(F=)
zJT=i}%={p>hW(#6q<Of-RK9&ZPvQQY8{^`@LAa6ckZlt<?j6dyPHNoLY3*lLifbfg
za2f%zz7JZXgN)FOVn}eaMKv~Cfx`(P_VY`3EG&>|5N~@%DOx$}Lw5-HzpMj>9=tXK
z`G3I8mJSSz`2P~N>rq7Df1iteRhO0os2aP*K&#*+2p8cH4bTIWKN3&^MU(yn4@>^i
zr(_!YXFJ_R0^4lOpl;J#t;3+bQej!Frie-$X|oln)2wDwt!`J{?7#k`^H7=jHRHpU
zB*hBzFK+XBTW^|g;+y_?y3v4;S5y?^BO$Bh-qA{2l1({NX+C-yD4s+%h5d?uQ6fC8
z=9wMyk|MErc+87~#}qR<h2~knp0vrEQQCIKol6^|v4^(Fo?1HgfrgQLz3&Uy8f8Pz
zJu89L-7VqMrREcxN2k->FDcKyI96tKQNc)?IH9*Pmr-GfM!LffIqC4s9k@3e0S8PS
zCKUnmqv(#>C0F%;^d?lDG;wKdFX&#3Q^&OW$H&(C*CRSH19Y2BU_M5ds#faKDs<@b
zXmF*SZSvmd81{;uDN!1oF9>Iv2PMUu)Kl7k?(qwB{aO%|7vF+h^X6emif`%w-j*uU
zqQ)ISw@ZqDI<-W2Z_3{KkO9ud-rhWqoxxt4imxLplWPSyTzzMoR5CDib?I^Yn{k`g
z7P{g0KayXJm;2$oGZ?uAaHE@xlyG(?CfI(HPF5{6n|mc-E7A)zXr1WWH6Xy2Yt3W~
z$g5#jhxF#v{w<g(eg^*VN|<E|5)POpRgD<(VCg0pHT-~`WZ^XxS>fhp17NDP)9oyA
zU+ZXYuEYg$*4AiuCeoB%<J)Da6V3|T9mR+*5?SjEv3GIfN8)Jz)2xNu?}%bDc7__T
zv-3{2GS=f-SKr25(gyeTl2DBjeX#V(`5m58lj<lzjk2trUSgW5*~!bo*eS|h*bPSy
zmGx8DOS=TJa^b{q4x)PjD}3~0;{oIAkN(m9S-mE(8*^TEdz?+F?Dsx+ybI$~*vANJ
zNh5rZa7}IM;i)ZFjYWe-n2u{ng4<X8HVQK5#auHk)G)YF9;Rlk*yml&X%pU+zoxzN
zNX{^409c#HdqIc!>BJ{Xkd=`*ET^UdcGJ=hW}J1X0KT@WCC(NRBUVm0jqllkY{;lA
z9BMPr@V%_}H{;Gl!H<$(n6L5n$+bEvQ8evmD!3cXkzV(B2SO!tKYsmZg#Hff2zhMn
z+LyFTEZsejRMs_;@-RJ1sK`D}RApx69mV|vxWZ<i{?fu!@r0fX6f)oidn{q$tu`c1
z8IavJv035CSdHt|)@)cJ&%+3ok!>j%bv57xo&!3@F9O8CoZ5Tk;&2)o)S`2<)(bh&
zBk=xK+6YCnF7DdKwzj}6HgYlswQ_j$zh&mLn3<?V{Vcf^Y11~ZK@|buW;)n(W3o7v
zfQI3K8u>ndnmD)0;F_ye3cr?XTq$Z`!+z9g1wjzeKBLGU732A}6W)t`{+dXA!UUoN
zonsr+4S5yyPXHLq_J5gN#S*`E3D`Yu`?gZ)m0wWlcg*YaK$GY0Tdf?F?pYel$$N!x
z5T$B?sUd$2rYwe<|3m~{YH|@io>4A`o#p)6vN&Zp4yQBhN1XR!6Dc;(4q<{U7YFJ{
zvh6GRmBm8WVw1Ab6D-7J%J+?-a8xe?3x$C6lqjKSh$T=?4G{VVDxa9N52+j-%f@1Z
z>2s*Dcr-AXI<+toL77JBXqP`knPwx{$xutnZQa=Eo!qoGiR!4Gf~_WJVOa~11z#$X
zHyEU~)^wHd22$rdAu8nZ_FIJe#vM^yLv@Ij_6!x_`+HTZU?kA=i$TwS4S=@5Ac5c_
zh<-cB5DTFZ$10(u;WY+t!L(hRslW8Hs>V)iT7S%Z+kLO%87hAEm~fguc>mGPZ_U8J
zopl!&%FCQHo1fa76%lWuGyA2op{X64u1ZFRT4Wfjih%MhiK>;d%;Y35`AV^NQv9nD
zb~wnJR&hhN<&vSp6yD5-6?B9M+}b)++?zoE>KRBQ8+so|sA)1BQdN&<ku)=(2_$5<
zVCy%7569ffEZ;h7G@mlAm`LwTjJR$SQBePX(`~MI$##v_B~#Wuh2^%mB8xm9j-=`3
z1-4j2KuX&sR{nxIpeS!yH($-0w`uy^fL8%C&j}$a4iIkcHhs2Z2JE?PIBlECx#pBo
zhL6?J*4nfjv4?-NHrCIORXLOLmM-=<<4f^A6H3|sD^T`8%~vun_CS!rSmaRYD!})5
zzStL%lfOn;1@lv|_-3Ah_KMhai>Ts*tVj8%^2Iu&HX+VN?Tf{r^iJW0yXb%np2M#N
zWuyG=(f6mQWEzV77O<_M0(~iRT;K?AZ{w`cDi#hdKE+`_ORXowLG6|E3#UNlxIt)d
zL#-$1M%4>zr}%E`!^P@a$qQgmeaCd_b{P1TVzW;&NVKTJl4UhfUV^{<;N8c=CcwF{
zfx2w6t+)y*_+V!T{;Le>U}lI6#!a<UKdzQC)u{dT)Iu8X1ALSx-xo~taJSaiz>$vl
z`qbda3$jlEjy*@_UaNQ^?+iDch0BsZ#TrG`0bU-t6up>sYUih1qsEaz{3)IJ81{fl
zn%)_NzHP@!02*>NuIz%dus^lHB7~)RHrirG*VQ`b)<)F@No_tPSz=2!fq!8)y?`m^
z;oRR9%M}E6V26kKh_g=#02R?Bf9@!xq|=lM-mn<<PYT5dNsC6LdaVG|k*JtBc8OT3
zXEU{?3<L|<&?aO3<_0bzba&=T_=rgXQ>7#=T7TCWWHFYTN-;nnl}K7#q*m3B)zqz&
z{aR+xA*Cc=a74!p(?|qL_4*fJz4q=0f0<+LICA73kZ51z-}2{N11;`S2f1m*2XlAL
z9oa|Oc-+{=K^;yvrKCIHT?BR%?S(hs(zl4!0_-xexpi=b5TOvgo*^BeaAeRgB6uW~
zlDA)~<}V)4#pv=HV&WYdZ5>noLI14{Ly&sh{zJHUoGm5qq%vVgECl=;D{%oTRg1Ql
zdZEM@=vG_|lA-+$HBf)WfOYp0ArldX6kFQ!{5$Mwyjb8EYszvS^Po|<z3kXDPp5Ry
z3imC4r18p6zQ6QCFA6rh%Xt-JCCF}1^GhAgnn3#>N@<iyY#;p|_J#G{jWm}!rZ7h7
zoy|wbK(EFt;#bhP!yOUJvJr+aZSSx{<p-5N5E{~A1XZFK`9&{f2MyvQ<2#XkDxO>R
z=$T^vQw_voRrjclNIg4J3cdM2!m<f%Jlb3SpzxM9PIQMs`<>$;2I6(Dl8DH<{FNu}
zrQ!53x=W5EdtW?!6k*_mEjKFfy#+8fyb73iJlNg0c|ZZ;{QYjqOt!Ku@pc01wb>{H
z?jc<ugum%U9tW;#drk9>;K9{}7hVbaMblE_`--vn&lWX_e6I#ZkNV!s(f2pKde)fs
zEPskm6Sqt)$Vzwl7q+o5xh>Tn*rXZ!Y<8a<Fsp&j(cbq}OSvsFEr1-u0S(npP}f4a
zfCv9bV^nVm`!h)VmqzFxG^~XM*9{gS@aS$B>9QH7hm(=63ew|NGRj<1Dg+7Mc{(-N
zVHF<k=*{e*58GN_2#IZg?%l!I8Qz-Bcr=1cF>B7=So;YzXY7Z&vC!k}YxzW0BAHBz
zRmTJj)vMx1eWu}1pVq>f^)dWCK6~)$NPgzjKYx2l@xxfQ;~mCWI30upJ~Nt9pg-fj
zuPsW-p}VtiE7Ec5fjY<NKtS7n_6$L`O|Oh~H;41E<^eBcX}9ECmzPomu=p#X_K&XE
zS&sk0-_(FxGx0Us_R(MTnOHO-BF3A{KwGbdm!I(3@U|ZNbG85KhN=IlR)-9bB!~Qv
zDRY9vVML!)gyxcvlPjTX_@)&*1I~Ux-3bgdM0_>DWTs()Lv54B&iFc~eU3aJQ`7_(
ztx)(YS!}=4^D|B&wDTnrtLAkn%CJ!wcb$0;qSfSn5Mp~)Z;LsXCedq79_+BRi{9yv
zy9^z4Z^{I3R0%e4D^aseaZ$cSCGKlRDD5|GCRW?Xe)c4C*8M|3b=yM{1xhUneEJm4
zjJ1UY4v63AE_p*hS8?2&7-Jf;ZYz1g&C9WY+$~KzF)NWJ9y9+C1|x!f7?E@@Nctji
zijQYuludLfxIndPKX>H%V<Wah(JG|5_35o7fX+dX0|gWk&;>2>RI~21<fPDEr@U|f
zhpTgZ&ZO(Rb|#wGwr$%sCbn(!jBRsb+qP{x6Whj{y6gS&TvgrwKzCQK-(Gv|W1%r-
z$JWra`#By2#XRG1R%Zg_aT=${<+j{o`ZlFcz0BzcR)TZ&N1Qwr;Z4vV6FMl(R?R)z
zLl=EmI!oR0DMd-&M>YPm$BJDry1nqNLmr55!%}y#q{xB7FIYew{<8tsiHRqQB-0V(
zCt%tMB4^tPs-U@-eW}lT4t*egfM9<glZE;#9noQ7%$uPID+&*oh3Jf`ZuGj?N>V<J
z8%dKQe+%`>>SAdw8~yjdAr&F*MbVNu%=_c1!|pdAFroQ7Lb}ryh5rGcHcR)eZgiEt
zZ40U{tmusoM4Ml7hAnNipwof=T(4~o^OfNyToW1f;N9}mSTINWM6r`=N36J1_ds6W
zeX$xFIL@1ij*kR54PTSX`_RjpQ(fhS!#2M@%@v#osudBh{B>cLrF!IOx0v_#s{SnQ
zmY3pz)1nK?>a4i#O0dmPf}|{AdyH#Qs+)2<Z0DI4Zkel`TRe6+YCp>A$&o9ad@^=h
zV0ouynJkFPSdt~Ty`h+A^%;OezdrNYE^t=vE*&y0Hvt1gi*-O+=g1OUFz42Rku922
zu`bBm2`bV$BQ*))`f?>t=dm`TG6TOr&9|Wx(>>@2C@Ke6At<QsK#`g(Sg^#}7UaZB
z2g#K^8n)v~1z71X;X0EiF()+7(X~T=94JIx4MTC8gPt5a!!Ndjc3cf-BF~UMK);br
zI@6ydB@_VQ7qXyi)F|Zh-ci;Epe{)>?ntADBZZV-oig$imdseZ{ba97ej{PLvxY%(
zVMpjgi3^|p%IIS_f6>iYOH$Scgh6FmlSaQo!YO_*h)E;J*~-DB!r?XJ=GN0l=}-R+
zX@hIbMreTM_$EVe!&4a$e)lOLEXo2$mbUJ`3`7Dn)H;&7D8nZ;;CGdmah!7c;VBBU
znfS;ppmK4T_=R;n=nD;^=Ls9+7e7dr(@~w~-AQ?sy-Zb}Tfh;pdI`$~8%il{t{RJv
zWDS#vTNouS7@?0*;d)tA6FC0$;h)+`43LcvKa8y1gTn$Zh!GXJB`BWs`=0K*CwZAx
zdYJ+^zKk6fvvbas%nQej`=dgiB5aGiWh6bYKK!WPfh-T@gtyn=L#x-+%kVdNpED<Z
z(Fl@bcR&e;y$U_8UtksqqS2mQMxeNf@M+$w>xQ>Do%RLWUCI#`6;(E#89VK|q-FSs
zhaZ~RTnH{)>xdTV=W?bY(k3L39{l;102pA`60KP;>{%J;t`H1*SEwcPZ|tS={2x;5
z(|+$debw;*)tO%pVSkXvmP5(F4g#Tgrxp4S<Oy$(O<&$nzy21MR5E0<;$WK;d^6~~
zF&WPO)g8B@n%0;XE?IOErl+-W<P%YmZO$@bFqdPUgsh;myU4?$wyhS}3=)*zlB5QB
zT9_!)FR_h1Tktx2!Y@e%m4yOhQ=!hymKRH{BqkjzI;v{9Keu9aoJPThi6coYvs~m$
zqOCQ#iyCjspLbXUI%ll`jiM5<QFkqZMwlI1UliLx^xvEm%WgS0!yH);PvA+UL1XAh
zMIYT;YNi6MuO)>(!KLlXQC!g#R(1dw|Ka&rv#Su{(FlvI0*Tt@@rKEGA*$f@zUeBQ
zg*1Btjp!<D#P<3C9dST3@IqL^|6&i_{fbQ!ivo(n-c6HVV4l51BdIZ)nw^zPJZ0ED
z?zgo%;q=5Ct}a|S1zV_~8`w-eVL$0WGxZ7AW!v-S0P`E@Ed<hsas8@-Jk|!>+;^a4
zS&bf^4Rlu*9^Upy<rP77mCs5ApM~?4P@bG8c4qN~o2Ls!mryp^x)Y9ei`9@bxpQ|9
zT9F-CugS0LT3(Uq={U$qv!80TBo1_MG;<&Jague!20oIT;}Edn0U?`2HBgWYDp-Ji
zZa+vFtcgOD{R<AHd8H(%JNE@p^!pzN7%miy-<Vgm(57n#Y&r|YhfgPrq57G@uaVa1
z$ir=1;j-Pb$z*TM%(F17g&n~g{X0hZ^EZ@M*DtXvjOPJIMZl|nU)wr0R>N){pKuT&
zNM($ftukHEZf>I(2wKTiT>!vzNdOE(zJbmnl;`GtXGV}f%5Ot*ch3x1)!sZS*R@QX
z+_ddmr`OoS8H4iev^EhS)8|yMCqE3gC%r=qaNj}+(d*olM&wv(lLZ;}q*xbbOrpZ;
zaK^+lgC82|Yrf3iOR2EAr+~jc>kwnRjFU@!J#ygf{4HcFlo1`!L4kR+0Glff<_1~b
zA`MP@&(82h79Bvvqc99`_WV8Wl`0ofD1GXq@CMY#Cvx`1P2m$}{eWoh6UFfbN#PS!
zevDt7up)rJa4Pf0{0Ww^9u%<a^F~d>3-x*d@`mjiRIMb{4V6?m>4JI!wOTWn$~psU
z_7V04trP~yqST$M2<20$uyOpSS|K;qG%+E>4pXoNI3#ZF`xX;mV)od#9<zwz-Iy-y
zQ=4WqD`g!&i4d*-FXy2~B%~G52YBIQ&NWF3cBqJ=A>(MnE*Fus$TWVbt>T&(s2-Zo
zQVUSr;P?V4_~bW#R{rDhEmjm+D6Lo63z1JLdth{>Q%rVu3dm&~+f$x090o5vn)}WG
zo9-&MBXlFay8Z-YIkx4TD$-p%SOlD6RU*k!iw=!$Rew1yTi7zr8TVPq=FK3{P&|A?
z8d3cG4Z{9RgWk^cwH~$}x{uR@4(?4Bs#pbxVny~8cEdzwk2GT3bJn#oA(m#D?j?IP
zp@wBqmSv^<$xR$;mT|u5h)s;i#)V|932`OCY0ovq!Lv5=Vp6IfXH|<xfKI9m7y{$f
z0*j2yHVu+r;Gn)3H=nMY-0*JVw3A>aukByEm@b5wmU)L5&!xd5yVnp6rfMUE?pt|t
z!<8@2LHPdte>eYbdbpnKev+mvKd>YG|M`tPqcDKrL@T>_eUy=J_*4~Jqo3f)Dwz`%
zx(<71BqJk<w8Tw9t$w}R%y?pTLt`aMwBC?>o|xG_G`}DIxcgrv%otYbg@t3s>2Ei>
z(`$Zyz%TP$OmUbN!`6Te#y<+t1tIM$ZiQ{sQ_a9CeK7$#Atz(22y`Ia`s(hc>LKr0
zgh~L;(x;P!`u70BEk>GKOCAoCX+D0IQ{y%xtIZ3CkvOk!hJ8Ft;t<0TS7#MB_Z^h8
z-=XlK{fgYp)zBql2y8algleZa_s`m_ZABG2D~vQ<l>XxaQDWN95KeF~Wz`c+ZuGCS
z<a81a6*INW6)Rl(a%x#o!A0SwE=T*p$Fu-p6QcE#AVPeUky(gE>lP4|0^(He`b--l
z_cBzfDgnFVxedcGx68VMa9&}w<g^D%tznXQA>we*1gI-g2Yh%G9+`baM@f_$^$hZP
z9#T2|70i_Bmm2ukU@^#Q?Iff_?RcZK+iPE(HbVjQr?h;>L@5|8A7Nq#3x)vr(m22c
z*a*v1-ex*lpy!(R5sDlA^_RAc@A{dO8pXm60tjoyw#k~@n{s}moI$*GhN~CE9LS&*
zf3M}xHH1%|4urHZIwF}DDq>}V6dtDCu}7jN+KsAG@^Conf%lY;9<$DS$SnC_50N&%
zs0dW3Sx}^cLjL1hl)WcaR&k;V(j>r3QRYaimo;bh9x@%0kdaViXPGa@C@H*7l2D5|
zYBDK44@b%@s&Pd99+PYdH_y(sUqVvM;t~b=J_$;(yioO-qDgW!DdCaQu_*?YK9r_<
zf$AeR>vr^T_bj4B;i!$u!HuF2QDKYB_Cs$gg?%IQ|N7wYf<Sh*n2624fPnNtfPgsu
z_g&`5!X~DSVkEXpLjf8pPF4Svcdbe1^9?@Mi@q%@K}0A(G|%n}?~skf$!NO`7#F<M
zpuh;>zk$3JNX^IyF{(oNq%j{qWnX6we7t@BBlq*Mo-7DMCv{h6-j+7feRcm=Aat`~
z83$1F=@%*>pBAmGe~}=)`z&-WW$Byfu&jMesofrRCciSDlLHug=ZW^vyL^ZqY`y6d
z%w&WwM&0w3{yD^ld|bbHvY0<LKM&f)Gq#abw=VsI2S1ac1VDx%35u>HO+d~|4kwpf
zfgq(>TPK`YDd(J2NkIybx1f3yBudNB+MY^kew{(^)mn{z-AdAtZ)<h|xRGA{tI7xq
ztXWfNIpBaOkpMiw&<Q}s0)v)<r;TU>;XCmyL%x64#4o8+hD&hY9-GQHI|}8Qs%oUO
z!m4~>;(ezB3l;cx%|ZZ=n-I^bx+l6%y80K;;k0_!h-?rmI75@KW9A`T#_Z}kZTID8
z8+f9~pD~`HOh_mk$*>F?hQn8yag2I~EY<y;Gf-E%HJ0kfy0>YMn1h8<16c56F1k81
z*rr91@%SKIZ2#8d19H8YTtBYFu8eEF%h(YC{D-`QE48|h_LDcz`k|<h{r^{s3a~K3
zRzu}AlE%`&8;LO_Z!$t3VyvQBLxW@y*aYunRkT{`({h+!#??ahK=LSz5etVkp^QuM
zp;Vwqsuy0<F)vgA`JA>h<aRTqS*w=WfcL!aE_uJ=bn|$g;{U!M<_F3e+9Aeq{5c}W
z3yi!%oMby1mues!Ou7N4fuh2L3lIe5T&okM3f>#lju9A=UF#+tD2}Lth}lC%^j7+c
z{FlzahuT+in-1aZty*ZN;w^VHBW{nR7q{0Oar}n|e;A!OY){(2TO+B5Xh3afc17f^
zJ;E;NRu-`bbr{;fn>*low<F-&5Mu}W-@D_BC@MWA2bYfe!hNFYSl!f8J-`T!2269k
z9>$BPCRIvIvM)T+>1R$>rjEQ<cA`!-WmcxXhjuzmkA%u!Sb5C!q^i+sTjYUNZ&L)b
zK?bWhI7w+JJe~*%AWl6t#ZS*rFU{skXn3^VR;R&yD(Vk0cQ>6BIx}Fln-w_`TwuzE
zhRXOCC=CUS989ycULre@2B5U7#Ci(o&R_@C8>K&OrnCYu?^b3SZ}IEYI#I$?xlAla
ziVn!>EN4G5dNv8lW(tV^d(Q)_;x*%V|5t}(XME0RSKP8PslB!=>gIf7qxgFp$v%8-
zU6&dPE5ib!l%TUbH40M)7;}2QlDv667<j9;E13#le<-asnIEwB0?=xBru(pt^Jua@
zravumk&4PA-&z4G+S_Y}E%-C<G+da@EEN;LCtqe<nQXJLCS~&UCHuL1mO{L==Io;F
zFNELmq@KO5%^czDEkueQ0C6AF?MhsL{wZY95*^(yYh<~=SebzR<aa10ZQz{5VsxSw
zfIi^6gFIoc6zOy-3=ksN(`meK%HLipz9pIv7=lL;F?Y+7bV8m7xci-<6A^G8^}PzM
z=`tH94)xSjiX8-nDDsr<4RF-#hhmZ4)Q61R28F~LsS0B)bZ&UjTD>6Z&ecY+Zr=sc
z3{RNyS*>FE(s1$j$zvuZh2)G`qVTWWK*#%rtD$81Jd4t^0ep-0SFlVOCL;f)dkYLz
zVEG2_Sia!;*6hK*6a>hnE`i$=4NqyWJ4R(Gyd_dZ8ETz$7VoMDPEwzgT~8;|j%+eK
zeXMaSQXDrhR_qQgYm_oBP^Dz2sZkLdzRx(P_UqlWhj5pgmqv8Bfzmy>UQwNJtTMB1
z4(Vy&`!XNs0B9S&qm5;?hOn_*NdyaCuqRZg{&`0&p)*U@)w>K(Z4&Lov@<tUtVFY#
z?JRfd?LYSnyiW|=_634@UI_fdcC)Hx-maa6r;7Y0p;u5<?YrS_fAS5NM0SGe;LGBh
zO~l5~yt_i!NE?~cbH^FRay|dd?m_I|W*6AN#sVY%2FO$2t&6Pt+%1nDPVW81U!Ulo
zN9c4#3xk&uhE9&u*vf0u|2S)9fHLuERN%S1bRJrOWll6-Tsh~4K6l+qVG&rFQ{}rO
z$zf$Ps|g<i-#i6Kmvy#ph{ldAL^~86zpLo;=q%qCfjo8A<KlMK_c*pl#nkPA-PY^q
zmuFQ81Hx$bP<j%k?;<NPx7>k_b9V!^Sq<XO;V(7FUyYCpagOl3h(<zNJ^9Uoofs5@
z?=mVp{f&Z{XG4LmhQui>{vz>3FisolZ?fMou!^!1fg_D^o0n^G3Tf`Tsra#I&0cGA
zU0J-Rh#+YS83HGEPkkdv9(r@fSLU`w2#_)U0f^d@F=kZ~IrG(mxM+Mqsm;{~jyj@N
zX<MK+ipJWXz}c7Pc16V8_vvgEygUC~Iu@nA6pevK6X93-Zlw{^ml@o=5Drlb$%2i<
z{>V{hpdq#41}ja{c&8awEsR4qwW>ETbWG^7JT8fv#~3NdwJ&d3M&@J~<Kh?r1ec9~
zJw+)(%R7_1K*a;9UJnAnkSSDW6$kI)t8j7ORpK5W0)Ml#)&{zkAhUvDo8H5`*7>AN
z5!h#fe~wlOzemLZ$;Sr=5)Xqqn~8+_&yxsqp04(eoC0E9Di1C&f9$VaO@G%No=}>W
zf6K1iQ5JvjHmb#LVT?F5&L6{(b>xf!O2TPB_yoR%Plimqqh6|_W^j%?o>&gSXxg`<
z7FT2S$4tI44iS=6k~w7W3g0Vh?hBK2&6qsf1N=ih^~4z3vaPSGcDpvNY!KxXR~p3A
zn=JB;F+Md?r6;+ygwF@-Ba4;(K~*D-jeMf7zci8VAoE={@KCaOVU)Zx2`6L#{Gok7
z@z?Rrpm|jKK3yLEJzzXAN_?|;t_tSlKji(b`im8a#}kff2s#&BvMDw1-WDX?Fi`|H
z-h-%;2aW67@#3tTiwU`D%*3TGxKA2{TvK4djVaq+0oR5-m)C(&ZD_1jf1IkqGUVuJ
zb?(!Vx<8ruJM4#0NG`E2S!@~1DOz~lww1`bpE$aVBuXdV{?fCDcFJ0;J)U$;R)exJ
z`~4pked0I`?*Rn@a!;)L!wJ|@{y~#|>m<|?(hw0CQa~kB?J=(}TZSuCge0H=lcEgz
zu98-c8LrB*W5@fhU5n>%W!J&`oX@7qnO#WZj5l^a%h$_YUfT*05NhH(UbP*6Ot&3>
zO?R=sKlcDWz;;Ew(FNf1p~!$sg<1R@I`j0IfO1%dffa6wvpPweC;?y#Q2S7(z~(}W
zu^OD+v_n}a;Xr>TrC+$C)q4$z>2@Pfq#fgf0xEnvv3q~Gq!I9itz>ifY=$ry0Ve*-
zgGz>cTs}6gwx%gWT!<Y){}#(#m7&d8m{H|8nhlDHfMru@n2*hi8*)wV+66v623WEj
ze#w^t1be;4H1nD~#sLhE?!Gn}EyqoVQFMtKlC%xEYav;wQM%+d2cRLvG~B3iYwJ>C
z@HHEnY!w@OgJRQjE2cJ)$Ro2(i5ZeDQ%LJd?aG&^Cvd0}td%!G@pHtVLl)bNOnVlz
z6C6DTj@a$ZWC)eL!;{wAl<g46G?iT!u~Q;;q>q(G>SR8Du>o)3$QG_tJ;j-Fq~gpI
z6`u2iX9CUIsWS4yCKkZaq=VqpiPkEqSff{KYkRy`Te#wd1py1u7jQLZRLFmKc1Ax_
z9M(323P|l3`lkvA%JfBlC7%PsLK2%;%59r|oh-EZ9z6m>QrnR~5=rXFpS*;@sN4d}
zK{Q@eGnXCCYXhW3p)CA`n<$V@+=VhtxP*tOY)eN+2W?p2XlL8B9<{ffqgZ`n8wxz7
z(eK4fMO(l;3z}`#c+V}iF2>Z?p?r8dU@zOIHHZIH_9gWz#Se+s6KILT#RPOlWU8w<
zKwF?<zo_f)uKmQ-RjV&B6>q{L<Zsg>W*oGJ&|j2>)BrD<L+mfAyZVo7hmfV_g?{a+
zy|@{hVXuugRjF4`whEJTHdA%#VqJ<{AKn<%^-fFTVti-`IR3;P)m`k0MBZaj$%!>l
zn+=i|_U7M`XFFz8E<{Sf^g6R8d!I2XEVmNDPaxqKrHXxjU^O@2&R=y&oW*Sc*SL9<
zN_|a{w*YLDJ2<soHwlxdgk?vEPqaDR1zf5M8h*jw6;=l({~Bz#+e8QUd@O2)h&TS^
z%uOYM)><*@zG?e%szunr4_PAZOOEZ!f5Fckj`Lj9_O@Z&m`V8^BOdf%^*RZEa*XIs
zpUsZt#MOWvN^17wfQj$)`h@N1NZ^}vS-}vAlmXCwos0mDfWsJuQGiGC?~x+C*kHRz
zKkubuQS`nOdj~!@?-k_vdSZ_wF~9#49spyxL0=8xI!l(Ceb-0ky|pQo-Y_S66R>jn
z^*cSk$ZvV?-Q0`ePj4P=BlKWsi@o|T9i8$i0>&eF7Z{GkCCzSI2L_dVI}``k8T4D}
zXAt12FL%ZTx4;d03y;Q@ZyT%gH~j0#00cCCAEg`2K8@Ji=;i3t$efr5iZ6~ZbNk$W
z{n|t+^22kyA40(!2J>jCuZYAXQHa5UXJ*v4!7{!*R?n`<M+7rnc;bf;XN+sUSgS9n
z&R}-FYbY+KY;5dY%}wMn>9T+jrbkEtKELjQX9_IDzE{>j1&MFtVnRN>&}HX))d3&~
z4a_JueZ4|Is~k9|-y}F-1+O2VC}^}o%tFz615bv>v~X_QLC-Wms@C!GpF^<ayk+pU
zKh^~Q@BcBFD>R4zW_b_m|D>dIK)r!cE#UVGp`eH$B~)Zkg~5<^;%KuDCE5}?D#(1P
zWJ$=nZ$Mu1qL|&FlT0$x$e0_L?{hvcuO4T1^m=~f0#9%i_RjAb03Rjj3y21aL%PfC
z@uY(>$&d1oHk9@yfX`rH{EoqQmn%T#uu1JxxC{dvrC9w2EI%!SFEejFvR-Y#)GNwI
zcF0!5u(nV>cOCZ;1`4^A`;Puh>5tQlAeR+RNV549XVLWB)yS0$C-li~7=yZv@U?%d
zIjcXboi=N`;5+A_o^7x1m*JjqG$V~^IGnw~4>dQeG-YG)8?DbHN95(KXV#-XBAegG
zEL?fyXu>i9w(EUwMTuroCa)J3dbU_}I#-0tSu9jsnqStNhgRdS<wruNmNk~n&T4m2
z6x>9Qt~xJaI}L>eXaClmPJEw<%0&i5MQP41V_NKboKLRARnU2)OBiz@RxqNd@q&*k
z-@1LGW{&rkde${{YE+(^&zGvYRx<4>z>W3O`qG2|?R#&(?3yqNr<op-U%`zHR{eO=
zfzt^ku;U6SmA_wA2u6m8t=VEOK7q(?Y7+Xt)o|X-iNt(@(B3L<IQQ=R(S>q=#g4_f
z11fYTnIG7va(XANzbOYNtv^s28RUW-?z|}QMYV!{HF|^@6#k2YF^yyh;TOoYN6-$%
zKEV_Nv<#A=d6vVb@e6#r^3l+NqVM}V-P&NF@1tH^71%nxp*%pN@J`C*9?5a!VYq}t
zqRe&84kNERppuXU%1{Yj_4A@i$beH83}5^bf)~b?rxIkrG!}z&)Pv0*BXBA$djJ}P
zilZbQ&4ppA0i`Sx1UHEjU8H#g8iS0hM<O8<4dhV^NVAL!f~k+lXu>1#_{CHODmhM|
zLOKe<Dxn0vCNPzWM*#MV3E9&0zlQ=68dPGCAc24|P!esm834}!<YUb5zqGFh|J0el
zt!0R!ei5!=Kp?0l7#c-r!7tSlhBO}0WM6`4lw`^2m&`_`6cg)6E`&Ij1Wpe&>MyiH
zX3rLTU2pLd=QPjUZxdz@3ZBAyuH1L-nDJkqCIfn2nEa|<QlrF;d9eD8pvrGlG3}HQ
z1~tHtwx`KsCjjo^5Z6h!bYLa7wqQ*^fkxo0<Xb$jNQdSWj-82tcXxMwy$>LGd8WrQ
zgdd{zg7+Pvt`A3$nLFReKm(z7&~Yr&t5N5hJ4DXzYa)*~RnW2f7Ylq&{OuY7-w0He
z+0zVlE3}?IYR_l|{q5NVp?B~S;4h|b9OJ<Ky^OEWFaQjU`$mNfAS;N4j`@%fpfO3=
z8dVc|lOGiFxi!}3e-)G0clFgBpXdKKeoz3AZ>4XqF4TJ5>Z)WlW4?C#RA_^_cFT)|
z=9;nAS!Hr5tXZ5ZZB7GnvYL8vN05Y!{0<K98Ad%3HWv6U)@-}On1FMZT)QvfW=O)h
z%0H_T4mipC(@V)YF?pI|bK(Ixfx86V9B(0yG9&pZN?Hvf7V@BXV2@?WeH~svW@0)L
z<p7E8C1cg;vpGMH+4Y%Jba<lsZeVtW!UHDV0Lv_$dNwQ*d4RK`{Ny{3Ki61HY8{yp
zxC2#ZB_)q~g5?j!HN|4l+&VIP<`X=oxP`SS2GCfsk4>Lv3T2tt?eZFR?Qk3`DGY^9
zD`jvtm|s>R_iW1YsxhsJXT9(uwJx2V-*Lf)myA2n>>{UZFIM^?M+)@*Wf;AsZ86)w
z%PKl%k>0U8psW*vhG8<sL`o51=K`*8-{NDLo%%JF2}Z2~r4pWxf;u{pMvhFYBMmL#
z1Q;Ek4UQ@+LjKzbfvF*7tdmKzE-2<^<^;CExlQ~Jn@Km}mZ=S(-O_ayZ|kgt<_>v#
z@|{RpPsbxrj1!I5RoD6v*WR|ugsG<)YO!9JlXAYaN;g&SB0Wf%tMSj+COZ~Jso$P}
zlx0gQH^`)b?}eQbT2F;S0B%FjDZyG-0C43LDA-iT=UL#0{rRA>6_I_lfMHTH)3qTg
zb#A0d=+xzO*-l$X+^s+;4X70e{#%^SK}6`DKxm?!*O@=aM%%G6dK}(lT$6yJak02x
z9}%%SNJPT&eZ5Xd-8n=>sM&XIy|H;&tkj{*7-pAX-g9QU-r|m-bZg@sisd$T1n?JH
zW+QtvER!^MafwLkB{nLQF&=3D2$5JXv{`N>enU~2A*0GfQvIfIqe9&odRAXovE*yf
z;HA<HU8&&kTPf!Vvqi-^_XHJJ(H?k~lvr0T$JNwTy9MdYCyGs^@*PbW=RnHf&D$5B
zyfq?Q_6i?^jMmLJHc%Rp$BCju1@N1&JrWY97E+wV1m!S39-DyvenFRcAw@p(ZYTAq
zU7#_Z@0Z@pCo1vAu}n|w&&ym@?oo1xviW2M`3CP%x#iaV#1k)5ESktL4?!iv&++%+
z)!2-YtSMo4<MD|V{SX|&za>Wn9LZpeC}IK>Z`D3zhj&yyK)#b|Yi6Rt03xwjOc&v!
zkUs0-?tCRBQH;X!;!%|~lq*hw2?oh(c?ZtR%f&ptW%s9JCVV(qwUf%z?<)J3&jd7O
zG^&tRK07V-wt~D3T;oR366>9-N;)gEPF!VcUtRqhI@yCycHED?*)hhn(`tMS(gla~
zI8I9{Ji=KXe})wG6kR;{0Y_30({tD!*$c_2okN-gN?*k!!M3=Jjxijh*IOJYzc-6G
zGFPiM>=@_!p_@PxWn@o2fN2igg1T|*n-_jX=D-x$wZ0K~&5uo?=;Shh+bA#g&5y$~
z`?9nljg6OHhyHQ`RmM!TvFv<pkYp<k+d;!;BeJo5KHmk${@^Ou0WeE@9@-e_L|%)F
z2Ir{@e<PsH^5<!??CNfccdX1-LuFd@%rxi;zQfJ<qF!?IzH^)R>@?UF`=pxnz!})C
zG{QNJpfNw%XP_rs;5{Ij;a_qo3RCAA;LYFgl!qAYopFL5A>#ZMp29i6{Iw!qFwlwz
ziKTLkv`vs}#i#&^0|=!tud34s`a3l4u?QEM+$*ilpp7f78^RSDtfsDBsV&wNR~KeV
zAco<<k~c+MvBXMD>0U&Zank1;B=x)y43s@NcvKtahmL%cAgzvN)fHq<;|uBHFn@&e
zH>yQ<xPDbMe=^S(ZDNS2GoVDHGD~=X1}nQkWm+SVL+dhY3$T~9C5aa?X&CLadVy1o
z8bv$3#&vAn#j#<J7wyvzi;c@ZxCU$E6sFTA@Fsr4@>g)tMc{YJY-@U@hV(aji$3P3
znQbnA5~6iU+7-e07RqyWD}Dz<_?A10*U48`P%ZkgJ-lx23waPUNTXhiFb9n`moR(C
zuR23<DZ?R5B><^*JC4dXVVot@-zci|ucmpNB4yu0i-TFsAPrF`XioZVVLY3zVGm(W
zCq$P9^MXX#B<=?DobXg3EVTGjlEKei`7qOj9D5R`lnONjxBXw8@ehVJLUFpH4Kl7h
z;jX{9a0#!BL}l?1%n%46LfK~wCs--!ZjLyud3j<xLI6XK8#v8srmFO1v!Pr{xk(yU
z+Nhh8<@ck1UW7-IUr`X(5|-{)8D;QVJJ`3mBC{VhT=1muXKaXan@B3UDO%#sLX?|Q
zgzCabf+baXr(_S*mkEg;G%rorYd9#P>R}2bJO-3!_V!jsC7j$JGV;rf9tvu}Tfkf9
zCsTs6SOA+k8UrId%c0umq%yts*DW2-f!;lLcdf^cweGJRa;?7Oae{&|UKPYXGgksy
zo&NQP*TF;y$Wh1#J1{9qc+C53$Eu9-10tCyO8uk#C~HV!aPadw!HdnK2LAaV`64Co
z^ecW{w#6Za4wM2znij&-iT-){g9uRhflTv~=zvooLKSX_Dqo3a@-TLy+cT7^a?qos
z$XA@pfczK=uQK!I3pf_g>il9th6PX5zUB0#V+HI;Wu_U4B2Zg08ibGli!&JbczU@+
zFtb`Dcx5JDp@$J3Uu(*<d8Ngop`~E8g`i$v>%q)Z8iE8F!N&@S2@c#!(rRW=JF?P_
zJEAJGxxp*Qc3EqVUKc=Dk=o0lLu_bfL_14cyM%k>F5smn(a0nVbZL{nIuXQF0&u=g
z)ZFAN%%2piL?vI0fHZH;LRf`3KR9Bbv0|g23L{(q=-<hwXPFzs-;HJ3#*I@*X?!p^
z-sbeWZgV=?-r@%UzQ7g4)&zjLxm;mIYK;U&?t8ru-8FDIaXoOsLfn@gwKa^wOr1(#
z*5h~TFjcXu&G6y9Y_uBPJESGb0ef1VUgN>o7v#BQ{2d@6h6CtwV~Cv#P133>v`ZTx
zl&z$(AG)z#*?t$J&(k)9Hi`zTt&@*U-#Inj$oZBPDrJb7w$X?o1J?hda_*H<z2r`D
zgF!2kF)s>zOttD0poI&Ap+g%hY4dZf5+2r5`gmzZqo3O_Rs#&IbbBZJ06P^J5xUOf
zXE4i2{f{_Bv{G1@Q7d{h9rQXo*e9z-txL|hu@iZ@)ZFSB(WQ<NSHev$7^;fU!fIiV
zE`8>2!Uk)0o4K*+6>rV>i;M=lY{GBt=S+%&-Qh@ZGMfX^A^osqL4=$&;RariihE4V
ziY|LFUd`ksvUwr15WbGMfTg&ti$`VzZwp3NW|$f@I2+r)A||e;r6<!nAyUBwDH*=B
z!hm2<35ZW_BI7d7#*D^_L=$79SLj;&0}+SN<yK&2^}HpV-}<PM^=|Zpl=V?uEn*(O
zw%F^j)~58rygLORIP`D?C(xmZ2cN{k06D7agwW&C`q@v|<x0L;3fyHV?&l97l-GQ`
zh!Jx8zwnf7?PD7ESF^H=aK6p4zSH)9R_BO!C^Jb9EWAeafwU$q|DC{B0-GAte;l)m
zAAk*aB8(|kqVNO>pz5dA2U`W@OO9!*m*EfzQX&tvb}^`MP+Gc4Qc<cbIwZ0<U=@p7
zCWHaObbk``2cmJM+5N7mm+xHF{&w+wE125iBS(jTWHHX9!Fhb)^R#`;{qA~qz9SF#
zb;H)J$Po2x;+?Axaqrz)p#RGam1ZB0od2NW9cunXqHkmr@SqPl!J9S&g|FIi6Ap~e
zcPZ5TJJ7v1eCDN=%qaW(r(HmJ7#*fB$s&ClCy*aW$0!c%qO)%{m66t{t+T~~1HN&J
z$Uz8GYbC-e!^p9HIH}WS!K5|4E?X#n*Zeg<em2t7(0AbxNA_72x5Jp@uSF~L)AnD}
z!?rcBjdk*3z#a)EIFy*qiG9&Qdh-wiM!2bKqYtg(Vx<t#IcKp7!CXArTt`Srx+w7s
z!?Nkj5^jTOomNW~ZG(a<#ND3*mR020pEM|`_9kLqf;zKIxBB10%XLLFNwxU+#!5Av
zUi%WTXohtDyyQx*f{XN_!30$)G5I-^wgg#0eG900K(#|_G3vzdzTg<6wweG`(|xfv
z*hRD8W`v(0B`eWb;y;#vyrTmSnkD1|u?F*UR4Hn+7#Q7A&x~$qtp1p&P*8(g0rv7-
z6Q2BB)2V<W52DhY?nZ2G5hPynuXkJ!qzvjz?vN|ef-0Jj4*;rKM}kx~G`)DG@nwAh
z_OlEgpjq7vjAy{6%pH{&=CkCo+#U8G6&VBFKWS7u0`h;<sIh`riQZ<&?NK~Cc|dk$
z6#7~rWrn{ys3KOC4f={ZyQ}hpYA|#A{VV!~)8XHfNM%!15QkWbHrqTAw_Zs%Wkg-P
zoii{p%vu;7gj}{Mlb&HFtVkFKULxP1SeHi!0L$*8+!l;x7&XrtE?Q3KwWZ}XB3w+H
z(weeUE^K%Fg4SgSA%Do5wH~m@wJ&87JR!UA^X(Gwh2j%Ma~O4WgSw`0Lg*S0AM?n9
zJ=t#Xq^mXA;CODE=as270?d7Puw3XeRku0R*9;+AI$ScIUzy5!uq~FZYLlHiO#Ut!
z17Zv0N;bM1_9VEwSp)%CA$|Nz81x=k^hn9M>6Xa;r#Zd8g~9LzEZ|_wQH(e3sKBj3
z6MiJO-2_MB>pWv-2_Cp=mSWN*mnE;3G&eBau;0#LUl$=FiAhxiwJ0?NttjM5)wx!m
zFN+8ySmKZ;7(Vm{5po9*!xhWr5QCNx0N<#C9|ucBBJ=i0Q0e1g=j4H4sttp`CEyAw
ziTHtmMvpsS{00}z!oh!!)4Qb*k#bQ>aL1Ye=LHYMf#^M!VRz&W9)oloAMOtVR($`j
zQwOk`#pbV9&aWW3IMB0+1Eo0j;!$MggJ8E&`1>Hcz&Kta?GNx3$ORa~hv)@MK*Wia
z$o<9<R?D~|!!}Cy^d9XS@+q;j%eB+A%l;;UV*J;jU({MpT-=^fkI@VKdOIbMV!$5n
z-mKQ=y|a6QDmoZYk9|H9ZY2MRKG+_)8K_p7KUec<g@){2bK3D2*#C{&_*6}Mi2uYI
zq<?%Z#-GL<yTs%y%*2`r^hA3bbik%66cJSaZhy+vf<>B`Dbm<vY0Y8zZvXF_yg?FL
zl|~3theR*OYd87P_mOjKKV}wb3jK*78*~?RSm5I<=)X@8XQ5xbK83m>q9>2aL!zs^
zSV$;zhiQm^eCSqf&|=fDW)%yQGw4CEV9WN&aw3DB`;h~X^~z_VQE|m5p#el!I^!J0
zhSmh=RFj5e^A*Q_yoK5kbpF^4Bzbv7Uyg#ay8D-zOlcIa#z$HMLw=^=WJ{^42uW{D
z%D*~}hV9PjjY@t*7BL1AHDH=wSG4w>^_vcvGInhriT2=;J}nu95!u<<WqH9v?pp4L
zz2H&zOwE;2xxSdpt-e$;EK(_TZk4j18|5;^P&uCEQebxQc-723qI}@n|Kz;T9gI6U
zj>g~y$6P|iRyicQq4N&<f1hr{&i-5Cn5`s$hpmV}R1t!L#C@muyq<Jx)K&RygXab0
zLvf!i7)b_7N8R;ks{1)4J!hxJ4(OS~ZPvwJ%05Acwv{c&mp-c=>|VJz=-aT>^k33%
z(hC=!!*Iw>Dv=W&I^-`4<KiQ@X$V`AU_-K%EPFL_9twl_Ii+xYj6sLpHEH*&;B+)V
z_pEh-Bfn(P_wYlO{7?9Oc#$N@@_4%1EpGj#-4zR83B^WFC5%)mFAwB8dlq}}v;4N!
zRZ21CJcxg6@k}r2K<u2<-lxM5k*<Z?t{bWSn-+q7BOG4yfVq0oRM`eN&wt6H8A7(v
zy4kEDWoX0Rda>76(ZPxeSBtaP0I>!?o)`!Hdh9=bs<J8667UZz*9<Q4S0ifTZX|S~
zygd>CV=J*Zn<ZU0tkEJ*`+&$o2)n5<w`x<9Zb)}_87%^0!C2;ZaXLe~J>s?7$M4RU
z;?5faI)4?7iNi$r?pO2=OuE$88Dp;W&BBS$tov-I?uMR?FS(;<fbSPr@5BpPlnn>@
zKW~g*SyrO>DVh$y?4VEcF}A~Z5$Hs3py(n2g2{C_f>@ZC8BuNn=JZ?RP!^&Ro)BvN
zSv3*Ci2dapW8r-$!n&K?WZ=?bf+4hmZ1>H!M^H#y#nq)NOMm8;qZhMGW2MZq7aBO1
z=rl8ewvtPXii+}%>dQDc=AG8&20HUfRhwJO4=-M|JapF&7O>bCh5V^9E1rju_Dx9u
z1*r2WR~*EIn$YxwmB;f#CQC<B0gWQx^(h*Y^k+{IL3x(nGSr#lnwG<}N*2QM(U}z$
zmUPTT$Bh~zVgKwn3Jz&$tJXEegeKDdE?f>E89L;=N@_JMnh0ZG>ct`8urp^!pc<G)
zR7_;B(oY8sm};`3{gFnua%&iJ9)Mg2P;)VNp0CNN9E~*4=5@>iEu3SO9a{ySHBPNr
zzMVB@xK)o+jJMJewi$rN``fEFn5|GYP;To9XLK!j!DfY5mIfQqX_3H;Se4HA#9QN*
zw~?PT=2dv@V=F0p`!XH44)gDooE<&7Q;)41S_J3!je1(i#iF|q7ii=YSn|~X4w)7-
z^Kwl!CjNBh-6>TeD#oNB0l&Mu;1*`Xskw6~MYh+$h+>{I4lvlgAkU&)o1NR-#uQ@~
z{bgs#iO65@chqy>JU!PAR+CT0c56+c$F|%u?~L#y!X>`__CK8UoTkyVxGbd8EbkDr
zQplxRjm0MMS?jlGsuiM!YBmZ5L}fzR8nguH7@my4fnD!42Rt(t?1Fex<TbRzF!3qf
zF!CA9jpr(R`ZtEN5(ETvxeNA@@TtU!WSw>@_zuufaRe_wJtf19Uz5V~4Fm<u+y=M4
z7X{SZGzD<?KTMkymG<AR9a3v%e2H4^L_NxqLzykG(S|ZWpa0@|gD#c>sDd8P<nR&_
z7J5Z&p~|TL)-N+*@)YZktmw;PR(aAMBb}2&Z7MNg6&BXH)zlH(^KZAAYt;~L)>t=O
z!PKOq9-UYvBYhYe`93#<-qNqRp}c8u+GK%gC!(O}-1Dll)LpsZ`EG5wJ<kPG?4zpX
z(*|qBM;N?Y_Ie>k#z{W}9O0m5-A^NbkY<0%U0sd<tpsX+`jdfj=1B5{B)JFlzK)oC
zhUxE%v+#>Zdx*<b6OtHseq(8pZVstJ89??BF(tl0_W83?{G!?RdOHTm2aDftg(i&I
zXp6`L;XN5ved_`#csL~~lC<oUh|Yd6Ktb#j`OXZY|3Je6#<AcAz|HO$j6)sIPeT+1
zCUqdVkH=*gKa6pZ+($wH5Gzq`D*j*%rD2;!P&;&Kyu1Y##5vYeu|0F?Cf#J}Y>>vS
zw7Ox4Ysay3{N|VlFO-P(vvAb!pLXS^C&wwhO2|MDxkxF;30YnHhk9IUbc7*pU>d|N
zM4l8TwtNZd?FxSSQ=f6{INC(K=gu3|?1>>f$f1C4go8{sjEgos=M&)Sm}?Z#cK!h?
zr8F5^Yr#lZX#UVPvU(AwGiMtyCLWfo+z=enTeFN%vCx<Qz);eGc|j0JS7JHJiccgi
zABSD^7DDhDjhBvJ{_8fT&35ZZilMpXn$D1A`JT3aY&ts@Fx!!agJ8>h6Xn)Gq|YN5
zAO?X=DgjSP0z)oEpd0O}Ga!^fQUM&}Je+qR7&`B7&OD<xl5{?b$dAiqrNkrqj~Vua
zfJ+6zF$0UV7TLCsD}4m*Y1=I>@EO6n{TfVp|17gR-=#h5H|{q0dMwna2E1c`@C8EL
zT=O+H0o@A%fSU?&181;sq}%{qQ4SQJNE7)M>00|HZw#;OX({xi+`m;MY{G?b+SB3H
zi_^2GJeAqSQ^W9hxnons$D?T4B>v8`CQSP?0s~erp7Yot%}tOcm5uRNzqku@jw~VB
za&59<de`N&Q5v~ZO}tP_tQ6x+OWJ#hg0IG)T)&qF@pgXWu0-TF@c)(4kIRUfqMrff
z@aLvTjL#xT?4A4#2#ykj>SsU@{WfoE`sspf53>r?&7**b2p|u;RM46SO*q@rb_aqd
zEpBz*gSiidzyAIoAAXoa1jA4yZ05++X<Ib{vSE@XdU2?G-aBErPG|X!4ss!SI@uwa
z4t`Tt7LkZ-GMZM@!X!`qpd5*RZzzIc&0>m8d7jfXsF3#@S?Wv)ho1GAmhe+8v5?^5
zCc9hD9bJDH;Fq^Ds&|2T=121OpP)qg>~NLbPm1&~k<d*FAg9G)qLuqcu#;FdsCgEe
zh#(9tDG~)rQ1WJ{zS1S{BH@y#J78uHT0dWql<|xCR?!>WD62s$S6v^P@OFmN$@IwE
zX)S&2{(fe~4ro3tb=FS=msS!oT0%mC5LbZy%HhFb6FuP<Bu*d>JVyvAC<BpTKXJ?m
z4rYkvd6Q}sfCO{BAtYV?K-Qxumn<nD1%r8c#l(lS;`A)b8coG1tTB{Tr$G#ZjB9J@
zd#QGf+Qd^>ClaQc(MZ(993^UP>d|D$n~okm40#$WLR&paRyIpoCdWQ?&+sU@DC1v-
zMk5+qs&pJoAEl1kR9%2JO?lzc^_kHD1x^HWE{-`KAU<PU0^<zUr!PU4y2ZdEWSVh!
z_Fy)K5=k@Yv7WhuswW;9Ok;)|jYfIlUN||6&TWRecI<bJ^^xd4)y>HSW-}kB3Yup1
zAouA8Hy4pWeSYQCDE3pyu6uv2E1k+Np4E6Y%FITgx{{$Jvq*W{2mvidW^sOuRlc_-
zm9wV^pgI8JpAZ5eivtg=Ar3N5qM*zkrf{Z~B?h<-u18+Y>2Qj#2yY`EIn+K?HROnC
zX`BwM3_i$?V^(g*IIt5`m}bQX#bySobWGm046mxJOw7<^igkIY5tm#XpU;BAWrx~a
zxacm0V)j@>K3ZhFKZ%Nk9cuL4VdH6W5h~ImKqY?wj<GcRzI<p_k&n@FqN3dJa*Ni?
zVRCMh3uV2dz;ueU(dc!ytl6WaBExGb|C4KAm$R*3UWq=s_dB`$#X@0Dtmi|_6Q@=|
z0){2O^Cs*S{LN<GB4Jv0J#cQ7+&#bU1+EkS<U)|S3RY;COkscwQD51dP#1bk0zcIr
z09H$xAv0*yDz}WY_<S=U?nU;7_;==Js3&(g@VYen^2`5*?nNnz<cnfMaO;V#kTkC)
zvR8>lu2TQ`Z>{f!t9mOEnx8eetToycO(;ZW%T_p7$kW!?F53DStl$>exUe8OVjph*
zDM2;<1v?Q=6QTc_h9if#lK;RZOl=^H@gfujo33fZb>{vFk-e$1BKPlr2twQA){Wtl
zK9hCvF>4UsVa;%-z^6<;NH;K%QF(TylTi2IA_kE=pi6kdZ9B@SH=eX&-t)w-|NJqE
zFhvUTf0i|5zY}Lu$P)omNQpO|pa5h+gpqGA+Ac@h#!>=4HBf(Qd%p;xVUZg`5>(kZ
zF?WOdMl;T?tMtpf7sL;`?l=+Bxk32dP^M|!8OQkq5TlHX>B;FYQ&TtF_xqI=d>~VY
z4Zj#g5Q`|6M3(9TbAoV55an8Dne#M*(LbG@*^!oGh-?E2V~MO4WFAXRRe*?db@?{y
z)ukez9I%i@Tyc&sosjrC_vc$CVaKrwB%Tr&>WxQPExv!5bQ*F=oltHQ+FVlb(UO1(
z3kKust_PdfgXn8_p|S~~RmZWz=n&a*7Y0WX)3_j<n5&Y?dzUZY1>MKChfJ}Muey2a
zuM{mhbXKdS)R<D*C_4s{RzPLh!8#hICl8|FNt(%t)%a9t<B9T*zdnj<ID|eota^MM
z{A$Kiw;#^GWc)R*U#Dzydz&BctZk&u*N;15WEQ|T>sq`dpu_H+L<=)q-a<?LBrN_o
zB#=3iRL&3yQ*YV&SCkzFmmTBC=+tVz>1I0|PL17tH6enr<ew>83xHvU!J`t~IE`a^
zjd>EUhxOz>nqMVkt{I#6q8rM=7Y3h;^$lR2W{&@5)o$Z(dVjcd7Kp2N$K=*>DXi<q
z1ofa@d<t76F7SvVsWba0C%!1OQM}NC#Z0F8_Y{q<pkeAC*e;eQB0=t)g2<`?eeBVA
zo7~eF9ywtD!rCa`62L6J(6PCyuI9c`WHJ%<Y9xfP72{7C031dj2Rakp0$fDQrW?sh
z<dGT4pAelKI3Vg@wX@DPznlmaB#$NMCA$5j2|XDr*Ay1_)e0wl%JWoL(dH+^3oRQ*
z#S*jBg7x4$p2x(8<kN?EYqvl!t3{b)nm8z7z($G-sWIS~u=pTdb&E2AW!lNJhxzWf
zgzwi1-=3Kr;*SD=4;CJNn;QZT+x=hVD;ycw{q<uLW<mo2@%&HucBilbL#pRW8)7J5
z%V?Fvk%O&iLCuA5tiQbbHWTzSNx(9+9PBm88_BxHgd9+<If*A^b@O6pTYm7?gp><~
z-&_kVCp+E3+`QDB`i6lrWXzuhTfFb5S$6!{yj*~<_j70<CwBrPh)D92_;|!VB5}Ep
zAW}>XZMc1?YDaGpv<VylHSkj%4CV?)^>6#Yf5lN+FCxQ0%N%!1{p!aQ_L~MLEj`Rw
zb(kS_-dp8`)G6&MOADGy5;e<KtV^5Y*u}o$O<3*8#19DuSWl=S*ooUWD~K^36|kw9
z>-ur3=UQ9?lm_Z{%j4}XYP4!&NYg8<P3?J_A?htr3Aqyp8gux7McU7H1J(<}hRwUN
z+)XCgEzPR(=n%PDQTc?r>X?&4K^y#a(X8nP2AIXE{3=b?y?C2N*_as&@U1rNNH&|h
zCeCy~sc%hjMY)C~y3GUwb(`Eo68j_E&R}1SCMuy$DF2(Q%Wrw2He|QJlwgnv=NkWK
z9QbBQ74snus!VM_6hf4`)ke#b`1Hsj1(S78a_1die`TUqH#ze@BQ>5AOr7qwQC#F>
zagpM5SP;%tuMG4hYF1xZfI-$#>qHz^O7Z@o7ZlqK=LkBK)T(iq=V{q4U$^n7yI8xK
zZRX>MY3d}8(`rh969#f+w}Au>p8i@ni&eXYo>%^96%Pks#SzoyP@-I_wKUUjF8p?Q
zkVV*>UjzCuwB6LnyFx%zLu3(y&I8ZlG7bdRZ3n@(OkLZ%VSg5ykp1A!XlWiEiObsP
z>ZK){F5RsiFP(!f%%G|yV)48vK}B`}J9>2=MyL7}@9I7YyTSr{i3Jrz5d#jRv|PnG
zbI+SwmR%X3+qGf4ZWf0KGwfwhJ0|D}4qy5%%&xL6bZSAr+GUC5nGKojBsG;GRd3vW
z(+Ox)@+#t<Kh#0IzGkNw!25>0#_#_owY}reMJ&3a5|YJ)4i@n!Nyq0?yzIN7tFoP6
zmoGq){{YtGiQn}9Cf9tw!Q+*W;AM;DYxX1P@OuV~vB`J^jZnOXFc(-#vxUGrbRRy_
zgU*T<bVHXVNz~&$RE+>at})*dXZn0zaQ!P;h(7%_R=oGcgWL#Hks4u!A!~THh6E_R
zmEK@Wq`v;#VhV9%c(+B`OLoR%#p@F8c%0!#&GJIaIWvo}Mk=NZU}y;?=!nJW6dgGX
z<@Eq|kv0lyjDQnGv?hzqkAx92!-ysM#3lct6qmWka{qq(48#c?M8tsd7s;~0Z4pop
z7rQzcd3roYk6Ft?=C~4i0(P=YlIQm4Ji-MVvi^mhMejU!>i~&A+bU!Ur`Y11Lc@qP
zLOLgF7N1+}A=U~7M$mq$5~j-;xe*jO`%*@5FrdcbOFQ=8J%vW93QgG`(YsE(_Lm3f
z{I5pZ?Y&N+MQI{5f+$SIToBEju{fwyRwiRHwlL^95BF@>HFeT995D3V8%dw`qVN5L
zk9qrV`U*Ty)M{V&czW}vMcPZwj34lQgV;;P23@O2sXs}>xyd@gi!DvoWnExuG&D>_
z*i+<<YJ<!)v7{r^jOa{ikYD8e3h<uYN%R!I@W`TU35dCI4OTtMB5RnVMnyWpCQ6d!
zPx37#av|A>SM{wye1H!|Q_O{wTX-(Abti%$Mdz^qYd?N!Jn@{rbRRdd)_c)ecr2RD
zTTDhwatYW9m**LtcRUxsfm}iMoso@u+>>b<W9>621O^P8U;=09*wxqn6eaACBdnlo
z#GiEflEEp@9k+L_a>r$t@@18=*=)x45f|AmM&B=Ix(FTW%?8~zpS==cVcco~GE5OD
zXFd;Cmuq)zim4g{{jWw##w9W_En7?@a8T^W`mnTrpW8zg?Udoj7><L#znuWS*PJfG
z3HldBBOoFRwuoekuZ_vg0Z$(S(hE5ZK7E;t^u`}Bvg#P3|F5gF0IFl#)-}Q1odpDU
zcMlNU-7R=<cNXrxaCZw%aCdk2;1V1H1PFQS<lcAo&F(6yy5M8Bjh@{-=NSJ#W54<u
z>VyMy(a|2J5$5xC=EEG(zYwbO=&V;h;BrX1he`9gqJ)sopG=GiwXU~tO*Qp0{{fwG
z(bh6LMV#gLklvV)USW%VkK@HJ5!l^VK+0yrR3Wc3WlzZARK{L&JH1B$&>wI+%21%T
z;6L1(H@yT>T>K8WVh2Pwr6`S7-(Erg-0z8?rM{3ghC5PC3I|j#zH46%%z$>}wn1%S
zop~f+9DLf)j@c*Hk34Q!y`=ZZ7*c>@iT(Aj!A;l`b_8f}*;F4WAw&}R;(@(H{Cm?3
zv}Own9|(<wEvX>g;Dvb|_-Q>o2$~y-8=vr|uTH=omYc)Lf*YZGL)Y&6i^^w+K-}cd
z)-X1hs`(o6P1WJRqT~B}rIX$AovX=n`y_+aLDFA`(~tgFk8V9P9WP5Oz+XfGit^#J
z&`mL^zsN!`K<H>>5V35)_?x6}<`H-~X;AV&Wij>$69h^4mVRW>VR-R)IFpotuz`;i
z=!C4}8*B*SV%niJ!JhOXxPrv}9G<C4xkx5F{^KDcNPEXIUflq+Z+M-Z?{_7H->67`
zR|0y5?=THNEvHd+lJ9D~TLU<`E}VEUZb?gf=CBG_npkbv;AbuYLF#sTjWFvJr72cQ
z+Mfk0nnsemed759s|ar*?5#S~Czh+)*IvQdpWcMf_HC$NM#L8n>lxY6qQ8&}M<;5_
z+Df@`A~>M8Sc-{IK(8Zi@JHt=5Nm+wy3HjH0{APN%K$=aBy)D*)8o%SLJIilqM=u&
z1h&sFK$VGBk5^m3p}lOft(xzxZ&N}@>E4a@CyHskX|bVWcm$#Sxh&@=Lwt?aAKuTJ
z4v*<gq*G=RZrAE`Ed7${SC^bj&jctl<va?r_ikgBZ=0l>hFLCUTiMgwe(=}4wHxJZ
zum1R1n*$K&L*z2B^mSDop_0HWrEL#772V|AIFEmC$DVEkDAtr+&V89c2T2?oz1+rG
zz_+0;-~-wlE`{5gz&MsxHDyU@rISxF<`>UwT3`|K8bq=5&H@?p%{?@V^=DyjCtWx9
z{_aN8(Mk92%4(C?C+@5|E&-*XblM&qax?#ii705j&!S@}wOitQTjJxi%jRNlzlI{n
zazYdD!O%_wUNCN@mXPc{^h<@CZ$>JxXU;JfL47wT6eKdU9VBLdM#r)0ZdN!ASp&c0
zy&|uEBW<BR)xY8YI<M@&L+hm0h%?}dEhSV=S6NVu)fKz`iF?lDQY3$9v|(qDnA<^Y
z7z2Q_x@kwdejVXLJ5U-^(aioSqsUu7njt<T6%(AlamI}>V%8bG&+bl6z7Ji<u1HS5
z>jBw<=jxSbzmcqAcr=^xt63!lZ-)DKZn5Ol)u-|pHD0D&A%d&@m>7|7<uPd21u-Jd
zl<m)|GE!yUlM&4+Y*X{NjIWGul>0NjFY%7{aVuT@iB7r1Z)|VmyIAi^lnKVt2a|h=
zcj|$NKv(9vnqyX`nP3|O^<Z=>9eFpTDm`tzqSTz~21BVv^^vbuvUoM01H=05X0ON=
zv#ps*w9&pSe&IRH;P;`pLyCe`$u&_;arjh!U2H*_O{S&AG8Nudiz)Wy=1K7KD`6&4
z3a4T_NXCVcL&fS<w!JI#`(wNH;g*{56=Zgz05A^ktk;<fcfq#9{?{<-*{~4Oatgtz
zmmuG7RXzeSG$ChQekGEz{il942Fp4lo6h;7k>xz&9PFrfzb|ywR+C?ztEL9&xAZNB
z7|Si4TfI?T_*-NGIE&X`AKs^gz5EBs!acwD6nyDTkh$<n%^+MWa>-=Mqv$d+4Wn`a
zq7Qzu9yqcpoj<F^YyR2;n?GBd!}=?eUV<u~H;CSAyv>Nv^)k&O=cR-XKClCxxqk}>
zM^MmUnmo6}^;UeH80`5Skm`6x8P)%ZaA-Fg9$B%-46|f6RYrPuSq6H5D^Mmm)CQi2
z|4R0})D4C513*-|Gnn29yJ-)9Im$x?$P!nilil0(u@QrckyL0EvK4*9;6TjQs~)NT
z;vL?n?{cH<)vYrvH<Z>U&sLs@hf;OV<OhA@RDl!P{MvvwXw}~^j9HRHJ6UCQf`0lL
zKJt#%cgUL9CTIw{UU8JT9WCYNXc1}&gVqgiepOhOvsA(#YM*AiM4QTlT!Lwvfdy%{
z8;Xt)5;iO7olqD%>wY0v_ti9heRS#y`C(i$`MSoCa?GEW-go>Ab8(5)9*;vO#aQB_
z-80pyKS#L5aqzGX6_fTJeOl)~o%kqfw6P{{D@&jh)esca{l0GoHr}ZGK=0uN=ivgH
z&?4iEuYtOjV!{*nt|@nU2_ybO66kH9uuF}%ipQJd-k0gBynKW<j%<MM$HdW^v80LN
z7~Nae%C)}9AKK2b^SXkiCL*3VHouinY7@~Q`f=U!DC;*m{y2XV$R5=Rfnm^md_;+^
zGH+MqhHrQf?_T{k9Q9xtFZElf+}_TUm~SXBilL^b{{YlNhvcD>9qkk;2=wU5tI+Z#
zb>G!^#sB4xTU9#Q9z~4lZX}Tr0(R+J|B_(vtrU@Zdp~@luud9~;OHV}qmW-}M!5Id
znb38ZSvOTQL75Yir~DHUkMJHzdN{aShyCFhhH{^*B>>+WKfd+wt^A7#>AHSevT9;%
z5f0g=<jw}vE8IA*|3_@7Du#0K%hgvP<SXeEuOU)M_rIoDDF?d?OTe#X_u%QS|M`Za
zn;`<B#GnD`BjV*hu0b`RB$AaQOo!vsWE!*fY2htTW?tet2o&DLI@~WjiD8Bg;`u{}
zB;RZ{Prj3bok+UO-f;0huD{6Z>G6k3A4-aYcIHnSrIDehb<>qX<XKvaNs4kx-cL85
z&1RZ${s?Hn4>NkYm18zgtMT6CAc!dwOK<q>vcd&42y4rvAQ}ogaNA(CU)QWZ<IK`u
zv`J-!>KUU*po(%{!A$kYD@eM4OVBfo(8%FG<S0hg(w#z4>)s>c&dILf%i1*DpI7zv
z#J}6tO}-p;nQ&v8gHM=fz|d@(6^O3MRhMla6R}S(mSJg?QfX-N@Xf-rV<sHZP)gcR
zwa)>Pjhl-fdK^#><Wr!&U+#F{{^8}j|2PIi+$vfMKkE+Mmh%<yk#WFR3VwN#NdBeV
zsp=uNk?Ydh$j1k|7d?!h%BpGX0|!p}`1cxRR6J87sq0B|6x<w@1h8QVnrR!buG#FY
z@oZ2yjQFh)a<G@if^iaIKi^U#Or9x!nWqZ@y`TuFy<37!&hQ5i2y^N-f5FWEvUXT2
zMN}Kl_0)6i!Kp5#6AY7Qu{1lmNGX0K6q5N&NNF8WjxaaIYON$4Jqx6tc|ae-^Cxc?
z{~R(YdZco@*$?4^mLrp0&^Xr%u#^d6p<^uC;fo2K9YU`>MCyp}v$^AJM{C~dn_C9}
zQI4JZj%QOtvMsUm*n5rN;0inNY2~lPUi{%7$41N{2e|E72kB&J=)`W#W5U1rm;}kd
zlmhm{3-Sb<<(mt}+~WxJQB-h@&{UH5zyH2iND+7mf_^#MkLhLYEfG~~#T6q-GUv2f
zC0U&=Fv}#yap$(3cj!#2*$*?COTNnBD9H>&7_{Q0!e{#d!vJ=gdC};{nWw>ipY!xD
zVGea@IpIoh2oJ)75<_S}*Ks7k4f_SK4_sEU(_SlOGPnLXRWY5ymfZRWx-LgL90{C)
z_b?Ll4n!l+3xhSwsG&-`NS?dzC=nxM!JY%5=?Ys(^rFl-EZaF5jmI&T7T{3s2G<l0
zcJX44R?M=}d#tE?$5f1(>W9W5z<}tn<r!$pBTO|#Rr=h*LUuW`Hfw+>j2mX7sQ?w0
zMVMNy$)LG9M5Q*zsr56`NlfuYAM3WZ43ZO6{g?cN6Z47YP61@JyS{7VpEro&W=j<+
z4Kk;zR$O07J%_)b+#)9ff_domwdWslFfy3MpU0Xl`5wkm@w#=__DP1C+%~v}J_mQy
z$h3y`GP-nSoEWGnyfp(qCsB3!ArB~b-$(Tvg~GOc4{e}f?C9ov%O;zYFrePVDNf~m
z2s0%`r;MZY>A^E_9F|%*FN>}Jk?!z<qdK7|hkukw73;ckYF$xI7MUEjkiIY*uSRJ9
zNxQEzOix?6uG|D+0@)=nqpI^-zTN_1g`uU=Ki#A*O|NpxBAp*da_rw#9;jPJ$7l6$
zq_nCQHU_My4(dQQ?Q_Y^vYT<5bVh5>Mj-S(BdlE_>AZoiy_TGKoiNjAuV`Pa*xh86
zUzwVknq?vp8tzKQ>iA)FdF5o&xLxAzTw}}1oK!GVB1t-r4twYeRgs+Sc^iUJKt>2L
zK+qr?0>6+sPvZ{kbA7-e^K-`AReIBz)ro3kROb$&oG^*-wT_x2(4B$0$XSHPIEF!f
znT$4*Q&-P>3K|U;@1`B<yCoK!6VIh(-oqRsV5Zo=JI}9;r9aEVpsp0wUE}$<L)Han
zuBOW_mNBwT(H8zx>QG6#;lRM9G1gm(Zn{9+J|w<XSnDI5@_;B-6pu}B2*2h&Pr)no
zMbVn_#EToVFg=a|<LB==Hi-z{Y7R>0B7^AFe+{aoQ+=E407r8rxI^aoGpKeQ2Man&
z!~m+>DJ>{t`(G~4sqh185xWDBw-AHbKcGj!GtV*V^qPeY#+!3C7Td^dU;x8JLRkFY
zQAF-G{vIwjial;dQRJp$Hkg_4n|8SrI==V+_2VZ}fJ8Et87oCWUe7Zt!zaZc2#tP7
zS#n$nMj2@rfmj-HO<rG(K{X5;@?`>VZh7FwJr6+=jCs5$tpFVCKy{@xkwEoP_ip#x
zBhxLiW=^~P#c9ph#VFm=m3%x|htEM)oPm3$RQs2gxQX{#wi}KUsh3``WT};L8_GmA
z{>B8Kx7aoMx!qm@%Dk#Oa(5Mt4rlQPy^U20wZQK){nAV%1?mwC2=|x+>b|{HzKOu;
zbxyBE;~&Z*%NlYmM4zWT6gmn*ZJ@{S)^R-^(PG<c-Mo{d;F%ysmWzvTaw)f2Smk%1
zr)Kpyh?*~3Jm)HZuPaROF#S*};n_o~mswPuvTk$RFBuaMSx@xORht<7^kEn_H!?p%
zx65Q@K&*LY#_ADfIuGkce;Bvf`nm@A5M;u@ZLaee6Lmq*Z25dtKbPS{4ohZ=%z{t7
zUpefwk6iMb<W~<Wu6vwGtKN63sQr;3-4)hXRs_FjD3}sE<j-NX20p0?p(e#bJ?3+{
zV(pYu!YN(K7tPy#-#ANL*lT@-=E{~%Rp?#o%}?5k<f52Ayh9LnHbY4&Niw4Zs&QCK
z`%+Q`f^AhDX<oui<`2;WFgD4?JfjQ0p?ypxZ)5j~I^YXwIY+KgI%x}NRXcaAMmm;u
z>F}_Z=M8mr&Zs7pA%BY_dw}wK;23QOuuJK*x#K+s<y3tWwiaX$hfB|26(qJz;w0-(
z=<vb6uusv9z{|*3L%PQ~1tR{`J;<c6=r_}OJ0MTuN{TEOuJZAd6z@G$R7)SG&{f)V
z3YaNEmxgJPQB;{?r&V3#J-weO9a9?=T(eG^!2h?E%7KM=dKoyqtLTqv&3|T1!C{`1
zf(cC8ktGtv9`0$>X>2bg{LQ)4yj=dS2zy1=K^81rQWBaUD$U%PMLEFVkdd+$`Gn{P
zsD);EhVUz&=g10(2<7a++sSC$`AIyT{p;89E?xk|q8N4^M*oOpz!Zdr*p0Texd;~G
zk1o_caESs~bcT*eDLlA_^SCg}(V{Ko;UjP!L$d9T_jE%p1tWF3rdsv~nhCr0x~BG<
z`g2Va=hR2D46}(5&Ch$Z+=Y3g<!R;R8K|&gj|O=v1{VayqT142;lsJ(dM`tR@0#K7
zl%4_0kJLqZVgu?NHoOVzn2KlB3{Dh<A5VBc>lL|frf0UI%e^R=#jAHuMt5Rp8PWjf
z$00UCww}$d!^8A~J$$6gf5m5Yd|fCw9jhI;E54m{`8Ld80y_jD5K?sd_<>f$a8Bn@
z_QA9NaX}x$#OIba<ctzzbohHE+$ZXKQ~o`)Z<KbVo5gREZDKeQ3l}V!Q<@`Q=2&F-
z8^~)fOYLzt0*1DlJ@XozG!}v5b^NyvkxN7ar#si<qpU&4bNq(K<_^xk_3Y86v7h|H
zy+j7dZ8CnOG^SbpdltNK_)+2uxZ7$5&7=wd)qg93XS3cOybs5nl69d!s$fKam6}i)
z%zIC0BOe1#O$+;5uO`jev&-fZwJ3fM>xqRDGLl+2;HuckT@T$BBnFzkoSgQ(o0`1*
z^?dh>CV)@yR6;~PXYgwrXOtLI32V_lAtOp7KPPr5EfQN=zum4t?QTt&4>AJDGJeAZ
zaO0JtMeuT^s)^V2*E*!Q(rm<5Z`oAg_l_HIZ_>S0yQQjasmvg{WP-2l?q_LU)_oe{
z@KkynAs;x^<wnvj=0LFIIT4E=qmfaEAby6l<Ix{AQZ!niX2S<>qserjF;j0l(?l=Y
zHT|nn`X)0x5$i~CSnb_uCYFdxQP_wGu=bk&uq~a%mHsP`>F6O`tCQ^1s&ytID)^{A
z3=WxPM%}~1-+YbeaG?s_oa_kS*)r1fWWV|1qe_jSh}>?<D__T4y`vw~DuUf{8$%fD
zW*94l7_$C{;SadMVuGBk0my7DDaee*i6#fY%`$-+EjKZ!_&T$1{KNS8d`5lgz_1bI
z5|<l`(boZ^txfmyr{vR7n?fJ7)0$(6mmjo8CV(!NeWtJiR1i~V8N&<_%1ABdmLjTM
zspiz;{EhubR>c_>1tqNlcU2baG#sW<E;_s5{Ak&ASZf4bxJhx!$y2{_3nx-rr7+Yn
zRvhDd@AM$U)DM{z_|z|+9LN-{K;+RJ>45`9N>wYR1*?+CVpPV=oqP)r+{w?NdeT{L
z)I`kBENcWzaI-z1?oaZs7W<foXei4_0*5%q2CVj)J@rd^V9jr<B}u8NFD0S_B)&Mx
zXTq_%$A7UQC!k44QYelof0bnLOu4OuT+3!A5nB@=j@x11v~36Qd>r`rMT(5jempF~
z02L%{rrH`>!EK>_YA<y{VS$CID{43nDS7CNP56UYKS+_Iz=-+>-rv(&mZDA#$>31-
zg!$k1Nmvl;94_c70~u(Jgi}DT`=M%9)r{_aNHV%KRuZ*_{AcNV?qmfWefP1;)Ti3s
zv8*)1&JTr=b6}Tuw(hkWTHNZJSuc^JtjF$0H;W!$pWhh0<eIMcrjp^zcqm@rFjk)&
zJ4_7oYExKVtjjMLOweyJ5ZE+Uz6~{iZQ8rgLl)=SXv%GldjK;2Zd-Ms<<P$)>|ev_
zX4>bi2!nI)O<3bYwVSC9@4nz>*q*DumN@x|EV<;y)Uy}yz7D=c^X|2D?S81+Gy`RX
z8^MQi({JrO;~HvW#=xjzGM}q3B6Iq{CVcN>dYogH1)R?1G<K!yaCBt~<qLD~;RAUj
zI>6Ikn)l&W>H~01T?ji?OKH$a@FHbcz$aXjg3-egQ3E9!qxHD1q#-%G$Iy867gA<H
zk3Ek826*D{JMhy2qTR?V-M07RIgz?-tq)U=iQR_tS9z@tFR#&nz~n$GMjOw`x;2og
z1hnQ73L{UQ_{-o~HwKmvdc%Hkpo$s(e9xVQ_OBTv*Ak$%6k}N8_r*`?XTOwYshk*F
z2uME8gxRl~)pBU(dz1y61Q=EzGKZE}C6I#{DYDYLAb?V+Bk0vK83%~-2SmgW_QoNM
zpxeQ45%B`SIt{__!tTJ*?$Aox$zO!k<!fpuMP~$<ojF3FOFGQYFHnnk=a7-)1t2^6
z!jG{dr;WgOxxMd|$S1hu?}QK9;xI{jF_k1jQUw%D#pXLgH!#MSHp$|#+Nff7nU^NX
z!+j1a4gwWvVig{6V82&+dq)ow#E<Aub&7Fw>AgbR#rYqf*!-3NsfUZ{4uhN$xf%p<
zlMPs`N}*a0@_PN`=emR7FoeUy6LW?Y8cdU~q~1{u94JV8w#S#!<ww+C{T;Q&3jP|<
z;HYf{#b!$a12z`<a4>lAiI%zuVyH0{<VP)n)&{njXX}^`mp9!df72NG&JDu-hWJgp
z-^P@+^<Fgd>#<bNUCveZ#@pN79bN#`S35J6#zb+Z_z~_i&rc>JV!;VMyD}`^GNYWC
zBhZaRG5Y<VXF!*`Kh3^XqJ8@2QaX<m)-QrPzHq~74U{Z1l&0;(qj%L1!Nj16zAARr
zSiv(nxt(xlQ8u-#8XWb=DY)X>GG@ncE*7A4`=Ra?uACXc0+mLAL+lsR`2lm8sEgx9
zhPOMxw2YKaDNbMtOKcm7<vl^cu<jvpTpi{pc2+2LLH3iDYu=<ad)dXFlLa`{kSrlQ
zuoL~o8@MefcSV;#H%i3UP$#!)&3NRsJSS!6>n~gW8!glLG1!I6b;tX8k;j77PDlX*
z_ZIrg4ZZDUiyp47#Cd_ONnTycq^;n3&jkQwdeh`1ueSe1$ok%H4X0dOkY##=m1kwo
z_8B>B<9LrI>T`qf2~L1xFhw|1{nX`Kz)dVM6p&lQg<pmWdzFP6qWMd}n5=SKB)u(G
z5~>zKX1m6iZ}`t2gj2fmjfo#HGgmu8xzMp{_7&xQ@v^dMHapZ;qD;GM88&3;ib5KS
z>8_NJ@*25HO{cKaRJ|M0yc@vgYfd^`!y^3(%~_+@S$0+F+*-E#+#5_NEQkO5SjL5b
zfQJX?qlrQ|PHCfTfy2TEJRc(R=W_x%j{>NIF65CU)6e<=9{naXf>s7TBn=I^K4E^I
z9<f?Xr>=ui&B>KrT!DI=<%xy4I7%u7Nu)Q0$OwtYe)EJy+g+(tEJT@%dDC@gqh;o_
zyUc<53fSWZXN=gwHJGq88&=P)8{0TmpYbhNCRVkysFiSt>s`~i%uK{y*oPO2(^Mde
zM+y|=Gt>t6CY4<3grttK@0wF|TOk8dYT|^Rh5Z;^O0j`9w_Q;bQBCj+LP)V5wlt#%
zh{bF=$(^m`tgY0bxai^aou=^#YvYVs`96)b+4ffj2hm<>Vsl%?S>3x+uE6Ugwfv)Y
zUh@*wb=J)h=K=O7Nkv0ln|UrTQfT17wi@W;8Ss-xOHSIufWnOHdC!5MDAGva>2r?6
zKnKf2w0*rQyKVfULdgo<`D*g6H^Xph%c!$b@qG2PjLSLHx&X?eT?QMqjqgXrwXD=W
zC0osJOTcu)yK@;}|M)U=mJGL=Z7EEc5@e}OH9roI!zPE<!x#nMzONLq&<W7oMNJBC
zkH0-}wxB?51Rb_8eSs}rPh~bM_t$Y58S4`E2E^jl`&2s#v*#slJXvE(w|Ns}ZXak!
z;s)i`j>9%*1znu=M=tL#DCKd<gYW%dHcsRS#Dd_&zCg#1K5~LJZfOODm2uWntnjFJ
z(lB0>*^4^h%^N!4Er;C;>=%H6L6mEh>K}YV=!HeG^5&?z^R;}3==dkp5oY5#0($m>
z`i-1qhK!sz$f9zG+VWjf1uf}zSDN@S;vyV`YYl}^JYl9y-+wrQEY4gLKbRuBe&nyy
zg)(|?UinSucHHS3sW7jOLiv{Tki>7vpgfNcjUV{*$#d7pn%vRX#gnsv-o52)(NB@?
zH(zQ>JX2Dr=Yw|xY;v$E{V*nCEJhy4n$g^T^o`7@yL>hna^#!k3u6eJW{Y{^zoQT3
zyrJhLwIGs!`$-n{6$?ai)H6YlUCPYDrjwmFg<KQfB=UE^Xr`OBh>HofiJ}81T>Ynx
z#MzPsg!B~&q&$xYc8jt$)*niIlg-TF@%C;uUuzIDw%vvLp32r-cc>-|K_JJSTAzqE
zsqLL4Niq|Wfziw>*4mE|haP8)1sP}@4jt5Hh7`D_(AtkVdWpF@)nKv~EEIr3W(zSg
z;{R(qYi{y{Ao5k&L&-zKO~Y+zWl5=)*yjN~K<8GSg#V@<`1wtXt7oMiH_z%R7?nkM
z?uPEI+~t`A<#*Yx($6Op;gy1YBx0{8)d3T5j`*=Jpl{Cie1vTYuo8l;75zjdHG)63
zG+1QX>G^9<t%qyr2}dF~&Y<vx%4iC|lAyps^4T2QEfKOOX1Q2-#MQSy$2^AG)GhfN
zRu6W4no}hKu$Gs)oH`#myZ9itDl<}6Df%keSC9p?`mLNA<hCeXPhEDF&Y;GbQ8~s*
zd}rPsr^~0HGCf=TapaS?sI1#!MG7G}X-9v=nd;gu;~)*uTY`Q`HpQrNiJ3#grJcF)
z0GTVZdMw+wDwVJ&yJAeAE4!?@>c@m{$s=SBqk0b>(7HieiUVc>6L2Vf<_SGsWkFCo
zrrN`(=FYTIuc28!r{mA3=XDG)I5RI{J|3s<;Z(-T4d*;-&|Q8y6l`kM1W^a7kVdB0
zo9`M6+7H9*YkE+L%}J|~<3@dDiM~8R91e=Kk_Wj3jZFkOH40<$P~0e!yGCXxP}0`5
zE&QAY;>q)hGzejC5!B<YK$|*oEGNTL%PTCqjJPP(HH)&Yn?FN}s)*B)94|k7HmKUt
zEo5@DL*THO8RoLajcKx&MjYCUEWNZ_w2@++mwhKU)oe96nYm(SI{wa0AefEAbVniR
zH70UulXXiki0#Wt)fc0!)~5Ozlc8lUx9`i<K<y1$_^LBxL(Hm6#gP6bw#KbZjV|i+
ze9gq4K`JVGYb8Q51V!`ZL_r3{V>XCQQbCcI_)PkVZSB2p1gMhhU+mu9X-Sw~EM3$a
z+pJdEBZOBHZ)k>+msX#@N+k2~<D*J>aEG{ORL6Bdk3X|5`wn|KnNM=!5VL(>xm6Zy
z1v1&rM|Q&$NYmC!C+Mk;yWBHIH)qNMFBez4OtT2|%HUx_zZ5d{T|XN$7W)f;az9E%
zB$fGwwl_CcRJF*(LR+TV652XgH$z8Pb19%w9kd|77V|NGijZM&Z%QAVT_aD|OOn)>
zxl@foa}XF%UA?I?en^m1B*H#U-s7OC2FBQt$O{F(&y3+bRL1*3MLBC*xG+ZK_Are?
zk6^kbZ-VV=&T!>SZV!8gTLf~`5YI}p1{VtloSe$ShGvZzi0Q*z!z0?PO=H(-bG0eg
zeO^5u;2#`=q7#d7grqgZBalwFrV55`3$3+B(4Bg<A+ksAh$Prb${91t5msz20~Q7$
z;-O+<%s^*TbBKm<uv_9H!>Mwf&zXIRLe@>@6(O-b_JW;PDz5nw{mzaCW4AxT;=}Q(
zRn<}qmCJCh#<<(iB=>jtBn}ws@oL1Ol<u~TDU!lLsy;^^o*$WsALV};nmkHmB=AjT
zYU<BjhD1qdp=3CAzIWH=&7s??IskH7OIpw>9Cn&KhxlE_ePixhv=wQWy#2};toVU@
zX9}6;)#EUi<GyRRzidn*6PjyHvhy+~4Brt+b{?83I&8oq8VACj?E+HOu&|r|!WCMt
zs~RMRy{!{{vzTFa)yEN;RiQf2Qr%IlKs+5HO2pKpx#(_p7Btft2nWqfs|L)~Ik!*L
z1(d2736!X1RKV%!PI~&TXJ>H0EXajP2C5p)@pV|BI!<e3TOx<MDC;C*vnfShv%Jsp
z%lfV`cd3nJLlHW<4=Yot>WsV@rH8y3K!mbcCArgg@v%IRX&PZzpf#47DeP;M^*5hZ
zC1pYEbJV21uWZE%>utfV<zc`U{i%eNSR1#pRspUxdueTVe9XjhG6QEe462uF<Vb`8
z*0P5Agb-IG`tVJ*u4{E71F_ZWs!iA3ex}2)^W;{tj^dF7xkGkw<}?O)Vyfu<64aso
zN_O#XGA;T-2SVo*eFe|2%S#QqLw2p98ZjJNZ6%d4PI<8UV`sJ!jJUv90_Rv&@7Hf%
z;Y0N_hT$*THETEy^qjlMcxa_IX|?d3LB1OaS%;s+?fWjmHtAakZi%VrUp8Tf8pv8E
zJan|%dW)lC@z|%`3?@0fYJwKRb#PGxX_9TOl&5mSHmN*lVqNPv8n$fRAi-jP^1EyC
z_~P9(k7ntrc+oIE*z7<KO8O|2&R`&`S&KeP0GZE$p?EjTqm^@BAkQIO*k;~PE~Je(
ziSq7I21y>tSOh=OJCvUV`nIFNx9E=<_QZ4X_!2jJpN5P_2k3`}+e~x7Qr5qOHKDDk
z(Ce#&@GTJ5x`I7ERd$+Nn`RjbntJ<6I?);ekVhtsZIqlCuGWDOYq}+0pX#0OD8gPp
zmWW+67*k>@V8iL@MHg9jirz{laWHW!2x7!gMR|l_5)X0ETdEU0;nu7il!Xb>$6McW
zq@b$wm72&h#!2=I4KdA0ljBDz&(*{kha3%xF%2;h3)bU?X=mS5JT$adb5wS-8($2p
z95{(TFi23R+8P3Ve;(CLob@OB43#dHJAY4YP!-QjpgCP6GmWHrOd^X6^A(;UQXPym
zoF9nvc=TvCUS0v_Aj5?yT}$S12r?4in~~ZJTZ(ML;20fyu><O6eDBlp(zmI8Ai@Ro
zc^7IQ3zHWqnz5a0f-Dkr(0SM!9l>c)5LRq1etoT7+(N)2S*NI)`M#mAGxSAcd<Dh#
zAKkRSL2Kk!ejn)&$!crx!#5wFMQbb|%_`IDz(HLOGFPNMymKNrqM8vCO5+c@k#y1O
zf3E5Cp1`X2k71&7W6(u%hxTc%NONRN^i9S|X-y6$TJm|@yENv_l}Hdoz+6Ogo;9-X
z9^Pmv5zhgd8g}~VZALB?CV8)5x`!Yhb7FC~r(dTD>KXLd#JF;+DK>XIOag`l_`hQX
zfgfs_9gD&1;-Ir7r{#{UQoV1cB?ZP68*{!}U3WPfwEi{T?$1G*VVFGn=6U(>MfgDS
zOz+p!)=J@qE%~}!0%fBXn}WIu$8kJvii=2826^CVz^hd;8=(w|aiBy7r)lUsON)W%
zgtdMBG45(xX9j`bMZJ~BN?5{r8LQCur8Gz!OO7zb&otzXA1J)O>(~g}YvQ2-VH#M4
zTnQ7rt>dSqjb1uJZ&#c-wlR^YMEu<<Xx{YkK;fs*JMN7mVh4#((I}#a$hA>C?OP6h
zc6C6j*G>PfUnu<}1;oS;S|NeqF3$*P??z9J2&vntE<Z4OZS-&5#2pMJ9tv&;3?M5U
zuL)k+oMsX<)_fbmTCQ$jwU<)WUCO-?6@<}a`>rDJ-iko3i@Lvzz?zN2*Q}9eRsPO^
zl85pzRu)wHwkA4i#kF6MzLx1NQ~`Z;6toQNKlz&5W0bhSoOkC$&tH!lfJakNnN|e&
zAsP0K+UC{n?WWB()<MIs5Bf*L{uM^?E>Y%%$4?s!XTCk>wRfK5&%1WQ5IY>BUj2KW
z!PV0w=}>4#dx~+$StK62_77S&ZGLEU$yK4}ICh3QKSiy&uCJ63Zgk`s7~k#Nl1l{u
z2``38YIY{-!+$;g9N`hfDVp8nvHB!D<oTSqvWeE!c5Z!ePiEu@G5jvZ>SSc}r~#2L
zKqdCjkM<i<Ki2iV$yei+&Kk+kpq~D8T?g~tjp+K0!}@@hx^ldI_o95#{VbgCA;W&o
zq-9WDyw*I5<mSC{dmtaS`enT9AA8uCKz+p^8C+3~UcI_HJdlkqw>bt~6izknEadB9
z+vuK9io7MrI%>$ZQsVm!e=#=E^|PugC~t64h?e{Zr|OlczewpFt)fpLBW2|ex<;sO
z;mOg0j$t|-VM{4FfzHFxnk7crse;bR22v_)bzSY{XlDui?P$a$rK%rruU+Mvz}Wr(
z5o>0RK84Tim2-L^t>iL&&0p`2=IP&5-EmgVGRWPeigPh_mOSlp&jsH0gc(bjlWJ-j
zyU`ZH=jAX?mlLOKH$7}E%vls`R~;lGqRMDg`W^)3jWOjVu+HjG8JvVSe!zc%YTk#u
z&nM9OM6qCuWopMkGK?!2i*&QH3XC$^C-0OSf2>2vD}ouBqo*()_xw6WXO;HJRho|f
zP~J9;I>a2yU7DtFK9so)5^q8wV$5*xQ02`ZR^X8DesrQ$eS47SKwO^=*voZGPy-U#
z_vQ;Da&b;irGFqDvN}5)Kywt?=wKxP7is{6VpNv1C8v;mQrcHt2|cocfN(eHu92o}
z{vYE6KQ~S3{&3k5v{aAMqB|vX_C2|Nwq7e+o!}!qJJ31bAN|rmm*EGv7>>_y!aAT3
z49a8WDI0%zqT`wxG97bmDfb_q+t1bs2r{KzNhsU>jPeq192dqm)Myza5`-BSSD0HJ
zW*}8QXTr!oY4wU(b_58E2M&B?YzaI=h|3#PLj_Fj#)u(SPu?LrPdr!_%vP(vHFILm
z12{q$YRJtJA_Qpn6!9>$*tm1+B_h(AZL&A2u8$xrxRQA^Nh)s+mOZ08C34|1#wE6O
zn!2OR6mt`Ug(s)`!fd)?UUoF@P2%$F=V8fWYF$~&CCStzSf)2UfUm&~f!ewKYLLHn
zX^s^3DyGbg23mRJk2?d8yAv%-?{gHUXbNWertY3r<dDH`jcVHM1aM4@KRB?SuNj#X
za|?tPW(eHE)OPu%mG7-j7O%6zj@J;kZeU7@RT^K=Ovy7)cVRZD+GZRD`s-dRNnNrg
z(2Pl(T2eg)dor%ufZrf+xiw1z+R&m;qWu|5uTmGi>6tthF<$}U;QK00%C|Y4pUQ%6
zNE=<YTssxJAzMrn9g|Z}*6{sIVuN8Uz;*@aS>1=EH#uMjCHvVCH}qoQAn>rTZ(`&T
z_BGU!bdYZ|lzx$+o`qs3sS8ebS60yz((7Fp+VK(nb4Cn2&~2bfm7C$hm!6REg1REH
zC`a=^qgT@p9fiwqIQ)|}U~)d?lTLN#Y&aKgN7K(SoX}&h+>!Mo{iaz;tFs|~Le5%p
z>zSXNB@tF_-HyR_$vnZGYx~k)3F3Dqc{{&Fsv{eYkE)&|k9Z=mF31s3HP(^Zr00nq
zS%#c8fe4&=fG!9A!&_v-YYqfPzhjQC-{p>sWb;iL^M&O_#~Go^86`t@Qa0W+F!nJt
zAlJ$Y_|pm8WNwD798z_X)$S>H<#>9OrL0oW`S4v(jXRA<Ma<8z!+EH7<n80dY@@NF
zusCypg?@t47~8pu*CqhhPNV~3(y<--5owXZnTX3~KtsoSxz1tbX%OBGk7te!dP3O^
z!|m~>)XiufZGNxvn>$aC&T&(N<Y89zSgl&-D-+w)_U;w0<;027*prX9n)wO}z89cL
z(Y>q0q$b6<$3!>KvlH_98w?89@{?Wk2|O;QINH7$`H_nJ*K1e#ODF!ZtRX~z`IIRY
zBZo%_Fm&X=zz^RAd;RPTt3fT-Z+Lse-&`b<fSrg)FnZi5u-5UgvO(BZwl<4(t0L=j
zSJ}C!A<TgFT^OPpo`Xu!ro>BJ&%jfgBg8-@Ht(#z$o5{YgW8-2JWJ0Z(=VmLMvq9#
zo&n75X1N=dufKm`=W5guzDmt|r5G0bt%%j90As#{GfwKtc0V!-q$b>@-V2Ns0`t0V
zpP)VCK79?d;DelUhRkVxkUKNkVgD`by94%jyA~R3RLkX6-&S_AQn8OM8+92EUe!@K
z$k6!S^kM6JvQnVGtsQgcsEm-qf+#eaF;O%-3=7lPkLB|pG$!;8O+O0#;>8yd6<n&r
zJ%B^8zsjvOmu}yM5YjWQ%JuM5Ym|N%G(A16kp48|qsf(Q<JA);A#_bPyhpK3P1>mZ
zTS({;!6sj6E=*+4xyB$?gl$6DG7czu@H5HFhu00!bk1ap-moUF?pAt>K3uhBoa|V$
zEyc3pmdPvJYUEoBa~wsvMS!AkOodUe4>nLjlaqt84EO2g>Iv=GqQ;^YRk4ltajvSR
zFZ-*&+Jx=#wAq`|YZ{V^;=@3H&d(kLk5rTM$<dd*MJ(&cCP-*R0iXIDyg*A*!8Rq6
z&n8dr-34J>uJtMcq;6ZOm`Ak9vtMV)f5NLE*+^k1nN(<xSnA{DIpQ_O*XPX$PYbK|
zb!Y7{oAiLPJ60b(U2om@*r($yfqX9vtH9vz6l+FfZ&~NHw+Gi>1)NY$Yt4bgr<z!F
zhBt@5{x!%%7=0)_1|DIBzyu3MFaxbUh%9mZB{xQI2cyrZ+(GIJrh2J|_(>2qsx5I@
z3B1i}d&9$YO!8HcRqD&MMTuA~$;`@DYX!E}Ydla03D`--&f495y8=5;!+H7H+3ClA
zmXvbKt!z@qlbeszetD1E$IKkhBV8hI1ikNGnS<QZ>2EQfjF-tGqv@;QgMib8@0pvU
zK0&+1S+tR0wW`O1S{a!c=ySDh#Gn;eDXa!*zTc2DS3Ic;8TL<@bQbO{!MFJF2jTik
z4%uM1_9O2%?!C3K8sa_jgbW=IO|vZSN4HX@8eu{hY2Ku;b`y%?b!*1g?kkwwp*a04
zZSAbs(?cYj>dawt38i4*Xa=T?l~iPO=Cgc<k`Mq9r_bLFAf8#UpJv<RF^Tt$ot05c
zvwu0BheGYWF19X#n@`OhCxk*;o9qR(Yp|;BAI&G_$|+bl57T+=UDGBK-KMIrIyV>5
ztCI?wu5x-6>+U<{LpOlGz}KWx0tsU#noHt!PWLcxDy%AdGbXX2?}6P4l}vTw6dC%%
zBpS0MwXD1*M5+GFHpq|D^zboRbmE>f*QL>N$H?F5ZsbK>=k;eB8{1PbY_xQa9j7Tm
zM5i(kzjhu>B1nq*b|lYhEo?P<+>x++59ms#^ITp2wxG!+x7h4ipPygNznJ1nw>d!a
zK=J6Iq}*dVyo{G?ngf)f#o5ukA%+<+^jgI&9MxFmmMhuDy!ui6`_tUl*n0iX{gd#|
zT?>~@9O{mV8d9_oG1wQrbDFa%U~wTfkOD#Kdmc63)Oy6Ps?$-vKB31tSri-1Kki%X
zRalZMtGEnp=HwhQaot)ll>~$&gIetvTU6KAFlw!eoj9_%a4CU1pFB*L<&_90B%3!g
z?6!vyF>}$H;X8L;<gaFD?8z&!w;o<9`RrDucodSYD!l0}Wj$h@qaoZ+Dw02DFEvV-
zB0cNW^qC)f5nsrKh<rEk`F;Caq<<;fNteI&iv^@t{=&*=47h+g#*|?0!H(<tC3Jxh
zbsrI7>-}k~p|%+?+U8{BEfWs#lW;p8iV$@-AP9~-H%=$Dn;d@m`kk-xfS#w`fX9sx
z%FYNH_Tc3)n@f|BFy||}i0X}LbHBy1#_Pucr5g?yxUCyr?C<oHrb{fOQd+;lFx%;S
z)sC6#Lb$T~L4^Ks8r}BI>3E2~W9eZ=-_ihhLWHHP)h5WmW6oDZEe-tz*7!z3|JWVJ
zuUhhO57N3bsh#}ZUVV;UtEW%c-%si92c1ia<p_=m{66=L;+Vcxhkb9Y+=b1ZyGE^9
zPSP6ybQHNWrzErcsaj{n43nmr@~LTl)%c-2rW_+Pon!6H@K{#?#n)C&vX7ehHLlKb
zLanR~apC7z;HpYVxo#tgS48$k_<qy3CPF1Nv10`r8JgjIsR7|%+wY04u!Zt?oGW4z
zwS@Yc{VPK7CbO$8Ki*f9u)#y>bz0CuDIxK<cX4}#t|<#$x8^m<^5)9Mnm1x+&yNhe
zvfCYpyFjSSeOG4fO+mZb&tx(*Bt3YZE#=bd?0iE%1A2+Xh>nW~u%n8of8Lhf3`=T-
z+Ih8mav=Y}Ce7xGbryzSsx8IljP=9MW)@qXYNbxR4=1~LHve0#Rd#nU^*SdS%(DYo
zdl(!xGK@e_je)%Me4ROM@{<rGaY0-!q3*AAJ%isXXU_sWW(fngB0<A8G+NcK-3~>I
z(=#_Y$iSbXZ&<6L1m|I~LY_EiyIh0U{4#{QapJFNCPnY!KVg&U68D;VX47JQBp$$k
zopfZ2qk*6!9%7rnGZ`nmiaX*h!AgE4t5ckQrB9-#R)4$d6>|Mzr9L;f1f2b4gn6ng
zFea2u)0w25y}Jfk&9aXBjJ1CJ3qkVB_V9GZ&j29$_Y!>UPudZ{4<l{}6k;CD?qiOC
zvS<BpzfYrlZ37*h;hrLXa5-kLeHFdspp=4uZ|b*x($dU3eOnG>Nimo0p<6CvCnR3q
z;WevXi@tmZDsA_RuT03SvV1SWGoeH;z;jwQNy70=5Jh9dF|F#}FZK+|q*FDL{Q&T}
z!Jr1dr+sAr`DKcTx~D&Ict*WRwZ0%*WF*Hz!++u9c~^bCBd#t{Cf0sMURro);My7k
zOqR@EVcw@Hzq#4YKIsTu&Cbtq6+9nkVz0%pem}m)c50o~Sa5E{u}?si9aOdh#eI$<
zAi4^A4E%+k>jZk_zIrFh)c2stscKn~s9Orevdx#Od5_=P-2Ue9yUAH`o$`z2Dte=t
zSDXZYJjpXdTwLOqB0nYS{lsKS_Q_D=lPB1jV~R#Um+R?DjB2EV8&UU|qnpTp#Bet|
zA)?Uc^j?@W$2L>;4MpH8-$r<yIKh0IhW;nF_gfOS#6cRWlzB1TL$T;j!5jld0lf=g
z;eZ;Hfc|}zQaf&#GoFwwudvShsDYh;11$I`!}U$RwWw)?_G?9X*xKVncT?~FscPyE
z_-dQsZA4k~nU-++RnlKH-L*{di*93(nOh_Hc&dFWwKH*t(v$b=(xmPko;Kdoq3>6Y
zCN?w9$ne4+x;%`kluFAWvyxV4QHp*7Ub)09^Swm*JQy2UU#EVdH&oF8Cl8<?kS?JV
zX11N&Mc%y35FN(wQ9TIKoFlm&OLU7F?#b;RIxoAspo*NOt{Sh+iJlrth)QTHBd91N
zrkahm{kxvgYX`=49Xzor0k#8V{NH&cOJ@@^TXPoBSqBBU!g28fw$N7XrBtB#Pi1Hm
zoDg%B%JQdo<PlcVnru43eJv&)s<0gwr5BjHW!JWQ(P-)A&@zjbz~mc6J!2ipn}UUm
z4WAjI<4v$L;0_QXy&uHcKwFtEO%e17k+?Ot^e`-HjPjlnvo)iSNuJ6{uluUJm0@SW
zxvgxkI|>enh^aSe>!>B#{B^83efv73A}!?m6s>ehs0mx`t|JTuQ=VmT;~1kji%(o#
zOa>pl%p{_mrwd|X=#2(Uy+nuX5HXd>O<L?azlUL?8;HCu$-v}@-X%mZyf3|lEJCKh
zOd!mjx9YQV*C)hZI4=5z248KsEHtPVWw)@JB`%VHu#cK05HMSzH;u{IUsHrMy&i*>
z21qK35I-ji&|BjQc~g7FEh2x>!~+zm?5CFHmpO9F@h6y#(6s??<m_2_)IX$lX(TXj
zpp^CJA&j|y1Dt{|WyI0Eaa?oi3>*Q?OmsFU9~B2^hp~}!Tn)Gt>{&sKH&62~h>!KO
z6cAHDExXGjri}@QI;LF9W%unK0H^`%G8GOsj{1@>B2RPlQ+MG0<JN&_sa!?;hlQDD
z`lW09J3?H_g1O&BS9HlKKNJkf&^DCf!!BbO+##=0txI;tRTz1ULi3ZW;^upGVR8IH
z-Cz0*Dwn$K^b3Hraw7OB^6k=B%={9wvAh?+F=t&CWiwQj^>=G~!pVDN<Tfu6{u1Yn
zd47qSKaGOuKdCQB2{4V0P~E>gLA3%tU4&>a3^_zx6<(l6Hf6WRAI$9G4WcHH7m)Tl
zKGOn(K2Qf4%|4W~pLv{9#pN5)|2Uz16+Kh#RaSdEt$TSd#P*TDB$MnQvf`j%LB?VT
zNcFZ|pAbR{un&q1XAR`iqIFN{hWnJO`Vn!3a&++BI=Sb<=W%@Yk5w~e=f`25&OAXj
z!YJ)sWP5iBn#_(x27Sznt5OZ$7V7T<_CI2c=z|t{$=AFPRIejre*de6MBjZ_%om)?
zi3HB&<p2Lutf$?wkeT?6Ts^Mupb=+yg+SH4dhe7Q5&B-<Aun-2fTd^P;J@E+5rNPL
zlwbrKZ{~zRW&>L9(m|aAZ0|Zjmjk@-j{jKR2@RqHD%UJlp};rV8Q2zp3A}}W7Q%O+
z-C-P%{~!aA%9~#y_z&~oABukf@R}9uA7&B(9uyA?4>|=mxIEqdfe3u}%7f(#IRAp>
z;QkA{z!8AthR^|6X9`@!U<*D6Vh9Mbzu;DcKXA+t3A9(Bd?Bc22p2L7|Gy3F4^ab(
zg2Oj!z`5MM$Pf_V!~Q=@G{GN`f0z}Ja2~?w1>T)7@b3J5d{OVg5D}<{6dPnYfewgj
z+yM`6gR^|_At31gPg@WWiWFc_5c+u!{|H1jf(seV{HJxr5mJEThut5h;I9(|bO;FY
zzy8UM<qwn#hHwmYnJBTr^W+Q=5bytj@Ol0~mm|c0zdTU?g1qJaK!T$Hz+Z-xe?ioW
zf1v;Ir=$h^WpDTw$gcbcyc(qd{MWq+eCb*Lf?~A(Kojc3AmcG`jQrOG<=^KpL;nx>
zMTZd70S5o^mjDYk{ncW!(I4=2Oa$`W3IsH#0(}~%hm^Ah#f_5z{v)s~2);&Y;5ht`
zAmu-cw>1dGf&=t6jt=-sIrkp|yar<nh6unyx}1Q2OI!ZKH9La(5&>Y9OB%p`6dDP@
zH<cxLli<{a|Fg(D|ADUT(f(}mAF;y!NpSdwtaAASDmfzmIqtuNs{WzCYqwrtkOHh*
zg$MYr1{C;o3;YFbdH;ccQ!pS!4;&Ed6guD^A)9~4c8LG~!sLLzR6_o0(IfB=^lgd(
z@LzQR@C_jO7c?LG2a=uU0{pkG8v_DD=r1TZ;t$k4%?S9bpzSYcFa8fiH^Tt<r)22g
zE$t?OAv#dT3^m}dN{qi+I!XaUd?1HubiiME?0-QI>HlddDFp*mJA)4RZ+<j5dj9SP
z?lS*uk#!Chv^0wg_$T}H-@A5|^S>Z9;J?X!;M2wa*H*Xl!4L%~WsVH+SL)Ya5PQ)d
z2sw}B&%XUTMdlyYwiFDKgYJfK0sjnf{5#BsTR~eL<e;W`T)@9yivDS7p%)A>|B1tY
zKQ8`(9tS|83-bT-xJX>Ug`5}yRV<i8=8k~S7uf*+d0JqBVer+50C#`?XSo^y87$Jn
KN{{~McmEH#7D<`_

delta 48454
zcmZ6yQ*h^9^TnHqZQHhOb7Gsn*iOEaOgPcRwry+TiEZ09=REblIH%row{Lb;S65f>
z?$27gyAdL$9O5?*)azP`uSmS07VL@co$IaZH?ZIM@eQ7E*S>nG*N|Xfi-~OCxB*?S
zc`ej0%<&WoNo?zHFtUhbgHvYe@*p`I_%=AmEKze<u6)d)9#6=Iq%n5NO`MKrl$*8G
zo)nzS6m{RXHDFdmTtK@4-N`v4%Pn=aH(h|@-{;4(HJDMK3cI+s{;=tUg3fPev0+l?
zF`Ypwywv!;@dQMY6ib6X&7LldK>)tA=w}=CZbt|m-lk5nv&3-cU)i>Hm`|NVXNHL9
zw)S;@pIjEN;O~}I6bxiIkozND(Gs+>E2yZvg?Jf4G=Fens^L)+tzzL$ltIw?%s9*G
z9!iGGk?8X2x|+tCOflPblCxVg^5AB4^YoPPDH-#+dqKsHj_eFBTb!2(N<b==CdXWh
z?dn7Z)(*>U;g7=E<^{vYo{SmI!r!v%DOQ+PhQF++u{pCR`ESd#f&?F$(XdH7nOQQV
zeic`$>WY?*cNghl1}t&fw^-76G;7GG+s2}?UD)DIC>t2dE!MZW#us?Xg8QEP3s7EV
z+^42>n;t<TF2d<B);3mUI|DwHd@E^fmr5)?pOaS8iW4s5_xidmAiEOPggjNcyNq~+
za!ZQNK1P@c=O#Lp$-hHgM;bECRfQHN)uFW<KXLmDejvvnyRI?*cWcKcbRCO%iiwst
zSQUzc6yx3KH~%+zA(=kIjl?_#+Wy}r^eclf@Qgi#-@Y|rCAk>)K>+q>tiIANt+p=R
zVZ4ET?e{vE_WKgQa!PYdxGYurWL|Vcr<q^J-V7^3LR2vQe@&Og8sR5&=$duG!V8a-
z;kYu1EWmZNObxt?_ocqb_euCG{n%_P>2538$7rQxNC|Pm^pCne!MgA@q9bV0vJgnd
zWX<Iq_hmLq^OP)oHUSzVy8FnPTOzDETu(RTB{>9Ll?&Nz&Mh6u*oC$5;}~9uMQ&yS
zF<HMv{9-e#dFnbMK3aSNLXAXKIJLH6q8ekU465Wx^eELS`DQdAuhAZG(z3UhSF2W5
zTyjFKkV*~H12mh{#0JQYkYJ|g5t?2?${1dnk)p~M;`|ydqX2@tt4}0HLwb~+!3&Gb
zc2>-Q$WG<#spdXbY=>-lCNR61E?t+Fm?^y|<qJy;%YRYcoReJpJw9<;H>bWljuf12
z<?&|Kloehn&*492OZeuYs}fOtOR}bEEIF6h?J2=~tM1@7b;7dgw&oQnvI}h0C4LVD
zdD8XBiQbn;i33Wa>j#ZUGepx4F|~8nudD&Nuem7Txjs$A#rnaXL7x94vHH#V-A$sG
zen@P@nK#kbfDNM+XA`qi%l={zq2Y^s`WV!}A{tlO9ghG+CtgYzZnRNlMS?WM>V8e(
z-NGHz>Gb8);i}QE2<)T0OBhmaX5T*M(-?|fE0PkTMgZtzFVv@7UKEU9p<glv*F1=@
z-WQP5g#uy9df|WHzk$1=CO#aBM4B4>fz?9ma{wQY7%1#Lk=BXI$)#pHBpoxycM(Vb
zLnJSeWgkZ#x&NRqO=(AS@=sHI(jjNij?$wd1tImB|8|S?mu%9!MQ9IcbCTAm`H!b@
z6}Gf=#7m&k41n4#F1L2;QQ!OFePSK0h!jEN4NZ>=PgJ(ELjl?UWlZv`pXJ}zJ!Uw2
zz9|ce3agsb!E|;%VuF6o57=)R)UqR|{=Z0F%G?gPgNd`qSOeYBo|Otb@=`gs`*p!r
zRFXwxXyU_L6BEXj$zKF`uV3W8V7@CrKw^S{!NMYgfq{vE*#uiy75;ZxOa!3006hjz
zmSBYCu$(>;XEJ6%F?$JnI61kB?o0%fo%}&emvg}*A>s-D+UI>ZQi=XQxMt%1Ej+2?
z0p(Pt9nICVTA1hZ8&IY#9PKSVoM*I|l}xzQA)y|>7--;`e9k2e6-EG{G8#<Wl~uYU
z2760EMOFZRxt}($LxbH3_Fm*Sr#l|1kbfyj$P786xHK*_NqEcvk_Qt}0NDQ<_5TGu
z=EU!Y0uBZy`d=^SOcYbbPV|SN1f0;tFohtJhAcrYnsrO^4tAjxj4xP7!yzV$iV+|+
z2eUWMP`IkqtKX)-@1hj_=Wy0-_E2tQ@UFo$#o-nM()^Bd+^&VZte%c*okYNrZdaty
z`3R6*v6s->K;}dQaQ4)7_8a=#EzaxGm_7*W*jKEBxv%-Pxg3)Bp+aFgfD$*<fZ8U?
z(D~MG(08X7F;TQuW&**L{V|?*7uJ&Xz|=Y-syOJy9LK2d??^SpX3j>T`QMv=cy$Kz
z7I$bc)fRhmpc)z9D$CGbhhBsS9ZXI(LeV3RGv#~HcC%=@f!|yHt&3+_*uF>EKnQ)Z
zN~FiWV*g<(B+}~DZU!Ak2qfdW9;4!27_O=#-Olmsmn!EM#P5-YN>#YTGKLMcEM=RG
zM1Qm}B!&7R|GGIL{0Cmz4o#;^E6^4PQ!*fd5QqEgpH~`Ux=2OIkHvNjj-v3$Zz%d(
zS9z5~WD;{5Q3-<!5MkB+0l@{yBrWuzjbvdo91;K0GIC<$VVUe4YJduP7j(37oF_ZP
zRXnCAyCYxiqv%MkH#@>KmR}L=QofuDP4|E25c>O{*vO6lMv^Mo`Qv^>L^bhKfEyT)
z5lBF<y0|76K#vE?JY*9H^aT@mRbx>0?Dex<OsgLXD<zG`j-jRXH@mc#T2PoX*|(%j
zM6fQIbzvEhlvE?X^3Xb`S1A~wLm33eR9eI<e?b3l&HTPan?m`o=BWu2XW-}n1QX0<
z4<VJcO}rRs5-r&}lN+-?*l+j*Kba7v(ZL}TQ1vJqOzh*DC_tuM6w_1SuKGN&5__CV
z8%-|4%4Rgmde6oeVOVg=7bQ%N^GlyR4vB$t+@BqwHzg6!-2GNylb!=+Y0KkLz*WF=
zkKc6nb<g8*@9XI__zE2}uIvub5oFq>F|cKAaj(1D#h9smaK>`-k`-h;$O3w?gn)L$
z^~UNo+tI%DS^dZ;di7ZS2n$-j%?R6GxY38sxLJqpe<6bCjoMBe?`6ppnYo3603t*Z
zCP~JRqM&<1MA&XhUpQ7je2}C9bVrPFUlcx)!)i}n>>%`SdBpw#_}>5`z;5UI=DGO=
zrps}M<W`f2!}TclK-oBv!+8E?S}h%jpX?nw+P1jAZg@pm^*7}HM~C&sLiEpJ2l7j1
zgvb4(Hp~fsB|O#LKgzgopE~4sH~pHd1_3WQcn2&#IVGpzNk&<`dKj~<hpDZ1D)kwn
zDhs~*>|etne5DYs*&-mSxx;2jGKzT#4;Sa$18sH)y8T+(mfUe}h}zJ8X=t(|;>;|H
z*>QGAtG$m~$$ojTI-^Yq4E!i>f5iwGlP|q&67^niV_|x*`p{j!O;k_0_62_|G#^2U
zLmD(gc_P6h;iD#nhB|vQq`B0O6)`Pl_iSz|6m{5s$(MjIM*)VRRZuh_s<YsWH`4Jk
zJM9TwyVI}mrsaz+uA*|dM4bFKC2U=4e+=J7a9OK|=DRIHRSH=0acr_}EAVp|aJLDX
z`kfY?!*WjfT}4}$&P$9oISIJlPswMJxU=xnEz3uz#Jly*bj#74UgMnD8A??rXH;da
zvXP;lcwsDbnF6$@D-`MNa_a&hrIH2R4LSxcQy)3LDHZ6CRZ6995La?}L1%^4_N2@9
z37cbvYxe1Z;&9`*YTks=CVk|Cq*3&r$?En1!u4xn5`u~A4EIhHD)p8%)kbu<a(K3;
ztfcR9D<F~6gXbFKDTQzpgN%mbL-KS21a=sr?I%J8DZrB5sKS1ktYOi5u4P%k{Mb}Z
zM#ZY6luEo}>Oqx+hJ(jSVe{NuOK*gvAsY`!>0vOb*q)RngM3w0i|;Yf$~5@qs=EF-
zKFE$r=qFzx4^^=l%`&4VICUE>l6woXSkKsZ)l9gU99k4Bbyro;pMPpg#auD4S|vJM
z+P_WA0BnjW_1dQ8X-dbsn+prvv?>@kEfldv-0L`Z^EfWq`4sg)e$O@EtmSv#mzLn$
z$}y{BI9hVe@4_5_rQ$>Gq#2(l_g`}zZgxdH4pIhri>?w*KFqwrKCy~(Bd%99`&&N_
zixUzm+CwT}Gr@Or(EESiQ3#yN^J-iXs39Ea0t4RJV?~VH#4H)RDPvnYfmW8>GM20X
zIRZxRLc~;E_5x6fLCw`zUaSWjA(xaEQ`M75cX&>db80Tk2PJNBjl)W*%1^%PgN<lz
z99v0Dg^{exCT$8==6mGC$&;B%6Z@tZ#B<dCs}|0EgU|buO`BEM(_WL~f}~u_gUISl
zz%E}<jVAkaOL8mBVT7lWds>0IJE&kCvo$Kaq)lQ2v<KHUGzfFsMCTdVnHC7II$J8f
zq?|O2{IiBrB8gcJt<$nm2E!|Jk9gL6kHUL+5Wzb>?Dv@${kWZ3E!`E?yJEfZhV?Iq
z0&R?dk`o*lE;f^25_@%Yv9d!s2{;B0fZEYF7LMz6I3+@^AvQM384bkEeW@}yNqFoC
zqo%o8^kL?5oYjNXa3wbKSUa-?Oq#(oYO@kvx?v?YvM@y#dHhYr&~&=35F916)Jf2+
z-7k&?uU`A9hTR^Nv=_XOD$(z6^bWsZh9tmKRUTtw5Mv2rV@u&GPvR44WD4oU0LfJA
zh%&#vr-Bp-hxsQ=w?KC~ILQDWJ=u0ub}1AFKn9~rwd=q_dd^)+MxA^9r-cFyp5Uya
zs!3H;TH>Ao%d4y~Ni~CvzcF>XS|9FMIZd^MeIVj=x|v#zt30KmX%y%PV{~1rzPv^_
zIi8cv{FiQ@B8agVpZd0;jC+U=a1oBnQhRccihVPv;5$8XAB&<_;?0mvH&ecW?7K}2
z=Z9m}o?t0tsN>fBD-N#8=U09{XHa3seoEPatk-kMGO@1M=l-Juv^3!cAyTSGQY+~c
z^y&&~WHXW-<?FPVZiH%+`>B1S#P7>?I$g8(Zoz-n7RZ^Mp6gXEK|a<FKv74Z%to3*
zt%j#}xQcBhqqyQpcR8l0#2#T}KV)0~YC_~qZtq||xKB$bIlNbwaO7>}ENnlmF<9eV
z(dTw3S8Q?d>+tjAU+WO+*8XfQEV6?)wvcU*S2i;$uj6lP>H;-~v?OMxLR;GR-Bv45
z)zA+0fuA!`SLlf+ME-sUUJ%aibTof-{Luf!J|^!(;qVS~31Udx>#naqAl8#EePUI(
zr`T7qHT5YPjUhltol=Xz$`Htv^#y6JW>fbBq!x?89jfUzmv~q@;DD+P4j4}pj;)hs
zag_nNnEHIh!3Ok-;yZXWIrHdM6l)z`=GEsGcqzHVyOtbmI=VI>EkRzfp$k0`O7Y(v
zcsw^gqtd@(0w_UEb!h$R2e|@t#jLEyyF;tt#2(t{)Ksu`-LYzg5|~uxxH)+jjgp9h
zKqagaI^#n$SIvs~qLH3UzhIr;65-@dES6Wf&0T3tZ5);?41T^?&HmHhGoP;a*u*d4
zc@&}}SrbcOt)+8-=JKjBeqW8Vt`_uR?}aF%IhqQt41eeE=vw#Lqp#&jnJHXoM7Wt5
z&6Y;9D<XR(p9W4za4g%6MaCXa$`<zNZk9X5cU9?pn#Gg7WG2;Fcpv}jM>#@lY#EZ7
z?@fAclF8Oy!{~25Ch4QpdcEsM-6|AR^?YS~K0A4Eh^d-^I>Z|+iy`**_C4@RW}-}-
z#!mrSeN@H(P1;WsjUB$m;8OQgthmU>ZO51=C4QWZ`;b8)tP8)A;86x4ks`8pZ2wm~
zIfY`3F)yq2vlY{>P8`jfGHWlpf40I&Wd^=cAti=RQ+MOB-}}_CVt<$RV^gvsej^~W
z|HGGMEdrGXz`GF&P?_VHzDk;iFdD<1oger5Gu+tyej;bCH{7uy6oY)J2HD{dWk;d1
zlsOQqhG^Os&d`1Nt=NsD?fKmXoO!k3Q^}U)U}_fos_8VN-`W@rVi?5tZa6sVOKR%B
zYihK57)j+Zp||}q(I3$aY0G08-9(JJ)RJEx{%k1(h+EB=93>#DS3-#7Qw`gRqB`uE
z&l+@z8s#4ai=!^&s=>1k73gXg$%?7!xT}mMCXp75!_jb}%DSQ5<WhZyw#5kC3*a{8
zThjN($FaQ;oya_<(iVU9<Wod-FrKM2H+wM_<okCDv~6ZzT&t~1xiJnEa_+cvX-3-o
zvFwTgvYf0%{-m=#<<i1d;?rOssCau+9ry-cF3+S5W#r6wgzPWRVwUbSN7)cZhBVlm
z!ZkI^fJf=bDAZohk_S0c7FgDkq5m~AS8-NiFq-po=j#Bqsy3FkSg9CN;?6d%U~U_#
zKQbQGn7U!}0H~8J<oH_&Lrlx{T*O-~5tl4L>jKxZLCe!Z^FoD_gTkfW2EX?Gmi5fm
zlblAle&dRZywaMVEgwclP~Arp4?(K_nQ&+eDnEs<hno`i<uq`f{VV+GJQ~tTG!C-y
z<g6>GWs0#QcVsCiZ0tP4Ada)^Be;Lf&O4jhkH}baJL?okvjM+4DhtPap8I%@i24Ku
zmjfQIzwsC2_|1+0?`#p@qS49N2!|nKSzn;>Y-A#<%q3@7iP(c_TnJSX&oFp{a!c$2
za~5(b9_=Fb5qM)*b`g7`8(-jw^RQj~v)#7;;PtisfZh9M+OKv6@NkunFnGfR{y^@A
zAQ={j)QmxA*@wAh7C$6|e(A*9<4OXaXb*F&Er$QTOL(K$(%qs@KM^n7Qr7Ot+!)~%
z7u0~!Jl#2)vA~qlt45XH2x}lj9uUfWKk*h379D2{Qc7j{6l{o7?FczYId2o%N*Pk_
zJ3{{29PKsy=!^n7aq5rdXLrbkoNFj8T6QEfprp`9sHt*4ebA;4IA*_Eo}_>cp}ALj
zaF&p3P-zvTZ%$Y_VQ*^eHSD$@(feN13P}%36okWsUiXL9tc+x8DO$L18|R9k(xEAl
z5<xM+Gn*7+ant9}%DQoM_osJCSULIg=1ZA81ypsbYl_O20Y2J0E!AK$jnCH?BQmmA
z2uuSnrm(>$9^t5&a}kBVMl28q#T%>5V@f-`nj>0D+UJZ-A=D>JihgkB+|?oEFBqkY
z9^Dm;q5T&>v5IC~hvJ)RWEYJy(f;jCNc6ori@IF)U&8%fwxg~QjXQ5iqE(Z3t(qRB
zbDuKDk|g2+r|6d`G?(Lu_K}Fzkw{KZ!Tag!W6=w5yphsb^^58gcov`=M>25lzQ&iq
z#q-Qd^tt~6_hc4bmusO?(n1q;6rh%#fWv<Hg;^M;lhhl2z;P$Qn{c&)7l^@e=gd3h
zS+o!BXyxxT;g=Nz<kize&1dt)8IuW5F`Cv$86v36Qd}3(Ut1@9f&F|xMK``?q;FKu
zkALP^yLCHzW5*NMP6BEx4_H)vntT2VQ6)@;U6+bW>^91`!xXvh!mK_)_M?odu-cER
z&<d`WF+8Kz1?dR>QDMa{O*Oy$9wNkq{%h#*NvDf#p-=ie+HhbYnSDiAqB*BnoaC_i
zlWog?8m)!onCJ!0BZ-19^iBqD7qc<0sZuTuP$Qz6i0H0}MHlE3vsk>up}N3XMR3jC
zY#TO;NXk`95Q)*%B-b#_SVfNM_~<o~?SB#Z-z{=MnPoGv8dn9F>99nj6pvpBoC~Mh
z`#X{LZ>a#~q>wzOWpilP5&8HrQ1Dw7>&=eO2?lk2MU=rPZ_}KXm0O}zKbxr_0=rLY
zfeFJ@>F3(>F-||LMsloo>XBlaBXFi#DcQ&-X3L0Em0B&QLz^8TInHaXYNwl0H6#+s
z`gU|j&4RofO>xeE4olQT5k3<-FZ_V-xfA&R10;bFtY}8iU|@#`U|<~o2S~c`$N(*U
zH;iMvKw;gvwR0|RWL~rpt{F-8mEZ?a`c6veJ`Ga02ABO1@uj)&Ztv#G8m%7+Dsl>I
zMGn65YhkYQnMdUF=~mQesM8?^%^cm1rM-En?WaoCzN&Bjoel9QZ5Y!p0zKi!0o%uZ
z+Q8?v3<(5p$U1*ce><{ZBpjEbEx=n#5le?;JRd*E*X$!!U9x^#kYTJwgR^ks!DXN^
zK!wE8I-oX=M<hgh%Bi_Ty6&PoqD9q%)yRKjQkluXf3(|FSa8vPdBd+d#N+-_b_)Al
zMfB5yB%lUE+eK->0|^1Yhi*n)Fk8e2RP|lZ6SViSqO%JXw6%wIUXkp<2zYS|puMyR
z2r$khKX2%nwD%<)E)<K(m}nPiqYT@D7m(JKpYbX8Ar%3Ot_!BFgPxZ=5u)UVv=$|h
zdp@;_LstctW9pA%(GN7$crx^W(Wq+)<F?lOk*Q!>BZx}>;bZlp$|;#Bz57UivErd|
zq$V}Xce00m#9k&gMZQ4`AZRtP(|Uu<XzGUunsvtvzqCx=aBixEX-Q=AaV)=jpF?W!
z8Fxt<*;Q0nD7CKntCkl%dak){Y!X2OJ9;aB4=zA1mg=eCmU1p%ip_6=c~7s}fJKDS
zh#vZDqGER9>fcY9Jj2(hXnP|)VW)S=BRW~3p2L)Gc}#$^#bI?BXxH@OEajSI?li&>
z6JGn?;$$g@U7=vP+RAnoKRUWgv9PR5u8U;v8m5t6XKlz(_P#(ul0H$b^bkL-QSnzU
zjG|G9;inwC%Z4Z6P-=^NSn`@dJ+_s_)~)TG{bowgfcvA+1DcVf6b*}jyn=qv$Wpv1
zCx+1`3)gx3`|Je)pf&~_<~;BxkdT!%0s>sx&IY<C)Cobb=Pi_|dR<xf4Z7#&HU0~+
z5t&L@)?8PR_F^AukJAoJ8)%1%>jRZX_adBoYSHkKFg20cne}=xyW!L~NcXN7OSaLr
zoHFB(3OqekXj`L+odqKmv?CK=xQvwbM=pqlSc)nr4Ve4`5WLif<>J23ZE=1dYzxc9
zd*KTto8iN2hMw=Vuh0n`wYEo>1SzLX+NBV&Zq2;kDX<mt*g+e?Qd`@;BnP$Lw1gQG
zydXK+yi^ByIjapYLG%tFX`PuqFqxtRmN@qDG-doE`&mM6lnuv$9lDV?RTVgbFQu%D
zW#lMly=0dT$Q^DoVQBhZKI+9#LoE!Tbe+hWTz9aThmsX2X&vb<M|`n_8IIRLZFsIV
zr-aQa{VC+&nl6XAi^iIOvo}P+y*y2tVDX6hDn8*p!4crWG^qgx@^L+<4da@YE^?Wu
z(z7V+(t0H);~U0s;)U~PE@g4J$F`=BGGVIg8u==LsFsb}Rv~=CftzBA>I{P*SF?QV
zzwnhudNrkG(_f7xQLGVllX<x$=cO-njuP-73sTlUhKT&Wn$tTS+RaE)E?Y=s<F}+<
z^GP7}+?yZ)RETvENqdu#a2r1n4PnfRA-*TKji1ODL(~@o^MY&?T>iwy5rGgPj*@L^
zv1SGUfM#5Pxj8r{n}>ip%}6fX-5WGWo-pr~=d!vbDpNa^A2cPvs*H5UjiWL|aMBSf
zVY~H!%)hu1fbbc0lJ0o+<XD1U?3e0J(#hfq7q7sc!~{V?>N(F}6=@(-vCo35X&tbp
z-|FIxre6x<_kOi=Ye1fCvlD5+o@`Hw1uqP|_|f~|tgFExbIy9+Gq?1<?_gM()h#|E
zziBYzudH@PoqsZz5VnPHg7XOtL2z)&YUC?{`=5{&|D#)O?@>Jd%$g;)*|7fl7pWq}
z<F>-YU5RIjhLP^vYdks8RIzMVg(Vv*R1`$s?^ZP~r8Q_aJDyb5;LEjip{aGOv~&zO
z5Dq)|<MqlQ1Akbz24L|Q^ag2#hzCk}V}bl1Kx4o^7@Au!DYOAl{w|^_Ax;2o#3e78
zXMOwip<$R8j0^R_UnusHUw#iah@8F-Gb*vx2Yu*HZTKZJXf-{-6bF;UYyK(L4zf|i
z<ankR*k59TGNT3TUtxkd$J4Xs8azM>*GQR9m)!OAZY3Fj@Nq0tD)(4AAdvUT{MKrs
zau_#Gs1kO3EHNQXIX_rhsq$U@ALFski^f-UO_1LT%?<P3(6bL=sR_=e^wHaISYs_h
zmfH_<C+3^gt_`yuf>LKascA_%RO^5LpT_Wiv>vkDchlfMTK`QoF`twh&{x41!~Bwt
zH(YvDtD<dgvDJsvU)8(RoF5#oh}3{3g;TKzg{xuiw9vKx(C((RwVfLgevsi38c<{S
z`?GVjebTGP?Py}+T0|reT&KSxSao95yI_YdM=pX6*2GBK;3X1Ox{h?WJ@_|RH>$6y
zw3>}lzXF^BVxs=r)0-GQV7xY3<5c`GC#F1|;yIt|9_D<u!pp@uURS9%<)+lxF~+(X
z!(iEP8l5wVqu}QoZ)!7NPmp8k2Q^^py4M@J{EQ&X*=Ds?@*JNpl0(Z1$(;>P6<ws5
zdCg-NzA;G<j*Sz*YdJuVTSNEZ$+|<7jua+2=2EG*$VHF6EZiv#bWa&NlpYduwsoE_
zc#pX#XL#5Kw5_38<Hpc@FlEHHIOt`u-s!E{dKDjJmFORt1(B^qanL1bO0tR>2>Ue1
zMI4}sQFf`-M`J-hS|NP{ly0u-%e;SLVLhW-rJdxwOV2maZ&<<_&R2Rzc`ekYJRnqh
z$DttJdlABT-1N!<Z#QYF-Lc=Vs&;Sj2TYRv@RrH&ucOJZdjqJ@yB$ZpSxB>8exI}j
z$cNcX*03^eMK%b5xrpZMhvQz2_$>@GZoaAd5`9Me0wrJ#;ez@TH)R0KeVz|evUFaF
zghb3)S&lgf1RN7%{ok~sCJel>FqE1kKj;K0iTXK-n-f(4J&Om<fq>K#maETT-%!!`
zvj2ef&(z=i68$gGx@pUy<dTTwS`nUzadK0nVeRMr=-9N>PgL_~y)~(H`u^(Luvjd4
zAu#1%d<!?Ik#2}UIO9{l;{}ztYl)`k6U+aOYv)zAi6!v=iA1<yVD$eLqm!$3qKq<X
zB0xb3{0_K#wf||)N{%Q7#$q2DAF>j%P>+ObL11rgCM%BoS|>%B9j_d1<v~d#m)YV@
zy~!a*Bd5O_llXh8=~Vf7i(%6*?q8?Cc!T>7;1fz@^L?vz`Q0ezV|pO&+X^Xn`AS%)
zrv0G8!JS%rmtr3XiwfN!IF-RWl%)1yU(@v&u*ItF6AIioAF;#gQkF^{tmr>K+$GTH
zLUU5PvBKg)eqo|-*{@DGUO%|=Z10j73TXRJw1(e09qFVz*`!a|7lPlaG{f2|HN%^t
z_5MDDKYA!EShVvQ=r1ZoBwR)w1^3EDmx?laXev_j;Vl_T5;yi~4nI}lO-Q13i{`HZ
z42|5lVCDY7fEO;`QKxU&k;BRzw*GjjDtgT#$<@ArdVQ7hc}WudNU(TFA~8;h?%5mB
z#`0HMb8R)~xf&t5dnO3<S08G<ae&&s-S15JuetWbk^DUjrw<GvseFM8tk|)phrV?S
zS|j?r%#N>-c!%zIL%F;-KjmL&wXW*~YPCsG`6@`32V8{s@QLfx>JMx(MWw>i74?1R
z@aOjNBuF(Rw^q4Uwuny8CT`0;RiCcTuka_tQYVA4(UKiwsLYqRgI*tzB*1%+-9qLn
z$m@${Gvx@m)qcM1wvi=s7W(?jstg@$LA_Pg>*$#n4l2fk$*8}{ZouZsp6>4h()3*e
zTUTD5LcWZ0h5m3~@QgJgI`$1rhAJ@$#?2%3Kh9jYic2BsiK5f+wuqw$1gi;E(gmB$
zr1iuhlafGs*=&0$vFGJYeQ}GgzS8^k&f)2@C!=Vf3u1!s=&=H;J6=4wU<Cv?Xysxi
zih3Fv`Z%!>PCOslqc$w_4?#&_%~ksDB%+7Z@J|Y}>&3WEy|*_s^QF7@WnqKBB;+My
zOlD!B+G<o+0ct&poc5u3hcf<bv?V$agY)&Zsxx<KNK-i6#JBkNS2iC7Qfp~CcK9M2
zvFa?sh0{p&$JTe;@z5IXS9a_Locz~)MY(bvW}<{JtgYqkNe(f-aqDjYj4~C|r^OWR
zsl4{Y?|Auj1KScy%%nXRn7(qDiUjsKD{3sRwfRA|hmb!7S&o~dx6y|`<SK}!2KOjF
zr57S%^!Ye51A3?l&RMdkrH+ibXbSERL-<WHcNfO@3W6Qt!MO~g&N-v^w2)eNtdL|}
zI67xT;pGNcZa57!Pn4yBFaUvY?g)`Bb0iHDKQPjm?xi_wd#81fkNUeSBL>GwqtZVa
zINKMZz}j7um%?BX&<n>`e^CZqS+=ill?=)9jrNDq!1gT)5@@4*7c-~4uip^<t9;k^
zrS*>*%CpCK4`E#6jv%tYB*ti4d0ZU~FAWW+AWo|S%a?V_dI=rybh4!5$L~P7qN<L5
z-D_|HzTiV@JeiZy(iVS<SLeR2LpCT_q8I2pV-Vh8S;8dWa*wq;FBwU@7}6gBFQSQI
z*_Q2apcf|4ES)EqD_K@xFbA^7aXY>JRW>78T&6Y%uEdD>O-jSAK$=l)&`fFJ7nS>(
zk8Q$N&S>hF;@mHQDtaSdgQ6^=IHOJW>|8*cgR5SV5ocv7pC+*c3!m*I77~LDGv@sC
zfmeut->gKurh{yYFrR{s1MSycf<RSi%=gVTcf;{2&PxIRg$TV29WpKXNHV3WguP(X
z&V)>LWxDCRSz8x2iFLa$`=sAd=owe&8f1xt`APV-DK(J*msvISQY3%S_}_s`uKc1+
zd+}2j3VZ={4r%fF1HPA5+5#gCq_)`0)xvI8S0bx0_eLSkOAKwJD9#pDG^Gq3mJHq4
zVEciLHpo^6v!7LQ`llgo+!%7*szxZcZ9Znkcf*w9c}{P0I_lf3sZp&9?vLFYZi2ih
zQ9Y-^zBw(x!ZAAw$^86f`K)5UtR9XU(}?yIq>Nc%IwpdhgX%gHx3rND)zbo-ww>Te
zupoQq=`B4zSJj8U%jiRlrXVft6(NQ5BO&uILFS8S2P7yzK1s_e&(%lp$Iv!T&&N<1
zIQntD4P);{flXVtSy|T7Rf`r&sAv89<?isQ(9i||uJfxax|=!lboknbzj9<99CM&0
zxP;_k3`GTPs(at($b)6YmHCNq65ep;q_5#7XLD2|a{RV5gU@>xua5WU#m1s~l>p6=
zWqWrQBT}Vy>Og)9`|y4Tp}ZQ1*uFeh9k+Y9rK3H5?xO<FCcKN6kN}iDRQZD_Z{B^2
zsj?KPWSU$lHd`upCPN;o;S~wnhj|@y4Pz0W`PDX+m9U-QmR+A3uTIGWaZGJ->>AUg
zG!1!`!!*k7bBb*`=HnyR(+EAHb_Dm@-`JfvU9=9jF6ur}w@o};A5C1^i+z|Vplzc+
z@Qu9g0E2(uJ5+`h*>}bp$~7LQ+EBt1T-O{>ZhMOgyMt!wa6>#3wzkn%yY^u&PM&Vs
zQun{h$$YjytQ2}-L!WJ<V+kL=KR&q-#oTg~GR*4Rz2pv<_vwgXTRkg(3-vy}>i2LP
zIJl2ScKdf6x=h<?z9hhHmce5+j2Hd}fh3_58nXiZC!92_E_dLDYhzLZ?|Hz-FZmsS
z@Og*7LOHr*kRv;Q2s?ia2_b{A%PVpL-xDJ^L|s-RXanbQUL=G(;horKmt+%XM30)s
z)K*^EPfWuBWek20Gxu!KB_XQhH7(*iSms}#yvY-X0^Wgn_9iPh-(ebPr^PeBY0Ekn
zLtf{KW6|L>r9diBUiRnJvPFs7ol*i7`pJ3XHm8`j5e>9aL%IvlJ`F{SBo90)<g`2r
z`r}I~dj(otW!%c9tIl=y@Z;^!T8d_ekmBk(T!arQCXbNJIsN#qdYMBVc%5Eke>|8r
zyJAz8W(|?bq$pAf;WF!q1!jZ0-PgEQM7QmO#ZKf5!q)4cyz;PE`n9r#lX-zC&vmc;
zSRle{5P6HjpF4Io*D_5s+L)ab<@Ot2*lW@~n4@Htj-M%c5M@9h#6OPF;v_=kJzTZ#
zw3XQd$G9I!E$MNMi0#=WMk6l4x4fWnw3A&PV<*S7!UL|jUXO<Z%(E~8h(`>YG{{Z;
z^Wcm-Q4ZwtA~R8%idm^t`&J-E@1m|>Ndx?8S#_OOvnRwbD7C{!Q`u8#s+R+5bul~D
z@UX>L6ub36r>WDsxusvX>e$#Vj|z2aF9FV;)?ztvq=tJWw$?p$^V2<h!B3lu+p3-}
zYEsuAW5}}eT0+VKUOz08+IdKK%m%5+vi{MCG5*h=<Q|!N2k*fBKa@aC#vhKUj<F_{
zoimP>DyWCa!y0M^S_oWH`-mB_1rri=Ymvkge68zm`U9v!9Y289UEPgER`2Oyx4$61
z48t_zo;btmTq{<E7Xis?2qIngD@T8DtQIT7SpN0&K>>251(3CRo<NkL(0M7Fr$Y2&
zx8N_%Tu^c|CfwW9RSPift9uh*JsLo@c4B*ah5U}w_RDf+;M(x1)_hgk7yE<05DCj3
zs#&o-S#gX@@q*fyPZ2Qgdue40@?!Jw;&3Q#j!BvsjBfvF^n0^{XnNot&RFgQA#Ex+
z?eO6b!lg~IOR3#6u|VYM?69aVw%?UlOk&H%#bkl8FMtlg!6&(MP%Z_B$7o45anKLn
z`Ge96!K;0vwQYl;lvTC_D~UBIAQaC-oj6rKHOgdGt_tTL%Ky%`#}_(oiP_9zz-?D0
zJcQWy2cuSYZh3(-ci~JJl0V_-0?Bx=qp2US_x_tCVAv;qC%&+-fdvdyTq>}Mr_{&V
zQ%SU|rZ}O-W1RZdY9WmjWICH>s!8cu)+j>begSOtWzQjEO&_|G=Mw!onMuWAG-`EY
zHwCC+T=@Mr<}B^<t4~Q$ZIsbp9EC^f;iAspVcJ8m4aOZ5JT6xr?63a-5dRylQRGi^
z2^cW2OB66L^8Z7UQxhmaw)VT1hBnrh@{vpUD3rKfnR=d*L&)fi1u5q58`O*$ZckWF
zGD%unCoASe1fJ(uudACfr|M~2rXJg~_sBR~5S0Y&TE${Tvu))fiNUz>C(g%EaiHIo
zB6~U_+Jqk8aZbR~>brm+V4cgs^7+1c3})YNoSKKj2T}yZDkK7_R^s>!v6H;{yB36O
zEBMs=5&I#Cgs-mVw6gz@<GtrFi*JkRhS*}&U9yJLai@MAki~a#gn5l7c#Yf=cWF~z
z+YP<nep7wPLnLt=3cuOa@`ofzJ~C(XHyDf?yoK{;kCho(<rSuyG{>JBx;e!a#u%_R
ze=#65eCbjYWL^S#P>-QYI0f@}qwsr*W<1C01RQwmR%ELCH&Yzw8OO6&mGMC1O5@()
z;*}={RRtm@KJYvX(m7m4cTCH8j~A;_v8San;V|tsp=Fka$8E_hK4B+x?v@5Dxl?}9
zQ{3~VLWSR1yB~CBo|h|K0}5s*|Ax$VTAs^-)bfR#tq1^RVIgrSnrSFipr78;QA1~b
zVmwd%0cjn(J3GbvwG)e2nYn~l1a?xox!dTz1iRphzY6ur%PsotF8VM{qIlG0Uce$+
zfq0E0A!Q)UdbI67zZx@EULFcRve1fjy^WgdIC<vj#$Z4=C_2(s!ISHV=Sl_Js*z+&
zE<wLaITRp(kdoe3MtP(5+V$1YUeM#SGr#%M!=c;weNxYV?nXJo$i%kXJfnT@hu>Pg
zA;n0j%xF%5%Lbv1Mch?qXtd8*(<tjzarKl-SV!=do1wAk;zwE*)56}|Y@NmNhtd_c
zeWU1qshzl7Bv&2%8+40dr6tIOSAQ3~n<}Wc*$I5lpF&y9X7b57eK`#r*80KeCa{;%
zRfQKKS!-1!vyk=>puFT6Rn#9ipX=;~-&3$(`H~U4>75wMv{GT7$>}ucNffY>Z%*TR
zy7IGjUaOmdX!}nlmZNRaiXqkbRC-RV)1E$mPs}yzfY6m3(XnM0%=Y4~kiYQ=N|BG6
zg$OVh$0=C651ykH@qmdqy?h(3_zxH7v^hlu{~9%F9)FCV*;IPOQm}IOS8VQ1DSytu
zJ%3<WuH8#$EY6JrQt#Yt!OAPwe+E2=5{EalkPved!)wOLPw3von}pcyT}!0i<y)8!
z)&In}<ToW)nUaT2DuLzQwm_LtpTG3(zv%#?o^j<z+QBfT!V~@g&JUW^wcOi`*k0HW
zF}S6SA!S4do+BgE%YxC`pen|42%r1K&)>wl)0`h;@!warnkc!Ls1cN1Xz3O$KwA$e
z_}~nrS;M!#*+ATL0X6o&9KuT*1y+lMnNT%f2SeGmktE?;X)+f_hQ*g{v0!Y=YyJS1
zd=Yv>V8^a|8~+(^E)$%HIX~c_hyPklk~6$XFFj0nET2)Yr$sHEQ4b%TB~f$PE;Q<B
zB;G3oXzw%OOu|J?@-<~bI^1(E&2V=^aX1Pa!<~0=YS>Mgfn*I9an0>JC#J@%B83ED
z+O<iqy8{3IY>v2W8&l1QvSH+T_pt*cWRFXwornG!u|NGDmyv|14`Jt8$^6H25jKS2
zlx%rV_28g+&1b|lT66Sl{4P$%$6<;YKEc6>=1Fgebd(L=`0i`s8h2h>4-a`<^2J}>
zxpS;ju^e}t=YVGOYz)!ldt@*!SIf6TkL>xeJze#S?#fBT0q?a#qUEx~oIV*~qivEn
z0-@#qMA@D6m)?xD(a+py0(*B@%z1VwK2Fv@^*Pt_H5&g2Mcw;Hd~tZz`Qm}fG_z8x
z;E)z3zsVMpqVdcrUM}g4zpFvc9wSSSmMzWc0k<~4U@s=JPP+_2!1hP0*1vW@cmu&_
z<2JAWySnuQ39Y`ys55vaenARoN~%AA-;-g^=fXX;WOOhdE{Q%&eQ__~)ENFnSGD<F
z`W;hCHBS;(af9_I0ShF<dhQQw;W%d-oRM9;DndPu(8Q=WU9R&|mMqv*m-#fE+`jXQ
zic2_p_f!{-<S`v0#TvBx$Q#QlBr-JQs!evSpIkrn-{~8>n%>DH|5|PUC9I)_caOe9
zIFeN?YdZ&?{Bn}*sbETrs^t7Xr|R$j`SjTGsSOj1O~8NN<|dw3VlV}*ANUBa;DA`O
z3r4~6ah<kN5hWIPiS7xPn9i{!-B&m&e@84hhw!$?s-pN)k#oq-Ukukv9)KsEX%E;Y
z_0Ec8Df8+~w&2LQx(T!c>0}gf@iBbtF2M$ZGStG#%tn+L#*{e5WHMh<$^ZI)=tTwC
z3SDW@ZB)Lw<l+yD=}ncfU1-Od$qI!+oZ%r>;;<GN4U;|6BWt&LW%UY9&n^WV1g52M
z&zx&D+>>N&#*s<d?0zF8ou=p?pqEKJliN@c8XDQaLo^TZpDYIlA)|Rkq<uxIuA$7Y
z!$+&K1h;DV5Kj>0*A^y)(D~#!u;2lVCW3QGe?bwfIGN0ht_I|qw2f9PJ<SFGxVyUN
zL|_Zqd14u_cD1wgy30O3asKzwO-sSjg~I>?tD;L}<zWC0n?-0i(gpCC^-2HK#mZ9p
zt;GMZkqwrV5CtC;#d5TAOh9NH6!0Pyt6U1!xis6<Yhw10V9=~j$aASgXs&T+&TMXu
zy6zT!UproZ+d4mI_{{aQrcOK{C+#)vd7o^}dIYAtdg7M9o*vvJIdcJmJmRU;VVW57
z7~_m!a8BSGNP1L-OSD)}Z<mdD&&wG0`;U>a4PMYNOxtf7Sq`>8Qi61%t+y7S5?VsU
z8Oa>_^HMs&&1nvB!9;61LiiaCVTwPEuZno-6iW5|)=)OsamY6Y%y8eCQpcv*L1V?`
zxI@VX#m>#S$8>_mT8ywW21c~|Q6F78JqnT=#q5BW=MU<8c9G@3UOwMycih0c5~h*z
zymI=Rzv;mnrRh^CWph4?=Zn!+J>9>uH%RYFhqBz<hXy((1T}x-kIO99#o2lEkMAeI
zbd0|m2IIOb0ju7fgl~nmss3&}fb-t26lfn`BEDPw&31R1)?e-i_vrH+So58Yh*RRV
zCx{*ZuX5?k9SDq#sPp~i<y=~}aA+;jBOsZO4KD*xG!SiLR>(UA2kOA;VH6c;Gs0KL
zrp9W)REDA@v)k`d;J(0S@&n%(_d7TyJ~d=UUM;-AQXDMe{%_^f#aT>{6B@;=a?&yE
zEC=nkybY(s5a4S&tgW=w_^iLJ#n`36XL<rQolR$D*w<B#^@<c*?O7mqL-L%arnY9?
zs1kP(AY~Ls$=&medcLV7WL0+)WE)>*)V;pY(dp6HF`6@|3{ch!5G&cBm83f&5S-87
z_ZRCocG!}cRSD52S$8_<<aR=5mYfOg+R%e8=Clb^ySWLM5=Wc$3>qyfJqu@?`vD}<
zV|~*>Bs;44VyfJ{Wg0tI*LnpW4xe*$v}}-lBHD7MdcEi7MwzLa;BQ#F*~tvh-|L6G
z<umr3|D11GLp-yzMJORkhK&!t6d*Pxx5d20*ZzDWY3s2CMhY}zqch%3S&b;AL9E>k
zpOQIsYN!};6DRyjy4UW}X!aPFzrct`rSE*0G$Y-Z;oMv?lTKF=6_z<Z3D)Ad8#PuB
z`he0vcsh3W!kC-%1-P{o?=pdvR+(6~X67q)p?=^%%Ad$Brgc<z?LMY7#L@y*r`SJ@
z3Snw=9#O<9sapes&|mnwqsW>5Mu=o=1G+g219bCszLm@1QDA1>v*k2QtH3ImGRxSV
zO|(}j<IG|+u2nqQ-{qXM6V$R}2g6VsyX(+rE(LRXFm)O55;}?^J<DtGnA7YIO@cW4
zC8febo@FfpbT|{6E!I!z3LbF&M7IF_TAG29*~_*G0yf1mj;Yn4R~wH+({nx$?SWq>
zM;!{1ey162YjT5EDuo~a8*tX~a5Gi(V&yU_3sR{-0#}dZGx~wlT$emo&{B$!5SfIx
z<RBO~=hyLAS1faZ2P_0(Y9O=^kZEhyT4lJQQtF4VPZBKdr~T!a!ED0KcA1n<f0M;Q
zEIl<#pp)CQJ^5C~Sik4H8I3nu1csN-nYCtRnm%C$xsS~K@E6)J3gG2q14*INF(620
zKAwf(%`=W0?Zl9W2Pu0A+_}W6E@#4x)>NuVFXRtyDq=`8|Hcb|om#g1>EweA`4l_M
ztCLagh%4eH_eT!W4xMcV@A9KeVbDyEP_@KNrr#j*u_E4{YmYZIuer3y9RX93GLvgn
z7j?F<<3MG8NKL1V5>S8g`Q~#wPI47&R)TD!vT}z1f<~5<`|Fx5?}c$$XUs#ghq!fO
ztBS>5z}$|@Rqf}5Y(g+a1D_~3jf92aRNDa`ndM(o5x#I82|=v+#>h4EsKb~OS3O!k
z_DH8Y*(*>)ED}wJpPMVHx@M%EqigC|AAZ$g{p>;HuS4(*2Vj=({%F$N)>Wv1{dgTz
zTF{l_GdGcH)kj+S+CTRBAHH!Fx^9qC3Y!5ZYubB&JH!^k(?d{EJ}+vglCX=PsSqU6
z(}(6^NtwjS?mwEJtn?8=fN5t$V;)yo-)x^vAZvbTYEGVH^5pkItu0yB9A!^7DoE9Q
z!wSfoLpxJH1xg<{lA%xVl7(fK%iOUHtLF+I(&XP?ZCQn@;nleVl#2u0tL1Y`yWx!s
z?~Z+H$KGG`LZ8Ru&NaTkjcf0a{DoqVF&Mb4dr;pC#*Ft^Bti|4&?cGeY#CIGXg{!$
zoepZrE8K7n2I(Va#^JY%?k4@C##-+j=z*Bt*o8eKfP>aw^l<$ZIk~sbtHK{=n`u&r
z9#H3O(>{DZ8R3P3=5dl8VxlOqZseMOx_1Z_Zx0o>addHYq)nJf%=hkx&;MxRq#&N#
z>(;T_t5cHYu7u|*QrY^Q4C_G}75+d>IQQRw$B&DSE&2uApC8N3*MI89p6?;d>R>d5
z|9Y_-0<Pj@b6trh@vuX}*^u-igD92mIDP!vdomirkd@A<hE{l{0^h>XiO6{H_&IrL
zU8P;Rc(<UVJ8B|9-TBN8sl>L+kKTXh%r;$3!aWJJv^8BenEy`d{5_jv<n*<vv1=FN
zS#Y4Pn>|D7o9pf$7t^!E2Wg)Alo2Hqa9L2A0)*=BA?D-_R7L5iOxcq^&@v5u{mKRu
z2gUXNva8G0r>cu;Mw;bs$a92bR8VVVF~(ZYnaPfcrMreTVxyGWb>gq9l44XeBQ&95
z&;$B2FJ)tKxBKuUTCZ>}A6_qVgo{5xjZ2)(Mx)vEB>5zj8zZ0eB*|OqH+bC)vdB#Y
zz^ywZynoK{seb{uHS7g@vsYjnLy9Qco^FSC{TPIQ^>-iXL+e+*&|K|TsBim}&ua)g
z9;x$->FTeY9|beMav7=NC&|^58iAp;Luf2oNwB;ry4+2}YOj6`_D3|Sy6J@MlvG7n
zER_mH1!w~9s($2@>_gUNesyn%9+VRq!0)1{|91VJvD(|8yy43-9!zwk@S|AT;K;;M
zym&<1e?0A66vUZAxxj1OdF^c_lNcf`Gzmj9$7=5h;CsvO^gmk0M0QBb99z}*%ReXr
zWe&aYdKg`q>^0tg0|hrKnqTQ{U&kN+4P+GXtjWMPn7eoI=+l9K7Dri2ZYrK_;7B>L
zGmviUJz1V)mIU)l^w9Wzk^Wzplf<5&OTUb1CSJU^G^lmwq4p0R*oyLm3lqF4ou~pn
z!J)u2rqequoC`oG4;aXu-kg6WnMS!X&tNDR)K26lf`*$e-E(+^7xl$<S?e$D#I(Bm
z*g1Z9tXlu<&h03{vu#$_n(AHw?m(we^3~_n1Jc~c9nSElf{vQYV!Uw6WGJ{(qi|5A
z0sRb6jsxGfmsp6yzU~bjH;ZX}j?#7#4u3b_M8Z<H*3dhINS9wlSjjp3{039fBdZ7L
zBv&p7M3ZFvxuE%@s%190qadp)SIDsC-xlSrXXr@?%TnKHKvbH%5Mz)F1PGS%*4H?W
ze`=9ajHKl^3nZ~8Ak{k}q>31aXLnx`jKQAi%XExr=92S_9?Y_VE`s2MoL6DZEjBOb
zStQ_<kqZ+{X`U^QGcF_n2S0W+CEbp}`5BBloDt!VlRmiwzjk935Hw2#hC!HVtm7+I
zvJ6G{NS)AyH(~F^f;K4-#|&=su2kqgXg5Ynp_^MiOd5<G#4#=SYL2ZF{ZrXPPY_Ke
z8`~o(Lu1diyY-&xyVF|A1lPe%<?svIPghn@SSSWQX&nR&%x$8Z>-bD*58c(XeY|P^
zj>g-NwDc#spwd(0#IO1O*@zLMQODKR#4&YA|D!${?|!?cjei(Gw(^rsZjD6x6hGD5
zI0vsAxU5>MpooL*=-0E<)S#;X3@4Q*g-gK<?m>L#aB_Gsy!f^5vP-bDZ4*gPLhQTY
zHV{nJE=~0IqISR^^!scs!49Kj3w6=_?*!OHS=*L*F@P+>+Q?S<Cwht?g{5WQ#~KM4
z+<cHj(W3?_Opp!8h7H2lw2|{6P>N8!_o8S#cZYubPKS1={+qd!A>y?0C0RyWE#Dw(
zmL*C5KYQut^4A`F^fhGFrpj{uCwQPC61<WBanhr@*eV#*8oW$QsrI{^ka*$vSln+l
zEte2~%VZgw3DeAhN1M_FluP>y#92vx4EBlqbdBgOU3Un;YK$=BLFx@XeiI{o<tkFc
z$5Z9t&g5bI0V_I!Q-)3yzK3D_-R44%b3bD|r-<z&y7m^jJ3vDxktG+7OE@|X`3>5}
zOkZ~fXQGz2_M)^vIO73aDbPPHt9Yg!F^PfHj!LPJURHQI#VuxliQ!njBfbYd@(zTz
zDarFw{s%TN%T!kj<2Qby^~TSc2`z*&bE(6XSu#&_@_ItBayc|5P!E%;DnsHpr~}6F
z4qr-GytDQ#V@+#IWj;elp=*C+mg6hqKgY?|CTBN$+P2Jms&`bE7ty~q^0aHZ-~<k2
z;(v7oaaK#B<GK!?m=&sm3LjEmdDrcJpe=8H;s-3?701XYX{wA47W-k={#uBWzAQR(
zS;o2r8VfIDzGHbBCaxDt<E_klhOrVPxTZk*RLq&u@(q7|S3Jf_RbaB16%i}Hu^i)w
z^~8TojKGFQOY)XMI#o5;m(3F^y#-DnFYlrUMw&hk!G<j$@rtUKHk<2QxC2F6e9&b1
z^8pMf!d2)z5#xt##QuM{I>+El!Yx`Snb^)G6FU>z$;7s8+s+q$v2EMN#F^N(ZCf|@
z-23O8s_v@(+tt|byY{ozR*c8*L!>tsJ~4R39B)U}CJ>kkxsv1(-U4PgBD_=bCPR)h
zr=payru0_7OeD$8XuxktW9PQn1e0x=l{HQ%%{V6dUEUrsYWXWWx_P!cJ~tjwm5&y%
z`0;RptVT6MF+G7bru^Vjlg9(IK|Y?)kjb#ouLW#);hx>rIw9Z{Q~bH&{;6U^Jv^N7
zb7bKJ`k~0h6B84;8X;+@w7N1sr`)O|Dd5$kWlj*p(AR1QYyh*fqi7<+KbY3$C5hIi
zD_2dqYy=R136qWK6*C*(o0?_AeSpKTE>*A{A2tjrU>wlke}Cuq;MqQ*YC)EogCOum
z<O|?ar4v%tHK<sLRcY|gu6K&Q2mkVLy|UnzbxgwX3&bt*4Xyd7c>zKTkvx^Wt?TNC
zxvMm%{j!c)V<zE?lE0%1tAcqzUwQ-K<J0&KQidV0rPN3qqxp3BV}w8%{?)Wt<{D(a
z9j~h`P_oApf0<6`OFNeVZJX@Rn~!U(Y$3o={fYBD2P~7{uD}+@`xVUdg;-m)ceRn=
zBbR)0Y|L{C+XIzkt4ZdK`15<=l;u1s)>{O!H{@69gc$pD4I*PpO|QKocT|0F2+CD6
z@kF!G>;bFR>k{l@kNd8+H7kc8>#G&@4!M*C@KZ&aPHzUav`*N<x}OXFm?ursrv+3l
zX%~cgEH*7X$IR^KDz<L=J5F!SieWVo+llwsne&M!;MV_|!8>qfXaAvEG@LyO(iE^b
z5NzYqC?X#uM__YNFg0wvLw1Y{v=#9ib(uE=*cHoIFxcctm=pN95Cn<f_vPI(sPYKH
zp;WPkE~$jhs0yFBE?ZKZyJ65YBLP6#5GlLyr`u6JGC(V}KnuA+68?fFnr&yOZDZVM
zvHLBBi+cq}_vWuTG<wJALbTAO3v5A+zi&7C>lQ5S^y0L~ZsxM@^q$o{(t7?fYFX_h
zSgz$wemG_9k?-IF-F%NjSR)>Oibh!D@d%bA2-munBIIqlo-Js+fLYxX(*!7a7<dr`
z-(8k?UlC2^S*v5L^5~L!Ok{)ON`qp}=*J5YO=uM{-lK6F-|nYzPaJ`YQ?+Vo+8TAj
z<_v32jbdYnUz;VaOqZqBfh?a;)Zij=IP!!%dXgg6I)COO%UX9s{^&$hwF5b}>oc|^
z;_Zww{)D9Uvm~A;uB9F<&jHMNA$!5+(vPeL@|w-iANy$S7il=r7U``XjwZ0b-iIwB
z%7R^IK#Hd{RQ3y~loW2#NpwPTL6Q`@a>#Fb_>o7DW89L!>bz1y26Zw2ap>WmVKc7I
zX@5Im!o3uzflm|A<0peST@=8%@Y{s_Jw?Fd8^ItmlDl;Y@i9dJ6a}Pg>oXB$NhE(D
zfVjWiY#^;XA#s0h_MgA8Ahtu~ZQ#Bl&^%~yh4_Y8KgZ<WdriMWhinl1IU#Ai)cbQL
zH=OkaD+v%xx~{XCL8u+VZBO-$`gmDpg=6uBYKiX8yCM4cVGXBcLhFe}$vxCBb1%mR
zQnYHn2!V{-T>=1NrUBqr172c!wnlQ<^`(0hc{U?P^V&L4F@)Aoukcuk^JlBET=955
z#d-|c4Oeh<%Riu2`GqdNM0;<s&~3h;^1jl8!9z_&Xn^@pHYgD%G4dj^wHl9Y=b-xJ
zLJwX}BDhB(0(`O&%YLl+wTi0IMq~Wy_RrP<bJjp2GnfypbU>cqS9Wt47~{e4cs3#7
zXU@IeiGJCjn(Bd+rz1rb*EbKc{BCy4?bvWN&-R7%Vdv>2!-e;JPTcR)f_B+esmdot
zJ^ca~c_BFDb<A?|p7hCYbNEmjO^U}q9$CKRw44;Ll>Xe1_@29;x#GLL!rAa~-;!s>
z_Ka)h=wg=5Es!DSdUU~g39g#TIW_U~T=oroFqa22+vB{5*A;S7sL$zhV^HLtb+`L}
zdRIjr4DG7l1S3d7oD?PC&2Cm6eW*KS=ywg{puKb|S{AH`8qkiB9B2%KLI7h*{#KQk
zQ7vVWhaUA64hY5>_($;m<GmpAs2KrOy&*RHJ7s_~=k7P)^Yay98(A(veA^T(#h%)K
zt(06LkVaT1lv{8;$(~RkZdyMyrUcRrdl{yGmARj3{RqD9RN?}Vs%zubgI%xFzgtt%
z&*!#T=93`H_P4n>eW=_BnwulCtz<ALZ@vjnX9mwj-|?WJAX;=?p}o1<sbm0|)g~)X
z{vx}KKzTr!R_CNG+TesXP9EoWM0lYSo*Gd($4}!2aL~~EP1(iMo97^TP^&380xP?P
zQkHa)+z4o>jw=LUPFy(&QrtsRbNP4AmDo#dQ?iQqV2Z<Q12mq>=EC7;`nRn3X^ki>
zjf0I_94DwL$Q<R>O1~q3gQOr{5Gp3fgSiWH0F%YkKlt@-_iCnH0M;@|9cEb_UPu4@
z#3!T8R|w}NsQ}T9)~~ub3#+XOt`;&c{+VgCx+$(+Jdg{}Zp^{h-5HqE3!|D8>vRr=
z_4$CA&OKQ{-zx-&X5PauN|=st2?qK8QT&7<Pw^$ZO{#=u6R#$byk#<6CYMCvoVx7@
zONQc+k+;ZN79`T|f=|_W;U><Bdk32P0GF9s!C_2hYv}wMoa~cjn|bX~xIv#)Kqg<d
z6Op33Q@Q~(dDKB&vP5ri$LqLR{TPy$1!JI^1$0LDlW)h7e^T7c)U|@uV01~uHv-3e
zmvOU^wguOUHi@&F#Wd%o+-W;fX5nWoxq@d|DGRY@rGmLII@hmvAHP8VTe`I*w2W;8
z1p!h00RqDD|IkHxGe-ks>jW8DPQb>3bA>}w^Qu;(N2t}=>aLcQ04g|9V=yLxH>Gqu
zk!<@4LV`@hmt?Q}bsm2YfeH^ZaJCfLdpXVNjm~L#tQ!je(lJoMIj&y?jU*>?KaM-)
z({Zmr{%pfK9HX4Wuyq`sL#(RNQG@#8yIxK$bA4;XT6&JmhLd*r507>=3=j#hn7NX|
z1E9RzZ0ZwwO$b{KdJrg=-^K)Wp5EU`%#2vy#cnUwH<Qw^DF5b1@RBL(hJi%w6J10d
z$(tVC-^;g(M8&kJnS5-rM083j3fd-=DXJz5DDp6ND{mU5MfKHMj(hnc`<t!ka(8$c
z&NHONicO){kY_t`Mw*Gd0$^(e5#fPG*5~cPHU06N`cNm}?gofCAJmi(UJc`C|68Ag
z2CLFAddtFAd6%<u!>{zmoW~v=N9a$PG0iHX9V*gG=FvGfZmT!Fm==lr{V&;j&mh5j
zQ}CzAGek_9kTiwyd6Ri08X|!(Y7<i<8qAl#sK{g^k^<XCd;^nj&ihWrdrJ6-GV_z<
z$y!0HZ`)H}THM{6V!0EBukFYAb{MbP3hnd7zbveG)ON7{ez1nm7SzYz-W;6&8%FWn
z2q#Ifmxl(t=>1wk`Jxlo)Tp$fG2+%2H<3mo0xjPdw2|3Orfx<BPoy4@6~t`BJPS>#
z|68A@=Gi85Ma?_g{^XOe7`Hwxcjxt0+Pt-*Bb6IU{vvQS;g!yQmvuFs(em{<b@l~j
zkN6e2!xJf#SUn`)BN`b`)sKLkt)`H8A)}%GTapp*Pk&feqYx{<*2L9NerMEG1eo#L
zcEBE2i_v-vaCBWq$%o%haXs>rFBnVYwK05Z_<iN4?4A>ox9)%qhF<7y1S9FSBDx;x
z0sYuD2IIX-To>lRlF6qi`c~ww7NhsCEtDgAv6~IbE(!`g)f*oSetCQA_Qq-~3Ynp%
ziKcLXRWc2P=3+g(SAHpX^bRG5i-)hZqo<{dg@L8-!>G0GcaDSuAGec+fcGoVS7{2}
zr6N`%7qo(*eEV8>#8G?0G3CK<K;GWi*7q^2ENtMlj08e!3M-0isJ14NO{AaQD48iH
zLnM%#I3_*$L|1V-8&_KuIi2#L%+-0dF)|G>dYEoNe`+Nn^bYrIvcYD8XAN9ONGN?P
zk#Z&4`#ZW`|KPY%%k0$tmvOL^t;}L>rf%PNY4^gs*Z%3QF5TMXj0#}dxHKU+uqfi@
zd`;Vl*b!#GW9?Ie0YN*_=v+$JUd%lhNhd6N$8r{d=UVoU!5UCBN}vrftI|-Z&-Ma1
zJnszT&@$GoS{|ToZx9H>eVrAe?P%ojcAvAy?bMe}hv;{}xPOt1uG6iPapO){dt-m-
zw_2-KHd||QfPgjPsT(?-Uu;)Ed=BHth9h5OW0PW!Dx+Ph#f>?PJ*X>)MIe)!3>bgQ
ze1ICJ?Vq5TFhhdYIM%L@cp&bok=X;76zd2?iVmd_#e94Qu9zzW#8F2B;flgLZHLLJ
zee@8bhG7s2+?D&G925qqamcTQ5SFeRfh7zTL=hIc`<=<G@6c{6JWyF`?brkE12l&S
zTKzF1M-<Og*dyl8X_cZkP6*w|Cn>E3+wa^p_H{SZ7~P8uff}2q>-!|XeG33PEzeou
zTUO6MK1+Axo*M$_ke10OOa><e7agMla$h4TBX?^8%*A?dFw<10=a#c-)T`Sp&R-hb
z@|CF$(NsrdtZNz2idCvxVY*pF|2<YjruJ=JyCJxJXQq@3d#kOxu(AI^U|l!54V)Z|
zP%~iuHImUB4lsAuL1hTnS<D6)e;Ni9B{5_P4|s0=-XKo>r==jC6QysuWc%~10|lvj
zVr-;;r1#L0XLEjGuoLG@vbplq^nkM_o@94)l=`QymKzr()rq{V1yO6DSq6?RoY2^3
zmO;!dBP1L_zxtSJM|V}rZEZ`hl~<X9{p;5~b~lA_=aY4o`XnCii+>cLyx|2LCN6us
zrAFRS9!I@Uaq^6gHz;9g5W<+003?*O;d3(V8(^$gta^1fGIQvs+lWt@iRcWB;o2Md
zrPZ)BU>spDK0;Jd@7isZEp4jxmV{4$4!jW*q34o$e6PpD>uApjuo+@y^U*yzM{PK=
zB>*wTHhWfa&eqevI35I$w1Plf9hD<URP)!GW$niJ#5yK=Sx4X!?45RIVodHRBaBvL
zpOQs0PW~YfbVnx0FMN@FW*Fp%@W1Kl*_%h-Nc|~Zq$i}+KZ?=^#$O~D<N^JWU6jz}
zsxLw6Pew@2fW7=q&s&yhS2C;8xP&}f1hj;nDg@543ey2y^Qr;EdNVkP7sSnqLQra&
z7$JLN9L^ye$_|ad$%vh|_Myj<!KV|?S@}JAW2_-H#f_ayaReRi2YXNCom6AWKn_V!
zIU<>9q2<0>tW^vGXWquORASyr4Bs4GQ@U06Q}QOd*kq;JXAm7iR<y!f7)9jbtbX@+
z#h`TWOfaTV?O*^0QekLqXE+*bW~PPkZXm&9?-dK#H7=UlW`FXn&9^bYodaDi{WiXI
z2Xvpu+U6D#V)N=cGZQx~r#%G9(RrDdS=f&EFGnXTasDRGD;HF`yFEoq#6QV*c;<yK
zpxFz&(r2~LdXxjM7?jbaas9U;m&OOK>xuCb+LJLP<{BUj^^!IOR+m}S5lTj%9>?{H
zLgRJ3woir>%O_<+)l%*JZjJFH=3!HSqcg$ws%m!wL3dY|MUF{nt}&BjuOa&@2+(|)
z2S@P0Q#!BSt5P%ka)SI^Uq<WdIXooPMkLYOQ^d!GyNZ1Z$E!Bbj}SwFjr~(9)xkWn
zFkyMGaT72sDYs#Tlx=`(?ZDx$Qe()XOMFAGvEwGO{Y93ICQ3ecV~i14Lzvzk(VXSX
zb5O-qbi8-srB4TRBc&DS{3oVPp*v%IsrKfzX)gH6a`u4j>66T<ZsKz6RefQMcS5=t
z0AJ~KbT^)>jHf56iuZT)>%T0kNCF_np5t5b-+^AdFd!fd{{h50)d&DuN?I!DpKKBw
zM7X1!EaF;)O+i|U^x|ZVztKrCz{sGBbWe#g$wPonyCV{yb`P(bdbnn%fp&<K9Fy}Y
z48xH=Phw?Tvc&s~qsH}*t5!Z<7fszwOR}G@Z!!F!9ietU#{-1{R0O9CC;cwc)TuYU
zBvE!Rx%#TI#EO6Owrv0qPOyhQ=6!`&3Y>J}b(8}#1j;lL?v*HG?j<PH>PfrF>-)u6
zR($J&e-%3@2HsF#1xPNpg&@)cT>P7tHLX27KPPu*`-lhbrS~zToHAB@XcK40g((l0
zfoafiEHWCVgEP`*B2p$U{;x3oESXkd)jd7oeqN)ixlJCE3=aTvS1X;Cl%|J7x<CyF
z+NS&!U?x_SEro?KIPi#u8%1(?Ra6qmW=)f;YAtWsc5tQz(<TCKXqvepU7}?IeHE=;
z=>&s=fU?j^JrA3tC<F?2uF|Mb@J=)RtOGb=biA7E*A4%RaZaOTn^>BmZjuCGY~V>z
zU4qxobmFuz=LWzQZ$Mk2-Ebb|)KuS^-$PVz85Hr4j{hKuwzY~TOW;r98`ZFt5%O3C
zixT-q*N`l&ir=3?$N6xA`o#Fl;DmC|i~WP(sNevU;@bsn(>Cabz(`_XDZ6MId1B_|
zvzywLn$)!C=^vV1qRc~?Qr;Sh1+E$Ml(xVmaalxIZ3y_Gy`>NV<6m8(tSQ=2LF``$
zD>P_Zqu}U&x%V%nzSzk6glw{UR7u7(Y943{r=8ktGj_QldunPoI?Hx^##^m*rE}=0
zGC+PQ5vN!Op+s(6CcZ}k(Hsts3!#DWlvlAlh)6Gb7@C_Kpo2lMhlY`}%Z!n;=O0dg
zT@+BG><x&r1BaB`R0N|<N>TqqTNGtui(W&$_Re-D?*VFjHs%DI$?2N(m?Z4JOGQl*
zIN~gAC<eChWSBduOv<Y5Pv5-OaIHJ^JJp>VY~c?vq?NI}p@!`0V)J>1_vgd;XX@qf
zUdpC>`hLH<X>5&5-N{OX$#witZq@4VT+$|K<t=~#bW0k+s1m=YiRN!KGyWTs=B)AZ
z9nu%z0&z-Hh1`j$Aej0n^cz=#&J_BR8zeESh9lX27~Kcbn^+oaQYWPLq!pok(cmo_
z#J@X^DFP<Hln76PA-K$i-l>{cq#p-lnu53xVpH3E|E@g5`AvK_kH!2HX+aqL1fmgs
z_Avkyv}w8mGsL%BgyyR*`dQgi1K-5lf%pV{LP8(!M2W1TkD?)Bj^^7-El@7&v>4rQ
zBlw;LA@WOzGs5>}&4;*}Kl52bn&W&L`LQSS_CT`0X5xNiV!8*NDYt_UZuq((nytQb
zI`j8k&+ND1dJgjXA~oeqbM8Ow>zJMJ_HY8QRG&UMe|o}Wy&Q|hhCw-S^1m_y9av^b
zkO)M$4>a5z5GVHQlHgxQ^awQ0j?6+E!8xN9eo@dGpf-e~EI0BI79e3iKz$m#K-6rj
zMIK6M8#eMeqhjpS8QdegrL77%qpgT}+H{1cTr*KE*auRJoscy(MmyZ^nrZi1(F8LR
zY&k74NHHkT$o9G=tu}ds>Xkf->U!Pj{r94N96?t!?pq;vflR2=<_3JN9W4g(1^DIX
z6JHQz=58~?AgM5_z+;Ge3su`ElN>~^>#*J^Sr9Yc1QYZinPhfq<yNl!V`pw)zRUTz
z(0+THn$iO~yrvA1N*&Q>i@=S9zjWXqn&4r7YV+us5X6bF;4z+lwBf%#S7oo&2{EX3
zF!yCb7=n$gns_LI4+d<$hM#D`7nPP6aoH3|u$It1butJ30OoBf-}Pkbsaw0o{G8Q0
z-!n&z$={r3UaJcv1AZgk6S3+pPi5J5%h3<bUi0-GPo@=Un-`a9SvGSGFB+t1z5W->
z^ElN@Y^&LATXm6B*&g239)q&`YC1;+8<(EsW<=}WYp{!S9e@t`su8=XH%Fy9&$^I?
z<RXQcx!)ywbk$|&73m@6UytRYVt?b!gjZ0?TFiDxe76*%l?i0|#U`(Kg_F!%OGAa`
zE<C*!;WDm#m7BITK5-B*;AeF8Z0TxPPycF7ydGXwM6tUd1P(L9XZjL-Qs1zm$1ch5
z7LP{(K@mhYIRFnidP&t>db^@$)2na{pr0WiilH}Q=mXCedGyeF=v}1VocBNUGjq-v
zvRo;rhGWk7d+rs_!5umiIRuy@l?*aJF-PeW@I>RSAz;EC6RGqQ^BE)MRU;r3Oe1;v
zF|;vKe(rnFmI1^L&sJ&^kuxI_%yu2L(RRsBqi<||UIE}~PKny7S%ec4_I>vAWaQW4
za9gAHc<kte4%o(uFiZk_7~fZgqBxyM&|eJiyIPX5h44%T;B8fq5~GApg=tqm6p;xN
zBx5V#>vO@|3Lr;D31cMg3X#MW{G_P_6q$yd$i!6;;^PI9B^qX-3Q7N1O2#(AE2;$?
zf2#)YRQ0myOFn-_!Hl`)*FWI?`&C{23;`X21_4R@=E5ldQ)g+WFaSwvVP0t8JJ6~)
z8V?Ql;h(jPVIV&Q;~Cvr<I#U9t-s3C{<54K)R40B3aiAZz}RN75cDiO(OGRI>Xh>w
zYSf=;h2hPUxq9RKiuKL%_*<!Jn0J47^t9QL_LQ+VF|O5ln}ekXS&R3DxKoFWkF+<z
zbb2ieEjJ3in+XpicLSKz5_GrvX$QA+!IVA7ZOpQbjUC}Y7vwgo9`1xd`a*}lInnR+
zyzS-TPT;gfFbL(&H^oh`zYx;ro_vIKcOA!&z4rpvkaM&k*8lu-ir{Dm&A>bUNbctP
z1ep(Q&}_wTs_yy7<oqAj^1q0VSK^v3^ud&s_nO)sHKAvmDLsJMBQsG4p%Kzys*l7V
z`?U;YC(R!0p-G|xYowioIp=x?KK|(i4)!G;?oR^j(_eB32*sX2pct9(t8976!enN8
z&Z)Fkadr+Dp@Bq89KELHCRg#HWO~rzZ@+4x6MQ5=R%RFT=hBe2_V6@5Pjl~~OWwVc
zIA55GK~JT<lN~^BUbdz%QVFCiU8<-6Gp!D_q`F0hZvDNs+2{tv-7jiIv3uN=Epw?;
zQHnWIg&fA)gxAC%S|1?i0;fs&O6H=+pfa3u^<68k8(dm^nPz)jiI7YJP{LEz68o&y
zcGf(#0o8S&y!R?-*-3RQ@%X1dM0*sCMsuUwl+}--G#J1Ht}4ayqIgc6g42+)lG*Bt
zaW`Hkx>9{VsPqDdCP04bZ1D#w+miYLK{@RZskn3HN&+~q8M9{Z4TrwW8T#?#UndKb
z-g(&aGQ7ozL~%4SNNh$Im@z{wYY2~tQ(WxR12{??GG?W=bXYN01WMpF@j-rBnFgpu
zWGW|DEHhx<dNcvjfLAW8qKvtkVBguUOTPa6;s+6pd~ONLnAJ}W5pESV8X}Z8z%5ZB
z%+^R4S{+(TavXsoeToX*(byRie8jmD+{bUP!t`X*@L#Z{hv+XW`vrlK(>CHTHg1ZP
z1_MDzpEj^POX%%5TIZ#VLVWba*PKg#RBEYQD;xk?@8>F+tC@K6*d{eoZGS~ZEfXxM
z+#19#{!$k*>Xp`(W&Ku=Fe}3yBn6jSi=9ZE0$Mzr4G@p0WG2lKdtAh8DJVf}Ve9q1
ze(5mn2egQi{j=P+sqZIhQEg8TVCj-6{|Ha_pub_L+&0lJ_|$fAFHLN@$DXKSfRPv~
zHirQ4a7hdbv)j?wMw=oK-vKceCKXSti_**V5oGO!V0XA-yCSaY`mU7L+Qv>5u5mh4
zdr>+xdll|~yQfaz4WtGTY=;z5oKY>%HI-7eM*o6^CH(UJmtIb)Sk79tJw$T@%bd|U
ze%~l*C)>_auuZ`xD$y&aA?=||UwA^yqSX(WN`1Tg4Mcc{GkuT8mf`b>4_LNIbksnh
zw3VG<=3``y!bX{^!Y$LI`e~;3ou$#;Ylrb3t=0`iwl!<5@-|-ATY^5mJ3ry=;8~<U
zZFDk0B)4Y73y{ASd#4KGr+$W`5WzGedROV)x_(0b%-ha+P6-nFA*xL3eIIEnBSrw2
zF})b0$83z`E3;ZD&3<w@F-@1(t-QfW&YsXZ)sXW}U$5plUfI}w6IMy$W$hMW#6J@O
z!-U{eO#(JkN=z4U6li|>^sI4SbUfHmP5A0W&ePK_^5KseEnHzru`cj1W~wNEKS&iB
z5&j)b=*ey^lZ%Z7)_U7)v<i2vWNARj;C(=qES)DzhEX6lZbs-<TN9#O#vt~mEQ*3T
zVXCvK=H6vj&=&M7@vxR_pc6m%Z#~0_YWLO27I?f|D|k)FfhJV*r@L?h;cBK^ro*@O
zh>B|iWK(jp+LEdk0OiOXJdD;Z$#=5ChA-0kZkitby_fn(bv~K5?bAnOsRMxE?D!18
z_%Ukn2M)g{P`ER^l*^jrH8w<7#5pBISID^~q$}jOAK#OAh8N$Hgm^vI0&fSO*7S6h
zg`Q}`=a^yyG{0Rzjyl%_boLnRRCF&+!~`4@8JD)8D{?y1?^odr=6Vo%RJadx4cauq
zPe)J!LGkPO8;_uzp;HK!NKwFkkCZx3J7snkY*8fHlDfvaoEQn_%uk9)@YU&^nIz|R
z5dP?9x)Z_?2y-(!T~U%9TCxrkwOXF+jsS5U2M8G$rd_Z}ig>j;V&60l6P78XB6U&K
z8<v;_lg9Cag-tD^tERBdrpHa*$IVXk)MK8-m5j5C2?W8~jm<UlD;of+R|b8)%OCgd
zfk(dHO}9jpZr8B$m|YE?kkmaltmK*2sE(CC{GcsH5U%phZt?TB?W4T^+G47`=yhX!
zQhR+f`$4(BK!|YvL9EAM9j_`8JA&q`8G;W9lOEY;PX4Ln@Qqh@Fr1$u;9X(4tui^$
z#+$f6&lM&Rq4fw<3YZ1#Fr^>P2ykmr(H_olrj)L$3JZ5<_;%q#0+1>x@T><Ue~r!H
z{p;lLXOF#PN5#l}A=-`k+dgNAL|hv;-0Wf94a$kXqB<D82e-`mJNfVEvQ7s1N1-!_
zOksUI`5A5zh6)oPo1;8C*U9>J72+J5OzrASj`XN5<?~4=h^GhO1hpZHXW~qfE>WB2
zZQ;7mtcc*(gG1RKRY)#~VqM%8<!ykL-&fgWTU?D1S6nUmRAv|;Z=0T!2k@NAN?#FR
z{zcGyX9lpD;5~O>IOm`g=r45Yn&TwcziSF9;Ry-6+@X@@W*mu|5$GB(torEr{3Dhh
zT>ZLTl<v+iST_zZ;3Oj?xvZCKgTeHVP7ss|B6T8$ASTTyX<$mTk(URv1>v|kfg5(%
z&Q0*$aTkP@Pg;1Dzb;f+Uib;5;=(7vz$+vPY8)1od?nJzj%ddSQ^Tw}1vee(<&jgC
zM~5P#ROx&C@K5e>nQs9<j9)^Lo~-Kh1G)#?y2zFvYssmr_h{VuBul<3gbx_)_wK37
zXe<LM!oCtIqA#jx|L+k^+rbsZOdMSm^qd>ISoy0Hy-6V15^dw~Gk4BL^oMo_yOymC
zZuX;a<HW+o;c@b?ZZcpF0Ge=ao(Ud1e4m^UX(0}vZVt7n+L}f>C~#imOA{1_o-r3J
zN16RMWP-h9qn`pVQ~>DP%BN?U`A4uF!?dXpE1%qWZ*a89>2=lSbhx>}4*+~Z+J}<-
zfH^;2W<~Ce2F067dJ^>D#Ph&|z!L$w4?JjVn1mkQmcVOnT-gH`fM+)e1~n5RW0r0(
z66^r)wbN|PK9x6^(vhi4zr6YDU?Z-+Q|C4dH=Tw>d~t)7`pYNJ<Rt}Tmo4riK}QAC
z<<{|srmvi<V{+jn)e3Dgwhep|_@TDJG#A@6oiV5J7W91eG3MpJkJv3HoCHAe2r}H+
z`sUDpYKd7Zx&>aE;ixBC#_a$DE8U*)-YozWBYNj?ViI;GRqz?7e>0_pF@vs8orhj~
z7yESGkbT7oS2kHlK=rx41zY|olrzEas=eB9%b)Fn(xq^sa|Ey%-L5JG4QdZIdJ7VL
zJvP8^e@>Dx%$r0ihxjf&B6c`?Dl%}sgB*B4CLBCAF1!%LeC{A8n<0phhw{G9B>)g|
zby}M8d!04x9cSp!=4gEJh$n1d77}s$Bv<~8+cbY~rSVEl`bY413x!B(B9B$#FOG&N
zn`$e_n}963n|TzJJ`Qyw`4FhONcj1Nlz2K#!DN*}cK(~FD#_m$xVRXs&}?)`67yh1
zhoI$6=$orKSZZSd517h1Uy@SgpGVTNzp3o9HfwwS%E<-gE4llHBvwqu!Emrq9Q_>P
zPaotjex}&B3gQ`P_~Qx8u1gtE)o=OVzTA$-AcOR`Om&oiYb^~h&`)&?E5yjdh@B5A
z{0CRmBr%hy_zM9`2ExMXoD{on+L(M&n&BO0OJ~eYZ!JYZTS_hG1Md^jB}YOWjeItd
zOe53jG27?mantN7jsNTO+Z}mTK(vF(hj|kg6d`_h5FMnlo>U9;%6w1Exs)3I-bv<=
za7VgW!yBP#dA|S*k@Y06iP%G-`cr$<GM5j>qC;!iKC44Ri18WW3t4m;)PBCl9kT`2
zS|%z3XDW*;emz(Uuo6%P!#V_L6qG7AV<_!8M^G)lr4QJDhesU<uP94muqsrVhdKAw
z%M_X0rHRV0+Q>AiMp>%NNUfij=MkVPu_nOpnLG#|n>PSVt$>pZC}E~Zi9%!w3ipo0
zW*O<a<TDa6$2tqDjp3Sxsh2n7ztc6xcI9WLpBf!ENQZZZEo$+mo6+ZpwRuo}us)45
zJXw0gvuRdO#@iB;Skx^`gZASg;Vc=K2~n>|i*79b4s$6=j?B(4b7Tz+?_p9dEIFNN
zRxGQqib@BRX(q!_EmLRk*<>?q82lE3P_Pb!B4G=x^Az3_86sR*RXM~uVrh@qz&a{*
zb@Zrqizx13_!hJ;?Wz=%GoVFyicb$4>#LV-T>$PE-j642p0c%1Z;<<zwwQ?X`B{;k
z8t_G5r}es>NnBXE?46tiwwMcEI5i5D-Lks-&BlO^FbQDYoa=X@C^mLOD#}e%q+1-;
zO;scXVHD?Qp<jL|Dj+|6IYD8t3tDCnG&{U>xKuF3AXn7wy*cvgj|>bprZu(;?(KmW
z5KiZ2G}O?)db#ZoHTVN3?NQQAylBF)v;5TcZIo%e!!mQ4CyM7*m11?un6v+R#69T=
z;|u_f$$IWxNZ(IVxWKBELh^+sEXU7K_*!={W98MlnnNms=xNis7k`T!>D=tD+TcDG
z<?QqmvS~53ux+tunvpM1mu^CNbPKpzyYX}`<mq%uH}g?#)zV)2ErZmx4I!T<g~R8(
zxF~jG-&j6z$^a|5y625!LgGj6y^nyzoq*>)8lOMfU|(px?n`s8m<lkfW$Y;G&k*OF
zc;2b`E<Gkd287L)Y7n|TSVCxTmex0GtDHUVk&eKZ<QW`^H;Zl@xOc>@YCx|)e+%_A
z`93cA;vOR8;+}9gBBYzHCxT$EOSqrx+!a&bejG`vg{Bp;y_~_T87aFY8l~WBBmfC1
zes}YW`07XFk<ofhAQ99oBM_Ud8c)dd8O6%EwdWeFORKLC8P|cK9TytHx6eIuxXvi@
zt?rJwIP^9I3^5=<kdlzc;ac=;hQE6-Cl0DR;uW?CJu!;G#4xV@n&^N?=Ghfy#i(z9
zM4d=DB6Nmc_P9^Ik2N16axO$4O#7<s=3wpS;Kb?n2m6^veY5b5j@^>KQ*xM7;3SxX
z?JfyBpk;7&pIU+<JCLk?*hUhr?io&+1Dcn+pjmP3PAa1-c>&$_@7rkie{a%{Nf2%m
zhV7LBOGyEt0Sv9RMQ_eH#c^rEOw6ZNZNFQuLA@y%C8RKD12oq6v)A7?&~86(ULm*P
zCs1LRnGDuMHbeq@IFABKcmrPZ0CEInSPCefAIc6Wt}#IHU@1;haFrZ5*Ng#@Vn}Cn
zi=x9ZKT)Cb){!GaqO9wn?SCo1?*&DMQ0@W%p<XFW(Pck>4F|(Eq=wy}a_S>drQ}O(
z57J1Oo0oNKBR8hFzZJuiOY)_?EZQ^XYUE2i6k&iDb&V_cRJYx%y^bxHfhH;h83_jG
z-o>b)ocm66j|q<&HMa`Gd3?Z`9{d>x$J5DraL%6lJ9jB9pnLui9!*xk=5m0j`cTFw
zTrvBaUc^CZq{9qf!DO~^jP23+_hRw}y)CDfccanH0IH!LVmzyVyeu5S%3;oRiSK_f
z3JP#>_yk=?2|$eumAC>r7%a?Y%SpSn1bh8P;wKx@CkP<1RVEKSK@clB%cJ4ydqmOE
z)7h^c-bp-XyiC+gQYE-*guE@d66@agM5>+cpVccI2Ldo&cyb<wU^TEPTrp!o0Gzb4
zwm{~9UlMt#Bdiqb3ouBM>c)-A#6KY&aNQqKv%L(8g8}p`8HMX|iYMKSyhjNNY#EHK
zFh#3v4QF_TY+cn^gCXc5YibyVVT$I*Jzf;|kPh9JJe66Bi3eOea!gIHSY&N8o-o>5
z)#^cG7n2z^L6-oyz6saeK+Km&>V_5Nj6df3F6p#_XtWs@E0rcUY`DKzYxR`Z(<O&g
z5$)CgSrP9;4-I(T{!cVp<Ha0kKLiK}`+r!38GF10&Sm(7YbQtm`X@O;8VmL+s`;EF
z7HlDm&AjFxO##XlOL}oDYLOrdrsBXk=~U^~(D0`-`t1Ssg8?Xen95O2x*YFovuC0C
zE9v3{3Gz5P0#DPNvCl`h$InNL&-b^bEszesE5l`f2yD9n<UT>}<~>7hOa}>dyNDe}
z+^cO#T(!J#0|`+8T{I61_SGomziEXBP0VDvN-Kp9ti2`Vge1yv!y$Ab3HYVp7BXNx
zyq2g)fOWF<22C=Vv#hR?UFk}A)vpze3H+pKz6z}Ha-BLB7_T$8p>ic5TFm-}<{~V(
zf}!KQQq{cre2j~>H8L)n+bkURdB-%dW|r!xqF^(gnj|Mc@?~sXEOeh#=*fV#i9{1;
z0wHa@UM~}M5yXaWGQ;}tR3q$4K+z!rZ3grGd23sJKIUD5r$UB90Ef4cN0qS!=fdJG
zDzTBLLQ9N<c(L~mh4qAD3cQW8zOJDA`nVObN>EyLC5^>m<}zB)M5g6<MKaytrQtv4
z8noHB&IoP*Jf8eoqd1W@{n_|uwi#OWRMwD`pq!6=@g~{yIX><06pbg1xDa)L2D8PW
z1}awM*vYQJCQO69G0T^r3TzmXGCzID#e@_RP=2Cvm$t`}MHlItoBbqi_b(;iUR#a7
zcAdr~$*R>qJ2dq4pNvJ=Z_~fAkS68X@E58oZB;lxr6$|L?X@98D5Y3oc#o~F#*Y)i
z9WG!<K<U|-e1IFT!Oue(0NASH59^+)%|&#(vK06UH{ltH+(n&C+2>cayt5U}w`lN(
z`f5noLYzX1SqI7o{#sm(sdNnLlB^k#yL)h11Q=xqD2KrO8WE0?<P>a?UfJ__2c=%x
zbCp_v82k^zgXVxI2eCmYSiXOW0WtP!f@(&L#@?0NXx^i<3%L{zOalqlL{JcKwR*jr
z-o=E0=n0->kJ&n^_K;>6xTUu9o3ggv(GC!L+fqAkNdYxCQ2}-$#~V|U%6K<vMOK=V
zuKyUiMb}nR*<Dn5c-(H@Es`mptHnc4FX4s(JWENNPfX+i70Mhgyj2^9^Y$|@^KQCH
z@#f`R5U~a66h)WH*Okb(`g4co8}$lnm2`Da@Kx%_sHT|Yq}Fm#UnxdGEX$1E$nQ9K
z><EF%LC6rlx^Sou5fG+sa-I=C6+;P$8X*=#8jzQS1a&t%asbK!Mh)xl<UzL`A1q%0
zrb$n%B}Bv6JEBQnv0r`fUCF*+R3GSh5pvUy&^z~2%h%9xtKpd%BFcU9y(*1Ttsyon
zhNvHVb0>Pp_}amJ1Po7KFK0wEtFZ^IPzur9VL8GSo-=_q`<-wF`_8~ca5<hSG>hz?
zBAMO5$2sPKEG$N8U*q5u1~86ASzKbkU4J8nZw0kj$6KfL8Kpvb%cvvyq&4z9J_l62
zEb726AB8!Fap139Sf;@yHT!W0k3c;EL0L0la(wrvaL%zG&a&L{ybDJ7YAaRJQ5EVZ
zPp$ZFeI26;L7d|l4#m8k*f&joi1c!a+Rc12*Eas3%CbPLEW;Zw?<~RZlMd<tV!0~=
zogS&U)bA%HOl!`ND6wyRB4yw#49HM3a`YpNTq!)wP4P)I;98P2AmPwVB)Bx<b#-0n
zow$Unn~V|u?i8ROP-T+)$GVqm6EAV1<)5$lB1!Z;`NpUhTRj=w(;7oU#D(a#;;VuN
zL8Fn%hJxob=vo@dsDa;{&K>~)sEeGZH2dmk(Wj)Z9hX4<OL}iL!Xzbl&W-%*e2CzC
za*uLY*ZC@GtUC+?r4JBJZ-SlX92{kjUbRfR8jiUM2lagdt?hC4ff08}YzK#Z=VugD
z|1sKI#}semdMJlnPGL8YU09-Ow&2to+daE!;XRC7864%lm*UBdsL3%SnM@ISb}yX$
z!IEC{7Zz=MF5g9n8SP+F2xx-AD(}~zG~EHV^d^ehK)qaH3*8b;njFh`{FcJE+NEr`
zy7<TJ2u@8quEqENSynLVnZy)-!-U7*CuIU?GHJr~3=|+ZQUJD(0a@hByh#(z^`Je}
zN@z+R9bBXr?VoEYtp%9GgFPLOUkIv_cDp^_9Y2BT=Glik*f4Skw2*Mnv9)dUwoO%P
z?Xb+6q|T+)1ce3OnhVKQ{5M1>h^=;Z+Ox5cNMssRRF_m*NrMp~xUhTVk%aOm)J?Nt
zBFQ-#k4W$&PEbN8Y_Di1pQP|hT;i1Thqu`=#1>ejH{?&RoY$y#ga_I*@BiWj1VEM%
zxz>5U*~rmvT!8yOw^B0;ksvjT0T@s{lSNZN{+w*Ct)-Pm{=JDp?XSCxDcnP>DNm=U
zDV_xWMQc(8XOd!#b%Wszvh@QE;dj_gPFT#Y(9ffDOd8Dg;MnJ*@ys;Nt+cePG~Vw`
z{|6+YzX?oLY=%XclzAXcob_;s!8#fv@h;y|qy#b}-L8Kq3=E&NWbC#0KY$Sm6;Sl7
zNfmYg``c}-5ervbud96Et&mU>RYfbJCuh~(UYJU@ARYe@RBW|K+Hc+c_oW-N*}b!m
zj<dFJJBw{m1;|D>d~RJ;cIaeMB_1E$7^fCa9bR_hqj7w2$>dzDt5MEbkVZz`(x3`7
zzMeX3x0J<7Qj{R8P*5Wf0#NM8XLh~ojiD(j;lT(+<Q>rrG}eF5b37(4#$LtSYzt4s
zH0V5+v!k>_Z!0~9;5181*A-Wlf?VgV=_4oL3D?*TtLQ7BH(P$(R~9i}sjpmYakGvm
z&Svm4xD({-@N$Rw%MsM#&_(*p^bfiG2sbd1*>${wtKcRaMs)@L7I6PO<1gh4K25h<
zM!=kk!FV*plg)VFY7%I$z7U7?T5NlMN|E^I$>KME^$wStb=<e9G9XxKJFtYx&}A`E
ziFsZoN$XM-NUs5mb81rIW#nWpcEwQQ#h<eX&ue&sN&4%Bu|NYh6nZK>a<rgG#e!M#
z8?U;65i)afy{<9815j#xSLPu72Txm`7T7gP6sNN$f48`^A{iG-hNChh=;b!+-sb08
znaTXXb|t7&P_5gjcl48|iMk`%!{hX$W?p0}ARPa7tYyZ_4+6|P7v;#m=jhkOne6Js
z%%;#hL9}-Oa<uT%&dVP!P@TqRN4yM?9~pr$6C~pGgeSxJDF6qITF!K7QlnOZ7S7VE
z8F2a;<!6$hscX^hT!9`p7E?q1X$KGoR>AaQhBdLfP0&IWTQ`s`OHxT<z`6WNz1zMd
z6qIp<xf!-|9gU#%iYvvrw)4I$Y|D(4t^FmU0~iFJ7_{3CjD6x~eS`*VR1W$@>dIE?
zuNMP0B~Utif1QY*gdC<$2HcjDBFIe*I1P-D4#CIhCb>zv+8d;868Fh!f&>cS>Bqug
z1>15};PHh|C_d1i;!^sf)cXGBtJEL=vxIhkJ6kRM?rl?jr#CVG|1S*{P?cmOH}}oK
zf3^HNJBIv489D_Q@CPn2FF%wK#T$A=7|j?(H&wftt9+yCB>a1<!{28?)Ffdvem{ay
zcUv_v6D`<5mJ{Bibtk}4rq`4W;PdtI#~&0a9A#-saij7SQk{WDAgL*9YO0cgGUHTi
zS?dGWcgg`R4R9v@Y~kBWI#dyDqKdobJ=zIW(c!$;FcjaY3%=Mg`I!^xmh+pLRBiot
zuhVR8v({E~hne>p(U|^7m3_%LuhwZE<H^-B0`R;urR#v#V{ffG_Ou*1xn=iSw4Zo^
z2Zs}tS-kI8M0H8!oy({1n&wm65qlK8P(qQ~J1sjNo#kQs)k=OdfTd|5c3W45e2Hyj
z`Y0S)aDWx)U%VbEnZUPDyWqc0r0R`gW8L;;n+h1ju&RDmk~yq_Pv&00B%sHU7;u4P
zsKnn(-5VLm#YpVreEH23iDw2A*nD~EiE)-kt7X(WVWx_iCIYGP(jF&5&w>F5A5nLY
zaHH9JB^)yM>x7LAV6?96Kpi2nZko!efW#!7WBi7FD7T5{9JuF}WRQO${5MODXfkF;
zs6_V*2?5P!03g#sOShq~TgA70$E$ldS-o&TA}{LSm1;5kNRY@YqKJgPVrG0oa)Dw2
z8-<;P_h%-GUi>_vJU3_aLwtJl=-41*dKuHv_?K-vNsQ7T0HFj;!4V5k@E9y=R!YL#
zx=t}R<ys^tukk0W#w2(oN+uF^j0J><*d=#-2JjObCe2`~grr9jgoZ^&t4A9;aTX#T
zJ)VBoF;o}v`zN^Y9G>VazOWC!CXl`or`&|8VHJN@e?1fHmg8;wo@k5fcR?^>PZDoX
zJ|M9pS!<*C2dCdXc4k5U06YslcaF1+f#Hv?nFUWuBLANsDdsfOq2B4A{*b1*AOAB3
zP^p;h<n+62cqc^rivVnt(A3a<ZR_nF8qCEJlA6s61qkVbKz>We!_Bv#hS?;tmD;cy
z$fzagm^GArj|mO>gyWt=)EsQy;+muXAoxJZ%KrOHh`}Ern)$;~Z_?+IbIRv&z2T|m
zyJR5z!TBaT{>?I4GBNe3?+%Z|*3ytfNP%h(VnoaRGY&RV=>hO15$*jRY9i7;Y9-nu
z=SyIWbcybWL}ufF#cjccytuj-b&fV5w$oftUQleY(kxe;Q?fGctj1aM*qFAhP!(!$
z4ANah*ytL!_gVe*N#4h3=eF(0oB=<Z-d4q!i42S~?X1*rn|F+&$?MQiu*xVeitret
zglUK0QMt&oumCJMR~TSr93;y@9uymxFKWuzu&@Nsdc;RQItx=EC_m=%{yX7=>#wyy
zw^^u%le6An;po!;=`dtVquDsJwCMa9_u83WUM9+_(nz~ede~0OygC2Z8x5-4QYF|~
z=ks_i4KZ8T5$Y052JWr6%=bqNUW~K2iunKsO@_8~bOB%(1UPg>n$)3DlI48In}H^y
z$#Mrj<NL@sEYe`1LMbDR80~6c8oUlGYarcAxp~yuAIlRTX?Ujtk?|bAM-4${%_!VK
zs%($+gw2#4cZm~&a91`%f-Q&FSh!6?4qjpRa~BFqy{>$s-E>(kN2PJGgn!Ku+oDLM
zUbHnd!wC>qHZnL*BV<p{4|gD@IdJ%_>K|Sos&3GF>{0me1CeFbOW?Wa)qdyVRDeHd
zJ(gNdMQTm%I5+sEK+nEiZS%y_e7BVl_|O$D-<=|<N{vx96G}HRbD(*=$2Zklm)@)^
zwV{|3y4yDOC%CeF1^$T3qCM@_)2_rKMnIGy^&Ak=iwSjty<BpM)T!(NRaDX-`cz?Y
zEkmx{OT~KjdnEp(_il4XvZ=zQbx0TGDyN0AAHN&&3efXKX1hzNi;@SWlDcU?^Ar6b
zOVsySxT&Oj35w;ffD`|NB+VzBcb&T-)Mt+QWq-&#K9-d==nrcYP*;3{IGe;p=op7v
z1T%o}Lb5eH!JhWm+1AfKkcU;eLPeflSB6@YH|#E~pVA%RPdiBPCPj=Va)ml~bp$A@
z!P?<-EXX7sx87L&Mbi!^7_y1)BfD_mZVb0?bb@4cB%I`(qFqlNGEXcVGZV-QG=mz5
zXx7*;t}vXg!J82kh#w*;>KR=?Drqzu#&1Jd91^HC5fB{DCv#uI5K|GERHNOc6|72p
z-bswMxnwcdzW*?bfe~vKv7b@yl-aCt`<P5Lg5%0N1}-`#f<x%zw}o4Lc7MqTYLTxZ
z>eK<v?)`6Bg_v#Re@-3<yNsCww0*&4U)r}jpbvUdw}AiF*t(nHV9I&F3)|wioG<#H
z!sa<g1}IWmvz_~c%zLK24jBS$M37h3l+0~YVD}NAQ~(zi3`Yl5Ebp?5k6Ib6qh2d}
z#`q+n??4ZO`o|0iYMoqFMV28HryQL;e;!Zc+`B2cy5a{Z-J|@0Hvq3XAJ@n0vc6PT
z(?^Dffv1AU3UpTDVlrnWl{`QL8n5BO0-LIx0srnsTIoBCHe0CTuiAgu=Ge=Xd*Mn$
z))Y?F&K-6gb9C8zV-Gvc!10`@+qiiT^5VDR2hKR)?ljq4z6GFWyXs6a(Z(Rz7$90(
zpt_D{<(0q2dv#rhOHuxUe<kct`1MwFNyUFuJb^bB85{K?-X_F(sX?eyQhh%TY8n$G
z4p@<o7KN{L3i}ZGQicy0^e$YVx$y%f@-1uk6hhGQ@)?$Y$71QXl+#2+BA2wglS7aJ
zv&iTM&Sx$y6PHU*Wx4;jkuFzLPo;LtjfXe3ALs#<{t?1}?U+&qU-_K?8FhQ})iu7g
zOd<gPD*~PIoHhru-?IZ}$act4TdwpK9*_aIC`>zW3O`Z%H!{08Z%#}^<35cnuZ(kM
zA~!=KnGK|Dl-t~HWG1$VxhmkCxjNoX7^IR2sfn7UkHbUwm~_Rv$<<%j>J340P3eH5
zgt@pwu$ErDp=P+&j$t__wh7f_uyS-wn5Z&w$mN#hw6_OgU6}YO$kKLzm4H})Uz<>?
z%vZQv^b4-A1Yp7QD{0tY*=~q5X4taMvRU1Q2yFaSYKP7B*aPe@(I?`gpcmFsUp6a_
zLt44@4yMMws_*~UeeAS3ySKjWKD8*{X!CzwvdcMKz=ryX8=4CGS0~#=kaG_zrMi6N
z>@3>`TmZDHlt@`4C~W{n3la8QuXFLF^lAY0?@R8`#03ZuZ2=o8h^4?*+^=sL;aRNo
zX;ONY%)in5ek|kZ^6%Q)hS!$Q$kmtk9iE?PB&0lq2_(WA7&OUmB1}J|-%9xVM3X}7
zNH|DqfV3|n7#My}(qm8>Ac|k4ZZ_|Ehz2+u8#CFD(mw?BZ)E4t`h55|dov)G*XkfK
zdoY_GOny4<;n+Ekd)US2bbSr((IH1<9X)IGw~taH?%03HI{NZ!B;95D&cNzttgL{W
z78&XIDc9r*Y>@@i^)gE;4Xk<U$(AtlEx$}V0DQK;>w+{1WXvC`MCD@ghgMm2HcC^I
zEt8{C^vL9oHIZ8niSw)B9k4`(LN$bO(drxmNEP+Jr9H`Iq1kG<ENSG@v5PYfU)Lr%
z3DTFufs3^yz9K#gtFTwsiFyk=(Gtuh3~r0~-Fk_&iVYXRnZ1Y2whWD|jVcWj1T6kG
zz!|7h&7$*!EhdLvT82-$!f=$gZEgva>4GV!UIhwCBb`yQc)eMMrLAH!StzPCd%mP$
zgP~=|V<?}fl>VmY#_^I)4Y{zBi7ixp1Zp#=kR9XR2);@S#G<k(u)?yvY*%geH6ZP~
z0nYdsZXq@gnjsCxqAa^MSlMb>qg2TVn7X5`xO7DnitmI;QlPR|R3((7MoZ<UqhGUL
zP__<at{ATUtKt->26U`JTb*YjSz#i+G6@ap1Ves)`-;tOYx|XjKKaXhJ1;JT96$NC
zHZsKO1wS<a2Ufi#j-}v~7N_K;13sGzF+I|BozjTac6&t&%xO??#V~yovCGUIV3iYj
zR;wt=dTPRwt00P&JgN@FU|O9alJ_ylQA}%eB`o*c(L1$SA~)yX*Imd9cdQ^rXI7>z
z{N*~VimxaXjxTBAjkghFgxzhh=E^FW-5K?9zL^{OgM+fRT?DC&xAQT&QN2{JPO!6h
zret7V{aBzMUW8u1UAB)1JH$a4APRnFf-4dd={8NYqvL<TNpv+$6Hz}pfy-6z21qn6
zYM8o;TMTueiXL?*7$Ws1+!Ml0xj{jc<RIEJ@+RI>LKJlpV=}N(uCTaJE!AUPpgQ}4
z&yji-9F!Q`M(@h>>(t_7>M~sJ9*hk#@RzSPjAsm(1EZ$9;leQgKV6*#P#n$nw;{MB
zNN^T+cXtTx?(Xg`8{Bnq*AU!Y65KtwyIX=o$hU9qSNHvMr)sOFcAx2;neOTC>2uES
zWSY1u0#P$_LN)lRY(?`ecsUg8xjfww)%Ln4J3Br*7~&z(7zrTi57IR>CRUw;kb-$-
zQ!kW~s$lAVhLjJTI}B;yb9|1RLMElFTOvPB#<f8fIl*R#44KJu!2O{}F`+Z&?lsfz
zG(}VEj%Z|dw^;U0tN2q<xp@i)qiw!!lly4%EKq<KDG7v<GJ|upFOgr;zV5I6d1~FC
zmG?f>hrG*#-kxe%kCg+`CC;RI+1DMGu7Y(l2WeJBUY}w&=yb7@QPJN#=&JRCXuMcO
z!;KD0NPgIO{c*gia#W7?gEl?q-D|=~nyx(Aa)<aXd5%DjS?TCIHY!x9el_2i?i=SZ
zCLq=g#!41iA(4>rle2mRF&A$pOxq%lp^fKc8gK5e5(lZ8q*LqMaP@(KHBo{Q{)?}T
zt{<!JNb;zK<y(E=y^UFdUaoK-+9i~jLwcPiP>Y?;QD3%IHc>4?WFzso_pR&-oYBaA
z9st6^XOfZJ5imQb)#%~MjB)uofC0Q6ZD82Dg?Nohm~7nVoWt>@Uw)Q@-Ot&$zJ|gZ
z>p{A6f-)a~<oq#(P+DHFE}BkXE_KIGMp1z8%YLyl;)`70&-bP0tbDL=nCq<d!EpUq
z8;UU@kRdqmPC~d7MH)bMDb$bd44Bw~Ug;m2L^x<$n4^j?B3K#b3S6z-_~ne`tq6=4
zP6lEAVU~ea9=(%bQ8Yqjn=%T(4)%Q<iTq-DeLaBP?~YD#U1F->f$4n!{Y{^rOg>Io
ziCvE@@5?O)YtBvl$n)IK#AJ}kN5~Q4KRv=93Qe-Z8Es0mm9u(I=d`wT^p`H8^hHq0
zjrES@2(JiabNrNP-)Wl1f2Yp*NWcLsYR#NTo!-L>B&y|B(dUb)-~IEtUrs|*!W?t0
zpSx2LQ7hK3<NdNJWQ~W@S0AbH!5Pc7za`mE2plTf|9gk(CffBz_z!OI4*!QpLuZW_
zaQuts3+b!Vl?~<1oyw?ve*S?eHkJvQ167VCLLXl?w17zD#VkA@%A!SQl!6^Fi2C3W
zi%FF7IEfo}`y_Kk#n8G3zQ0Ubd1Y5i|L|uCNM=x9Ew?wr-5Z8<*P%w(%<dNP)1ZJt
z;MJMI+F|mq-*KUEN{9JMQsV5Nb)cOX{L`Kv{v<)J$pJiPu?GUiOD`3!3|XPP`mi7V
zN4A<rcKf~<20ZJ!hXut4Qh~I8;Dh)RP=M4C@p3`+aAwGfB>9n(;W$*8M$A2$*bC#C
z7g&x+GY^AYPu6}Uk#YUl0T4pT*K5t=?^BUeDbIOY4qqlsSN<;2DfO1eLI31Uq9&Kl
zR6da>pcyZ3C`>xoNsr&f3O+dVN+sLTGQtVi9%E{AlW)6lo-$+3MKm6bn$TYay5VA#
z$5mpVCN0`EwA$+qM9o<_DOc$9BENiz6Vad^EvKNrBoyOWMImnKL9O8C7`2qbtv=^$
zmV1nHTy|qsac^$x>M1F?xne%(YNB4BIZQp(DI_Gm9P`ndSGlBb_ferahW*oOo<!NT
zMIb(+v3V_E(Af4Bdr?5zfv!y+7)G7up0Zh&h8!GsBy8s);ud(f_&b?w0pN^7JI}HS
zx9)OD@P$oy1<jr^{!^^Y)B)#C>jXp?m;d{&7R3?6nBj09cRCiioc>S|Lr;(W=Eo(K
zXjYGL3ys^p@2ImU%~rxgxKQRX_*%ULP-#xf-&rYlh!;$NzWvOunOJP&z`X82WKh>?
z53_&JHgv3l*2VUR<Ja$=cB-KnW4S)YZr?CF-m7{cXBbQlPs7n8G|7<J;E`KLd_|ZU
zVYXJ3ik@amv4o4*LlQz;r{WMjApS+|ePQ$&oNIx6a&}qED9)9<Ck-QY#+`7N#EmD!
z=27%xog+goY|{^4dqCB|4A2P@+y8^T^su+YH4PN<0g!m5U)cBy!ud1W8Wm9*0<vyv
z4{9lSPBHw5CNo;lWf%e_X1YrZ5m=pbjAc29QkTcViQ!X<zrZKuxSBsLikcT^Na$x3
z@oew<AktvvjcG&p$;YgwYoTg?lZ~*i(AqgJxqrKsX%DpiR#<tNQN)oMDBW+xO@YI5
z`;pEV;{;oySACZ1IMQv0=<QoW@DplT2Dtf_gXeVr%;#u9BR{Z!RqD$Qb4sWJT+X}w
z&eGKOTB9nn$&?pKoL`d}=}QW~s;DIdk*2g{^+RJ1Ni2RCE4_m0yn;Z7`9vZ3IbL*J
zUS2ANI4vqI#`0jC2gK)kP9*frAFei{1A&~SOhi&aP~Q5+Rlbk?CmtfR+PIYxOR0&0
z*gGUzEcIlZB=?qi;EqC(9S@~g^H~&Fgx{-=GunNXR&b}64L=LWY>UkDCu4sf3pU@^
zDMyrK<`k^#-GWQF*SEd>Gn6*C{+RRYax(H+qb`Rk{{cr9DVcf8<T)*N>P>Jy>8klK
zzu&fQb;EU3v~bmqYu?YN=G}CYxr1CwbO(yYu{9&gr<!9dAW)TU<l`$zm@&QK#x9fh
z%z;9K)^+GU`y!$uPN5#Vd7r;DUgYUn>!f4QUZTb2`$DA42dgZd0sH9oHuI6)k(+|U
zlAt(@SzZNG=^<u?<JLfD%rRaE6Y+uaIF3p-`cPU&{#*GvbA+jyMq80gV>czO@^zDR
zKElK8$La4kKm$#e>1u{Nr!eG(KQ5`X7vQyOUcV;S=$!dj-Hpp0g^+XJK4wSui*I)@
zH7*_YujU!$zt#Lt*j){3vU1aOb@HS6++!-J({3JtZS_L}S?7XHAXoD~=TYb`5_ca@
z31(VNfK=)JtSUKT=$%yvrEgd#D@mc*+~BxidQUeo&}96A?1|+o%)Cmjc|o0YvDODu
zj4`D+o8eqIUPTo$(QIsHLgtzzCS?}W1GeOQ{cfB+oqb;~6a8Eq#vSy1Tt-vUt>r!?
zICWM*5*alyvt`Zx4N_MKcTFEwv7Dhz68F#j4qG-v?U|WoMy?SJkA&+gnk^Vd5>8F3
zpaGtG4p<th<7XF*$Z2gXC-FqXjCU3YiNw0(8>eQ8aew~jjpWCm46p~>f~!EkQ-px(
zf0uCsE*55#IdN)6{Y0Ec5o1_|QKR4|ty1ZYSjBdRSTnt)7n7RFUXg+DhA;0V(EBX^
z#43Noo6^V6wo{R7-f*4ro^+iAFXrBz)_?<-Fs?;K@YoQa28vJ`SPw9y(lv*hiA|LU
zlY)wusOsoV#lPnbYo*jtidi0M0}naxxo~#8-P1&9d7dfzghN*kJR0gO+Z|&BqS?hT
zOD(iI!o~&!)ns1zE?CSwKKNfOQItAcwT4}`BA3<MXE}_p@=uZXn+!Og>a26zF{oB(
z>yg>@)!vJzFNU3FI9#y8?Ncu5@FCvN0%1h9$|T8tusZWHv<)-ko;yJr0`nU<Td(lS
z0XULj7Pubz6;F&Ur#?nx!)o0Vtqq<=3w~XyMXBbMZ26(_^s>s>_K{tAmc#mR6Vtl;
z?yFZ>g$^k|iXS&^CBJFzeB2l~BXr7m<y$Pe_X;0P3APWR-4St-zg%J9v*xl?>NQ-8
zFsw>iRd$G69h%vFsSQ132l}S1_SE9y)|+`*EZ@nk?g|RA@|h}rB38kXjNCR*n}=o`
zQ+l~P{&Q+1a)=|*-V_JR<3s<|-F*%vXxbexUSV&l#Nq#Yv;mqPx#;|wA=(A;Xovk(
z?ar?xtLypuvCW~GLAx+`0qe(C^YJ;|$~=c@h%P9K{{G<^hX@b6Dxh0iLb{;%85sf#
z@?3)?^)gpXLN+1<&VYP`trP=dju5JL(87Mk$NnkeF7r|;KhY_kz4PS{^O<g8#Y^{C
zgC!rShp=a!(5QAUaV&(G2LhT48DYka)kxNR&owB=TE&vC{62T26K~S+E(s(Rk7Jp8
z3XMC2()UN-+>G-)S?C=DgMM6NO3K0Yu<oQGNo!cghTa;lpR!>=FtW;Tkq{>8?@?TN
zf30%I<Fd*r&MZ+TuAv`+iAo`t55!9>QB;78PyGG<Z5N$G=GIsWmQMKsdY>T-RMD5k
z7r_u{&~EUMmv7A6@r<F7pmD%3Bqy~J#t1@8<bU9l4m%&V(6FGQ02T<9DuxO^Ks^;j
zd2&LcAz6D6PUdtR=8g$?zP|kajl6|w=x0`Y+&AzgJSp5h?5s>}Hk-w)+}9qq1??VM
zteYmK759cubn}<Or;GuMwSDC*psn@gZn16mNQm+F-N>-kx^oWvI_uhW&03R+C>Loi
zc@Xu`gjTr7S8pbC5w0X~`0#z($+BQk`zT)`Z=YW!^^XGy<cYQq0?D`s8#iU@_mr~V
zFmFx8b%MK<!nO-n{Ps4zQJpbi8H!2}PgUtA!+Z6v_taCy{iN`f_f^SbfLFDB5Mk>l
zX6JqF>mh8FENZXe^07MC!kz;qjj}Y|yMQGG*L0BuvCwU+Cv|2F1O4`M{wT)xkM4MB
zIHMp*V`_QQHVU6!#<R3gQ%h1!fp(Y>GZu?GV9%p;VDNIXng5?a6pTX&=!XaR)<#bH
z;?@X78b)KDfx-!FdRKG$PXVGwF$2rr2BOJ&rTAkt>QYmyN?+dFpp2Ry*%?pXCQ{L(
z22g%7zJqyNiSONFM3ce2R5sW>=^v{TEy!pA76i_10#rR$`1ntS+JjA#<_v~~R)`wb
zEy*PjdBk|Oaxu_y%s4MxjkenL>-HYlMe#cyAF$B_KYb+n4z~MQwi8cNh6;IJbg><7
zxL%CEygu(@e@4u`-$jhV!&Mc7r9hi3R$gF6k{!r~#iTH%?Hw<5R?OB{x)vS~3xh_%
zLtah+61+z0GT!4Y_+W4wm?joXIf}<!CN}JODKw5V>mTtiX3#h=lUD?+Tj1z9^ZUBD
zw3)+QKBU@4D+I)L;PX3u0#Jcwnm@80+149(AcxinOnoS4L=nsKsKOMo(u)1OsJ~j?
z7N>rjC4Vt59^JwZe@+a<Q+&tzp3mnvgdq(G)ZUjrVbi1b_?Q{@(p<BH28FYsCuQj<
zh{=Pr|0|mr)A#`QCw31D@|DiShdw`Z<G8K)UW$27%<`(|4v~p~{fL5i54ChmR02)o
zqhS-N^dVkYW7J<R+5;a6qP0wL_za&0s&^O8g@;t>Pg^4qU^Nz;p+3^)vLrK!=kz=n
z0)h6nL)GHQs$G^6j%~z)_Su$_?R^n&$`2cn&A1ZndJfl6T`n6o%LX||9(>b@Q5<t>
zu3fDpl0uAP-_#2tXSqklqG;waliEmpT>CKWRg&}Fr};&D=?RFfC&6|e*`tUMievxT
zaAU+L?RU7T{nY!e_Bex11PQrTeZ^FGK$^Wd`+j@DQ5-GSZ)6$r1cjG$lmVja{GvJ`
zzmqK+0iw@g*SoQSZ1}!Z*-xJszQ_>zbU2I$N0y@AH(Fu(()>bw@~#a)%(e-BPr`{E
zyeLJ85N?xd5to0K7rGlCl66i-#iqo9J0(1joE>=OKo%d8I7qN|ZX~gD*Pbe9!Ny4=
zOP8M7{Mp%?0&)GqUoSXJx3O31&;MwKwWUh(1%TVHI=KD*XP#)ZfCZAtMFy6HMk!%3
zkZM@b)MKEE%0v`LN`oZin8|(cM~jiQJw`54A8NjjWWo7fzl)?CYyc)-Pc#>*G!FJn
zKC^84US@GQ-kr9@=Rqdd*_fg>aN2cgQER0)7@HU{#WT<!*(b$?iX)ka?S=hRYaB7c
zi0VMLnBPo8CUf5(IjkxYzy)?<_%eD+oCb)sc91HqT<}gD35OytpYKXNZYW?-*J$6y
z$B7e@3K>bw^DDxtYlak%ulcN_WGb+sK3BWpRlC6Zl6U&+pM}DU;_lT<sTtSe)rpH+
zBHfBPlL9oo<V%AqZ+xOSqON!C%qP0xoZ7lR$-|?(5R(FYfA?v%s{pNhFO@h8Wok;b
z8ibAdAG#0eG~Lo3v&6$*zUAY>daBKRRF)<3-&G9JNp#7{`@M1`a6ws8@A;xJoiLT$
z-C?KL21Af6ig=8XT4%D2&^Ol&s31+|U`jUlO6pGP8@?4l6jIHd(#u_soKew<yYT92
z5g@x@jn%j04xTYy0D&Lbv8!(~XGC69tXjW34HzZnX3D#=d_tLnUW}!%O{Whhk3~jz
z#oi*4+Qup1D9c$B4!co<`;3nhOvq@X$n_wA{1ZyI#1-d2SL=W;eemF=W}!TTFI2!G
zm!xO4jjbw|)VNuw$8Uf!ff|i>xtpF}8i;rW9p;VB<6s<yk`MfDpZtiL>di~pI7_oa
zQQV~4N&s5xC79(-)E$JrK<@(lY?aK+SSH<RW4z{AVUhZBC}U_eG3OZ<cxR}PcY!fx
z<y)R*mP3Bo9H+n8ZU^Ty!X5~h{>2{(#ng{5-h?MOi=1j$D1uZ%I*UAV9AaGqjY7`v
zU&l{$u<wruM5MO-GaR^ic7SaktbdoK2?_{-FfC=S%4<qSc0V31m@}o=Sx8pV#|iH|
z0>j*CS`M1oo`fEEqA3L*;2tD#r|g%_f}yQvbBXS=FZ~X)S2uwHukV~77A3IwI9--T
zifncfa&^AyTA{iy`5zC}z-RdEh8TJD7D#HHKh5%W;@k_|irhfmC3kEKLsN-9uH<q9
zCmzP*;X_ReNEL5Q&>9*Z3}h7D-=T>U5;eCM;I)xagasacc(-{TvRjuRrcW|ap-|F-
zFsbEt>}yx{aAbNGo>XganH#Ox`#uEF)}{66^1~q;{bzt1ZW5YJvG!y?nuaJ(sD*Kw
zlFY4br{W<-hN_1%AKTJ+0qSU<l0lL`kgX=K<Pc-DETP54sz4f|K*JE(eR^S)Q&5OZ
z?GJcG;=UJ&<7(s4=Ng}lg<)L@4eKX##VfDPSxY9?UDT4~h-h?ei=6M;`Zq{|+o>)Q
zIj`=QJ%rWhtPTzOb=Z4mtm`c~!>v(L=!RaP=7*;`qa(B{bceeA`n_1<j%TPrAeRR6
z(#wQ36%Tc-fgF@p^*c&75gJI^204+HY;&t43!YyD2aEX3wg}@AcuBqFD+HB+I8Frj
z=v&WAA>9C!>LrekS({no&0o@$5s$5g!$JMn^s&;qY$KBxd1sh;^n?XT#R3XDEzVi{
zl&pR#eNon~67M~=9qK|rf52hlxKPj-5D@U-;BasY(T8PU-v+l32e8|R(BBq9u}BDt
zFM<Jr2Va2^a${Cuc+~6A2<j13`0WDH2-1=gbqt-*dZR^h)!ieruuQpR!z)8QDa?3U
z?10a7T-{g>YppYewVeVPh-jh|&f5nY7pwQ#-ToI7d%rJRE+O`ubw!YO5qX(sL@KhG
zLA`qeJ;_1V<DZ;4qHK{}mUnXr2LNI(Xr92a_72K-$R|*%3+v|5X=6Sa#^Bk1Z1(og
z!jeP8)C^q@843q%O*!3~9f^~zU&tgEc*r9umM<_<+H0IHwz;+|uml50;aXwaMdN~s
zb#Zybi7<1VUE;6;{@HarBEAEb3%I>w3W-stSTq$WvtKR*53*7j4fZfvn<n*D&w_zQ
zOTIQqQc#L#ht0oc16ubp;(n)PGbB5qr{`{(A8q&>7`VjBNVf>6aOEuL*P5z^omQQ!
zZX_l6vgTN~C`OqQ&2CudJFLdA80?a{jBeDsv6yh-e7`yoVz2e~*l?_G6rhnaNT)IW
zf-9i|IXAYD9i=;cnNj$=%#`QjPAo0ZXNGFLGs=Nn?S{BaR3t6R7+In&e}@vQsC9t(
zerm3Vc^+dG;>R3us=cJy(>5n|lrj6d4O>{|dq^=VCag;bUq-`2jnKQ_v4c&J^L2DA
zpNM)tJZXg`V7xC-S7{u+|3UE+O{&nJz3z7--3+5#x1lLqLSvmkNaGn{@5%!qaF2jD
zA%Qe2NRI6ljrAEi)L(+@IY{shv-C)=0^JD05&}rUX!a_jNApOhEEiE|>CD*5D{EjT
zy}j7vOG?_?{n%-9%f4mK9p3|yfs|0+96y{zwsq-l)CSuvJgU~?x>o}FF68G_o~h)U
z7!&;(osM()*&@-U9}~eo?Z=8Z(27Xe<tIrIsn(KW|8h-x61uv^i4+qfoF0BL@o{uI
zXDWdZ#43-<JRFgb>O`43W?zah_|*w2$5iT>H(Gu0GA4v2k0Dy&XCFqSDVB}ai|OPJ
zySjHIKe~yXg|k5A%m4U4b?P~4XM(MFHPm3iKJcRff=(p{GMd^MySnCRdmE|ExBc<Y
z*jI31B!PYxgZK%YRtJJYbO{-iL*^Y0bRX#kIoHT{=8u+?qIxF=6-_JcSe5g$Hs$jR
z93)?6yBDeib)OBMb1&Uz?ijiUN~-kjsuVXa*Z9~nq!}si;@4a+csB2I9DlE0${D;K
zWfVbRje**hfWa+4cI|JyB!|4cH2WOg9<Hk6Hg`OE(>CX>eBT3y`-rZo2zWOZ6QhM}
zAEM*@{1U>y?ey`#5DBWpn`S2L=p=sLJ4$CHl<(xVh-4xTxUDXe6jt6lIl>ko_O=;N
zil?!m5F%DBi^hO9%cKnDmAPhAOg+vVpH>d@gi`5O23nL4(GRfb3Ixe~N07OQJaJB%
zojb?^QMsBE5<Mt^ObFav>M4J@(}Q3#ldV+BO+&K_iwv-6M_J`Z-75>Qi$x`aSIR&#
z^5t%orNU*Y-jHPln#CID^oYde3fh%~vTi);3aSkynLqZ8i?Rt5%rogV=X~7vqCQuu
z`P3i|18r`*B|vO$jWj*)9}?KK$55#oR?Jc<!Nx~}<@v9sE!kxjmN0vE`#F^QlZmeG
z%fu6q)&-O?;dVdFL3SU8y=@xQK@9KUW4=iBM^zzZUAJOlkFPC(Bf`k4BDJVzyBOPR
z7Gp9Zt>i$zV16xRI9Jf1w~$^dk-9~4q)I7m0i7&=+GCCj3e|I=uM;_Qa%I%DV%o~5
zBglg6`LEY@&-97Y59-$_sck+C?DDTH+ef&s>Nb`X&>0V8&$m*p!mypCu!+@q6*kr6
z_?)wm<zUn<oJ0*)vYcj~N%7?yf5UC4pIoOI9@AMGfMV;SNbh!@OZ^hd(4mW$iSOxX
z16-;vx$eXgaq1)dh2GH2god~{Sm|&od=4Hksz~XeRg2>4ZJ$+HzgQ@7Wpx#g*uQs|
z9RFk(gT-laS?y-fXHnd-fL3cF#=fAxO2Ed~r(rM2t(MhjFGg*`Gg_@BpD{P?#NGal
z$L;%xT)S-k3&*;_R1~)7m$a{E5zCIJVnF8x0lS&V*OUS&>N=e*8am75uG7Mt)Y&|$
zrkiuy786~Jf_x{j#y(_64pWlbT)i7gAJJs~Kc+w2v*peGyKE@AyX=O%e8+}lYL|K0
z_LM{ohK}eaoYBOzZ1|^*OH>X;d+O_v%P9wCX$0GLk#)C=En!OKt;|MR`AadrVFHiM
z9N3uU<$|ne=aR+rf21V{yGCGvxH9=yO=%H$3eXosB`%ikY6Ufm(;6ns!fxU?#wm0h
z22VLn>q%`XIR#daGL}bXH?w4LTC7@&zsX#@2Yty=V?T^tK&&IpkiHHZw%Silj{Ufo
zI@Hc!MTS&oTR(C}IcPg*f?UdFCl2J6JH^r6A~IB$MwOyMnr8w~k><vVRcQnvms-?R
zW&>uAx*F-71J=$gP=hlPt&h&l!}!$2UziKEwRp+!P8&_iNL@5ibh=n7#y*JKln{$m
zy)S5;{n4;^LS?6C687x%bt;P7<fLl`H@cpsvEM*LZ>Bp$Mp*N`cHoQ2SpzVTPq#m#
z%zSpwl16^t&)6rp$TH7cxYno=PJgb&EJkFAM0eXFY!$92#rL?M2whX~GS?~sx4E7^
z7^u$<Xy!eO=qPDK(t3<|r5(<YYOeD~38h|Z;MzS_iV+Adh|oPw?c3Z~oG&q9^<5LO
zJtuJ2OM9BO1V&22R97m6RRNt_r0f-Dzbfj@9IO18i2FcC$fVtFm6+dXXM#$7Sjv0&
zy-<15JnGkv5vMp?CKb|DI<&wPGuQ4DAKONzg&sobg3EE|B%5RaRLc$)6xR+VRGw-B
z(-x=b>=Bw})-@qv(TIZ>Bl;{5%@7MiF{FLhtX7BJnyXlh*E>S%L<ERhm34KxvvNdp
z;UMpW9Ke2WRlk@}d&Wjis@yxWgo-yyhdsAGKOfc~Vy!K(U65h_l{dPqR9*A3)oH$3
zM(k<NM2s=<cNiccK#VbEECS!$c4uEYN}U5UOpj5Mx=<0<r9@BMuJL}pd1c_x8Ob+u
zPv^Ee6VU<)Yg6LWGziq9$79>GDY>b<9za9%EN@3!agWur9d>u=BFWQ;YZYN++hcPn
zBH<cQ5A(xn!F6fyQvm5Ax2a3x<9~OSwjVy+M>=cNGg6@#@oae4NnxRlTx)bq{#-os
z9QyOZ{=~V1#B(@@h7YuayKL)D$(FFsBfV|v$Pu<i;c1yMiwca+_>Gvs@ksiysC?<W
z(01N?p05BesSB1pS(g^dd%TA_zvYDI!P?TEm4s*YL2udJlElh>*Zk>(8mS)%eLvL+
zRcs`WZRLu+oa;=O_aN16+15oAL2#JAA$$X4G$QgB?8BB-@6LC*Sk^D=2b|@Y47BhJ
zwE$7rS=;I69(O=&&!4*Zb-cF8ScaMo0mBL5>Ks36*vJyC3YX5#=;JJ|GWTMOHFyD;
zUcE6CQTO5K0s}}D*b6wVka;tE_+k8{@isr@)zO}z`6y}XxbYC~u{}SLA+TW-6m|(%
zgdFsX5)2Rs#Av~((oepqSuXcogmMsN)hb+ZJf@Pw(})8VXjj_~e&%$gafHy^M-d!r
z-(Kir?uYR+Do%qFG@$!lu~Cv|UI}*jiJ}d4=qOTdt}|@}QRKa}v*J<<PL}u|?`^rQ
z5d_rV^50Q1eSISLOd8qpzpH^r87lRp=?Y?L6?MDKat>uI$6R9R7NI5Dyi^!@hmBav
zXDE}YuMq(3B&7Aq{-Dsb)38?4y|&C3iDkOOH{YMuJ8)+my4z$FjV`mHj}V}JV7_LJ
zG*pAm<2&vZ?M`g`$EXK(6u-{UA~~hQy#VHU{MExfHkLwVvAmEq?bV^9{j1@cW!SDM
zyvjDI$Q*ag?{mSK2h8&$<(`Sy`=%ifkEYtf-U<k)plqFC-0Ok;@io=<>nRG><49jJ
z=$wcVOMb_I|KPPIlr(1n(p}_kwwMxgm(p|24gb@b3wotH(gc+NAJe0HWL`yee861y
z@48ogbE49`!gOKM%<lfww({Ifdy1vBnDQDv0r@2ruie9eZoV1QQW}B;?AXRnWMvRo
zOUX1qHoTO8T!(qSoSjr(hsYdAERVVUZS1s>9|X~Nw+={Uu1IVJBJ01^HyE;8e}Zs%
zVYO8Z*?gy_`tW+U;{%COqZNW@xsI&0IWAt%6Z2v}$B8ZKUdL%s-!^F0w2v{lUXPG>
z?QPoLu3n4~t=n;?c>2+j;HG{4-4G=IaqC(am_vmBlFfU(`=ZC}qdqAYh+rh}iz*bf
zM(fMI?5Dro&E1r_eIOrjLYdJq68-b1VzI4<N=G4?SoP{}!!_xum^=Q{(ku4rfiv5)
zuleq0$2yTU8pVC1KNI^l&X}v564$bmxH!ZzpSa*yO6H=%O*AZ@z7(V8$K&h3&CPdT
z0R!Y_I$jduL3MD4kXPH#^BXRyMGga~ehayq<3a`r=Z{r3^yyU&&VG5KcpI6IojH!S
z+uJd#m||BNG2a(Cq5sScd#@dI22c5^K*(+nu*ywbZz*)+en7eCT?f=0P&^ZtrF5zT
zT)7W4)CdDPBfgtjiv(nq&0sOlk;ot_0UN|x!=DXz*2b<4Uat=(i)enhVo!`0;atMI
ztV-m!sPl(r8}A{686g|X{DS|vN?UFQuc}KMuKfKpi0g=8kiAF5TYLf$W^>@i$IyM6
zD*_j8e<r`C)(VvkrO*hvVFly#EETdXZLCKm+X<B_f%S;&Ix?8MY=h_q#pDA5Bao^`
zFDsw&h)#<m!rMI{ygmYBAW8$tMx@)Dsoq<Wa!%VU(~&L5ZqCPFS|#fJ(~EVxx1v!G
z2}WXj$dB*@t{|1L-Q>%J&`-Ak<{r~RF`+y+_i_|tdHgdAAB5ybs~7EL7^J=3Z{bI&
zzjoG|pr%B%x}d7t@RtdqA|n?*5d#r}1C!g-V7SWmGqDWy9h9qGw9k#{i`4y8Junwf
zmq~Anr34u2zwEc`;d0-tK`ba?kEn6A34NZ8yixhoPEaq-07b-5PT0Rgo1#d_mzOJy
znU}?q6<P~XW%V5^JNVb*8sf**T5RlmBKubKRqYRa>7IPo5FXn!dJ*6H9A1Dp*xT5}
zeo*ILL<HPn3K{QYEed20@^zzT$o7}WN=<7TN$L4&74L{?yN*)moa)v>()lA=`Frn6
z>kPYN1H2*AMk^kYJ45OAJzF(iKcDW`w2BD!#`5scE2caLQx_Wqtc5>6c7FVIg$Xz~
zgOqDpWVf;4?)WiKFz2=6=Z6V23}$q$Bsn+UQ>pOq<@)aG3Tkla41tp_RfY@a5+2*=
zgIIjAO0c|gpY;2hoVP{7KW<~HUviSrAoc)j>)6~GD|tm-;THIUx7puv^lL~Z)KOI+
zSH0@P5r5Ak=%xmWLAI@s)}Z1_@V(*yHR_Sa^`<C=!-VihhO!W+dG!!r%tvQF@wIKz
z9UFdmrd85@*$Iy7bG25M5Q>QuhIz@;&Rkx@#F}B>bPDY~U6soknfZk>9-KjIo+Xc*
z_{V3TdFE6^opJ)^p2`#Q)E_h<WqAF^P(vG)I1?j}H=IXl5dN%b4^0uK1g5naEE|LA
z_Lj&g-F&z;ZR1c>w7hIU?}&#(lBLvb_~Xv>FqOeWW`;GnC}aM<CiQgFp>b1LDdR(h
zn589LqXQuR)GS+>6c3%GJyk%s%qrovT`_-Q*^3kO*a~fUZT6M6qL%)Q1cn|@h&sc(
zwI9KtO}h!S?NK}1N!NTc*GZ(YG_bSKLOT3`faSf+xK31EVge@c8zY68Kqz~CJ%^->
z12Y$mc||4#iH;_*%4rwTuV6^77~H`O49?HqMXTbwE%5?4$QZfq(3Zb2%BPF_yFc^m
z-jP^^9y;~lkH0_Z<6bN}!e$})5pEJ(uWfy(IbvkXr8$wbVl6Hhs@Nnst#@eZL!Fv>
zP2Xjm8as;Aw`A4;Tn*3DQg2;;rk}L^^)*&Q<dnF1I)7iC#&@!mMjX1UDs&Z4<fpx7
zzft@t{Ca6Zt`CV&v2?3Mj=t8*Rl8dx)qyA46G7GFqwIoNq=Z)Cv$nBkoz#VC2Ee@c
zcg*pv?3d9jxjfI-pOAC=WPXZnet8KG*%({iJnxx?alMomfZG(ugD7S~2C2H&QT*{l
zBeGuV1|)VRTjz|GRQ>3cPMDCIC3cKc0q~neezB#SahJP1Uk<aVdwvy<?U%V;1x?gN
zwj*Cn#rtrh?(Z&#y${G7ZyMV%7B%HEei489Y@0<hW1uRXLyI(NFu2LK@4C;^8AMbM
zAM_I=;M044Eg<RrmU?epTB?9-mwHB7Ax~^k(V<ZB?Tchkx$A;r>%lO0X6m(SYDslK
zto)tOw;d?~r%Ct~obmICjrkO&UPG_RuqflRVLLgcOgp&~f7cHrEm46RZB;V<XC7r4
zmbc&Q7IBu5!1;e9QW%=xuhep=4t6<u`={Uug{Y=qf`G!mcqg|G?HHP@`fJXuD!*{5
z+qD?<eVcA3K9rt5Ed6OXg5-PW`lQh_pd<50!7xp8=uYYed$fAv=;W6FstLUenY;bj
z4n?4-Qc!1E&)u!5bW(RO#}((fBC1pN#GkYNDXB}!3A$qykx2&YbImRMI7wqepR)Ky
z;>snU;|~y;em|pH#EnR1_9mvJZBq7ow==Z6efcdw^lRHFY@Xapu5J#ac}-PX3vDQb
zqgrf$!O0Q@l%p~124(TLzR7#8n+eBdrOt517s52xOT3pzLZ7^pJIjSXhFStd#RdMb
zK6Y03${XsOjfYMFq3_QLpB`24SGx9cOb(mUCLDm$cq{Q=3VvImuQ(d}smt$SKwmjN
z-0v;cr4~iS{H#4pWbwb7jkzpD`BMO$^eCk5vYX*L$a#D*{%7B(UT()M^JVjxPBNzp
zDw~<W7q%|V>5Sm>;xBS6jIem4O;9ai%j)Nu%NLa|-UOC^O!IEO9W@y{&=%OmS7|{F
zMSG*^Mmfj0>h-Yn)Wz>oB-iEbLb}|!cK)c?WsOU7^~V~b;|_@0O<9{d^uipf;4#>p
z=xGAfko~>|2+6m{K9CvwJbV>;Yj4!`a!5}GFLe%~fi_whfy+RAaH>Ly)#2Gsb?QTL
z>y+wq+^Oa~VdT?ZWzoBo@_<zuXK5!L#E-V5iV2p<GsBU(GO`8Jp(Q0SnW_G4(SgP6
z2$VvpTo2ci_>P@dnyB4;Y<RK@tt?Dn%OlS{-=Uvn+pN&*^N<kK1M`Mr{>Lz6wm{Sv
ztUcvaXPUsTz>eDfBGNvE{DJi{%DRv-X}z9$FMhIJZQMNBd`yXVtJiwyd0^G5DXQyt
z-Kay+tljBbbxah~acO3LJb?~4&VJ&ZhH<-?*8%EQos<dz9FaBK^;!Y?5Po8Vr_P;;
z!YJJt{aIeJM}D&W-3)||BM)&Q=N8N0G_x*d-V4ocz@p)tvgnf}Uah9v*{wz$!o+FT
z3heju)jF9Wpjbo6b#rNss9?tL!^zf|aM7tc)YiejDEzOS=gX}^5nP>>IS^Ib3vyiO
z<6_Ww)SDZlES4@bN@gA^EmZe=26G^SKO~eeWXkIFz{yx^+Q|~MM9quuxE3{iu#~BR
zKkCA726Fbq#h!#Y#7iHIFVJMya>xo8&PqH@N=3+}!^nG0U0IYzA99=`T+564jAm=f
zTB^xn+d4K3>}OMkh=Sx1Nc?L;?szW&rp?yZSt=e6Zcr%+>$K}JeK(V5%U+aHd?rjs
zDG=+FekY?Av3GaGVdQS?v$cBF%Ff)vz?+K;U}R$qw7IFQrTE}Zvo_tsot>c)da|tg
z+`?dNZ*dt?VK9iujaB11!Cdnz{6&RFn~m&|4X;yic^YD-R8^&B+_6Te&MZ&ja{kpj
zIybkm_Q2O>`mZTE0_Ve=wl_0b3o!E)ZF3H#iNu8XT&cEH9rf-oe8#CVE1i8U++AH}
zK&;Y6imJVPOUc^$5WTH%`FBL{&A5Q4w)dar3s-&MnlL$@kHXrLs?`;Ln=LOkwn;;*
z{t)dE;V()pU!lBd&?}O?xW_tKga`5p-(T$i0ftnxiZxl(lv*!9=g%$nS86vMG?}(r
zUByv8{O+}e3BTq<(5E_X)zRJxEi{6724)F5UD0(qqEK^(K%rk~|KWAeKB*_x>XE!s
z#?{2^4E8kl)9ksw@`n-njzVE}alpma%%Oqt0xy(${gJa@;==qzt!L`W6#=fxnLGQq
zY>zD#JF#QYOE<C$_PgpKQ+)#F_*QZd=1Y*~6s2mgr?_CzR@wt*xI|454OoU90{Hlw
zL&N+<qKAs5bgSioK+=0X#;6oyUS*=9Nb`UrK0K#dF=HcF#&MAOTu!9p`w`N!_#oqO
z>z6HF4b0B)Qj8bEiitf=7Alf#O!q{GT;=S(cF(3dHN4C(7o)OVmo8c^PvZ%?a5+^3
zEZO3_%$||tpMr8ur*fNN#V)2|?1As`-`i?X#B$F)J2m5WdQ(jYFTu>|s7111OgAeA
zFb_XX6sC@4Dr*t>#Rl8`s-O^b#A_~(KJtX_Cx*8}$t*_hq&`~0cB7^qSKD3M^;V$Y
z_9|dDpjCE~B|^E<w4nlil1#uNKtTxB3%w$#UOsw#B3=yVto&z(g#1wu7(+7J_nG}O
zv)M&wQU?r;Cw@VjF8ro&h)J@^8SI`ri$Yzf$qsDNZ(AjDxx>X;`Cj$x;)J9tO}o6d
zSdEj$_mZ#<q+MaY<j9g8g}DY2QgJ5FPW1PJr22K$!+0Jc&K~=d-!v{dJ#!{QSb7g3
zsr@|I_6T08Hbu%nLKB{>z&&4<$Y<tg{n|Qwrk#M!5M%>N=^}pTY{+G)ZQ~e{u+o`m
z$t#xEp>&EJ?l@G(q=%1Q$sUBgLpe1hB9L)AI9pQjXyUyHqllXqlf{ZV(lXfqza&w=
zAdL_OU_03zmD^;fYm97nXikGG8VMx<3vGWZ>YvZmwjW~PX9ZSvf!r6FC--ack<JGe
z2!FQuz}X*Gk0@L26(k4sUc<?P1j3iaM1Q8oUiiR8`aN}LExB{%ZJc+u7rIwmEsf@U
zJ9ON6wG~`{&KW%t1MrX^iKk+wSymC4P4|)eXS;i3V<@;-W^z#SV?kTi!Nsda)z3-*
zSjl=-^Ty|jwGwa-fg^Krq7g?!*U;8Ti)i$XlMm2&CH*32XnsL_q$2ihuUW&{m}jg{
zaH3kb)^gm4y*ZMAA>K8p?vM84_c+_++0PJ5Ud(6Y#)=y-chda(`zP|<Fi`%`tE!76
z>rEf5^G52}2s@*!%-q5C&{q+F$SYO&wbVhSE}Z<Vq^9czsFgm6)|mAHA-K?-Enxlb
z@#1D%wetR{9g{Eb&iXepg@K2`3ua+RXq=T8ZwJ?>L!HuJz`jZFs;2B^H23@(6XG3~
z&z~g2nw7?n#)0x*l)HtgumMzTj7B+Pj6yWcl~!G-`@hof)A8KWp$ZG7Ih#L~RZ|oa
z=HrV8D#l8z1E~pb>%YRIN+g=!>TM=`XO(?c(SL`zDFP!tB*F}_F2>#oec`ZWE|ILi
zkzwV}&Qg2fIEtVnmrYwbo0P{u`rzTgHz(y%j4*VFp+g|kza0HgY5Dwq>P`u0@9}gC
zs;VGrXRQs>i&&*mZqd65?}z?<=yT-2BG5<jNWbnK$KUe(SN1d0!^Qaywf_>$7iiya
z8ggRYV`6bdq+%3suGjw)%LmHo#OwqcD~ZA07WAO)R<eJDjDWGKx{6>|q1WaXhI7&q
zJq!_Q>;i_-DC|z93TPG*>;7WcU`H`N?JzsftaS!7AmS8d_d|Z9Ou{GsJFtEGjIjhm
z+AkxA=Q-!nZ<B}Z+aJF_kVa^9G-gUl%5o$@q9{+yd4>C7QCZUT#R;Et2N~!oopl2)
zzqZnSyWguX-T`(;!6Bmij@vnFihQXbyG!5r8B(Sha>_t=REF4RVlcLiXwe>!7Su38
zFIM9dR~xg>T0$<<i*BGT!fv>vhN|0in!Kio2F{ymW9NE^xynhCRJFum;lL_6?1~fP
z%@>rsN7rn66xMe_xoG=k+K_c<|5m+Y#z;e7#hzWjSQn_qXzk>vil@Y!&Xk?@iBJLc
zQ?@{$TV}QZcIS7U%=uHgxEUL#F;(Vdq4=aYQ04oPS6M}u@U{XIn;CqVvhsBoo0ql(
z0-TQTCqZVj%pt}wP^C7SfbetK5xl3wc_)GfL`sE<>MTmGbnV;pp~a1b)+zCb&+M8l
zZCMR=OfA5^JFhtHXP!T-^uwa6w1hTZ&`JDwz0%&*GpqtL?B1W<5OjJ?+xgcOIFheF
z^{LWW-TfK#4l_6PO<VjLo;Dd5b`e3h0n?>hni57QS+~LSM4aL#X>Ft*jQD4yyP{X$
zmc7egZZ>OVI=C=!gmKpMvjQ42se-Q!PgNR?ibOKdL->mqe2G`g@B&GpA=>j<QOz{%
zCJ8l}1P@u`+&lhilOKmfeN71!xGvz#1tbBVH%!T!>rY6MgrW^m`9x80{fWX<skV>M
zX3<`P?#lF?)7gV;%G8ST9)`+92|p6dr>)En(GXr&oVq3b*-5%hrr(Au<xAQ%c9~89
z3{bMDV(NHFpjm5z$bU&5#csKK(j6pF@{n~a5#j$FS!cKK!*#P18&sjD!@t=|3WEAt
zhhp|(nl||OA$GaBhleQTACvt5wa7<{aM*zm`gPvneQYrAcY}lmLGWdO)(3PUKQ-_S
zK0_kUG(dw@QsCgd$mmQ#!o!L%k1MG@LZIYfO~_2p*)R)aH;8bA8}b;e`i>297(oGC
z`sk!xf;~Xy!6GUQVAJNm8vqiN$b<>19-+ezGP5WG|1b~!ko^mQ_cUPtGJbFfAoNje
zz^EgyD+>4-6b2W_{s!cQ`~M&b$afSKkZ_GQiSm!)7ytr-<PDgG@E7bHC4~N=z_bq9
z7{z*bjQ#h!aU4Pr%@`^mAc7gq0PK6ej|BD$d~@(J&VLTZB?d)-LFh7{bv^LuD1%Su
z?X^V^fzZbBK{I3IfYVAF&=*AT`Qku8(7q{+i4+X+Lm!@Lxq_6(vEC6dfJ?^$0mlge
z29d$wKvoC{uvjMq>6?S#7{L%ZXnh<Nke-UEjR2O|ucQI@N^hVj4lo1&DRIGq=q6AB
z|4l9l?z)KHfHP8mFUW2J0Qlc*fd6u4vVS3>$@iea32MNb>~jB7;5`TV{|}M@-lW=j
z17)iHg}O8eKnatmfPd3k{O>*V(f$jL>fwP-!Qh*u0&hyx(EAJ0PYJy<H3!*GDZcA9
z2X#-80R9o><p<Y~D)_ot-W+mm4kEF`1=U#Nff%Pz0smE81=kbb8_>@R3<~^({t--+
z1pEBTf=hf`8i_q9KL7yQoTdW&BL;{IhAhDlxLW?t*5dFN5}Y9dywSw_KL`W_w$opT
zX9)m!Bc${OBJ==5WMEw-Y``0dqBjttCm5mzs})fI-l(g*f%1I75C<p?d<*`oS^;kK
z{BNLS|G$5SI!6ci*8G3M+224*fqx;NIS#;^aO5|TcgSDpVvZj0H%1G5kM6<G+1tNs
zi2e&{|DXfB350o5Qe7M<|A!*rzi|fOQn=m#C5d2w21J*N3d);91^m}v8?4LmPpZp*
zw~l0x)4UAejW6)Ozk>H#Q~#FqAJ<@55YhrF;Em(u8#pK9|HG7kH|}q5Adl?7S4dER
z2HO0A3V7oM^#+{C{R>hoG6MeBL*!o$sSpg2g2=|O0RJv9{Kt*tU+B02boreWw7-Z2
zcr%armjLhebbukozYp6#<A5Ky86$!37w;Qrs2k+GB=?_jp=Sx}UDkKd@{;*GhhC8I
jG7I3JVFBDDL4bW(Ai(|I|JlCvf?}6xVR8EY`R@M#6n-b6

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d1f4cb442..2b3219323 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 21 16:11:33 EST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

From 7e401a83cfd93dda60acf4459998c8375d73a432 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Thu, 4 Apr 2019 18:26:10 +0200
Subject: [PATCH 101/210] Make PlotLoc's immutable

---
 .../bukkit/util/BukkitChunkManager.java       |  2 +-
 .../plotsquared/plot/object/Plot.java         | 10 +++---
 .../plotsquared/plot/object/PlotLoc.java      | 36 ++++++++-----------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 76c9381fb..02c24362a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -223,7 +223,7 @@ public class BukkitChunkManager extends ChunkManager {
                 for (int y = 0; y < blocks.length; y++) {
                     if (blocks[y] != null) {
                         BaseBlock block = blocks[y];
-                        queue.setBlock(loc.x, y, loc.z, block);
+                        queue.setBlock(loc.getX(), y, loc.getZ(), block);
                     }
                 }
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 63db95632..f4c278cdb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1282,7 +1282,7 @@ public class Plot {
         if (loc != null) {
             int x;
             int z;
-            if (loc.x == Integer.MAX_VALUE && loc.z == Integer.MAX_VALUE) {
+            if (loc.getX() == Integer.MAX_VALUE && loc.getZ() == Integer.MAX_VALUE) {
                 // center
                 RegionWrapper largest = plot.getLargestRegion();
                 x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX;
@@ -1290,12 +1290,12 @@ public class Plot {
             } else {
                 // specific
                 Location bot = plot.getBottomAbs();
-                x = bot.getX() + loc.x;
-                z = bot.getZ() + loc.z;
+                x = bot.getX() + loc.getX();
+                z = bot.getZ() + loc.getZ();
             }
-            int y = loc.y < 1 ?
+            int y = loc.getY() < 1 ?
                 (isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) + 1 : 63) :
-                loc.y;
+                loc.getY();
             return new Location(plot.getWorldName(), x, y, z);
         }
         // Side
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
index e1254a8db..fc12eebbf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
@@ -1,27 +1,22 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.Nullable;
 
-public class PlotLoc {
+@Getter @RequiredArgsConstructor public class PlotLoc {
 
-    public int x;
-    public int y;
-    public int z;
+    private final int x;
+    private final int y;
+    private final int z;
 
     public PlotLoc(int x, int z) {
-        this.x = x;
-        this.y = -1;
-        this.z = z;
+        this(x, -1, z);
     }
 
-    public PlotLoc(int x, int y, int z) {
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-
-    public static PlotLoc fromString(String input) {
-        if ("side".equalsIgnoreCase(input)) {
+    @Nullable public static PlotLoc fromString(final String input) {
+        if (input == null || "side".equalsIgnoreCase(input)) {
             return null;
         } else if (StringMan.isEqualIgnoreCaseToAny(input, "center", "middle")) {
             return new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
@@ -44,7 +39,7 @@ public class PlotLoc {
     }
 
     @Override public int hashCode() {
-        int prime = 31;
+        final int prime = 31;
         int result = 1;
         result = (prime * result) + this.x;
         result = (prime * result) + this.y;
@@ -59,17 +54,14 @@ public class PlotLoc {
         return String.format("%d,%d,%d", x, y, z);
     }
 
-    @Override public boolean equals(Object obj) {
+    @Override public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        PlotLoc other = (PlotLoc) obj;
+        final PlotLoc other = (PlotLoc) obj;
         return (this.x == other.x) && (this.y == other.y) && (this.z == other.z);
     }
 }

From 3f194f90cee0599ba5335961230d32d42494d511 Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Thu, 4 Apr 2019 18:31:47 +0200
Subject: [PATCH 102/210] Unbreakify things

---
 .../plotsquared/plot/object/PlotLoc.java      | 51 ++++++++++++++++---
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
index fc12eebbf..59f7088e8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
@@ -1,17 +1,42 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
 import org.jetbrains.annotations.Nullable;
 
-@Getter @RequiredArgsConstructor public class PlotLoc {
+/**
+ * (x,y,z) or (x,z) representation for PlotSquared (hence the "Plot" prefix)
+ */
+@AllArgsConstructor public final class PlotLoc {
 
-    private final int x;
-    private final int y;
-    private final int z;
+    /**
+     * Use the getter
+     *
+     * @see #getX()
+     * @deprecated
+     */
+    @Deprecated public int x;
+    /**
+     * Use the getter
+     *
+     * @see #getY()
+     * @deprecated
+     */
+    @Deprecated public int y;
+    /**
+     * Use the getter
+     *
+     * @see #getZ()
+     * @deprecated
+     */
+    @Deprecated public int z;
 
-    public PlotLoc(int x, int z) {
+    /**
+     * Initialize a new {@link PlotLoc} and set the Y value to {@code -1}
+     * @param x X value
+     * @param z Y value
+     */
+    public PlotLoc(final int x, final int z) {
         this(x, -1, z);
     }
 
@@ -38,6 +63,18 @@ import org.jetbrains.annotations.Nullable;
         }
     }
 
+    public int getX() {
+        return this.x;
+    }
+
+    public int getY() {
+        return this.y;
+    }
+
+    public int getZ() {
+        return this.z;
+    }
+
     @Override public int hashCode() {
         final int prime = 31;
         int result = 1;

From 69a029a555d043753233e3374b33ab3dabb1bd51 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 01:54:02 +1100
Subject: [PATCH 103/210] Fix plot schematic y

---
 .../bukkit/util/BukkitHybridUtils.java        |  2 +-
 .../plotsquared/plot/generator/HybridGen.java |  2 +-
 .../plot/generator/HybridPlotManager.java     |  7 ++++-
 .../plot/generator/HybridPlotWorld.java       | 31 ++++++++++++++-----
 .../plot/generator/HybridUtils.java           |  2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index 068bbd89b..dace8ab26 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -112,7 +112,7 @@ public class BukkitHybridUtils extends HybridUtils {
                 }
                 int minY;
                 if (Settings.Schematics.PASTE_ON_TOP) {
-                    minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+                    minY = hpw.SCHEM_Y;
                 } else {
                     minY = 1;
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index 8c6f2c765..66a32db4c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -17,7 +17,7 @@ public class HybridGen extends IndependentPlotGenerator {
         short relativeZ, int x, int z, boolean isRoad) {
         int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
         if (isRoad || Settings.Schematics.PASTE_ON_TOP) {
-            minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
+            minY = world.SCHEM_Y;
         } else {
             minY = 1;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 52dc99f82..631b4ad45 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -78,7 +78,12 @@ public class HybridPlotManager extends ClassicPlotManager {
     private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
         Location pos2, boolean clear) {
         int size = hpw.SIZE;
-        int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT);
+        int minY;
+        if (Settings.Schematics.PASTE_ON_TOP) {
+            minY = hpw.SCHEM_Y;
+        } else {
+            minY = 1;
+        }
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
             short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
             if (absX < 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 8ee998111..621fff1bc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -30,10 +30,12 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     private static AffineTransform transform = new AffineTransform().rotateY(90);
     public boolean ROAD_SCHEMATIC_ENABLED;
     public boolean PLOT_SCHEMATIC = false;
+    public int PLOT_SCHEMATIC_HEIGHT = -1;
     public short PATH_WIDTH_LOWER;
     public short PATH_WIDTH_UPPER;
     public HashMap<Integer, BaseBlock[]> G_SCH;
     private Location SIGN_LOCATION;
+    public int SCHEM_Y;
 
     public HybridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
         PlotId min, PlotId max) {
@@ -143,7 +145,23 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         Schematic schematic3 = SchematicHandler.manager.getSchematic(schematic3File);
         int shift = this.ROAD_WIDTH / 2;
         int oddshift = (this.ROAD_WIDTH & 1) == 0 ? 0 : 1;
-        int minY = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
+
+        SCHEM_Y = Math.min(PLOT_HEIGHT, ROAD_HEIGHT);
+        int plotY = PLOT_HEIGHT - SCHEM_Y;
+        int roadY = ROAD_HEIGHT - SCHEM_Y;
+
+        if (schematic3.getClipboard().getDimensions().getY() == 256) {
+            SCHEM_Y = 0;
+            plotY = 0;
+            roadY = ROAD_HEIGHT;
+        }
+
+        if (schematic1.getClipboard().getDimensions().getY() == 256) {
+            SCHEM_Y = 0;
+            plotY = Math.min(plotY, PLOT_HEIGHT);
+            roadY = 0;
+        }
+
         if (schematic3 != null) {
             this.PLOT_SCHEMATIC = true;
             BlockArrayClipboard blockArrayClipboard3 = schematic3.getClipboard();
@@ -168,8 +186,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 centerShiftX = (PLOT_WIDTH - w3) / 2;
             }
 
-            int startY = minY - PLOT_HEIGHT;
-
             BlockVector3 min = blockArrayClipboard3.getMinimumPoint();
             for (short x = 0; x < w3; x++) {
                 for (short z = 0; z < l3; z++) {
@@ -177,7 +193,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                         BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                         if (!id.getBlockType().getMaterial().isAir()) {
                             addOverlayBlock((short) (x + shift + oddshift + centerShiftX),
-                                (short) (y + startY), (short) (z + shift + oddshift + centerShiftZ),
+                                (short) (y + plotY), (short) (z + shift + oddshift + centerShiftZ),
                                 id, false, h3);
                         }
                     }
@@ -234,16 +250,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         short w2 = (short) d2.getX();
         short l2 = (short) d2.getZ();
         short h2 = (short) d2.getY();
-        int startY = minY - ROAD_HEIGHT;
         BlockVector3 min = blockArrayClipboard2.getMinimumPoint();
         for (short x = 0; x < w2; x++) {
             for (short z = 0; z < l2; z++) {
                 for (short y = 0; y < h2; y++) {
                     BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
-                        addOverlayBlock((short) (x - shift), (short) (y + startY),
+                        addOverlayBlock((short) (x - shift), (short) (y + roadY),
                             (short) (z + shift + oddshift), id, false, h1);
-                        addOverlayBlock((short) (z + shift + oddshift), (short) (y + startY),
+                        addOverlayBlock((short) (z + shift + oddshift), (short) (y + roadY),
                             (short) (shift - x + (oddshift - 1)), id, true, h1);
                     }
                 }
@@ -255,7 +270,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 for (short y = 0; y < h2; y++) {
                     BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
-                        addOverlayBlock((short) (x - shift), (short) (y + startY),
+                        addOverlayBlock((short) (x - shift), (short) (y + roadY),
                             (short) (z - shift), id, false, h2);
                     }
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 7214f409c..207ef87d5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -343,7 +343,7 @@ public abstract class HybridUtils {
                         }
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                            int minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT);
+                            int minY = plotWorld.SCHEM_Y;
                             int maxY = Math.max(extend, blocks.length);
                             if (blocks != null) {
                                 for (int y = 0; y < maxY; y++) {

From c71fe00741df87a13e95d35c9f3eb6eb2c41806f Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 02:07:14 +1100
Subject: [PATCH 104/210] Missed this as well

---
 .../plotsquared/plot/generator/HybridUtils.java                 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 207ef87d5..2db5ec0b1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -2,6 +2,7 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.WEExtent;
@@ -344,6 +345,7 @@ public abstract class HybridUtils {
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
                             int minY = plotWorld.SCHEM_Y;
+                            if (Settings.Schematics.PASTE_ON_TOP) minY = 1;
                             int maxY = Math.max(extend, blocks.length);
                             if (blocks != null) {
                                 for (int y = 0; y < maxY; y++) {

From 3e3951a3e759b420f229bc323a3d3788f9265248 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 02:07:39 +1100
Subject: [PATCH 105/210] *negate

---
 .../plotsquared/plot/generator/HybridUtils.java                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index 2db5ec0b1..a3d9bc186 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -345,7 +345,7 @@ public abstract class HybridUtils {
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
                             int minY = plotWorld.SCHEM_Y;
-                            if (Settings.Schematics.PASTE_ON_TOP) minY = 1;
+                            if (!Settings.Schematics.PASTE_ON_TOP) minY = 1;
                             int maxY = Math.max(extend, blocks.length);
                             if (blocks != null) {
                                 for (int y = 0; y < maxY; y++) {

From 0c00eb2061c60c88366cf811f04b5f9a8f44c67b Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 5 Apr 2019 17:39:16 +0100
Subject: [PATCH 106/210] Add clean task back properly

---
 build.gradle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a6c24bba3..ab2786e5d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,11 @@ subprojects {
     apply plugin: 'idea'
     apply plugin: 'com.github.johnrengelman.shadow'
 
-    group = 'com.github.intellectualsites,plotsquared'
+    group = 'com.github.intellectualsites.plotsquared'
+
+    clean.doFirst {
+        delete "../target"
+    }
 
     dependencies {
         compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '7.0.0-SNAPSHOT') {
@@ -68,6 +72,7 @@ subprojects {
         testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
         testImplementation "junit:junit:4.12"
     }
+    
     repositories {
         mavenCentral()
         maven { url "http://maven.sk89q.com/repo/" }

From 676ef0159afecddf9060c7550b2f748801b7bef5 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 03:54:27 +1100
Subject: [PATCH 107/210] only change plotY if height not 256

---
 .../plotsquared/plot/generator/HybridPlotWorld.java           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 621fff1bc..784b7d831 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -158,7 +158,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         if (schematic1.getClipboard().getDimensions().getY() == 256) {
             SCHEM_Y = 0;
-            plotY = Math.min(plotY, PLOT_HEIGHT);
+            if (schematic3.getClipboard().getDimensions().getY() != 256) {
+                plotY = PLOT_HEIGHT;
+            }
             roadY = 0;
         }
 

From 5d515b38632a5ff40f78fa53a70806b85dee1a72 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 12:55:45 +1100
Subject: [PATCH 108/210] This shouldn't have been made private

---
 .../plotsquared/plot/object/worlds/SinglePlotArea.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index 101941391..6a8782d1a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -98,7 +98,7 @@ public class SinglePlotArea extends GridPlotWorld {
         return super.addPlotIfAbsent(plot);
     }
 
-    private Plot adapt(Plot p) {
+    protected Plot adapt(Plot p) {
         if (p instanceof SinglePlot) {
             return p;
         }

From b32b8a98e2adc6d3a3638e2a7c5e2b26264613ed Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 17:19:48 +1100
Subject: [PATCH 109/210] Fixes #1936

---
 .../bukkit/listeners/EntitySpawnListener.java | 62 ++++++++++++++-----
 .../bukkit/listeners/PlayerEvents.java        |  2 +-
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 53066f0de..d2b1270eb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -7,6 +7,7 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
@@ -19,9 +20,12 @@ import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.entity.EntityTeleportEvent;
 import org.bukkit.event.vehicle.*;
+import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -29,12 +33,37 @@ public class EntitySpawnListener implements Listener {
 
     private static boolean ignoreTP = false;
 
+    private final static String KEY = "P2";
+
+    public static void testNether(Entity entity) {
+        @NotNull World world = entity.getWorld();
+        if (world.getEnvironment() != World.Environment.NETHER) {
+            return;
+        }
+        test(entity);
+    }
+
+    private static boolean hasPlotArea = false;
+    private static String areaName = null;
+
+    public static void testCreate(Entity entity) {
+        @NotNull World world = entity.getWorld();
+        if (areaName == world.getName()) {
+            if (!hasPlotArea) return;
+        } else {
+            areaName = world.getName();
+            hasPlotArea = PlotSquared.get().hasPlotArea(areaName);
+            if (!hasPlotArea) return;
+        }
+        test(entity);
+    }
+
     public static void test(Entity entity) {
-        List<MetadataValue> meta = entity.getMetadata("plotworld");
-        World world = entity.getLocation().getWorld();
+        @NotNull World world = entity.getWorld();
+        List<MetadataValue> meta = entity.getMetadata(KEY);
         if (meta == null || meta.isEmpty()) {
             if (PlotSquared.get().hasPlotArea(world.getName())) {
-                entity.setMetadata("plotworld",
+                entity.setMetadata(KEY,
                     new FixedMetadataValue((Plugin) PlotSquared.get().IMP, entity.getLocation()));
             }
         } else {
@@ -103,41 +132,40 @@ public class EntitySpawnListener implements Listener {
         }
     }
 
+    @EventHandler public void onChunkLoad(ChunkLoadEvent event) {
+        @NotNull Chunk chunk = event.getChunk();
+        for (Entity entity : chunk.getEntities()) {
+            testCreate(entity);
+        }
+    }
+
     @EventHandler public void onVehicle(VehicleUpdateEvent event) {
-        test(event.getVehicle());
-    }
-
-    @EventHandler public void onVehicle(VehicleDestroyEvent event) {
-        test(event.getVehicle());
-    }
-
-    @EventHandler public void onVehicle(VehicleEntityCollisionEvent event) {
-        test(event.getVehicle());
+        testNether(event.getVehicle());
     }
 
     @EventHandler public void onVehicle(VehicleCreateEvent event) {
-        test(event.getVehicle());
+        testCreate(event.getVehicle());
     }
 
     @EventHandler public void onVehicle(VehicleBlockCollisionEvent event) {
-        test(event.getVehicle());
+        testNether(event.getVehicle());
     }
 
     @EventHandler public void onTeleport(EntityTeleportEvent event) {
         Entity ent = event.getEntity();
         if (ent instanceof Vehicle || ent instanceof ArmorStand) {
-            test(event.getEntity());
+            testNether(event.getEntity());
         }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void vehicleMove(VehicleMoveEvent event) {
-        test(event.getVehicle());
+        testNether(event.getVehicle());
     }
 
     @EventHandler public void spawn(CreatureSpawnEvent event) {
         if (event.getEntityType() == EntityType.ARMOR_STAND) {
-            test(event.getEntity());
+            testCreate(event.getEntity());
         }
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 86315262a..3833c8b8e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1722,7 +1722,7 @@ import java.util.regex.Pattern;
             return;
         }
 
-        EntitySpawnListener.test(entity);
+        EntitySpawnListener.testNether(entity);
 
         Plot plot = area.getPlotAbs(location);
         PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());

From 3651b3ac8d6e8d68427d13304836fcf6dd5d775b Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 6 Apr 2019 23:14:39 +1100
Subject: [PATCH 110/210] I don't know about coffee, but how about Java?
 @sauilitired

---
 .../plotsquared/bukkit/listeners/EntitySpawnListener.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index d2b1270eb..a7d8133c6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -49,12 +49,11 @@ public class EntitySpawnListener implements Listener {
     public static void testCreate(Entity entity) {
         @NotNull World world = entity.getWorld();
         if (areaName == world.getName()) {
-            if (!hasPlotArea) return;
         } else {
             areaName = world.getName();
             hasPlotArea = PlotSquared.get().hasPlotArea(areaName);
-            if (!hasPlotArea) return;
         }
+        if (!hasPlotArea) return;
         test(entity);
     }
 

From 259fe94f830786d6454d9affcf3eaf1b380457ae Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 8 Apr 2019 01:43:38 +1000
Subject: [PATCH 111/210] Potential fix to skip chunks being kept loaded

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 0009ba553..0ef174a04 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -252,9 +252,10 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                 if (!result) {
                                     continue outer;
                                 }
-                            } while (index < chunks.length
-                                && System.currentTimeMillis() - start < 5);
-                            return;
+                                if (System.currentTimeMillis() - start > 5) {
+                                    return;
+                                }
+                            } while (index < chunks.length);
                         }
                     }
                 }

From 3f712ed5f02a2b0af8b166db014a2ddbf1903b6d Mon Sep 17 00:00:00 2001
From: Jesse Boyd <boy0001@users.noreply.github.com>
Date: Mon, 8 Apr 2019 18:03:38 +1000
Subject: [PATCH 112/210] should check both end/nether

---
 .../plotsquared/bukkit/listeners/EntitySpawnListener.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index a7d8133c6..8487c6a32 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -37,7 +37,7 @@ public class EntitySpawnListener implements Listener {
 
     public static void testNether(Entity entity) {
         @NotNull World world = entity.getWorld();
-        if (world.getEnvironment() != World.Environment.NETHER) {
+        if (world.getEnvironment() != World.Environment.NETHER && world.getEnvironment() != World.Environment.THE_END) {
             return;
         }
         test(entity);

From 9225a13808813f5e47674a4d822ab44574b9b446 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 9 Apr 2019 00:29:13 +1000
Subject: [PATCH 113/210] sorry for breaking roads

---
 .../bukkit/listeners/SingleWorldListener.java |  6 ++--
 .../plot/generator/HybridPlotWorld.java       | 32 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
index 88d25cd11..fc13147dd 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java
@@ -28,10 +28,10 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk");
         ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
         this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
-        this.mustSave = classChunk.getField("mustSave").getRealField();
         try {
-        } catch (Exception e) {
-            e.printStackTrace();
+            this.mustSave = classChunk.getField("mustSave").getRealField();
+        } catch (Throwable ignore) {
+            ignore.printStackTrace();
         }
         Bukkit.getPluginManager().registerEvents(this, plugin);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 784b7d831..9ed1eca54 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -150,15 +150,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int plotY = PLOT_HEIGHT - SCHEM_Y;
         int roadY = ROAD_HEIGHT - SCHEM_Y;
 
-        if (schematic3.getClipboard().getDimensions().getY() == 256) {
+        if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() == 256) {
             SCHEM_Y = 0;
             plotY = 0;
             roadY = ROAD_HEIGHT;
         }
 
-        if (schematic1.getClipboard().getDimensions().getY() == 256) {
+        if (schematic1 != null && schematic1.getClipboard().getDimensions().getY() == 256) {
             SCHEM_Y = 0;
-            if (schematic3.getClipboard().getDimensions().getY() != 256) {
+            if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != 256) {
                 plotY = PLOT_HEIGHT;
             }
             roadY = 0;
@@ -242,21 +242,17 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         // TODO: What? this.ROAD_BLOCK = BlockBucket.empty(); // PlotBlock.getEmptyData(this.ROAD_BLOCK); // PlotBlock.get(this.ROAD_BLOCK.id, (byte) 0);
 
         BlockArrayClipboard blockArrayClipboard1 = schematic1.getClipboard();
-        BlockArrayClipboard blockArrayClipboard2 = schematic2.getClipboard();
 
         BlockVector3 d1 = blockArrayClipboard1.getDimensions();
         short w1 = (short) d1.getX();
         short l1 = (short) d1.getZ();
         short h1 = (short) d1.getY();
-        BlockVector3 d2 = blockArrayClipboard2.getDimensions();
-        short w2 = (short) d2.getX();
-        short l2 = (short) d2.getZ();
-        short h2 = (short) d2.getY();
-        BlockVector3 min = blockArrayClipboard2.getMinimumPoint();
-        for (short x = 0; x < w2; x++) {
-            for (short z = 0; z < l2; z++) {
-                for (short y = 0; y < h2; y++) {
-                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
+
+        BlockVector3 min = blockArrayClipboard1.getMinimumPoint();
+        for (short x = 0; x < w1; x++) {
+            for (short z = 0; z < l1; z++) {
+                for (short y = 0; y < h1; y++) {
+                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + roadY),
                             (short) (z + shift + oddshift), id, false, h1);
@@ -266,11 +262,17 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 }
             }
         }
-        min = blockArrayClipboard1.getMinimumPoint();
+
+        BlockArrayClipboard blockArrayClipboard2 = schematic2.getClipboard();
+        BlockVector3 d2 = blockArrayClipboard2.getDimensions();
+        short w2 = (short) d2.getX();
+        short l2 = (short) d2.getZ();
+        short h2 = (short) d2.getY();
+        min = blockArrayClipboard2.getMinimumPoint();
         for (short x = 0; x < w2; x++) {
             for (short z = 0; z < l2; z++) {
                 for (short y = 0; y < h2; y++) {
-                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
+                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + roadY),
                             (short) (z - shift), id, false, h2);

From d571f54c6567bbbe32386d230801974692a22edb Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 9 Apr 2019 15:48:25 +0100
Subject: [PATCH 114/210] Update offset to match ci

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ab2786e5d..84ede9b34 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2042;  // Offset to match CI
+    index = -2044;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 97903f3870351f16cc8cf13dc1dba21ec2307dd9 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 10 Apr 2019 11:34:21 +1000
Subject: [PATCH 115/210] Fix you are not in a plot area for single plot worlds

---
 .../plot/object/worlds/SinglePlotAreaManager.java          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index 7c9f16d70..bb0be73ba 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -70,13 +70,12 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
 
     @Override public PlotArea getApplicablePlotArea(Location location) {
         PlotArea found = super.getApplicablePlotArea(location);
-        if (found != null) {
+        if (found != null)
             return found;
-        }
         String world = location.getWorld();
-        return isWorld(world) || world.equals("*") ?
+        return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
             area :
-            super.getApplicablePlotArea(location);
+            null;
     }
 
     @Override public PlotArea getPlotArea(String world, String id) {

From 533edc5f406ef8e3c760c8ec604becc996ffde9b Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 10 Apr 2019 17:10:17 +1000
Subject: [PATCH 116/210] Change default threshold to -1

---
 .../intellectualsites/plotsquared/plot/config/Settings.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index f2a669823..4c142697e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -179,10 +179,10 @@ public class Settings extends Config {
     public static final class Auto_Clear extends ConfigBlock {
         @Create // This value has to be generated since an instance isn't static
         public CALIBRATION CALIBRATION = null;
-        public int THRESHOLD = 1;
+        public int THRESHOLD = -1;
         public int REQUIRED_PLOTS = -1;
         public boolean CONFIRMATION = true;
-        public int DAYS = 7;
+        public int DAYS = 90;
         public int SKIP_ACCOUNT_AGE_DAYS = -1;
         public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
 

From 6cea26f4361bcfde0851a718a21e5fad02b53816 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 10 Apr 2019 17:10:44 +1000
Subject: [PATCH 117/210] Add random collection

---
 .../plotsquared/plot/object/BlockBucket.java  | 137 +++++-------------
 .../collection/FlatRandomCollection.java      |  45 ++++++
 .../object/collection/RandomCollection.java   |  33 +++++
 .../collection/SimpleRandomCollection.java    |  29 ++++
 .../plotsquared/plot/util/MathMan.java        |  15 ++
 5 files changed, 162 insertions(+), 97 deletions(-)
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java
 create mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
index 071b2bfcd..5f2c371bc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
@@ -3,6 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.object;
 import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
+import com.github.intellectualsites.plotsquared.plot.object.collection.RandomCollection;
 import com.google.common.collect.ImmutableMap;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -20,12 +21,15 @@ import java.util.Map.Entry;
     implements Iterable<PlotBlock>, ConfigurationSerializable {
 
     private final Random random = new Random();
-    private final Map<Range, PlotBlock> ranges = new HashMap<>();
-    private final Map<PlotBlock, Integer> blocks;
+    private final Map<PlotBlock, Double> blocks;
+
     private final BucketIterator bucketIterator = new BucketIterator();
     private boolean compiled, singleItem;
     private PlotBlock head;
 
+    private RandomCollection<PlotBlock> randomBlocks;
+    private PlotBlock single;
+
     public BlockBucket() {
         this.blocks = new HashMap<>();
     }
@@ -48,6 +52,11 @@ import java.util.Map.Entry;
     }
 
     public void addBlock(@NonNull final PlotBlock block, final int chance) {
+        addBlock(block, (double) chance);
+    }
+
+    private void addBlock(@NonNull final PlotBlock block, double chance) {
+        if (chance == -1) chance = 1;
         this.blocks.put(block, chance);
         this.compiled = false;
         if (head == null) {
@@ -56,9 +65,6 @@ import java.util.Map.Entry;
     }
 
     public boolean isEmpty() {
-        if (isCompiled()) {
-            return ranges.isEmpty();
-        }
         return blocks.isEmpty();
     }
 
@@ -72,7 +78,7 @@ import java.util.Map.Entry;
         if (!isCompiled()) {
             this.compile();
         }
-        return Collections.unmodifiableCollection(this.ranges.values());
+        return Collections.unmodifiableCollection(this.blocks.keySet());
     }
 
     /**
@@ -112,80 +118,21 @@ import java.util.Map.Entry;
             return;
         }
 
-        if (blocks.size() == 0) {
-            this.compiled = true;
-            return;
-        }
-
-        if (blocks.size() == 1) {
-            this.ranges.put(new Range(0, 100, true), blocks.keySet().toArray(new PlotBlock[1])[0]);
-            this.compiled = true;
-            this.singleItem = true;
-            return;
-        }
-
-        final Map<PlotBlock, Integer> temp = new HashMap<>(blocks.size());
-        final List<PlotBlock> unassigned = new ArrayList<>(blocks.size());
-
-        int sum = 0;
-        for (final Map.Entry<PlotBlock, Integer> entry : blocks.entrySet()) {
-            if (entry.getValue() == -1) {
-                unassigned.add(entry.getKey());
-            } else {
-                sum += entry.getValue();
-                temp.put(entry.getKey(), entry.getValue());
-            }
-        }
-        //
-        // If this doesn't amount to 100 add it up to exactly 100.
-        //
-        if (sum < 100) {
-            final int remaining = 100 - sum;
-            if (unassigned.isEmpty()) {
-                // If there are no unassigned values, we just add it to the first value
-                final Entry<PlotBlock, Integer> entry = temp.entrySet().iterator().next();
-                temp.put(entry.getKey(), (entry.getValue() + 1 + remaining));
-            } else {
-                final int perUnassigned = remaining / unassigned.size();
-                for (final PlotBlock block : unassigned) {
-                    temp.put(block, perUnassigned);
-                    sum += perUnassigned;
-                }
-                // Make sure there isn't a tiny difference remaining
-                if (sum < 100) {
-                    final int difference = 100 - sum;
-                    temp.put(unassigned.get(0), perUnassigned + difference);
-                    sum = 100;
-                }
-            }
-        } else if (!unassigned.isEmpty()) {
-            Captions.BUCKET_ENTRIES_IGNORED.send(ConsolePlayer.getConsole());
-        }
-        //
-        // If the sum adds up to more than 100, divide all values
-        //
-        if (sum > 100) {
-            final double ratio = 100D / sum;
-            for (final Map.Entry<PlotBlock, Integer> entry : blocks.entrySet()) {
-                if (entry.getValue() == -1) {
-                    continue;
-                }
-                temp.put(entry.getKey(), (int) (entry.getValue() * ratio));
-            }
-        } else {
-            temp.forEach(temp::put);
-        }
-        int start = 0;
-        for (final Map.Entry<PlotBlock, Integer> entry : temp.entrySet()) {
-            final int rangeStart = start;
-            final int rangeEnd = rangeStart + entry.getValue();
-            start = rangeEnd + 1;
-            final Range range =
-                new Range(rangeStart, rangeEnd, unassigned.contains(entry.getKey()));
-            this.ranges.put(range, entry.getKey());
-        }
-        this.blocks.clear();
         this.compiled = true;
+        switch (blocks.size()) {
+            case 0:
+                single = null;
+                this.randomBlocks = null;
+                break;
+            case 1:
+                single = blocks.keySet().iterator().next();
+                this.randomBlocks = null;
+                break;
+            default:
+                single = null;
+                this.randomBlocks = RandomCollection.of(blocks, random);
+                break;
+        }
     }
 
     @Override public Iterator<PlotBlock> iterator() {
@@ -205,19 +152,13 @@ import java.util.Map.Entry;
         if (!isCompiled()) {
             this.compile();
         }
-        if (this.isEmpty()) {
-            return StringPlotBlock.EVERYTHING;
-        } else if (this.hasSingleItem()) {
-            return this.head;
+        if (single != null) {
+            return single;
         }
-        final int number = random.nextInt(101);
-        for (final Map.Entry<Range, PlotBlock> entry : ranges.entrySet()) {
-            if (entry.getKey().isInRange(number)) {
-                return entry.getValue();
-            }
+        if (randomBlocks != null) {
+            return randomBlocks.next();
         }
-        // Didn't find a block? Try again
-        return getBlock();
+        return StringPlotBlock.EVERYTHING;
     }
 
     @Override public String toString() {
@@ -225,14 +166,16 @@ import java.util.Map.Entry;
             compile();
         }
         final StringBuilder builder = new StringBuilder();
-        final Iterator<Entry<Range, PlotBlock>> iterator = this.ranges.entrySet().iterator();
-        while (iterator.hasNext()) {
-            final Entry<Range, PlotBlock> entry = iterator.next();
-            builder.append(entry.getValue().getRawId());
-            if (!entry.getKey().isAutomatic()) {
-                builder.append(":").append(entry.getKey().getWeight());
+        Iterator<Entry<PlotBlock, Double>> iter = blocks.entrySet().iterator();
+        while (iter.hasNext()) {
+            Entry<PlotBlock, Double> entry = iter.next();
+            PlotBlock block = entry.getKey();
+            builder.append(block.getRawId());
+            Double weight = entry.getValue();
+            if (weight != 1) {
+                builder.append(":").append(weight.intValue());
             }
-            if (iterator.hasNext()) {
+            if (iter.hasNext()) {
                 builder.append(",");
             }
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java
new file mode 100644
index 000000000..3255a80e7
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java
@@ -0,0 +1,45 @@
+package com.github.intellectualsites.plotsquared.plot.object.collection;
+
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Random;
+
+public class FlatRandomCollection<T> extends RandomCollection<T> {
+    private T[] values;
+
+    public FlatRandomCollection(Map<T, Double> weights, Random random) {
+        super(weights, random);
+        int max = 0;
+        int[] counts = new int[weights.size()];
+        Double[] weightDoubles = weights.values().toArray(new Double[weights.size()]);
+        for (int i = 0; i < weightDoubles.length; i++) {
+            int weight = (int) (weightDoubles[i] * 100);
+            counts[i] = weight;
+            if (weight != (weightDoubles[i] * 100)) {
+                throw new IllegalArgumentException("Too small");
+            }
+            if (weight > max) {
+                max = weight;
+            }
+        }
+        int gcd = MathMan.gcd(counts);
+        if (max / gcd > 100000) {
+            throw new IllegalArgumentException("Too large");
+        }
+        ArrayList<T> parsed = new ArrayList<>();
+        for (Map.Entry<T, Double> entry : weights.entrySet()) {
+            int num = (int) (100 * entry.getValue());
+            for (int j = 0; j < num / gcd; j++) {
+                parsed.add(entry.getKey());
+            }
+        }
+        this.values = (T[]) parsed.toArray();
+    }
+
+    @Override
+    public T next() {
+        return values[random.nextInt(values.length)];
+    }
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java
new file mode 100644
index 000000000..ac136e9b4
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java
@@ -0,0 +1,33 @@
+package com.github.intellectualsites.plotsquared.plot.object.collection;
+
+import java.util.Map;
+import java.util.Random;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public abstract class RandomCollection<T> {
+    protected Random random;
+
+    public RandomCollection(Map<T, Double> weights, Random random) {
+        this.random = random;
+    }
+
+    public static <T> RandomCollection<T> of(Map<T, Double> weights, Random random) {
+        try {
+            return new FlatRandomCollection<>(weights, random);
+        } catch (IllegalArgumentException ignore) {
+            return new SimpleRandomCollection<>(weights, random);
+        }
+    }
+
+    public void setRandom(Random random) {
+        checkNotNull(random);
+        this.random = random;
+    }
+
+    public Random getRandom() {
+        return random;
+    }
+
+    public abstract T next();
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java
new file mode 100644
index 000000000..7ea996613
--- /dev/null
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java
@@ -0,0 +1,29 @@
+package com.github.intellectualsites.plotsquared.plot.object.collection;
+
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Random;
+import java.util.TreeMap;
+
+public class SimpleRandomCollection<E> extends RandomCollection<E> {
+
+    private final NavigableMap<Double, E> map = new TreeMap<>();
+    private double total = 0;
+
+    public SimpleRandomCollection(Map<E, Double> weights, Random random) {
+        super(weights, random);
+        for (Map.Entry<E, Double> entry : weights.entrySet()) {
+            add(entry.getValue(), entry.getKey());
+        }
+    }
+
+    public void add(double weight, E result) {
+        if (weight <= 0) return;
+        total += weight;
+        map.put(total, result);
+    }
+
+    public E next() {
+        return map.ceilingEntry(random.nextDouble()).getValue();
+    }
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
index 852521817..00ea391ba 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MathMan.java
@@ -37,6 +37,21 @@ public class MathMan {
         }
     }
 
+    public static final int gcd(int a, int b) {
+        if (b == 0) {
+            return a;
+        }
+        return gcd(b, a % b);
+    }
+
+    public static final int gcd(int[] a) {
+        int result = a[0];
+        for (int i = 1; i < a.length; i++) {
+            result = gcd(result, a[i]);
+        }
+        return result;
+    }
+
     public static long pairInt(int x, int y) {
         return (((long) x) << 32) | (y & 0xffffffffL);
     }

From b0b328e50b7feb699243244d6ea02ad1afe2e640 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 11 Apr 2019 12:43:16 +0100
Subject: [PATCH 118/210] Update offset to match CI

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 84ede9b34..123813173 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2044;  // Offset to match CI
+    index = -2045;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 691675243400d1b5fb7e2c58e4e6926707d7e01d Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 12 Apr 2019 12:11:03 +1000
Subject: [PATCH 119/210] Fixes #2322

---
 Core/src/main/resources/addsigns.js  | 2 +-
 Core/src/main/resources/automerge.js | 2 +-
 Core/src/main/resources/setbiomes.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/main/resources/addsigns.js b/Core/src/main/resources/addsigns.js
index 7f0996ca1..a1d2b8714 100644
--- a/Core/src/main/resources/addsigns.js
+++ b/Core/src/main/resources/addsigns.js
@@ -1,7 +1,7 @@
 /*
 This script will fix all signs in the world.
 */
-var plots = PS.sortPlots(PS.getPlots());
+var plots = PS.sortPlotsByTemp(PS.getPlots());
 for (var i = 0; i < plots.size(); i++) {
     var plot = plots.get(i);
     if (!plot.isMerged() || !plot.getMerged(0)) {
diff --git a/Core/src/main/resources/automerge.js b/Core/src/main/resources/automerge.js
index b8326e842..6a6c2a20f 100644
--- a/Core/src/main/resources/automerge.js
+++ b/Core/src/main/resources/automerge.js
@@ -28,7 +28,7 @@ The following utility classes are usable:
  
  For more information see: https://github.com/IntellectualSites/PlotSquared/wiki/Scripting
 */
-var plots = PS.sortPlots(PS.getPlots());
+var plots = PS.sortPlotsByTemp(PS.getPlots());
 PS.class.static.log("Attempting to auto merge " + plots.size() + " plots");
 if ("%s0" === "true") {
     for (var i = 0; i < plots.size(); i++) {
diff --git a/Core/src/main/resources/setbiomes.js b/Core/src/main/resources/setbiomes.js
index b3d1dd4ff..48c841cb2 100644
--- a/Core/src/main/resources/setbiomes.js
+++ b/Core/src/main/resources/setbiomes.js
@@ -1,7 +1,7 @@
 /*
 This script will reset all biomes in claimed plots
 */
-var plots = PS.sortPlots(PS.getPlots());
+var plots = PS.sortPlotsByTemp(PS.getPlots());
 for (var i = 0; i < plots.size(); i++) {
     var plot = plots.get(i);
     if (!plot.isMerged() || !plot.getMerged(0)) {

From 1c915905c6b661b3b032fe6725012b83c6dc100c Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 11 Apr 2019 23:27:47 -0400
Subject: [PATCH 120/210] Fixes #2275

---
 .../bukkit/listeners/PlayerEvents.java        | 73 ++++++++++++++-----
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 3833c8b8e..33e0093f8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -632,24 +632,33 @@ import java.util.regex.Pattern;
             EventUtil.manager.doJoinTask(pp);
         }, 20);
 
-        if (pp.hasPermission(Captions.PERMISSION_ADMIN_UPDATE_NOTIFICATION.s()) &&
-            PlotSquared.get().getUpdateUtility() != null) {
-                final UpdateUtility updateUtility = PlotSquared.get().getUpdateUtility();
-                final BukkitMain bukkitMain = BukkitMain.getPlugin(BukkitMain.class);
-                updateUtility.checkForUpdate(bukkitMain.getPluginVersionString(), ((updateDescription, throwable) -> {
+        if (pp.hasPermission(Captions.PERMISSION_ADMIN_UPDATE_NOTIFICATION.s())
+            && PlotSquared.get().getUpdateUtility() != null) {
+            final UpdateUtility updateUtility = PlotSquared.get().getUpdateUtility();
+            final BukkitMain bukkitMain = BukkitMain.getPlugin(BukkitMain.class);
+            updateUtility.checkForUpdate(bukkitMain.getPluginVersionString(),
+                ((updateDescription, throwable) -> {
                     if (throwable != null) {
-                        bukkitMain.getLogger().severe(String.format("Could not check for update. Reason: %s",
-                            throwable.getMessage()));
+                        bukkitMain.getLogger().severe(String
+                            .format("Could not check for update. Reason: %s",
+                                throwable.getMessage()));
                     } else {
                         if (updateDescription != null) {
-                            new PlotMessage("-------- ").color("$2").text("PlotSquared Update Notification").color("$1").text(" --------").color("$2")
-                                .send(pp);
-                            new PlotMessage("There appears to be a PlotSquared update available!").color("$1").send(pp);
+                            new PlotMessage("-------- ").color("$2")
+                                .text("PlotSquared Update Notification").color("$1")
+                                .text(" --------").color("$2").send(pp);
+                            new PlotMessage("There appears to be a PlotSquared update available!")
+                                .color("$1").send(pp);
                             new PlotMessage(String.format("You are running version %s,"
-                                + " the newest available version is %s", bukkitMain.getPluginVersionString(), updateDescription.getVersion())).color("$1").send(pp);
-                            new PlotMessage("Update URL").color("$1").text(": ").color("$2").text(updateDescription.getUrl()).tooltip("Download update").send(pp);
-                            new PlotMessage("-------- ").color("$2").text("PlotSquared Update Notification").color("$1").text(" --------").color("$2")
+                                    + " the newest available version is %s",
+                                bukkitMain.getPluginVersionString(),
+                                updateDescription.getVersion())).color("$1").send(pp);
+                            new PlotMessage("Update URL").color("$1").text(": ").color("$2")
+                                .text(updateDescription.getUrl()).tooltip("Download update")
                                 .send(pp);
+                            new PlotMessage("-------- ").color("$2")
+                                .text("PlotSquared Update Notification").color("$1")
+                                .text(" --------").color("$2").send(pp);
                         }
                     }
                 }));
@@ -2689,7 +2698,7 @@ import java.util.regex.Pattern;
             return;
         }
         Entity victim = event.getEntity();
-        if (!entityDamage(damager, victim)) {
+        if (!entityDamage(damager, victim, event.getCause())) {
             if (event.isCancelled()) {
                 if (victim instanceof Ageable) {
                     Ageable ageable = (Ageable) victim;
@@ -2703,18 +2712,37 @@ import java.util.regex.Pattern;
         }
     }
 
-    public boolean entityDamage(Entity damager, Entity victim) {
+    private boolean entityDamage(Entity damager, Entity victim) {
+        return entityDamage(damager, victim, null);
+    }
+
+    private boolean entityDamage(Entity damager, Entity victim,
+        EntityDamageEvent.DamageCause cause) {
         Location dloc = BukkitUtil.getLocation(damager);
         Location vloc = BukkitUtil.getLocation(victim);
         PlotArea dArea = dloc.getPlotArea();
-        PlotArea vArea =
-            dArea != null && dArea.contains(vloc.getX(), vloc.getZ()) ? dArea : vloc.getPlotArea();
+        PlotArea vArea;
+        if (dArea != null && dArea.contains(vloc.getX(), vloc.getZ())) {
+            vArea = dArea;
+        } else {
+            vArea = vloc.getPlotArea();
+        }
         if (dArea == null && vArea == null) {
             return true;
         }
 
-        Plot dplot = dArea != null ? dArea.getPlot(dloc) : null;
-        Plot vplot = vArea != null ? vArea.getPlot(vloc) : null;
+        Plot dplot;
+        if (dArea != null) {
+            dplot = dArea.getPlot(dloc);
+        } else {
+            dplot = null;
+        }
+        Plot vplot;
+        if (vArea != null) {
+            vplot = vArea.getPlot(vloc);
+        } else {
+            vplot = null;
+        }
 
         Plot plot;
         String stub;
@@ -2860,6 +2888,13 @@ import java.util.regex.Pattern;
             .equals(dplot.guessOwner(), vplot.guessOwner()))) {
             return vplot != null && Flags.PVE.isTrue(vplot);
         }
+        //disable the firework damage. too much of a headache to support at the moment.
+        if (vplot != null) {
+            if (EntityDamageEvent.DamageCause.ENTITY_EXPLOSION == cause
+                && damager.getType() == EntityType.FIREWORK) {
+                return false;
+            }
+        }
         return ((vplot != null && Flags.PVE.isTrue(vplot)) || !(damager instanceof Arrow
             && !(victim instanceof Creature)));
     }

From 0c46df65e62c8069adcb13fbadb5b53ec6d33e93 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 12 Apr 2019 17:42:35 +0100
Subject: [PATCH 121/210] Not sure why that last commit was a thing locally

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 84ede9b34..7bb184b05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2044;  // Offset to match CI
+    index = -2039;  // Offset to match CI
     for (; parents != null && !parents.isEmpty(); index++) {
         parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
     }

From 04779d28fb6e9d12fde1452c07f21ec829bbd130 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 13 Apr 2019 12:26:19 +1000
Subject: [PATCH 122/210] Don't fail on metrics error

---
 .../plotsquared/bukkit/BukkitMain.java               | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 0ef174a04..340197c5a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -657,11 +657,15 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         if (this.metricsStarted) {
             return;
         }
-        System.setProperty("bstats.relocatecheck",
-            "false"); // We do not want to relocate the package...
-        Metrics metrics = new Metrics(this);// bstats
-        PlotSquared.log(Captions.PREFIX + "&6Metrics enabled.");
         this.metricsStarted = true;
+        try {
+            System.setProperty("bstats.relocatecheck",
+                "false"); // We do not want to relocate the package...
+            Metrics metrics = new Metrics(this);// bstats
+            PlotSquared.log(Captions.PREFIX + "&6Metrics enabled.");
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
     }
 
     @Override public ChunkManager initChunkManager() {

From 50acf4f51fa0ee46fb0fc95511e976f55c802251 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Sat, 13 Apr 2019 13:06:21 +1000
Subject: [PATCH 123/210] Print exception on failed schematic setup

---
 .../plotsquared/plot/generator/HybridPlotWorld.java              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 9ed1eca54..76fec7701 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -120,6 +120,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         try {
             setupSchematics();
         } catch (Exception ignored) {
+            ignored.printStackTrace();
             PlotSquared.debug("&c - road schematics are disabled for this world.");
         }
     }

From 59f89980a32f2a13dbd20fab1701cf879ba6940d Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 13:13:56 +1000
Subject: [PATCH 124/210] Don't need ratio out of 100 anymore

---
 .../plotsquared/plot/util/LegacyConverter.java                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
index f904249dd..262df3f83 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -65,9 +65,8 @@ import java.util.Map;
         }
         final BlockBucket bucket = new BlockBucket();
         if (includeRatios) {
-            final double ratio = 100D / blocks.length;
             for (final Map.Entry<PlotBlock, Integer> count : counts.entrySet()) {
-                bucket.addBlock(count.getKey(), (int) (count.getValue() * ratio));
+                bucket.addBlock(count.getKey(), (int) (count.getValue()));
             }
         } else {
             counts.keySet().forEach(bucket::addBlock);

From 0fdc5eafbdb966c8b09f412433774dcfb0a578bb Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 13:46:33 +1000
Subject: [PATCH 125/210] Allow single plot areas to load survival worlds

---
 .../intellectualsites/plotsquared/plot/PlotSquared.java      | 2 +-
 .../plotsquared/plot/object/worlds/SinglePlotArea.java       | 4 ++--
 .../plot/object/worlds/SinglePlotAreaManager.java            | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index e53b36042..3c15d437c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1390,7 +1390,7 @@ import java.util.zip.ZipInputStream;
                 ConfigurationSection section =
                     this.worlds.getConfigurationSection("worlds." + world);
                 plotworld.saveConfiguration(section);
-                plotworld.loadConfiguration(section);
+                plotworld.loadDefaultConfiguration(section);
                 this.worlds.save(this.worldsFile);
             } catch (IOException e) {
                 e.printStackTrace();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index 6a8782d1a..749829e9c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -36,8 +36,8 @@ public class SinglePlotArea extends GridPlotWorld {
                 SetupObject setup = new SetupObject();
                 setup.plotManager = "PlotSquared:single";
                 setup.setupGenerator = "PlotSquared:single";
-                setup.type = 0;
-                setup.terrain = 0;
+                setup.type = TYPE;
+                setup.terrain = TERRAIN;
                 setup.step = new ConfigurationNode[0];
                 setup.world = worldName;
                 SetupUtils.manager.setupWorld(setup);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index bb0be73ba..fd99fb067 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -69,13 +69,10 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
     }
 
     @Override public PlotArea getApplicablePlotArea(Location location) {
-        PlotArea found = super.getApplicablePlotArea(location);
-        if (found != null)
-            return found;
         String world = location.getWorld();
         return isWorld(world) || world.equals("*") || super.getAllPlotAreas().length == 0 ?
             area :
-            null;
+            super.getApplicablePlotArea(location);
     }
 
     @Override public PlotArea getPlotArea(String world, String id) {

From 27eda9eb7cdc650a04d882faf93c7c857e3069ce Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 14:00:01 +1000
Subject: [PATCH 126/210] Don't setup single plot worlds

---
 .../bukkit/util/BukkitSetupUtils.java            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
index efdb034cd..5eb2e3fbc 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -131,15 +131,13 @@ public class BukkitSetupUtils extends SetupUtils {
                 for (ConfigurationNode step : steps) {
                     worldSection.set(step.getConstant(), step.getValue());
                 }
-                PlotSquared.get().worlds.set("worlds." + world + ".generator.type", object.type);
-                PlotSquared.get().worlds
-                    .set("worlds." + world + ".generator.terrain", object.terrain);
-                PlotSquared.get().worlds
-                    .set("worlds." + world + ".generator.plugin", object.plotManager);
-                if (object.setupGenerator != null && !object.setupGenerator
-                    .equals(object.plotManager)) {
-                    PlotSquared.get().worlds
-                        .set("worlds." + world + ".generator.init", object.setupGenerator);
+                if (!object.plotManager.endsWith(":single")) {
+                    PlotSquared.get().worlds.set("worlds." + world + ".generator.type", object.type);
+                    PlotSquared.get().worlds.set("worlds." + world + ".generator.terrain", object.terrain);
+                    PlotSquared.get().worlds.set("worlds." + world + ".generator.plugin", object.plotManager);
+                    if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
+                        PlotSquared.get().worlds.set("worlds." + world + ".generator.init", object.setupGenerator);
+                    }
                 }
                 GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
                 if (gen != null && gen.isFull()) {

From 7e63ffe745cee97699b8869212d3a24be1a29168 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 14:30:05 +1000
Subject: [PATCH 127/210] Optimize vanilla world generation*

*For single plot worlds

Reuse base world data. Instead of taking several seconds, it should now take tens of milliseconds.
---
 .../bukkit/util/BukkitSetupUtils.java         | 17 ++---
 .../plot/object/worlds/SinglePlotArea.java    | 67 ++++++++++++++++---
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
index 5eb2e3fbc..ad3de7cd3 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -123,15 +123,16 @@ public class BukkitSetupUtils extends SetupUtils {
                 break;
             }
             case 1: {
-                if (!PlotSquared.get().worlds.contains(worldPath)) {
-                    PlotSquared.get().worlds.createSection(worldPath);
-                }
-                ConfigurationSection worldSection =
-                    PlotSquared.get().worlds.getConfigurationSection(worldPath);
-                for (ConfigurationNode step : steps) {
-                    worldSection.set(step.getConstant(), step.getValue());
-                }
                 if (!object.plotManager.endsWith(":single")) {
+                    if (!PlotSquared.get().worlds.contains(worldPath)) {
+                        PlotSquared.get().worlds.createSection(worldPath);
+                    }
+                    if (steps.length != 0) {
+                        ConfigurationSection worldSection = PlotSquared.get().worlds.getConfigurationSection(worldPath);
+                        for (ConfigurationNode step : steps) {
+                            worldSection.set(step.getConstant(), step.getValue());
+                        }
+                    }
                     PlotSquared.get().worlds.set("worlds." + world + ".generator.type", object.type);
                     PlotSquared.get().worlds.set("worlds." + world + ".generator.terrain", object.terrain);
                     PlotSquared.get().worlds.set("worlds." + world + ".generator.plugin", object.plotManager);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index 749829e9c..c6a9a4c3e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -1,16 +1,26 @@
 package com.github.intellectualsites.plotsquared.plot.object.worlds;
 
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
 import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotLoc;
+import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
 import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
 
 public class SinglePlotArea extends GridPlotWorld {
 
@@ -26,20 +36,61 @@ public class SinglePlotArea extends GridPlotWorld {
         VOID = config.getBoolean("void", false);
     }
 
+    @Override public void saveConfiguration(ConfigurationSection config) {
+        new Exception().printStackTrace();
+        super.saveConfiguration(config);
+    }
+
     public void loadWorld(final PlotId id) {
+        String worldName = id.toCommaSeparatedString();
+        if (WorldUtil.IMP.isWorld(worldName)) {
+            return;
+        }
+        SetupObject setup = new SetupObject();
+        setup.plotManager = "PlotSquared:single";
+        setup.setupGenerator = "PlotSquared:single";
+        setup.type = TYPE;
+        setup.terrain = TERRAIN;
+        setup.step = new ConfigurationNode[0];
+        setup.world = worldName;
+
+        // Duplicate 0;0
+        if (setup.type != 0) {
+            File container = PlotSquared.imp().getWorldContainer();
+            File dest = new File(container, worldName);
+            if (!dest.exists()) {
+                File src = new File(container, "0,0");
+                if (src.exists()) {
+                    if (!dest.exists()) {
+                        dest.mkdirs();
+                    }
+                    File levelDat = new File(src, "level.dat");
+                    if (levelDat.exists()) {
+                        try {
+                            Files.copy(levelDat.toPath(), new File(dest, levelDat.getName()).toPath());
+                            File data = new File(src, "data");
+                            if (data.exists()) {
+                                File dataDest = new File(dest, "data");
+                                dataDest.mkdirs();
+                                for (File file : data.listFiles()) {
+                                    Files.copy(file.toPath(), new File(dataDest, file.getName()).toPath());
+                                }
+                            }
+                        } catch (IOException ignore) {
+                            ignore.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+
         TaskManager.IMP.sync(new RunnableVal<Object>() {
             @Override public void run(Object value) {
                 String worldName = id.toCommaSeparatedString();
                 if (WorldUtil.IMP.isWorld(worldName)) {
                     return;
                 }
-                SetupObject setup = new SetupObject();
-                setup.plotManager = "PlotSquared:single";
-                setup.setupGenerator = "PlotSquared:single";
-                setup.type = TYPE;
-                setup.terrain = TERRAIN;
-                setup.step = new ConfigurationNode[0];
-                setup.world = worldName;
+
                 SetupUtils.manager.setupWorld(setup);
             }
         });

From 000e3de35d483572f87b784d73fb9ff054620d85 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 14:36:31 +1000
Subject: [PATCH 128/210] Don't allow importing using base directory

---
 .../plotsquared/plot/commands/DebugImportWorlds.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
index ddffaf744..85fb9a752 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
@@ -36,6 +36,10 @@ import java.util.UUID;
         SinglePlotArea area = ((SinglePlotAreaManager) pam).getArea();
         PlotId id = new PlotId(0, 0);
         File container = PlotSquared.imp().getWorldContainer();
+        if (container.equals(new File("."))) {
+            player.sendMessage("World container must be configured to be a separate directory to your base files!");
+            return;
+        }
         for (File folder : container.listFiles()) {
             String name = folder.getName();
             if (!WorldUtil.IMP.isWorld(name) && PlotId.fromString(name) == null) {

From d31dbc7c7cec93983bdc9bea17faded8e54462f2 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 22:07:33 +1000
Subject: [PATCH 129/210] Fix debugimportworlds 1.13

because someone changed PlotId.fromString to throw an exception without updating things that call it
---
 .../plotsquared/plot/commands/DebugImportWorlds.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
index 85fb9a752..f46e9e588 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
@@ -42,7 +42,7 @@ import java.util.UUID;
         }
         for (File folder : container.listFiles()) {
             String name = folder.getName();
-            if (!WorldUtil.IMP.isWorld(name) && PlotId.fromString(name) == null) {
+            if (!WorldUtil.IMP.isWorld(name) && PlotId.fromStringOrNull(name) == null) {
                 UUID uuid = UUIDHandler.getUUID(name, null);
                 if (uuid == null) {
                     uuid =

From 8ac23b92d87b9f8a54098df26f2c9f4ec6265e75 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Wed, 17 Apr 2019 22:18:03 +1000
Subject: [PATCH 130/210] Use UUID, not just name

---
 .../plotsquared/plot/commands/DebugImportWorlds.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
index f46e9e588..b800932a8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
@@ -3,6 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
@@ -43,7 +44,12 @@ import java.util.UUID;
         for (File folder : container.listFiles()) {
             String name = folder.getName();
             if (!WorldUtil.IMP.isWorld(name) && PlotId.fromStringOrNull(name) == null) {
-                UUID uuid = UUIDHandler.getUUID(name, null);
+                UUID uuid;
+                if (name.length() > 16) {
+                    uuid = UUID.fromString(name);
+                } else {
+                    uuid = UUIDHandler.getUUID(name, null);
+                }
                 if (uuid == null) {
                     uuid =
                         UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(Charsets.UTF_8));

From 815e513093cec11e2902bf2c1eea72a4759dfe52 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 19 Apr 2019 12:53:48 +1000
Subject: [PATCH 131/210] Fix teleportOnLogin error

---
 .../plotsquared/plot/object/PlotPlayer.java   | 104 +++++++++---------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index 47d4f20e1..f25bb988d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -462,8 +462,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      */
     public void unregister() {
         Plot plot = getCurrentPlot();
-        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
-            .getArea() instanceof SinglePlotArea) {
+        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot.getArea() instanceof SinglePlotArea) {
             PlotId id = plot.getId();
             int x = id.x;
             int z = id.y;
@@ -538,59 +537,60 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                 @Override public void run(Map<String, byte[]> value) {
                     try {
                         PlotPlayer.this.metaMap = value;
-                        if (!value.isEmpty()) {
-                            if (Settings.Enabled_Components.PERSISTENT_META) {
-                                PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
-                                if (manager instanceof SinglePlotAreaManager) {
-                                    PlotArea area = ((SinglePlotAreaManager) manager).getArea();
-                                    byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
-                                    if (arr != null) {
-                                        removePersistentMeta("quitLoc");
+                        if (value.isEmpty()) {
+                            return;
+                        }
 
-                                        if (getMeta("teleportOnLogin", true)) {
-                                            ByteBuffer quitWorld = ByteBuffer.wrap(arr);
-                                            final int plotX = quitWorld.getShort();
-                                            final int plotZ = quitWorld.getShort();
-                                            PlotId id = new PlotId(plotX, plotZ);
-                                            int x = quitWorld.getInt();
-                                            int y = quitWorld.get() & 0xFF;
-                                            int z = quitWorld.getInt();
-                                            Plot plot = area.getOwnedPlot(id);
-                                            if (plot != null) {
-                                                final Location loc =
-                                                    new Location(plot.getWorldName(), x, y, z);
-                                                if (plot.isLoaded()) {
-                                                    TaskManager.runTask(() -> {
-                                                        if (getMeta("teleportOnLogin", true)) {
-                                                            teleport(loc);
-                                                            sendMessage(
-                                                                Captions.TELEPORTED_TO_PLOT.f()
-                                                                + " (quitLoc) (" + plotX + ","
-                                                                + plotZ + ")");
-                                                        }
-                                                    });
-                                                } else if (!PlotSquared.get()
-                                                    .isMainThread(Thread.currentThread())) {
-                                                    if (getMeta("teleportOnLogin", true)) {
-                                                        if (plot.teleportPlayer(PlotPlayer.this)) {
-                                                            TaskManager.runTask(() -> {
-                                                                if (getMeta("teleportOnLogin",
-                                                                    true)) {
-                                                                    teleport(loc);
-                                                                    sendMessage(
-                                                                        Captions.TELEPORTED_TO_PLOT
-                                                                            .f()
-                                                                            + " (quitLoc-unloaded) ("
-                                                                            + plotX + "," + plotZ
-                                                                            + ")");
-                                                                }
-                                                            });
-                                                        }
-                                                    }
-                                                }
+                        if (!Settings.Enabled_Components.PERSISTENT_META) {
+                            return;
+                        }
+                        PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
+
+                        if (!(manager instanceof SinglePlotAreaManager)) {
+                            return;
+                        }
+                        PlotArea area = ((SinglePlotAreaManager) manager).getArea();
+                        byte[] arr = PlotPlayer.this.getPersistentMeta("quitLoc");
+                        if (arr == null) {
+                            return;
+                        }
+                        removePersistentMeta("quitLoc");
+
+                        if (!getMeta("teleportOnLogin", true)) {
+                            return;
+                        }
+                        ByteBuffer quitWorld = ByteBuffer.wrap(arr);
+                        final int plotX = quitWorld.getShort();
+                        final int plotZ = quitWorld.getShort();
+                        PlotId id = new PlotId(plotX, plotZ);
+                        int x = quitWorld.getInt();
+                        int y = quitWorld.get() & 0xFF;
+                        int z = quitWorld.getInt();
+                        Plot plot = area.getOwnedPlot(id);
+
+                        if (plot == null) {
+                            return;
+                        }
+
+                        final Location loc = new Location(plot.getWorldName(), x, y, z);
+                        if (plot.isLoaded()) {
+                            TaskManager.runTask(() -> {
+                                if (getMeta("teleportOnLogin", true)) {
+                                    teleport(loc);
+                                    sendMessage(Captions.TELEPORTED_TO_PLOT.f() + " (quitLoc) (" + plotX + "," + plotZ + ")");
+                                }
+                            });
+                        } else if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                            if (getMeta("teleportOnLogin", true)) {
+                                if (plot.teleportPlayer(PlotPlayer.this)) {
+                                    TaskManager.runTask(() -> {
+                                        if (getMeta("teleportOnLogin",true)) {
+                                            if (plot.isLoaded()) {
+                                                teleport(loc);
+                                                sendMessage(Captions.TELEPORTED_TO_PLOT.f() + " (quitLoc-unloaded) (" + plotX + "," + plotZ + ")");
                                             }
                                         }
-                                    }
+                                    });
                                 }
                             }
                         }

From ea26ec628db0e5e8e4c843ad06804815c13943dd Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 19 Apr 2019 13:02:50 +1000
Subject: [PATCH 132/210] Use Settings.Teleport.ON_LOGIN

---
 .../intellectualsites/plotsquared/plot/object/PlotPlayer.java | 2 +-
 .../intellectualsites/plotsquared/plot/util/EventUtil.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index f25bb988d..a08017a12 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -541,7 +541,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                             return;
                         }
 
-                        if (!Settings.Enabled_Components.PERSISTENT_META) {
+                        if (!Settings.Teleport.ON_LOGIN) {
                             return;
                         }
                         PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index 4e1d4fd87..0e9a6f40f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -7,6 +7,8 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
 import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 
 import javax.annotation.Nullable;
@@ -75,7 +77,7 @@ public abstract class EventUtil {
             }
         }
         final Plot plot = player.getCurrentPlot();
-        if (Settings.Teleport.ON_LOGIN && plot != null) {
+        if (Settings.Teleport.ON_LOGIN && plot != null && !(plot.getArea() instanceof SinglePlotArea)) {
             TaskManager.runTask(() -> plot.teleportPlayer(player));
             MainUtil.sendMessage(player,
                 Captions.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot

From bb44c2ea92b9fe0c42bfdf4590469f8712b539d2 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sat, 20 Apr 2019 16:26:31 +0100
Subject: [PATCH 133/210] parsable build number

---
 build.gradle | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7bb184b05..0edf1ecb7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,11 +32,15 @@ ext {
     date = git.head().getDate().format("yy.MM.dd")
     revision = "-${git.head().abbreviatedId}"
     parents = git.head().parentIds;
-    index = -2039;  // Offset to match CI
-    for (; parents != null && !parents.isEmpty(); index++) {
-        parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
+    if (project.hasProperty('buildnumber')) {
+        buildNumber = "$buildnumber"
+    } else {
+        index = -2042;  // Offset to match CI
+        for (; parents != null && !parents.isEmpty(); index++) {
+            parents = git.getResolve().toCommit(parents.get(0)).getParentIds()
+        }
+        buildNumber = "${index}"
     }
-    buildNumber = "${index}"
 }
 
 // version = String.format("%s.%s%s%s", rootVersion, date, revision, buildNumber)
@@ -72,7 +76,7 @@ subprojects {
         testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
         testImplementation "junit:junit:4.12"
     }
-    
+
     repositories {
         mavenCentral()
         maven { url "http://maven.sk89q.com/repo/" }

From 406dd22703adec1bbea8061deac5b05e6290faeb Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 23 Apr 2019 01:06:41 +1000
Subject: [PATCH 134/210] Workaround for effective permission check

---
 .../bukkit/object/BukkitPlayer.java           | 60 +++++++++++++------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index f4e1b8e3c..caac45a20 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -7,6 +7,7 @@ import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -16,8 +17,13 @@ import org.bukkit.event.Event;
 import org.bukkit.event.EventException;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+import org.bukkit.permissions.Permissible;
+import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.RegisteredListener;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
@@ -99,6 +105,8 @@ public class BukkitPlayer extends PlotPlayer {
         return this.player.hasPermission(permission);
     }
 
+    private static boolean CHECK_EFFECTIVE = true;
+
     @Override public int hasPermissionRange(String stub, int range) {
         if (hasPermission(Captions.PERMISSION_ADMIN.s())) {
             return Integer.MAX_VALUE;
@@ -117,29 +125,43 @@ public class BukkitPlayer extends PlotPlayer {
             return Integer.MAX_VALUE;
         }
         int max = 0;
-        String stubPlus = stub + ".";
-        Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
-        if (!effective.isEmpty()) {
-            for (PermissionAttachmentInfo attach : effective) {
-                String perm = attach.getPermission();
-                if (perm.startsWith(stubPlus)) {
-                    String end = perm.substring(stubPlus.length());
-                    if (MathMan.isInteger(end)) {
-                        int val = Integer.parseInt(end);
-                        if (val > range) {
-                            return val;
-                        }
-                        if (val > max) {
-                            max = val;
+        if (CHECK_EFFECTIVE) {
+            boolean hasAny = false;
+            String stubPlus = stub + ".";
+            Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
+            if (!effective.isEmpty()) {
+                for (PermissionAttachmentInfo attach : effective) {
+                    String permStr = attach.getPermission();
+                    if (permStr.startsWith(stubPlus)) {
+                        hasAny = true;
+                        String end = permStr.substring(stubPlus.length());
+                        if (MathMan.isInteger(end)) {
+                            int val = Integer.parseInt(end);
+                            if (val > range) {
+                                return val;
+                            }
+                            if (val > max) {
+                                max = val;
+                            }
                         }
                     }
                 }
-            }
-        } else {
-            for (int i = range; i > 0; i--) {
-                if (hasPermission(stub + "." + i)) {
-                    return i;
+                if (hasAny) {
+                    return max;
                 }
+                // Workaround
+                for (PermissionAttachmentInfo attach : effective) {
+                    String permStr = attach.getPermission();
+                    Permission perm = Bukkit.getPluginManager().getPermission(permStr);
+                    @NotNull PermissionDefault def = perm.getDefault();
+                    if (!def.getValue(false)) return max;
+                }
+                CHECK_EFFECTIVE = false;
+            }
+        }
+        for (int i = range; i > 0; i--) {
+            if (hasPermission(stub + "." + i)) {
+                return i;
             }
         }
         return max;

From f5fa15080cfaffc14ca5a925fe2c18199de616a8 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 22 Apr 2019 11:45:23 -0400
Subject: [PATCH 135/210] Minor javadoc updates

---
 .../plotsquared/plot/object/OfflinePlotPlayer.java    | 11 ++++++-----
 .../plotsquared/plot/object/PlotPlayer.java           |  8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
index 709a7cee6..85e6e72d8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/OfflinePlotPlayer.java
@@ -5,28 +5,29 @@ import java.util.UUID;
 public interface OfflinePlotPlayer {
 
     /**
-     * Get the {@code UUID} of this player
+     * Gets the {@code UUID} of this player
      *
      * @return the player {@link UUID}
      */
     UUID getUUID();
 
     /**
-     * Get the time in milliseconds when the player was last seen online.
+     * Gets the time in milliseconds when the player was last seen online.
      *
      * @return the time in milliseconds when last online
+     * @deprecated This method may be inconsistent across platforms. The javadoc may be wrong depending on which platform is used.
      */
-    long getLastPlayed();
+    @SuppressWarnings("DeprecatedIsStillUsed") @Deprecated long getLastPlayed();
 
     /**
      * Checks if this player is online.
      *
-     * @return true if this player is online
+     * @return {@code true} if this player is online
      */
     boolean isOnline();
 
     /**
-     * Get the name of this player.
+     * Gets the name of this player.
      *
      * @return the player name
      */
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index a08017a12..c850513cd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -426,12 +426,16 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      */
     public abstract void setTime(long time);
 
+    /**
+     * Determines whether or not the player can fly.
+     * @return {@code true} if the player is allowed to fly
+     */
     public abstract boolean getFlight();
 
     /**
-     * Set this player's fly mode.
+     * Sets whether or not this player can fly.
      *
-     * @param fly if the player can fly
+     * @param fly {@code true} if the player can fly, otherwise {@code false}
      */
     public abstract void setFlight(boolean fly);
 

From 145af1e091e9d422a871e43e18966d073e39add6 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 23 Apr 2019 01:53:24 +1000
Subject: [PATCH 136/210] fix workaround

---
 .../plotsquared/bukkit/object/BukkitPlayer.java             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index caac45a20..71014eb78 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -152,9 +152,9 @@ public class BukkitPlayer extends PlotPlayer {
                 // Workaround
                 for (PermissionAttachmentInfo attach : effective) {
                     String permStr = attach.getPermission();
-                    Permission perm = Bukkit.getPluginManager().getPermission(permStr);
-                    @NotNull PermissionDefault def = perm.getDefault();
-                    if (!def.getValue(false)) return max;
+                    if (permStr.startsWith("plots.") && !permStr.equals("plots.use")) {
+                        return max;
+                    }
                 }
                 CHECK_EFFECTIVE = false;
             }

From ef8d33db41162d3c9e569cca78242812e81a42f3 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 22 Apr 2019 11:55:05 -0400
Subject: [PATCH 137/210] Minor command changes Changed RequiredType in some
 classes and formatting changed in others.

---
 .../plotsquared/plot/commands/Add.java        | 24 +++++++++----------
 .../plotsquared/plot/commands/Auto.java       |  8 +++++--
 .../plotsquared/plot/commands/Biome.java      |  8 +++----
 .../plotsquared/plot/commands/Condense.java   | 12 ++++------
 .../plotsquared/plot/commands/Deny.java       |  2 +-
 .../plotsquared/plot/commands/Grant.java      | 24 ++++++++++++++-----
 .../plotsquared/plot/commands/Inbox.java      |  4 ++--
 .../plotsquared/plot/commands/Info.java       | 12 +++++++---
 .../plotsquared/plot/commands/Kick.java       |  2 +-
 .../plotsquared/plot/commands/Like.java       |  7 ++++--
 .../plotsquared/plot/commands/Swap.java       |  2 +-
 .../plotsquared/plot/commands/Unlink.java     | 16 ++++++-------
 12 files changed, 69 insertions(+), 52 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
index b5bbbd2e0..5741fb7ba 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
@@ -19,7 +19,7 @@ import java.util.UUID;
 @CommandDeclaration(command = "add",
     description = "Allow a user to build in a plot while you are online",
     usage = "/plot add <player>", category = CommandCategory.SETTINGS, permission = "plots.add",
-    requiredType = RequiredType.NONE) public class Add extends Command {
+    requiredType = RequiredType.PLAYER) public class Add extends Command {
 
     public Add() {
         super(MainCommand.getInstance(), true);
@@ -63,21 +63,19 @@ import java.util.UUID;
         checkTrue(size <= plot.getArea().MAX_PLOT_MEMBERS || Permissions
                 .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST),
             Captions.PLOT_MAX_MEMBERS);
-        confirm.run(this, new Runnable() {
-            @Override // Success
-            public void run() {
-                for (UUID uuid : uuids) {
-                    if (uuid != DBFunc.EVERYONE) {
-                        if (!plot.removeTrusted(uuid)) {
-                            if (plot.getDenied().contains(uuid)) {
-                                plot.removeDenied(uuid);
-                            }
+        // Success
+        confirm.run(this, () -> {
+            for (UUID uuid : uuids) {
+                if (uuid != DBFunc.EVERYONE) {
+                    if (!plot.removeTrusted(uuid)) {
+                        if (plot.getDenied().contains(uuid)) {
+                            plot.removeDenied(uuid);
                         }
                     }
-                    plot.addMember(uuid);
-                    EventUtil.manager.callMember(player, plot, uuid, true);
-                    MainUtil.sendMessage(player, Captions.MEMBER_ADDED);
                 }
+                plot.addMember(uuid);
+                EventUtil.manager.callMember(player, plot, uuid, true);
+                MainUtil.sendMessage(player, Captions.MEMBER_ADDED);
             }
         }, null);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index 11d9c30f4..fb6d571be 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -25,8 +25,12 @@ public class Auto extends SubCommand {
         if (allowedPlots == null) {
             allowedPlots = player.getAllowedPlots();
         }
-        int currentPlots =
-            Settings.Limit.GLOBAL ? player.getPlotCount() : player.getPlotCount(plotarea.worldname);
+        int currentPlots;
+        if (Settings.Limit.GLOBAL) {
+            currentPlots = player.getPlotCount();
+        } else {
+            currentPlots = player.getPlotCount(plotarea.worldname);
+        }
         int diff = currentPlots - allowedPlots;
         if (diff + sizeX * sizeZ > 0) {
             if (diff < 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
index 6f80ba6c5..b40167b4c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Biome.java
@@ -27,11 +27,9 @@ import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
             return false;
         }
         plot.addRunning();
-        plot.setBiome(value.toUpperCase(), new Runnable() {
-            @Override public void run() {
-                plot.removeRunning();
-                MainUtil.sendMessage(player, Captions.BIOME_SET_TO.s() + value.toLowerCase());
-            }
+        plot.setBiome(value.toUpperCase(), () -> {
+            plot.removeRunning();
+            MainUtil.sendMessage(player, Captions.BIOME_SET_TO.s() + value.toLowerCase());
         });
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
index 040fd97b8..1245d2cce 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
@@ -126,13 +126,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
                             }
                             i++;
                             final AtomicBoolean result = new AtomicBoolean(false);
-                            result.set(origin.move(possible, new Runnable() {
-                                @Override public void run() {
-                                    if (result.get()) {
-                                        MainUtil.sendMessage(player,
-                                            "Moving: " + origin + " -> " + possible);
-                                        TaskManager.runTaskLater(task, 1);
-                                    }
+                            result.set(origin.move(possible, () -> {
+                                if (result.get()) {
+                                    MainUtil.sendMessage(player,
+                                        "Moving: " + origin + " -> " + possible);
+                                    TaskManager.runTaskLater(task, 1);
                                 }
                             }, false));
                             if (result.get()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
index fe917e08a..34a2936f8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
@@ -16,7 +16,7 @@ import java.util.UUID;
 
 @CommandDeclaration(command = "deny", aliases = {"d", "ban"},
     description = "Deny a user from a plot", usage = "/plot deny <player>",
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Deny
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER) public class Deny
     extends SubCommand {
 
     public Deny() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
index ed3cc9856..a3e46dd08 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Grant.java
@@ -38,8 +38,12 @@ import java.util.UUID;
                 if (args.length > 2) {
                     break;
                 }
-                final UUID uuid =
-                    args.length == 2 ? UUIDHandler.getUUIDFromString(args[1]) : player.getUUID();
+                final UUID uuid;
+                if (args.length == 2) {
+                    uuid = UUIDHandler.getUUIDFromString(args[1]);
+                } else {
+                    uuid = player.getUUID();
+                }
                 if (uuid == null) {
                     Captions.INVALID_PLAYER.send(player, args[1]);
                     return;
@@ -47,12 +51,20 @@ import java.util.UUID;
                 MainUtil.getPersistentMeta(uuid, "grantedPlots", new RunnableVal<byte[]>() {
                     @Override public void run(byte[] array) {
                         if (arg0.equals("check")) { // check
-                            int granted =
-                                array == null ? 0 : ByteArrayUtilities.bytesToInteger(array);
+                            int granted;
+                            if (array == null) {
+                                granted = 0;
+                            } else {
+                                granted = ByteArrayUtilities.bytesToInteger(array);
+                            }
                             Captions.GRANTED_PLOTS.send(player, granted);
                         } else { // add
-                            int amount =
-                                1 + (array == null ? 0 : ByteArrayUtilities.bytesToInteger(array));
+                            int amount;
+                            if (array == null) {
+                                amount = 1;
+                            } else {
+                                amount = 1 + ByteArrayUtilities.bytesToInteger(array);
+                            }
                             boolean replace = array != null;
                             String key = "grantedPlots";
                             byte[] rawData = ByteArrayUtilities.integerToBytes(amount);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
index 259395b5a..4a59850a9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Inbox.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 @CommandDeclaration(command = "inbox", description = "Review the comments for a plot",
     usage = "/plot inbox [inbox] [delete <index>|clear|page]", permission = "plots.inbox",
-    category = CommandCategory.CHAT, requiredType = RequiredType.NONE) public class Inbox
+    category = CommandCategory.CHAT, requiredType = RequiredType.PLAYER) public class Inbox
     extends SubCommand {
 
     public void displayComments(PlotPlayer player, List<PlotComment> oldComments, int page) {
@@ -23,7 +23,7 @@ import java.util.List;
             MainUtil.sendMessage(player, Captions.INBOX_EMPTY);
             return;
         }
-        PlotComment[] comments = oldComments.toArray(new PlotComment[oldComments.size()]);
+        PlotComment[] comments = oldComments.toArray(new PlotComment[0]);
         if (page < 0) {
             page = 0;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
index 4fb4d6859..f93d95a32 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -130,9 +130,15 @@ import java.util.UUID;
         if (arg != null) {
             info = getCaption(arg);
             if (info == null) {
-                MainUtil.sendMessage(player,
-                    "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
-                        + "&aowner&7, " + (Settings.Ratings.USE_LIKES ? " &alikes" : " &arating"));
+                if (Settings.Ratings.USE_LIKES) {
+                    MainUtil.sendMessage(player,
+                        "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                            + "&aowner&7, " + " &alikes");
+                } else {
+                    MainUtil.sendMessage(player,
+                        "&6Categories&7: &amembers&7, &aalias&7, &abiome&7, &aseen&7, &adenied&7, &aflags&7, &aid&7, &asize&7, &atrusted&7, "
+                            + "&aowner&7, " + " &arating");
+                }
                 return false;
             }
             full = true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
index 88e69f556..b749eaba4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
@@ -19,7 +19,7 @@ import java.util.UUID;
 
 @CommandDeclaration(command = "kick", aliases = {"k"}, description = "Kick a player from your plot",
     permission = "plots.kick", usage = "/plot kick <player>", category = CommandCategory.TELEPORT,
-    requiredType = RequiredType.NONE) public class Kick extends SubCommand {
+    requiredType = RequiredType.PLAYER) public class Kick extends SubCommand {
 
     public Kick() {
         super(Argument.PlayerName);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
index d7c6223c3..7f1b57c6d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
@@ -96,8 +96,11 @@ public class Like extends SubCommand {
             final Rating result = EventUtil.manager.callRating(player, plot, new Rating(rating));
             if (result != null) {
                 plot.addRating(uuid, result);
-                sendMessage(player, like ? Captions.RATING_LIKED : Captions.RATING_DISLIKED,
-                    plot.getId().toString());
+                if (like) {
+                    sendMessage(player, Captions.RATING_LIKED, plot.getId().toString());
+                } else {
+                    sendMessage(player, Captions.RATING_DISLIKED, plot.getId().toString());
+                }
             }
         };
         if (plot.getSettings().ratings == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
index d911ae3a5..da709d2a3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Swap.java
@@ -9,7 +9,7 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 
 @CommandDeclaration(usage = "/plot swap <X;Z>", command = "swap", description = "Swap two plots",
-    aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE)
+    aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER)
 public class Swap extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
index abca00a79..dc928c765 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
@@ -7,8 +7,8 @@ import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
-@CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
-    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
+@CommandDeclaration(command = "unlink", aliases = {"u",
+    "unmerge"}, description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
 public class Unlink extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
@@ -38,14 +38,12 @@ public class Unlink extends SubCommand {
         } else {
             createRoad = true;
         }
-        Runnable runnable = new Runnable() {
-            @Override public void run() {
-                if (!plot.unlinkPlot(createRoad, createRoad)) {
-                    MainUtil.sendMessage(player, "&cUnlink has been cancelled");
-                    return;
-                }
-                MainUtil.sendMessage(player, Captions.UNLINK_SUCCESS);
+        Runnable runnable = () -> {
+            if (!plot.unlinkPlot(createRoad, createRoad)) {
+                MainUtil.sendMessage(player, "&cUnlink has been cancelled");
+                return;
             }
+            MainUtil.sendMessage(player, Captions.UNLINK_SUCCESS);
         };
         if (hasConfirmation(player)) {
             CmdConfirm.addPending(player, "/plot unlink " + plot.getId(), runnable);

From 21a5b04b7b6ef92dab65f89c7c28da934e6f6d49 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Tue, 23 Apr 2019 12:57:39 +1000
Subject: [PATCH 138/210] remove debug

---
 .../plotsquared/plot/object/worlds/SinglePlotArea.java           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index c6a9a4c3e..b8a27bab9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -37,7 +37,6 @@ public class SinglePlotArea extends GridPlotWorld {
     }
 
     @Override public void saveConfiguration(ConfigurationSection config) {
-        new Exception().printStackTrace();
         super.saveConfiguration(config);
     }
 

From 1118901ca2de68644e3cf5ef2b01ac13060c6967 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 23 Apr 2019 13:45:24 -0400
Subject: [PATCH 139/210] Initial 1.14 Update

---
 Bukkit/build.gradle                           |  3 +-
 .../plotsquared/bukkit/BukkitMain.java        | 11 +++----
 .../bukkit/listeners/ChunkListener.java       | 10 +++----
 .../bukkit/listeners/PlayerEvents.java        |  8 ++---
 .../entity/ReplicatingEntityWrapper.java      | 29 +++++++++----------
 .../bukkit/util/BukkitChunkManager.java       | 11 ++++---
 .../bukkit/util/BukkitHybridUtils.java        |  2 +-
 .../bukkit/util/BukkitSetupUtils.java         |  4 +--
 .../plotsquared/bukkit/util/BukkitUtil.java   |  4 +--
 .../plotsquared/bukkit/util/SendChunk.java    |  2 +-
 10 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index b7c87d99c..c22f4d681 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     implementation project(':Core')
     compile project(':Core')
-    compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
+    compile 'org.spigotmc:spigot-api:1.14-pre5-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
     compile(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
@@ -43,7 +43,6 @@ shadowJar {
         include(dependency('com.squareup.okio:okio:2.2.2'))
         include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.21'))
     }
-    // relocate('org.mcstats', 'com.plotsquared.stats')
     archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
     destinationDir = file '../target'
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 340197c5a..93ee1c8ac 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -247,7 +247,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                     }
                                 } else {
                                     result = world
-                                        .unloadChunk(chunkI.getX(), chunkI.getZ(), true, false);
+                                        .unloadChunk(chunkI.getX(), chunkI.getZ(), true);
                                 }
                                 if (!result) {
                                     continue outer;
@@ -332,15 +332,12 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                     Entity entity = iterator.next();
                     switch (entity.getType()) {
                         case EGG:
-                        case COMPLEX_PART:
                         case FISHING_HOOK:
                         case ENDER_SIGNAL:
-                        case LINGERING_POTION:
                         case AREA_EFFECT_CLOUD:
                         case EXPERIENCE_ORB:
                         case LEASH_HITCH:
                         case FIREWORK:
-                        case WEATHER:
                         case LIGHTNING:
                         case WITHER_SKULL:
                         case UNKNOWN:
@@ -352,7 +349,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                         case SNOWBALL:
                         case SHULKER_BULLET:
                         case SPECTRAL_ARROW:
-                        case TIPPED_ARROW:
                         case ENDER_PEARL:
                         case ARROW:
                         case LLAMA_SPIT:
@@ -421,12 +417,12 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                             if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
                                 LivingEntity livingEntity = (LivingEntity) entity;
                                 List<MetadataValue> meta = entity.getMetadata("plot");
-                                if (meta != null && !meta.isEmpty()) {
+                                if (!meta.isEmpty()) {
                                     if (livingEntity.isLeashed()) {
                                         continue;
                                     }
                                     List<MetadataValue> keep = entity.getMetadata("keep");
-                                    if (keep != null && !keep.isEmpty()) {
+                                    if (!keep.isEmpty()) {
                                         continue;
                                     }
 
@@ -774,6 +770,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                 return;
             }
         }
+        assert world != null;
         ChunkGenerator gen = world.getGenerator();
         if (gen instanceof BukkitPlotGenerator) {
             PlotSquared.get().loadWorld(worldName, (BukkitPlotGenerator) gen);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index 902aa86b5..82dd29531 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -94,7 +94,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                     if (System.currentTimeMillis() - start > 5) {
                         return;
                     }
-                    chunk.unload(true, false);
+                    chunk.unload(true);
                 }
             } catch (Throwable e) {
                 e.printStackTrace();
@@ -112,7 +112,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
             field.set(false);
             if (chunk.isLoaded()) {
                 ignoreUnload = true;
-                chunk.unload(false, false);
+                chunk.unload(false);
                 ignoreUnload = false;
             }
         }
@@ -225,7 +225,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                 TaskManager.tasks.remove(currentIndex);
                 PlotSquared
                     .debug(Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                chunk.unload(true, true);
+                chunk.unload(true);
                 return;
             }
             BlockState[] tiles = chunk.getTileEntities();
@@ -234,7 +234,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                 TaskManager.tasks.remove(currentIndex);
                 PlotSquared
                     .debug(Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                chunk.unload(true, true);
+                chunk.unload(true);
                 return;
             }
             long start = System.currentTimeMillis();
@@ -245,7 +245,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
                     TaskManager.tasks.remove(currentIndex);
                     PlotSquared.debug(
                         Captions.PREFIX.s() + "&aSuccessfully processed and unloaded chunk!");
-                    chunk.unload(true, true);
+                    chunk.unload(true);
                     return;
                 }
                 tiles[i].getBlock().setType(Material.AIR, false);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 33e0093f8..c611e80f4 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -108,7 +108,6 @@ import java.util.regex.Pattern;
             case EGG:
             case ENDER_PEARL:
             case FIREBALL:
-            case LINGERING_POTION:
             case LLAMA_SPIT:
             case SHULKER_BULLET:
             case SMALL_FIREBALL:
@@ -116,13 +115,11 @@ import java.util.regex.Pattern;
             case SPECTRAL_ARROW:
             case SPLASH_POTION:
             case THROWN_EXP_BOTTLE:
-            case TIPPED_ARROW:
                 // projectile
             case FALLING_BLOCK:
             case PRIMED_TNT:
                 // Block entities
             case AREA_EFFECT_CLOUD:
-            case COMPLEX_PART:
             case ENDER_CRYSTAL:
             case ENDER_SIGNAL:
             case EVOKER_FANGS:
@@ -132,7 +129,6 @@ import java.util.regex.Pattern;
             case LEASH_HITCH:
             case LIGHTNING:
             case UNKNOWN:
-            case WEATHER:
             case WITHER_SKULL:
                 // non moving / unmovable
                 return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP);
@@ -1956,8 +1952,8 @@ import java.util.regex.Pattern;
                     case CHAIN_COMMAND_BLOCK:
                     case REPEATING_COMMAND_BLOCK:
 
-                    case SIGN:
-                    case WALL_SIGN:
+                    case LEGACY_SIGN:
+                    case LEGACY_WALL_SIGN:
 
                     case REDSTONE_TORCH:
                     case REDSTONE_WALL_TORCH:
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index f05555947..b569e6577 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -63,7 +63,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 this.dataByte = getOrdinal(TreeSpecies.values(), boat.getWoodType());
                 return;
             case ARROW:
-            case COMPLEX_PART:
             case EGG:
             case ENDER_CRYSTAL:
             case ENDER_PEARL:
@@ -87,14 +86,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case MINECART_FURNACE:
             case SPLASH_POTION:
             case THROWN_EXP_BOTTLE:
-            case WEATHER:
             case WITHER_SKULL:
             case UNKNOWN:
-            case TIPPED_ARROW:
             case SPECTRAL_ARROW:
             case SHULKER_BULLET:
             case DRAGON_FIREBALL:
-            case LINGERING_POTION:
             case AREA_EFFECT_CLOUD:
             case TRIDENT:
             case LLAMA_SPIT:
@@ -164,9 +160,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 storeLiving((LivingEntity) entity);
                 return;
             // END TAMEABLE //
+            //todo fix sheep
             case SHEEP:
                 Sheep sheep = (Sheep) entity;
-                this.dataByte = (byte) (sheep.isSheared() ? 1 : 0);
+                if (sheep.isSheared()) {
+                    this.dataByte = (byte) 1;
+                } else {
+                    this.dataByte = (byte) 0;
+                }
                 this.dataByte2 = sheep.getColor().getDyeData();
                 storeAgeable(sheep);
                 storeLiving(sheep);
@@ -324,12 +325,14 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
 
     void restoreEquipment(LivingEntity entity) {
         EntityEquipment equipment = entity.getEquipment();
-        equipment.setItemInMainHand(this.lived.mainHand);
-        equipment.setItemInOffHand(this.lived.offHand);
-        equipment.setHelmet(this.lived.helmet);
-        equipment.setChestplate(this.lived.chestplate);
-        equipment.setLeggings(this.lived.leggings);
-        equipment.setBoots(this.lived.boots);
+        if (equipment != null) {
+            equipment.setItemInMainHand(this.lived.mainHand);
+            equipment.setItemInOffHand(this.lived.offHand);
+            equipment.setHelmet(this.lived.helmet);
+            equipment.setChestplate(this.lived.chestplate);
+            equipment.setLeggings(this.lived.leggings);
+            equipment.setBoots(this.lived.boots);
+        }
     }
 
     private void restoreInventory(InventoryHolder entity) {
@@ -462,7 +465,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 ((Slime) entity).setSize(this.dataByte);
                 return entity;
             case ARROW:
-            case COMPLEX_PART:
             case EGG:
             case ENDER_CRYSTAL:
             case ENDER_PEARL:
@@ -485,11 +487,8 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case SNOWBALL:
             case SPLASH_POTION:
             case THROWN_EXP_BOTTLE:
-            case WEATHER:
-            case TIPPED_ARROW:
             case SPECTRAL_ARROW:
             case SHULKER_BULLET:
-            case LINGERING_POTION:
             case AREA_EFFECT_CLOUD:
             case DRAGON_FIREBALL:
             case WITHER_SKULL:
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 02c24362a..099b5b3fc 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -395,9 +395,9 @@ public class BukkitChunkManager extends ChunkManager {
         final boolean safe) {
         if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
             TaskManager
-                .runTask(() -> BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe));
+                .runTask(() -> BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save));
         } else {
-            BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save, safe);
+            BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save);
         }
     }
 
@@ -466,7 +466,6 @@ public class BukkitChunkManager extends ChunkManager {
             case ENDER_PEARL:
             case ARROW:
             case TRIDENT:
-            case TIPPED_ARROW:
             case SHULKER_BULLET:
             case SPECTRAL_ARROW:
             case DRAGON_FIREBALL:
@@ -476,18 +475,15 @@ public class BukkitChunkManager extends ChunkManager {
             case FALLING_BLOCK:
                 // Block entities
             case ENDER_CRYSTAL:
-            case COMPLEX_PART:
             case FISHING_HOOK:
             case ENDER_SIGNAL:
             case EXPERIENCE_ORB:
             case LEASH_HITCH:
             case FIREWORK:
-            case WEATHER:
             case LIGHTNING:
             case WITHER_SKULL:
             case UNKNOWN:
             case AREA_EFFECT_CLOUD:
-            case LINGERING_POTION:
             case EVOKER_FANGS:
                 // non moving / unremovable
                 break;
@@ -534,6 +530,9 @@ public class BukkitChunkManager extends ChunkManager {
             case SALMON:
             case PUFFERFISH:
             case TROPICAL_FISH:
+            case CAT:
+            case FOX:
+            case PANDA:
                 // animal
                 count[3]++;
                 count[1]++;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
index dace8ab26..fb0d20fbc 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java
@@ -304,7 +304,7 @@ public class BukkitHybridUtils extends HybridUtils {
                             }
                         }
                     }
-                    worldObj.unloadChunkRequest(X, Z, true);
+                    worldObj.unloadChunkRequest(X, Z);
                 }
             }, () -> TaskManager.runTaskAsync(run), 5);
         });
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
index ad3de7cd3..8309203ef 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -61,11 +61,11 @@ public class BukkitSetupUtils extends SetupUtils {
         }
         if (save) {
             for (Chunk chunk : world.getLoadedChunks()) {
-                chunk.unload(true, false);
+                chunk.unload(true);
             }
         } else {
             for (Chunk chunk : world.getLoadedChunks()) {
-                chunk.unload(false, false);
+                chunk.unload(false);
             }
         }
         Bukkit.unloadWorld(world, false);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index a1a358737..8b6ea0ec8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -331,7 +331,7 @@ import java.util.*;
         final Block block = world.getBlockAt(x, y, z);
         //        block.setType(Material.AIR);
         final Material type = block.getType();
-        if (type != Material.SIGN && type != Material.WALL_SIGN) {
+        if (type != Material.LEGACY_SIGN && type != Material.LEGACY_WALL_SIGN) {
             BlockFace facing = BlockFace.EAST;
             if (world.getBlockAt(x, y, z + 1).getType().isSolid()) {
                 facing = BlockFace.NORTH;
@@ -340,7 +340,7 @@ import java.util.*;
             } else if (world.getBlockAt(x, y, z - 1).getType().isSolid()) {
                 facing = BlockFace.SOUTH;
             }
-            block.setType(Material.WALL_SIGN, false);
+            block.setType(Material.LEGACY_WALL_SIGN, false);
             final WallSign sign = (WallSign) block.getBlockData();
             sign.setFacing(facing);
             block.setBlockData(sign, false);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
index cecea15ff..62d82cedb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
@@ -116,7 +116,7 @@ public class SendChunk {
         for (final Chunk chunk : chunks) {
             TaskManager.runTask(() -> {
                 try {
-                    chunk.unload(true, false);
+                    chunk.unload(true);
                 } catch (Throwable ignored) {
                     String worldName = chunk.getWorld().getName();
                     PlotSquared.debug(

From b2b2f3cd058c45f8cbc08b007f72b397f4ebdacb Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 23 Apr 2019 14:24:55 -0400
Subject: [PATCH 140/210] attempt to fix signs

---
 .../plotsquared/bukkit/util/BukkitUtil.java                  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 8b6ea0ec8..1eea02ab4 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -13,6 +13,7 @@ import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.block.*;
+import org.bukkit.block.data.Rotatable;
 import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -341,8 +342,8 @@ import java.util.*;
                 facing = BlockFace.SOUTH;
             }
             block.setType(Material.LEGACY_WALL_SIGN, false);
-            final WallSign sign = (WallSign) block.getBlockData();
-            sign.setFacing(facing);
+            final Rotatable sign = (Rotatable) block.getBlockData();
+            sign.setRotation(facing);
             block.setBlockData(sign, false);
         }
         final BlockState blockstate = block.getState();

From 9b3ca4468cf134c941f47d79cd0752db78090cdf Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 23 Apr 2019 14:41:20 -0400
Subject: [PATCH 141/210] Temporary fix for a working 1.14 build

---
 .../plotsquared/bukkit/util/BukkitUtil.java                | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 1eea02ab4..1a8294d11 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -342,9 +342,10 @@ import java.util.*;
                 facing = BlockFace.SOUTH;
             }
             block.setType(Material.LEGACY_WALL_SIGN, false);
-            final Rotatable sign = (Rotatable) block.getBlockData();
-            sign.setRotation(facing);
-            block.setBlockData(sign, false);
+            Bukkit.getConsoleSender().sendMessage("Please report to MattBDev on Discord: " + block.getBlockData().getClass().getName());
+            //final Rotatable sign = (Rotatable) block.getBlockData();
+            //sign.setRotation(facing);
+            //block.setBlockData(sign, false);
         }
         final BlockState blockstate = block.getState();
         if (blockstate instanceof Sign) {

From 1e97392244ba2b04cb626bd1dd743fadbf26f76f Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 22:27:32 +0100
Subject: [PATCH 142/210] Update to gradle 5.4

---
 Bukkit/build.gradle                      |  8 ++++----
 Core/build.gradle                        |  6 +++---
 build.gradle                             | 12 ++++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index c22f4d681..19e71c895 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -37,11 +37,11 @@ shadowJar {
         include(dependency(':Core'))
         include(dependency('org.bstats:bstats-bukkit:1.4'))
         // update notification stuff
-        include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'))
-        include(dependency('com.squareup.retrofit2:retrofit:2.4.0'))
-        include(dependency('com.squareup.okhttp3:okhttp:3.14.0'))
+        include(dependency('com.github.Sauilitired:Jenkins4J:3.0-SNAPSHOT'))
+        include(dependency('com.squareup.retrofit2:retrofit:2.5.0'))
+        include(dependency('com.squareup.okhttp3:okhttp:3.14.1'))
         include(dependency('com.squareup.okio:okio:2.2.2'))
-        include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.21'))
+        include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.30'))
     }
     archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
     destinationDir = file '../target'
diff --git a/Core/build.gradle b/Core/build.gradle
index 48fa09110..0e24504f9 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -12,10 +12,10 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:1.18.4")
     testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
 
-    compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
-    compile 'com.squareup.okhttp3:okhttp:3.14.0'
+    compile 'com.github.Sauilitired:Jenkins4J:3.0-SNAPSHOT'
+    compile 'com.squareup.okhttp3:okhttp:3.14.1'
     compile 'com.squareup.okio:okio:2.2.2'
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.21'
+    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30'
 }
 
 sourceCompatibility = 1.8
diff --git a/build.gradle b/build.gradle
index 0edf1ecb7..b99c5bbdc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
     configurations.all {
         resolutionStrategy {
-            force 'org.ow2.asm:asm:7.0'
+            force 'org.ow2.asm:asm:7.1'
         }
     }
 }
@@ -69,11 +69,11 @@ subprojects {
         }
         //Minecraft uses Guava 21 as of 1.13.
         compile 'com.google.guava:guava:21.0'
-        compile("org.projectlombok:lombok:1.18.4")
-        compileOnly("org.projectlombok:lombok:1.18.4")
-        testCompileOnly("org.projectlombok:lombok:1.18.4")
-        annotationProcessor("org.projectlombok:lombok:1.18.4")
-        testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
+        compile("org.projectlombok:lombok:1.18.6")
+        compileOnly("org.projectlombok:lombok:1.18.6")
+        testCompileOnly("org.projectlombok:lombok:1.18.6")
+        annotationProcessor("org.projectlombok:lombok:1.18.6")
+        testAnnotationProcessor("org.projectlombok:lombok:1.18.6")
         testImplementation "junit:junit:4.12"
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2b3219323..db5043d4e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Dec 21 16:11:33 EST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From bd1217810f2577f7d67bcd6f16d588fe0df73568 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 22:30:31 +0100
Subject: [PATCH 143/210] Should fix the sign issue

---
 .../plotsquared/bukkit/util/BukkitUtil.java               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 1a8294d11..6f7e26e8a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -13,6 +13,7 @@ import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.block.*;
+import org.bukkit.block.data.Directional;
 import org.bukkit.block.data.Rotatable;
 import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Entity;
@@ -342,10 +343,9 @@ import java.util.*;
                 facing = BlockFace.SOUTH;
             }
             block.setType(Material.LEGACY_WALL_SIGN, false);
-            Bukkit.getConsoleSender().sendMessage("Please report to MattBDev on Discord: " + block.getBlockData().getClass().getName());
-            //final Rotatable sign = (Rotatable) block.getBlockData();
-            //sign.setRotation(facing);
-            //block.setBlockData(sign, false);
+            final Directional sign = (Directional) block.getBlockData();
+            sign.setFacing(facing);
+            block.setBlockData(sign, false);
         }
         final BlockState blockstate = block.getState();
         if (blockstate instanceof Sign) {

From 5ac00c4920805d2cb06d88ef2da87c8b890c010f Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 22:41:06 +0100
Subject: [PATCH 144/210] downgrade Jenkins4J

---
 Bukkit/build.gradle | 2 +-
 Core/build.gradle   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 19e71c895..b849afac8 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -37,7 +37,7 @@ shadowJar {
         include(dependency(':Core'))
         include(dependency('org.bstats:bstats-bukkit:1.4'))
         // update notification stuff
-        include(dependency('com.github.Sauilitired:Jenkins4J:3.0-SNAPSHOT'))
+        include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'))
         include(dependency('com.squareup.retrofit2:retrofit:2.5.0'))
         include(dependency('com.squareup.okhttp3:okhttp:3.14.1'))
         include(dependency('com.squareup.okio:okio:2.2.2'))
diff --git a/Core/build.gradle b/Core/build.gradle
index 0e24504f9..c07965771 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:1.18.4")
     testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
 
-    compile 'com.github.Sauilitired:Jenkins4J:3.0-SNAPSHOT'
+    compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
     compile 'com.squareup.okhttp3:okhttp:3.14.1'
     compile 'com.squareup.okio:okio:2.2.2'
     compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30'

From c7ba94f959df8ed4dda275fd2b9a91720b7d0a79 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 23:03:52 +0100
Subject: [PATCH 145/210] Fix legacy material loading error and Jenkins4J
 dependencies

---
 Bukkit/build.gradle                                  |  4 ++--
 .../bukkit/util/BukkitLegacyMappings.java            | 12 +++++++++---
 Core/build.gradle                                    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index b849afac8..e7c0e90ce 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -38,8 +38,8 @@ shadowJar {
         include(dependency('org.bstats:bstats-bukkit:1.4'))
         // update notification stuff
         include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'))
-        include(dependency('com.squareup.retrofit2:retrofit:2.5.0'))
-        include(dependency('com.squareup.okhttp3:okhttp:3.14.1'))
+        include(dependency('com.squareup.retrofit2:retrofit:2.4.0'))
+        include(dependency('com.squareup.okhttp3:okhttp:3.14.0'))
         include(dependency('com.squareup.okio:okio:2.2.2'))
         include(dependency('org.jetbrains.kotlin:kotlin-stdlib:1.3.30'))
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index 85da1affc..00edbb660 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -6,6 +6,7 @@ import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.util.LegacyMappings;
 import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
 import lombok.*;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 
 import java.util.*;
@@ -675,9 +676,14 @@ public final class BukkitLegacyMappings extends LegacyMappings {
         for (final Material material : Material.values()) {
             final String materialName = material.name().toLowerCase(Locale.ENGLISH);
             if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.get(materialName) == null) {
-                final LegacyBlock missingBlock =
-                    new LegacyBlock(material.getId(), materialName, materialName);
-                missing.add(missingBlock);
+                try {
+                    final LegacyBlock missingBlock =
+                        new LegacyBlock(material.getId(), materialName, materialName);
+                    missing.add(missingBlock);
+                } catch (Exception e) {
+                    Bukkit.getLogger().severe(
+                        "Error creating legacy block: " + materialName + ". Possibly a new block.");
+                }
             }
         }
         addAll(missing);
diff --git a/Core/build.gradle b/Core/build.gradle
index c07965771..d08b102f5 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -13,7 +13,7 @@ dependencies {
     testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
 
     compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
-    compile 'com.squareup.okhttp3:okhttp:3.14.1'
+    compile 'com.squareup.okhttp3:okhttp:3.14.0'
     compile 'com.squareup.okio:okio:2.2.2'
     compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30'
 }

From 9485f82ea9fb850ca9b9fd0f5a9ef5e08dd63703 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 23:46:10 +0100
Subject: [PATCH 146/210] Fix signs between 1.13 and 1.14

---
 .../plotsquared/bukkit/util/BukkitUtil.java                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 6f7e26e8a..065756932 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -14,8 +14,6 @@ import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.block.*;
 import org.bukkit.block.data.Directional;
-import org.bukkit.block.data.Rotatable;
-import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
@@ -342,7 +340,9 @@ import java.util.*;
             } else if (world.getBlockAt(x, y, z - 1).getType().isSolid()) {
                 facing = BlockFace.SOUTH;
             }
-            block.setType(Material.LEGACY_WALL_SIGN, false);
+            block.setType(Material.valueOf(
+                PlotSquared.get().IMP.getServerVersion()[1] == 13 ? "WALL_SIGN" : "OAK_WALL_SIGN"),
+                false);
             final Directional sign = (Directional) block.getBlockData();
             sign.setFacing(facing);
             block.setBlockData(sign, false);

From d352804b5d4ad03f65f2845576c738d99f5ce044 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 23:47:00 +0100
Subject: [PATCH 147/210] Update gradle lombok version for core

---
 Core/build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Core/build.gradle b/Core/build.gradle
index d08b102f5..71a24b237 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -6,11 +6,11 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'org.yaml:snakeyaml:1.23'
     compile 'com.google.code.gson:gson:2.8.5'
-    compile("org.projectlombok:lombok:1.18.4")
-    compileOnly("org.projectlombok:lombok:1.18.4")
-    testCompileOnly("org.projectlombok:lombok:1.18.4")
-    annotationProcessor("org.projectlombok:lombok:1.18.4")
-    testAnnotationProcessor("org.projectlombok:lombok:1.18.4")
+    compile("org.projectlombok:lombok:1.18.6")
+    compileOnly("org.projectlombok:lombok:1.18.6")
+    testCompileOnly("org.projectlombok:lombok:1.18.6")
+    annotationProcessor("org.projectlombok:lombok:1.18.6")
+    testAnnotationProcessor("org.projectlombok:lombok:1.18.6")
 
     compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
     compile 'com.squareup.okhttp3:okhttp:3.14.0'

From bef3dbc6f4dc50dcd02f4da9ea7a96044101535e Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Tue, 23 Apr 2019 23:48:22 +0100
Subject: [PATCH 148/210] Reformat code

---
 .../plotsquared/bukkit/BukkitMain.java        | 52 +++++++------
 .../bukkit/events/PlayerLeavePlotEvent.java   |  3 +-
 .../bukkit/events/PlayerPlotHelperEvent.java  |  3 +-
 .../bukkit/events/PlayerPlotTrustedEvent.java |  3 +-
 .../bukkit/generator/BukkitPlotGenerator.java |  7 +-
 .../generator/DelegatePlotGenerator.java      | 13 ++--
 .../bukkit/listeners/ChunkListener.java       |  6 +-
 .../bukkit/listeners/EntitySpawnListener.java | 20 ++---
 .../bukkit/listeners/PlotPlusListener.java    |  8 +-
 .../bukkit/object/BukkitPlayer.java           |  9 +--
 .../bukkit/titles/TitleManager_1_11.java      |  3 +-
 .../bukkit/util/BukkitChunkManager.java       |  3 +-
 .../bukkit/util/BukkitSetupUtils.java         | 18 +++--
 .../bukkit/util/block/GenChunk.java           |  8 +-
 Bukkit/src/main/resources/plugin.yml          |  2 +-
 .../plotsquared/plot/PlotSquared.java         | 15 ++--
 .../plotsquared/plot/commands/Area.java       |  7 +-
 .../plotsquared/plot/commands/Chat.java       |  4 +-
 .../plotsquared/plot/commands/Cluster.java    |  6 +-
 .../plot/commands/CommandCategory.java        | 24 ++++--
 .../plotsquared/plot/commands/Condense.java   |  2 +-
 .../plot/commands/DebugImportWorlds.java      |  4 +-
 .../plotsquared/plot/commands/Dislike.java    |  7 +-
 .../plotsquared/plot/commands/Help.java       |  3 +-
 .../plotsquared/plot/commands/Info.java       |  4 +-
 .../plotsquared/plot/commands/Like.java       | 15 ++--
 .../plotsquared/plot/commands/ListCmd.java    | 12 +--
 .../plot/commands/MainCommand.java            |  3 +-
 .../plotsquared/plot/commands/Move.java       |  4 +-
 .../plotsquared/plot/commands/Near.java       |  3 +-
 .../plotsquared/plot/commands/Rate.java       |  4 +-
 .../plotsquared/plot/commands/Setup.java      | 24 +++---
 .../plotsquared/plot/commands/SubCommand.java | 11 ++-
 .../plotsquared/plot/commands/Unlink.java     |  5 +-
 .../plotsquared/plot/commands/Visit.java      |  4 +-
 .../plotsquared/plot/config/Captions.java     |  4 +-
 .../plotsquared/plot/config/Settings.java     |  3 +-
 .../plot/generator/HybridPlotManager.java     |  6 +-
 .../plot/generator/HybridPlotWorld.java       | 23 ++++--
 .../plot/generator/HybridUtils.java           |  3 +-
 .../plot/listener/PlotListener.java           | 20 ++---
 .../plot/listener/ProcessedWEExtent.java      |  3 +-
 .../plotsquared/plot/object/BlockBucket.java  |  4 +-
 .../plotsquared/plot/object/Direction.java    |  3 +-
 .../plotsquared/plot/object/Plot.java         | 54 ++++++-------
 .../plotsquared/plot/object/PlotId.java       |  4 +-
 .../plotsquared/plot/object/PlotLoc.java      |  1 +
 .../plotsquared/plot/object/PlotPlayer.java   | 14 +++-
 .../plot/object/StringWrapper.java            |  2 +-
 .../collection/FlatRandomCollection.java      |  3 +-
 .../object/collection/RandomCollection.java   |  8 +-
 .../collection/SimpleRandomCollection.java    |  3 +-
 .../plot/object/worlds/SinglePlotArea.java    | 14 ++--
 .../object/worlds/SinglePlotAreaManager.java  |  4 +-
 .../plotsquared/plot/util/ChunkManager.java   |  6 +-
 .../plotsquared/plot/util/EventUtil.java      | 17 ++--
 .../plot/util/LegacyConverter.java            |  4 +-
 .../plotsquared/plot/util/MainUtil.java       |  9 ++-
 .../plot/util/SchematicHandler.java           |  9 ++-
 .../plotsquared/plot/util/UpdateUtility.java  | 77 +++++++++++--------
 Core/src/main/resources/addplots.js           |  6 +-
 Core/src/main/resources/automerge.js          |  6 +-
 Core/src/main/resources/furthest.js           |  3 +-
 63 files changed, 332 insertions(+), 300 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 93ee1c8ac..3398e18ad 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -31,8 +31,8 @@ import com.sk89q.worldedit.extension.platform.Capability;
 import lombok.Getter;
 import lombok.NonNull;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.*;
 import org.bukkit.Location;
+import org.bukkit.*;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -48,7 +48,6 @@ import org.bukkit.plugin.java.JavaPlugin;
 import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Method;
-import java.net.URL;
 import java.util.*;
 
 import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
@@ -60,7 +59,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     static {
         try {
             Settings.load(new File("plugins/PlotSquared/config/settings.yml"));
-        } catch (Throwable ignored) {}
+        } catch (Throwable ignored) {
+        }
     }
 
     private final LegacyMappings legacyMappings = new BukkitLegacyMappings();
@@ -110,8 +110,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS);
         } catch (final Throwable throwable) {
             throw new IllegalStateException(
-                    "Failed to force load WorldEdit. Road schematics will fail to generate",
-                    throwable);
+                "Failed to force load WorldEdit. Road schematics will fail to generate", throwable);
         }
     }
 
@@ -145,25 +144,31 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         // Check for updates
         if (PlotSquared.get().getUpdateUtility() != null) {
             final UpdateUtility updateUtility = PlotSquared.get().getUpdateUtility();
-            updateUtility.checkForUpdate(this.getPluginVersionString(), ((updateDescription, throwable) -> {
-                Bukkit.getScheduler().runTask(BukkitMain.this, () -> {
-                    getLogger().info("-------- PlotSquared Update Check --------");
-                    if (throwable != null) {
-                        getLogger().severe(String.format("Could not check for update. Reason: %s",
-                            throwable.getMessage()));
-                    } else {
-                        if (updateDescription == null) {
-                            getLogger().info("You appear to be running the latest version of PlotSquared. Congratulations!");
+            updateUtility
+                .checkForUpdate(this.getPluginVersionString(), ((updateDescription, throwable) -> {
+                    Bukkit.getScheduler().runTask(BukkitMain.this, () -> {
+                        getLogger().info("-------- PlotSquared Update Check --------");
+                        if (throwable != null) {
+                            getLogger().severe(String
+                                .format("Could not check for update. Reason: %s",
+                                    throwable.getMessage()));
                         } else {
-                            getLogger().info("There appears to be a PlotSquared update available!");
-                            getLogger().info(String.format("You are running version %s,"
-                                + " the newest available version is %s", getPluginVersionString(), updateDescription.getVersion()));
-                            getLogger().info(String.format("Update URL: %s", updateDescription.getUrl()));
+                            if (updateDescription == null) {
+                                getLogger().info(
+                                    "You appear to be running the latest version of PlotSquared. Congratulations!");
+                            } else {
+                                getLogger()
+                                    .info("There appears to be a PlotSquared update available!");
+                                getLogger().info(String.format("You are running version %s,"
+                                        + " the newest available version is %s",
+                                    getPluginVersionString(), updateDescription.getVersion()));
+                                getLogger().info(
+                                    String.format("Update URL: %s", updateDescription.getUrl()));
+                            }
                         }
-                    }
-                    getLogger().info("-------- PlotSquared Update Check --------");
-                });
-            }));
+                        getLogger().info("-------- PlotSquared Update Check --------");
+                    });
+                }));
         } else {
             getLogger().warning("Update checking disabled. Skipping.");
         }
@@ -246,8 +251,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                         continue outer;
                                     }
                                 } else {
-                                    result = world
-                                        .unloadChunk(chunkI.getX(), chunkI.getZ(), true);
+                                    result = world.unloadChunk(chunkI.getX(), chunkI.getZ(), true);
                                 }
                                 if (!result) {
                                     continue outer;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
index 465e8cee9..36482d44c 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
@@ -6,8 +6,7 @@ import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
 /**
-
-
+ *
  */
 public class PlayerLeavePlotEvent extends PlayerEvent {
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
index 2773f9b73..573d53ea8 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
@@ -7,8 +7,7 @@ import org.bukkit.event.HandlerList;
 import java.util.UUID;
 
 /**
-
-
+ *
  */
 public class PlayerPlotHelperEvent extends PlotEvent {
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
index 95440056f..6d9805660 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
@@ -7,8 +7,7 @@ import org.bukkit.event.HandlerList;
 import java.util.UUID;
 
 /**
-
-
+ *
  */
 public class PlayerPlotTrustedEvent extends PlotEvent {
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index 14a7e400e..b6a246f0d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -117,10 +117,11 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return toAdd;
     }
 
-    @Override @NotNull public ChunkData generateChunkData(@NotNull World world, @NotNull Random random,
-        int x, int z, @NotNull BiomeGrid biome) {
+    @Override @NotNull
+    public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z,
+        @NotNull BiomeGrid biome) {
 
-        GenChunk result =  new GenChunk();
+        GenChunk result = new GenChunk();
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getCd() != null) {
                 for (int cx = 0; cx < 16; cx++) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
index 36ef53a5a..820a9fa42 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@@ -32,10 +32,8 @@ import java.util.Random;
         return this.chunkGenerator.getClass().getName();
     }
 
-    @Override
-    public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
-        return PlotSquared.get().IMP.getDefaultGenerator()
-            .getNewPlotArea(world, id, min, max);
+    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
+        return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotArea(world, id, min, max);
     }
 
     @Override public BlockBucket[][] generateBlockBucketChunk(PlotArea settings) {
@@ -55,15 +53,14 @@ import java.util.Random;
                 for (int y = 1; y < hpw.PLOT_HEIGHT; y++) {
                     blockBuckets[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = hpw.MAIN_BLOCK;
                 }
-                blockBuckets[hpw.PLOT_HEIGHT >> 4][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4)
-                    | x] = hpw.MAIN_BLOCK;
+                blockBuckets[hpw.PLOT_HEIGHT >> 4][((hpw.PLOT_HEIGHT & 0xF) << 8) | (z << 4) | x] =
+                    hpw.MAIN_BLOCK;
             }
         }
         return blockBuckets;
     }
 
-    @Override
-    public void generateChunk(final ScopedLocalBlockQueue result, PlotArea settings) {
+    @Override public void generateChunk(final ScopedLocalBlockQueue result, PlotArea settings) {
         World w = BukkitUtil.getWorld(world);
         Location min = result.getMin();
         int cx = min.getX() >> 4;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index 82dd29531..d15f167b9 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -269,15 +269,13 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
             }
             PlotSquared.debug(
                 Captions.PREFIX.s() + "&a detected unsafe chunk and processed: " + (chunk.getX()
-                    << 4)
-                    + "," + (chunk.getX() << 4));
+                    << 4) + "," + (chunk.getX() << 4));
         }
         if (tiles.length > Settings.Chunk_Processor.MAX_TILES) {
             if (unload) {
                 PlotSquared.debug(
                     Captions.PREFIX.s() + "&c detected unsafe chunk: " + (chunk.getX() << 4) + ","
-                        + (
-                        chunk.getX() << 4));
+                        + (chunk.getX() << 4));
                 cleanChunk(chunk);
                 return true;
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index 8487c6a32..f15663fdb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -19,33 +19,34 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
 import org.bukkit.event.entity.EntityTeleportEvent;
-import org.bukkit.event.vehicle.*;
+import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
+import org.bukkit.event.vehicle.VehicleCreateEvent;
+import org.bukkit.event.vehicle.VehicleMoveEvent;
+import org.bukkit.event.vehicle.VehicleUpdateEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
 public class EntitySpawnListener implements Listener {
 
-    private static boolean ignoreTP = false;
-
     private final static String KEY = "P2";
+    private static boolean ignoreTP = false;
+    private static boolean hasPlotArea = false;
+    private static String areaName = null;
 
     public static void testNether(Entity entity) {
         @NotNull World world = entity.getWorld();
-        if (world.getEnvironment() != World.Environment.NETHER && world.getEnvironment() != World.Environment.THE_END) {
+        if (world.getEnvironment() != World.Environment.NETHER
+            && world.getEnvironment() != World.Environment.THE_END) {
             return;
         }
         test(entity);
     }
 
-    private static boolean hasPlotArea = false;
-    private static String areaName = null;
-
     public static void testCreate(Entity entity) {
         @NotNull World world = entity.getWorld();
         if (areaName == world.getName()) {
@@ -53,7 +54,8 @@ public class EntitySpawnListener implements Listener {
             areaName = world.getName();
             hasPlotArea = PlotSquared.get().hasPlotArea(areaName);
         }
-        if (!hasPlotArea) return;
+        if (!hasPlotArea)
+            return;
         test(entity);
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
index 78b3dc269..b103ed7de 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlotPlusListener.java
@@ -132,11 +132,11 @@ import java.util.UUID;
         Player player = event.getPlayer();
         Plot plot = event.getPlot();
         Optional<IntervalFlag.Interval> feed = plot.getFlag(Flags.FEED);
-        feed.ifPresent(
-            value -> feedRunnable.put(player.getUniqueId(), new Interval(value.getVal1(), value.getVal2(), 20)));
+        feed.ifPresent(value -> feedRunnable
+            .put(player.getUniqueId(), new Interval(value.getVal1(), value.getVal2(), 20)));
         Optional<IntervalFlag.Interval> heal = plot.getFlag(Flags.HEAL);
-        heal.ifPresent(
-            value -> healRunnable.put(player.getUniqueId(), new Interval(value.getVal1(), value.getVal2(), 20)));
+        heal.ifPresent(value -> healRunnable
+            .put(player.getUniqueId(), new Interval(value.getVal1(), value.getVal2(), 20)));
     }
 
     @EventHandler public void onPlayerQuit(PlayerQuitEvent event) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 71014eb78..1afe93656 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -7,7 +7,6 @@ import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
-import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -17,13 +16,8 @@ import org.bukkit.event.Event;
 import org.bukkit.event.EventException;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.permissions.Permissible;
-import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.plugin.RegisteredListener;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.Nonnull;
 import java.util.Arrays;
@@ -33,6 +27,7 @@ import java.util.stream.Collectors;
 
 public class BukkitPlayer extends PlotPlayer {
 
+    private static boolean CHECK_EFFECTIVE = true;
     public final Player player;
     private boolean offline;
     private UUID uuid;
@@ -105,8 +100,6 @@ public class BukkitPlayer extends PlotPlayer {
         return this.player.hasPermission(permission);
     }
 
-    private static boolean CHECK_EFFECTIVE = true;
-
     @Override public int hasPermissionRange(String stub, int range) {
         if (hasPermission(Captions.PERMISSION_ADMIN.s())) {
             return Integer.MAX_VALUE;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
index 4832a1eac..fc8bfb7aa 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
@@ -408,7 +408,8 @@ public class TitleManager_1_11 {
 
     private Method getMethod(Class<?> clazz, String name, Class<?>... args) {
         for (Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args, m.getParameterTypes()))) {
+            if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args,
+                m.getParameterTypes()))) {
                 m.setAccessible(true);
                 return m;
             }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 099b5b3fc..54ced2b83 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -394,8 +394,7 @@ public class BukkitChunkManager extends ChunkManager {
     public void unloadChunk(final String world, final ChunkLoc loc, final boolean save,
         final boolean safe) {
         if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-            TaskManager
-                .runTask(() -> BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save));
+            TaskManager.runTask(() -> BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save));
         } else {
             BukkitUtil.getWorld(world).unloadChunk(loc.x, loc.z, save);
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
index 8309203ef..2e90b4de0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -128,16 +128,22 @@ public class BukkitSetupUtils extends SetupUtils {
                         PlotSquared.get().worlds.createSection(worldPath);
                     }
                     if (steps.length != 0) {
-                        ConfigurationSection worldSection = PlotSquared.get().worlds.getConfigurationSection(worldPath);
+                        ConfigurationSection worldSection =
+                            PlotSquared.get().worlds.getConfigurationSection(worldPath);
                         for (ConfigurationNode step : steps) {
                             worldSection.set(step.getConstant(), step.getValue());
                         }
                     }
-                    PlotSquared.get().worlds.set("worlds." + world + ".generator.type", object.type);
-                    PlotSquared.get().worlds.set("worlds." + world + ".generator.terrain", object.terrain);
-                    PlotSquared.get().worlds.set("worlds." + world + ".generator.plugin", object.plotManager);
-                    if (object.setupGenerator != null && !object.setupGenerator.equals(object.plotManager)) {
-                        PlotSquared.get().worlds.set("worlds." + world + ".generator.init", object.setupGenerator);
+                    PlotSquared.get().worlds
+                        .set("worlds." + world + ".generator.type", object.type);
+                    PlotSquared.get().worlds
+                        .set("worlds." + world + ".generator.terrain", object.terrain);
+                    PlotSquared.get().worlds
+                        .set("worlds." + world + ".generator.plugin", object.plotManager);
+                    if (object.setupGenerator != null && !object.setupGenerator
+                        .equals(object.plotManager)) {
+                        PlotSquared.get().worlds
+                            .set("worlds." + world + ".generator.init", object.setupGenerator);
                     }
                 }
                 GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
index 9018a3707..eebac8ef0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
@@ -35,10 +35,6 @@ public class GenChunk extends ScopedLocalBlockQueue {
         this.biomes = Biome.values();
     }
 
-    public void setChunk(Chunk chunk) {
-        this.chunk = chunk;
-    }
-
     public Chunk getChunk() {
         if (chunk == null) {
             World worldObj = BukkitUtil.getWorld(world);
@@ -49,6 +45,10 @@ public class GenChunk extends ScopedLocalBlockQueue {
         return chunk;
     }
 
+    public void setChunk(Chunk chunk) {
+        this.chunk = chunk;
+    }
+
     public void setChunk(ChunkWrapper wrap) {
         chunk = null;
         world = wrap.world;
diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml
index 565ceaf7f..41714aeb6 100644
--- a/Bukkit/src/main/resources/plugin.yml
+++ b/Bukkit/src/main/resources/plugin.yml
@@ -72,7 +72,7 @@ permissions:
   plots.permpack.basicinbox:
     default: op
     children:
-      comments.notifications.enabled  : true 
+      comments.notifications.enabled: true
       plots.inbox.read.public: true
       plots.inbox.modify.public: true
       plots.inbox.modify.public: true
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 3c15d437c..6252274d7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1156,9 +1156,9 @@ import java.util.zip.ZipInputStream;
                                 + areaGen);
                         PlotSquared.log(Captions.PREFIX + "&c | &9plotworld: &7" + pa);
                         PlotSquared.log(Captions.PREFIX + "&c | &9manager: &7" + pa);
-                        PlotSquared
-                            .log(Captions.PREFIX + "&cNote: &7Area created for cluster:" + name
-                            + " (invalid or old configuration?)");
+                        PlotSquared.log(
+                            Captions.PREFIX + "&cNote: &7Area created for cluster:" + name
+                                + " (invalid or old configuration?)");
                         areaGen.getPlotGenerator().initialize(pa);
                         areaGen.augment(pa);
                         toLoad.add(pa);
@@ -1613,12 +1613,13 @@ import java.util.zip.ZipInputStream;
         Settings.load(configFile);
         try {
             copyFile("updater.properties", "config");
-            try (BufferedReader bufferedReader =
-                new BufferedReader(new InputStreamReader(new FileInputStream(new File(new File(this.IMP.getDirectory(),
-                    "config"), "updater.properties"))))) {
+            try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(
+                new FileInputStream(new File(new File(this.IMP.getDirectory(), "config"),
+                    "updater.properties"))))) {
                 final Properties properties = new Properties();
                 properties.load(bufferedReader);
-                final boolean enabled = Boolean.valueOf(properties.getOrDefault("enabled", true).toString());
+                final boolean enabled =
+                    Boolean.valueOf(properties.getOrDefault("enabled", true).toString());
                 if (enabled) {
                     this.updateUtility = new UpdateUtility(properties.getProperty("path"),
                         properties.getProperty("job"), properties.getProperty("artifact"));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
index 933938e2e..bfd42f36e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -15,8 +15,11 @@ import java.util.ArrayList;
 import java.util.Objects;
 import java.util.Set;
 
-@CommandDeclaration(command = "area", permission = "plots.area", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE, description = "Create a new PlotArea", aliases = "world", usage = "/plot area <create|info|list|tp|regen>", confirmation = true)
-public class Area extends SubCommand {
+@CommandDeclaration(command = "area", permission = "plots.area",
+    category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE,
+    description = "Create a new PlotArea", aliases = "world",
+    usage = "/plot area <create|info|list|tp|regen>", confirmation = true) public class Area
+    extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 0) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
index 2b988c85d..c2a3daf84 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Chat.java
@@ -4,8 +4,8 @@ import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
 @CommandDeclaration(command = "chat", description = "Toggle plot chat on or off",
-    usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT, requiredType = RequiredType.PLAYER)
-public class Chat extends SubCommand {
+    usage = "/plot chat [on|off]", permission = "plots.chat", category = CommandCategory.CHAT,
+    requiredType = RequiredType.PLAYER) public class Chat extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         MainCommand.getInstance().toggle.chat(this, player, new String[0], null, null);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index 50e226c33..a59c65550 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -141,9 +141,9 @@ import java.util.UUID;
                 } else {
                     current = player.getPlayerClusterCount(player.getLocation().getWorld());
                 }
-                int allowed =
-                    Permissions.hasPermissionRange(player, Captions.PERMISSION_CLUSTER_SIZE,
-                    Settings.Limit.MAX_PLOTS);
+                int allowed = Permissions
+                    .hasPermissionRange(player, Captions.PERMISSION_CLUSTER_SIZE,
+                        Settings.Limit.MAX_PLOTS);
                 if (current + cluster.getArea() > allowed) {
                     MainUtil.sendMessage(player, Captions.NO_PERMISSION,
                         Captions.PERMISSION_CLUSTER_SIZE + "." + (current + cluster.getArea()));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
index 97c793be3..bebf77907 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/CommandCategory.java
@@ -11,31 +11,39 @@ import lombok.RequiredArgsConstructor;
      * Claiming CommandConfig.
      * Such as: /plot claim
      */
-    CLAIMING(Captions.COMMAND_CATEGORY_CLAIMING), /**
+    CLAIMING(Captions.COMMAND_CATEGORY_CLAIMING),
+    /**
      * Teleportation CommandConfig.
      * Such as: /plot visit
      */
-    TELEPORT(Captions.COMMAND_CATEGORY_TELEPPORT), /**
+    TELEPORT(Captions.COMMAND_CATEGORY_TELEPPORT),
+    /**
      * Protection.
      */
-    SETTINGS(Captions.COMMAND_CATEGORY_SETTINGS), /**
+    SETTINGS(Captions.COMMAND_CATEGORY_SETTINGS),
+    /**
      * Chat.
      */
-    CHAT(Captions.COMMAND_CATEGORY_CHAT), /**
+    CHAT(Captions.COMMAND_CATEGORY_CHAT),
+    /**
      * Web.
      */
-    SCHEMATIC(Captions.COMMAND_CATEGORY_SCHEMATIC), /**
+    SCHEMATIC(Captions.COMMAND_CATEGORY_SCHEMATIC),
+    /**
      * Cosmetic.
      */
-    APPEARANCE(Captions.COMMAND_CATEGORY_APPEARANCE), /**
+    APPEARANCE(Captions.COMMAND_CATEGORY_APPEARANCE),
+    /**
      * Information CommandConfig.
      * Such as: /plot info
      */
-    INFO(Captions.COMMAND_CATEGORY_INFO), /**
+    INFO(Captions.COMMAND_CATEGORY_INFO),
+    /**
      * Debug CommandConfig.
      * Such as: /plot debug
      */
-    DEBUG(Captions.COMMAND_CATEGORY_DEBUG), /**
+    DEBUG(Captions.COMMAND_CATEGORY_DEBUG),
+    /**
      * Administration commands.
      */
     ADMINISTRATION(Captions.COMMAND_CATEGORY_ADMINISTRATION);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
index 1245d2cce..478a0cab9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
@@ -11,8 +11,8 @@ import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
 
-import java.util.*;
 import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @CommandDeclaration(command = "condense", permission = "plots.admin",
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
index b800932a8..ddac91e4d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugImportWorlds.java
@@ -3,7 +3,6 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.Command;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
@@ -38,7 +37,8 @@ import java.util.UUID;
         PlotId id = new PlotId(0, 0);
         File container = PlotSquared.imp().getWorldContainer();
         if (container.equals(new File("."))) {
-            player.sendMessage("World container must be configured to be a separate directory to your base files!");
+            player.sendMessage(
+                "World container must be configured to be a separate directory to your base files!");
             return;
         }
         for (File folder : container.listFiles()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java
index ca807a263..372231481 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Dislike.java
@@ -3,9 +3,10 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 
-@CommandDeclaration(command = "dislike", permission = "plots.dislike", description = "Dislike the plot",
-    usage = "/plot dislike [next|purge]", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
-public class Dislike extends SubCommand {
+@CommandDeclaration(command = "dislike", permission = "plots.dislike",
+    description = "Dislike the plot", usage = "/plot dislike [next|purge]",
+    category = CommandCategory.INFO, requiredType = RequiredType.PLAYER) public class Dislike
+    extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         return Like.handleLike(player, args, false);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
index ab6fb73a3..97c793221 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Help.java
@@ -79,8 +79,7 @@ public class Help extends Command {
             for (CommandCategory c : CommandCategory.values()) {
                 builder.append("\n" + StringMan
                     .replaceAll(Captions.HELP_INFO_ITEM.s(), "%category%",
-                        c.toString().toLowerCase(),
-                        "%category_desc%", c.toString()));
+                        c.toString().toLowerCase(), "%category_desc%", c.toString()));
             }
             builder.append("\n").append(Captions.HELP_INFO_ITEM.s().replaceAll("%category%", "all")
                 .replaceAll("%category_desc%", Captions.HELP_DISPLAY_ALL_COMMANDS.s()));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
index f93d95a32..51e5cd6c0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Info.java
@@ -12,8 +12,8 @@ import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 import java.util.UUID;
 
 @CommandDeclaration(command = "info", aliases = "i", description = "Display plot info",
-    usage = "/plot info <id> [-f, to force info]", category = CommandCategory.INFO) public class Info
-    extends SubCommand {
+    usage = "/plot info <id> [-f, to force info]", category = CommandCategory.INFO)
+public class Info extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         Plot plot;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
index 7f1b57c6d..f839a9b1a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Like.java
@@ -17,14 +17,11 @@ import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import java.util.*;
 
 @CommandDeclaration(command = "like", permission = "plots.like", description = "Like the plot",
-    usage = "/plot like [next|purge]", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
-public class Like extends SubCommand {
+    usage = "/plot like [next|purge]", category = CommandCategory.INFO,
+    requiredType = RequiredType.PLAYER) public class Like extends SubCommand {
 
-    @Override public boolean onCommand(PlotPlayer player, String[] args) {
-        return handleLike(player, args, true);
-    }
-
-    protected static boolean handleLike(final PlotPlayer player, String[] args, final boolean like) {
+    protected static boolean handleLike(final PlotPlayer player, String[] args,
+        final boolean like) {
         final UUID uuid = player.getUUID();
         if (args.length == 1) {
             switch (args[0].toLowerCase()) {
@@ -143,4 +140,8 @@ public class Like extends SubCommand {
         return numLikes / (numLikes + numDislikes);
     }
 
+    @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        return handleLike(player, args, true);
+    }
+
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
index ff06a036a..e2951db6a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -363,13 +363,13 @@ public class ListCmd extends SubCommand {
                     } else {
                         color = "$1";
                     }
-                    PlotMessage trusted =
-                        new PlotMessage().text(Captions.color(Captions.PLOT_INFO_TRUSTED.s()
-                        .replaceAll("%trusted%", MainUtil.getPlayerList(plot.getTrusted()))))
+                    PlotMessage trusted = new PlotMessage().text(Captions.color(
+                        Captions.PLOT_INFO_TRUSTED.s()
+                            .replaceAll("%trusted%", MainUtil.getPlayerList(plot.getTrusted()))))
                         .color("$1");
-                    PlotMessage members =
-                        new PlotMessage().text(Captions.color(Captions.PLOT_INFO_MEMBERS.s()
-                        .replaceAll("%members%", MainUtil.getPlayerList(plot.getMembers()))))
+                    PlotMessage members = new PlotMessage().text(Captions.color(
+                        Captions.PLOT_INFO_MEMBERS.s()
+                            .replaceAll("%members%", MainUtil.getPlayerList(plot.getMembers()))))
                         .color("$1");
                     String strFlags = StringMan.join(plot.getFlags().values(), ",");
                     if (strFlags.isEmpty()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
index 90007b66e..d1daa73cd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/MainCommand.java
@@ -198,8 +198,7 @@ public class MainCommand extends Command {
             Plot newPlot = Plot.fromString(area, args[0]);
             if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
                 .equals(area) || Permissions.hasPermission(player, Captions.PERMISSION_ADMIN))
-                && !newPlot
-                .isDenied(player.getUUID())) {
+                && !newPlot.isDenied(player.getUUID())) {
                 Location newLoc = newPlot.getCenter();
                 if (player.canTeleport(newLoc)) {
                     // Save meta
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
index 9956b6f2e..e52ec1fcf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Move.java
@@ -11,8 +11,8 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 
 @CommandDeclaration(usage = "/plot move <X;Z>", command = "move", description = "Move a plot",
-    aliases = {"debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER)
-public class Move extends SubCommand {
+    aliases = {"debugmove"}, permission = "plots.move", category = CommandCategory.CLAIMING,
+    requiredType = RequiredType.PLAYER) public class Move extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         Location loc = player.getLocation();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
index 0fa721dff..3d73c7bbe 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Near.java
@@ -9,7 +9,8 @@ import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
-@CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players", usage = "/plot near", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
+@CommandDeclaration(command = "near", aliases = "n", description = "Display nearby players",
+    usage = "/plot near", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
 public class Near extends Command {
     public Near() {
         super(MainCommand.getInstance(), true);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
index 66f4fc06b..9c93925b6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
@@ -16,8 +16,8 @@ import java.util.Map.Entry;
 import java.util.UUID;
 
 @CommandDeclaration(command = "rate", permission = "plots.rate", description = "Rate the plot",
-    usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER)
-public class Rate extends SubCommand {
+    usage = "/plot rate [#|next|purge]", aliases = "rt", category = CommandCategory.INFO,
+    requiredType = RequiredType.PLAYER) public class Rate extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         if (args.length == 1) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
index 5dc5973d4..66fbd041a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
@@ -58,8 +58,8 @@ import java.util.Map.Entry;
                     object.setup_index--;
                     ConfigurationNode node = object.step[object.setup_index];
                     sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
-                        node.getDescription(),
-                        node.getType().getType(), String.valueOf(node.getDefaultValue()));
+                        node.getDescription(), node.getType().getType(),
+                        String.valueOf(node.getDefaultValue()));
                     return false;
                 } else if (object.current > 0) {
                     object.current--;
@@ -131,8 +131,8 @@ import java.util.Map.Entry;
                     }
                     ConfigurationNode step = object.step[object.setup_index];
                     sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
-                        step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                        step.getDescription(), step.getType().getType(),
+                        String.valueOf(step.getDefaultValue()));
                 } else {
                     if (gen.isFull()) {
                         object.plotManager = object.setupGenerator;
@@ -234,8 +234,8 @@ import java.util.Map.Entry;
                 }
                 ConfigurationNode step = object.step[object.setup_index];
                 sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
-                    step.getDescription(),
-                    step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                    step.getDescription(), step.getType().getType(),
+                    String.valueOf(step.getDefaultValue()));
                 break;
             }
             case 6:  // world setup
@@ -248,8 +248,8 @@ import java.util.Map.Entry;
                 ConfigurationNode step = object.step[object.setup_index];
                 if (args.length < 1) {
                     sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
-                        step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                        step.getDescription(), step.getType().getType(),
+                        String.valueOf(step.getDefaultValue()));
                     return false;
                 }
 
@@ -269,14 +269,14 @@ import java.util.Map.Entry;
                     }
                     step = object.step[object.setup_index];
                     sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
-                        step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                        step.getDescription(), step.getType().getType(),
+                        String.valueOf(step.getDefaultValue()));
                     return false;
                 } else {
                     sendMessage(player, Captions.SETUP_INVALID_ARG, args[0], step.getConstant());
                     sendMessage(player, Captions.SETUP_STEP, object.setup_index + 1,
-                        step.getDescription(),
-                        step.getType().getType(), String.valueOf(step.getDefaultValue()));
+                        step.getDescription(), step.getType().getType(),
+                        String.valueOf(step.getDefaultValue()));
                     return false;
                 }
             case 7:
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
index 7f36f6a4a..91dd83069 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SubCommand.java
@@ -23,17 +23,16 @@ public abstract class SubCommand extends Command {
         setRequiredArguments(arguments);
     }
 
+    public static boolean sendMessage(PlotPlayer player, Captions message, Object... args) {
+        message.send(player, args);
+        return true;
+    }
+
     @Override public void execute(PlotPlayer player, String[] args,
         RunnableVal3<Command, Runnable, Runnable> confirm,
         RunnableVal2<Command, CommandResult> whenDone) {
         onCommand(player, args);
     }
 
-
     public abstract boolean onCommand(PlotPlayer player, String[] args);
-
-    public static boolean sendMessage(PlotPlayer player, Captions message, Object... args) {
-        message.send(player, args);
-        return true;
-    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
index dc928c765..9ce6bd5fb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Unlink.java
@@ -7,8 +7,9 @@ import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 
-@CommandDeclaration(command = "unlink", aliases = {"u",
-    "unmerge"}, description = "Unlink a mega-plot", usage = "/plot unlink [createroads]", requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
+@CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"},
+    description = "Unlink a mega-plot", usage = "/plot unlink [createroads]",
+    requiredType = RequiredType.PLAYER, category = CommandCategory.SETTINGS, confirmation = true)
 public class Unlink extends SubCommand {
 
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
index 9217d0523..f5dc5710e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Visit.java
@@ -14,8 +14,8 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 import java.util.*;
 
 @CommandDeclaration(command = "visit", permission = "plots.visit",
-    description = "Visit someones plot", usage = "/plot visit [<player>|<alias>|<world>|<id>] [#]", aliases = {
-    "v", "tp", "teleport", "goto", "home", "h"}, requiredType = RequiredType.PLAYER,
+    description = "Visit someones plot", usage = "/plot visit [<player>|<alias>|<world>|<id>] [#]",
+    aliases = {"v", "tp", "teleport", "goto", "home", "h"}, requiredType = RequiredType.PLAYER,
     category = CommandCategory.TELEPORT) public class Visit extends Command {
 
     public Visit() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index c163a10a4..ddd72e9f8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -378,8 +378,8 @@ public enum Captions {
     RATING_ALREADY_EXISTS("$2You have already rated plot $2%s", "Ratings"), RATING_APPLIED(
         "$4You successfully rated plot $2%s", "Ratings"),
 
-    RATING_DISLIKED("$4You successfully disliked plot $2%s", "Ratings"),
-    RATING_LIKED("$4You successfully liked plot $2%s", "Ratings"),
+    RATING_DISLIKED("$4You successfully disliked plot $2%s", "Ratings"), RATING_LIKED(
+        "$4You successfully liked plot $2%s", "Ratings"),
 
     RATING_NOT_YOUR_OWN("$2You cannot rate your own plot", "Ratings"), RATING_NOT_DONE(
         "$2You can only rate finished plots.", "Ratings"),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 4c142697e..3c492583c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -317,8 +317,7 @@ public class Settings extends Config {
     public static final class Ratings {
         @Comment("Replace the rating system with a like system. Will add /plot like/dislike,"
             + " and remove the rating command") public static boolean USE_LIKES = false;
-        @Comment("Rating categories")
-        public static List<String> CATEGORIES = new ArrayList<>();
+        @Comment("Rating categories") public static List<String> CATEGORIES = new ArrayList<>();
     }
 
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 631b4ad45..a3b308335 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -42,11 +42,9 @@ public class HybridPlotManager extends ClassicPlotManager {
                 files.add(new FileBytes(newDir + "intersection.schem",
                     Files.readAllBytes(intersection.toPath())));
             }
-            File plot =
-                MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "plot.schem");
+            File plot = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "plot.schem");
             if (plot.exists()) {
-                files.add(
-                    new FileBytes(newDir + "plot.schem", Files.readAllBytes(plot.toPath())));
+                files.add(new FileBytes(newDir + "plot.schem", Files.readAllBytes(plot.toPath())));
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 76fec7701..880ddee35 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -34,8 +34,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public short PATH_WIDTH_LOWER;
     public short PATH_WIDTH_UPPER;
     public HashMap<Integer, BaseBlock[]> G_SCH;
-    private Location SIGN_LOCATION;
     public int SCHEM_Y;
+    private Location SIGN_LOCATION;
 
     public HybridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
         PlotId min, PlotId max) {
@@ -134,13 +134,17 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
     public void setupSchematics() throws SchematicHandler.UnsupportedFormatException {
         this.G_SCH = new HashMap<>();
-        File root = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname);
+        File root = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+            "schematics/GEN_ROAD_SCHEMATIC/" + this.worldname);
         File schematic1File = new File(root, "sideroad.schem");
-        if (!schematic1File.exists()) schematic1File = new File(root, "sideroad.schematic");
+        if (!schematic1File.exists())
+            schematic1File = new File(root, "sideroad.schematic");
         File schematic2File = new File(root, "intersection.schem");
-        if (!schematic2File.exists()) schematic2File = new File(root, "intersection.schematic");
+        if (!schematic2File.exists())
+            schematic2File = new File(root, "intersection.schematic");
         File schematic3File = new File(root, "plot.schem");
-        if (!schematic3File.exists()) schematic3File = new File(root, "plot.schematic");
+        if (!schematic3File.exists())
+            schematic3File = new File(root, "plot.schematic");
         Schematic schematic1 = SchematicHandler.manager.getSchematic(schematic1File);
         Schematic schematic2 = SchematicHandler.manager.getSchematic(schematic2File);
         Schematic schematic3 = SchematicHandler.manager.getSchematic(schematic3File);
@@ -193,7 +197,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
             for (short x = 0; x < w3; x++) {
                 for (short z = 0; z < l3; z++) {
                     for (short y = 0; y < h3; y++) {
-                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
+                        BaseBlock id = blockArrayClipboard3.getFullBlock(BlockVector3
+                            .at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                         if (!id.getBlockType().getMaterial().isAir()) {
                             addOverlayBlock((short) (x + shift + oddshift + centerShiftX),
                                 (short) (y + plotY), (short) (z + shift + oddshift + centerShiftZ),
@@ -253,7 +258,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         for (short x = 0; x < w1; x++) {
             for (short z = 0; z < l1; z++) {
                 for (short y = 0; y < h1; y++) {
-                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
+                    BaseBlock id = blockArrayClipboard1.getFullBlock(BlockVector3
+                        .at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + roadY),
                             (short) (z + shift + oddshift), id, false, h1);
@@ -273,7 +279,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         for (short x = 0; x < w2; x++) {
             for (short z = 0; z < l2; z++) {
                 for (short y = 0; y < h2; y++) {
-                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3.at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
+                    BaseBlock id = blockArrayClipboard2.getFullBlock(BlockVector3
+                        .at(x + min.getBlockX(), y + min.getBlockY(), z + min.getBlockZ()));
                     if (!id.getBlockType().getMaterial().isAir()) {
                         addOverlayBlock((short) (x - shift), (short) (y + roadY),
                             (short) (z - shift), id, false, h2);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index a3d9bc186..de6c3390b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -345,7 +345,8 @@ public abstract class HybridUtils {
                         if (condition) {
                             BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
                             int minY = plotWorld.SCHEM_Y;
-                            if (!Settings.Schematics.PASTE_ON_TOP) minY = 1;
+                            if (!Settings.Schematics.PASTE_ON_TOP)
+                                minY = 1;
                             int maxY = Math.max(extend, blocks.length);
                             if (blocks != null) {
                                 for (int y = 0; y < maxY; y++) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
index b3d15736b..c56763a76 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
@@ -95,8 +95,7 @@ public class PlotListener {
                         } else {
                             MainUtil.sendMessage(player, StringMan
                                 .replaceAll(Captions.GAMEMODE_WAS_BYPASSED.s(), "{plot}",
-                                    plot.getId(),
-                                    "{gamemode}", gamemodeFlag.get()));
+                                    plot.getId(), "{gamemode}", gamemodeFlag.get()));
                         }
                     }
                 }
@@ -109,8 +108,7 @@ public class PlotListener {
                         } else {
                             MainUtil.sendMessage(player, StringMan
                                 .replaceAll(Captions.GAMEMODE_WAS_BYPASSED.s(), "{plot}",
-                                    plot.getId(),
-                                    "{gamemode}", guestGamemodeFlag.get()));
+                                    plot.getId(), "{gamemode}", guestGamemodeFlag.get()));
                         }
                     }
                 }
@@ -158,8 +156,7 @@ public class PlotListener {
             }
             if (titles) {
                 if (!Captions.TITLE_ENTERED_PLOT.s().isEmpty() || !Captions.TITLE_ENTERED_PLOT_SUB
-                    .s()
-                    .isEmpty()) {
+                    .s().isEmpty()) {
                     TaskManager.runTaskLaterAsync(() -> {
                         Plot lastPlot = player.getMeta(PlotPlayer.META_LAST_PLOT);
                         if ((lastPlot != null) && plot.getId().equals(lastPlot.getId())) {
@@ -206,8 +203,7 @@ public class PlotListener {
                     } else {
                         MainUtil.sendMessage(player, StringMan
                             .replaceAll(Captions.GAMEMODE_WAS_BYPASSED.s(), "{plot}",
-                                plot.toString(),
-                                "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
+                                plot.toString(), "{gamemode}", pw.GAMEMODE.name().toLowerCase()));
                     }
                 }
             }
@@ -215,10 +211,10 @@ public class PlotListener {
             farewell.ifPresent(s -> MainUtil
                 .format(Captions.PREFIX_FAREWELL.s() + s, plot, player, false,
                     new RunnableVal<String>() {
-                    @Override public void run(String value) {
-                        MainUtil.sendMessage(player, value);
-                    }
-                }));
+                        @Override public void run(String value) {
+                            MainUtil.sendMessage(player, value);
+                        }
+                    }));
             Optional<Boolean> leave = plot.getFlag(Flags.NOTIFY_LEAVE);
             if (leave.isPresent() && leave.get()) {
                 if (!Permissions.hasPermission(player, "plots.flag.notify-enter.bypass")) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
index 14247f792..21014db70 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/ProcessedWEExtent.java
@@ -163,8 +163,7 @@ public class ProcessedWEExtent extends AbstractDelegateExtent {
             this.Eblocked = true;
             PlotSquared.debug(
                 Captions.PREFIX + "&cdetected unsafe WorldEdit: " + location.getBlockX() + ","
-                    + location
-                    .getBlockZ());
+                    + location.getBlockZ());
         }
         if (WEManager.maskContains(this.mask, location.getBlockX(), location.getBlockY(),
             location.getBlockZ())) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
index 5f2c371bc..e357de0b7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
@@ -1,7 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable;
-import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.object.collection.RandomCollection;
 import com.google.common.collect.ImmutableMap;
@@ -56,7 +55,8 @@ import java.util.Map.Entry;
     }
 
     private void addBlock(@NonNull final PlotBlock block, double chance) {
-        if (chance == -1) chance = 1;
+        if (chance == -1)
+            chance = 1;
         this.blocks.put(block, chance);
         this.compiled = false;
         if (head == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
index 9ce6e1621..0c7de4905 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java
@@ -3,7 +3,8 @@ package com.github.intellectualsites.plotsquared.plot.object;
 public enum Direction {
     NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, "west"), NORTHEAST(4,
         "northeast"), SOUTHEAST(5, "southeast"), SOUTHWEST(6, "southwest"), NORTHWEST(7,
-        "northwest"),;
+        "northwest"),
+    ;
 
 
     private int index;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index f4c278cdb..e2f83172e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -58,6 +58,7 @@ public class Plot {
      * plot owner
      * (Merged plots can have multiple owners)
      * Direct access is Deprecated: use getOwners()
+     *
      * @deprecated
      */
     @Deprecated public UUID owner;
@@ -344,6 +345,7 @@ public class Plot {
      * plot owner
      * (Merged plots can have multiple owners)
      * Direct access is Deprecated: use getOwners()
+     *
      * @deprecated
      */
     @Deprecated public UUID getOwner() {
@@ -353,6 +355,32 @@ public class Plot {
         return this.owner;
     }
 
+    /**
+     * Sets the plot owner (and update the database)
+     *
+     * @param owner uuid to set as owner
+     */
+    public void setOwner(UUID owner) {
+        if (!hasOwner()) {
+            this.owner = owner;
+            create();
+            return;
+        }
+        if (!isMerged()) {
+            if (!this.owner.equals(owner)) {
+                this.owner = owner;
+                DBFunc.setOwner(this, owner);
+            }
+            return;
+        }
+        for (Plot current : getConnectedPlots()) {
+            if (!owner.equals(current.owner)) {
+                current.owner = owner;
+                DBFunc.setOwner(current, owner);
+            }
+        }
+    }
+
     /**
      * Gets a immutable set of owner UUIDs for a plot (supports multi-owner mega-plots).
      * <p>
@@ -748,32 +776,6 @@ public class Plot {
         }
     }
 
-    /**
-     * Sets the plot owner (and update the database)
-     *
-     * @param owner uuid to set as owner
-     */
-    public void setOwner(UUID owner) {
-        if (!hasOwner()) {
-            this.owner = owner;
-            create();
-            return;
-        }
-        if (!isMerged()) {
-            if (!this.owner.equals(owner)) {
-                this.owner = owner;
-                DBFunc.setOwner(this, owner);
-            }
-            return;
-        }
-        for (Plot current : getConnectedPlots()) {
-            if (!owner.equals(current.owner)) {
-                current.owner = owner;
-                DBFunc.setOwner(current, owner);
-            }
-        }
-    }
-
     /**
      * Sets the plot owner (and update the database)
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
index 7c21df8fc..10b9e4c71 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java
@@ -34,7 +34,8 @@ public class PlotId {
      */
     @Nonnull public static PlotId fromString(@Nonnull String string) {
         PlotId plot = fromStringOrNull(string);
-        if (plot == null) throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
+        if (plot == null)
+            throw new IllegalArgumentException("Cannot create PlotID. String invalid.");
         return plot;
     }
 
@@ -101,6 +102,7 @@ public class PlotId {
     public PlotId getRelative(Direction direction) {
         return getRelative(direction.getIndex());
     }
+
     /**
      * Get the PlotId in a relative direction
      * 0 = north<br>
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
index 59f7088e8..33e57f753 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java
@@ -33,6 +33,7 @@ import org.jetbrains.annotations.Nullable;
 
     /**
      * Initialize a new {@link PlotLoc} and set the Y value to {@code -1}
+     *
      * @param x X value
      * @param z Y value
      */
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index c850513cd..dd2dc28b5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -428,6 +428,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
 
     /**
      * Determines whether or not the player can fly.
+     *
      * @return {@code true} if the player is allowed to fly
      */
     public abstract boolean getFlight();
@@ -466,7 +467,8 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
      */
     public void unregister() {
         Plot plot = getCurrentPlot();
-        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot.getArea() instanceof SinglePlotArea) {
+        if (plot != null && Settings.Enabled_Components.PERSISTENT_META && plot
+            .getArea() instanceof SinglePlotArea) {
             PlotId id = plot.getId();
             int x = id.x;
             int z = id.y;
@@ -581,17 +583,21 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
                             TaskManager.runTask(() -> {
                                 if (getMeta("teleportOnLogin", true)) {
                                     teleport(loc);
-                                    sendMessage(Captions.TELEPORTED_TO_PLOT.f() + " (quitLoc) (" + plotX + "," + plotZ + ")");
+                                    sendMessage(
+                                        Captions.TELEPORTED_TO_PLOT.f() + " (quitLoc) (" + plotX
+                                            + "," + plotZ + ")");
                                 }
                             });
                         } else if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
                             if (getMeta("teleportOnLogin", true)) {
                                 if (plot.teleportPlayer(PlotPlayer.this)) {
                                     TaskManager.runTask(() -> {
-                                        if (getMeta("teleportOnLogin",true)) {
+                                        if (getMeta("teleportOnLogin", true)) {
                                             if (plot.isLoaded()) {
                                                 teleport(loc);
-                                                sendMessage(Captions.TELEPORTED_TO_PLOT.f() + " (quitLoc-unloaded) (" + plotX + "," + plotZ + ")");
+                                                sendMessage(Captions.TELEPORTED_TO_PLOT.f()
+                                                    + " (quitLoc-unloaded) (" + plotX + "," + plotZ
+                                                    + ")");
                                             }
                                         }
                                     });
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
index e3f0031ba..12d0a11aa 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java
@@ -1,7 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 /**
-
+ *
  */
 public class StringWrapper {
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java
index 3255a80e7..dd7803d66 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/FlatRandomCollection.java
@@ -38,8 +38,7 @@ public class FlatRandomCollection<T> extends RandomCollection<T> {
         this.values = (T[]) parsed.toArray();
     }
 
-    @Override
-    public T next() {
+    @Override public T next() {
         return values[random.nextInt(values.length)];
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java
index ac136e9b4..b8dfa0a12 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/RandomCollection.java
@@ -20,14 +20,14 @@ public abstract class RandomCollection<T> {
         }
     }
 
+    public Random getRandom() {
+        return random;
+    }
+
     public void setRandom(Random random) {
         checkNotNull(random);
         this.random = random;
     }
 
-    public Random getRandom() {
-        return random;
-    }
-
     public abstract T next();
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java
index 7ea996613..e75b64cb4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/collection/SimpleRandomCollection.java
@@ -18,7 +18,8 @@ public class SimpleRandomCollection<E> extends RandomCollection<E> {
     }
 
     public void add(double weight, E result) {
-        if (weight <= 0) return;
+        if (weight <= 0)
+            return;
         total += weight;
         map.put(total, result);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index b8a27bab9..a51ef110b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -5,13 +5,7 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
 import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotLoc;
-import com.github.intellectualsites.plotsquared.plot.object.PlotSettings;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
+import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
@@ -66,13 +60,15 @@ public class SinglePlotArea extends GridPlotWorld {
                     File levelDat = new File(src, "level.dat");
                     if (levelDat.exists()) {
                         try {
-                            Files.copy(levelDat.toPath(), new File(dest, levelDat.getName()).toPath());
+                            Files.copy(levelDat.toPath(),
+                                new File(dest, levelDat.getName()).toPath());
                             File data = new File(src, "data");
                             if (data.exists()) {
                                 File dataDest = new File(dest, "data");
                                 dataDest.mkdirs();
                                 for (File file : data.listFiles()) {
-                                    Files.copy(file.toPath(), new File(dataDest, file.getName()).toPath());
+                                    Files.copy(file.toPath(),
+                                        new File(dataDest, file.getName()).toPath());
                                 }
                             }
                         } catch (IOException ignore) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index fd99fb067..95b303eea 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -96,7 +96,9 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
         if (found != null && found.length != 0) {
             return found;
         }
-        return isWorld(world) || world.equals("*") ? array : all.length == 0 ? noPlotAreas : super.getPlotAreas(world, region);
+        return isWorld(world) || world.equals("*") ?
+            array :
+            all.length == 0 ? noPlotAreas : super.getPlotAreas(world, region);
     }
 
     @Override public PlotArea[] getAllPlotAreas() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index c8beb8ba5..a7c39cf18 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -12,9 +12,11 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class ChunkManager {
 
+    private static final Map<ChunkLoc, RunnableVal<ScopedLocalBlockQueue>> forceChunks =
+        new ConcurrentHashMap<>();
+    private static final Map<ChunkLoc, RunnableVal<ScopedLocalBlockQueue>> addChunks =
+        new ConcurrentHashMap<>();
     public static ChunkManager manager = null;
-    private static final Map<ChunkLoc, RunnableVal<ScopedLocalBlockQueue>> forceChunks = new ConcurrentHashMap<>();
-    private static final Map<ChunkLoc, RunnableVal<ScopedLocalBlockQueue>> addChunks = new ConcurrentHashMap<>();
 
     public static ChunkLoc getChunkChunk(Location location) {
         int x = location.getX() >> 9;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
index 0e9a6f40f..6229e9332 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EventUtil.java
@@ -8,7 +8,6 @@ import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 
 import javax.annotation.Nullable;
@@ -77,7 +76,8 @@ public abstract class EventUtil {
             }
         }
         final Plot plot = player.getCurrentPlot();
-        if (Settings.Teleport.ON_LOGIN && plot != null && !(plot.getArea() instanceof SinglePlotArea)) {
+        if (Settings.Teleport.ON_LOGIN && plot != null && !(plot
+            .getArea() instanceof SinglePlotArea)) {
             TaskManager.runTask(() -> plot.teleportPlayer(player));
             MainUtil.sendMessage(player,
                 Captions.TELEPORTED_TO_ROAD.f() + " (on-login) " + "(" + plot.getId().x + ";" + plot
@@ -154,8 +154,8 @@ public abstract class EventUtil {
                 if (plot.hasOwner()) {
                     return Permissions
                         .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)
-                        || !(
-                        !notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                        || !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
                             Captions.FLAG_HANGING_BREAK.s()));
                 }
                 return Permissions
@@ -173,8 +173,8 @@ public abstract class EventUtil {
                 if (plot.hasOwner()) {
                     return Permissions
                         .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)
-                        || !(
-                        !notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
+                        || !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
                             Captions.FLAG_MISC_BREAK.s()));
                 }
                 return Permissions
@@ -219,9 +219,8 @@ public abstract class EventUtil {
                     .contains(block.getPlotBlock())) {
                     return Permissions
                         .hasPermission(player, Captions.PERMISSION_ADMIN_INTERACT_OTHER.s(), false)
-                        || !(
-                        !notifyPerms || MainUtil.sendMessage(player, Captions.FLAG_TUTORIAL_USAGE,
-                            Captions.FLAG_USE.s()));
+                        || !(!notifyPerms || MainUtil
+                        .sendMessage(player, Captions.FLAG_TUTORIAL_USAGE, Captions.FLAG_USE.s()));
                 }
                 return true;
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
index 262df3f83..55d86ce5a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -115,10 +115,10 @@ import java.util.Map;
                 if (worldSection.contains(entry.getKey())) {
                     if (entry.getValue() == ConfigurationType.BLOCK) {
                         this.convertBlock(worldSection, entry.getKey(),
-                                worldSection.getString(entry.getKey()));
+                            worldSection.getString(entry.getKey()));
                     } else {
                         this.convertBlockList(worldSection, entry.getKey(),
-                                worldSection.getStringList(entry.getKey()));
+                            worldSection.getStringList(entry.getKey()));
                     }
                 }
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index 1ae9839b8..cfc910748 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -735,7 +735,8 @@ public class MainUtil {
             seen = Captions.NEVER.s();
         }
         Optional<String> descriptionFlag = plot.getFlag(Flags.DESCRIPTION);
-        String description = !descriptionFlag.isPresent() ? Captions.NONE.s() :
+        String description = !descriptionFlag.isPresent() ?
+            Captions.NONE.s() :
             Flags.DESCRIPTION.valueToString(descriptionFlag.get());
 
         StringBuilder flags = new StringBuilder();
@@ -779,10 +780,12 @@ public class MainUtil {
             TaskManager.runTaskAsync(() -> {
                 String info1;
                 if (Settings.Ratings.USE_LIKES) {
-                    info1 = newInfo.replaceAll("%rating%", String.format("%.0f%%", Like.getLikesPercentage(plot) * 100D));
+                    info1 = newInfo.replaceAll("%rating%",
+                        String.format("%.0f%%", Like.getLikesPercentage(plot) * 100D));
                 } else {
                     int max = 10;
-                    if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES.isEmpty()) {
+                    if (Settings.Ratings.CATEGORIES != null && !Settings.Ratings.CATEGORIES
+                        .isEmpty()) {
                         max = 8;
                     }
                     if (full && Settings.Ratings.CATEGORIES != null
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index 522e45fa5..cf04f7f94 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -253,9 +253,11 @@ public abstract class SchematicHandler {
         if (!name.endsWith(".schem") && !name.endsWith(".schematic")) {
             name = name + ".schem";
         }
-        File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS + File.separator + name);
+        File file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+            Settings.Paths.SCHEMATICS + File.separator + name);
         if (!file.exists()) {
-            file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS + File.separator + name + "atic");
+            file = MainUtil.getFile(PlotSquared.get().IMP.getDirectory(),
+                Settings.Paths.SCHEMATICS + File.separator + name + "atic");
         }
         return getSchematic(file);
     }
@@ -270,7 +272,8 @@ public abstract class SchematicHandler {
             MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
         final List<String> names = new ArrayList<>();
         if (parent.exists()) {
-            final String[] rawNames = parent.list((dir, name) -> name.endsWith(".schematic") || name.endsWith(".schem"));
+            final String[] rawNames =
+                parent.list((dir, name) -> name.endsWith(".schematic") || name.endsWith(".schem"));
             if (rawNames != null) {
                 final List<String> transformed = Arrays.stream(rawNames)
                     .map(rawName -> rawName.substring(0, rawName.length() - 10))
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java
index 29d2126f6..0ad79b41b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UpdateUtility.java
@@ -29,15 +29,14 @@ public class UpdateUtility {
 
     private void fetchLatestBuildInfo(final BiConsumer<BuildInfo, Throwable> whenDone) {
         this.jenkins.getJobInfo(jobName).whenCompleteAsync((jobInfo, exception) -> {
-           if (jobInfo == null && exception != null) {
-               whenDone.accept(null, exception);
-           } else if (jobInfo != null) {
-               jobInfo.getLastSuccessfulBuild().getBuildInfo()
-                   .whenComplete(whenDone);
-           } else {
-               whenDone.accept(null, new IllegalStateException(
-                   String.format("Could not fetch job info for job %s", this.jobName)));
-           }
+            if (jobInfo == null && exception != null) {
+                whenDone.accept(null, exception);
+            } else if (jobInfo != null) {
+                jobInfo.getLastSuccessfulBuild().getBuildInfo().whenComplete(whenDone);
+            } else {
+                whenDone.accept(null, new IllegalStateException(
+                    String.format("Could not fetch job info for job %s", this.jobName)));
+            }
         });
     }
 
@@ -47,17 +46,19 @@ public class UpdateUtility {
                 whenDone.accept(null, throwable);
             } else {
                 final Collection<ArtifactDescription> artifacts = buildInfo.getArtifacts();
-                final Optional<ArtifactDescription> artifact = artifacts.stream().filter(artifactDescription -> {
-                    final String name = artifactDescription.getFileName();
-                    final Matcher matcher = artifactPattern.matcher(name);
-                    return matcher.matches();
-                }).findAny();
+                final Optional<ArtifactDescription> artifact =
+                    artifacts.stream().filter(artifactDescription -> {
+                        final String name = artifactDescription.getFileName();
+                        final Matcher matcher = artifactPattern.matcher(name);
+                        return matcher.matches();
+                    }).findAny();
                 if (artifact.isPresent()) {
                     final ArtifactDescription artifactDescription = artifact.get();
                     whenDone.accept(artifactDescription, null);
                 } else {
-                    whenDone.accept(null,
-                        new NullPointerException(String.format("Could not find any matching artifacts in build %d", buildInfo.getId())));
+                    whenDone.accept(null, new NullPointerException(String
+                        .format("Could not find any matching artifacts in build %d",
+                            buildInfo.getId())));
                 }
             }
         });
@@ -67,30 +68,34 @@ public class UpdateUtility {
         final BiConsumer<UpdateDescription, Throwable> whenDone) {
         this.getMatchingArtifact(((artifactDescription, throwable) -> {
             if (throwable != null) {
-                whenDone.accept(null, new RuntimeException(
-                    String.format("Failed to read artifact description: %s", throwable.getMessage()), throwable));
+                whenDone.accept(null, new RuntimeException(String
+                    .format("Failed to read artifact description: %s", throwable.getMessage()),
+                    throwable));
             } else {
                 try {
                     final String version = this.isNewer(currentVersion, artifactDescription);
                     if (version != null) {
-                        whenDone.accept(new UpdateDescription(version, artifactDescription.getUrl()),
-                            null);
+                        whenDone
+                            .accept(new UpdateDescription(version, artifactDescription.getUrl()),
+                                null);
                     } else {
                         whenDone.accept(null, null);
                     }
                 } catch (final Throwable exception) {
-                    whenDone.accept(null,
-                        new RuntimeException(String.format("Failed to compare versions: %s",
-                            exception.getMessage()), exception));
+                    whenDone.accept(null, new RuntimeException(
+                        String.format("Failed to compare versions: %s", exception.getMessage()),
+                        exception));
                 }
             }
         }));
     }
 
-    private String isNewer(@NonNull final String currentVersion, @NonNull final ArtifactDescription artifact) {
+    private String isNewer(@NonNull final String currentVersion,
+        @NonNull final ArtifactDescription artifact) {
         final Matcher matcher = artifactPattern.matcher(artifact.getFileName());
         if (!matcher.matches()) {
-            throw new IllegalArgumentException("Artifact file name does not match artifact pattern");
+            throw new IllegalArgumentException(
+                "Artifact file name does not match artifact pattern");
         }
         final String version = matcher.group("version");
         if (version == null) {
@@ -101,12 +106,14 @@ public class UpdateUtility {
 
     /**
      * Compare two given versions in the format $major.$minor
+     *
      * @param oldVersion current version
      * @param newVersion other version
      * @return -1 if the current version is older, 1 is the versions are the same,
-     *         and 1 if the current version is newer
+     * and 1 if the current version is newer
      */
-    private int compareVersions(@NonNull final String oldVersion, @NonNull final String newVersion) {
+    private int compareVersions(@NonNull final String oldVersion,
+        @NonNull final String newVersion) {
         // Versions look this this: major.minor :P
         final int[] oldNums = splitVersion(oldVersion);
         final int[] newNums = splitVersion(newVersion);
@@ -131,16 +138,18 @@ public class UpdateUtility {
     private int[] splitVersion(@NonNull final String versionString) {
         final String[] parts = versionString.split("\\.");
         switch (parts.length) {
-            case 0: return new int[] {-1, -1};
-            case 1: return new int[] {-1, Integer.parseInt(parts[0])};
-            case 2: return new int[] {Integer.parseInt(parts[0]), Integer.parseInt(parts[1])};
-            default: return null;
+            case 0:
+                return new int[] {-1, -1};
+            case 1:
+                return new int[] {-1, Integer.parseInt(parts[0])};
+            case 2:
+                return new int[] {Integer.parseInt(parts[0]), Integer.parseInt(parts[1])};
+            default:
+                return null;
         }
     }
 
-    @Getter
-    @RequiredArgsConstructor
-    public static class UpdateDescription {
+    @Getter @RequiredArgsConstructor public static class UpdateDescription {
         private final String version;
         private final String url;
     }
diff --git a/Core/src/main/resources/addplots.js b/Core/src/main/resources/addplots.js
index 5691c181c..b45f8d4ff 100644
--- a/Core/src/main/resources/addplots.js
+++ b/Core/src/main/resources/addplots.js
@@ -5,11 +5,9 @@ This will increase a player's allowed plots by the provided value
 var uuid = UUIDHandler.getUUID('%s0', null);
 if (uuid === null) {
     C_INVALID_PLAYER.send(PlotPlayer, '%s0');
-}
-else if (!MathMan.class.static.isInteger('%s1')) {
+} else if (!MathMan.class.static.isInteger('%s1')) {
     C_NOT_VALID_NUMBER.send(PlotPlayer, '(0, ' + Settings.MAX_PLOTS + ')');
-}
-else {
+} else {
     var amount = parseInt('%s1');
     var pp = IMP.wrapPlayer(UUIDHandler.getUUIDWrapper().getOfflinePlayer(uuid).player);
     var allowed = pp.getAllowedPlots();
diff --git a/Core/src/main/resources/automerge.js b/Core/src/main/resources/automerge.js
index 6a6c2a20f..220a24867 100644
--- a/Core/src/main/resources/automerge.js
+++ b/Core/src/main/resources/automerge.js
@@ -35,14 +35,12 @@ if ("%s0" === "true") {
         var plot = plots.get(i);
         plot.autoMerge(-1, 250000, plot.owner, true);
     }
-}
-else if ("%s0" === "false") {
+} else if ("%s0" === "false") {
     for (var i = 0; i < plots.size(); i++) {
         var plot = plots.get(i);
         plot.autoMerge(-1, 250000, plot.owner, false);
     }
-}
-else {
+} else {
     C_COMMAND_SYNTAX.send(PlotPlayer, "/plot debugexec automerge.js <removeroads>");
     MainUtil.class.static.sendMessage(PlotPlayer, "$1<removeroads> is true or false if you want to remove roads when auto merging");
 }
diff --git a/Core/src/main/resources/furthest.js b/Core/src/main/resources/furthest.js
index b0f973088..7c539894e 100644
--- a/Core/src/main/resources/furthest.js
+++ b/Core/src/main/resources/furthest.js
@@ -27,7 +27,6 @@ if (PS.hasPlotArea("%s0")) {
         }
     }
     PS.class.static.log(plot);
-}
-else {
+} else {
     PlotPlayer.sendMessage("Usage: /plot debugexec runasync furthest.js <plotworld>");
 }

From d0be0780fd950c4febba26b450cfbfb376ab97bc Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 24 Apr 2019 16:11:24 -0400
Subject: [PATCH 149/210] Reformatting and cleaning.

---
 .../plotsquared/bukkit/BukkitMain.java        |   4 +-
 .../bukkit/listeners/WorldEvents.java         |  39 +-
 .../entity/ReplicatingEntityWrapper.java      |   8 +-
 .../bukkit/titles/DefaultTitle.java           |  19 +
 .../bukkit/titles/DefaultTitleManager.java    | 214 +++--
 .../bukkit/titles/DefaultTitle_111.java       |  20 -
 .../plotsquared/bukkit/titles/HackTitle.java  |  22 -
 .../bukkit/titles/HackTitleManager.java       | 177 ----
 .../bukkit/titles/TitleManager.java           | 448 ++++-----
 .../bukkit/titles/TitleManager_1_11.java      | 857 +++++++++---------
 .../bukkit/util/BukkitChunkManager.java       |  21 +-
 .../bukkit/util/BukkitEventUtil.java          | 163 ++--
 .../bukkit/util/BukkitInventoryUtil.java      | 172 ++--
 13 files changed, 995 insertions(+), 1169 deletions(-)
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 3398e18ad..12dd070fc 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -2,7 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit;
 
 import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
 import com.github.intellectualsites.plotsquared.bukkit.listeners.*;
-import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle_111;
+import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle;
 import com.github.intellectualsites.plotsquared.bukkit.util.*;
 import com.github.intellectualsites.plotsquared.bukkit.util.block.BukkitLocalQueue;
 import com.github.intellectualsites.plotsquared.bukkit.uuid.*;
@@ -727,7 +727,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                 + " &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature.");
             Settings.TITLES = false;
         } else {
-            AbstractTitle.TITLE_CLASS = new DefaultTitle_111();
+            AbstractTitle.TITLE_CLASS = new DefaultTitle();
             if (wrapper instanceof DefaultUUIDWrapper
                 || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
                 Settings.UUID.NATIVE_UUID_PROVIDER = true;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java
index 98d6c0f5a..afa821975 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java
@@ -12,25 +12,26 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldInitEvent;
 import org.bukkit.generator.ChunkGenerator;
 
-@SuppressWarnings("unused") public class WorldEvents implements Listener {
+@SuppressWarnings("unused")
+public class WorldEvents implements Listener {
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onWorldInit(WorldInitEvent event) {
-        World world = event.getWorld();
-        String name = world.getName();
-        PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
-        if (manager instanceof SinglePlotAreaManager) {
-            SinglePlotAreaManager single = (SinglePlotAreaManager) manager;
-            if (single.isWorld(name)) {
-                world.setKeepSpawnInMemory(false);
-                return;
-            }
-        }
-        ChunkGenerator gen = world.getGenerator();
-        if (gen instanceof GeneratorWrapper) {
-            PlotSquared.get().loadWorld(name, (GeneratorWrapper<?>) gen);
-        } else {
-            PlotSquared.get().loadWorld(name, new BukkitPlotGenerator(name, gen));
-        }
+  @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+  public void onWorldInit(WorldInitEvent event) {
+    World world = event.getWorld();
+    String name = world.getName();
+    PlotAreaManager manager = PlotSquared.get().getPlotAreaManager();
+    if (manager instanceof SinglePlotAreaManager) {
+      SinglePlotAreaManager single = (SinglePlotAreaManager) manager;
+      if (single.isWorld(name)) {
+        world.setKeepSpawnInMemory(false);
+        return;
+      }
     }
+    ChunkGenerator gen = world.getGenerator();
+    if (gen instanceof GeneratorWrapper) {
+      PlotSquared.get().loadWorld(name, (GeneratorWrapper<?>) gen);
+    } else {
+      PlotSquared.get().loadWorld(name, new BukkitPlotGenerator(name, gen));
+    }
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index b569e6577..c7e0e04f6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -282,6 +282,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     this.dataByte = (byte) 0;
                 }
                 storeLiving((LivingEntity) entity);
+                return;
                 // END LIVING //
             default:
                 PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType());
@@ -317,8 +318,9 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         if (this.lived.leashed) {
             // TODO leashes
             //            World world = entity.getWorld();
-            //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) + lived.leashX, Math.floor(y) + lived.leashY, Math
-            // .floor(z) + lived.leashZ), EntityType.LEASH_HITCH);
+            //            Entity leash = world.spawnEntity(new Location(world, Math.floor(x) +
+            //            lived.leashX, Math.floor(y) + lived.leashY, Math.floor(z) + lived.leashZ),
+            //            EntityType.LEASH_HITCH);
             //            entity.setLeashHolder(leash);
         }
     }
@@ -343,7 +345,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
     }
 
-    public void storeLiving(LivingEntity lived) {
+    private void storeLiving(LivingEntity lived) {
         this.lived = new LivingEntityStats();
         this.lived.potions = lived.getActivePotionEffects();
         this.lived.loot = lived.getCanPickupItems();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
new file mode 100644
index 000000000..626525ccf
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
@@ -0,0 +1,19 @@
+package com.github.intellectualsites.plotsquared.bukkit.titles;
+
+import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
+import org.bukkit.entity.Player;
+
+public class DefaultTitle extends AbstractTitle {
+
+  @Override
+  public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
+    try {
+      final Player playerObj = ((BukkitPlayer) player).player;
+      TitleManager_1_11 title = new TitleManager_1_11(head, sub, in, delay, out);
+      title.send(playerObj);
+    } catch (Throwable ignored) {
+    }
+  }
+}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
index a5447f9bf..10eef5753 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
@@ -9,121 +9,119 @@ import java.lang.reflect.Method;
 
 public class DefaultTitleManager extends TitleManager {
 
-    /**
-     * Create a new 1.8 title.
-     *
-     * @param title       Title text
-     * @param subtitle    Subtitle text
-     * @param fadeInTime  Fade in time
-     * @param stayTime    Stay on screen time
-     * @param fadeOutTime Fade out time
-     */
-    DefaultTitleManager(String title, String subtitle, int fadeInTime, int stayTime,
-        int fadeOutTime) {
-        super(title, subtitle, fadeInTime, stayTime, fadeOutTime);
-    }
+  /**
+   * Create a new 1.8 title.
+   *
+   * @param title       Title text
+   * @param subtitle    Subtitle text
+   * @param fadeInTime  Fade in time
+   * @param stayTime    Stay on screen time
+   * @param fadeOutTime Fade out time
+   */
+  DefaultTitleManager(String title, String subtitle, int fadeInTime, int stayTime,
+      int fadeOutTime) {
+    super(title, subtitle, fadeInTime, stayTime, fadeOutTime);
+  }
 
-    /**
-     * Load spigot and NMS classes.
-     */
-    @Override void loadClasses() {
-        this.packetTitle = Reflection.getNMSClass("PacketPlayOutTitle");
-        this.packetActions = Reflection.getNMSClass("EnumTitleAction");
-        this.chatBaseComponent = Reflection.getNMSClass("IChatBaseComponent");
-        this.nmsChatSerializer = Reflection.getNMSClass("ChatSerializer");
-    }
+  /**
+   * Load spigot and NMS classes.
+   */
+  @Override void loadClasses() {
+    this.packetTitle = Reflection.getNMSClass("PacketPlayOutTitle");
+    this.packetActions = Reflection.getNMSClass("EnumTitleAction");
+    this.chatBaseComponent = Reflection.getNMSClass("IChatBaseComponent");
+    this.nmsChatSerializer = Reflection.getNMSClass("ChatSerializer");
+  }
 
-    @Override public void send(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        if (this.packetTitle != null) {
-            // First reset previous settings
-            resetTitle(player);
-            // Send timings first
-            Object handle = getHandle(player);
-            Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            Object[] actions = this.packetActions.getEnumConstants();
-            Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet = this.packetTitle
-                .getConstructor(this.packetActions, this.chatBaseComponent, Integer.TYPE,
-                    Integer.TYPE, Integer.TYPE)
-                .newInstance(actions[2], null, this.fadeInTime * (this.ticks ? 1 : 20),
-                    this.stayTime * (this.ticks ? 1 : 20),
-                    this.fadeOutTime * (this.ticks ? 1 : 20));
-            // Send if set
-            if (this.fadeInTime != -1 && this.fadeOutTime != -1 && this.stayTime != -1) {
-                sendPacket.invoke(connection, packet);
-            }
-            // Send title
-            Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
-                "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getTitle())
-                    + "\",color:" + this.titleColor.name().toLowerCase() + '}');
-            packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-                .newInstance(actions[0], serialized);
-            sendPacket.invoke(connection, packet);
-            if (!this.getSubtitle().isEmpty()) {
-                // Send subtitle if present
-                serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
-                    "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getSubtitle())
-                        + "\",color:" + this.subtitleColor.name().toLowerCase() + '}');
-                packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-                    .newInstance(actions[1], serialized);
-                sendPacket.invoke(connection, packet);
-            }
-        }
-    }
-
-    @Override public void clearTitle(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        // Send timings first
-        Object handle = getHandle(player);
-        Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-        Object[] actions = this.packetActions.getEnumConstants();
-        Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-        Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-            .newInstance(actions[3], null);
+  @Override public void send(Player player)
+      throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
+    if (this.packetTitle != null) {
+      // First reset previous settings
+      resetTitle(player);
+      // Send timings first
+      Object handle = getHandle(player);
+      Object connection = getField(handle.getClass(), "playerConnection").get(handle);
+      Object[] actions = this.packetActions.getEnumConstants();
+      Method sendPacket = getMethod(connection.getClass(), "sendPacket");
+      Object packet = this.packetTitle
+          .getConstructor(this.packetActions, this.chatBaseComponent, Integer.TYPE, Integer.TYPE,
+              Integer.TYPE).newInstance(actions[2], null, this.fadeInTime * (this.ticks ? 1 : 20),
+              this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
+      // Send if set
+      if (this.fadeInTime != -1 && this.fadeOutTime != -1 && this.stayTime != -1) {
         sendPacket.invoke(connection, packet);
-    }
-
-    /**
-     * Reset the title settings.
-     *
-     * @param player Player
-     * @throws SecurityException
-     * @throws ReflectiveOperationException
-     * @throws SecurityException
-     */
-    @Override public void resetTitle(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        // Send timings first
-        Object handle = getHandle(player);
-        Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-        Object[] actions = this.packetActions.getEnumConstants();
-        Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-        Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-            .newInstance(actions[4], null);
+      }
+      // Send title
+      Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
+          "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getTitle()) + "\",color:"
+              + this.titleColor.name().toLowerCase() + '}');
+      packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
+          .newInstance(actions[0], serialized);
+      sendPacket.invoke(connection, packet);
+      if (!this.getSubtitle().isEmpty()) {
+        // Send subtitle if present
+        serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
+            "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getSubtitle())
+                + "\",color:" + this.subtitleColor.name().toLowerCase() + '}');
+        packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
+            .newInstance(actions[1], serialized);
         sendPacket.invoke(connection, packet);
+      }
     }
+  }
 
-    Field getField(Class<?> clazz, String name) {
-        try {
-            Field field = clazz.getDeclaredField(name);
-            field.setAccessible(true);
-            return field;
-        } catch (NoSuchFieldException | SecurityException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
+  @Override public void clearTitle(Player player)
+      throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
+    // Send timings first
+    Object handle = getHandle(player);
+    Object connection = getField(handle.getClass(), "playerConnection").get(handle);
+    Object[] actions = this.packetActions.getEnumConstants();
+    Method sendPacket = getMethod(connection.getClass(), "sendPacket");
+    Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
+        .newInstance(actions[3], null);
+    sendPacket.invoke(connection, packet);
+  }
 
-    Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-        for (Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && (args.length == 0 || classListEqual(args,
-                m.getParameterTypes()))) {
-                m.setAccessible(true);
-                return m;
-            }
-        }
-        return null;
+  /**
+   * Reset the title settings.
+   *
+   * @param player Player
+   * @throws SecurityException
+   * @throws ReflectiveOperationException
+   * @throws SecurityException
+   */
+  @Override public void resetTitle(Player player)
+      throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
+    // Send timings first
+    Object handle = getHandle(player);
+    Object connection = getField(handle.getClass(), "playerConnection").get(handle);
+    Object[] actions = this.packetActions.getEnumConstants();
+    Method sendPacket = getMethod(connection.getClass(), "sendPacket");
+    Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
+        .newInstance(actions[4], null);
+    sendPacket.invoke(connection, packet);
+  }
+
+  Field getField(Class<?> clazz, String name) {
+    try {
+      Field field = clazz.getDeclaredField(name);
+      field.setAccessible(true);
+      return field;
+    } catch (NoSuchFieldException | SecurityException e) {
+      e.printStackTrace();
+      return null;
     }
+  }
+
+  Method getMethod(Class<?> clazz, String name, Class<?>... args) {
+    for (Method m : clazz.getMethods()) {
+      if (m.getName().equals(name) && (args.length == 0 || classListEqual(args,
+          m.getParameterTypes()))) {
+        m.setAccessible(true);
+        return m;
+      }
+    }
+    return null;
+  }
 
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java
deleted file mode 100644
index c0d176019..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle_111.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
-import org.bukkit.entity.Player;
-
-@SuppressWarnings("deprecation") public class DefaultTitle_111 extends AbstractTitle {
-
-    @Override
-    public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
-        try {
-            final Player playerObj = ((BukkitPlayer) player).player;
-            TitleManager_1_11 title = new TitleManager_1_11(head, sub, in, delay, out);
-            title.send(playerObj);
-            return;
-        } catch (Throwable ignored) {
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java
deleted file mode 100644
index ae2b50a60..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitle.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
-import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
-
-public class HackTitle extends AbstractTitle {
-
-    @Override
-    public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
-        try {
-            HackTitleManager title = new HackTitleManager(head, sub, in, delay, out);
-            title.send(((BukkitPlayer) player).player);
-        } catch (Exception ignored) {
-            PlotSquared.debug("&cYour server version does not support titles!");
-            Settings.TITLES = false;
-            AbstractTitle.TITLE_CLASS = null;
-        }
-    }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java
deleted file mode 100644
index 2ec197927..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/HackTitleManager.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import com.github.intellectualsites.plotsquared.bukkit.chat.Reflection;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-public class HackTitleManager extends TitleManager {
-
-    /**
-     * Create a new 1.8 title.
-     *
-     * @param title       Title text
-     * @param subtitle    Subtitle text
-     * @param fadeInTime  Fade in time
-     * @param stayTime    Stay on screen time
-     * @param fadeOutTime Fade out time
-     */
-    HackTitleManager(String title, String subtitle, int fadeInTime, int stayTime, int fadeOutTime) {
-        super(title, subtitle, fadeInTime, stayTime, fadeOutTime);
-    }
-
-    /**
-     * Load spigot and NMS classes.
-     */
-    @Override void loadClasses() {
-        this.packetTitle = getClass("org.spigotmc.ProtocolInjector$PacketTitle");
-        this.packetActions = getClass("org.spigotmc.ProtocolInjector$PacketTitle$Action");
-        this.nmsChatSerializer = Reflection.getNMSClass("ChatSerializer");
-    }
-
-    @Override public void send(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        if ((getProtocolVersion(player) >= 47) && isSpigot() && (this.packetTitle != null)) {
-            // First reset previous settings
-            resetTitle(player);
-            // Send timings first
-            Object handle = getHandle(player);
-            Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            Object[] actions = this.packetActions.getEnumConstants();
-            Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet = this.packetTitle
-                .getConstructor(this.packetActions, Integer.TYPE, Integer.TYPE, Integer.TYPE)
-                .newInstance(actions[2], this.fadeInTime * (this.ticks ? 1 : 20),
-                    this.stayTime * (this.ticks ? 1 : 20),
-                    this.fadeOutTime * (this.ticks ? 1 : 20));
-            // Send if set
-            if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
-                sendPacket.invoke(connection, packet);
-            }
-            // Send title
-            Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
-                "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getTitle())
-                    + "\",color:" + this.titleColor.name().toLowerCase() + "}");
-            packet = this.packetTitle
-                .getConstructor(this.packetActions, Reflection.getNMSClass("IChatBaseComponent"))
-                .newInstance(actions[0], serialized);
-            sendPacket.invoke(connection, packet);
-            if (!this.getSubtitle().isEmpty()) {
-                // Send subtitle if present
-                serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
-                    "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getSubtitle())
-                        + "\",color:" + this.subtitleColor.name().toLowerCase() + "}");
-                packet = this.packetTitle.getConstructor(this.packetActions,
-                    Reflection.getNMSClass("IChatBaseComponent"))
-                    .newInstance(actions[1], serialized);
-                sendPacket.invoke(connection, packet);
-            }
-        }
-    }
-
-    @Override public void clearTitle(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        if ((getProtocolVersion(player) >= 47) && isSpigot()) {
-            // Send timings first
-            Object handle = getHandle(player);
-            Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            Object[] actions = this.packetActions.getEnumConstants();
-            Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet =
-                this.packetTitle.getConstructor(this.packetActions).newInstance(actions[3]);
-            sendPacket.invoke(connection, packet);
-        }
-    }
-
-    @Override public void resetTitle(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        if ((getProtocolVersion(player) >= 47) && isSpigot()) {
-            // Send timings first
-            Object handle = getHandle(player);
-            Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-            Object[] actions = this.packetActions.getEnumConstants();
-            Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-            Object packet =
-                this.packetTitle.getConstructor(this.packetActions).newInstance(actions[4]);
-            sendPacket.invoke(connection, packet);
-        }
-    }
-
-    /**
-     * Get the protocol version of the player.
-     *
-     * @param player Player
-     * @return Protocol version
-     * @throws IllegalArgumentException
-     * @throws ReflectiveOperationException
-     * @throws SecurityException
-     */
-    private int getProtocolVersion(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-        Object handle = getHandle(player);
-        Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-        Object networkManager = getValue("networkManager", connection);
-        return (Integer) getMethod("getVersion", networkManager.getClass()).invoke(networkManager);
-    }
-
-    /**
-     * Check if running spigot.
-     *
-     * @return Spigot
-     */
-    private boolean isSpigot() {
-        return Bukkit.getVersion().contains("Spigot");
-    }
-
-    /**
-     * Get class by url.
-     *
-     * @param namespace Namespace url
-     * @return Class
-     */
-    private Class<?> getClass(String namespace) {
-        try {
-            return Class.forName(namespace);
-        } catch (ClassNotFoundException ignored) {
-        }
-        return null;
-    }
-
-    private Field getField(String name, Class<?> clazz)
-        throws NoSuchFieldException, SecurityException {
-        return clazz.getDeclaredField(name);
-    }
-
-    private Object getValue(String name, Object obj)
-        throws ReflectiveOperationException, SecurityException, IllegalArgumentException {
-        Field f = getField(name, obj.getClass());
-        f.setAccessible(true);
-        return f.get(obj);
-    }
-
-    private Field getField(Class<?> clazz, String name) {
-        try {
-            Field field = clazz.getDeclaredField(name);
-            field.setAccessible(true);
-            return field;
-        } catch (SecurityException | NoSuchFieldException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-        for (Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && ((args.length == 0) || classListEqual(args,
-                m.getParameterTypes()))) {
-                m.setAccessible(true);
-                return m;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
index f4c249f97..4b1d4349f 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
@@ -11,246 +11,246 @@ import java.util.Map;
 
 public abstract class TitleManager {
 
-    private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
-    /* Title packet */ Class<?> packetTitle;
-    /* Title packet actions ENUM */ Class<?> packetActions;
-    /* Chat serializer */ Class<?> nmsChatSerializer;
-    Class<?> chatBaseComponent;
-    ChatColor titleColor = ChatColor.WHITE;
-    ChatColor subtitleColor = ChatColor.WHITE;
-    /* Title timings */ int fadeInTime = -1;
-    int stayTime = -1;
-    int fadeOutTime = -1;
-    boolean ticks = false;
-    /* Title text and color */
-    private String title = "";
-    /* Subtitle text and color */
-    private String subtitle = "";
+  private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
+  /* Title packet */ Class<?> packetTitle;
+  /* Title packet actions ENUM */ Class<?> packetActions;
+  /* Chat serializer */ Class<?> nmsChatSerializer;
+  Class<?> chatBaseComponent;
+  ChatColor titleColor = ChatColor.WHITE;
+  ChatColor subtitleColor = ChatColor.WHITE;
+  /* Title timings */ int fadeInTime = -1;
+  int stayTime = -1;
+  int fadeOutTime = -1;
+  boolean ticks = false;
+  /* Title text and color */
+  private String title;
+  /* Subtitle text and color */
+  private String subtitle;
 
-    /**
-     * Create a new 1.8 title.
-     *
-     * @param title       Title text
-     * @param subtitle    Subtitle text
-     * @param fadeInTime  Fade in time
-     * @param stayTime    Stay on screen time
-     * @param fadeOutTime Fade out time
-     */
-    TitleManager(String title, String subtitle, int fadeInTime, int stayTime, int fadeOutTime) {
-        this.title = title;
-        this.subtitle = subtitle;
-        this.fadeInTime = fadeInTime;
-        this.stayTime = stayTime;
-        this.fadeOutTime = fadeOutTime;
-        loadClasses();
+  /**
+   * Create a new 1.8 title.
+   *
+   * @param title       Title text
+   * @param subtitle    Subtitle text
+   * @param fadeInTime  Fade in time
+   * @param stayTime    Stay on screen time
+   * @param fadeOutTime Fade out time
+   */
+  TitleManager(String title, String subtitle, int fadeInTime, int stayTime, int fadeOutTime) {
+    this.title = title;
+    this.subtitle = subtitle;
+    this.fadeInTime = fadeInTime;
+    this.stayTime = stayTime;
+    this.fadeOutTime = fadeOutTime;
+    loadClasses();
+  }
+
+  abstract void loadClasses();
+
+  /**
+   * Gets title text.
+   *
+   * @return Title text
+   */
+  public final String getTitle() {
+    return this.title;
+  }
+
+  /**
+   * Sets the text for the title.
+   *
+   * @param title Title
+   */
+  public final void setTitle(String title) {
+    this.title = title;
+  }
+
+  /**
+   * Gets the subtitle text.
+   *
+   * @return Subtitle text
+   */
+  public final String getSubtitle() {
+    return this.subtitle;
+  }
+
+  /**
+   * Sets subtitle text.
+   *
+   * @param subtitle Subtitle text
+   */
+  public final void setSubtitle(String subtitle) {
+    this.subtitle = subtitle;
+  }
+
+  /**
+   * Sets the title color.
+   *
+   * @param color Chat color
+   */
+  public final void setTitleColor(ChatColor color) {
+    this.titleColor = color;
+  }
+
+  /**
+   * Sets the subtitle color.
+   *
+   * @param color Chat color
+   */
+  public final void setSubtitleColor(ChatColor color) {
+    this.subtitleColor = color;
+  }
+
+  /**
+   * Sets title fade in time.
+   *
+   * @param time Time
+   */
+  public final void setFadeInTime(int time) {
+    this.fadeInTime = time;
+  }
+
+  /**
+   * Sets title fade out time.
+   *
+   * @param time Time
+   */
+  public final void setFadeOutTime(int time) {
+    this.fadeOutTime = time;
+  }
+
+  /**
+   * Sets title stay time.
+   *
+   * @param time Time
+   */
+  public final void setStayTime(int time) {
+    this.stayTime = time;
+  }
+
+  /**
+   * Sets timings to ticks.
+   */
+  public final void setTimingsToTicks() {
+    this.ticks = true;
+  }
+
+  /**
+   * Sets timings to seconds.
+   */
+  public final void setTimingsToSeconds() {
+    this.ticks = false;
+  }
+
+  /**
+   * Sends the title to a player.
+   *
+   * @param player Player
+   * @throws IllegalArgumentException
+   * @throws ReflectiveOperationException
+   * @throws SecurityException
+   */
+  public abstract void send(Player player)
+      throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
+
+  /**
+   * Broadcasts the title to all players.
+   *
+   * @throws Exception
+   */
+  public final void broadcast() throws Exception {
+    for (Player player : Bukkit.getOnlinePlayers()) {
+      send(player);
     }
+  }
 
-    abstract void loadClasses();
+  /**
+   * Clears the title.
+   *
+   * @param player Player
+   * @throws IllegalArgumentException
+   * @throws ReflectiveOperationException
+   * @throws SecurityException
+   */
+  public abstract void clearTitle(Player player)
+      throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
 
-    /**
-     * Gets title text.
-     *
-     * @return Title text
-     */
-    public final String getTitle() {
-        return this.title;
+  /**
+   * Resets the title settings.
+   *
+   * @param player Player
+   * @throws IllegalArgumentException
+   * @throws ReflectiveOperationException
+   * @throws SecurityException
+   */
+  public abstract void resetTitle(Player player)
+      throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
+
+  private Class<?> getPrimitiveType(Class<?> clazz) {
+    if (CORRESPONDING_TYPES.containsKey(clazz)) {
+      return CORRESPONDING_TYPES.get(clazz);
+    } else {
+      return clazz;
     }
+  }
 
-    /**
-     * Sets the text for the title.
-     *
-     * @param title Title
-     */
-    public final void setTitle(String title) {
-        this.title = title;
+  private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
+    int a;
+    if (classes != null) {
+      a = classes.length;
+    } else {
+      a = 0;
     }
-
-    /**
-     * Gets the subtitle text.
-     *
-     * @return Subtitle text
-     */
-    public final String getSubtitle() {
-        return this.subtitle;
+    Class<?>[] types = new Class<?>[a];
+    for (int i = 0; i < a; i++) {
+      types[i] = getPrimitiveType(classes[i]);
     }
+    return types;
+  }
 
-    /**
-     * Sets subtitle text.
-     *
-     * @param subtitle Subtitle text
-     */
-    public final void setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
+  final Object getHandle(Object obj) {
+    try {
+      return getMethod("getHandle", obj.getClass()).invoke(obj);
+    } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+      e.printStackTrace();
+      return null;
     }
+  }
 
-    /**
-     * Sets the title color.
-     *
-     * @param color Chat color
-     */
-    public final void setTitleColor(ChatColor color) {
-        this.titleColor = color;
+  final Method getMethod(String name, Class<?> clazz, Class<?>... paramTypes) {
+    Class<?>[] t = toPrimitiveTypeArray(paramTypes);
+    for (Method m : clazz.getMethods()) {
+      Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
+      if (m.getName().equals(name) && equalsTypeArray(types, t)) {
+        return m;
+      }
     }
+    return null;
+  }
 
-    /**
-     * Sets the subtitle color.
-     *
-     * @param color Chat color
-     */
-    public final void setSubtitleColor(ChatColor color) {
-        this.subtitleColor = color;
+  private boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
+    if (a.length != o.length) {
+      return false;
     }
-
-    /**
-     * Sets title fade in time.
-     *
-     * @param time Time
-     */
-    public final void setFadeInTime(int time) {
-        this.fadeInTime = time;
+    for (int i = 0; i < a.length; i++) {
+      if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) {
+        return false;
+      }
     }
+    return true;
+  }
 
-    /**
-     * Sets title fade out time.
-     *
-     * @param time Time
-     */
-    public final void setFadeOutTime(int time) {
-        this.fadeOutTime = time;
+  boolean classListEqual(Class<?>[] l1, Class<?>[] l2) {
+    if (l1.length != l2.length) {
+      return false;
     }
-
-    /**
-     * Sets title stay time.
-     *
-     * @param time Time
-     */
-    public final void setStayTime(int time) {
-        this.stayTime = time;
-    }
-
-    /**
-     * Sets timings to ticks.
-     */
-    public final void setTimingsToTicks() {
-        this.ticks = true;
-    }
-
-    /**
-     * Sets timings to seconds.
-     */
-    public final void setTimingsToSeconds() {
-        this.ticks = false;
-    }
-
-    /**
-     * Sends the title to a player.
-     *
-     * @param player Player
-     * @throws IllegalArgumentException
-     * @throws ReflectiveOperationException
-     * @throws SecurityException
-     */
-    public abstract void send(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
-
-    /**
-     * Broadcasts the title to all players.
-     *
-     * @throws Exception
-     */
-    public final void broadcast() throws Exception {
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            send(player);
-        }
-    }
-
-    /**
-     * Clears the title.
-     *
-     * @param player Player
-     * @throws IllegalArgumentException
-     * @throws ReflectiveOperationException
-     * @throws SecurityException
-     */
-    public abstract void clearTitle(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
-
-    /**
-     * Resets the title settings.
-     *
-     * @param player Player
-     * @throws IllegalArgumentException
-     * @throws ReflectiveOperationException
-     * @throws SecurityException
-     */
-    public abstract void resetTitle(Player player)
-        throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
-
-    private Class<?> getPrimitiveType(Class<?> clazz) {
-        if (CORRESPONDING_TYPES.containsKey(clazz)) {
-            return CORRESPONDING_TYPES.get(clazz);
-        } else {
-            return clazz;
-        }
-    }
-
-    private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
-        int a;
-        if (classes != null) {
-            a = classes.length;
-        } else {
-            a = 0;
-        }
-        Class<?>[] types = new Class<?>[a];
-        for (int i = 0; i < a; i++) {
-            types[i] = getPrimitiveType(classes[i]);
-        }
-        return types;
-    }
-
-    final Object getHandle(Object obj) {
-        try {
-            return getMethod("getHandle", obj.getClass()).invoke(obj);
-        } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    final Method getMethod(String name, Class<?> clazz, Class<?>... paramTypes) {
-        Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-        for (Method m : clazz.getMethods()) {
-            Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-            if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-                return m;
-            }
-        }
-        return null;
-    }
-
-    private boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
-        if (a.length != o.length) {
-            return false;
-        }
-        for (int i = 0; i < a.length; i++) {
-            if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    boolean classListEqual(Class<?>[] l1, Class<?>[] l2) {
-        if (l1.length != l2.length) {
-            return false;
-        }
-        boolean equal = true;
-        for (int i = 0; i < l1.length; i++) {
-            if (l1[i] != l2[i]) {
-                equal = false;
-                break;
-            }
-        }
-        return equal;
+    boolean equal = true;
+    for (int i = 0; i < l1.length; i++) {
+      if (l1[i] != l2[i]) {
+        equal = false;
+        break;
+      }
     }
+    return equal;
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
index fc8bfb7aa..627a48157 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
@@ -18,485 +18,488 @@ import java.util.stream.IntStream;
  * @version 1.1.0
  */
 public class TitleManager_1_11 {
-    private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
-    /* Title packet */
-    private static Class<?> packetTitle;
-    /* Title packet actions ENUM */
-    private static Class<?> packetActions;
-    /* Chat serializer */
-    private static Class<?> nmsChatSerializer;
-    private static Class<?> chatBaseComponent;
-    /* NMS player and connection */
-    private static Class<?> nmsPlayer;
-    private static Class<?> nmsPlayerConnection;
-    private static Field playerConnection;
-    private static Method sendPacket;
-    private static Class<?> obcPlayer;
-    private static Method methodPlayerGetHandle;
-    /* Title text and color */
-    private String title = "";
-    private ChatColor titleColor = ChatColor.WHITE;
-    /* Subtitle text and color */
-    private String subtitle = "";
-    private ChatColor subtitleColor = ChatColor.WHITE;
-    /* Title timings */
-    private int fadeInTime = -1;
-    private int stayTime = -1;
-    private int fadeOutTime = -1;
-    private boolean ticks = false;
+  private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
+  /* Title packet */
+  private static Class<?> packetTitle;
+  /* Title packet actions ENUM */
+  private static Class<?> packetActions;
+  /* Chat serializer */
+  private static Class<?> nmsChatSerializer;
+  private static Class<?> chatBaseComponent;
+  /* NMS player and connection */
+  private static Class<?> nmsPlayer;
+  private static Class<?> nmsPlayerConnection;
+  private static Field playerConnection;
+  private static Method sendPacket;
+  private static Class<?> obcPlayer;
+  private static Method methodPlayerGetHandle;
+  /* Title text and color */
+  private String title = "";
+  private ChatColor titleColor = ChatColor.WHITE;
+  /* Subtitle text and color */
+  private String subtitle = "";
+  private ChatColor subtitleColor = ChatColor.WHITE;
+  /* Title timings */
+  private int fadeInTime = -1;
+  private int stayTime = -1;
+  private int fadeOutTime = -1;
+  private boolean ticks = false;
 
-    public TitleManager_1_11() {
-        loadClasses();
+  public TitleManager_1_11() {
+    loadClasses();
+  }
+
+  /**
+   * Create a new 1.8 title.
+   *
+   * @param title Title
+   */
+  public TitleManager_1_11(String title) {
+    this.title = title;
+    loadClasses();
+  }
+
+  /**
+   * Create a new 1.8 title
+   *
+   * @param title    Title text
+   * @param subtitle Subtitle text
+   */
+  public TitleManager_1_11(String title, String subtitle) {
+    this.title = title;
+    this.subtitle = subtitle;
+    loadClasses();
+  }
+
+  /**
+   * Copy 1.8 title.
+   *
+   * @param title Title
+   */
+  public TitleManager_1_11(TitleManager_1_11 title) {
+    // Copy title
+    this.title = title.getTitle();
+    this.subtitle = title.getSubtitle();
+    this.titleColor = title.getTitleColor();
+    this.subtitleColor = title.getSubtitleColor();
+    this.fadeInTime = title.getFadeInTime();
+    this.fadeOutTime = title.getFadeOutTime();
+    this.stayTime = title.getStayTime();
+    this.ticks = title.isTicks();
+    loadClasses();
+  }
+
+  /**
+   * Create a new 1.8 title.
+   *
+   * @param title       Title text
+   * @param subtitle    Subtitle text
+   * @param fadeInTime  Fade in time
+   * @param stayTime    Stay on screen time
+   * @param fadeOutTime Fade out time
+   */
+  public TitleManager_1_11(String title, String subtitle, int fadeInTime, int stayTime,
+      int fadeOutTime) {
+    this.title = title;
+    this.subtitle = subtitle;
+    this.fadeInTime = fadeInTime;
+    this.stayTime = stayTime;
+    this.fadeOutTime = fadeOutTime;
+    loadClasses();
+  }
+
+  private static boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
+    if (a.length != o.length) {
+      return false;
     }
+    return IntStream.range(0, a.length)
+        .noneMatch(i -> !a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i]));
+  }
 
-    /**
-     * Create a new 1.8 title
-     *
-     * @param title Title
-     */
-    public TitleManager_1_11(String title) {
-        this.title = title;
-        loadClasses();
+  /**
+   * Load spigot and NMS classes.
+   */
+  private void loadClasses() {
+    if (packetTitle == null) {
+      packetTitle = getNMSClass("PacketPlayOutTitle");
+      packetActions = getNMSClass("PacketPlayOutTitle$EnumTitleAction");
+      chatBaseComponent = getNMSClass("IChatBaseComponent");
+      nmsChatSerializer = getNMSClass("ChatComponentText");
+      nmsPlayer = getNMSClass("EntityPlayer");
+      nmsPlayerConnection = getNMSClass("PlayerConnection");
+      playerConnection = getField(nmsPlayer, "playerConnection");
+      sendPacket = getMethod(nmsPlayerConnection, "sendPacket");
+      obcPlayer = getOBCClass("entity.CraftPlayer");
+      methodPlayerGetHandle = getMethod("getHandle", obcPlayer);
     }
+  }
 
-    /**
-     * Create a new 1.8 title
-     *
-     * @param title    Title text
-     * @param subtitle Subtitle text
-     */
-    public TitleManager_1_11(String title, String subtitle) {
-        this.title = title;
-        this.subtitle = subtitle;
-        loadClasses();
-    }
+  /**
+   * Gets the title text.
+   *
+   * @return Title text
+   */
+  public String getTitle() {
+    return this.title;
+  }
 
-    /**
-     * Copy 1.8 title
-     *
-     * @param title Title
-     */
-    public TitleManager_1_11(TitleManager_1_11 title) {
-        // Copy title
-        this.title = title.getTitle();
-        this.subtitle = title.getSubtitle();
-        this.titleColor = title.getTitleColor();
-        this.subtitleColor = title.getSubtitleColor();
-        this.fadeInTime = title.getFadeInTime();
-        this.fadeOutTime = title.getFadeOutTime();
-        this.stayTime = title.getStayTime();
-        this.ticks = title.isTicks();
-        loadClasses();
-    }
+  /**
+   * Sets the title text.
+   *
+   * @param title Title
+   */
+  public void setTitle(String title) {
+    this.title = title;
+  }
 
-    /**
-     * Create a new 1.8 title
-     *
-     * @param title       Title text
-     * @param subtitle    Subtitle text
-     * @param fadeInTime  Fade in time
-     * @param stayTime    Stay on screen time
-     * @param fadeOutTime Fade out time
-     */
-    public TitleManager_1_11(String title, String subtitle, int fadeInTime, int stayTime,
-        int fadeOutTime) {
-        this.title = title;
-        this.subtitle = subtitle;
-        this.fadeInTime = fadeInTime;
-        this.stayTime = stayTime;
-        this.fadeOutTime = fadeOutTime;
-        loadClasses();
-    }
+  /**
+   * Gets the subtitle text.
+   *
+   * @return Subtitle text
+   */
+  public String getSubtitle() {
+    return this.subtitle;
+  }
 
-    private static boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
-        if (a.length != o.length) {
-            return false;
+  /**
+   * Sets the subtitle text.
+   *
+   * @param subtitle Subtitle text
+   */
+  public void setSubtitle(String subtitle) {
+    this.subtitle = subtitle;
+  }
+
+  /**
+   * Sets timings to ticks.
+   */
+  public void setTimingsToTicks() {
+    ticks = true;
+  }
+
+  /**
+   * Sets timings to seconds.
+   */
+  public void setTimingsToSeconds() {
+    ticks = false;
+  }
+
+  /**
+   * Sends the title to a player.
+   *
+   * @param player Player
+   */
+  public void send(Player player) {
+    if (packetTitle != null) {
+      // First reset previous settings
+      resetTitle(player);
+      try {
+        // Send timings first
+        Object handle = getHandle(player);
+        Object connection = playerConnection.get(handle);
+        Object[] actions = packetActions.getEnumConstants();
+        Object packet = packetTitle
+            .getConstructor(packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE,
+                Integer.TYPE).newInstance(actions[3], null, fadeInTime * (ticks ? 1 : 20),
+                stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
+        // Send if set
+        if (fadeInTime != -1 && fadeOutTime != -1 && stayTime != -1) {
+          sendPacket.invoke(connection, packet);
         }
-        return IntStream.range(0, a.length)
-            .noneMatch(i -> !a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i]));
-    }
 
-    /**
-     * Load spigot and NMS classes
-     */
-    private void loadClasses() {
-        if (packetTitle == null) {
-            packetTitle = getNMSClass("PacketPlayOutTitle");
-            packetActions = getNMSClass("PacketPlayOutTitle$EnumTitleAction");
-            chatBaseComponent = getNMSClass("IChatBaseComponent");
-            nmsChatSerializer = getNMSClass("ChatComponentText");
-            nmsPlayer = getNMSClass("EntityPlayer");
-            nmsPlayerConnection = getNMSClass("PlayerConnection");
-            playerConnection = getField(nmsPlayer, "playerConnection");
-            sendPacket = getMethod(nmsPlayerConnection, "sendPacket");
-            obcPlayer = getOBCClass("entity.CraftPlayer");
-            methodPlayerGetHandle = getMethod("getHandle", obcPlayer);
+        Object serialized;
+        if (!subtitle.equals("")) {
+          // Send subtitle if present
+          serialized = nmsChatSerializer.getConstructor(String.class)
+              .newInstance(subtitleColor + ChatColor.translateAlternateColorCodes('&', subtitle));
+          packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
+              .newInstance(actions[1], serialized);
+          sendPacket.invoke(connection, packet);
         }
+
+        // Send title
+        serialized = nmsChatSerializer.getConstructor(String.class)
+            .newInstance(titleColor + ChatColor.translateAlternateColorCodes('&', title));
+        packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
+            .newInstance(actions[0], serialized);
+        sendPacket.invoke(connection, packet);
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
     }
+  }
 
-    /**
-     * Get title text
-     *
-     * @return Title text
-     */
-    public String getTitle() {
-        return this.title;
-    }
-
-    /**
-     * Set title text
-     *
-     * @param title Title
-     */
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    /**
-     * Get subtitle text
-     *
-     * @return Subtitle text
-     */
-    public String getSubtitle() {
-        return this.subtitle;
-    }
-
-    /**
-     * Set subtitle text
-     *
-     * @param subtitle Subtitle text
-     */
-    public void setSubtitle(String subtitle) {
-        this.subtitle = subtitle;
-    }
-
-    /**
-     * Set timings to ticks
-     */
-    public void setTimingsToTicks() {
-        ticks = true;
-    }
-
-    /**
-     * Set timings to seconds
-     */
-    public void setTimingsToSeconds() {
-        ticks = false;
-    }
-
-    /**
-     * Send the title to a player
-     *
-     * @param player Player
-     */
-    public void send(Player player) {
-        if (packetTitle != null) {
-            // First reset previous settings
-            resetTitle(player);
-            try {
-                // Send timings first
-                Object handle = getHandle(player);
-                Object connection = playerConnection.get(handle);
-                Object[] actions = packetActions.getEnumConstants();
-                Object packet = packetTitle
-                    .getConstructor(packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE,
-                        Integer.TYPE).newInstance(actions[3], null, fadeInTime * (ticks ? 1 : 20),
-                        stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
-                // Send if set
-                if (fadeInTime != -1 && fadeOutTime != -1 && stayTime != -1) {
-                    sendPacket.invoke(connection, packet);
-                }
-
-                Object serialized;
-                if (!subtitle.equals("")) {
-                    // Send subtitle if present
-                    serialized = nmsChatSerializer.getConstructor(String.class).newInstance(
-                        subtitleColor + ChatColor.translateAlternateColorCodes('&', subtitle));
-                    packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-                        .newInstance(actions[1], serialized);
-                    sendPacket.invoke(connection, packet);
-                }
-
-                // Send title
-                serialized = nmsChatSerializer.getConstructor(String.class)
-                    .newInstance(titleColor + ChatColor.translateAlternateColorCodes('&', title));
-                packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-                    .newInstance(actions[0], serialized);
-                sendPacket.invoke(connection, packet);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+  public void updateTimes(Player player) {
+    if (TitleManager_1_11.packetTitle != null) {
+      try {
+        Object handle = getHandle(player);
+        Object connection = playerConnection.get(handle);
+        Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
+        Object packet = TitleManager_1_11.packetTitle.getConstructor(
+            new Class[] {TitleManager_1_11.packetActions, chatBaseComponent, Integer.TYPE,
+                Integer.TYPE, Integer.TYPE})
+            .newInstance(actions[3], null, this.fadeInTime * (this.ticks ? 1 : 20),
+                this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
+        if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
+          sendPacket.invoke(connection, packet);
         }
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
     }
+  }
 
-    public void updateTimes(Player player) {
-        if (TitleManager_1_11.packetTitle != null) {
-            try {
-                Object handle = getHandle(player);
-                Object connection = playerConnection.get(handle);
-                Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
-                Object packet = TitleManager_1_11.packetTitle.getConstructor(
-                    new Class[] {TitleManager_1_11.packetActions, chatBaseComponent, Integer.TYPE,
-                        Integer.TYPE, Integer.TYPE})
-                    .newInstance(actions[3], null, this.fadeInTime * (this.ticks ? 1 : 20),
-                        this.stayTime * (this.ticks ? 1 : 20),
-                        this.fadeOutTime * (this.ticks ? 1 : 20));
-                if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
-                    sendPacket.invoke(connection, packet);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+  public void updateTitle(Player player) {
+    if (TitleManager_1_11.packetTitle != null) {
+      try {
+        Object handle = getHandle(player);
+        Object connection = getField(handle.getClass(), "playerConnection").get(handle);
+        Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
+        Method sendPacket = getMethod(connection.getClass(), "sendPacket");
+        Object serialized = nmsChatSerializer.getConstructor(String.class)
+            .newInstance(titleColor + ChatColor.translateAlternateColorCodes('&', this.title));
+        Object packet = TitleManager_1_11.packetTitle
+            .getConstructor(new Class[] {TitleManager_1_11.packetActions, chatBaseComponent})
+            .newInstance(actions[0], serialized);
+        sendPacket.invoke(connection, packet);
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
     }
+  }
 
-    public void updateTitle(Player player) {
-        if (TitleManager_1_11.packetTitle != null) {
-            try {
-                Object handle = getHandle(player);
-                Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-                Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
-                Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-                Object serialized = nmsChatSerializer.getConstructor(String.class).newInstance(
-                    titleColor + ChatColor.translateAlternateColorCodes('&', this.title));
-                Object packet = TitleManager_1_11.packetTitle.getConstructor(
-                    new Class[] {TitleManager_1_11.packetActions, chatBaseComponent})
-                    .newInstance(actions[0], serialized);
-                sendPacket.invoke(connection, packet);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+  public void updateSubtitle(Player player) {
+    if (TitleManager_1_11.packetTitle != null) {
+      try {
+        Object handle = getHandle(player);
+        Object connection = playerConnection.get(handle);
+        Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
+        Object serialized = nmsChatSerializer.getConstructor(String.class).newInstance(
+            subtitleColor + ChatColor.translateAlternateColorCodes('&', this.subtitle));
+        Object packet = TitleManager_1_11.packetTitle
+            .getConstructor(new Class[] {TitleManager_1_11.packetActions, chatBaseComponent})
+            .newInstance(actions[1], serialized);
+        sendPacket.invoke(connection, packet);
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
     }
+  }
 
-    public void updateSubtitle(Player player) {
-        if (TitleManager_1_11.packetTitle != null) {
-            try {
-                Object handle = getHandle(player);
-                Object connection = playerConnection.get(handle);
-                Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
-                Object serialized = nmsChatSerializer.getConstructor(String.class).newInstance(
-                    subtitleColor + ChatColor.translateAlternateColorCodes('&', this.subtitle));
-                Object packet = TitleManager_1_11.packetTitle.getConstructor(
-                    new Class[] {TitleManager_1_11.packetActions, chatBaseComponent})
-                    .newInstance(actions[1], serialized);
-                sendPacket.invoke(connection, packet);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
+  /**
+   * Broadcasts the title to all players.
+   */
+  public void broadcast() {
+    for (Player p : Bukkit.getOnlinePlayers()) {
+      send(p);
     }
+  }
 
-    /**
-     * Broadcast the title to all players
-     */
-    public void broadcast() {
-        for (Player p : Bukkit.getOnlinePlayers()) {
-            send(p);
-        }
+  /**
+   * Clears the title from the players screen.
+   *
+   * @param player Player
+   */
+  public void clearTitle(Player player) {
+    try {
+      // Send timings first
+      Object handle = getHandle(player);
+      Object connection = playerConnection.get(handle);
+      Object[] actions = packetActions.getEnumConstants();
+      Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
+          .newInstance(actions[4], null);
+      sendPacket.invoke(connection, packet);
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+  }
 
-    /**
-     * Clear the title
-     *
-     * @param player Player
-     */
-    public void clearTitle(Player player) {
-        try {
-            // Send timings first
-            Object handle = getHandle(player);
-            Object connection = playerConnection.get(handle);
-            Object[] actions = packetActions.getEnumConstants();
-            Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-                .newInstance(actions[4], null);
-            sendPacket.invoke(connection, packet);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+  /**
+   * Resets the title settings.
+   *
+   * @param player Player
+   */
+  public void resetTitle(Player player) {
+    try {
+      // Send timings first
+      Object handle = getHandle(player);
+      Object connection = playerConnection.get(handle);
+      Object[] actions = packetActions.getEnumConstants();
+      Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
+          .newInstance(actions[5], null);
+      sendPacket.invoke(connection, packet);
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+  }
 
-    /**
-     * Reset the title settings
-     *
-     * @param player Player
-     */
-    public void resetTitle(Player player) {
-        try {
-            // Send timings first
-            Object handle = getHandle(player);
-            Object connection = playerConnection.get(handle);
-            Object[] actions = packetActions.getEnumConstants();
-            Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-                .newInstance(actions[5], null);
-            sendPacket.invoke(connection, packet);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+  private Class<?> getPrimitiveType(Class<?> clazz) {
+    return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
+  }
 
-    private Class<?> getPrimitiveType(Class<?> clazz) {
-        return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
+  private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
+    int a = classes != null ? classes.length : 0;
+    Class<?>[] types = new Class<?>[a];
+    for (int i = 0; i < a; i++) {
+      types[i] = getPrimitiveType(classes[i]);
     }
+    return types;
+  }
 
-    private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
-        int a = classes != null ? classes.length : 0;
-        Class<?>[] types = new Class<?>[a];
-        for (int i = 0; i < a; i++) {
-            types[i] = getPrimitiveType(classes[i]);
-        }
-        return types;
+  private Object getHandle(Player player) {
+    try {
+      return methodPlayerGetHandle.invoke(player);
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
     }
+  }
 
-    private Object getHandle(Player player) {
-        try {
-            return methodPlayerGetHandle.invoke(player);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
+  private Method getMethod(String name, Class<?> clazz, Class<?>... paramTypes) {
+    Class<?>[] t = toPrimitiveTypeArray(paramTypes);
+    for (Method m : clazz.getMethods()) {
+      Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
+      if (m.getName().equals(name) && equalsTypeArray(types, t)) {
+        return m;
+      }
     }
+    return null;
+  }
 
-    private Method getMethod(String name, Class<?> clazz, Class<?>... paramTypes) {
-        Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-        for (Method m : clazz.getMethods()) {
-            Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-            if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-                return m;
-            }
-        }
-        return null;
-    }
+  private String getVersion() {
+    String name = Bukkit.getServer().getClass().getPackage().getName();
+    return name.substring(name.lastIndexOf('.') + 1) + ".";
+  }
 
-    private String getVersion() {
-        String name = Bukkit.getServer().getClass().getPackage().getName();
-        String version = name.substring(name.lastIndexOf('.') + 1) + ".";
-        return version;
+  private Class<?> getNMSClass(String className) {
+    String fullName = "net.minecraft.server." + getVersion() + className;
+    Class<?> clazz = null;
+    try {
+      clazz = Class.forName(fullName);
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+    return clazz;
+  }
 
-    private Class<?> getNMSClass(String className) {
-        String fullName = "net.minecraft.server." + getVersion() + className;
-        Class<?> clazz = null;
-        try {
-            clazz = Class.forName(fullName);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return clazz;
+  private Class<?> getOBCClass(String className) {
+    String fullName = "org.bukkit.craftbukkit." + getVersion() + className;
+    Class<?> clazz = null;
+    try {
+      clazz = Class.forName(fullName);
+    } catch (Exception e) {
+      e.printStackTrace();
     }
+    return clazz;
+  }
 
-    private Class<?> getOBCClass(String className) {
-        String fullName = "org.bukkit.craftbukkit." + getVersion() + className;
-        Class<?> clazz = null;
-        try {
-            clazz = Class.forName(fullName);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return clazz;
+  private Field getField(Class<?> clazz, String name) {
+    try {
+      Field field = clazz.getDeclaredField(name);
+      field.setAccessible(true);
+      return field;
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
     }
+  }
 
-    private Field getField(Class<?> clazz, String name) {
-        try {
-            Field field = clazz.getDeclaredField(name);
-            field.setAccessible(true);
-            return field;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
+  private Method getMethod(Class<?> clazz, String name, Class<?>... args) {
+    for (Method m : clazz.getMethods()) {
+      if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args,
+          m.getParameterTypes()))) {
+        m.setAccessible(true);
+        return m;
+      }
     }
+    return null;
+  }
 
-    private Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-        for (Method m : clazz.getMethods()) {
-            if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args,
-                m.getParameterTypes()))) {
-                m.setAccessible(true);
-                return m;
-            }
-        }
-        return null;
+  private boolean ClassListEqual(Class<?>[] l1, Class<?>[] l2) {
+    if (l1.length != l2.length) {
+      return false;
     }
+    boolean equal = true;
+    for (int i = 0; i < l1.length; i++) {
+      if (l1[i] != l2[i]) {
+        equal = false;
+        break;
+      }
+    }
+    return equal;
+  }
 
-    private boolean ClassListEqual(Class<?>[] l1, Class<?>[] l2) {
-        boolean equal = true;
-        if (l1.length != l2.length) {
-            return false;
-        }
-        for (int i = 0; i < l1.length; i++) {
-            if (l1[i] != l2[i]) {
-                equal = false;
-                break;
-            }
-        }
-        return equal;
-    }
+  public ChatColor getTitleColor() {
+    return titleColor;
+  }
 
-    public ChatColor getTitleColor() {
-        return titleColor;
-    }
+  /**
+   * Sets the title color.
+   *
+   * @param color Chat color
+   */
+  public void setTitleColor(ChatColor color) {
+    this.titleColor = color;
+  }
 
-    /**
-     * Set the title color
-     *
-     * @param color Chat color
-     */
-    public void setTitleColor(ChatColor color) {
-        this.titleColor = color;
-    }
+  public ChatColor getSubtitleColor() {
+    return subtitleColor;
+  }
 
-    public ChatColor getSubtitleColor() {
-        return subtitleColor;
-    }
+  /**
+   * Sets the subtitle color.
+   *
+   * @param color Chat color
+   */
+  public void setSubtitleColor(ChatColor color) {
+    this.subtitleColor = color;
+  }
 
-    /**
-     * Set the subtitle color
-     *
-     * @param color Chat color
-     */
-    public void setSubtitleColor(ChatColor color) {
-        this.subtitleColor = color;
-    }
+  public int getFadeInTime() {
+    return fadeInTime;
+  }
 
-    public int getFadeInTime() {
-        return fadeInTime;
-    }
+  /**
+   * Sets the fade in time for the title.
+   *
+   * @param time Time
+   */
+  public void setFadeInTime(int time) {
+    this.fadeInTime = time;
+  }
 
-    /**
-     * Set title fade in time
-     *
-     * @param time Time
-     */
-    public void setFadeInTime(int time) {
-        this.fadeInTime = time;
-    }
+  /**
+   * Gets the fade out time for the title.
+   *
+   * @return the time to fade out
+   */
+  public int getFadeOutTime() {
+    return fadeOutTime;
+  }
 
-    public int getFadeOutTime() {
-        return fadeOutTime;
-    }
+  /**
+   * Sets the fade out time for the title.
+   *
+   * @param time fade-out time
+   */
+  public void setFadeOutTime(int time) {
+    this.fadeOutTime = time;
+  }
 
-    /**
-     * Set title fade out time
-     *
-     * @param time Time
-     */
-    public void setFadeOutTime(int time) {
-        this.fadeOutTime = time;
-    }
+  public int getStayTime() {
+    return stayTime;
+  }
 
-    public int getStayTime() {
-        return stayTime;
-    }
+  /**
+   * Sets the title stay time.
+   *
+   * @param time Time
+   */
+  public void setStayTime(int time) {
+    this.stayTime = time;
+  }
 
-    /**
-     * Set title stay time
-     *
-     * @param time Time
-     */
-    public void setStayTime(int time) {
-        this.stayTime = time;
-    }
-
-    public boolean isTicks() {
-        return ticks;
-    }
+  public boolean isTicks() {
+    return ticks;
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 54ced2b83..7dcbc5add 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -275,8 +275,6 @@ public class BukkitChunkManager extends ChunkManager {
                         continue;
                     }
                     final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
-                    RegionWrapper currentPlotClear =
-                        new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
                     if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) {
                         AugmentedUtils
                             .bypass(ignoreAugment, () -> queue.regenChunkSafe(chunk.x, chunk.z));
@@ -341,6 +339,8 @@ public class BukkitChunkManager extends ChunkManager {
                     if (checkX2 && checkZ2) {
                         map.saveRegion(bukkitWorldObj, xxt2, xxt, zzt2, zzt); //
                     }
+                    RegionWrapper currentPlotClear =
+                        new RegionWrapper(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ());
                     map.saveEntitiesOut(chunkObj, currentPlotClear);
                     AugmentedUtils.bypass(ignoreAugment,
                         () -> setChunkInPlotArea(null, new RunnableVal<ScopedLocalBlockQueue>() {
@@ -611,11 +611,7 @@ public class BukkitChunkManager extends ChunkManager {
             }
         }
 
-        public void saveEntitiesIn(Chunk chunk, RegionWrapper region) {
-            saveEntitiesIn(chunk, region, 0, 0, false);
-        }
-
-        public void saveEntitiesOut(Chunk chunk, RegionWrapper region) {
+        void saveEntitiesOut(Chunk chunk, RegionWrapper region) {
             for (Entity entity : chunk.getEntities()) {
                 Location loc = BukkitUtil.getLocation(entity);
                 int x = loc.getX();
@@ -632,7 +628,11 @@ public class BukkitChunkManager extends ChunkManager {
             }
         }
 
-        public void saveEntitiesIn(Chunk chunk, RegionWrapper region, int offsetX, int offsetZ,
+        void saveEntitiesIn(Chunk chunk, RegionWrapper region) {
+            saveEntitiesIn(chunk, region, 0, 0, false);
+        }
+
+        void saveEntitiesIn(Chunk chunk, RegionWrapper region, int offsetX, int offsetZ,
             boolean delete) {
             for (Entity entity : chunk.getEntities()) {
                 Location loc = BukkitUtil.getLocation(entity);
@@ -657,7 +657,7 @@ public class BukkitChunkManager extends ChunkManager {
             }
         }
 
-        public void restoreEntities(World world, int xOffset, int zOffset) {
+        void restoreEntities(World world, int xOffset, int zOffset) {
             for (EntityWrapper entity : this.entities) {
                 try {
                     entity.spawn(world, xOffset, zOffset);
@@ -670,8 +670,7 @@ public class BukkitChunkManager extends ChunkManager {
         }
 
         //todo optimize maxY
-        public void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX,
-            int offsetZ) {
+        void saveBlocks(BukkitWorld world, int maxY, int x, int z, int offsetX, int offsetZ) {
             maxY = Math.min(255, maxY);
             BaseBlock[] ids;
             ids = new BaseBlock[maxY + 1];
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
index 5a4cf885a..744d9084f 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEventUtil.java
@@ -1,9 +1,30 @@
 package com.github.intellectualsites.plotsquared.bukkit.util;
 
-import com.github.intellectualsites.plotsquared.bukkit.events.*;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerClaimPlotEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerEnterPlotEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerLeavePlotEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerPlotDeniedEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerPlotHelperEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerPlotTrustedEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlayerTeleportToPlotEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotAutoMergeEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotChangeOwnerEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotClearEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotComponentSetEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotDeleteEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotFlagAddEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotFlagRemoveEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotMergeEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotRateEvent;
+import com.github.intellectualsites.plotsquared.bukkit.events.PlotUnlinkEvent;
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.Rating;
 import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -16,97 +37,95 @@ import java.util.List;
 import java.util.UUID;
 
 /**
- * Utility class for handling Bukkit {@link Event events}
+ * Utility class for handling Bukkit Events.
  */
 public final class BukkitEventUtil extends EventUtil {
 
-    @Nullable public Player getPlayer(final PlotPlayer player) {
-        if (player instanceof BukkitPlayer) {
-            return ((BukkitPlayer) player).player;
-        }
-        return null;
+  @Nullable public Player getPlayer(final PlotPlayer player) {
+    if (player instanceof BukkitPlayer) {
+      return ((BukkitPlayer) player).player;
     }
+    return null;
+  }
 
-    private boolean callEvent(@Nonnull final Event event) {
-        Bukkit.getServer().getPluginManager().callEvent(event);
-        return !(event instanceof Cancellable) || !((Cancellable) event).isCancelled();
-    }
+  private boolean callEvent(@Nonnull final Event event) {
+    Bukkit.getServer().getPluginManager().callEvent(event);
+    return !(event instanceof Cancellable) || !((Cancellable) event).isCancelled();
+  }
 
-    @Override public boolean callClaim(PlotPlayer player, Plot plot, boolean auto) {
-        return callEvent(new PlayerClaimPlotEvent(getPlayer(player), plot, auto));
-    }
+  @Override public boolean callClaim(PlotPlayer player, Plot plot, boolean auto) {
+    return callEvent(new PlayerClaimPlotEvent(getPlayer(player), plot, auto));
+  }
 
-    @Override public boolean callTeleport(PlotPlayer player, Location from, Plot plot) {
-        return callEvent(new PlayerTeleportToPlotEvent(getPlayer(player), from, plot));
-    }
+  @Override public boolean callTeleport(PlotPlayer player, Location from, Plot plot) {
+    return callEvent(new PlayerTeleportToPlotEvent(getPlayer(player), from, plot));
+  }
 
-    @Override public boolean callComponentSet(Plot plot, String component) {
-        return callEvent(new PlotComponentSetEvent(plot, component));
-    }
+  @Override public boolean callComponentSet(Plot plot, String component) {
+    return callEvent(new PlotComponentSetEvent(plot, component));
+  }
 
-    @Override public boolean callClear(Plot plot) {
-        return callEvent(new PlotClearEvent(plot));
-    }
+  @Override public boolean callClear(Plot plot) {
+    return callEvent(new PlotClearEvent(plot));
+  }
 
-    @Override public boolean callDelete(Plot plot) {
-        return callEvent(new PlotDeleteEvent(plot));
-    }
+  @Override public boolean callDelete(Plot plot) {
+    return callEvent(new PlotDeleteEvent(plot));
+  }
 
-    @Override public boolean callFlagAdd(Flag flag, Plot plot) {
-        return callEvent(new PlotFlagAddEvent(flag, plot));
-    }
+  @Override public boolean callFlagAdd(Flag flag, Plot plot) {
+    return callEvent(new PlotFlagAddEvent(flag, plot));
+  }
 
-    @Override public boolean callFlagRemove(Flag<?> flag, Plot plot, Object value) {
-        return callEvent(new PlotFlagRemoveEvent(flag, plot));
-    }
+  @Override public boolean callFlagRemove(Flag<?> flag, Plot plot, Object value) {
+    return callEvent(new PlotFlagRemoveEvent(flag, plot));
+  }
 
-    @Override public boolean callMerge(Plot plot, int dir, int max) {
-        return callEvent(
-            new PlotMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, dir, max));
-    }
+  @Override public boolean callMerge(Plot plot, int dir, int max) {
+    return callEvent(new PlotMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, dir, max));
+  }
 
-    @Override public boolean callAutoMerge(Plot plot, List<PlotId> plots) {
-        return callEvent(
-            new PlotAutoMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, plots));
-    }
+  @Override public boolean callAutoMerge(Plot plot, List<PlotId> plots) {
+    return callEvent(new PlotAutoMergeEvent(BukkitUtil.getWorld(plot.getWorldName()), plot, plots));
+  }
 
-    @Override public boolean callUnlink(PlotArea area, List<PlotId> plots) {
-        return callEvent(new PlotUnlinkEvent(BukkitUtil.getWorld(area.worldname), area, plots));
-    }
+  @Override public boolean callUnlink(PlotArea area, List<PlotId> plots) {
+    return callEvent(new PlotUnlinkEvent(BukkitUtil.getWorld(area.worldname), area, plots));
+  }
 
-    @Override public void callEntry(PlotPlayer player, Plot plot) {
-        callEvent(new PlayerEnterPlotEvent(getPlayer(player), plot));
-    }
+  @Override public void callEntry(PlotPlayer player, Plot plot) {
+    callEvent(new PlayerEnterPlotEvent(getPlayer(player), plot));
+  }
 
-    @Override public void callLeave(PlotPlayer player, Plot plot) {
-        callEvent(new PlayerLeavePlotEvent(getPlayer(player), plot));
-    }
+  @Override public void callLeave(PlotPlayer player, Plot plot) {
+    callEvent(new PlayerLeavePlotEvent(getPlayer(player), plot));
+  }
 
-    @Override public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
-        callEvent(new PlayerPlotDeniedEvent(getPlayer(initiator), plot, player, added));
-    }
+  @Override public void callDenied(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    callEvent(new PlayerPlotDeniedEvent(getPlayer(initiator), plot, player, added));
+  }
 
-    @Override public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
-        callEvent(new PlayerPlotTrustedEvent(getPlayer(initiator), plot, player, added));
-    }
+  @Override public void callTrusted(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    callEvent(new PlayerPlotTrustedEvent(getPlayer(initiator), plot, player, added));
+  }
 
-    @Override public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
-        callEvent(new PlayerPlotHelperEvent(getPlayer(initiator), plot, player, added));
-    }
+  @Override public void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added) {
+    callEvent(new PlayerPlotHelperEvent(getPlayer(initiator), plot, player, added));
+  }
 
-    @Override
-    public boolean callOwnerChange(PlotPlayer initiator, Plot plot, UUID oldOwner, UUID newOwner,
-        boolean hasOldOwner) {
-        return callEvent(
-            new PlotChangeOwnerEvent(getPlayer(initiator), plot, oldOwner, newOwner, hasOldOwner));
-    }
+  @Override
+  public boolean callOwnerChange(PlotPlayer initiator, Plot plot, UUID oldOwner, UUID newOwner,
+      boolean hasOldOwner) {
+    return callEvent(
+        new PlotChangeOwnerEvent(getPlayer(initiator), plot, oldOwner, newOwner, hasOldOwner));
+  }
 
-    @Override @Nullable public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
-        PlotRateEvent event = new PlotRateEvent(player, rating, plot);
-        Bukkit.getServer().getPluginManager().callEvent(event);
-        if (event.isCancelled()) {
-            return null;
-        }
-        return event.getRating();
+  @Override @Nullable public Rating callRating(PlotPlayer player, Plot plot, Rating rating) {
+    PlotRateEvent event = new PlotRateEvent(player, rating, plot);
+    Bukkit.getServer().getPluginManager().callEvent(event);
+    if (event.isCancelled()) {
+      return null;
     }
+    return event.getRating();
+  }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
index f2b4188e3..2c66f8d3f 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java
@@ -21,100 +21,104 @@ import java.util.stream.IntStream;
 
 public class BukkitInventoryUtil extends InventoryUtil {
 
-    public static ItemStack getItem(PlotItemStack item) {
-        if (item == null) {
-            return null;
-        }
-        ItemStack stack = new ItemStack(BukkitUtil.getMaterial(item.getPlotBlock()), item.amount);
-        ItemMeta meta = null;
-        if (item.name != null) {
-            meta = stack.getItemMeta();
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', item.name));
-        }
-        if (item.lore != null) {
-            if (meta == null) {
-                meta = stack.getItemMeta();
-            }
-            List<String> lore = new ArrayList<>();
-            for (String entry : item.lore) {
-                lore.add(ChatColor.translateAlternateColorCodes('&', entry));
-            }
-            meta.setLore(lore);
-        }
-        if (meta != null) {
-            stack.setItemMeta(meta);
-        }
-        return stack;
+  @Override public void open(PlotInventory inv) {
+    BukkitPlayer bp = (BukkitPlayer) inv.player;
+    Inventory inventory = Bukkit.createInventory(null, inv.size * 9, inv.getTitle());
+    PlotItemStack[] items = inv.getItems();
+    for (int i = 0; i < inv.size * 9; i++) {
+      PlotItemStack item = items[i];
+      if (item != null) {
+        inventory.setItem(i, getItem(item));
+      }
     }
+    bp.player.openInventory(inventory);
+  }
 
-    @Override public void open(PlotInventory inv) {
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        Inventory inventory = Bukkit.createInventory(null, inv.size * 9, inv.getTitle());
-        PlotItemStack[] items = inv.getItems();
-        for (int i = 0; i < inv.size * 9; i++) {
-            PlotItemStack item = items[i];
-            if (item != null) {
-                inventory.setItem(i, getItem(item));
-            }
-        }
-        bp.player.openInventory(inventory);
+  @Override public void close(PlotInventory inv) {
+    if (!inv.isOpen()) {
+      return;
     }
+    BukkitPlayer bp = (BukkitPlayer) inv.player;
+    bp.player.closeInventory();
+  }
 
-    @Override public void close(PlotInventory inv) {
-        if (!inv.isOpen()) {
-            return;
-        }
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        bp.player.closeInventory();
+  @Override public void setItem(PlotInventory inv, int index, PlotItemStack item) {
+    BukkitPlayer bp = (BukkitPlayer) inv.player;
+    InventoryView opened = bp.player.getOpenInventory();
+    if (!inv.isOpen()) {
+      return;
     }
+    opened.setItem(index, getItem(item));
+    bp.player.updateInventory();
+  }
 
-    @Override public void setItem(PlotInventory inv, int index, PlotItemStack item) {
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        InventoryView opened = bp.player.getOpenInventory();
-        if (!inv.isOpen()) {
-            return;
-        }
-        opened.setItem(index, getItem(item));
-        bp.player.updateInventory();
+  private static ItemStack getItem(PlotItemStack item) {
+    if (item == null) {
+      return null;
     }
+    ItemStack stack = new ItemStack(BukkitUtil.getMaterial(item.getPlotBlock()), item.amount);
+    ItemMeta meta = null;
+    if (item.name != null) {
+      meta = stack.getItemMeta();
+      meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', item.name));
+    }
+    if (item.lore != null) {
+      if (meta == null) {
+        meta = stack.getItemMeta();
+      }
+      List<String> lore = new ArrayList<>();
+      for (String entry : item.lore) {
+        lore.add(ChatColor.translateAlternateColorCodes('&', entry));
+      }
+      meta.setLore(lore);
+    }
+    if (meta != null) {
+      stack.setItemMeta(meta);
+    }
+    return stack;
+  }
 
-    public PlotItemStack getItem(ItemStack item) {
-        if (item == null) {
-            return null;
-        }
-        // int id = item.getTypeId();
-        Material id = item.getType();
-        short data = item.getDurability();
-        int amount = item.getAmount();
-        String name = null;
-        String[] lore = null;
-        if (item.hasItemMeta()) {
-            ItemMeta meta = item.getItemMeta();
-            if (meta.hasDisplayName()) {
-                name = meta.getDisplayName();
-            }
-            if (meta.hasLore()) {
-                List<String> itemLore = meta.getLore();
-                lore = itemLore.toArray(new String[0]);
-            }
-        }
-        return new PlotItemStack(id.name(), amount, name, lore);
+  public PlotItemStack getItem(ItemStack item) {
+    if (item == null) {
+      return null;
     }
+    // int id = item.getTypeId();
+    Material id = item.getType();
+    ItemMeta meta = item.getItemMeta();
+    int amount = item.getAmount();
+    String name = null;
+    String[] lore = null;
+    if (item.hasItemMeta()) {
+      assert meta != null;
+      if (meta.hasDisplayName()) {
+        name = meta.getDisplayName();
+      }
+      if (meta.hasLore()) {
+        List<String> itemLore = meta.getLore();
+        lore = itemLore.toArray(new String[0]);
+      }
+    }
+    return new PlotItemStack(id.name(), amount, name, lore);
+  }
 
-    @Override public PlotItemStack[] getItems(PlotPlayer player) {
-        BukkitPlayer bp = (BukkitPlayer) player;
-        PlayerInventory inv = bp.player.getInventory();
-        return IntStream.range(0, 36).mapToObj(i -> getItem(inv.getItem(i)))
-            .toArray(PlotItemStack[]::new);
-    }
+  @Override public PlotItemStack[] getItems(PlotPlayer player) {
+    BukkitPlayer bp = (BukkitPlayer) player;
+    PlayerInventory inv = bp.player.getInventory();
+    return IntStream.range(0, 36).mapToObj(i -> getItem(inv.getItem(i)))
+        .toArray(PlotItemStack[]::new);
+  }
 
-    @Override public boolean isOpen(PlotInventory plotInventory) {
-        if (!plotInventory.isOpen()) {
-            return false;
-        }
-        BukkitPlayer bp = (BukkitPlayer) plotInventory.player;
-        InventoryView opened = bp.player.getOpenInventory();
-        return plotInventory.isOpen() && opened.getType() == InventoryType.CRAFTING
-            && opened.getTitle() == null;
+  @Override public boolean isOpen(PlotInventory plotInventory) {
+    if (!plotInventory.isOpen()) {
+      return false;
     }
+    BukkitPlayer bp = (BukkitPlayer) plotInventory.player;
+    InventoryView opened = bp.player.getOpenInventory();
+    if (plotInventory.isOpen()) {
+      if (opened.getType() == InventoryType.CRAFTING) {
+        opened.getTitle();
+      }
+    }
+    return false;
+  }
 }

From 9f792fa54b70a534176f6ea7008cbb96559d69b3 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 24 Apr 2019 21:23:57 -0400
Subject: [PATCH 150/210] Fixes #2328 I hope this doesn't cause more issues
 than it solves

---
 .../plotsquared/bukkit/BukkitMain.java          |  4 ++--
 .../bukkit/listeners/EntitySpawnListener.java   |  6 +++---
 .../bukkit/listeners/PlayerEvents.java          | 17 +++++++----------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 12dd070fc..8aaea98fe 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -420,7 +420,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                         case SHULKER:
                             if (Settings.Enabled_Components.KILL_ROAD_MOBS) {
                                 LivingEntity livingEntity = (LivingEntity) entity;
-                                List<MetadataValue> meta = entity.getMetadata("plot");
+                                List<MetadataValue> meta = entity.getMetadata("shulkerPlot");
                                 if (!meta.isEmpty()) {
                                     if (livingEntity.isLeashed()) {
                                         continue;
@@ -457,7 +457,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                     if (area != null) {
                                         PlotId currentPlotId = PlotId.of(area.getPlotAbs(pLoc));
                                         if (currentPlotId != null) {
-                                            entity.setMetadata("plot", new FixedMetadataValue(
+                                            entity.setMetadata("shulkerPlot", new FixedMetadataValue(
                                                 (Plugin) PlotSquared.get().IMP, currentPlotId));
                                         }
                                     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index f15663fdb..27a24ba9d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -62,7 +62,7 @@ public class EntitySpawnListener implements Listener {
     public static void test(Entity entity) {
         @NotNull World world = entity.getWorld();
         List<MetadataValue> meta = entity.getMetadata(KEY);
-        if (meta == null || meta.isEmpty()) {
+        if (meta.isEmpty()) {
             if (PlotSquared.get().hasPlotArea(world.getName())) {
                 entity.setMetadata(KEY,
                     new FixedMetadataValue((Plugin) PlotSquared.get().IMP, entity.getLocation()));
@@ -126,8 +126,8 @@ public class EntitySpawnListener implements Listener {
                     event.setCancelled(true);
                 }
             case SHULKER:
-                if (!entity.hasMetadata("plot")) {
-                    entity.setMetadata("plot",
+                if (!entity.hasMetadata("shulkerPlot")) {
+                    entity.setMetadata("shulkerPlot",
                         new FixedMetadataValue((Plugin) PlotSquared.get().IMP, plot.getId()));
                 }
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index c611e80f4..346983255 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -10,10 +10,13 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.*;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.FluidCollisionMode;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
@@ -1048,17 +1051,11 @@ import java.util.regex.Pattern;
     public void onBigBoom(EntityExplodeEvent event) {
         Location location = BukkitUtil.getLocation(event.getLocation());
         PlotArea area = location.getPlotArea();
-        if (area == null) {
+        boolean plotArea = location.isPlotArea();
+        if (!plotArea) {
             if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
                 return;
             }
-            Iterator<Block> iterator = event.blockList().iterator();
-            while (iterator.hasNext()) {
-                iterator.next();
-                if (location.isPlotArea()) {
-                    iterator.remove();
-                }
-            }
             return;
         }
         Plot plot = area.getOwnedPlot(location);

From 0b7e63bafb20421461133856c0dad6961a3aa62c Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 24 Apr 2019 22:04:30 -0400
Subject: [PATCH 151/210] Added new 1.14 blocks

---
 .../bukkit/listeners/PlayerEvents.java        | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 346983255..144afd98e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -939,8 +939,8 @@ import java.util.regex.Pattern;
         String sender = event.getPlayer().getDisplayName();
         PlotId id = plot.getId();
         Set<Player> recipients = event.getRecipients();
-        Set<Player> spies = new HashSet<>();
         recipients.clear();
+        Set<Player> spies = new HashSet<>();
         for (Entry<String, PlotPlayer> entry : UUIDHandler.getPlayers().entrySet()) {
             PlotPlayer pp = entry.getValue();
             if (pp.getAttribute("chatspy")) {
@@ -1951,6 +1951,18 @@ import java.util.regex.Pattern;
 
                     case LEGACY_SIGN:
                     case LEGACY_WALL_SIGN:
+                    case OAK_SIGN:
+                    case ACACIA_SIGN:
+                    case ACACIA_WALL_SIGN:
+                    case BIRCH_SIGN:
+                    case BIRCH_WALL_SIGN:
+                    case DARK_OAK_SIGN:
+                    case DARK_OAK_WALL_SIGN:
+                    case JUNGLE_SIGN:
+                    case JUNGLE_WALL_SIGN:
+                    case OAK_WALL_SIGN:
+                    case SPRUCE_SIGN:
+                    case SPRUCE_WALL_SIGN:
 
                     case REDSTONE_TORCH:
                     case REDSTONE_WALL_TORCH:
@@ -1966,10 +1978,17 @@ import java.util.regex.Pattern;
                     case COMMAND_BLOCK:
                     case COMPARATOR:
                     case CRAFTING_TABLE:
+                        //todo re-evaluate adding lectern here
+                    case LECTERN:
+                    case GRINDSTONE:
+                    case LOOM:
+                    case SMOKER:
+                    case STONECUTTER:
                     case DISPENSER:
                     case DROPPER:
                     case ENCHANTING_TABLE:
                     case FURNACE:
+                    case BLAST_FURNACE:
                     case HOPPER:
                     case JUKEBOX:
                     case LEVER:

From dca85945429916e9b623c14757543fff7d61f531 Mon Sep 17 00:00:00 2001
From: Matt <4009945+MattBDev@users.noreply.github.com>
Date: Thu, 25 Apr 2019 13:06:26 -0400
Subject: [PATCH 152/210] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index d8d94f840..711feba16 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,20 +1,30 @@
-__*NOTICE: Bukkit/Spigot versions 1.7.10 to 1.12.2 are considered legacy and will receive limited support. Please consider upgrading to 1.13 for future support.*__
+__*NOTICE: Bukkit/Spigot versions 1.7.10 to 1.12.2 are considered legacy and will receive limited support. Please consider upgrading to 1.13 for future support. Plugins exist for 1.13+ that bring back old behaviors found in 1.8*__
 # Bug report template 
 <!--- In order to create a valid issue report you have to follow this template. -->
 <!--- Incomplete reports might be marked as invalid. -->
 <!--  Feature requests and enhancements may be suggested at https://github.com/IntellectualSites/PlotSquaredSuggestions. -->
-**Debug paste link:** 
-<!--- Enter /plot debugpaste in game or in your console and copy the output here -->
+**[REQUIRED] PlotSquared Version Number:** <!--- Enter /plot version in game or in your console and copy the output here -->
 
-**Description of the problem:** 
+**[REQUIRED] Spigot/Paper Version Number:** 
 
+**[REQUIRED] Minecraft Version Number:** 
+
+**Links to worlds.yml file and settings.yml file:** 
+<!--- Copy and paste the information to the service of your choosing and provide the link here. -->
+
+**[REQUIRED] Description of the problem:** 
+
+**Any relevant console output or screenshots:**
+
+**Plugins being used on the server:**
+<!--- Optional but recommended --->
 
 **How to replicate:** 
 <!--- If you can reproduce the issue please tell us as detailed as possible step by step how to do that -->
 
 **Checklist**:
 <!-- Make sure you have completed the following steps (put an "X" between of brackets): -->
-- [] I included a `/plot debugpaste` link
+- [] I included all information required in the sections above
 - [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/PlotSquared/issues?utf8=%E2%9C%93&q=is%3Aissue)
 - [] I made sure I am using an up-to-date version of PlotSquared
 - [] I Made sure the bug/error is not caused by any other plugin

From b7909cc6e5b07efece24a97f4c87f61296ac8512 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Sat, 27 Apr 2019 16:16:13 +0200
Subject: [PATCH 153/210] Fix typo

---
 .github/ISSUE_TEMPLATE.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 711feba16..91ba21cb9 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -27,7 +27,4 @@ __*NOTICE: Bukkit/Spigot versions 1.7.10 to 1.12.2 are considered legacy and wil
 - [] I included all information required in the sections above
 - [] I made sure there are no duplicates of this report [(Use Search)](https://github.com/IntellectualSites/PlotSquared/issues?utf8=%E2%9C%93&q=is%3Aissue)
 - [] I made sure I am using an up-to-date version of PlotSquared
-- [] I Made sure the bug/error is not caused by any other plugin
-
-
-
+- [] I made sure the bug/error is not caused by any other plugin

From 237b10a2a2bc83cd493b71ef08ae807298d62a37 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 29 Apr 2019 10:49:58 -0400
Subject: [PATCH 154/210] Tidying up the code

---
 Bukkit/build.gradle                           |   4 +-
 .../bukkit/listeners/PlayerEvents.java        | 139 ++++++--
 .../bukkit/util/BukkitSetupUtils.java         |  26 +-
 Bukkit/src/main/resources/plugin.yml          |   5 -
 Core/build.gradle                             |  18 +-
 .../plotsquared/plot/commands/Alias.java      |   2 +-
 .../plotsquared/plot/commands/Comment.java    |   2 +-
 .../plotsquared/plot/commands/Copy.java       |   6 +-
 .../plotsquared/plot/commands/Desc.java       |   2 +-
 .../plotsquared/plot/commands/Template.java   |  31 +-
 .../plotsquared/plot/config/Captions.java     | 306 +++++++++---------
 build.gradle                                  |   3 +-
 12 files changed, 306 insertions(+), 238 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index e7c0e90ce..ef26dbb05 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -3,13 +3,15 @@ repositories {
     maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url "http://nexus.hc.to/content/repositories/pub_releases" }
     maven { url = "https://repo.codemc.org/repository/maven-public" }
+    maven { url 'http://repo.onarandombox.com/content/groups/public'}
     mavenLocal()
 }
 
 dependencies {
     implementation project(':Core')
     compile project(':Core')
-    compile 'org.spigotmc:spigot-api:1.14-pre5-SNAPSHOT'
+    implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.14-pre5-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
     compile(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 144afd98e..d31703ad4 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -10,8 +10,36 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotHandler;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotInventory;
+import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
+import com.github.intellectualsites.plotsquared.plot.util.EntityUtil;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.RegExUtil;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.UpdateUtility;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Pattern;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.FluidCollisionMode;
@@ -22,18 +50,82 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Animals;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Creature;
+import org.bukkit.entity.EnderDragon;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
+import org.bukkit.entity.Fireball;
+import org.bukkit.entity.Hanging;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.ItemFrame;
+import org.bukkit.entity.LingeringPotion;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
+import org.bukkit.entity.TNTPrimed;
+import org.bukkit.entity.Tameable;
+import org.bukkit.entity.ThrownPotion;
+import org.bukkit.entity.Vehicle;
+import org.bukkit.entity.Villager;
+import org.bukkit.entity.WaterMob;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.*;
-import org.bukkit.event.entity.*;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockDamageEvent;
+import org.bukkit.event.block.BlockDispenseEvent;
+import org.bukkit.event.block.BlockExplodeEvent;
+import org.bukkit.event.block.BlockFadeEvent;
+import org.bukkit.event.block.BlockFormEvent;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockGrowEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
+import org.bukkit.event.block.EntityBlockFormEvent;
+import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.EntityChangeBlockEvent;
+import org.bukkit.event.entity.EntityCombustByEntityEvent;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.LingeringPotionSplashEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.event.entity.ProjectileHitEvent;
+import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerBucketEmptyEvent;
+import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerEggThrowEvent;
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
@@ -51,11 +143,6 @@ import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.regex.Pattern;
-
 /**
  * Player Events involving plots.
  */
@@ -151,16 +238,19 @@ import java.util.regex.Pattern;
                 return EntityUtil.checkEntity(plot, Flags.ENTITY_CAP, Flags.VEHICLE_CAP);
             case BAT:
             case CHICKEN:
+            case CAT:
             case COD:
             case COW:
             case DOLPHIN:
             case DONKEY:
+            case FOX:
             case HORSE:
             case IRON_GOLEM:
             case LLAMA:
             case MULE:
             case MUSHROOM_COW:
             case OCELOT:
+            case PANDA:
             case PARROT:
             case PIG:
             case POLAR_BEAR:
@@ -171,6 +261,7 @@ import java.util.regex.Pattern;
             case SKELETON_HORSE:
             case SNOWMAN:
             case SQUID:
+            case TRADER_LLAMA:
             case TROPICAL_FISH:
             case TURTLE:
             case VILLAGER:
@@ -208,6 +299,9 @@ import java.util.regex.Pattern;
             case WITHER_SKELETON:
             case ZOMBIE:
             case ZOMBIE_VILLAGER:
+            case PILLAGER:
+            case PHANTOM:
+            case RAVAGER:
                 // monster
                 return EntityUtil
                     .checkEntity(plot, Flags.ENTITY_CAP, Flags.MOB_CAP, Flags.HOSTILE_CAP);
@@ -524,18 +618,17 @@ import java.util.regex.Pattern;
         }
         String[] parts = msg.split(" ");
         Plot plot = pp.getCurrentPlot();
-        if (BukkitMain.getWorldEdit() != null) { // Check WorldEdit
-            switch (parts[0].toLowerCase()) {
-                case "up":
-                case "/up":
-                case "worldedit:up":
-                case "worldedit:/up":
-                    if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
-                        .hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER, true))) {
-                        event.setCancelled(true);
-                        return;
-                    }
-            }
+        // Check WorldEdit
+        switch (parts[0].toLowerCase()) {
+            case "up":
+            case "/up":
+            case "worldedit:up":
+            case "worldedit:/up":
+                if (plot == null || (!plot.isAdded(pp.getUUID()) && !Permissions
+                    .hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER, true))) {
+                    event.setCancelled(true);
+                    return;
+                }
         }
         if (plot == null) {
             return;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
index 2e90b4de0..6237f0ba3 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -9,6 +9,8 @@ import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
 import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
+import com.onarandombox.MultiverseCore.MultiverseCore;
+import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
 import org.bukkit.*;
 import org.bukkit.World.Environment;
 import org.bukkit.entity.Player;
@@ -171,9 +173,9 @@ public class BukkitSetupUtils extends SetupUtils {
         } catch (IOException e) {
             e.printStackTrace();
         }
+        Plugin plugin = Bukkit.getPluginManager().getPlugin("Multiverse-Core");
         if (object.setupGenerator != null) {
-            if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null && Bukkit
-                .getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
+            if (plugin != null && plugin.isEnabled()) {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(),
                     "mv create " + world + " normal -g " + object.setupGenerator);
                 setGenerator(world, object.setupGenerator);
@@ -181,15 +183,6 @@ public class BukkitSetupUtils extends SetupUtils {
                     return world;
                 }
             }
-            if (Bukkit.getPluginManager().getPlugin("MultiWorld") != null && Bukkit
-                .getPluginManager().getPlugin("MultiWorld").isEnabled()) {
-                Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(),
-                    "mw create " + world + " plugin:" + object.setupGenerator);
-                setGenerator(world, object.setupGenerator);
-                if (Bukkit.getWorld(world) != null) {
-                    return world;
-                }
-            }
             WorldCreator wc = new WorldCreator(object.world);
             wc.generator(object.setupGenerator);
             wc.environment(Environment.NORMAL);
@@ -197,22 +190,13 @@ public class BukkitSetupUtils extends SetupUtils {
             Bukkit.createWorld(wc);
             setGenerator(world, object.setupGenerator);
         } else {
-            if (Bukkit.getPluginManager().getPlugin("Multiverse-Core") != null && Bukkit
-                .getPluginManager().getPlugin("Multiverse-Core").isEnabled()) {
+            if (plugin != null && plugin.isEnabled()) {
                 Bukkit.getServer().dispatchCommand(Bukkit.getServer().getConsoleSender(),
                     "mv create " + world + " normal");
                 if (Bukkit.getWorld(world) != null) {
                     return world;
                 }
             }
-            if (Bukkit.getPluginManager().getPlugin("MultiWorld") != null && Bukkit
-                .getPluginManager().getPlugin("MultiWorld").isEnabled()) {
-                Bukkit.getServer()
-                    .dispatchCommand(Bukkit.getServer().getConsoleSender(), "mw create " + world);
-                if (Bukkit.getWorld(world) != null) {
-                    return world;
-                }
-            }
             World bw =
                 Bukkit.createWorld(new WorldCreator(object.world).environment(Environment.NORMAL));
         }
diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml
index 41714aeb6..d9cd4e9d4 100644
--- a/Bukkit/src/main/resources/plugin.yml
+++ b/Bukkit/src/main/resources/plugin.yml
@@ -62,7 +62,6 @@ permissions:
       plots.set.flag.vehicle-use.*: true
       plots.set.flag.vehicle-place.*: true
       plots.set.flag.vehicle-break.*: true
-      plots.set.flag.player-interact.*: true
       plots.set.flag.place.*: true
       plots.set.flag.break.*: true
       plots.set.flag.use.*: true
@@ -75,16 +74,12 @@ permissions:
       comments.notifications.enabled: true
       plots.inbox.read.public: true
       plots.inbox.modify.public: true
-      plots.inbox.modify.public: true
       plots.inbox.write.public: true
-      plots.inbox.read.public: true
       plots.inbox.read.report: true
       plots.inbox.write.report: true
-      plots.inbox.read.report: true
       plots.inbox.read.owner: true
       plots.inbox.modify.owner: true
       plots.inbox.write.owner: true
-      plots.inbox.read.owner: true
       plots.comment: true
       plots.inbox: true
   plots.permpack.wilderness:
diff --git a/Core/build.gradle b/Core/build.gradle
index 71a24b237..82f6abd3a 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -3,19 +3,19 @@ repositories {
 }
 
 dependencies {
-    testCompile 'junit:junit:4.12'
-    compile 'org.yaml:snakeyaml:1.23'
-    compile 'com.google.code.gson:gson:2.8.5'
-    compile("org.projectlombok:lombok:1.18.6")
+    implementation 'org.yaml:snakeyaml:1.23'
+    //keep inline with Minecraft which uses gson 2.8.0
+    implementation 'com.google.code.gson:gson:2.8.0'
+    implementation("org.projectlombok:lombok:1.18.6")
     compileOnly("org.projectlombok:lombok:1.18.6")
     testCompileOnly("org.projectlombok:lombok:1.18.6")
     annotationProcessor("org.projectlombok:lombok:1.18.6")
     testAnnotationProcessor("org.projectlombok:lombok:1.18.6")
 
-    compile 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
-    compile 'com.squareup.okhttp3:okhttp:3.14.0'
-    compile 'com.squareup.okio:okio:2.2.2'
-    compile 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30'
+    implementation 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.0'
+    implementation 'com.squareup.okio:okio:2.2.2'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.30'
 }
 
 sourceCompatibility = 1.8
@@ -33,7 +33,7 @@ processResources {
     }
 }
 
-jar.archiveName = "PlotSquared-API-${project.parent.version}.jar"
+jar.setArchiveName("PlotSquared-API-${project.parent.version}.jar")
 jar.destinationDir = file '../mvn/com/github/intellectualsites/plotsquared/PlotSquared-API/' + project.parent.version
 task createPom {
     doLast {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
index 3602bda5e..8e0847f57 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Alias.java
@@ -15,7 +15,7 @@ import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 @CommandDeclaration(command = "setalias", permission = "plots.alias",
     description = "Set the plot name", usage = "/plot alias <set|remove> <alias>",
     aliases = {"alias", "sa", "name", "rename", "setname", "seta", "nameplot"},
-    category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) public class Alias
+    category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER) public class Alias
     extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
index a4441658b..048047bb6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Comment.java
@@ -17,7 +17,7 @@ import java.util.Arrays;
 import java.util.Map.Entry;
 
 @CommandDeclaration(command = "comment", aliases = {"msg"}, description = "Comment on a plot",
-    category = CommandCategory.CHAT, requiredType = RequiredType.NONE, permission = "plots.comment")
+    category = CommandCategory.CHAT, requiredType = RequiredType.PLAYER, permission = "plots.comment")
 public class Comment extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
index f925720f1..dd95a8c2f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Copy.java
@@ -40,11 +40,7 @@ import com.github.intellectualsites.plotsquared.plot.util.Permissions;
             Captions.PLOTWORLD_INCOMPATIBLE.send(player);
             return false;
         }
-        if (plot1.copy(plot2, new Runnable() {
-            @Override public void run() {
-                MainUtil.sendMessage(player, Captions.COPY_SUCCESS);
-            }
-        })) {
+        if (plot1.copy(plot2, () -> MainUtil.sendMessage(player, Captions.COPY_SUCCESS))) {
             return true;
         } else {
             MainUtil.sendMessage(player, Captions.REQUIRES_UNOWNED);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
index ec62e299c..d3b261ba8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Desc.java
@@ -11,7 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 @CommandDeclaration(command = "setdescription", permission = "plots.set.desc",
     description = "Set the plot description", usage = "/plot desc <description>",
     aliases = {"desc", "setdesc", "setd", "description"}, category = CommandCategory.SETTINGS,
-    requiredType = RequiredType.NONE) public class Desc extends SetCommand {
+    requiredType = RequiredType.PLAYER) public class Desc extends SetCommand {
 
     @Override public boolean set(PlotPlayer player, Plot plot, String desc) {
         if (desc.isEmpty()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
index 424878e27..472542523 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
@@ -33,11 +33,11 @@ import java.util.zip.ZipOutputStream;
             if (!folder.exists()) {
                 return false;
             }
-            File input = new File(folder + File.separator + template + ".template");
             File output = PlotSquared.get().IMP.getDirectory();
             if (!output.exists()) {
                 output.mkdirs();
             }
+            File input = new File(folder + File.separator + template + ".template");
             try (ZipInputStream zis = new ZipInputStream(new FileInputStream(input))) {
                 ZipEntry ze = zis.getNextEntry();
                 byte[] buffer = new byte[2048];
@@ -63,9 +63,6 @@ import java.util.zip.ZipOutputStream;
                 zis.closeEntry();
             }
             return true;
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-            return false;
         } catch (IOException e) {
             e.printStackTrace();
             return false;
@@ -162,11 +159,9 @@ import java.util.zip.ZipOutputStream;
                 setup.step = new ConfigurationNode[0];
                 setup.world = world;
                 SetupUtils.manager.setupWorld(setup);
-                GlobalBlockQueue.IMP.addTask(new Runnable() {
-                    @Override public void run() {
-                        MainUtil.sendMessage(player, "Done!");
-                        player.teleport(WorldUtil.IMP.getSpawn(world));
-                    }
+                GlobalBlockQueue.IMP.addTask(() -> {
+                    MainUtil.sendMessage(player, "Done!");
+                    player.teleport(WorldUtil.IMP.getSpawn(world));
                 });
                 return true;
             }
@@ -182,17 +177,15 @@ import java.util.zip.ZipOutputStream;
                     return false;
                 }
                 final PlotManager manager = area.getPlotManager();
-                TaskManager.runTaskAsync(new Runnable() {
-                    @Override public void run() {
-                        try {
-                            manager.exportTemplate(area);
-                        } catch (Exception e) { // Must recover from any exception thrown a third party template manager
-                            e.printStackTrace();
-                            MainUtil.sendMessage(player, "Failed: " + e.getMessage());
-                            return;
-                        }
-                        MainUtil.sendMessage(player, "Done!");
+                TaskManager.runTaskAsync(() -> {
+                    try {
+                        manager.exportTemplate(area);
+                    } catch (Exception e) { // Must recover from any exception thrown a third party template manager
+                        e.printStackTrace();
+                        MainUtil.sendMessage(player, "Failed: " + e.getMessage());
+                        return;
                     }
+                    MainUtil.sendMessage(player, "Done!");
                 });
                 return true;
             default:
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index ddd72e9f8..a5a1c559c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -5,160 +5,165 @@ import com.github.intellectualsites.plotsquared.configuration.ConfigurationSecti
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
-
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Captions class.
  */
 public enum Captions {
 
+    //@formatter:off
     /*
      * Static flags
      */
-    FLAG_USE("use", "static.flags"), FLAG_BREAK("break", "static.flags"), FLAG_PLACE("place",
-        "static.flags"), FLAG_PVP("pvp", "static.flags"), FLAG_HANGING_PLACE("hanging-place",
-        "static.flags"), FLAG_HANGING_BREAK("hanging-break", "static.flags"), FLAG_HANGING_INTERACT(
-        "hanging-interact", "static.flags"), FLAG_MISC_INTERACT("misc-interact",
-        "static.flags"), FLAG_MISC_BREAK("misc-break", "static.flags"), FLAG_MISC_PLACE(
-        "misc-place", "static.flags"), FLAG_VEHICLE_BREAK("vehicle-break",
-        "static.flags"), FLAG_HOSTILE_INTERACT("hostile-interact",
-        "static.flags"), FLAG_DEVICE_INTERACT("device-interact",
-        "static.flags"), FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"), FLAG_VEHICLE_USE(
-        "vehicle-use", "static.flags"), FLAG_VEHICLE_PLACE("vehicle-place",
-        "static.flags"), FLAG_PLAYER_INTERACT("player-interact",
-        "static.flags"), FLAG_TAMED_INTERACT("tamed-interact",
-        "static.flags"), FLAG_DISABLE_PHYSICS("disable-physics", "static.flags"), FLAG_MOB_PLACE(
-        "mob-place", "static.flags"), /*
+    FLAG_USE("use", "static.flags"),
+    FLAG_BREAK("break", "static.flags"),
+    FLAG_PLACE("place", "static.flags"),
+    FLAG_PVP("pvp", "static.flags"),
+    FLAG_HANGING_PLACE("hanging-place", "static.flags"),
+    FLAG_HANGING_BREAK("hanging-break", "static.flags"),
+    FLAG_HANGING_INTERACT("hanging-interact", "static.flags"),
+    FLAG_MISC_INTERACT("misc-interact", "static.flags"),
+    FLAG_MISC_BREAK("misc-break", "static.flags"),
+    FLAG_MISC_PLACE("misc-place", "static.flags"),
+    FLAG_VEHICLE_BREAK("vehicle-break", "static.flags"),
+    FLAG_HOSTILE_INTERACT("hostile-interact", "static.flags"),
+    FLAG_DEVICE_INTERACT("device-interact", "static.flags"),
+    FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"), FLAG_VEHICLE_USE("vehicle-use", "static.flags"),
+    FLAG_VEHICLE_PLACE("vehicle-place", "static.flags"),
+    FLAG_PLAYER_INTERACT("player-interact", "static.flags"),
+    FLAG_TAMED_INTERACT("tamed-interact", "static.flags"),
+    FLAG_DISABLE_PHYSICS("disable-physics", "static.flags"),
+    FLAG_MOB_PLACE("mob-place", "static.flags"),
+    /*
      * Static permission
      */
-    PERMISSION_STAR("*", "static.permissions"), PERMISSION_ADMIN("plots.admin",
-        "static.permissions"), PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned",
-        "static.permissions"), PERMISSION_PROJECTILE_OTHER("plots.projectile.other",
-        "static.permissions"), PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS(
-        "plots.admin.interact.blockedcommands", "static.permissions"), PERMISSION_WORLDEDIT_BYPASS(
-        "plots.worldedit.bypass", "static.permissions"), PERMISSION_PLOT_TOGGLE_TITLES(
-        "plots.toggle.titles", "static.permissions"), PERMISSION_PLOT_TOGGLE_CHAT(
-        "plots.toggle.chat", "static.permissions"), PERMISSION_ADMIN_UPDATE_NOTIFICATION(
-        "plots.admin.update.notify", "static.permissions"), PERMISSION_ADMIN_EXIT_DENIED(
-        "plots.admin.exit.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_DENIED(
-        "plots.admin.entry.denied", "static.permissions"), PERMISSION_ADMIN_ENTRY_FORCEFIELD(
-        "plots.admin.entry.forcefield", "static.permissions"), PERMISSION_COMMANDS_CHAT(
-        "plots.admin.command.chat", "static.permissions"), PERMISSION_MERGE_OTHER(
-        "plots.merge.other", "static.permissions"), PERMISSION_MERGE_KEEPROAD(
-        "plots.merge.keeproad", "static.permissions"), PERMISSION_ADMIN_DESTROY_UNOWNED(
-        "plots.admin.destroy.unowned", "static.permissions"), PERMISSION_ADMIN_DESTROY_GROUNDLEVEL(
-        "plots.admin.destroy.groundlevel", "static.permissions"), PERMISSION_ADMIN_DESTROY_OTHER(
-        "plots.admin.destroy.other", "static.permissions"), PERMISSION_ADMIN_DESTROY_ROAD(
-        "plots.admin.destroy.road", "static.permissions"), PERMISSION_ADMIN_BUILD_ROAD(
-        "plots.admin.build.road", "static.permissions"), PERMISSION_ADMIN_BUILD_UNOWNED(
-        "plots.admin.build.unowned", "static.permissions"), PERMISSION_ADMIN_BUILD_OTHER(
-        "plots.admin.build.other", "static.permissions"), PERMISSION_ADMIN_INTERACT_ROAD(
-        "plots.admin.interact.road", "static.permissions"), PERMISSION_ADMIN_INTERACT_UNOWNED(
-        "plots.admin.interact.unowned", "static.permissions"), PERMISSION_ADMIN_INTERACT_OTHER(
-        "plots.admin.interact.other", "static.permissions"), PERMISSION_ADMIN_BUILD_HEIGHTLIMIT(
-        "plots.admin.build.heightlimit", "static.permissions"), PERMISSION_ADMIN_UPDATE(
-        "plots.admin.command.update", "static.permissions"), PERMISSION_ADMIN_COMMAND_RATE(
-        "plots.admin.command.rate", "static.permissions"), PERMISSION_ADMIN_COMMAND_TRUST(
-        "plots.admin.command.trust", "static.permissions"), PERMISSION_TRUST_EVERYONE(
-        "plots.trust.everyone", "static.permissions"), PERMISSION_AREA_CREATE("plots.area.create",
-        "static.permissions"), PERMISSION_AREA_INFO("plots.area.info",
-        "static.permissions"), PERMISSION_AREA_INFO_FORCE("plots.admin.info.force",
-        "static.permissions"), PERMISSION_AREA_LIST("plots.area.list",
-        "static.permissions"), PERMISSION_AREA_REGEN("plots.area.regen",
-        "static.permissions"), PERMISSION_AREA_TP("plots.area.tp",
-        "static.permissions"), PERMISSION_AUTO_MEGA("plots.auto.mega",
-        "static.permissions"), PERMISSION_CLAIM_SCHEMATIC("plots.claim.%s0",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC("plots.admin.command.schematic",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_CLEAR("plots.admin.command.clear",
-        "static.permissions"), PERMISSION_CONTINUE("plots.continue",
-        "static.permissions"), PERMISSION_CLUSTER_LIST("plots.cluster.list",
-        "static.permissions"), PERMISSION_CLUSTER_CREATE("plots.cluster.create",
-        "static.permissions"), PERMISSION_CLUSTER_CREATE_OTHER("plots.cluster.create.other",
-        "static.permissions"), PERMISSION_CLUSTER_SIZE("plots.cluster.size",
-        "static.permissions"), PERMISSION_CLUSTER_DELETE("plots.cluster.delete",
-        "static.permissions"), PERMISSION_CLUSTER_DELETE_OTHER("plots.cluster.delete.other",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE("plots.cluster.resize",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE_OTHER("plots.cluster.resize.other",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE_SHRINK("plots.cluster.resize.shrink",
-        "static.permissions"), PERMISSION_CLUSTER_RESIZE_EXPAND("plots.cluster.resize.expand",
-        "static.permissions"), PERMISSION_CLUSTER("plots.cluster",
-        "static.permissions"), PERMISSION_CLUSTER_INVITE("plots.cluster.invite",
-        "static.permissions"), PERMISSION_CLUSTER_INVITE_OTHER("plots.cluster.invite.other",
-        "static.permissions"), PERMISSION_CLUSTER_KICK("plots.cluster.kick",
-        "static.permissions"), PERMISSION_CLUSTER_KICK_OTHER("plots.cluster.kick.other",
-        "static.permissions"), PERMISSION_CLUSTER_LEAVE("plots.cluster.leave",
-        "static.permissions"), PERMISSION_CLUSTER_HELPERS("plots.cluster.helpers",
-        "static.permissions"), PERMISSION_CLUSTER_TP("plots.cluster.tp",
-        "static.permissions"), PERMISSION_CLUSTER_TP_OTHER("plots.cluster.tp.other",
-        "static.permissions"), PERMISSION_CLUSTER_INFO("plots.cluster.info",
-        "static.permissions"), PERMISSION_CLUSTER_SETHOME("plots.cluster.sethome",
-        "static.permissions"), PERMISSION_CLUSTER_SETHOME_OTHER("plots.cluster.sethome.other",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_CONTINUE("plots.admin.command.continue",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DELETE("plots.admin.command.delete",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DENY("plots.admin.command.deny",
-        "static.permissions"), PERMISSION_DENY_EVERYONE("plots.deny.everyone",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DONE("plots.admin.command.done",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_DOWNLOAD("plots.admin.command.download",
-        "static.permissions"), PERMISSION_DOWNLOAD_WORLD("plots.download.world",
-        "static.permissions"), PERMISSION_SET_FLAG_OTHER("plots.set.flag.other",
-        "static.permissions"), PERMISSION_SET_FLAG("plots.set.flag",
-        "static.permissions"), PERMISSION_SET_FLAG_KEY("plots.set.flag.%s0",
-        "static.permissions"), PERMISSION_SET_FLAG_KEY_VALUE("plots.set.flag.%s0.%s1",
-        "static.permissions"), PERMISSION_FLAG_REMOVE("plots.flag.remove",
-        "static.permissions"), PERMISSION_FLAG_ADD("plots.flag.add",
-        "static.permissions"), PERMISSION_FLAG_LIST("plots.flag.list",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_KICK("plots.admin.command.kick",
-        "static.permissions"), PERMISSION_GRANT("plots.grant.%s0",
-        "static.permissions"), PERMISSION_LIST_FORSALE("plots.list.forsale",
-        "static.permissions"), PERMISSION_LIST_MINE("plots.list.mine",
-        "static.permissions"), PERMISSION_LIST_SHARED("plots.list.shared",
-        "static.permissions"), PERMISSION_LIST_WORLD("plots.list.world",
-        "static.permissions"), PERMISSION_LIST_WORLD_NAME("plots.list.world.%s0",
-        "static.permissions"), PERMISSION_LIST_TOP("plots.list.top",
-        "static.permissions"), PERMISSION_LIST_ALL("plots.list.all",
-        "static.permissions"), PERMISSION_LIST_UNOWNED("plots.list.unowned",
-        "static.permissions"), PERMISSION_LIST_UNKNOWN("plots.list.unknown",
-        "static.permissions"), PERMISSION_LIST_PLAYER("plots.list.player",
-        "static.permissions"), PERMISSION_LIST_DONE("plots.list.done",
-        "static.permissions"), PERMISSION_LIST_EXPIRED("plots.list.expired",
-        "static.permissions"), PERMISSION_LIST_FUZZY("plots.list.fuzzy",
-        "static.permissions"), PERMISSION_LIST_AREA("plots.list.area",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_LOAD("plots.admin.command.load",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SETOWNER("plots.admin.command.setowner",
-        "static.permissions"), PERMISSION_COMMENT("plots.comment",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_REMOVE("plots.admin.command.remove",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SAVE("plots.admin.command.save",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE(
-        "plots.admin.command.schematic.paste", "static.permissions"), PERMISSION_SCHEMATIC_PASTE(
-        "plots.schematic.paste", "static.permissions"), PERMISSION_SCHEMATIC_LIST(
-        "plots.schematic.list", "static.permissions"),
+    PERMISSION_STAR("*", "static.permissions"),
+    PERMISSION_ADMIN("plots.admin", "static.permissions"),
+    PERMISSION_PROJECTILE_UNOWNED("plots.projectile.unowned", "static.permissions"),
+    PERMISSION_PROJECTILE_OTHER("plots.projectile.other", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_BLOCKED_CMDS("plots.admin.interact.blockedcommands", "static.permissions"),
+    PERMISSION_WORLDEDIT_BYPASS("plots.worldedit.bypass", "static.permissions"),
+    PERMISSION_PLOT_TOGGLE_TITLES("plots.toggle.titles", "static.permissions"),
+    PERMISSION_PLOT_TOGGLE_CHAT("plots.toggle.chat", "static.permissions"),
+    PERMISSION_ADMIN_UPDATE_NOTIFICATION("plots.admin.update.notify", "static.permissions"),
+    PERMISSION_ADMIN_EXIT_DENIED("plots.admin.exit.denied", "static.permissions"),
+    PERMISSION_ADMIN_ENTRY_DENIED("plots.admin.entry.denied", "static.permissions"),
+    PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield", "static.permissions"),
+    PERMISSION_COMMANDS_CHAT("plots.admin.command.chat", "static.permissions"),
+    PERMISSION_MERGE_OTHER("plots.merge.other", "static.permissions"),
+    PERMISSION_MERGE_KEEPROAD("plots.merge.keeproad", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_UNOWNED("plots.admin.destroy.unowned", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_GROUNDLEVEL("plots.admin.destroy.groundlevel", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_OTHER("plots.admin.destroy.other", "static.permissions"),
+    PERMISSION_ADMIN_DESTROY_ROAD("plots.admin.destroy.road", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_UNOWNED("plots.admin.build.unowned", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_OTHER("plots.admin.build.other", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_ROAD("plots.admin.interact.road", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_UNOWNED("plots.admin.interact.unowned", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other", "static.permissions"),
+    PERMISSION_ADMIN_BUILD_HEIGHTLIMIT("plots.admin.build.heightlimit", "static.permissions"),
+    PERMISSION_ADMIN_UPDATE("plots.admin.command.update", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_RATE("plots.admin.command.rate", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_TRUST("plots.admin.command.trust", "static.permissions"),
+    PERMISSION_TRUST_EVERYONE("plots.trust.everyone", "static.permissions"),
+    PERMISSION_AREA_CREATE("plots.area.create", "static.permissions"),
+    PERMISSION_AREA_INFO("plots.area.info","static.permissions"),
+    PERMISSION_AREA_INFO_FORCE("plots.admin.info.force", "static.permissions"),
+    PERMISSION_AREA_LIST("plots.area.list", "static.permissions"),
+    PERMISSION_AREA_REGEN("plots.area.regen", "static.permissions"),
+    PERMISSION_AREA_TP("plots.area.tp", "static.permissions"),
+    PERMISSION_AUTO_MEGA("plots.auto.mega", "static.permissions"),
+    PERMISSION_CLAIM_SCHEMATIC("plots.claim.%s0", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_SCHEMATIC("plots.admin.command.schematic", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_CLEAR("plots.admin.command.clear", "static.permissions"),
+    PERMISSION_CONTINUE("plots.continue", "static.permissions"),
+    PERMISSION_CLUSTER_LIST("plots.cluster.list", "static.permissions"),
+    PERMISSION_CLUSTER_CREATE("plots.cluster.create", "static.permissions"),
+    PERMISSION_CLUSTER_CREATE_OTHER("plots.cluster.create.other", "static.permissions"),
+    PERMISSION_CLUSTER_SIZE("plots.cluster.size", "static.permissions"),
+    PERMISSION_CLUSTER_DELETE("plots.cluster.delete", "static.permissions"),
+    PERMISSION_CLUSTER_DELETE_OTHER("plots.cluster.delete.other", "static.permissions"),
+    PERMISSION_CLUSTER_RESIZE("plots.cluster.resize", "static.permissions"),
+    PERMISSION_CLUSTER_RESIZE_OTHER("plots.cluster.resize.other", "static.permissions"),
+    PERMISSION_CLUSTER_RESIZE_SHRINK("plots.cluster.resize.shrink", "static.permissions"),
+    PERMISSION_CLUSTER_RESIZE_EXPAND("plots.cluster.resize.expand", "static.permissions"),
+    PERMISSION_CLUSTER("plots.cluster", "static.permissions"),
+    PERMISSION_CLUSTER_INVITE("plots.cluster.invite", "static.permissions"),
+    PERMISSION_CLUSTER_INVITE_OTHER("plots.cluster.invite.other", "static.permissions"),
+    PERMISSION_CLUSTER_KICK("plots.cluster.kick", "static.permissions"),
+    PERMISSION_CLUSTER_KICK_OTHER("plots.cluster.kick.other", "static.permissions"),
+    PERMISSION_CLUSTER_LEAVE("plots.cluster.leave", "static.permissions"),
+    PERMISSION_CLUSTER_HELPERS("plots.cluster.helpers", "static.permissions"),
+    PERMISSION_CLUSTER_TP("plots.cluster.tp", "static.permissions"),
+    PERMISSION_CLUSTER_TP_OTHER("plots.cluster.tp.other", "static.permissions"),
+    PERMISSION_CLUSTER_INFO("plots.cluster.info", "static.permissions"),
+    PERMISSION_CLUSTER_SETHOME("plots.cluster.sethome", "static.permissions"),
+    PERMISSION_CLUSTER_SETHOME_OTHER("plots.cluster.sethome.other", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_CONTINUE("plots.admin.command.continue", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_DELETE("plots.admin.command.delete", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_DENY("plots.admin.command.deny", "static.permissions"),
+    PERMISSION_DENY_EVERYONE("plots.deny.everyone", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_DONE("plots.admin.command.done", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_DOWNLOAD("plots.admin.command.download", "static.permissions"),
+    PERMISSION_DOWNLOAD_WORLD("plots.download.world", "static.permissions"),
+    PERMISSION_SET_FLAG_OTHER("plots.set.flag.other", "static.permissions"),
+    PERMISSION_SET_FLAG("plots.set.flag", "static.permissions"),
+    PERMISSION_SET_FLAG_KEY("plots.set.flag.%s0", "static.permissions"),
+    PERMISSION_SET_FLAG_KEY_VALUE("plots.set.flag.%s0.%s1", "static.permissions"),
+    PERMISSION_FLAG_REMOVE("plots.flag.remove", "static.permissions"),
+    PERMISSION_FLAG_ADD("plots.flag.add", "static.permissions"),
+    PERMISSION_FLAG_LIST("plots.flag.list", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_KICK("plots.admin.command.kick", "static.permissions"),
+    PERMISSION_GRANT("plots.grant.%s0", "static.permissions"),
+    PERMISSION_LIST_FORSALE("plots.list.forsale", "static.permissions"),
+    PERMISSION_LIST_MINE("plots.list.mine", "static.permissions"),
+    PERMISSION_LIST_SHARED("plots.list.shared", "static.permissions"),
+    PERMISSION_LIST_WORLD("plots.list.world", "static.permissions"),
+    PERMISSION_LIST_WORLD_NAME("plots.list.world.%s0", "static.permissions"),
+    PERMISSION_LIST_TOP("plots.list.top", "static.permissions"),
+    PERMISSION_LIST_ALL("plots.list.all", "static.permissions"),
+    PERMISSION_LIST_UNOWNED("plots.list.unowned", "static.permissions"),
+    PERMISSION_LIST_UNKNOWN("plots.list.unknown", "static.permissions"),
+    PERMISSION_LIST_PLAYER("plots.list.player", "static.permissions"),
+    PERMISSION_LIST_DONE("plots.list.done", "static.permissions"),
+    PERMISSION_LIST_EXPIRED("plots.list.expired", "static.permissions"),
+    PERMISSION_LIST_FUZZY("plots.list.fuzzy", "static.permissions"),
+    PERMISSION_LIST_AREA("plots.list.area", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_LOAD("plots.admin.command.load", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_SETOWNER("plots.admin.command.setowner", "static.permissions"),
+    PERMISSION_COMMENT("plots.comment", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_REMOVE("plots.admin.command.remove", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_SAVE("plots.admin.command.save", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE("plots.admin.command.schematic.paste", "static.permissions"),
+    PERMISSION_SCHEMATIC_PASTE("plots.schematic.paste", "static.permissions"),
+    PERMISSION_SCHEMATIC_LIST("plots.schematic.list", "static.permissions"),
 
-    PERMISSION_SCHEMATIC_SAVE("plots.schematic.save",
-        "static.permissions"), PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE(
-        "plots.admin.command.schematic.save", "static.permissions"),
+    PERMISSION_SCHEMATIC_SAVE("plots.schematic.save", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE("plots.admin.command.schematic.save", "static.permissions"),
 
-    PERMISSION_SET_COMPONENT("plots.set.%s0", "static.permissions"), PERMISSION_ADMIN_COMMAND(
+    PERMISSION_SET_COMPONENT("plots.set.%s0", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND(
         "plots.admin.command.%s0", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_UNLINK("plots.ad2min.command.unlink", "static.permissions"),
+    PERMISSION_VISIT_UNOWNED("plots.visit.unowned", "static.permissions"),
+    PERMISSION_VISIT_OWNED("plots.visit.owned", "static.permissions"),
+    PERMISSION_SHARED("plots.visit.shared", "static.permissions"),
+    PERMISSION_VISIT_OTHER("plots.visit.other", "static.permissions"),
+    PERMISSION_HOME("plots.home", "static.permissions"),
 
-    PERMISSION_ADMIN_COMMAND_UNLINK("plots.admin.command.unlink",
-        "static.permissions"), PERMISSION_VISIT_UNOWNED("plots.visit.unowned",
-        "static.permissions"),
-
-    PERMISSION_VISIT_OWNED("plots.visit.owned", "static.permissions"), PERMISSION_SHARED(
-        "plots.visit.shared", "static.permissions"),
-
-    PERMISSION_VISIT_OTHER("plots.visit.other", "static.permissions"), PERMISSION_HOME("plots.home",
-        "static.permissions"),
-
-    PERMISSION_ALIAS_SET_OBSOLETE("plots.set.alias",
-        "static.permissions"), // Note this is for backwards compatibility
-
-    PERMISSION_ALIAS_SET("plots.alias.set", "static.permissions"), PERMISSION_ALIAS_REMOVE(
-        "plots.alias.remove", "static.permissions"),
+    PERMISSION_ALIAS_SET_OBSOLETE("plots.set.alias", "static.permissions"), // Note this is for backwards compatibility
+    PERMISSION_ALIAS_SET("plots.alias.set", "static.permissions"),
+    PERMISSION_ALIAS_REMOVE("plots.alias.remove", "static.permissions"),
 
     /*
      * Static console
@@ -894,6 +899,7 @@ public enum Captions {
         "LegacyConfig"),
 
     CUSTOM_STRING("-", "-");
+    //@formatter:on
 
     public static final HashMap<String, String> replacements = new HashMap<>();
 
@@ -917,7 +923,7 @@ public enum Captions {
     /**
      * Constructor.
      *
-     * @param def    default
+     * @param def default
      * @param prefix use prefix
      */
     Captions(String def, boolean prefix, String category) {
@@ -941,18 +947,16 @@ public enum Captions {
             return m;
         }
         Map<String, String> map = new LinkedHashMap<>();
-        if (args.length > 0) {
-            for (int i = args.length - 1; i >= 0; i--) {
-                String arg = "" + args[i];
-                if (arg == null || arg.isEmpty()) {
-                    map.put("%s" + i, "");
-                } else {
-                    arg = Captions.color(arg);
-                    map.put("%s" + i, arg);
-                }
-                if (i == 0) {
-                    map.put("%s", arg);
-                }
+        for (int i = args.length - 1; i >= 0; i--) {
+            String arg = "" + args[i];
+            if (arg.isEmpty()) {
+                map.put("%s" + i, "");
+            } else {
+                arg = Captions.color(arg);
+                map.put("%s" + i, arg);
+            }
+            if (i == 0) {
+                map.put("%s", arg);
             }
         }
         m = StringMan.replaceFromMap(m, map);
@@ -982,13 +986,13 @@ public enum Captions {
             EnumSet<Captions> allEnums = EnumSet.allOf(Captions.class);
             HashSet<String> allNames = new HashSet<>();
             HashSet<String> categories = new HashSet<>();
-            HashSet<String> toRemove = new HashSet<>();
             for (Captions caption : allEnums) {
                 allNames.add(caption.name());
                 categories.add(caption.category.toLowerCase());
             }
             HashSet<Captions> captions = new HashSet<>();
             boolean changed = false;
+            HashSet<String> toRemove = new HashSet<>();
             for (String key : keys) {
                 if (!yml.isString(key)) {
                     if (!categories.contains(key)) {
diff --git a/build.gradle b/build.gradle
index b99c5bbdc..3c4acbdec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,13 +62,14 @@ subprojects {
     }
 
     dependencies {
-        compile(group: 'com.sk89q.worldedit', name: 'worldedit-core', version: '7.0.0-SNAPSHOT') {
+        implementation('com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT') {
             exclude(module: 'bukkit-classloader-check')
             exclude(module: 'mockito-core')
             exclude(module: 'dummypermscompat')
         }
         //Minecraft uses Guava 21 as of 1.13.
         compile 'com.google.guava:guava:21.0'
+        compileOnly 'org.jetbrains:annotations:17.0.0'
         compile("org.projectlombok:lombok:1.18.6")
         compileOnly("org.projectlombok:lombok:1.18.6")
         testCompileOnly("org.projectlombok:lombok:1.18.6")

From 299fac95fbcd4e15c440db2d6f902415501ca0c5 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 29 Apr 2019 11:02:47 -0400
Subject: [PATCH 155/210] Add a stupidity fail-safe.

---
 .../plotsquared/bukkit/BukkitMain.java        |  3 -
 .../bukkit/util/BukkitLegacyMappings.java     | 61 +++++++++++--------
 .../plotsquared/bukkit/util/BukkitUtil.java   |  8 ++-
 3 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 8aaea98fe..3411e85ba 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -116,10 +116,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
     @Override public void onEnable() {
 
-
         this.pluginName = getDescription().getName();
-        getServer().getName();
-
         PlotPlayer.registerConverter(Player.class, BukkitUtil::getPlayer);
 
         if (Bukkit.getVersion().contains("git-Spigot")) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index 00edbb660..061712d02 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -1,36 +1,44 @@
 package com.github.intellectualsites.plotsquared.bukkit.util;
 
+import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.LegacyPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.util.LegacyMappings;
 import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
-import lombok.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.AccessLevel;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.ToString;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 /**
  * Borrowed from https://github.com/Phoenix616/IDConverter/blob/master/mappings/src/main/java/de/themoep/idconverter/IdMappings.java
  * Original License:
  * <p>
- * Minecraft ID mappings
- * Copyright (C) 2017  Max Lee (https://github.com/Phoenix616)
+ * Minecraft ID mappings Copyright (C) 2017  Max Lee (https://github.com/Phoenix616)
  * <p>
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  * <p>
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with this program.  If
+ * not, see <http://www.gnu.org/licenses/>.
  */
 public final class BukkitLegacyMappings extends LegacyMappings {
 
@@ -702,7 +710,15 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             try {
                 material = Material.valueOf(legacyBlock.getNewName());
             } catch (final Exception e) {
-                material = Material.getMaterial(legacyBlock.getLegacyName(), true);
+                try {
+                    material = Material.getMaterial(legacyBlock.getLegacyName(), true);
+                } catch (NoSuchMethodError error) {
+                    PlotSquared.log(
+                        "You can't use this version of PlotSquared on a server "
+                            + "less than Minecraft 1.13.2");
+                    Bukkit.shutdown();
+                    break;
+                }
             }
             legacyBlock.material = material;
         }
@@ -721,13 +737,10 @@ public final class BukkitLegacyMappings extends LegacyMappings {
     }
 
     /**
-     * Try to find a legacy plot block by any means possible.
-     * Strategy:
-     * - Check if the name contains a namespace, if so, strip it
-     * - Check if there's a (new) material matching the name
-     * - Check if there's a legacy material matching the name
-     * - Check if there's a numerical ID matching the name
-     * - Return null if everything else fails
+     * Try to find a legacy plot block by any means possible. Strategy: - Check if the name contains
+     * a namespace, if so, strip it - Check if there's a (new) material matching the name - Check if
+     * there's a legacy material matching the name - Check if there's a numerical ID matching the
+     * name - Return null if everything else fails
      *
      * @param string String ID
      * @return LegacyBlock if found, else null
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
index 065756932..66b509615 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java
@@ -340,9 +340,11 @@ import java.util.*;
             } else if (world.getBlockAt(x, y, z - 1).getType().isSolid()) {
                 facing = BlockFace.SOUTH;
             }
-            block.setType(Material.valueOf(
-                PlotSquared.get().IMP.getServerVersion()[1] == 13 ? "WALL_SIGN" : "OAK_WALL_SIGN"),
-                false);
+            if (PlotSquared.get().IMP.getServerVersion()[1] == 13) {
+                block.setType(Material.valueOf("WALL_SIGN"), false);
+            } else {
+                block.setType(Material.valueOf("OAK_WALL_SIGN"), false);
+            }
             final Directional sign = (Directional) block.getBlockData();
             sign.setFacing(facing);
             block.setBlockData(sign, false);

From 9e324762b6df6e735e42e72a47f77a7960f48567 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 29 Apr 2019 15:18:38 -0400
Subject: [PATCH 156/210] Move the update utility setup to it's own method

---
 .../plotsquared/plot/PlotSquared.java         | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 6252274d7..8823118b1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1611,6 +1611,30 @@ import java.util.zip.ZipInputStream;
             }
         }
         Settings.load(configFile);
+        setupUpdateUtility();
+        //Sets the version information for the settings.yml file
+        try (InputStream stream = getClass().getResourceAsStream("/plugin.properties")) {
+            try (BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
+                String versionString = br.readLine();
+                String commitString = br.readLine();
+                String dateString = br.readLine();
+                this.version = PlotVersion.tryParse(versionString, commitString, dateString);
+                Settings.DATE =
+                    new Date(100 + version.year, version.month, version.day).toGMTString();
+                Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
+                Settings.COMMIT =
+                    "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
+                        .toHexString(version.hash);
+                System.out.println("Version is " + this.version);
+            }
+        } catch (IOException throwable) {
+            throwable.printStackTrace();
+        }
+        Settings.save(configFile);
+        config = YamlConfiguration.loadConfiguration(configFile);
+    }
+
+    private void setupUpdateUtility() {
         try {
             copyFile("updater.properties", "config");
             try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(
@@ -1630,24 +1654,6 @@ import java.util.zip.ZipInputStream;
         } catch (final Throwable throwable) {
             throwable.printStackTrace();
         }
-        try (InputStream stream = getClass().getResourceAsStream("/plugin.properties");
-            BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
-            //java.util.Scanner scanner = new java.util.Scanner(stream).useDelimiter("\\A");
-            String versionString = br.readLine();
-            String commitString = br.readLine();
-            String dateString = br.readLine();
-            //scanner.close();
-            this.version = PlotVersion.tryParse(versionString, commitString, dateString);
-            Settings.DATE = new Date(100 + version.year, version.month, version.day).toGMTString();
-            Settings.BUILD = "https://ci.athion.net/job/PlotSquared/" + version.build;
-            Settings.COMMIT = "https://github.com/IntellectualSites/PlotSquared/commit/" + Integer
-                .toHexString(version.hash);
-            System.out.println("Version is " + this.version);
-        } catch (IOException throwable) {
-            throwable.printStackTrace();
-        }
-        Settings.save(configFile);
-        config = YamlConfiguration.loadConfiguration(configFile);
     }
 
     /**

From db6115eae5cd342ff394f2d908c3f6891383ea6b Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 29 Apr 2019 15:19:49 -0400
Subject: [PATCH 157/210] Documentation and formatting changes

---
 .../bukkit/util/block/BukkitLocalQueue.java   |  16 +--
 .../plotsquared/plot/config/Config.java       | 103 +++++++++---------
 .../plot/generator/HybridPlotManager.java     |  33 +++---
 .../plot/object/worlds/SinglePlotManager.java |  10 +-
 .../plot/util/block/BasicLocalBlockQueue.java |   4 +-
 .../plot/util/block/LocalBlockQueue.java      |   8 ++
 6 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index e7e7113db..483fb51c0 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -45,16 +45,12 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
 
     @Override public PlotBlock getBlock(int x, int y, int z) {
         World worldObj = Bukkit.getWorld(getWorld());
-        Block block = worldObj.getBlockAt(x, y, z);
-        if (block == null) {
+        if (worldObj != null) {
+            Block block = worldObj.getBlockAt(x, y, z);
+            return PlotBlock.get(block.getType().toString());
+        } else {
             return PlotBlock.get(0, 0);
         }
-        // int id = block.getTypeId();
-        // if (id == 0) {
-        //     return PlotBlock.get(0, 0);
-        // }
-        // return PlotBlock.get(id, block.getData());
-        return PlotBlock.get(block.getType().toString());
     }
 
     @Override public void refreshChunk(int x, int z) {
@@ -194,9 +190,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
                 if (biomes2 != null) {
                     for (String biomeStr : biomes2) {
                         if (biomeStr != null) {
-                            if (last == null || !StringMan.isEqual(last, biomeStr)) {
-                                biome = Biome.valueOf(biomeStr.toUpperCase());
-                            }
+                            biome = Biome.valueOf(biomeStr.toUpperCase());
                             worldObj.setBiome(bx, bz, biome);
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
index 82992e265..ace39f846 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java
@@ -105,10 +105,10 @@ public class Config {
                 file.getParentFile().mkdirs();
                 file.createNewFile();
             }
-            PrintWriter writer = new PrintWriter(file);
-            Object instance = root.newInstance();
-            save(writer, root, instance, 0);
-            writer.close();
+            try (PrintWriter writer = new PrintWriter(file)) {
+                Object instance = root.newInstance();
+                save(writer, root, instance, 0);
+            }
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -183,7 +183,6 @@ public class Config {
                             }
                         }
                     }
-                    continue;
                 } else {
                     writer.write(spacing + toNodeName(field.getName() + ": ") + toYamlString(
                         field.get(instance), spacing) + lineSeparator);
@@ -281,55 +280,53 @@ public class Config {
             Class<?> clazz = root == null ? MethodHandles.lookup().lookupClass() : root;
             Object instance = clazz.newInstance();
             while (split.length > 0) {
-                switch (split.length) {
-                    case 1:
-                        return instance;
-                    default:
-                        Class found = null;
-                        Class<?>[] classes = clazz.getDeclaredClasses();
-                        for (Class current : classes) {
-                            if (current.getSimpleName().equalsIgnoreCase(toFieldName(split[0]))) {
-                                found = current;
-                                break;
-                            }
-                        }
-                        try {
-                            Field instanceField = clazz.getDeclaredField(toFieldName(split[0]));
-                            setAccessible(instanceField);
-                            if (instanceField.getType() != ConfigBlock.class) {
-                                Object value = instanceField.get(instance);
-                                if (value == null) {
-                                    value = found.newInstance();
-                                    instanceField.set(instance, value);
-                                }
-                                clazz = found;
-                                instance = value;
-                                split = Arrays.copyOfRange(split, 1, split.length);
-                                continue;
-                            }
-                            ConfigBlock value = (ConfigBlock) instanceField.get(instance);
-                            if (value == null) {
-                                value = new ConfigBlock();
-                                instanceField.set(instance, value);
-                            }
-                            instance = value.get(split[1]);
-                            if (instance == null) {
-                                instance = found.newInstance();
-                                value.put(split[1], instance);
-                            }
-                            clazz = found;
-                            split = Arrays.copyOfRange(split, 2, split.length);
-                            continue;
-                        } catch (NoSuchFieldException ignore) {
-                        }
-                        if (found != null) {
-                            split = Arrays.copyOfRange(split, 1, split.length);
-                            clazz = found;
-                            instance = clazz.newInstance();
-                            continue;
-                        }
-                        return null;
+                if (split.length == 1) {
+                    return instance;
                 }
+                Class found = null;
+                Class<?>[] classes = clazz.getDeclaredClasses();
+                for (Class current : classes) {
+                    if (current.getSimpleName().equalsIgnoreCase(toFieldName(split[0]))) {
+                        found = current;
+                        break;
+                    }
+                }
+                try {
+                    Field instanceField = clazz.getDeclaredField(toFieldName(split[0]));
+                    setAccessible(instanceField);
+                    if (instanceField.getType() != ConfigBlock.class) {
+                        Object value = instanceField.get(instance);
+                        if (value == null) {
+                            value = found.newInstance();
+                            instanceField.set(instance, value);
+                        }
+                        clazz = found;
+                        instance = value;
+                        split = Arrays.copyOfRange(split, 1, split.length);
+                        continue;
+                    }
+                    ConfigBlock value = (ConfigBlock) instanceField.get(instance);
+                    if (value == null) {
+                        value = new ConfigBlock();
+                        instanceField.set(instance, value);
+                    }
+                    instance = value.get(split[1]);
+                    if (instance == null) {
+                        instance = found.newInstance();
+                        value.put(split[1], instance);
+                    }
+                    clazz = found;
+                    split = Arrays.copyOfRange(split, 2, split.length);
+                    continue;
+                } catch (NoSuchFieldException ignore) {
+                }
+                if (found != null) {
+                    split = Arrays.copyOfRange(split, 1, split.length);
+                    clazz = found;
+                    instance = clazz.newInstance();
+                    continue;
+                }
+                return null;
             }
         } catch (Throwable e) {
             e.printStackTrace();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index a3b308335..10e7c1a8d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -3,7 +3,14 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.Template;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.FileBytes;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
@@ -11,7 +18,6 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.google.common.collect.Sets;
 import com.sk89q.worldedit.world.block.BaseBlock;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -144,10 +150,11 @@ public class HybridPlotManager extends ClassicPlotManager {
     }
 
     /**
-     * <p>Clearing the plot needs to only consider removing the blocks - This implementation has used the setCuboidAsync
-     * function, as it is fast, and uses NMS code - It also makes use of the fact that deleting chunks is a lot faster
-     * than block updates This code is very messy, but you don't need to do something quite as complex unless you happen
-     * to have 512x512 sized plots. </p>
+     * <p>Clearing the plot needs to only consider removing the blocks - This implementation has
+     * used the setCuboidAsync function, as it is fast, and uses NMS code - It also makes use of the
+     * fact that deleting chunks is a lot faster than block updates This code is very messy, but you
+     * don't need to do something quite as complex unless you happen to have 512x512 sized plots.
+     * </p>
      */
     @Override public boolean clearPlot(final PlotArea plotArea, Plot plot,
         final Runnable whenDone) {
@@ -177,9 +184,7 @@ public class HybridPlotManager extends ClassicPlotManager {
                     queue.regenChunk(value[0], value[1]);
                     return;
                 }
-                ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                // Otherwise we need to set each component, as we don't want to regenerate the road or other plots that share the same chunk //
-                ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                /* Otherwise we need to set each component, as we don't want to regenerate the road or other plots that share the same chunk.*/
                 // Set the biome
                 MainUtil.setBiome(world, value[2], value[3], value[4], value[5], biome);
                 // These two locations are for each component (e.g. bedrock, main block, floor, air)
@@ -199,12 +204,10 @@ public class HybridPlotManager extends ClassicPlotManager {
                 // And finally set the schematic, the y value is unimportant for this function
                 pastePlotSchematic(dpw, queue, bot, top);
             }
-        }, new Runnable() {
-            @Override public void run() {
-                queue.enqueue();
-                // And notify whatever called this when plot clearing is done
-                GlobalBlockQueue.IMP.addTask(whenDone);
-            }
+        }, () -> {
+            queue.enqueue();
+            // And notify whatever called this when plot clearing is done
+            GlobalBlockQueue.IMP.addTask(whenDone);
         }, 10);
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index 2b389ca9b..7146a898b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -30,12 +30,10 @@ public class SinglePlotManager extends PlotManager {
         SetupUtils.manager.unload(plot.getWorldName(), false);
         final File worldFolder =
             new File(PlotSquared.get().IMP.getWorldContainer(), plot.getWorldName());
-        TaskManager.IMP.taskAsync(new Runnable() {
-            @Override public void run() {
-                MainUtil.deleteDirectory(worldFolder);
-                if (whenDone != null) {
-                    whenDone.run();
-                }
+        TaskManager.IMP.taskAsync(() -> {
+            MainUtil.deleteDirectory(worldFolder);
+            if (whenDone != null) {
+                whenDone.run();
             }
         });
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index 99c0386cf..282c21bc4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -116,7 +116,9 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     }
 
     @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-        if ((y > 255) || (y < 0)) {
+        if (y > 255) {
+            return false;
+        } else if (y < 0) {
             return false;
         }
         int cx = x >> 4;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
index 65dc13971..16538784f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
@@ -37,6 +37,14 @@ public abstract class LocalBlockQueue {
 
     public abstract void setModified(long modified);
 
+    /**
+     * Sets the block at the coordinates provided to the given id.
+     *
+     * @param x the x coordinate from from 0 to 15 inclusive
+     * @param y the y coordinate from from 0 (inclusive) - maxHeight(exclusive)
+     * @param z the z coordinate from 0 to 15 inclusive
+     * @param id the id to set the block to
+     */
     public abstract boolean setBlock(final int x, final int y, final int z, final PlotBlock id);
 
     public abstract boolean setBlock(final int x, final int y, final int z, final BaseBlock id);

From ac5cdfae648ce3f76ed3d036a7444a1ec5ea6fef Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 30 Apr 2019 14:44:33 -0400
Subject: [PATCH 158/210] Fix for ItemFrames

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java       | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index d31703ad4..04c7b216f 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -2803,6 +2803,13 @@ import org.bukkit.util.Vector;
             return;
         }
         Entity victim = event.getEntity();
+        if (victim.getType().equals(EntityType.ITEM_FRAME)) {
+            Plot plot = BukkitUtil.getLocation(victim).getPlot();
+            if (plot != null && !plot.isAdded(damager.getUniqueId())) {
+                event.setCancelled(true);
+                return;
+            }
+        }
         if (!entityDamage(damager, victim, event.getCause())) {
             if (event.isCancelled()) {
                 if (victim instanceof Ageable) {
@@ -2918,7 +2925,7 @@ import org.bukkit.util.Vector;
                         "plots.admin.destroy." + stub);
                     return false;
                 }
-            } else if (victim.getEntityId() == 30) {
+            } else if (victim.getType() == EntityType.ARMOR_STAND) {
                 if (plot != null && (plot.getFlag(Flags.MISC_BREAK, false) || plot
                     .isAdded(plotPlayer.getUUID()))) {
                     return true;

From 72291b09f264b7f469440a5a009bc937cf69f3d8 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 30 Apr 2019 15:11:43 -0400
Subject: [PATCH 159/210] Fix the actual issue and remove whatever junk from
 the previous commit

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 04c7b216f..be4a24c65 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -2803,6 +2803,7 @@ import org.bukkit.util.Vector;
             return;
         }
         Entity victim = event.getEntity();
+/*
         if (victim.getType().equals(EntityType.ITEM_FRAME)) {
             Plot plot = BukkitUtil.getLocation(victim).getPlot();
             if (plot != null && !plot.isAdded(damager.getUniqueId())) {
@@ -2810,6 +2811,7 @@ import org.bukkit.util.Vector;
                 return;
             }
         }
+*/
         if (!entityDamage(damager, victim, event.getCause())) {
             if (event.isCancelled()) {
                 if (victim instanceof Ageable) {
@@ -2918,6 +2920,12 @@ import org.bukkit.util.Vector;
             if (victim instanceof Hanging) { // hanging
                 if (plot != null && (plot.getFlag(Flags.HANGING_BREAK, false) || plot
                     .isAdded(plotPlayer.getUUID()))) {
+                    if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+                        if (!Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                            MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT, Captions.PERMISSION_ADMIN_BUILD_OTHER);
+                            return false;
+                        }
+                    }
                     return true;
                 }
                 if (!Permissions.hasPermission(plotPlayer, "plots.admin.destroy." + stub)) {

From f72d39ed85870b12f0ac801014d166e8becec1c8 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 1 May 2019 12:11:35 -0400
Subject: [PATCH 160/210] Fixes #1318

---
 .../bukkit/listeners/PlayerEvents.java        | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index be4a24c65..ebb7a8617 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1808,7 +1808,7 @@ import org.bukkit.util.Vector;
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onInteract(PlayerInteractAtEntityEvent e) {
         Entity entity = e.getRightClicked();
-        if (!(entity instanceof ArmorStand)) {
+        if (!(entity instanceof ArmorStand) && !(entity instanceof ItemFrame)) {
             return;
         }
         Location location = BukkitUtil.getLocation(e.getRightClicked().getLocation());
@@ -1816,25 +1816,34 @@ import org.bukkit.util.Vector;
         if (area == null) {
             return;
         }
-
         EntitySpawnListener.testNether(entity);
-
-        Plot plot = area.getPlotAbs(location);
+        Plot plot = location.getPlotAbs();
         PlotPlayer pp = BukkitUtil.getPlayer(e.getPlayer());
         if (plot == null) {
             if (!Permissions.hasPermission(pp, "plots.admin.interact.road")) {
-                MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.road");
-                e.setCancelled(true);
-            }
-        } else if (!plot.hasOwner()) {
-            if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
                 MainUtil
-                    .sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.unowned");
+                    .sendMessage(pp, Captions.NO_PERMISSION_EVENT, "plots.admin.interact.road");
                 e.setCancelled(true);
             }
         } else {
-            UUID uuid = pp.getUUID();
-            if (!plot.isAdded(uuid)) {
+            if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
+                if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT, Captions.PERMISSION_ADMIN_BUILD_OTHER);
+                    e.setCancelled(true);
+                    return;
+                }
+            }
+            if (!plot.hasOwner()) {
+                if (!Permissions.hasPermission(pp, "plots.admin.interact.unowned")) {
+                    MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
+                        "plots.admin.interact.unowned");
+                    e.setCancelled(true);
+                }
+            } else {
+                UUID uuid = pp.getUUID();
+                if (plot.isAdded(uuid)) {
+                    return;
+                }
                 if (Flags.MISC_INTERACT.isTrue(plot)) {
                     return;
                 }

From 2ec13e4e76d448f089be5060682be33a5f09fbdf Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Wed, 1 May 2019 12:31:50 -0400
Subject: [PATCH 161/210] Replace code with hasFlag() where appropriate.

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java     | 10 +++++-----
 .../intellectualsites/plotsquared/plot/flag/Flags.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index ebb7a8617..de3fd6dab 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1115,7 +1115,7 @@ import org.bukkit.util.Vector;
                 MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                     Captions.PERMISSION_ADMIN_DESTROY_OTHER);
                 event.setCancelled(true);
-            } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+            } else if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
                 if (!Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                     MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                         Captions.PERMISSION_ADMIN_BUILD_OTHER);
@@ -2475,7 +2475,7 @@ import org.bukkit.util.Vector;
             MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
                 Captions.PERMISSION_ADMIN_BUILD_OTHER);
             event.setCancelled(true);
-        } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+        } else if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
             if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                 MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
                     Captions.PERMISSION_ADMIN_BUILD_OTHER);
@@ -2537,7 +2537,7 @@ import org.bukkit.util.Vector;
             MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                 Captions.PERMISSION_ADMIN_BUILD_OTHER);
             event.setCancelled(true);
-        } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+        } else if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
             if (!Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                 MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT,
                     Captions.PERMISSION_ADMIN_BUILD_OTHER);
@@ -2929,7 +2929,7 @@ import org.bukkit.util.Vector;
             if (victim instanceof Hanging) { // hanging
                 if (plot != null && (plot.getFlag(Flags.HANGING_BREAK, false) || plot
                     .isAdded(plotPlayer.getUUID()))) {
-                    if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+                    if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
                         if (!Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                             MainUtil.sendMessage(plotPlayer, Captions.NO_PERMISSION_EVENT, Captions.PERMISSION_ADMIN_BUILD_OTHER);
                             return false;
@@ -3097,7 +3097,7 @@ import org.bukkit.util.Vector;
                     event.setCancelled(true);
                     return;
                 }
-            } else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(Flags.DONE)) {
+            } else if (Settings.Done.RESTRICT_BUILDING && plot.hasFlag(Flags.DONE)) {
                 if (!Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {
                     MainUtil.sendMessage(pp, Captions.NO_PERMISSION_EVENT,
                         Captions.PERMISSION_ADMIN_BUILD_OTHER);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
index f4be6b5d6..12d9e2b06 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/Flags.java
@@ -180,7 +180,7 @@ public final class Flags {
                 }
             });
             PlotSquared.get().forEachPlotRaw(value -> {
-                if (value.getFlags().containsKey(duplicate)) {
+                if (value.hasFlag(duplicate)) {
                     Object remove = value.getFlags().remove(duplicate);
                     try {
                         if (remove instanceof Collection

From eb9d98d2891751f1bc771522d1f976d5f99b337d Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Wed, 1 May 2019 19:52:26 +0100
Subject: [PATCH 162/210] Use https://www.athion.net/ISPaster/paste

---
 .../plotsquared/plot/commands/DebugPaste.java                 | 4 ++--
 .../plotsquared/plot/util/IncendoPaster.java                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
index e442f596f..f28b33a0a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste",
-    description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your latest.log to https://incendo.org",
+    description = "Upload settings.yml, worlds.yml, PlotSquared.use_THIS.yml and your latest.log to https://athion.net/ISPaster/paste",
     permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste
     extends SubCommand {
 
@@ -122,7 +122,7 @@ import java.util.stream.Collectors;
                     if (jsonObject.has("created")) {
                         final String pasteId = jsonObject.get("paste_id").getAsString();
                         final String link =
-                            String.format("https://incendo.org/paste/view/%s", pasteId);
+                            String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
                         player
                             .sendMessage(Captions.DEBUG_REPORT_CREATED.s().replace("%url%", link));
                     } else {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
index 18a822d07..1fec0e567 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/IncendoPaster.java
@@ -19,8 +19,8 @@ import java.util.*;
     /**
      * Upload service URL
      */
-    public static final String UPLOAD_PATH = "https://incendo.org/paste/upload";
-    /**
+    public static final String UPLOAD_PATH = "https://athion.net/ISPaster/paste/upload";
+     /**
      * Valid paste applications
      */
     public static final Collection<String> VALID_APPLICATIONS =

From e156d58769270f3a6511ec4413d3d8c7925ee6d4 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 2 May 2019 15:54:14 +0100
Subject: [PATCH 163/210] Generate javadoc with aggregatedJavadocs option

---
 .gitignore   |  3 ++-
 build.gradle | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index f55b143d2..68823d640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,4 +139,5 @@ checkstyle.xml
 classes/
 p2error.txt
 *.bat
-Nukkit/build/resources/main/plugin.yml
\ No newline at end of file
+Nukkit/build/resources/main/plugin.yml
+docs/
diff --git a/build.gradle b/build.gradle
index 3c4acbdec..ac3b36fb5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,6 +48,8 @@ version = String.format("%s.%s", rootVersion, buildNumber)
 
 description = rootProject.name
 
+delete "./docs"
+
 subprojects {
     apply plugin: 'java'
     apply plugin: 'maven'
@@ -85,3 +87,20 @@ subprojects {
         maven { url 'https://jitpack.io' }
     }
 }
+
+task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all child projects as if it was a single project', group: 'Documentation') {
+    destinationDir = file("./docs/javadoc")
+    title = "$project.name $version API"
+    options.author true
+    options.links 'http://docs.spring.io/spring/docs/4.3.x/javadoc-api/', 'http://docs.oracle.com/javase/8/docs/api/', 'http://docs.spring.io/spring-ws/docs/2.3.0.RELEASE/api/', 'http://docs.spring.io/spring-security/site/docs/4.0.4.RELEASE/apidocs/'
+    options.addStringOption('Xdoclint:none', '-quiet')
+
+    subprojects.each { proj ->
+        proj.tasks.withType(Javadoc).each { javadocTask ->
+            source += javadocTask.source
+            classpath += javadocTask.classpath
+            excludes += javadocTask.excludes
+            includes += javadocTask.includes
+        }
+    }
+}

From 2998f45b27fe69e68167874115577434709becb4 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 2 May 2019 16:14:53 +0100
Subject: [PATCH 164/210] Update JavaDoc link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 207497290..c4cb62633 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ is to provide a lag-free and smooth experience.
 * [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki)
 
 ### Developer Resources
-* [[JavaDoc (Core)](https://incendo.org/javadoc/plotsquared/core/index.html)] [[JavaDoc (Bukkit)](https://incendo.org/javadoc/plotsquared/core/index.html)] [[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
+* [[JavaDoc](https://ci.athion.net/job/PlotSquared-Breaking/javadoc/)] [[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
 * [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/)] [[Alternative (Incendo)](https://github.com/IntellectualSites/PlotSquared/wiki/incendo-mvn)]
 * [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/Developer-documentation-(WIP))
 

From 5796db51a72fcf740b8567d7bb38ef7baaaaecfd Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Thu, 2 May 2019 20:51:52 +0200
Subject: [PATCH 165/210] Update links

---
 README.md    | 4 ++--
 build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c4cb62633..a00ec16ee 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,8 @@ is to provide a lag-free and smooth experience.
 * [Wiki](https://github.com/intellectualcrafters/plotsquared/wiki)
 
 ### Developer Resources
-* [[JavaDoc](https://ci.athion.net/job/PlotSquared-Breaking/javadoc/)] [[Alternative (Empcraft)](http://empcraft.com/plotsquared/doc/)]
-* [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/)] [[Alternative (Incendo)](https://github.com/IntellectualSites/PlotSquared/wiki/incendo-mvn)]
+* [[JavaDoc](https://ci.athion.net/job/PlotSquared-Breaking/javadoc/)]
+* [[Maven Repo (CI)](http://ci.athion.net/job/PlotSquared-Breaking/ws/mvn/)]
 * [API Documentation](https://github.com/IntellectualSites/PlotSquared/wiki/Developer-documentation-(WIP))
 
 # Building
diff --git a/build.gradle b/build.gradle
index ac3b36fb5..dddfa3ffd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,8 +48,6 @@ version = String.format("%s.%s", rootVersion, buildNumber)
 
 description = rootProject.name
 
-delete "./docs"
-
 subprojects {
     apply plugin: 'java'
     apply plugin: 'maven'
@@ -95,6 +93,8 @@ task aggregatedJavadocs(type: Javadoc, description: 'Generate javadocs from all
     options.links 'http://docs.spring.io/spring/docs/4.3.x/javadoc-api/', 'http://docs.oracle.com/javase/8/docs/api/', 'http://docs.spring.io/spring-ws/docs/2.3.0.RELEASE/api/', 'http://docs.spring.io/spring-security/site/docs/4.0.4.RELEASE/apidocs/'
     options.addStringOption('Xdoclint:none', '-quiet')
 
+    delete "./docs"
+
     subprojects.each { proj ->
         proj.tasks.withType(Javadoc).each { javadocTask ->
             source += javadocTask.source

From 0a6fad73c305f172969bb22958cd0bfde55a3071 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 5 May 2019 11:56:08 +0100
Subject: [PATCH 166/210] Correct versioning

---
 .../github/intellectualsites/plotsquared/plot/PlotVersion.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
index ecb423970..6925fbe94 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
@@ -34,8 +34,7 @@ public class PlotVersion {
         if (hash == 0 && build == 0) {
             return "PlotSquared-" + year + "." + month + "." + day + "-SNAPSHOT";
         } else {
-            return "PlotSquared-" + year + "." + month + "." + day + "-" + Integer.toHexString(hash)
-                + "-" + build;
+            return "PlotSquared-" + build;
         }
     }
 

From 46beb901126581354dc3bef4ffd568845eb25d31 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 5 May 2019 11:58:45 +0100
Subject: [PATCH 167/210] Correcter versioning

---
 .../intellectualsites/plotsquared/plot/PlotVersion.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
index 6925fbe94..1d65c36e0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotVersion.java
@@ -32,9 +32,9 @@ public class PlotVersion {
 
     @Override public String toString() {
         if (hash == 0 && build == 0) {
-            return "PlotSquared-" + year + "." + month + "." + day + "-SNAPSHOT";
+            return "PlotSquared-NoVer-SNAPSHOT";
         } else {
-            return "PlotSquared-" + build;
+            return "PlotSquared-4." + build;
         }
     }
 

From f6e492638df8a8c210f321caac4325929c1cd201 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 5 May 2019 16:56:00 +0100
Subject: [PATCH 168/210] Bad temporary fix for #2345 - just don't use
 BukkitLocalQueue#regenChunkSafe and that on 1.14 :) (:

---
 .../plotsquared/bukkit/util/BukkitChunkManager.java            | 3 ++-
 .../plotsquared/plot/generator/HybridPlotManager.java          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
index 7dcbc5add..744f4b6e9 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java
@@ -275,7 +275,8 @@ public class BukkitChunkManager extends ChunkManager {
                         continue;
                     }
                     final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
-                    if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) {
+                    if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z
+                        && PlotSquared.imp().getServerVersion()[1] == 13) {
                         AugmentedUtils
                             .bypass(ignoreAugment, () -> queue.regenChunkSafe(chunk.x, chunk.z));
                         continue;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 10e7c1a8d..4796e3644 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -180,7 +180,7 @@ public class HybridPlotManager extends ClassicPlotManager {
         ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
             @Override public void run(int[] value) {
                 // If the chunk isn't near the edge and it isn't an augmented world we can just regen the whole chunk
-                if (canRegen && (value[6] == 0)) {
+                if (canRegen && (value[6] == 0) && PlotSquared.imp().getServerVersion()[1] == 13) {
                     queue.regenChunk(value[0], value[1]);
                     return;
                 }

From d8ac6115c77e0058553f1b023de7a588c3f9065f Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 10 May 2019 17:16:48 -0400
Subject: [PATCH 169/210] I never thought it would come to this

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 3411e85ba..b8cc83032 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -115,7 +115,12 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override public void onEnable() {
-
+        if (PlotSquared.get().IMP.getServerVersion()[1] < 13) {
+            PlotSquared.log("You can't use this version of PlotSquared on a server less than Minecraft 1.13.2.");
+            PlotSquared.log("Please check the download page for the link to the legacy versions.");
+            Bukkit.shutdown();
+            return;
+        }
         this.pluginName = getDescription().getName();
         PlotPlayer.registerConverter(Player.class, BukkitUtil::getPlayer);
 

From f232334bcc9ecaccd7bfedde0fc64281e10b1937 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 10 May 2019 21:18:28 -0400
Subject: [PATCH 170/210] Various formatting tweaks as well as metrics changes.

---
 Bukkit/build.gradle                           |   2 -
 .../plotsquared/bukkit/BukkitMain.java        |  44 +-
 .../plotsquared/bukkit/util/Metrics.java      | 695 ++++++++++++++++++
 .../plotsquared/plot/PlotSquared.java         |  11 +-
 .../plotsquared/plot/config/Captions.java     | 242 +++---
 5 files changed, 858 insertions(+), 136 deletions(-)
 create mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index ef26dbb05..f9998521f 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
     implementation 'org.spigotmc:spigot-api:1.14-pre5-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
-    compile(group: 'org.bstats', name: 'bstats-bukkit', version: '1.4')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
     }
@@ -37,7 +36,6 @@ jar.enabled = false
 shadowJar {
     dependencies {
         include(dependency(':Core'))
-        include(dependency('org.bstats:bstats-bukkit:1.4'))
         // update notification stuff
         include(dependency('com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'))
         include(dependency('com.squareup.retrofit2:retrofit:2.4.0'))
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index b8cc83032..8a4574a0d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -1,11 +1,20 @@
 package com.github.intellectualsites.plotsquared.bukkit;
 
 import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator;
-import com.github.intellectualsites.plotsquared.bukkit.listeners.*;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.ChunkListener;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.EntitySpawnListener;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.PlayerEvents;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.PlotPlusListener;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.SingleWorldListener;
+import com.github.intellectualsites.plotsquared.bukkit.listeners.WorldEvents;
 import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle;
 import com.github.intellectualsites.plotsquared.bukkit.util.*;
 import com.github.intellectualsites.plotsquared.bukkit.util.block.BukkitLocalQueue;
-import com.github.intellectualsites.plotsquared.bukkit.uuid.*;
+import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper;
+import com.github.intellectualsites.plotsquared.bukkit.uuid.FileUUIDHandler;
+import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper;
+import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper;
+import com.github.intellectualsites.plotsquared.bukkit.uuid.SQLUUIDHandler;
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.IPlotMain;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
@@ -16,7 +25,12 @@ import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridGen;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
 import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.BlockRegistry;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
 import com.github.intellectualsites.plotsquared.plot.object.chat.PlainChatManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager;
 import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea;
@@ -30,8 +44,6 @@ import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldedit.extension.platform.Capability;
 import lombok.Getter;
 import lombok.NonNull;
-import org.bstats.bukkit.Metrics;
-import org.bukkit.Location;
 import org.bukkit.*;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.Entity;
@@ -48,7 +60,11 @@ import org.bukkit.plugin.java.JavaPlugin;
 import javax.annotation.Nullable;
 import java.io.File;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
 
 import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils.getRefClass;
 
@@ -175,11 +191,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             getLogger().warning("Update checking disabled. Skipping.");
         }
 
-        if (Settings.Enabled_Components.METRICS) {
-            this.startMetrics();
-        } else {
-            PlotSquared.log(Captions.CONSOLE_PLEASE_ENABLE_METRICS.f(getPluginName()));
-        }
+        this.startMetrics();
         if (Settings.Enabled_Components.WORLDS) {
             TaskManager.IMP.taskRepeat(this::unload, 20);
             try {
@@ -660,14 +672,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             return;
         }
         this.metricsStarted = true;
-        try {
-            System.setProperty("bstats.relocatecheck",
-                "false"); // We do not want to relocate the package...
-            Metrics metrics = new Metrics(this);// bstats
-            PlotSquared.log(Captions.PREFIX + "&6Metrics enabled.");
-        } catch (Throwable e) {
-            e.printStackTrace();
-        }
+        Metrics metrics = new Metrics(this);// bstats
+        PlotSquared.log(Captions.PREFIX + "&6Metrics enabled.");
     }
 
     @Override public ChunkManager initChunkManager() {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java
new file mode 100644
index 000000000..ff6e1b310
--- /dev/null
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java
@@ -0,0 +1,695 @@
+package com.github.intellectualsites.plotsquared.bukkit.util;
+
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.ServicePriority;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+
+import javax.net.ssl.HttpsURLConnection;
+import java.io.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.Callable;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * bStats collects some data for plugin authors.
+ * <p>
+ * Check out https://bStats.org/ to learn more about bStats!
+ */
+@SuppressWarnings({"WeakerAccess", "unused"})
+public class Metrics {
+
+    static {
+        // You can use the property to disable the check in your test environment
+        if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
+            // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
+            final String defaultPackage = new String(
+                new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
+            final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
+            // We want to make sure nobody just copy & pastes the example and use the wrong package names
+            if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
+                throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
+            }
+        }
+    }
+
+    // The version of this bStats class
+    public static final int B_STATS_VERSION = 1;
+
+    // The url to which the data is sent
+    private static final String URL = "https://bStats.org/submitData/bukkit";
+
+    // Is bStats enabled on this server?
+    private boolean enabled;
+
+    // Should failed requests be logged?
+    private static boolean logFailedRequests;
+
+    // Should the sent data be logged?
+    private static boolean logSentData;
+
+    // Should the response text be logged?
+    private static boolean logResponseStatusText;
+
+    // The uuid of the server
+    private static String serverUUID;
+
+    // The plugin
+    private final Plugin plugin;
+
+    // A list with all custom charts
+    private final List<CustomChart> charts = new ArrayList<>();
+
+    /**
+     * Class constructor.
+     *
+     * @param plugin The plugin which stats should be submitted.
+     */
+    public Metrics(Plugin plugin) {
+        if (plugin == null) {
+            throw new IllegalArgumentException("Plugin cannot be null!");
+        }
+        this.plugin = plugin;
+
+        // Get the config file
+        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
+        File configFile = new File(bStatsFolder, "config.yml");
+        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+
+        // Check if the config file exists
+        if (!config.isSet("serverUuid")) {
+
+            // Add default values
+            config.addDefault("enabled", true);
+            // Every server gets it's unique random id.
+            config.addDefault("serverUuid", UUID.randomUUID().toString());
+            // Should failed request be logged?
+            config.addDefault("logFailedRequests", false);
+            // Should the sent data be logged?
+            config.addDefault("logSentData", false);
+            // Should the response text be logged?
+            config.addDefault("logResponseStatusText", false);
+
+            // Inform the server owners about bStats
+            config.options().header(
+                "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
+                    "To honor their work, you should not disable it.\n" +
+                    "This has nearly no effect on the server performance!\n" +
+                    "Check out https://bStats.org/ to learn more :)"
+            ).copyDefaults(true);
+            try {
+                config.save(configFile);
+            } catch (IOException ignored) { }
+        }
+
+        // Load the data
+        enabled = config.getBoolean("enabled", true);
+        serverUUID = config.getString("serverUuid");
+        logFailedRequests = config.getBoolean("logFailedRequests", false);
+        logSentData = config.getBoolean("logSentData", false);
+        logResponseStatusText = config.getBoolean("logResponseStatusText", false);
+
+        if (enabled) {
+            boolean found = false;
+            // Search for all other bStats Metrics classes to see if we are the first one
+            for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+                try {
+                    service.getField("B_STATS_VERSION"); // Our identifier :)
+                    found = true; // We aren't the first
+                    break;
+                } catch (NoSuchFieldException ignored) { }
+            }
+            // Register our service
+            Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
+            if (!found) {
+                // We are the first!
+                startSubmitting();
+            }
+        }
+    }
+
+    /**
+     * Checks if bStats is enabled.
+     *
+     * @return Whether bStats is enabled or not.
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Adds a custom chart.
+     *
+     * @param chart The chart to add.
+     */
+    public void addCustomChart(CustomChart chart) {
+        if (chart == null) {
+            throw new IllegalArgumentException("Chart cannot be null!");
+        }
+        charts.add(chart);
+    }
+
+    /**
+     * Starts the Scheduler which submits our data every 30 minutes.
+     */
+    private void startSubmitting() {
+        final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
+        timer.scheduleAtFixedRate(new TimerTask() {
+            @Override
+            public void run() {
+                if (!plugin.isEnabled()) { // Plugin was disabled
+                    timer.cancel();
+                    return;
+                }
+                // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
+                // Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
+                Bukkit.getScheduler().runTask(plugin, () -> submitData());
+            }
+        }, 1000 * 60 * 5, 1000 * 60 * 30);
+        // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
+        // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
+        // WARNING: Just don't do it!
+    }
+
+    /**
+     * Gets the plugin specific data.
+     * This method is called using Reflection.
+     *
+     * @return The plugin specific data.
+     */
+    public JSONObject getPluginData() {
+        JSONObject data = new JSONObject();
+
+        String pluginName = plugin.getDescription().getName();
+        String pluginVersion = plugin.getDescription().getVersion();
+
+        data.put("pluginName", pluginName); // Append the name of the plugin
+        data.put("pluginVersion", pluginVersion); // Append the version of the plugin
+        JSONArray customCharts = new JSONArray();
+        for (CustomChart customChart : charts) {
+            // Add the data of the custom charts
+            JSONObject chart = customChart.getRequestJsonObject();
+            if (chart == null) { // If the chart is null, we skip it
+                continue;
+            }
+            customCharts.add(chart);
+        }
+        data.put("customCharts", customCharts);
+
+        return data;
+    }
+
+    /**
+     * Gets the server specific data.
+     *
+     * @return The server specific data.
+     */
+    private JSONObject getServerData() {
+        // Minecraft specific data
+        int playerAmount;
+        try {
+            // Around MC 1.8 the return type was changed to a collection from an array,
+            // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
+            Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
+            playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
+                ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
+                : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
+        } catch (Exception e) {
+            playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
+        }
+        int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
+        String bukkitVersion = Bukkit.getVersion();
+
+        // OS/Java specific data
+        String javaVersion = System.getProperty("java.version");
+        String osName = System.getProperty("os.name");
+        String osArch = System.getProperty("os.arch");
+        String osVersion = System.getProperty("os.version");
+        int coreCount = Runtime.getRuntime().availableProcessors();
+
+        JSONObject data = new JSONObject();
+
+        data.put("serverUUID", serverUUID);
+
+        data.put("playerAmount", playerAmount);
+        data.put("onlineMode", onlineMode);
+        data.put("bukkitVersion", bukkitVersion);
+
+        data.put("javaVersion", javaVersion);
+        data.put("osName", osName);
+        data.put("osArch", osArch);
+        data.put("osVersion", osVersion);
+        data.put("coreCount", coreCount);
+
+        return data;
+    }
+
+    /**
+     * Collects the data and sends it afterwards.
+     */
+    private void submitData() {
+        final JSONObject data = getServerData();
+
+        JSONArray pluginData = new JSONArray();
+        // Search for all other bStats Metrics classes to get their plugin data
+        for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
+            try {
+                service.getField("B_STATS_VERSION"); // Our identifier :)
+
+                for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
+                    try {
+                        pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
+                    } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
+                }
+            } catch (NoSuchFieldException ignored) { }
+        }
+
+        data.put("plugins", pluginData);
+
+        // Create a new thread for the connection to the bStats server
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    // Send the data
+                    sendData(plugin, data);
+                } catch (Exception e) {
+                    // Something went wrong! :(
+                    if (logFailedRequests) {
+                        plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
+                    }
+                }
+            }
+        }).start();
+    }
+
+    /**
+     * Sends the data to the bStats server.
+     *
+     * @param plugin Any plugin. It's just used to get a logger instance.
+     * @param data The data to send.
+     * @throws Exception If the request failed.
+     */
+    private static void sendData(Plugin plugin, JSONObject data) throws Exception {
+        if (data == null) {
+            throw new IllegalArgumentException("Data cannot be null!");
+        }
+        if (Bukkit.isPrimaryThread()) {
+            throw new IllegalAccessException("This method must not be called from the main thread!");
+        }
+        if (logSentData) {
+            plugin.getLogger().info("Sending data to bStats: " + data.toString());
+        }
+        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
+
+        // Compress the data to save bandwidth
+        byte[] compressedData = compress(data.toString());
+
+        // Add headers
+        connection.setRequestMethod("POST");
+        connection.addRequestProperty("Accept", "application/json");
+        connection.addRequestProperty("Connection", "close");
+        connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
+        connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
+        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
+        connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
+
+        // Send data
+        connection.setDoOutput(true);
+        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+        outputStream.write(compressedData);
+        outputStream.flush();
+        outputStream.close();
+
+        InputStream inputStream = connection.getInputStream();
+        BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+
+        StringBuilder builder = new StringBuilder();
+        String line;
+        while ((line = bufferedReader.readLine()) != null) {
+            builder.append(line);
+        }
+        bufferedReader.close();
+        if (logResponseStatusText) {
+            plugin.getLogger().info("Sent data to bStats and received response: " + builder.toString());
+        }
+    }
+
+    /**
+     * Gzips the given String.
+     *
+     * @param str The string to gzip.
+     * @return The gzipped String.
+     * @throws IOException If the compression failed.
+     */
+    private static byte[] compress(final String str) throws IOException {
+        if (str == null) {
+            return null;
+        }
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
+        gzip.write(str.getBytes(StandardCharsets.UTF_8));
+        gzip.close();
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * Represents a custom chart.
+     */
+    public static abstract class CustomChart {
+
+        // The id of the chart
+        final String chartId;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         */
+        CustomChart(String chartId) {
+            if (chartId == null || chartId.isEmpty()) {
+                throw new IllegalArgumentException("ChartId cannot be null or empty!");
+            }
+            this.chartId = chartId;
+        }
+
+        private JSONObject getRequestJsonObject() {
+            JSONObject chart = new JSONObject();
+            chart.put("chartId", chartId);
+            try {
+                JSONObject data = getChartData();
+                if (data == null) {
+                    // If the data is null we don't send the chart.
+                    return null;
+                }
+                chart.put("data", data);
+            } catch (Throwable t) {
+                if (logFailedRequests) {
+                    Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
+                }
+                return null;
+            }
+            return chart;
+        }
+
+        protected abstract JSONObject getChartData() throws Exception;
+
+    }
+
+    /**
+     * Represents a custom simple pie.
+     */
+    public static class SimplePie extends CustomChart {
+
+        private final Callable<String> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SimplePie(String chartId, Callable<String> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            String value = callable.call();
+            if (value == null || value.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("value", value);
+            return data;
+        }
+    }
+
+    /**
+     * Represents a custom advanced pie.
+     */
+    public static class AdvancedPie extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() == 0) {
+                    continue; // Skip this invalid
+                }
+                allSkipped = false;
+                values.put(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+    }
+
+    /**
+     * Represents a custom drilldown pie.
+     */
+    public static class DrilldownPie extends CustomChart {
+
+        private final Callable<Map<String, Map<String, Integer>>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        public JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Map<String, Integer>> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean reallyAllSkipped = true;
+            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
+                JSONObject value = new JSONObject();
+                boolean allSkipped = true;
+                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
+                    value.put(valueEntry.getKey(), valueEntry.getValue());
+                    allSkipped = false;
+                }
+                if (!allSkipped) {
+                    reallyAllSkipped = false;
+                    values.put(entryValues.getKey(), value);
+                }
+            }
+            if (reallyAllSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+    }
+
+    /**
+     * Represents a custom single line chart.
+     */
+    public static class SingleLineChart extends CustomChart {
+
+        private final Callable<Integer> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SingleLineChart(String chartId, Callable<Integer> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            int value = callable.call();
+            if (value == 0) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("value", value);
+            return data;
+        }
+
+    }
+
+    /**
+     * Represents a custom multi line chart.
+     */
+    public static class MultiLineChart extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                if (entry.getValue() == 0) {
+                    continue; // Skip this invalid
+                }
+                allSkipped = false;
+                values.put(entry.getKey(), entry.getValue());
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+
+    }
+
+    /**
+     * Represents a custom simple bar chart.
+     */
+    public static class SimpleBarChart extends CustomChart {
+
+        private final Callable<Map<String, Integer>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, Integer> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            for (Map.Entry<String, Integer> entry : map.entrySet()) {
+                JSONArray categoryValues = new JSONArray();
+                categoryValues.add(entry.getValue());
+                values.put(entry.getKey(), categoryValues);
+            }
+            data.put("values", values);
+            return data;
+        }
+
+    }
+
+    /**
+     * Represents a custom advanced bar chart.
+     */
+    public static class AdvancedBarChart extends CustomChart {
+
+        private final Callable<Map<String, int[]>> callable;
+
+        /**
+         * Class constructor.
+         *
+         * @param chartId The id of the chart.
+         * @param callable The callable which is used to request the chart data.
+         */
+        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
+            super(chartId);
+            this.callable = callable;
+        }
+
+        @Override
+        protected JSONObject getChartData() throws Exception {
+            JSONObject data = new JSONObject();
+            JSONObject values = new JSONObject();
+            Map<String, int[]> map = callable.call();
+            if (map == null || map.isEmpty()) {
+                // Null = skip the chart
+                return null;
+            }
+            boolean allSkipped = true;
+            for (Map.Entry<String, int[]> entry : map.entrySet()) {
+                if (entry.getValue().length == 0) {
+                    continue; // Skip this invalid
+                }
+                allSkipped = false;
+                JSONArray categoryValues = new JSONArray();
+                for (int categoryValue : entry.getValue()) {
+                    categoryValues.add(categoryValue);
+                }
+                values.put(entry.getKey(), categoryValues);
+            }
+            if (allSkipped) {
+                // Null = skip the chart
+                return null;
+            }
+            data.put("values", values);
+            return data;
+        }
+    }
+
+}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 8823118b1..7c94060fd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -9,7 +9,11 @@ import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.config.Storage;
-import com.github.intellectualsites.plotsquared.plot.database.*;
+import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
+import com.github.intellectualsites.plotsquared.plot.database.Database;
+import com.github.intellectualsites.plotsquared.plot.database.MySQL;
+import com.github.intellectualsites.plotsquared.plot.database.SQLManager;
+import com.github.intellectualsites.plotsquared.plot.database.SQLite;
 import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
@@ -157,11 +161,6 @@ import java.util.zip.ZipInputStream;
             }
             // Required
             this.IMP.registerWorldEvents();
-            if (Settings.Enabled_Components.METRICS) {
-                this.IMP.startMetrics();
-            } else {
-                PlotSquared.log(Captions.CONSOLE_PLEASE_ENABLE_METRICS.f(IMP.getPluginName()));
-            }
             if (Settings.Enabled_Components.CHUNK_PROCESSOR) {
                 this.IMP.registerChunkProcessor();
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index a5a1c559c..2037bcdf1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -5,6 +5,7 @@ import com.github.intellectualsites.plotsquared.configuration.ConfigurationSecti
 import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.EnumSet;
@@ -36,7 +37,8 @@ public enum Captions {
     FLAG_VEHICLE_BREAK("vehicle-break", "static.flags"),
     FLAG_HOSTILE_INTERACT("hostile-interact", "static.flags"),
     FLAG_DEVICE_INTERACT("device-interact", "static.flags"),
-    FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"), FLAG_VEHICLE_USE("vehicle-use", "static.flags"),
+    FLAG_ANIMAL_INTERACT("animal-interact", "static.flags"),
+    FLAG_VEHICLE_USE("vehicle-use", "static.flags"),
     FLAG_VEHICLE_PLACE("vehicle-place", "static.flags"),
     FLAG_PLAYER_INTERACT("player-interact", "static.flags"),
     FLAG_TAMED_INTERACT("tamed-interact", "static.flags"),
@@ -147,24 +149,19 @@ public enum Captions {
     PERMISSION_ADMIN_COMMAND_SCHEMATIC_PASTE("plots.admin.command.schematic.paste", "static.permissions"),
     PERMISSION_SCHEMATIC_PASTE("plots.schematic.paste", "static.permissions"),
     PERMISSION_SCHEMATIC_LIST("plots.schematic.list", "static.permissions"),
-
     PERMISSION_SCHEMATIC_SAVE("plots.schematic.save", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_SCHEMATIC_SAVE("plots.admin.command.schematic.save", "static.permissions"),
-
     PERMISSION_SET_COMPONENT("plots.set.%s0", "static.permissions"),
-    PERMISSION_ADMIN_COMMAND(
-        "plots.admin.command.%s0", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND("plots.admin.command.%s0", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_UNLINK("plots.ad2min.command.unlink", "static.permissions"),
     PERMISSION_VISIT_UNOWNED("plots.visit.unowned", "static.permissions"),
     PERMISSION_VISIT_OWNED("plots.visit.owned", "static.permissions"),
     PERMISSION_SHARED("plots.visit.shared", "static.permissions"),
     PERMISSION_VISIT_OTHER("plots.visit.other", "static.permissions"),
     PERMISSION_HOME("plots.home", "static.permissions"),
-
     PERMISSION_ALIAS_SET_OBSOLETE("plots.set.alias", "static.permissions"), // Note this is for backwards compatibility
     PERMISSION_ALIAS_SET("plots.alias.set", "static.permissions"),
     PERMISSION_ALIAS_REMOVE("plots.alias.remove", "static.permissions"),
-
     /*
      * Static console
      */
@@ -173,49 +170,44 @@ public enum Captions {
             + "and security. %s0 will require Java 8 in a future update.",
         "static.console"), CONSOLE_PLEASE_ENABLE_METRICS(
         "&dPlease enable metrics for %s0. Using metrics improves plugin stability, performance, and features. "
-            + "Bug fixes and new features are influenced on metrics.", "static.console"), /*
+            + "Bug fixes and new features are influenced on metrics.", "static.console"),
+    /*
      * Confirm
      */
-
-    EXPIRED_CONFIRM("$2Confirmation has expired, please run the command again!",
-        "Confirm"), FAILED_CONFIRM("$2You have no pending actions to confirm!", "Confirm"),
-
+    EXPIRED_CONFIRM("$2Confirmation has expired, please run the command again!", "Confirm"),
+    FAILED_CONFIRM("$2You have no pending actions to confirm!", "Confirm"),
     REQUIRES_CONFIRM(
         "$2Are you sure you wish to execute: $1%s$2?&-$2This cannot be undone! If you are sure: $1/plot confirm",
-        "Confirm"), /*
+        "Confirm"),
+    /*
      * Move
      */
-
     MOVE_SUCCESS("$4Successfully moved plot.", "Move"), COPY_SUCCESS("$4Successfully copied plot.",
         "Move"),
-
-    REQUIRES_UNOWNED("$2The location specified is already occupied.", "Move"), /*
+    REQUIRES_UNOWNED("$2The location specified is already occupied.", "Move"),
+    /*
      * Area Create
      */
-
     REQUIRES_UNMERGED("$2The plot cannot be merged", "debug"),
-
-    SET_ATTRIBUTE("$4Successfully set %s0 set to %s1", "Set"), /*
+    SET_ATTRIBUTE("$4Successfully set %s0 set to %s1", "Set"),
+    /*
      * Web
      */
-
-    GENERATING_LINK("$1Processing plot...", "Web"), GENERATING_LINK_FAILED(
+    GENERATING_LINK("$1Processing plot...", "Web"),
+    GENERATING_LINK_FAILED(
         "$2Failed to generate download link!", "Web"),
-
-    SAVE_FAILED("$2Failed to save", "Web"), LOAD_NULL(
-        "$2Please use $4/plot load $2to get a list of schematics", "Web"),
-
-    LOAD_FAILED("$2Failed to load schematic", "Web"), LOAD_LIST(
-        "$2To load a schematic, use $1/plot load #", "Web"),
-
-    SAVE_SUCCESS("$1Successfully saved!", "Web"), /*
+    SAVE_FAILED("$2Failed to save", "Web"),
+    LOAD_NULL("$2Please use $4/plot load $2to get a list of schematics", "Web"),
+    LOAD_FAILED("$2Failed to load schematic", "Web"),
+    LOAD_LIST("$2To load a schematic, use $1/plot load #", "Web"),
+    SAVE_SUCCESS("$1Successfully saved!", "Web"),
+    /*
      * Compass
      */
-
-    COMPASS_TARGET("$4Successfully targeted plot with compass", "Compass"), /*
+    COMPASS_TARGET("$4Successfully targeted plot with compass", "Compass"),
+    /*
      * Cluster
      */
-
     CLUSTER_AVAILABLE_ARGS(
         "$1The following sub commands are available: $4list$2, $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, "
             + "$4members$2, $4info$2, $4tp$2, $4sethome", "Cluster"), CLUSTER_LIST_HEADING(
@@ -252,23 +244,22 @@ public enum Captions {
 
     CLUSTER_INFO(
         "$1Current cluster: $2%id%&-$1Name: $2%name%&-$1Owner: $2%owner%&-$1Size: $2%size%&-$1Rights: $2%rights%",
-        "Cluster"), /*
+        "Cluster"),
+    /*
      * Border
      */
-
-    BORDER("$2You are outside the current map border", "Border"), /*
-     * Unclaim
+    BORDER("$2You are outside the current map border", "Border"),
+    /*
+     * Un-claim
      */
-
     UNCLAIM_SUCCESS("$4You successfully unclaimed the plot.", "Unclaim"), UNCLAIM_FAILED(
-        "$2Could not unclaim the plot", "Unclaim"), /*
+        "$2Could not unclaim the plot", "Unclaim"),
+    /*
      * WorldEdit masks
      */
-
     WORLDEDIT_DELAYED("$2Please wait while we process your WorldEdit action...",
         "WorldEdit Masks"), WORLDEDIT_RUN("$2Apologies for the delay. Now executing: %s",
         "WorldEdit Masks"),
-
     REQUIRE_SELECTION_IN_MASK(
         "$2%s of your selection is not within your plot mask. You can only make edits within your plot.",
         "WorldEdit Masks"), WORLDEDIT_VOLUME(
@@ -290,26 +281,26 @@ public enum Captions {
 
     GAMEMODE_WAS_BYPASSED("$1You bypassed the GameMode ($2{gamemode}$1) $1set for $2{plot}",
         "GameMode"), HEIGHT_LIMIT("$1This plot area has a height limit of $2{limit}",
-        "Height Limit"), /*
+        "Height Limit"),
+    /*
      * Records
      */
-
     RECORD_PLAY("$2%player $2started playing record $1%name", "Records"), NOTIFY_ENTER(
         "$2%player $2entered your plot ($1%plot$2)", "Records"),
 
-    NOTIFY_LEAVE("$2%player $2left your plot ($1%plot$2)", "Records"), /*
+    NOTIFY_LEAVE("$2%player $2left your plot ($1%plot$2)", "Records"),
+    /*
      * Swap
      */
-
     SWAP_OVERLAP("$2The proposed areas are not allowed to overlap", "Swap"), SWAP_DIMENSIONS(
         "$2The proposed areas must have comparable dimensions", "Swap"),
 
     SWAP_SYNTAX("$2/plot swap <id>", "Swap"), SWAP_SUCCESS("$4Successfully swapped plots", "Swap"),
 
-    STARTED_SWAP("$2Started plot swap task. You will be notified when it finishes", "Swap"), /*
+    STARTED_SWAP("$2Started plot swap task. You will be notified when it finishes", "Swap"),
+    /*
      * Comment
      */
-
     INBOX_NOTIFICATION("%s unread messages. Use /plot inbox", "Comment"), NOT_VALID_INBOX_INDEX(
         "$2No comment at index %s", "Comment"),
 
@@ -326,13 +317,12 @@ public enum Captions {
         "$4A comment has been left", "Comment"),
 
     COMMENT_HEADER("$2&m---------&r $1Comments $2&m---------&r", "Comment"), INBOX_EMPTY(
-        "$2No comments", "Comment"), /*
+        "$2No comments", "Comment"),
+    /*
      * Console
      */
-
     NOT_CONSOLE("$2For safety reasons, this command can only be executed by console.",
         "Console"), IS_CONSOLE("$2This command can only be executed by a player.", "Console"),
-
     /*
     Inventory
      */
@@ -340,7 +330,6 @@ public enum Captions {
         "Inventory"),
 
     INVENTORY_CATEGORY("&cCategory: &6{category}", "Inventory"),
-
     /*
      * Clipboard
      */
@@ -355,17 +344,17 @@ public enum Captions {
 
     CLIPBOARD_INFO(
         "$2Current Selection - Plot ID: $1%id$2, Width: $1%width$2, Total Blocks: $1%total$2",
-        "Clipboard"), /*
+        "Clipboard"),
+    /*
      * Toggle
      */
-
     TOGGLE_ENABLED("$2Enabled setting: %s", "Toggle"), TOGGLE_DISABLED("$2Disabled setting: %s",
         "Toggle"),
 
-    COMMAND_BLOCKED("$2That command is not allowed in this plot", "Blocked Command"), /*
+    COMMAND_BLOCKED("$2That command is not allowed in this plot", "Blocked Command"),
+    /*
      * Done
      */
-
     DONE_ALREADY_DONE("$2This plot is already marked as done", "Done"), DONE_NOT_DONE(
         "$2This plot is not marked as done.", "Done"),
 
@@ -373,7 +362,8 @@ public enum Captions {
         "$2This plot is too simple. Please add more detail before using this command.",
         "Done"), DONE_SUCCESS("$1Successfully marked this plot as done.", "Done"),
 
-    DONE_REMOVED("$1You may now continue building in this plot.", "Done"), /*
+    DONE_REMOVED("$1You may now continue building in this plot.", "Done"),
+    /*
      * Ratings
      */
 
@@ -389,12 +379,14 @@ public enum Captions {
     RATING_NOT_YOUR_OWN("$2You cannot rate your own plot", "Ratings"), RATING_NOT_DONE(
         "$2You can only rate finished plots.", "Ratings"),
 
-    RATING_NOT_OWNED("$2You cannot rate a plot that is not claimed by anyone", "Ratings"), /*
+    RATING_NOT_OWNED("$2You cannot rate a plot that is not claimed by anyone", "Ratings"),
+    /*
      * Tutorial
      */
 
     RATE_THIS("$2Rate this plot!", "Tutorial"), COMMENT_THIS(
-        "$2Leave some feedback on this plot: %s", "Tutorial"), /*
+        "$2Leave some feedback on this plot: %s", "Tutorial"),
+    /*
      * Economy Stuff
      */
 
@@ -411,7 +403,8 @@ public enum Captions {
     ADDED_BALANCE("$1%s $2has been added to your balance", "Economy"), REMOVED_BALANCE(
         "$1%s $2has been taken from your balance", "Economy"),
 
-    REMOVED_GRANTED_PLOT("$2You used %s plot grant(s), you've got $1%s $2left", "Economy"), /*
+    REMOVED_GRANTED_PLOT("$2You used %s plot grant(s), you've got $1%s $2left", "Economy"),
+    /*
      * Setup Stuff
      */
 
@@ -433,7 +426,8 @@ public enum Captions {
         "$2You need to specify a generator ($1/plot setup <world> &l<generator>&r$2)&-$1Additional commands:&-$2 - $1/plot setup <value>&-$2 - "
             + "$1/plot setup back&-$2 - $1/plot setup cancel", "Setup"),
 
-    SETUP_INVALID_GENERATOR("$2Invalid generator. Possible options: %s", "Setup"), /*
+    SETUP_INVALID_GENERATOR("$2Invalid generator. Possible options: %s", "Setup"),
+    /*
      * Schematic Stuff
      */
 
@@ -456,13 +450,15 @@ public enum Captions {
     TITLE_ENTERED_PLOT("$1Plot: %world%;%x%;%z%", "Titles"), TITLE_ENTERED_PLOT_SUB("$4Owned by %s",
         "Titles"),
 
-    PREFIX_GREETING("$1%id%$2> ", "Titles"), PREFIX_FAREWELL("$1%id%$2> ", "Titles"), /*
+    PREFIX_GREETING("$1%id%$2> ", "Titles"), PREFIX_FAREWELL("$1%id%$2> ", "Titles"),
+    /*
      * Core Stuff
      */
 
     TASK_START("Starting task...", "Core"), PREFIX("$3[$1P2$3] $2", "Core"),
 
-    ENABLED("$1%s0 is now enabled", "Core"), /*
+    ENABLED("$1%s0 is now enabled", "Core"),
+    /*
      * Reload
      */
 
@@ -485,7 +481,8 @@ public enum Captions {
     MISSING_ALIAS("$2You need to specify an alias", "Alias"), ALIAS_TOO_LONG(
         "$2The alias must be < 50 characters in length", "Alias"),
 
-    ALIAS_IS_TAKEN("$2That alias is already taken", "Alias"), /*
+    ALIAS_IS_TAKEN("$2That alias is already taken", "Alias"),
+    /*
      * Position
      */
 
@@ -495,15 +492,18 @@ public enum Captions {
     POSITION_UNSET("$1Home position reset to the default location", "Position"), HOME_ARGUMENT(
         "$2Use /plot set home [none]", "Position"),
 
-    INVALID_POSITION("$2That is not a valid position value", "Position"), /*
+    INVALID_POSITION("$2That is not a valid position value", "Position"),
+    /*
      * Cap
      */
 
-    ENTITY_CAP("$2You are not allowed to spawn more mobs", "cap"), /*
+    ENTITY_CAP("$2You are not allowed to spawn more mobs", "cap"),
+    /*
      * Time
      */
 
-    TIME_FORMAT("$1%hours%, %min%, %sec%", "Time"), /*
+    TIME_FORMAT("$1%hours%, %min%, %sec%", "Time"),
+    /*
      * Permission
      */
 
@@ -539,7 +539,8 @@ public enum Captions {
         "Merge"), UNLINK_REQUIRED("$2An unlink is required to do this.", "Merge"),
 
     UNLINK_IMPOSSIBLE("$2You can only unlink a mega-plot", "Merge"), UNLINK_SUCCESS(
-        "$2Successfully unlinked plots.", "Merge"), /*
+        "$2Successfully unlinked plots.", "Merge"),
+    /*
      * CommandConfig
      */
 
@@ -550,14 +551,16 @@ public enum Captions {
         "$2I'm sorry, but you're not permitted to use any subcommands.", "CommandConfig"),
 
     SUBCOMMAND_SET_OPTIONS_HEADER("$2Possible Values: ", "CommandConfig"), COMMAND_SYNTAX(
-        "$1Usage: $2%s", "CommandConfig"), /*
+        "$1Usage: $2%s", "CommandConfig"),
+    /*
      * Player not found
      */
 
     INVALID_PLAYER_WAIT("$2Player not found: $1%s$2, fetching it. Try again soon.",
         "Errors"), INVALID_PLAYER("$2Player not found: $1%s$2.", "Errors"),
 
-    INVALID_PLAYER_OFFLINE("$2The player must be online: $1%s.", "Errors"), /*
+    INVALID_PLAYER_OFFLINE("$2The player must be online: $1%s.", "Errors"),
+    /*
      * Command flag
      */
 
@@ -569,21 +572,22 @@ public enum Captions {
         "Errors"), // SETTINGS_PASTE_UPLOADED("$2settings.yml was uploaded to: $1%url%", "Paste"),
 
     // LATEST_LOG_UPLOADED("$2latest.log was uploaded to: $1%url%", "Paste"),
-    DEBUG_REPORT_CREATED("$1Uploaded a full debug to: $1%url%", "Paste"), /*
-     *
-     */
+    DEBUG_REPORT_CREATED("$1Uploaded a full debug to: $1%url%", "Paste"),
 
-    COMMAND_WENT_WRONG("$2Something went wrong when executing that command...", "Errors"), /*
+    COMMAND_WENT_WRONG("$2Something went wrong when executing that command...", "Errors"),
+    /*
      * purge
      */
 
-    PURGE_SUCCESS("$4Successfully purged %s plots", "Purge"), /*
+    PURGE_SUCCESS("$4Successfully purged %s plots", "Purge"),
+    /*
      * trim
      */
 
     TRIM_IN_PROGRESS("A world trim task is already in progress!",
         "Trim"), NOT_VALID_HYBRID_PLOT_WORLD(
-        "The hybrid plot manager is required to perform this action", "Trim"), /*
+        "The hybrid plot manager is required to perform this action", "Trim"),
+    /*
      * No <plot>
      */
 
@@ -599,16 +603,19 @@ public enum Captions {
     NOT_VALID_WORLD("$2That is not a valid world (case sensitive)", "Errors"), NOT_VALID_PLOT_WORLD(
         "$2That is not a valid plot area (case sensitive)", "Errors"),
 
-    NO_PLOTS("$2You don't have any plots", "Errors"), /*
+    NO_PLOTS("$2You don't have any plots", "Errors"),
+    /*
      * Block List
      */
 
-    BLOCK_LIST_SEPARATER("$1,$2 ", "Block List"), /*
+    BLOCK_LIST_SEPARATER("$1,$2 ", "Block List"),
+    /*
      * Biome
      */
 
     NEED_BIOME("$2You need to specify a valid biome.", "Biome"), BIOME_SET_TO(
-        "$2Plot biome set to $2", "Biome"), /*
+        "$2Plot biome set to $2", "Biome"),
+    /*
      * Teleport / Entry
      */
 
@@ -616,7 +623,8 @@ public enum Captions {
         "$2You got teleported to the road", "Teleport"),
 
     TELEPORT_IN_SECONDS("$1Teleporting in %s seconds. Do not move...", "Teleport"), TELEPORT_FAILED(
-        "$2Teleportation cancelled due to movement or damage", "Teleport"), /*
+        "$2Teleportation cancelled due to movement or damage", "Teleport"),
+    /*
      * Set Block
      */
 
@@ -626,13 +634,16 @@ public enum Captions {
     AllowUnsafe
      */
     DEBUGALLOWUNSAFE_ON("$2Unsafe actions allowed", "unsafe"), DEBUGALLOWUNSAFE_OFF(
-        "$2Unsafe actions disabled", "unsafe"), /*
+        "$2Unsafe actions disabled", "unsafe"),
+    /*
      * Debug
      */
 
     DEBUG_HEADER("$1Debug Information&-", "Debug"), DEBUG_SECTION("$2>> $1&l%val%", "Debug"),
 
-    DEBUG_LINE("$2>> $1%var%$2:$1 %val%&-", "Debug"), /*
+    DEBUG_LINE("$2>> $1%var%$2:$1 %val%&-", "Debug"),
+
+    /*
      * Invalid
      */
 
@@ -651,29 +662,24 @@ public enum Captions {
     PLAYER_HAS_NOT_BEEN_ON("$2That player hasn't been in the plotworld", "Invalid"), FOUND_NO_PLOTS(
         "$2Found no plots with your search query", "Invalid"),
 
-    FOUND_NO_PLOTS_FOR_PLAYER("$2No plots found for player: %s", "Invalid"), /*
-     * Camera
-     */
-
-    CAMERA_STARTED("$2You have entered camera mode for plot $1%s", "Camera"), CAMERA_STOPPED(
-        "$2You are no longer in camera mode", "Camera"), /*
+    FOUND_NO_PLOTS_FOR_PLAYER("$2No plots found for player: %s", "Invalid"),
+    /*
      * Need
      */
-
     NEED_PLOT_NUMBER("$2You've got to specify a plot number or alias", "Need"), NEED_BLOCK(
         "$2You've got to specify a block", "Need"),
 
     NEED_PLOT_ID("$2You've got to specify a plot id.", "Need"), NEED_PLOT_WORLD(
         "$2You've got to specify a plot area.", "Need"),
 
-    NEED_USER("$2You need to specify a username", "Need"), /*
+    NEED_USER("$2You need to specify a username", "Need"),
+    /*
      * Near
      */
-
-    PLOT_NEAR("$1Players: %s0", "Near"), /*
+    PLOT_NEAR("$1Players: %s0", "Near"),
+    /*
      * Info
      */
-
     NONE("None", "Info"), NOW("Now", "Info"),
 
     NEVER("Never", "Info"), UNKNOWN("Unknown", "Info"),
@@ -709,25 +715,29 @@ public enum Captions {
 
     PLOT_INFO_SEEN("$1Seen:$2 %seen%", "Info"), PLOT_USER_LIST(" $1%user%$2,", "Info"),
 
-    PLOT_FLAG_LIST("$1%s0:%s1$2", "Info"), INFO_SYNTAX_CONSOLE("$2/plot info X;Y", "Info"), /*
+    PLOT_FLAG_LIST("$1%s0:%s1$2", "Info"), INFO_SYNTAX_CONSOLE("$2/plot info X;Y", "Info"),
+    /*
      * Generating
      */
 
-    GENERATING_COMPONENT("$1Started generating component from your settings", "Working"), /*
+    GENERATING_COMPONENT("$1Started generating component from your settings", "Working"),
+    /*
      * Clearing
      */
 
     CLEARING_PLOT("$2Clearing plot async.", "Working"), CLEARING_DONE(
         "$4Clear completed! Took %sms.", "Working"),
 
-    DELETING_DONE("$4Delete completed! Took %sms.", "Working"), /*
+    DELETING_DONE("$4Delete completed! Took %sms.", "Working"),
+    /*
      * Claiming
      */
 
     PLOT_NOT_CLAIMED("$2Plot not claimed", "Working"), PLOT_IS_CLAIMED(
         "$2This plot is already claimed", "Working"),
 
-    CLAIMED("$4You successfully claimed the plot", "Working"), /*
+    CLAIMED("$4You successfully claimed the plot", "Working"),
+    /*
      * List
      */
 
@@ -742,17 +752,20 @@ public enum Captions {
         "$2>> $1%id$2:$1%world $2- $1%owner", "List"),
 
     PLOT_LIST_ITEM_ORDERED("$2[$1%in$2] >> $1%id$2:$1%world $2- $1%owner",
-        "List"), PLOT_LIST_FOOTER("$2>> $1%word% a total of $2%num% $1claimed %plot%.", "List"), /*
+        "List"), PLOT_LIST_FOOTER("$2>> $1%word% a total of $2%num% $1claimed %plot%.", "List"),
+    /*
      * Left
      */
 
-    LEFT_PLOT("$2You left a plot", "Left"), /*
+    LEFT_PLOT("$2You left a plot", "Left"),
+    /*
      * Wait
      */
 
     WAIT_FOR_TIMER(
         "$2A setblock timer is bound to either the current plot or you. Please wait for it to finish",
-        "Errors"), /*
+        "Errors"),
+    /*
      * Chat
      */
 
@@ -762,7 +775,8 @@ public enum Captions {
     PLOT_CHAT_FORCED("$2This world forces everyone to use plot chat.", "Chat"), PLOT_CHAT_ON(
         "$4Plot chat enabled.", "Chat"),
 
-    PLOT_CHAT_OFF("$4Plot chat disabled.", "Chat"), /*
+    PLOT_CHAT_OFF("$4Plot chat disabled.", "Chat"),
+    /*
      * Denied
      */
 
@@ -775,16 +789,19 @@ public enum Captions {
 
     YOU_GOT_DENIED(
         "$4You are denied from the plot you were previously on, and got teleported to spawn",
-        "Deny"), /*
+        "Deny"),
+    /*
      * Kick
      */
 
-    YOU_GOT_KICKED("$4You got kicked!", "Kick"), /*
+    YOU_GOT_KICKED("$4You got kicked!", "Kick"),
+    /*
      * Rain
      */
 
     NEED_ON_OFF("$2You need to specify a value. Possible values: $1on$2, $1off",
-        "Rain"), SETTING_UPDATED("$4You successfully updated the setting", "Rain"), /*
+        "Rain"), SETTING_UPDATED("$4You successfully updated the setting", "Rain"),
+    /*
      * Flag
      */
 
@@ -802,7 +819,8 @@ public enum Captions {
         "$4Successfully removed flag", "Flag"),
 
     FLAG_ADDED("$4Successfully added flag", "Flag"), FLAG_TUTORIAL_USAGE(
-        "$1Have an admin set the flag: $2%s", "CommandConfig"), /*
+        "$1Have an admin set the flag: $2%s", "CommandConfig"),
+    /*
      * Trusted
      */
 
@@ -811,7 +829,8 @@ public enum Captions {
 
     WAS_NOT_ADDED("$2That player was not trusted on this plot", "Trusted"), PLOT_REMOVED_USER(
         "$1Plot %s of which you were added to has been deleted due to owner inactivity",
-        "Trusted"), /*
+        "Trusted"),
+    /*
      * Member
      */
 
@@ -825,20 +844,23 @@ public enum Captions {
         "Member"), MEMBER_WAS_NOT_ADDED("$2That player was not added as a user on this plot",
         "Member"),
 
-    PLOT_MAX_MEMBERS("$2You are not allowed to add any more players to this plot", "Member"), /*
+    PLOT_MAX_MEMBERS("$2You are not allowed to add any more players to this plot", "Member"),
+    /*
      * Set Owner
      */
 
     SET_OWNER("$4You successfully set the plot owner", "Owner"), SET_OWNER_CANCELLED(
         "$2The setowner action was cancelled", "Owner"),
 
-    NOW_OWNER("$4You are now owner of plot %s", "Owner"), /*
+    NOW_OWNER("$4You are now owner of plot %s", "Owner"),
+    /*
      * Signs
      */
 
     OWNER_SIGN_LINE_1("$1ID: $1%id%", "Signs"), OWNER_SIGN_LINE_2("$1Owner:", "Signs"),
 
-    OWNER_SIGN_LINE_3("$2%plr%", "Signs"), OWNER_SIGN_LINE_4("$3Claimed", "Signs"), /*
+    OWNER_SIGN_LINE_3("$2%plr%", "Signs"), OWNER_SIGN_LINE_4("$3Claimed", "Signs"),
+    /*
      * Help
      */
 
@@ -871,14 +893,16 @@ public enum Captions {
      * Direction
      */
 
-    DIRECTION("$1Current direction: %dir%", "Help"), /*
+    DIRECTION("$1Current direction: %dir%", "Help"),
+    /*
      * Grant
      */
 
     GRANTED_PLOTS("$1Result: $2%s $1grants left", "Grants"), GRANTED_PLOT(
         "$1You granted %s0 plot to $2%s1", "Grants"),
 
-    GRANTED_PLOT_FAILED("$1Grant failed: $2%s", "Grants"), /*
+    GRANTED_PLOT_FAILED("$1Grant failed: $2%s", "Grants"),
+    /*
      * Custom
      */
 

From a841b4ea86c74e41725a19ebc2a1d1660668f5fa Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 10 May 2019 22:42:07 -0400
Subject: [PATCH 171/210] Titles are now exclusive to paper servers

---
 Bukkit/build.gradle                           |  8 +++--
 .../plotsquared/bukkit/BukkitMain.java        | 36 ++++++++-----------
 .../bukkit/titles/DefaultTitle.java           |  8 ++---
 .../plotsquared/plot/config/Settings.java     |  4 +--
 4 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index f9998521f..2a6b17d65 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -1,17 +1,19 @@
 repositories {
     maven { url "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
-    maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url "http://nexus.hc.to/content/repositories/pub_releases" }
-    maven { url = "https://repo.codemc.org/repository/maven-public" }
+    maven { url "https://repo.codemc.org/repository/maven-public" }
     maven { url 'http://repo.onarandombox.com/content/groups/public'}
+    maven { url 'https://papermc.io/repo/repository/maven-public/' }
     mavenLocal()
 }
 
 dependencies {
     implementation project(':Core')
     compile project(':Core')
+    compile 'com.destroystokyo.paper:paper-api:1.14-R0.1-SNAPSHOT'
     implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
-    implementation 'org.spigotmc:spigot-api:1.14-pre5-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.14-R0.1-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 8a4574a0d..42e9ff489 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -132,8 +132,10 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
     @Override public void onEnable() {
         if (PlotSquared.get().IMP.getServerVersion()[1] < 13) {
-            PlotSquared.log("You can't use this version of PlotSquared on a server less than Minecraft 1.13.2.");
-            PlotSquared.log("Please check the download page for the link to the legacy versions.");
+            System.out.println(
+                "You can't use this version of PlotSquared on a server less than Minecraft 1.13.2.");
+            System.out
+                .println("Please check the download page for the link to the legacy versions.");
             Bukkit.shutdown();
             return;
         }
@@ -152,7 +154,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             System.out.println("[P2] DOWNLOAD: https://papermc.io/downloads");
             System.out.println("[P2] GUIDE: https://www.spigotmc.org/threads/21726/");
             System.out.println("[P2] NOTE: This is only a recommendation");
-            System.out.println("[P2]       both Spigot and CraftBukkit are still supported.");
+            System.out.println("[P2]       both Spigot and CraftBukkit are still supported (excluding titles).");
             System.out
                 .println("[P2] ===============================================================");
         }
@@ -705,12 +707,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override public UUIDHandlerImplementation initUUIDHandler() {
-        boolean checkVersion = false;
-        try {
-            OfflinePlayer.class.getDeclaredMethod("getUniqueId");
-            checkVersion = true;
-        } catch (Throwable ignore) {
-        }
         final UUIDWrapper wrapper;
         if (Settings.UUID.OFFLINE) {
             if (Settings.UUID.FORCE_LOWERCASE) {
@@ -719,23 +715,15 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                 wrapper = new OfflineUUIDWrapper();
             }
             Settings.UUID.OFFLINE = true;
-        } else if (checkVersion) {
+        } else {
             wrapper = new DefaultUUIDWrapper();
             Settings.UUID.OFFLINE = false;
-        } else {
-            if (Settings.UUID.FORCE_LOWERCASE) {
-                wrapper = new LowerOfflineUUIDWrapper();
-            } else {
-                wrapper = new OfflineUUIDWrapper();
-            }
-            Settings.UUID.OFFLINE = true;
         }
-        if (!checkVersion) {
+        if (Bukkit.getVersion().contains("git-Spigot")) {
             PlotSquared.log(Captions.PREFIX
-                + " &c[WARN] Titles are disabled - please update your version of Bukkit to support this feature.");
+                + " &c[WARN] Titles are Paper only feature. Titles will be disabled.");
             Settings.TITLES = false;
         } else {
-            AbstractTitle.TITLE_CLASS = new DefaultTitle();
             if (wrapper instanceof DefaultUUIDWrapper
                 || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
                 Settings.UUID.NATIVE_UUID_PROVIDER = true;
@@ -798,8 +786,14 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override public AbstractTitle initTitleManager() {
+        if (Bukkit.getVersion().contains("git-Spigot")) {
+            PlotSquared.log(Captions.PREFIX
+                + " &c[WARN] Titles are Paper only feature. Titles will be disabled.");
+            Settings.TITLES = false;
+            return null;
+        }
         // Already initialized in UUID handler
-        return AbstractTitle.TITLE_CLASS;
+        return new DefaultTitle();
     }
 
     @Override @Nullable public PlotPlayer wrapPlayer(final Object player) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
index 626525ccf..0ec4a2c1f 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
@@ -3,17 +3,17 @@ package com.github.intellectualsites.plotsquared.bukkit.titles;
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class DefaultTitle extends AbstractTitle {
 
   @Override
   public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
-    try {
+    //Titles are now a Paper Exclusive feature.
+    if (Bukkit.getVersion().contains("git-Paper")) {
       final Player playerObj = ((BukkitPlayer) player).player;
-      TitleManager_1_11 title = new TitleManager_1_11(head, sub, in, delay, out);
-      title.send(playerObj);
-    } catch (Throwable ignored) {
+      playerObj.sendTitle(head, sub, in, delay, out);
     }
   }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 3c492583c..1743f1755 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -27,9 +27,9 @@ public class Settings extends Config {
     @Final public static String PLATFORM; // These values are set from P2 before loading
 
     @Comment("Show additional information in console") public static boolean DEBUG = true;
-    @Comment({"The big annoying text that appears when you enter a plot",
+    @Comment({"[PAPER ONLY] The big annoying text that appears when you enter a plot",
         "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"})
-    public static boolean TITLES = true;
+    public static boolean TITLES = false;
 
     @Create // This value will be generated automatically
     public static ConfigBlock<Auto_Clear> AUTO_CLEAR = null;

From 0d67c174aa882baf790940afc4a531d0575213ef Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 10 May 2019 23:00:11 -0400
Subject: [PATCH 172/210] Fix compatibility with 1.13 and 1.14

---
 .../bukkit/listeners/ChunkListener.java       |   4 +-
 .../bukkit/listeners/PlayerEvents.java        | 111 ++----------------
 2 files changed, 14 insertions(+), 101 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
index d15f167b9..c55e4f440 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java
@@ -148,8 +148,8 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
         if (ignoreUnload) {
             return;
         }
+        Chunk chunk = event.getChunk();
         if (Settings.Chunk_Processor.AUTO_TRIM) {
-            Chunk chunk = event.getChunk();
             String world = chunk.getWorld().getName();
             if (PlotSquared.get().hasPlotArea(world)) {
                 if (unloadChunk(world, chunk, true)) {
@@ -158,7 +158,7 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
             }
         }
         if (processChunk(event.getChunk(), true)) {
-            event.setCancelled(true);
+            chunk.setForceLoaded(true);
         }
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index de3fd6dab..7a22be0fb 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -10,36 +10,8 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.listener.PlayerBlockEventType;
 import com.github.intellectualsites.plotsquared.plot.listener.PlotListener;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.object.PlotHandler;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.PlotInventory;
-import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
-import com.github.intellectualsites.plotsquared.plot.util.EntityUtil;
-import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.MathMan;
-import com.github.intellectualsites.plotsquared.plot.util.Permissions;
-import com.github.intellectualsites.plotsquared.plot.util.RegExUtil;
-import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
-import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
-import com.github.intellectualsites.plotsquared.plot.util.UpdateUtility;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.regex.Pattern;
+import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.util.*;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.FluidCollisionMode;
@@ -50,82 +22,18 @@ import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.entity.Ageable;
-import org.bukkit.entity.Animals;
-import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Creature;
-import org.bukkit.entity.EnderDragon;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Fireball;
-import org.bukkit.entity.Hanging;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.ItemFrame;
-import org.bukkit.entity.LingeringPotion;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.ThrownPotion;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.entity.Villager;
-import org.bukkit.entity.WaterMob;
+import org.bukkit.entity.*;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockDispenseEvent;
-import org.bukkit.event.block.BlockExplodeEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.BlockRedstoneEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.EntityBlockFormEvent;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.EntityChangeBlockEvent;
-import org.bukkit.event.entity.EntityCombustByEntityEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.LingeringPotionSplashEvent;
-import org.bukkit.event.entity.PotionSplashEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.event.entity.ProjectileLaunchEvent;
+import org.bukkit.event.block.*;
+import org.bukkit.event.entity.*;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.event.hanging.HangingPlaceEvent;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerEggThrowEvent;
-import org.bukkit.event.player.PlayerEvent;
-import org.bukkit.event.player.PlayerInteractAtEntityEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.event.vehicle.VehicleCreateEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.vehicle.VehicleEntityCollisionEvent;
@@ -143,6 +51,11 @@ import org.bukkit.projectiles.BlockProjectileSource;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 
+import java.lang.reflect.Field;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.regex.Pattern;
+
 /**
  * Player Events involving plots.
  */
@@ -1795,7 +1708,7 @@ import org.bukkit.util.Vector;
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPotionSplash(LingeringPotionSplashEvent event) {
-        LingeringPotion entity = event.getEntity();
+        Projectile entity = event.getEntity();
         Location location = BukkitUtil.getLocation(entity);
         if (!PlotSquared.get().hasPlotArea(location.getWorld())) {
             return;

From 4522d98934ccd9481bbf57ed1430c6ddd4d1bbaf Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sat, 11 May 2019 14:31:13 +0100
Subject: [PATCH 173/210] Don't force metrics. Forcing metrics is against the
 precedent for all major Spigot plugins

---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 42e9ff489..580aca74d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -193,7 +193,11 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             getLogger().warning("Update checking disabled. Skipping.");
         }
 
-        this.startMetrics();
+        if (Settings.Enabled_Components.METRICS) {
+            this.startMetrics();
+        } else {
+            PlotSquared.log(Captions.CONSOLE_PLEASE_ENABLE_METRICS.f(getPluginName()));
+        }
         if (Settings.Enabled_Components.WORLDS) {
             TaskManager.IMP.taskRepeat(this::unload, 20);
             try {

From 728082723c3f40633ba8195bc459dec4d053d192 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 12 May 2019 12:53:25 +0100
Subject: [PATCH 174/210] Revert "Don't force metrics. Forcing metrics is
 against the precedent for all major Spigot plugins"

This reverts commit 4522d98934ccd9481bbf57ed1430c6ddd4d1bbaf.
---
 .../intellectualsites/plotsquared/bukkit/BukkitMain.java    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 580aca74d..42e9ff489 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -193,11 +193,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             getLogger().warning("Update checking disabled. Skipping.");
         }
 
-        if (Settings.Enabled_Components.METRICS) {
-            this.startMetrics();
-        } else {
-            PlotSquared.log(Captions.CONSOLE_PLEASE_ENABLE_METRICS.f(getPluginName()));
-        }
+        this.startMetrics();
         if (Settings.Enabled_Components.WORLDS) {
             TaskManager.IMP.taskRepeat(this::unload, 20);
             try {

From 4daf1c7721c86db10f77aef4f1258045b6ccba4e Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 13 May 2019 15:56:28 -0400
Subject: [PATCH 175/210] Fixes #2355

---
 .../plotsquared/bukkit/BukkitMain.java          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 42e9ff489..986b2d4a4 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -131,14 +131,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override public void onEnable() {
-        if (PlotSquared.get().IMP.getServerVersion()[1] < 13) {
-            System.out.println(
-                "You can't use this version of PlotSquared on a server less than Minecraft 1.13.2.");
-            System.out
-                .println("Please check the download page for the link to the legacy versions.");
-            Bukkit.shutdown();
-            return;
-        }
         this.pluginName = getDescription().getName();
         PlotPlayer.registerConverter(Player.class, BukkitUtil::getPlayer);
 
@@ -161,6 +153,15 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
 
         new PlotSquared(this, "Bukkit");
 
+        if (PlotSquared.get().IMP.getServerVersion()[1] < 13) {
+            System.out.println(
+                "You can't use this version of PlotSquared on a server less than Minecraft 1.13.2.");
+            System.out
+                .println("Please check the download page for the link to the legacy versions.");
+            Bukkit.shutdown();
+            return;
+        }
+
         // Check for updates
         if (PlotSquared.get().getUpdateUtility() != null) {
             final UpdateUtility updateUtility = PlotSquared.get().getUpdateUtility();

From adefe2eeef6cae2a0ae4b1780da84325d4e756e2 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 13 May 2019 18:20:58 -0400
Subject: [PATCH 176/210] Titles can be used on Spigot and Paper now

---
 .../plotsquared/bukkit/BukkitMain.java            | 15 ++-------------
 .../plotsquared/bukkit/titles/DefaultTitle.java   |  8 ++------
 .../plotsquared/plot/config/Settings.java         |  4 ++--
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 986b2d4a4..94f6adcb7 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -146,7 +146,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             System.out.println("[P2] DOWNLOAD: https://papermc.io/downloads");
             System.out.println("[P2] GUIDE: https://www.spigotmc.org/threads/21726/");
             System.out.println("[P2] NOTE: This is only a recommendation");
-            System.out.println("[P2]       both Spigot and CraftBukkit are still supported (excluding titles).");
+            System.out.println("[P2]       both Spigot and CraftBukkit are still supported.");
             System.out
                 .println("[P2] ===============================================================");
         }
@@ -720,11 +720,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             wrapper = new DefaultUUIDWrapper();
             Settings.UUID.OFFLINE = false;
         }
-        if (Bukkit.getVersion().contains("git-Spigot")) {
-            PlotSquared.log(Captions.PREFIX
-                + " &c[WARN] Titles are Paper only feature. Titles will be disabled.");
-            Settings.TITLES = false;
-        } else {
+        if (!Bukkit.getVersion().contains("git-Spigot")) {
             if (wrapper instanceof DefaultUUIDWrapper
                 || wrapper.getClass() == OfflineUUIDWrapper.class && !Bukkit.getOnlineMode()) {
                 Settings.UUID.NATIVE_UUID_PROVIDER = true;
@@ -787,13 +783,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override public AbstractTitle initTitleManager() {
-        if (Bukkit.getVersion().contains("git-Spigot")) {
-            PlotSquared.log(Captions.PREFIX
-                + " &c[WARN] Titles are Paper only feature. Titles will be disabled.");
-            Settings.TITLES = false;
-            return null;
-        }
-        // Already initialized in UUID handler
         return new DefaultTitle();
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
index 0ec4a2c1f..e91f8bcae 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
@@ -3,17 +3,13 @@ package com.github.intellectualsites.plotsquared.bukkit.titles;
 import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class DefaultTitle extends AbstractTitle {
 
   @Override
   public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
-    //Titles are now a Paper Exclusive feature.
-    if (Bukkit.getVersion().contains("git-Paper")) {
-      final Player playerObj = ((BukkitPlayer) player).player;
-      playerObj.sendTitle(head, sub, in, delay, out);
-    }
+    final Player playerObj = ((BukkitPlayer) player).player;
+    playerObj.sendTitle(head, sub, in, delay, out);
   }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
index 1743f1755..3c492583c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java
@@ -27,9 +27,9 @@ public class Settings extends Config {
     @Final public static String PLATFORM; // These values are set from P2 before loading
 
     @Comment("Show additional information in console") public static boolean DEBUG = true;
-    @Comment({"[PAPER ONLY] The big annoying text that appears when you enter a plot",
+    @Comment({"The big annoying text that appears when you enter a plot",
         "For a single plot: `/plot flag set titles false`", "For just you: `/plot toggle titles`"})
-    public static boolean TITLES = false;
+    public static boolean TITLES = true;
 
     @Create // This value will be generated automatically
     public static ConfigBlock<Auto_Clear> AUTO_CLEAR = null;

From 84911c1a8cdd417180a4bbeb22a952d986cf6c34 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 13 May 2019 18:22:17 -0400
Subject: [PATCH 177/210] Remove unused title classes

---
 .../bukkit/titles/DefaultTitleManager.java    | 127 -----
 .../bukkit/titles/TitleManager.java           | 256 ---------
 .../bukkit/titles/TitleManager_1_11.java      | 505 ------------------
 3 files changed, 888 deletions(-)
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
deleted file mode 100644
index 10eef5753..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitleManager.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import com.github.intellectualsites.plotsquared.bukkit.chat.Reflection;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
-public class DefaultTitleManager extends TitleManager {
-
-  /**
-   * Create a new 1.8 title.
-   *
-   * @param title       Title text
-   * @param subtitle    Subtitle text
-   * @param fadeInTime  Fade in time
-   * @param stayTime    Stay on screen time
-   * @param fadeOutTime Fade out time
-   */
-  DefaultTitleManager(String title, String subtitle, int fadeInTime, int stayTime,
-      int fadeOutTime) {
-    super(title, subtitle, fadeInTime, stayTime, fadeOutTime);
-  }
-
-  /**
-   * Load spigot and NMS classes.
-   */
-  @Override void loadClasses() {
-    this.packetTitle = Reflection.getNMSClass("PacketPlayOutTitle");
-    this.packetActions = Reflection.getNMSClass("EnumTitleAction");
-    this.chatBaseComponent = Reflection.getNMSClass("IChatBaseComponent");
-    this.nmsChatSerializer = Reflection.getNMSClass("ChatSerializer");
-  }
-
-  @Override public void send(Player player)
-      throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-    if (this.packetTitle != null) {
-      // First reset previous settings
-      resetTitle(player);
-      // Send timings first
-      Object handle = getHandle(player);
-      Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-      Object[] actions = this.packetActions.getEnumConstants();
-      Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-      Object packet = this.packetTitle
-          .getConstructor(this.packetActions, this.chatBaseComponent, Integer.TYPE, Integer.TYPE,
-              Integer.TYPE).newInstance(actions[2], null, this.fadeInTime * (this.ticks ? 1 : 20),
-              this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
-      // Send if set
-      if (this.fadeInTime != -1 && this.fadeOutTime != -1 && this.stayTime != -1) {
-        sendPacket.invoke(connection, packet);
-      }
-      // Send title
-      Object serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
-          "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getTitle()) + "\",color:"
-              + this.titleColor.name().toLowerCase() + '}');
-      packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-          .newInstance(actions[0], serialized);
-      sendPacket.invoke(connection, packet);
-      if (!this.getSubtitle().isEmpty()) {
-        // Send subtitle if present
-        serialized = getMethod(this.nmsChatSerializer, "a", String.class).invoke(null,
-            "{text:\"" + ChatColor.translateAlternateColorCodes('&', this.getSubtitle())
-                + "\",color:" + this.subtitleColor.name().toLowerCase() + '}');
-        packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-            .newInstance(actions[1], serialized);
-        sendPacket.invoke(connection, packet);
-      }
-    }
-  }
-
-  @Override public void clearTitle(Player player)
-      throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-    // Send timings first
-    Object handle = getHandle(player);
-    Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-    Object[] actions = this.packetActions.getEnumConstants();
-    Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-    Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-        .newInstance(actions[3], null);
-    sendPacket.invoke(connection, packet);
-  }
-
-  /**
-   * Reset the title settings.
-   *
-   * @param player Player
-   * @throws SecurityException
-   * @throws ReflectiveOperationException
-   * @throws SecurityException
-   */
-  @Override public void resetTitle(Player player)
-      throws IllegalArgumentException, ReflectiveOperationException, SecurityException {
-    // Send timings first
-    Object handle = getHandle(player);
-    Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-    Object[] actions = this.packetActions.getEnumConstants();
-    Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-    Object packet = this.packetTitle.getConstructor(this.packetActions, this.chatBaseComponent)
-        .newInstance(actions[4], null);
-    sendPacket.invoke(connection, packet);
-  }
-
-  Field getField(Class<?> clazz, String name) {
-    try {
-      Field field = clazz.getDeclaredField(name);
-      field.setAccessible(true);
-      return field;
-    } catch (NoSuchFieldException | SecurityException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-    for (Method m : clazz.getMethods()) {
-      if (m.getName().equals(name) && (args.length == 0 || classListEqual(args,
-          m.getParameterTypes()))) {
-        m.setAccessible(true);
-        return m;
-      }
-    }
-    return null;
-  }
-
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
deleted file mode 100644
index 4b1d4349f..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class TitleManager {
-
-  private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
-  /* Title packet */ Class<?> packetTitle;
-  /* Title packet actions ENUM */ Class<?> packetActions;
-  /* Chat serializer */ Class<?> nmsChatSerializer;
-  Class<?> chatBaseComponent;
-  ChatColor titleColor = ChatColor.WHITE;
-  ChatColor subtitleColor = ChatColor.WHITE;
-  /* Title timings */ int fadeInTime = -1;
-  int stayTime = -1;
-  int fadeOutTime = -1;
-  boolean ticks = false;
-  /* Title text and color */
-  private String title;
-  /* Subtitle text and color */
-  private String subtitle;
-
-  /**
-   * Create a new 1.8 title.
-   *
-   * @param title       Title text
-   * @param subtitle    Subtitle text
-   * @param fadeInTime  Fade in time
-   * @param stayTime    Stay on screen time
-   * @param fadeOutTime Fade out time
-   */
-  TitleManager(String title, String subtitle, int fadeInTime, int stayTime, int fadeOutTime) {
-    this.title = title;
-    this.subtitle = subtitle;
-    this.fadeInTime = fadeInTime;
-    this.stayTime = stayTime;
-    this.fadeOutTime = fadeOutTime;
-    loadClasses();
-  }
-
-  abstract void loadClasses();
-
-  /**
-   * Gets title text.
-   *
-   * @return Title text
-   */
-  public final String getTitle() {
-    return this.title;
-  }
-
-  /**
-   * Sets the text for the title.
-   *
-   * @param title Title
-   */
-  public final void setTitle(String title) {
-    this.title = title;
-  }
-
-  /**
-   * Gets the subtitle text.
-   *
-   * @return Subtitle text
-   */
-  public final String getSubtitle() {
-    return this.subtitle;
-  }
-
-  /**
-   * Sets subtitle text.
-   *
-   * @param subtitle Subtitle text
-   */
-  public final void setSubtitle(String subtitle) {
-    this.subtitle = subtitle;
-  }
-
-  /**
-   * Sets the title color.
-   *
-   * @param color Chat color
-   */
-  public final void setTitleColor(ChatColor color) {
-    this.titleColor = color;
-  }
-
-  /**
-   * Sets the subtitle color.
-   *
-   * @param color Chat color
-   */
-  public final void setSubtitleColor(ChatColor color) {
-    this.subtitleColor = color;
-  }
-
-  /**
-   * Sets title fade in time.
-   *
-   * @param time Time
-   */
-  public final void setFadeInTime(int time) {
-    this.fadeInTime = time;
-  }
-
-  /**
-   * Sets title fade out time.
-   *
-   * @param time Time
-   */
-  public final void setFadeOutTime(int time) {
-    this.fadeOutTime = time;
-  }
-
-  /**
-   * Sets title stay time.
-   *
-   * @param time Time
-   */
-  public final void setStayTime(int time) {
-    this.stayTime = time;
-  }
-
-  /**
-   * Sets timings to ticks.
-   */
-  public final void setTimingsToTicks() {
-    this.ticks = true;
-  }
-
-  /**
-   * Sets timings to seconds.
-   */
-  public final void setTimingsToSeconds() {
-    this.ticks = false;
-  }
-
-  /**
-   * Sends the title to a player.
-   *
-   * @param player Player
-   * @throws IllegalArgumentException
-   * @throws ReflectiveOperationException
-   * @throws SecurityException
-   */
-  public abstract void send(Player player)
-      throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
-
-  /**
-   * Broadcasts the title to all players.
-   *
-   * @throws Exception
-   */
-  public final void broadcast() throws Exception {
-    for (Player player : Bukkit.getOnlinePlayers()) {
-      send(player);
-    }
-  }
-
-  /**
-   * Clears the title.
-   *
-   * @param player Player
-   * @throws IllegalArgumentException
-   * @throws ReflectiveOperationException
-   * @throws SecurityException
-   */
-  public abstract void clearTitle(Player player)
-      throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
-
-  /**
-   * Resets the title settings.
-   *
-   * @param player Player
-   * @throws IllegalArgumentException
-   * @throws ReflectiveOperationException
-   * @throws SecurityException
-   */
-  public abstract void resetTitle(Player player)
-      throws IllegalArgumentException, ReflectiveOperationException, SecurityException;
-
-  private Class<?> getPrimitiveType(Class<?> clazz) {
-    if (CORRESPONDING_TYPES.containsKey(clazz)) {
-      return CORRESPONDING_TYPES.get(clazz);
-    } else {
-      return clazz;
-    }
-  }
-
-  private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
-    int a;
-    if (classes != null) {
-      a = classes.length;
-    } else {
-      a = 0;
-    }
-    Class<?>[] types = new Class<?>[a];
-    for (int i = 0; i < a; i++) {
-      types[i] = getPrimitiveType(classes[i]);
-    }
-    return types;
-  }
-
-  final Object getHandle(Object obj) {
-    try {
-      return getMethod("getHandle", obj.getClass()).invoke(obj);
-    } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  final Method getMethod(String name, Class<?> clazz, Class<?>... paramTypes) {
-    Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-    for (Method m : clazz.getMethods()) {
-      Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-      if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-        return m;
-      }
-    }
-    return null;
-  }
-
-  private boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
-    if (a.length != o.length) {
-      return false;
-    }
-    for (int i = 0; i < a.length; i++) {
-      if (!a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  boolean classListEqual(Class<?>[] l1, Class<?>[] l2) {
-    if (l1.length != l2.length) {
-      return false;
-    }
-    boolean equal = true;
-    for (int i = 0; i < l1.length; i++) {
-      if (l1[i] != l2[i]) {
-        equal = false;
-        break;
-      }
-    }
-    return equal;
-  }
-}
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
deleted file mode 100644
index 627a48157..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/TitleManager_1_11.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.stream.IntStream;
-
-/**
- * Minecraft 1.8 Title
- * For 1.11
- *
- * @author Maxim Van de Wynckel
- * @version 1.1.0
- */
-public class TitleManager_1_11 {
-  private static final Map<Class<?>, Class<?>> CORRESPONDING_TYPES = new HashMap<>();
-  /* Title packet */
-  private static Class<?> packetTitle;
-  /* Title packet actions ENUM */
-  private static Class<?> packetActions;
-  /* Chat serializer */
-  private static Class<?> nmsChatSerializer;
-  private static Class<?> chatBaseComponent;
-  /* NMS player and connection */
-  private static Class<?> nmsPlayer;
-  private static Class<?> nmsPlayerConnection;
-  private static Field playerConnection;
-  private static Method sendPacket;
-  private static Class<?> obcPlayer;
-  private static Method methodPlayerGetHandle;
-  /* Title text and color */
-  private String title = "";
-  private ChatColor titleColor = ChatColor.WHITE;
-  /* Subtitle text and color */
-  private String subtitle = "";
-  private ChatColor subtitleColor = ChatColor.WHITE;
-  /* Title timings */
-  private int fadeInTime = -1;
-  private int stayTime = -1;
-  private int fadeOutTime = -1;
-  private boolean ticks = false;
-
-  public TitleManager_1_11() {
-    loadClasses();
-  }
-
-  /**
-   * Create a new 1.8 title.
-   *
-   * @param title Title
-   */
-  public TitleManager_1_11(String title) {
-    this.title = title;
-    loadClasses();
-  }
-
-  /**
-   * Create a new 1.8 title
-   *
-   * @param title    Title text
-   * @param subtitle Subtitle text
-   */
-  public TitleManager_1_11(String title, String subtitle) {
-    this.title = title;
-    this.subtitle = subtitle;
-    loadClasses();
-  }
-
-  /**
-   * Copy 1.8 title.
-   *
-   * @param title Title
-   */
-  public TitleManager_1_11(TitleManager_1_11 title) {
-    // Copy title
-    this.title = title.getTitle();
-    this.subtitle = title.getSubtitle();
-    this.titleColor = title.getTitleColor();
-    this.subtitleColor = title.getSubtitleColor();
-    this.fadeInTime = title.getFadeInTime();
-    this.fadeOutTime = title.getFadeOutTime();
-    this.stayTime = title.getStayTime();
-    this.ticks = title.isTicks();
-    loadClasses();
-  }
-
-  /**
-   * Create a new 1.8 title.
-   *
-   * @param title       Title text
-   * @param subtitle    Subtitle text
-   * @param fadeInTime  Fade in time
-   * @param stayTime    Stay on screen time
-   * @param fadeOutTime Fade out time
-   */
-  public TitleManager_1_11(String title, String subtitle, int fadeInTime, int stayTime,
-      int fadeOutTime) {
-    this.title = title;
-    this.subtitle = subtitle;
-    this.fadeInTime = fadeInTime;
-    this.stayTime = stayTime;
-    this.fadeOutTime = fadeOutTime;
-    loadClasses();
-  }
-
-  private static boolean equalsTypeArray(Class<?>[] a, Class<?>[] o) {
-    if (a.length != o.length) {
-      return false;
-    }
-    return IntStream.range(0, a.length)
-        .noneMatch(i -> !a[i].equals(o[i]) && !a[i].isAssignableFrom(o[i]));
-  }
-
-  /**
-   * Load spigot and NMS classes.
-   */
-  private void loadClasses() {
-    if (packetTitle == null) {
-      packetTitle = getNMSClass("PacketPlayOutTitle");
-      packetActions = getNMSClass("PacketPlayOutTitle$EnumTitleAction");
-      chatBaseComponent = getNMSClass("IChatBaseComponent");
-      nmsChatSerializer = getNMSClass("ChatComponentText");
-      nmsPlayer = getNMSClass("EntityPlayer");
-      nmsPlayerConnection = getNMSClass("PlayerConnection");
-      playerConnection = getField(nmsPlayer, "playerConnection");
-      sendPacket = getMethod(nmsPlayerConnection, "sendPacket");
-      obcPlayer = getOBCClass("entity.CraftPlayer");
-      methodPlayerGetHandle = getMethod("getHandle", obcPlayer);
-    }
-  }
-
-  /**
-   * Gets the title text.
-   *
-   * @return Title text
-   */
-  public String getTitle() {
-    return this.title;
-  }
-
-  /**
-   * Sets the title text.
-   *
-   * @param title Title
-   */
-  public void setTitle(String title) {
-    this.title = title;
-  }
-
-  /**
-   * Gets the subtitle text.
-   *
-   * @return Subtitle text
-   */
-  public String getSubtitle() {
-    return this.subtitle;
-  }
-
-  /**
-   * Sets the subtitle text.
-   *
-   * @param subtitle Subtitle text
-   */
-  public void setSubtitle(String subtitle) {
-    this.subtitle = subtitle;
-  }
-
-  /**
-   * Sets timings to ticks.
-   */
-  public void setTimingsToTicks() {
-    ticks = true;
-  }
-
-  /**
-   * Sets timings to seconds.
-   */
-  public void setTimingsToSeconds() {
-    ticks = false;
-  }
-
-  /**
-   * Sends the title to a player.
-   *
-   * @param player Player
-   */
-  public void send(Player player) {
-    if (packetTitle != null) {
-      // First reset previous settings
-      resetTitle(player);
-      try {
-        // Send timings first
-        Object handle = getHandle(player);
-        Object connection = playerConnection.get(handle);
-        Object[] actions = packetActions.getEnumConstants();
-        Object packet = packetTitle
-            .getConstructor(packetActions, chatBaseComponent, Integer.TYPE, Integer.TYPE,
-                Integer.TYPE).newInstance(actions[3], null, fadeInTime * (ticks ? 1 : 20),
-                stayTime * (ticks ? 1 : 20), fadeOutTime * (ticks ? 1 : 20));
-        // Send if set
-        if (fadeInTime != -1 && fadeOutTime != -1 && stayTime != -1) {
-          sendPacket.invoke(connection, packet);
-        }
-
-        Object serialized;
-        if (!subtitle.equals("")) {
-          // Send subtitle if present
-          serialized = nmsChatSerializer.getConstructor(String.class)
-              .newInstance(subtitleColor + ChatColor.translateAlternateColorCodes('&', subtitle));
-          packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-              .newInstance(actions[1], serialized);
-          sendPacket.invoke(connection, packet);
-        }
-
-        // Send title
-        serialized = nmsChatSerializer.getConstructor(String.class)
-            .newInstance(titleColor + ChatColor.translateAlternateColorCodes('&', title));
-        packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-            .newInstance(actions[0], serialized);
-        sendPacket.invoke(connection, packet);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public void updateTimes(Player player) {
-    if (TitleManager_1_11.packetTitle != null) {
-      try {
-        Object handle = getHandle(player);
-        Object connection = playerConnection.get(handle);
-        Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
-        Object packet = TitleManager_1_11.packetTitle.getConstructor(
-            new Class[] {TitleManager_1_11.packetActions, chatBaseComponent, Integer.TYPE,
-                Integer.TYPE, Integer.TYPE})
-            .newInstance(actions[3], null, this.fadeInTime * (this.ticks ? 1 : 20),
-                this.stayTime * (this.ticks ? 1 : 20), this.fadeOutTime * (this.ticks ? 1 : 20));
-        if ((this.fadeInTime != -1) && (this.fadeOutTime != -1) && (this.stayTime != -1)) {
-          sendPacket.invoke(connection, packet);
-        }
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public void updateTitle(Player player) {
-    if (TitleManager_1_11.packetTitle != null) {
-      try {
-        Object handle = getHandle(player);
-        Object connection = getField(handle.getClass(), "playerConnection").get(handle);
-        Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
-        Method sendPacket = getMethod(connection.getClass(), "sendPacket");
-        Object serialized = nmsChatSerializer.getConstructor(String.class)
-            .newInstance(titleColor + ChatColor.translateAlternateColorCodes('&', this.title));
-        Object packet = TitleManager_1_11.packetTitle
-            .getConstructor(new Class[] {TitleManager_1_11.packetActions, chatBaseComponent})
-            .newInstance(actions[0], serialized);
-        sendPacket.invoke(connection, packet);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public void updateSubtitle(Player player) {
-    if (TitleManager_1_11.packetTitle != null) {
-      try {
-        Object handle = getHandle(player);
-        Object connection = playerConnection.get(handle);
-        Object[] actions = TitleManager_1_11.packetActions.getEnumConstants();
-        Object serialized = nmsChatSerializer.getConstructor(String.class).newInstance(
-            subtitleColor + ChatColor.translateAlternateColorCodes('&', this.subtitle));
-        Object packet = TitleManager_1_11.packetTitle
-            .getConstructor(new Class[] {TitleManager_1_11.packetActions, chatBaseComponent})
-            .newInstance(actions[1], serialized);
-        sendPacket.invoke(connection, packet);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  /**
-   * Broadcasts the title to all players.
-   */
-  public void broadcast() {
-    for (Player p : Bukkit.getOnlinePlayers()) {
-      send(p);
-    }
-  }
-
-  /**
-   * Clears the title from the players screen.
-   *
-   * @param player Player
-   */
-  public void clearTitle(Player player) {
-    try {
-      // Send timings first
-      Object handle = getHandle(player);
-      Object connection = playerConnection.get(handle);
-      Object[] actions = packetActions.getEnumConstants();
-      Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-          .newInstance(actions[4], null);
-      sendPacket.invoke(connection, packet);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * Resets the title settings.
-   *
-   * @param player Player
-   */
-  public void resetTitle(Player player) {
-    try {
-      // Send timings first
-      Object handle = getHandle(player);
-      Object connection = playerConnection.get(handle);
-      Object[] actions = packetActions.getEnumConstants();
-      Object packet = packetTitle.getConstructor(packetActions, chatBaseComponent)
-          .newInstance(actions[5], null);
-      sendPacket.invoke(connection, packet);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  private Class<?> getPrimitiveType(Class<?> clazz) {
-    return CORRESPONDING_TYPES.containsKey(clazz) ? CORRESPONDING_TYPES.get(clazz) : clazz;
-  }
-
-  private Class<?>[] toPrimitiveTypeArray(Class<?>[] classes) {
-    int a = classes != null ? classes.length : 0;
-    Class<?>[] types = new Class<?>[a];
-    for (int i = 0; i < a; i++) {
-      types[i] = getPrimitiveType(classes[i]);
-    }
-    return types;
-  }
-
-  private Object getHandle(Player player) {
-    try {
-      return methodPlayerGetHandle.invoke(player);
-    } catch (Exception e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  private Method getMethod(String name, Class<?> clazz, Class<?>... paramTypes) {
-    Class<?>[] t = toPrimitiveTypeArray(paramTypes);
-    for (Method m : clazz.getMethods()) {
-      Class<?>[] types = toPrimitiveTypeArray(m.getParameterTypes());
-      if (m.getName().equals(name) && equalsTypeArray(types, t)) {
-        return m;
-      }
-    }
-    return null;
-  }
-
-  private String getVersion() {
-    String name = Bukkit.getServer().getClass().getPackage().getName();
-    return name.substring(name.lastIndexOf('.') + 1) + ".";
-  }
-
-  private Class<?> getNMSClass(String className) {
-    String fullName = "net.minecraft.server." + getVersion() + className;
-    Class<?> clazz = null;
-    try {
-      clazz = Class.forName(fullName);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return clazz;
-  }
-
-  private Class<?> getOBCClass(String className) {
-    String fullName = "org.bukkit.craftbukkit." + getVersion() + className;
-    Class<?> clazz = null;
-    try {
-      clazz = Class.forName(fullName);
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return clazz;
-  }
-
-  private Field getField(Class<?> clazz, String name) {
-    try {
-      Field field = clazz.getDeclaredField(name);
-      field.setAccessible(true);
-      return field;
-    } catch (Exception e) {
-      e.printStackTrace();
-      return null;
-    }
-  }
-
-  private Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-    for (Method m : clazz.getMethods()) {
-      if (m.getName().equals(name) && (args.length == 0 || ClassListEqual(args,
-          m.getParameterTypes()))) {
-        m.setAccessible(true);
-        return m;
-      }
-    }
-    return null;
-  }
-
-  private boolean ClassListEqual(Class<?>[] l1, Class<?>[] l2) {
-    if (l1.length != l2.length) {
-      return false;
-    }
-    boolean equal = true;
-    for (int i = 0; i < l1.length; i++) {
-      if (l1[i] != l2[i]) {
-        equal = false;
-        break;
-      }
-    }
-    return equal;
-  }
-
-  public ChatColor getTitleColor() {
-    return titleColor;
-  }
-
-  /**
-   * Sets the title color.
-   *
-   * @param color Chat color
-   */
-  public void setTitleColor(ChatColor color) {
-    this.titleColor = color;
-  }
-
-  public ChatColor getSubtitleColor() {
-    return subtitleColor;
-  }
-
-  /**
-   * Sets the subtitle color.
-   *
-   * @param color Chat color
-   */
-  public void setSubtitleColor(ChatColor color) {
-    this.subtitleColor = color;
-  }
-
-  public int getFadeInTime() {
-    return fadeInTime;
-  }
-
-  /**
-   * Sets the fade in time for the title.
-   *
-   * @param time Time
-   */
-  public void setFadeInTime(int time) {
-    this.fadeInTime = time;
-  }
-
-  /**
-   * Gets the fade out time for the title.
-   *
-   * @return the time to fade out
-   */
-  public int getFadeOutTime() {
-    return fadeOutTime;
-  }
-
-  /**
-   * Sets the fade out time for the title.
-   *
-   * @param time fade-out time
-   */
-  public void setFadeOutTime(int time) {
-    this.fadeOutTime = time;
-  }
-
-  public int getStayTime() {
-    return stayTime;
-  }
-
-  /**
-   * Sets the title stay time.
-   *
-   * @param time Time
-   */
-  public void setStayTime(int time) {
-    this.stayTime = time;
-  }
-
-  public boolean isTicks() {
-    return ticks;
-  }
-}

From b66734a4722a5d4fe27505b813873781b370e28f Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Mon, 13 May 2019 21:57:41 -0400
Subject: [PATCH 178/210] Misc. code changes A lot of renaming Some formatting
 Narrowed scope of variables Added annotations

---
 .../bukkit/object/BukkitOfflinePlayer.java    |  3 +-
 .../bukkit/object/BukkitPlayer.java           | 11 ++-
 .../bukkit/util/OfflinePlayerUtil.java        |  8 --
 .../bukkit/util/block/GenChunk.java           | 28 +++---
 .../bukkit/uuid/DefaultUUIDWrapper.java       |  3 +-
 .../bukkit/uuid/LowerOfflineUUIDWrapper.java  |  6 +-
 .../bukkit/uuid/OfflineUUIDWrapper.java       |  6 +-
 .../plotsquared/commands/Command.java         |  8 +-
 .../ConfigurationSerialization.java           | 26 +++--
 .../plotsquared/plot/commands/Auto.java       | 31 +++---
 .../plotsquared/plot/commands/Clear.java      | 44 ++++-----
 .../plotsquared/plot/commands/Cluster.java    |  1 -
 .../plotsquared/plot/commands/Condense.java   |  8 +-
 .../plotsquared/plot/commands/Database.java   | 10 +-
 .../plotsquared/plot/commands/DebugPaste.java |  4 +-
 .../plotsquared/plot/commands/Deny.java       | 12 ++-
 .../plotsquared/plot/commands/ListCmd.java    | 20 +++-
 .../plotsquared/plot/commands/Load.java       | 18 ++--
 .../plotsquared/plot/commands/Remove.java     |  2 +-
 .../plot/commands/SchematicCmd.java           | 20 ++--
 .../plotsquared/plot/commands/Setup.java      | 12 ++-
 .../plotsquared/plot/commands/Trust.java      | 12 +--
 .../plotsquared/plot/config/Captions.java     | 50 ++++------
 .../plotsquared/plot/database/SQLManager.java | 25 +++--
 .../plot/generator/AugmentedUtils.java        |  9 +-
 .../plot/generator/HybridPlotManager.java     | 15 +--
 .../plotsquared/plot/listener/WEManager.java  |  7 +-
 .../plotsquared/plot/object/BlockBucket.java  |  8 +-
 .../plotsquared/plot/object/Plot.java         | 94 +++++++++----------
 .../plotsquared/plot/object/PlotArea.java     | 10 +-
 .../plot/object/worlds/SinglePlotArea.java    | 12 +--
 .../object/worlds/SinglePlotAreaManager.java  |  3 +-
 .../plot/util/HastebinUtility.java            |  9 +-
 .../plotsquared/plot/util/MainUtil.java       |  4 +-
 .../plot/util/ReflectionUtils.java            | 21 +++--
 .../plot/util/SchematicHandler.java           | 21 ++++-
 .../plotsquared/plot/util/UUIDHandler.java    | 19 ++--
 .../plot/util/UUIDHandlerImplementation.java  | 22 +++--
 .../plotsquared/plot/util/WorldUtil.java      | 24 +++--
 .../plot/util/block/GlobalBlockQueue.java     | 84 ++++++++---------
 .../plot/util/expiry/ExpireManager.java       |  3 +-
 .../plotsquared/plot/uuid/UUIDWrapper.java    |  3 +-
 42 files changed, 409 insertions(+), 327 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java
index 390e9d9be..7c52a25de 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java
@@ -2,6 +2,7 @@ package com.github.intellectualsites.plotsquared.bukkit.object;
 
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
@@ -19,7 +20,7 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer {
         this.player = player;
     }
 
-    @Override public UUID getUUID() {
+    @NotNull @Override public UUID getUUID() {
         return this.player.getUniqueId();
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 1afe93656..7b1ce2c54 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -6,7 +6,12 @@ import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
+import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -18,8 +23,8 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.RegisteredListener;
+import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
 import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
@@ -55,7 +60,7 @@ public class BukkitPlayer extends PlotPlayer {
         return location == null ? BukkitUtil.getLocation(this.player) : location;
     }
 
-    @Nonnull @Override public UUID getUUID() {
+    @NotNull @Override public UUID getUUID() {
         if (this.uuid == null) {
             this.uuid = UUIDHandler.getUUID(this);
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java
index f1bc97bb1..a3e40fae1 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java
@@ -13,14 +13,6 @@ import static com.github.intellectualsites.plotsquared.plot.util.ReflectionUtils
 
 public class OfflinePlayerUtil {
 
-    public static Player loadPlayer(String name) {
-        return loadPlayer(Bukkit.getOfflinePlayer(name));
-    }
-
-    public static Player loadPlayer(UUID id) {
-        return loadPlayer(Bukkit.getOfflinePlayer(id));
-    }
-
     public static Player loadPlayer(OfflinePlayer player) {
         if (player == null) {
             return null;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
index eebac8ef0..1049d902a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
@@ -26,8 +26,8 @@ public class GenChunk extends ScopedLocalBlockQueue {
     public BiomeGrid biomeGrid;
     public Chunk chunk;
     public String world;
-    public int cx;
-    public int cz;
+    public int chunkX;
+    public int chunkZ;
     @Getter @Setter private ChunkData cd = null;
 
     public GenChunk() {
@@ -39,7 +39,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
         if (chunk == null) {
             World worldObj = BukkitUtil.getWorld(world);
             if (worldObj != null) {
-                this.chunk = worldObj.getChunkAt(cx, cz);
+                this.chunk = worldObj.getChunkAt(chunkX, chunkZ);
             }
         }
         return chunk;
@@ -52,8 +52,8 @@ public class GenChunk extends ScopedLocalBlockQueue {
     public void setChunk(ChunkWrapper wrap) {
         chunk = null;
         world = wrap.world;
-        cx = wrap.x;
-        cz = wrap.z;
+        chunkX = wrap.x;
+        chunkZ = wrap.z;
     }
 
     @Override public void fillBiome(String biomeName) {
@@ -82,13 +82,13 @@ public class GenChunk extends ScopedLocalBlockQueue {
                 Arrays.fill(data, start, end, block);
             }
         }
-        int minx = Math.min(pos1.getX(), pos2.getX());
-        int miny = Math.min(pos1.getY(), pos2.getY());
-        int minz = Math.min(pos1.getZ(), pos2.getZ());
-        int maxx = Math.max(pos1.getX(), pos2.getX());
-        int maxy = Math.max(pos1.getY(), pos2.getY());
-        int maxz = Math.max(pos1.getZ(), pos2.getZ());
-        cd.setRegion(minx, miny, minz, maxx + 1, maxy + 1, maxz + 1, block.to(Material.class));
+        int minX = Math.min(pos1.getX(), pos2.getX());
+        int minY = Math.min(pos1.getY(), pos2.getY());
+        int minZ = Math.min(pos1.getZ(), pos2.getZ());
+        int maxX = Math.max(pos1.getX(), pos2.getX());
+        int maxY = Math.max(pos1.getY(), pos2.getY());
+        int maxZ = Math.max(pos1.getZ(), pos2.getZ());
+        cd.setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, block.to(Material.class));
     }
 
     @Override public boolean setBiome(int x, int z, String biome) {
@@ -147,11 +147,11 @@ public class GenChunk extends ScopedLocalBlockQueue {
     }
 
     public int getX() {
-        return chunk == null ? cx : chunk.getX();
+        return chunk == null ? chunkX : chunk.getX();
     }
 
     public int getZ() {
-        return chunk == null ? cz : chunk.getZ();
+        return chunk == null ? chunkZ : chunk.getZ();
     }
 
     @Override public String getWorld() {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
index ce058b691..40d902f8e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java
@@ -7,13 +7,14 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
 import java.util.UUID;
 
 public class DefaultUUIDWrapper extends UUIDWrapper {
 
-    @Override public UUID getUUID(PlotPlayer player) {
+    @NotNull @Override public UUID getUUID(PlotPlayer player) {
         return ((BukkitPlayer) player).player.getUniqueId();
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
index 55e2039a0..3f33387b9 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java
@@ -4,14 +4,14 @@ import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.google.common.base.Charsets;
 import org.bukkit.OfflinePlayer;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
 public class LowerOfflineUUIDWrapper extends OfflineUUIDWrapper {
 
-    @Override public UUID getUUID(PlotPlayer player) {
-        return UUID.nameUUIDFromBytes(
-            ("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8));
+    @NotNull @Override public UUID getUUID(PlotPlayer player) {
+        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8));
     }
 
     @Override public UUID getUUID(OfflinePlotPlayer player) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
index 6686c09f1..306f67e4e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java
@@ -13,6 +13,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -33,9 +34,8 @@ public class OfflineUUIDWrapper extends UUIDWrapper {
         }
     }
 
-    @Override public UUID getUUID(PlotPlayer player) {
-        return UUID
-            .nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8));
+    @NotNull @Override public UUID getUUID(PlotPlayer player) {
+        return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8));
     }
 
     @Override public UUID getUUID(OfflinePlotPlayer player) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
index bf803d712..277ebe2e7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java
@@ -10,7 +10,11 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal2;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -150,10 +154,10 @@ public abstract class Command {
         this.perm = declaration.permission();
         this.required = declaration.requiredType();
         this.category = declaration.category();
-        HashMap<String, Object> options = new HashMap<>();
         List<String> aliasOptions = new ArrayList<>();
         aliasOptions.add(this.id);
         aliasOptions.addAll(Arrays.asList(declaration.aliases()));
+        HashMap<String, Object> options = new HashMap<>();
         options.put("aliases", aliasOptions);
         options.put("description", declaration.description());
         options.put("usage", declaration.usage());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
index 0783b4af5..cb1abd54a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java
@@ -212,10 +212,15 @@ public class ConfigurationSerialization {
                 return result;
             }
         } catch (IllegalAccessException | InvocationTargetException | IllegalArgumentException ex) {
-            Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
-                "Could not call method '" + method.toString() + "' of " + this.clazz
-                    + " for deserialization",
-                ex instanceof InvocationTargetException ? ex.getCause() : ex);
+            if (ex instanceof InvocationTargetException) {
+                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                    "Could not call method '" + method.toString() + "' of " + this.clazz
+                        + " for deserialization", ex.getCause());
+            } else {
+                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                    "Could not call method '" + method.toString() + "' of " + this.clazz
+                        + " for deserialization", ex);
+            }
         }
 
         return null;
@@ -226,10 +231,15 @@ public class ConfigurationSerialization {
         try {
             return ctor.newInstance(args);
         } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | InstantiationException ex) {
-            Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
-                "Could not call constructor '" + ctor.toString() + "' of " + this.clazz
-                    + " for deserialization",
-                ex instanceof InvocationTargetException ? ex.getCause() : ex);
+            if (ex instanceof InvocationTargetException) {
+                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                    "Could not call constructor '" + ctor.toString() + "' of " + this.clazz
+                        + " for deserialization", ex.getCause());
+            } else {
+                Logger.getLogger(ConfigurationSerialization.class.getName()).log(Level.SEVERE,
+                    "Could not call constructor '" + ctor.toString() + "' of " + this.clazz
+                        + " for deserialization", ex);
+            }
         }
 
         return null;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
index fb6d571be..fa187877e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
@@ -5,8 +5,17 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.object.Expression;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.util.ByteArrayUtilities;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 
 import javax.annotation.Nullable;
 import java.util.Set;
@@ -68,15 +77,15 @@ public class Auto extends SubCommand {
      * @param player
      * @param area
      * @param start
-     * @param schem
+     * @param schematic
      */
     public static void homeOrAuto(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem) {
+        final String schematic) {
         Set<Plot> plots = player.getPlots();
         if (!plots.isEmpty()) {
             plots.iterator().next().teleportPlayer(player);
         } else {
-            autoClaimSafe(player, area, start, schem);
+            autoClaimSafe(player, area, start, schematic);
         }
     }
 
@@ -86,11 +95,11 @@ public class Auto extends SubCommand {
      * @param player
      * @param area
      * @param start
-     * @param schem
+     * @param schematic
      */
     public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem) {
-        autoClaimSafe(player, area, start, schem, null);
+        final String schematic) {
+        autoClaimSafe(player, area, start, schematic, null);
     }
 
     /**
@@ -99,10 +108,10 @@ public class Auto extends SubCommand {
      * @param player
      * @param area
      * @param start
-     * @param schem
+     * @param schematic
      */
     public static void autoClaimSafe(final PlotPlayer player, final PlotArea area, PlotId start,
-        final String schem, @Nullable final Integer allowedPlots) {
+        final String schematic, @Nullable final Integer allowedPlots) {
         player.setMeta(Auto.class.getName(), true);
         autoClaimFromDatabase(player, area, start, new RunnableVal<Plot>() {
             @Override public void run(final Plot plot) {
@@ -112,7 +121,7 @@ public class Auto extends SubCommand {
                         if (plot == null) {
                             MainUtil.sendMessage(player, Captions.NO_FREE_PLOTS);
                         } else if (checkAllowedPlots(player, area, allowedPlots, 1, 1)) {
-                            plot.claim(player, true, schem, false);
+                            plot.claim(player, true, schematic, false);
                             if (area.AUTO_MERGE) {
                                 plot.autoMerge(-1, Integer.MAX_VALUE, player.getUUID(), true);
                             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
index c16b603ac..6bde7ffd0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Clear.java
@@ -36,33 +36,27 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
         checkTrue(plot.getRunning() == 0, Captions.WAIT_FOR_TIMER);
         checkTrue(!Settings.Done.RESTRICT_BUILDING || !Flags.DONE.isSet(plot) || Permissions
             .hasPermission(player, Captions.PERMISSION_CONTINUE), Captions.DONE_ALREADY_DONE);
-        confirm.run(this, new Runnable() {
-            @Override public void run() {
-                final long start = System.currentTimeMillis();
-                boolean result = plot.clear(true, false, new Runnable() {
-                    @Override public void run() {
-                        plot.unlink();
-                        GlobalBlockQueue.IMP.addTask(new Runnable() {
-                            @Override public void run() {
-                                plot.removeRunning();
-                                // If the state changes, then mark it as no longer done
-                                if (plot.getFlag(Flags.DONE).isPresent()) {
-                                    FlagManager.removePlotFlag(plot, Flags.DONE);
-                                }
-                                if (plot.getFlag(Flags.ANALYSIS).isPresent()) {
-                                    FlagManager.removePlotFlag(plot, Flags.ANALYSIS);
-                                }
-                                MainUtil.sendMessage(player, Captions.CLEARING_DONE,
-                                    "" + (System.currentTimeMillis() - start));
-                            }
-                        });
+        confirm.run(this, () -> {
+            final long start = System.currentTimeMillis();
+            boolean result = plot.clear(true, false, () -> {
+                plot.unlink();
+                GlobalBlockQueue.IMP.addTask(() -> {
+                    plot.removeRunning();
+                    // If the state changes, then mark it as no longer done
+                    if (plot.getFlag(Flags.DONE).isPresent()) {
+                        FlagManager.removePlotFlag(plot, Flags.DONE);
                     }
+                    if (plot.getFlag(Flags.ANALYSIS).isPresent()) {
+                        FlagManager.removePlotFlag(plot, Flags.ANALYSIS);
+                    }
+                    MainUtil.sendMessage(player, Captions.CLEARING_DONE,
+                        "" + (System.currentTimeMillis() - start));
                 });
-                if (!result) {
-                    MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
-                } else {
-                    plot.addRunning();
-                }
+            });
+            if (!result) {
+                MainUtil.sendMessage(player, Captions.WAIT_FOR_TIMER);
+            } else {
+                plot.addRunning();
             }
         }, null);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
index a59c65550..32d7095a9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Cluster.java
@@ -466,7 +466,6 @@ import java.util.UUID;
                     PlotSquared.get().getPlots(player.getLocation().getWorld(), uuid))) {
                     PlotCluster current = plot.getCluster();
                     if (current != null && current.equals(cluster)) {
-                        player.getLocation().getWorld();
                         plot.unclaim();
                     }
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
index 478a0cab9..184e2289d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Condense.java
@@ -11,8 +11,12 @@ import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
-import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 @CommandDeclaration(command = "condense", permission = "plots.admin",
@@ -104,6 +108,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
                     return false;
                 }
                 MainUtil.sendMessage(player, "TASK STARTED...");
+                Condense.TASK = true;
                 Runnable run = new Runnable() {
                     @Override public void run() {
                         if (!Condense.TASK) {
@@ -147,7 +152,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
                         }
                     }
                 };
-                Condense.TASK = true;
                 TaskManager.runTaskAsync(run);
                 return true;
             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
index e94850121..d908f2105 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Database.java
@@ -87,8 +87,8 @@ import java.util.Map.Entry;
                     HashMap<String, HashMap<PlotId, Plot>> map = manager.getPlots();
                     plots = new ArrayList<>();
                     for (Entry<String, HashMap<PlotId, Plot>> entry : map.entrySet()) {
-                        String areaname = entry.getKey();
-                        PlotArea pa = PlotSquared.get().getPlotAreaByString(areaname);
+                        String areaName = entry.getKey();
+                        PlotArea pa = PlotSquared.get().getPlotAreaByString(areaName);
                         if (pa != null) {
                             for (Entry<PlotId, Plot> entry2 : entry.getValue().entrySet()) {
                                 Plot plot = entry2.getValue();
@@ -123,9 +123,9 @@ import java.util.Map.Entry;
                                 plots.add(plot);
                             }
                         } else {
-                            HashMap<PlotId, Plot> plotmap = PlotSquared.get().plots_tmp
-                                .computeIfAbsent(areaname, k -> new HashMap<>());
-                            plotmap.putAll(entry.getValue());
+                            HashMap<PlotId, Plot> plotMap = PlotSquared.get().plots_tmp
+                                .computeIfAbsent(areaName, k -> new HashMap<>());
+                            plotMap.putAll(entry.getValue());
                         }
                     }
                     DBFunc.createPlotsAndData(plots,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
index f28b33a0a..7fe7bfdd1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugPaste.java
@@ -27,11 +27,11 @@ import java.util.stream.Collectors;
     extends SubCommand {
 
     private static String readFile(@NonNull final File file) throws IOException {
-        final StringBuilder content = new StringBuilder();
         final List<String> lines;
         try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
             lines = reader.lines().collect(Collectors.toList());
         }
+        final StringBuilder content = new StringBuilder();
         for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
             content.append(lines.get(i)).append("\n");
         }
@@ -41,7 +41,6 @@ import java.util.stream.Collectors;
     @Override public boolean onCommand(final PlotPlayer player, String[] args) {
         TaskManager.runTaskAsync(() -> {
             try {
-                final IncendoPaster incendoPaster = new IncendoPaster("plotsquared");
 
                 StringBuilder b = new StringBuilder();
                 b.append(
@@ -79,6 +78,7 @@ import java.util.stream.Collectors;
                     "\n# You can do so at https://github.com/IntellectualSites/PlotSquared/issues");
                 b.append("\n# or via our Discord at https://discord.gg/ngZCzbU");
 
+                final IncendoPaster incendoPaster = new IncendoPaster("plotsquared");
                 incendoPaster.addFile(new IncendoPaster.PasteFile("information", b.toString()));
 
                 try {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
index 34a2936f8..fa6a1f96c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Deny.java
@@ -8,9 +8,13 @@ import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
 
-import java.util.Iterator;
 import java.util.Set;
 import java.util.UUID;
 
@@ -44,9 +48,7 @@ import java.util.UUID;
             MainUtil.sendMessage(player, Captions.INVALID_PLAYER, args[0]);
             return false;
         }
-        Iterator<UUID> iter = uuids.iterator();
-        while (iter.hasNext()) {
-            UUID uuid = iter.next();
+        for (UUID uuid : uuids) {
             if (uuid == DBFunc.EVERYONE && !(
                 Permissions.hasPermission(player, Captions.PERMISSION_DENY_EVERYONE) || Permissions
                     .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_DENY))) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
index e2951db6a..bd4613409 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -5,12 +5,22 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared.SortType;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.Rating;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.UUID;
 
 @CommandDeclaration(command = "list", aliases = {"l", "find", "search"}, description = "List plots",
     permission = "plots.list", category = CommandCategory.INFO,
@@ -20,7 +30,7 @@ public class ListCmd extends SubCommand {
     private String[] getArgumentList(PlotPlayer player) {
         List<String> args = new ArrayList<>();
         if (EconHandler.manager != null && Permissions
-            .hasPermission(player, Captions.PERMISSION_LIST_FORSALE)) {
+            .hasPermission(player, Captions.PERMISSION_LIST_FOR_SALE)) {
             args.add("forsale");
         }
         if (Permissions.hasPermission(player, Captions.PERMISSION_LIST_MINE)) {
@@ -222,9 +232,9 @@ public class ListCmd extends SubCommand {
                 sort = false;
                 break;
             case "forsale":
-                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_FORSALE)) {
+                if (!Permissions.hasPermission(player, Captions.PERMISSION_LIST_FOR_SALE)) {
                     MainUtil.sendMessage(player, Captions.NO_PERMISSION,
-                        Captions.PERMISSION_LIST_FORSALE);
+                        Captions.PERMISSION_LIST_FOR_SALE);
                     return false;
                 }
                 if (EconHandler.manager == null) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
index 234568fda..d18332798 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
@@ -4,7 +4,11 @@ import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.Permissions;
@@ -50,9 +54,9 @@ import java.util.List;
                     MainUtil.sendMessage(player, Captions.LOAD_NULL);
                     return false;
                 }
-                String schem;
+                String schematic;
                 try {
-                    schem = schematics.get(Integer.parseInt(args[0]) - 1);
+                    schematic = schematics.get(Integer.parseInt(args[0]) - 1);
                 } catch (Exception ignored) {
                     // use /plot load <index>
                     MainUtil.sendMessage(player, Captions.NOT_VALID_NUMBER,
@@ -61,7 +65,7 @@ import java.util.List;
                 }
                 final URL url;
                 try {
-                    url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schem);
+                    url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic);
                 } catch (MalformedURLException e) {
                     e.printStackTrace();
                     MainUtil.sendMessage(player, Captions.LOAD_FAILED);
@@ -70,8 +74,8 @@ import java.util.List;
                 plot.addRunning();
                 MainUtil.sendMessage(player, Captions.GENERATING_COMPONENT);
                 TaskManager.runTaskAsync(() -> {
-                    Schematic schematic = SchematicHandler.manager.getSchematic(url);
-                    if (schematic == null) {
+                    Schematic taskSchematic = SchematicHandler.manager.getSchematic(url);
+                    if (taskSchematic == null) {
                         plot.removeRunning();
                         sendMessage(player, Captions.SCHEMATIC_INVALID,
                             "non-existent or not in gzip format");
@@ -79,7 +83,7 @@ import java.util.List;
                     }
                     PlotArea area = plot.getArea();
                     SchematicHandler.manager
-                        .paste(schematic, plot, 0, area.MIN_BUILD_HEIGHT, 0, false,
+                        .paste(taskSchematic, plot, 0, area.MIN_BUILD_HEIGHT, 0, false,
                             new RunnableVal<Boolean>() {
                                 @Override public void run(Boolean value) {
                                     plot.removeRunning();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
index 30c364671..875eb6e4c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Remove.java
@@ -44,11 +44,11 @@ import java.util.UUID;
         int count = 0;
         switch (args[0]) {
             case "unknown": {
-                ArrayList<UUID> toRemove = new ArrayList<>();
                 HashSet<UUID> all = new HashSet<>();
                 all.addAll(plot.getMembers());
                 all.addAll(plot.getTrusted());
                 all.addAll(plot.getDenied());
+                ArrayList<UUID> toRemove = new ArrayList<>();
                 for (UUID uuid : all) {
                     if (UUIDHandler.getName(uuid) == null) {
                         toRemove.add(uuid);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
index 48f0a8a1c..24ccbe016 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
@@ -4,9 +4,19 @@ import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.google.common.collect.Lists;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -191,9 +201,7 @@ public class SchematicCmd extends SubCommand {
                     MainUtil.sendMessage(player, Captions.NO_PLOT_PERMS);
                     return false;
                 }
-                location.getWorld();
-                Collection<Plot> plots = new ArrayList<>();
-                plots.add(plot);
+                ArrayList<Plot> plots = Lists.newArrayList(plot);
                 boolean result = SchematicHandler.manager.exportAll(plots, null, null, () -> {
                     MainUtil.sendMessage(player, "&aFinished export");
                     SchematicCmd.this.running = false;
@@ -212,7 +220,7 @@ public class SchematicCmd extends SubCommand {
                     return false;
                 }
                 final String string =
-                    StringMan.join(SchematicHandler.manager.getShematicNames(), "$2, $1");
+                    StringMan.join(SchematicHandler.manager.getSchematicNames(), "$2, $1");
                 Captions.SCHEMATIC_LIST.send(player, string);
             }
             break;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
index 66fbd041a..2b7e5ab7f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Setup.java
@@ -6,7 +6,11 @@ import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Configuration;
 import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode;
 import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotMessage;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
@@ -345,7 +349,7 @@ import java.util.Map.Entry;
             return messages;
         }
 
-        @Override public boolean parseInut(String input) {
+        @Override public boolean parseInput(String input) {
             this.generator = input.toLowerCase();
             return true;
         }
@@ -385,7 +389,7 @@ import java.util.Map.Entry;
             return messages;
         }
 
-        @Override public boolean parseInut(String input) {
+        @Override public boolean parseInput(String input) {
             if (!WORLD_TYPES.keySet().contains(input.toLowerCase())) {
                 return false;
             }
@@ -416,7 +420,7 @@ import java.util.Map.Entry;
 
         public abstract Collection<PlotMessage> showDescriptionMessage();
 
-        public abstract boolean parseInut(String input);
+        public abstract boolean parseInput(String input);
 
         public final PlotMessage getUsage() {
             return new PlotMessage("Usage: ").color("$1")
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
index 6724efdda..81a508ee3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
@@ -39,25 +39,25 @@ import java.util.UUID;
         checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
         final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
         checkTrue(!uuids.isEmpty(), Captions.INVALID_PLAYER, args[0]);
-        Iterator<UUID> iter = uuids.iterator();
+        Iterator<UUID> iterator = uuids.iterator();
         int size = currentPlot.getTrusted().size() + currentPlot.getMembers().size();
-        while (iter.hasNext()) {
-            UUID uuid = iter.next();
+        while (iterator.hasNext()) {
+            UUID uuid = iterator.next();
             if (uuid == DBFunc.EVERYONE && !(
                 Permissions.hasPermission(player, Captions.PERMISSION_TRUST_EVERYONE) || Permissions
                     .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST))) {
                 MainUtil.sendMessage(player, Captions.INVALID_PLAYER, MainUtil.getName(uuid));
-                iter.remove();
+                iterator.remove();
                 continue;
             }
             if (currentPlot.isOwner(uuid)) {
                 MainUtil.sendMessage(player, Captions.ALREADY_OWNER, MainUtil.getName(uuid));
-                iter.remove();
+                iterator.remove();
                 continue;
             }
             if (currentPlot.getTrusted().contains(uuid)) {
                 MainUtil.sendMessage(player, Captions.ALREADY_ADDED, MainUtil.getName(uuid));
-                iter.remove();
+                iterator.remove();
                 continue;
             }
             size += currentPlot.getMembers().contains(uuid) ? 0 : 1;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index 2037bcdf1..0c6f501df 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -125,8 +125,8 @@ public enum Captions {
     PERMISSION_FLAG_ADD("plots.flag.add", "static.permissions"),
     PERMISSION_FLAG_LIST("plots.flag.list", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_KICK("plots.admin.command.kick", "static.permissions"),
-    PERMISSION_GRANT("plots.grant.%s0", "static.permissions"),
-    PERMISSION_LIST_FORSALE("plots.list.forsale", "static.permissions"),
+    PERMISSION_GRANT("plots.grant.%s0", "static.permissions"), PERMISSION_LIST_FOR_SALE(
+        "plots.list.forsale", "static.permissions"),
     PERMISSION_LIST_MINE("plots.list.mine", "static.permissions"),
     PERMISSION_LIST_SHARED("plots.list.shared", "static.permissions"),
     PERMISSION_LIST_WORLD("plots.list.world", "static.permissions"),
@@ -211,37 +211,25 @@ public enum Captions {
     CLUSTER_AVAILABLE_ARGS(
         "$1The following sub commands are available: $4list$2, $4create$2, $4delete$2, $4resize$2, $4invite$2, $4kick$2, $4leave$2, "
             + "$4members$2, $4info$2, $4tp$2, $4sethome", "Cluster"), CLUSTER_LIST_HEADING(
-        "$2There are $1%s$2 clusters in this world", "Cluster"),
-
-    CLUSTER_LIST_ELEMENT("$2 - $1%s&-", "Cluster"), CLUSTER_INTERSECTION(
-        "$2The proposed area overlaps with: %s0", "Cluster"),
-
-    CLUSTER_OUTSIDE("$2The proposed area is outside the plot area: %s0", "Cluster"), CLUSTER_ADDED(
-        "$4Successfully created the cluster.", "Cluster"),
-
-    CLUSTER_DELETED("$4Successfully deleted the cluster.", "Cluster"), CLUSTER_RESIZED(
-        "$4Successfully resized the cluster.", "Cluster"),
-
-    CLUSTER_ADDED_USER("$4Successfully added user to the cluster.", "Cluster"), CANNOT_KICK_PLAYER(
-        "$2You cannot kick that player", "Cluster"),
-
-    CLUSTER_INVITED("$1You have been invited to the following cluster: $2%s",
-        "Cluster"), CLUSTER_REMOVED("$1You have been removed from cluster: $2%s", "Cluster"),
-
-    CLUSTER_KICKED_USER("$4Successfully kicked the user", "Cluster"), INVALID_CLUSTER(
-        "$1Invalid cluster name: $2%s", "Cluster"),
-
-    CLUSTER_NOT_ADDED("$2That player was not added to the plot cluster",
-        "Cluster"), CLUSTER_CANNOT_LEAVE("$1You must delete or transfer ownership before leaving",
-        "Cluster"),
-
-    CLUSTER_ADDED_HELPER("$4Successfully added a helper to the cluster",
+        "$2There are $1%s$2 clusters in this world", "Cluster"), CLUSTER_LIST_ELEMENT("$2 - $1%s&-",
+        "Cluster"), CLUSTER_INTERSECTION(
+        "$2The proposed area overlaps with: %s0", "Cluster"), CLUSTER_OUTSIDE(
+        "$2The proposed area is outside the plot area: %s0", "Cluster"), CLUSTER_ADDED(
+        "$4Successfully created the cluster.", "Cluster"), CLUSTER_DELETED(
+        "$4Successfully deleted the cluster.", "Cluster"), CLUSTER_RESIZED(
+        "$4Successfully resized the cluster.", "Cluster"), CLUSTER_ADDED_USER(
+        "$4Successfully added user to the cluster.", "Cluster"), CANNOT_KICK_PLAYER(
+        "$2You cannot kick that player", "Cluster"), CLUSTER_INVITED(
+        "$1You have been invited to the following cluster: $2%s", "Cluster"), CLUSTER_REMOVED(
+        "$1You have been removed from cluster: $2%s", "Cluster"), CLUSTER_KICKED_USER(
+        "$4Successfully kicked the user", "Cluster"), INVALID_CLUSTER(
+        "$1Invalid cluster name: $2%s", "Cluster"), CLUSTER_NOT_ADDED(
+        "$2That player was not added to the plot cluster", "Cluster"), CLUSTER_CANNOT_LEAVE(
+        "$1You must delete or transfer ownership before leaving",
+        "Cluster"), CLUSTER_ADDED_HELPER("$4Successfully added a helper to the cluster",
         "Cluster"), CLUSTER_REMOVED_HELPER("$4Successfully removed a helper from the cluster",
-        "Cluster"),
-
-    CLUSTER_REGENERATED("$4Successfully started cluster regeneration",
+        "Cluster"), CLUSTER_REGENERATED("$4Successfully started cluster regeneration",
         "Cluster"), CLUSTER_TELEPORTING("$4Teleporting...", "Cluster"),
-
     CLUSTER_INFO(
         "$1Current cluster: $2%id%&-$1Name: $2%name%&-$1Owner: $2%owner%&-$1Size: $2%size%&-$1Rights: $2%rights%",
         "Cluster"),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index fac357c46..ed0eee71d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -308,7 +308,6 @@ import java.util.concurrent.atomic.AtomicInteger;
                         PlotSquared.debug("============ DATABASE ERROR ============");
                         PlotSquared.debug("There was an error updating the database.");
                         PlotSquared.debug(" - It will be corrected on shutdown");
-                        PlotSquared.debug("========================================");
                         e.printStackTrace();
                         PlotSquared.debug("========================================");
                     }
@@ -326,15 +325,15 @@ import java.util.concurrent.atomic.AtomicInteger;
                 PreparedStatement statement = null;
                 UniqueStatement task = null;
                 UniqueStatement lastTask = null;
-                Iterator<Entry<Plot, Queue<UniqueStatement>>> iter =
+                Iterator<Entry<Plot, Queue<UniqueStatement>>> iterator =
                     this.plotTasks.entrySet().iterator();
-                while (iter.hasNext()) {
+                while (iterator.hasNext()) {
                     try {
-                        Entry<Plot, Queue<UniqueStatement>> entry = iter.next();
+                        Entry<Plot, Queue<UniqueStatement>> entry = iterator.next();
                         Plot plot = entry.getKey();
                         Queue<UniqueStatement> tasks = entry.getValue();
                         if (tasks.isEmpty()) {
-                            iter.remove();
+                            iterator.remove();
                             continue;
                         }
                         task = tasks.remove();
@@ -352,7 +351,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                             task.set(statement);
                             task.addBatch(statement);
                             try {
-                                if (statement != null && statement.isClosed()) {
+                                if (statement.isClosed()) {
                                     statement = null;
                                 }
                             } catch (AbstractMethodError ignore) {
@@ -1615,17 +1614,17 @@ import java.util.concurrent.atomic.AtomicInteger;
                         PlotId plot_id = new PlotId(resultSet.getInt("plot_id_x"),
                             resultSet.getInt("plot_id_z"));
                         id = resultSet.getInt("id");
-                        String areaid = resultSet.getString("world");
-                        if (!areas.contains(areaid)) {
+                        String areaID = resultSet.getString("world");
+                        if (!areas.contains(areaID)) {
                             if (Settings.Enabled_Components.DATABASE_PURGER) {
                                 toDelete.add(id);
                                 continue;
                             } else {
-                                AtomicInteger value = noExist.get(areaid);
+                                AtomicInteger value = noExist.get(areaID);
                                 if (value != null) {
                                     value.incrementAndGet();
                                 } else {
-                                    noExist.put(areaid, new AtomicInteger(1));
+                                    noExist.put(areaID, new AtomicInteger(1));
                                 }
                             }
                         }
@@ -1657,7 +1656,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                                     .getTime();
                             } catch (ParseException e) {
                                 PlotSquared.debug(
-                                    "Could not parse date for plot: #" + id + "(" + areaid + ";"
+                                    "Could not parse date for plot: #" + id + "(" + areaID + ";"
                                         + plot_id + ") (" + parsable + ")");
                                 time = System.currentTimeMillis() + id;
                             }
@@ -1665,7 +1664,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                         Plot p = new Plot(plot_id, user, new HashSet<>(), new HashSet<>(),
                             new HashSet<>(), "", null, null, null,
                             new boolean[] {false, false, false, false}, time, id);
-                        HashMap<PlotId, Plot> map = newPlots.get(areaid);
+                        HashMap<PlotId, Plot> map = newPlots.get(areaID);
                         if (map != null) {
                             Plot last = map.put(p.getId(), p);
                             if (last != null) {
@@ -1679,7 +1678,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                             }
                         } else {
                             map = new HashMap<>();
-                            newPlots.put(areaid, map);
+                            newPlots.put(areaID, map);
                             map.put(p.getId(), p);
                         }
                         plots.put(id, p);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
index 1d18cbdcd..005a22d72 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
@@ -1,7 +1,12 @@
 package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
@@ -49,7 +54,7 @@ public class AugmentedUtils {
                 queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
             }
             LocalBlockQueue primaryMask;
-            // coords
+            // coordinates
             int bxx;
             int bzz;
             int txx;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 4796e3644..44e1d1705 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -3,14 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.commands.Template;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
-import com.github.intellectualsites.plotsquared.plot.object.FileBytes;
-import com.github.intellectualsites.plotsquared.plot.object.Location;
-import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
-import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
-import com.github.intellectualsites.plotsquared.plot.object.PlotId;
-import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.util.ChunkManager;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
@@ -18,6 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.google.common.collect.Sets;
 import com.sk89q.worldedit.world.block.BaseBlock;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -32,12 +26,11 @@ public class HybridPlotManager extends ClassicPlotManager {
             new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml", Template.getBytes(plotArea)));
         String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator
             + plotArea.worldname + File.separator;
-        String newDir =
-            "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator + "__TEMP_DIR__"
-                + File.separator;
         try {
             File sideroad =
                 MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "sideroad.schem");
+            String newDir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator
+                + "__TEMP_DIR__" + File.separator;
             if (sideroad.exists()) {
                 files.add(new FileBytes(newDir + "sideroad.schem",
                     Files.readAllBytes(sideroad.toPath())));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
index 0d80cab31..3692efa51 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/WEManager.java
@@ -3,7 +3,11 @@ package com.github.intellectualsites.plotsquared.plot.listener;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
 
 import java.util.HashSet;
 import java.util.UUID;
@@ -68,7 +72,6 @@ public class WEManager {
         }
         boolean allowMember = player.hasPermission("plots.worldedit.member");
         Plot plot = player.getCurrentPlot();
-        HashSet<RegionWrapper> allowed = new HashSet<>();
         if (plot == null) {
             plot = player.getMeta("WorldEditRegionPlot");
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
index e357de0b7..6900500f9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
@@ -166,16 +166,16 @@ import java.util.Map.Entry;
             compile();
         }
         final StringBuilder builder = new StringBuilder();
-        Iterator<Entry<PlotBlock, Double>> iter = blocks.entrySet().iterator();
-        while (iter.hasNext()) {
-            Entry<PlotBlock, Double> entry = iter.next();
+        Iterator<Entry<PlotBlock, Double>> iterator = blocks.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Entry<PlotBlock, Double> entry = iterator.next();
             PlotBlock block = entry.getKey();
             builder.append(block.getRawId());
             Double weight = entry.getValue();
             if (weight != 1) {
                 builder.append(":").append(weight.intValue());
             }
-            if (iter.hasNext()) {
+            if (iterator.hasNext()) {
                 builder.append(",");
             }
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index e2f83172e..78c7675d2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -2220,13 +2220,13 @@ public class Plot {
         if (!EventUtil.manager.callMerge(this, dir, max)) {
             return false;
         }
-        HashSet<Plot> visited = new HashSet<>();
-        HashSet<PlotId> merged;
         Set<Plot> connected = this.getConnectedPlots();
-        merged = connected.stream().map(Plot::getId).collect(Collectors.toCollection(HashSet::new));
+        HashSet<PlotId> merged =
+            connected.stream().map(Plot::getId).collect(Collectors.toCollection(HashSet::new));
         ArrayDeque<Plot> frontier = new ArrayDeque<>(connected);
         Plot current;
         boolean toReturn = false;
+        HashSet<Plot> visited = new HashSet<>();
         while ((current = frontier.poll()) != null && max >= 0) {
             if (visited.contains(current)) {
                 continue;
@@ -2421,10 +2421,10 @@ public class Plot {
         regions_cache = null;
 
         HashSet<Plot> tmpSet = new HashSet<>();
-        ArrayDeque<Plot> frontier = new ArrayDeque<>();
-        HashSet<Object> queuecache = new HashSet<>();
         tmpSet.add(this);
         Plot tmp;
+        HashSet<Object> queuecache = new HashSet<>();
+        ArrayDeque<Plot> frontier = new ArrayDeque<>();
         if (merged[0]) {
             tmp = this.area.getPlotAbs(this.id.getRelative(Direction.NORTH));
             if (!tmp.getMerged(Direction.SOUTH)) {
@@ -2923,51 +2923,51 @@ public class Plot {
             plot.swapData(other, null);
         }
         // copy terrain
-        Runnable move = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    Plot plot = destination.getRelative(0, 0);
-                    for (Plot current : plot.getConnectedPlots()) {
-                        getManager().claimPlot(current.getArea(), current);
-                        Plot originPlot = originArea.getPlotAbs(
-                            new PlotId(current.id.x - offset.x, current.id.y - offset.y));
-                        originPlot.getManager().unClaimPlot(originArea, originPlot, null);
-                    }
-                    plot.setSign();
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                final Runnable task = this;
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                final Location pos1 = corners[0];
-                final Location pos2 = corners[1];
-                Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
-                newPos.setWorld(destination.getWorldName());
-                ChunkManager.manager.copyRegion(pos1, pos2, newPos,
-                    () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
-            }
-        };
-        Runnable swap = new Runnable() {
-            @Override public void run() {
-                if (regions.isEmpty()) {
-                    TaskManager.runTask(whenDone);
-                    return;
-                }
-                RegionWrapper region = regions.poll();
-                Location[] corners = region.getCorners(getWorldName());
-                Location pos1 = corners[0];
-                Location pos2 = corners[1];
-                Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
-                Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
-                pos3.setWorld(destination.getWorldName());
-                pos4.setWorld(destination.getWorldName());
-                ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
-            }
-        };
         if (occupied) {
+            Runnable swap = new Runnable() {
+                @Override public void run() {
+                    if (regions.isEmpty()) {
+                        TaskManager.runTask(whenDone);
+                        return;
+                    }
+                    RegionWrapper region = regions.poll();
+                    Location[] corners = region.getCorners(getWorldName());
+                    Location pos1 = corners[0];
+                    Location pos2 = corners[1];
+                    Location pos3 = pos1.clone().add(offsetX, 0, offsetZ);
+                    Location pos4 = pos2.clone().add(offsetX, 0, offsetZ);
+                    pos3.setWorld(destination.getWorldName());
+                    pos4.setWorld(destination.getWorldName());
+                    ChunkManager.manager.swap(pos1, pos2, pos3, pos4, this);
+                }
+            };
             swap.run();
         } else {
+            Runnable move = new Runnable() {
+                @Override public void run() {
+                    if (regions.isEmpty()) {
+                        Plot plot = destination.getRelative(0, 0);
+                        for (Plot current : plot.getConnectedPlots()) {
+                            getManager().claimPlot(current.getArea(), current);
+                            Plot originPlot = originArea.getPlotAbs(
+                                new PlotId(current.id.x - offset.x, current.id.y - offset.y));
+                            originPlot.getManager().unClaimPlot(originArea, originPlot, null);
+                        }
+                        plot.setSign();
+                        TaskManager.runTask(whenDone);
+                        return;
+                    }
+                    final Runnable task = this;
+                    RegionWrapper region = regions.poll();
+                    Location[] corners = region.getCorners(getWorldName());
+                    final Location pos1 = corners[0];
+                    final Location pos2 = corners[1];
+                    Location newPos = pos1.clone().add(offsetX, 0, offsetZ);
+                    newPos.setWorld(destination.getWorldName());
+                    ChunkManager.manager.copyRegion(pos1, pos2, newPos,
+                        () -> ChunkManager.manager.regenerateRegion(pos1, pos2, false, task));
+                }
+            };
             move.run();
         }
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 9cdd5a4bd..253d74b40 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -10,7 +10,12 @@ import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.generator.GridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.EventUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.PlotGameMode;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.area.QuadMap;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
@@ -844,11 +849,10 @@ public abstract class PlotArea {
             return false;
         }
 
+        manager.startPlotMerge(this, plotIds);
         final Set<UUID> trusted = new HashSet<>();
         final Set<UUID> members = new HashSet<>();
         final Set<UUID> denied = new HashSet<>();
-
-        manager.startPlotMerge(this, plotIds);
         for (int x = pos1.x; x <= pos2.x; x++) {
             for (int y = pos1.y; y <= pos2.y; y++) {
                 PlotId id = new PlotId(x, y);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index a51ef110b..e1f6505f6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -50,21 +50,21 @@ public class SinglePlotArea extends GridPlotWorld {
         // Duplicate 0;0
         if (setup.type != 0) {
             File container = PlotSquared.imp().getWorldContainer();
-            File dest = new File(container, worldName);
-            if (!dest.exists()) {
+            File destination = new File(container, worldName);
+            if (!destination.exists()) {
                 File src = new File(container, "0,0");
                 if (src.exists()) {
-                    if (!dest.exists()) {
-                        dest.mkdirs();
+                    if (!destination.exists()) {
+                        destination.mkdirs();
                     }
                     File levelDat = new File(src, "level.dat");
                     if (levelDat.exists()) {
                         try {
                             Files.copy(levelDat.toPath(),
-                                new File(dest, levelDat.getName()).toPath());
+                                new File(destination, levelDat.getName()).toPath());
                             File data = new File(src, "data");
                             if (data.exists()) {
-                                File dataDest = new File(dest, "data");
+                                File dataDest = new File(destination, "data");
                                 dataDest.mkdirs();
                                 for (File file : data.listFiles()) {
                                     Files.copy(file.toPath(),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
index 95b303eea..f2e0b3c03 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java
@@ -35,8 +35,7 @@ public class SinglePlotAreaManager extends DefaultPlotAreaManager {
             return true;
         }
         int mode = 0;
-        for (int i = 0; i < chars.length; i++) {
-            char c = chars[i];
+        for (char c : chars) {
             switch (mode) {
                 case 0:
                     mode = 1;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
index d2495b646..3b0563a3d 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/HastebinUtility.java
@@ -1,6 +1,11 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
@@ -47,7 +52,6 @@ public class HastebinUtility {
     }
 
     public static String upload(final File file) throws IOException {
-        final StringBuilder content = new StringBuilder();
         List<String> lines = new ArrayList<>();
         try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
             String line;
@@ -56,6 +60,7 @@ public class HastebinUtility {
                 lines.add(line);
             }
         }
+        final StringBuilder content = new StringBuilder();
         for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
             content.append(lines.get(i)).append("\n");
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
index cfc910748..2e1784b59 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/MainUtil.java
@@ -399,8 +399,6 @@ public class MainUtil {
 
         List<UUID> uuids = new ArrayList<>();
         PlotId id = null;
-        PlotArea area = null;
-        String alias = null;
 
         for (String term : split) {
             try {
@@ -418,6 +416,8 @@ public class MainUtil {
             IntStream.range(0, size).mapToObj(i -> new ArrayList<Plot>())
                 .collect(Collectors.toCollection(() -> new ArrayList<>(size)));
 
+        PlotArea area = null;
+        String alias = null;
         for (Plot plot : PlotSquared.get().getPlots()) {
             int count = 0;
             if (!uuids.isEmpty()) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
index cf6bbee2d..621766c17 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ReflectionUtils.java
@@ -1,7 +1,15 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author DPOH-VAR
@@ -137,21 +145,22 @@ public class ReflectionUtils {
     }
 
     @SuppressWarnings("unchecked")
-    public static <T> Constructor<T> makeConstructor(Class<?> clazz, Class<?>... paramaterTypes) {
+    public static <T> Constructor<T> makeConstructor(Class<?> clazz, Class<?>... parameterTypes) {
         try {
-            return (Constructor<T>) clazz.getConstructor(paramaterTypes);
+            return (Constructor<T>) clazz.getConstructor(parameterTypes);
         } catch (NoSuchMethodException ignored) {
+            //todo print a constructor not found method
             return null;
         }
     }
 
-    public static <T> T callConstructor(Constructor<T> constructor, Object... paramaters) {
+    public static <T> T callConstructor(Constructor<T> constructor, Object... parameters) {
         if (constructor == null) {
             throw new RuntimeException("No such constructor");
         }
         constructor.setAccessible(true);
         try {
-            return constructor.newInstance(paramaters);
+            return constructor.newInstance(parameters);
         } catch (InvocationTargetException ex) {
             throw new RuntimeException(ex.getCause());
         } catch (IllegalAccessException | IllegalArgumentException | InstantiationException ex) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index cf04f7f94..d6df9d003 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -7,12 +7,25 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.generator.ClassicPlotWorld;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
-import com.sk89q.jnbt.*;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.jnbt.NBTInputStream;
+import com.sk89q.jnbt.NBTOutputStream;
+import com.sk89q.jnbt.StringTag;
+import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
-import com.sk89q.worldedit.extent.clipboard.io.*;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
+import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicReader;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
@@ -267,7 +280,7 @@ public abstract class SchematicHandler {
      *
      * @return Immutable collection with schematic names
      */
-    public Collection<String> getShematicNames() {
+    public Collection<String> getSchematicNames() {
         final File parent =
             MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), Settings.Paths.SCHEMATICS);
         final List<String> names = new ArrayList<>();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
index 52e65a3fd..feb58f51f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandler.java
@@ -9,8 +9,9 @@ import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.google.common.collect.BiMap;
+import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -85,7 +86,7 @@ public class UUIDHandler {
         implementation.add(toAdd);
     }
 
-    @Nonnull public static UUID getUUID(PlotPlayer player) {
+    @NotNull public static UUID getUUID(PlotPlayer player) {
         return implementation.getUUID(player);
     }
 
@@ -96,7 +97,7 @@ public class UUIDHandler {
         return implementation.getUUID(player);
     }
 
-    public static String getName(UUID uuid) {
+    @Nullable public static String getName(UUID uuid) {
         if (implementation == null) {
             return null;
         }
@@ -120,13 +121,13 @@ public class UUIDHandler {
         return check(implementation.getPlayer(name));
     }
 
-    private static PlotPlayer check(PlotPlayer plr) {
-        if (plr != null && !plr.isOnline()) {
-            UUIDHandler.getPlayers().remove(plr.getName());
-            PlotSquared.get().IMP.unregister(plr);
-            plr = null;
+    private static PlotPlayer check(@Nullable PlotPlayer player) {
+        if (player != null && !player.isOnline()) {
+            UUIDHandler.getPlayers().remove(player.getName());
+            PlotSquared.get().IMP.unregister(player);
+            player = null;
         }
-        return plr;
+        return player;
     }
 
     public static UUID getUUIDFromString(String nameOrUUIDString) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
index baf7523ca..9ccae793b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementation.java
@@ -4,13 +4,23 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.StringWrapper;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.google.common.base.Charsets;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class UUIDHandlerImplementation {
@@ -216,7 +226,7 @@ public abstract class UUIDHandlerImplementation {
         this.uuidMap.clear();
     }
 
-    public String getName(UUID uuid) {
+    @Nullable public String getName(UUID uuid) {
         if (uuid == null) {
             return null;
         }
@@ -227,7 +237,7 @@ public abstract class UUIDHandlerImplementation {
         return null;
     }
 
-    public UUID getUUID(String name, RunnableVal<UUID> ifFetch) {
+    @Nullable public UUID getUUID(String name, RunnableVal<UUID> ifFetch) {
         if (name.isEmpty()) {
             return null;
         }
@@ -255,7 +265,7 @@ public abstract class UUIDHandlerImplementation {
         return null;
     }
 
-    public UUID getUUID(PlotPlayer player) {
+    @NotNull public UUID getUUID(PlotPlayer player) {
         return this.uuidWrapper.getUUID(player);
     }
 
@@ -263,7 +273,7 @@ public abstract class UUIDHandlerImplementation {
         return this.uuidWrapper.getUUID(player);
     }
 
-    public PlotPlayer getPlayer(UUID uuid) {
+    @Nullable public PlotPlayer getPlayer(UUID uuid) {
         String name = getName(uuid);
         if (name != null) {
             return getPlayer(name);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
index 2e05542aa..3aaed57fb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/WorldUtil.java
@@ -3,9 +3,17 @@ package com.github.intellectualsites.plotsquared.plot.util;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.*;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.PlotItem;
-import com.sk89q.jnbt.*;
+import com.sk89q.jnbt.CompoundTag;
+import com.sk89q.jnbt.IntTag;
+import com.sk89q.jnbt.NBTInputStream;
+import com.sk89q.jnbt.NBTOutputStream;
+import com.sk89q.jnbt.Tag;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URL;
 import java.util.Map;
 import java.util.Set;
@@ -66,7 +74,6 @@ public abstract class WorldUtil {
                 try (final ZipOutputStream zos = new ZipOutputStream(output)) {
                     File dat = getDat(plot.getWorldName());
                     Location spawn = getSpawn(plot.getWorldName());
-                    byte[] buffer = new byte[1024];
                     if (dat != null) {
                         ZipEntry ze = new ZipEntry("world" + File.separator + dat.getName());
                         zos.putNextEntry(ze);
@@ -89,6 +96,7 @@ public abstract class WorldUtil {
                         }
                     }
                     setSpawn(spawn);
+                    byte[] buffer = new byte[1024];
                     for (Plot current : plot.getConnectedPlots()) {
                         Location bot = current.getBottomAbs();
                         Location top = current.getTopAbs();
@@ -107,12 +115,12 @@ public abstract class WorldUtil {
                                         "world" + File.separator + "region" + File.separator
                                             + name);
                                     zos.putNextEntry(ze);
-                                    final FileInputStream in = new FileInputStream(file);
-                                    int len;
-                                    while ((len = in.read(buffer)) > 0) {
-                                        zos.write(buffer, 0, len);
+                                    try (FileInputStream in = new FileInputStream(file)) {
+                                        int len;
+                                        while ((len = in.read(buffer)) > 0) {
+                                            zos.write(buffer, 0, len);
+                                        }
                                     }
-                                    in.close();
                                     zos.closeEntry();
                                 }
                             }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
index a448eb127..6d75b6bfb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/GlobalBlockQueue.java
@@ -81,52 +81,50 @@ public class GlobalBlockQueue {
             return false;
         }
         running.set(true);
-        TaskManager.runTaskRepeat(new Runnable() {
-            @Override public void run() {
-                if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
-                    lastSuccess = System.currentTimeMillis();
-                    tasks();
-                    return;
-                }
-                SET_TASK.value1 = 50 + Math.min(
-                    (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
-                        System.currentTimeMillis()),
-                    GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
-                SET_TASK.value2 = getNextQueue();
-                if (SET_TASK.value2 == null) {
-                    return;
-                }
-                if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
-                    throw new IllegalStateException(
-                        "This shouldn't be possible for placement to occur off the main thread");
-                }
-                // Disable the async catcher as it can't discern async vs parallel
-                SET_TASK.value2.startSet(true);
-                try {
-                    if (PARALLEL_THREADS <= 1) {
-                        SET_TASK.run();
-                    } else {
-                        ArrayList<Thread> threads = new ArrayList<>();
-                        for (int i = 0; i < PARALLEL_THREADS; i++) {
-                            threads.add(new Thread(SET_TASK));
-                        }
-                        for (Thread thread : threads) {
-                            thread.start();
-                        }
-                        for (Thread thread : threads) {
-                            try {
-                                thread.join();
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
+        TaskManager.runTaskRepeat(() -> {
+            if (inactiveQueues.isEmpty() && activeQueues.isEmpty()) {
+                lastSuccess = System.currentTimeMillis();
+                tasks();
+                return;
+            }
+            SET_TASK.value1 = 50 + Math.min(
+                (50 + GlobalBlockQueue.this.last) - (GlobalBlockQueue.this.last =
+                    System.currentTimeMillis()),
+                GlobalBlockQueue.this.secondLast - System.currentTimeMillis());
+            SET_TASK.value2 = getNextQueue();
+            if (SET_TASK.value2 == null) {
+                return;
+            }
+            if (!PlotSquared.get().isMainThread(Thread.currentThread())) {
+                throw new IllegalStateException(
+                    "This shouldn't be possible for placement to occur off the main thread");
+            }
+            // Disable the async catcher as it can't discern async vs parallel
+            SET_TASK.value2.startSet(true);
+            try {
+                if (PARALLEL_THREADS <= 1) {
+                    SET_TASK.run();
+                } else {
+                    ArrayList<Thread> threads = new ArrayList<>();
+                    for (int i = 0; i < PARALLEL_THREADS; i++) {
+                        threads.add(new Thread(SET_TASK));
+                    }
+                    for (Thread thread : threads) {
+                        thread.start();
+                    }
+                    for (Thread thread : threads) {
+                        try {
+                            thread.join();
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
                         }
                     }
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } finally {
-                    // Enable it again (note that we are still on the main thread)
-                    SET_TASK.value2.endSet(true);
                 }
+            } catch (Throwable e) {
+                e.printStackTrace();
+            } finally {
+                // Enable it again (note that we are still on the main thread)
+                SET_TASK.value2.endSet(true);
             }
         }, 1);
         return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
index cf4e025eb..2fbcdee01 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/expiry/ExpireManager.java
@@ -169,13 +169,12 @@ public class ExpireManager {
             return new ArrayList<>();
         }
 
-        boolean shouldCheckAccountAge = false;
-
         long diff = getAge(plot);
         if (diff == 0) {
             return new ArrayList<>();
         }
         // Filter out non old plots
+        boolean shouldCheckAccountAge = false;
         for (int i = 0; i < applicable.size(); i++) {
             ExpiryTask et = applicable.poll();
             if (et.applies(diff)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
index 235b51a34..c2a0af542 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/uuid/UUIDWrapper.java
@@ -2,12 +2,13 @@ package com.github.intellectualsites.plotsquared.plot.uuid;
 
 import com.github.intellectualsites.plotsquared.plot.object.OfflinePlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
 
 public abstract class UUIDWrapper {
 
-    public abstract UUID getUUID(PlotPlayer player);
+    @NotNull public abstract UUID getUUID(PlotPlayer player);
 
     public abstract UUID getUUID(OfflinePlotPlayer player);
 

From 427504fd7c83e52f4d38490d797e1cd39511bb38 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 17 May 2019 14:26:47 -0400
Subject: [PATCH 179/210] Commented out Multiverse-Core and Bump to 1.14.1

---
 Bukkit/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 2a6b17d65..1d03fd0f8 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -3,7 +3,7 @@ repositories {
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url "http://nexus.hc.to/content/repositories/pub_releases" }
     maven { url "https://repo.codemc.org/repository/maven-public" }
-    maven { url 'http://repo.onarandombox.com/content/groups/public'}
+    //maven { url 'http://repo.onarandombox.com/content/groups/public'}
     maven { url 'https://papermc.io/repo/repository/maven-public/' }
     mavenLocal()
 }
@@ -11,9 +11,9 @@ repositories {
 dependencies {
     implementation project(':Core')
     compile project(':Core')
-    compile 'com.destroystokyo.paper:paper-api:1.14-R0.1-SNAPSHOT'
-    implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
-    implementation 'org.spigotmc:spigot-api:1.14-R0.1-SNAPSHOT'
+    compile 'com.destroystokyo.paper:paper-api:1.14.1-R0.1-SNAPSHOT'
+    //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
+    implementation 'org.spigotmc:spigot-api:1.14.1-R0.1-SNAPSHOT'
     compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'

From 6f5cb30734ea8ce2092e577f7f8ed5ffbbfa93cc Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 17 May 2019 14:38:57 -0400
Subject: [PATCH 180/210] Minor message changes and variable changes

---
 .../plotsquared/bukkit/BukkitMain.java        | 22 +----------
 .../generator/BukkitAugmentedGenerator.java   |  4 +-
 .../bukkit/generator/BukkitPlotGenerator.java |  8 ++--
 .../generator/DelegatePlotGenerator.java      | 39 +++++++++++--------
 .../bukkit/generator/PlotBlockPopulator.java  |  4 +-
 .../bukkit/util/block/GenChunk.java           | 17 ++++----
 .../plot/generator/AugmentedUtils.java        |  3 +-
 .../object/worlds/DefaultPlotAreaManager.java |  6 ++-
 8 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index 94f6adcb7..e473076ac 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -40,8 +40,6 @@ import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
 import com.github.intellectualsites.plotsquared.plot.uuid.UUIDWrapper;
 import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.extension.platform.Capability;
 import lombok.Getter;
 import lombok.NonNull;
 import org.bukkit.*;
@@ -54,7 +52,6 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import javax.annotation.Nullable;
@@ -114,22 +111,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return Bukkit.getVersion();
     }
 
-    private void init() {
-        try {
-            PluginManager manager = Bukkit.getPluginManager();
-            System.out.println("[P2] Force loading WorldEdit");
-            Plugin plugin = manager.getPlugin("WorldEdit");
-            if (!manager.isPluginEnabled("WorldEdit")) {
-                manager.enablePlugin(WorldEditPlugin.getPlugin(WorldEditPlugin.class));
-            }
-            System.out.println("[P2] Testing platform capabilities");
-            WorldEdit.getInstance().getPlatformManager().queryCapability(Capability.GAME_HOOKS);
-        } catch (final Throwable throwable) {
-            throw new IllegalStateException(
-                "Failed to force load WorldEdit. Road schematics will fail to generate", throwable);
-        }
-    }
-
     @Override public void onEnable() {
         this.pluginName = getDescription().getName();
         PlotPlayer.registerConverter(Player.class, BukkitUtil::getPlayer);
@@ -146,7 +127,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
             System.out.println("[P2] DOWNLOAD: https://papermc.io/downloads");
             System.out.println("[P2] GUIDE: https://www.spigotmc.org/threads/21726/");
             System.out.println("[P2] NOTE: This is only a recommendation");
-            System.out.println("[P2]       both Spigot and CraftBukkit are still supported.");
+            System.out.println("[P2]       Spigot is still supported.");
             System.out
                 .println("[P2] ===============================================================");
         }
@@ -158,6 +139,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                 "You can't use this version of PlotSquared on a server less than Minecraft 1.13.2.");
             System.out
                 .println("Please check the download page for the link to the legacy versions.");
+            System.out.println("The server will now be shutdown to prevent any corruption.");
             Bukkit.shutdown();
             return;
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
index 6942bf6ab..03b0c8123 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
@@ -4,6 +4,7 @@ import com.github.intellectualsites.plotsquared.plot.generator.AugmentedUtils;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
@@ -24,7 +25,8 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
         return generator;
     }
 
-    @Override public void populate(World world, Random random, Chunk source) {
+    @Override
+    public void populate(@NotNull World world, @NotNull Random random, @NotNull Chunk source) {
         AugmentedUtils.generate(world.getName(), source.getX(), source.getZ(), null);
     }
 }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index b6a246f0d..1f1976889 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -123,19 +123,19 @@ public class BukkitPlotGenerator extends ChunkGenerator
 
         GenChunk result = new GenChunk();
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
-            if (result.getCd() != null) {
+            if (result.getChunkData() != null) {
                 for (int cx = 0; cx < 16; cx++) {
                     for (int cz = 0; cz < 16; cz++) {
                         biome.setBiome(cx, cz, Biome.PLAINS);
                     }
                 }
-                return result.getCd();
+                return result.getChunkData();
             }
         }
         // Set the chunk location
         result.setChunk(new ChunkWrapper(world.getName(), x, z));
         // Set the result data
-        result.setCd(createChunkData(world));
+        result.setChunkData(createChunkData(world));
         result.biomeGrid = biome;
         result.result = null;
 
@@ -151,7 +151,7 @@ public class BukkitPlotGenerator extends ChunkGenerator
             e.printStackTrace();
         }
         // Return the result data
-        return result.getCd();
+        return result.getChunkData();
     }
 
     private void generate(ChunkLoc loc, World world, ScopedLocalBlockQueue result) {
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
index 820a9fa42..8c1d97947 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@@ -4,7 +4,12 @@ import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.generator.IndependentPlotGenerator;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
 import lombok.RequiredArgsConstructor;
@@ -61,27 +66,27 @@ import java.util.Random;
     }
 
     @Override public void generateChunk(final ScopedLocalBlockQueue result, PlotArea settings) {
-        World w = BukkitUtil.getWorld(world);
+        World world = BukkitUtil.getWorld(this.world);
         Location min = result.getMin();
-        int cx = min.getX() >> 4;
-        int cz = min.getZ() >> 4;
-        Random r = new Random(MathMan.pair((short) cx, (short) cz));
-        ChunkGenerator.BiomeGrid grid = new ChunkGenerator.BiomeGrid() {
-            @Override public void setBiome(int x, int z, Biome biome) {
-                result.setBiome(x, z, biome.name());
-            }
-
-            @Override @NotNull public Biome getBiome(int x, int z) {
-                return Biome.FOREST;
-            }
-        };
+        int chunkX = min.getX() >> 4;
+        int chunkZ = min.getZ() >> 4;
+        Random random = new Random(MathMan.pair((short) chunkX, (short) chunkZ));
         try {
-            chunkGenerator.generateChunkData(w, r, cx, cz, grid);
+            ChunkGenerator.BiomeGrid grid = new ChunkGenerator.BiomeGrid() {
+                @Override public void setBiome(int x, int z, Biome biome) {
+                    result.setBiome(x, z, biome.name());
+                }
+
+                @Override @NotNull public Biome getBiome(int x, int z) {
+                    return Biome.FOREST;
+                }
+            };
+            chunkGenerator.generateChunkData(world, random, chunkX, chunkZ, grid);
             return;
         } catch (Throwable ignored) {
         }
-        for (BlockPopulator populator : chunkGenerator.getDefaultPopulators(w)) {
-            populator.populate(w, r, w.getChunkAt(cx, cz));
+        for (BlockPopulator populator : chunkGenerator.getDefaultPopulators(world)) {
+            populator.populate(world, random, world.getChunkAt(chunkX, chunkZ));
         }
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java
index 4e2fee0b5..9236e184a 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java
@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Random;
 
@@ -19,7 +20,8 @@ import java.util.Random;
     private final IndependentPlotGenerator plotGenerator;
     private LocalBlockQueue queue;
 
-    @Override public void populate(final World world, final Random random, final Chunk source) {
+    @Override public void populate(@NotNull final World world, @NotNull final Random random,
+        @NotNull final Chunk source) {
         if (this.queue == null) {
             this.queue = GlobalBlockQueue.IMP.getNewQueue(world.getName(), false);
         }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
index 1049d902a..fc2bc3574 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java
@@ -28,7 +28,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
     public String world;
     public int chunkX;
     public int chunkZ;
-    @Getter @Setter private ChunkData cd = null;
+    @Getter @Setter private ChunkData chunkData = null;
 
     public GenChunk() {
         super(null, new Location(null, 0, 0, 0), new Location(null, 15, 255, 15));
@@ -88,7 +88,8 @@ public class GenChunk extends ScopedLocalBlockQueue {
         int maxX = Math.max(pos1.getX(), pos2.getX());
         int maxY = Math.max(pos1.getY(), pos2.getY());
         int maxZ = Math.max(pos1.getZ(), pos2.getZ());
-        cd.setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, block.to(Material.class));
+        chunkData
+            .setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, block.to(Material.class));
     }
 
     @Override public boolean setBiome(int x, int z, String biome) {
@@ -105,10 +106,10 @@ public class GenChunk extends ScopedLocalBlockQueue {
 
     @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
         if (this.result == null) {
-            this.cd.setBlock(x, y, z, id.to(Material.class));
+            this.chunkData.setBlock(x, y, z, id.to(Material.class));
             return true;
         }
-        this.cd.setBlock(x, y, z, id.to(Material.class));
+        this.chunkData.setBlock(x, y, z, id.to(Material.class));
         this.storeCache(x, y, z, id);
         return true;
     }
@@ -125,10 +126,10 @@ public class GenChunk extends ScopedLocalBlockQueue {
 
     @Override public boolean setBlock(int x, int y, int z, BaseBlock id) {
         if (this.result == null) {
-            this.cd.setBlock(x, y, z, BukkitAdapter.adapt(id));
+            this.chunkData.setBlock(x, y, z, BukkitAdapter.adapt(id));
             return true;
         }
-        this.cd.setBlock(x, y, z, BukkitAdapter.adapt(id));
+        this.chunkData.setBlock(x, y, z, BukkitAdapter.adapt(id));
         this.storeCache(x, y, z, PlotBlock.get(id.getBlockType().getId()));
         return true;
     }
@@ -136,7 +137,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
     @Override public PlotBlock getBlock(int x, int y, int z) {
         int i = MainUtil.CACHE_I[y][x][z];
         if (result == null) {
-            return PlotBlock.get(cd.getType(x, y, z));
+            return PlotBlock.get(chunkData.getType(x, y, z));
         }
         PlotBlock[] array = result[i];
         if (array == null) {
@@ -177,7 +178,7 @@ public class GenChunk extends ScopedLocalBlockQueue {
                 }
             }
         }
-        toReturn.cd = this.cd;
+        toReturn.chunkData = this.chunkData;
         return toReturn;
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
index 005a22d72..a8fb953d9 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
@@ -11,6 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.block.DelegateLocalBlo
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Set;
 
@@ -24,7 +25,7 @@ public class AugmentedUtils {
         enabled = true;
     }
 
-    public static boolean generate(final String world, final int cx, final int cz,
+    public static boolean generate(@NotNull final String world, final int cx, final int cz,
         LocalBlockQueue queue) {
         if (!enabled) {
             return false;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
index 9a9abca74..31a86b874 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java
@@ -139,7 +139,11 @@ public class DefaultPlotAreaManager implements PlotAreaManager {
                 return null;
             case 1:
                 PlotArea pa = this.plotAreas[0];
-                return pa.contains(location) ? pa : null;
+                if (pa.contains(location)) {
+                    return pa;
+                } else {
+                    return null;
+                }
             case 2:
             case 3:
             case 4:

From 595a68ecbaf9e8eab48b0264d0759a793602a67f Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 17 May 2019 15:32:05 -0400
Subject: [PATCH 181/210] variable renames

---
 .../bukkit/generator/BukkitPlotGenerator.java |  6 ++--
 .../plotsquared/bukkit/util/SendChunk.java    |  8 ++---
 .../plotsquared/plot/commands/Set.java        | 15 +++++++---
 .../plotsquared/plot/commands/Trim.java       |  3 +-
 .../plot/generator/AugmentedUtils.java        | 30 +++++++++----------
 .../plot/generator/ClassicPlotManager.java    |  1 -
 .../plotsquared/plot/object/Plot.java         | 21 ++++++-------
 .../plotsquared/plot/util/ChunkManager.java   | 22 +++++++++-----
 .../plot/util/block/BasicLocalBlockQueue.java | 24 +++++++--------
 .../plot/util/block/LocalBlockQueue.java      |  8 +++--
 10 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
index 1f1976889..465fcab20 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@@ -124,9 +124,9 @@ public class BukkitPlotGenerator extends ChunkGenerator
         GenChunk result = new GenChunk();
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
             if (result.getChunkData() != null) {
-                for (int cx = 0; cx < 16; cx++) {
-                    for (int cz = 0; cz < 16; cz++) {
-                        biome.setBiome(cx, cz, Biome.PLAINS);
+                for (int chunkX = 0; chunkX < 16; chunkX++) {
+                    for (int chunkZ = 0; chunkZ < 16; chunkZ++) {
+                        biome.setBiome(chunkX, chunkZ, Biome.PLAINS);
                     }
                 }
                 return result.getChunkData();
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
index 62d82cedb..6ed7317b6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java
@@ -88,14 +88,14 @@ public class SendChunk {
             if (location == null) {
                 location = pp.getLocation();
             }
-            int cx = location.getX() >> 4;
-            int cz = location.getZ() >> 4;
+            int chunkX = location.getX() >> 4;
+            int chunkZ = location.getZ() >> 4;
             Player player = ((BukkitPlayer) pp).player;
             Object entity = this.methodGetHandlePlayer.of(player).call();
 
             for (Chunk chunk : list) {
-                int dx = Math.abs(cx - chunk.getX());
-                int dz = Math.abs(cz - chunk.getZ());
+                int dx = Math.abs(chunkX - chunk.getX());
+                int dz = Math.abs(chunkZ - chunk.getZ());
                 if ((dx > view) || (dz > view)) {
                     continue;
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
index 6f9277166..8a3406cda 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
@@ -8,8 +8,17 @@ import com.github.intellectualsites.plotsquared.plot.config.Configuration.Unknow
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.WorldUtil;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 
 import java.util.ArrayList;
@@ -60,8 +69,6 @@ import java.util.stream.IntStream;
                                 MainUtil.sendMessage(player, Captions.NEED_BLOCK);
                                 return true;
                             }
-                            String[] split = material.split(",");
-                            // blocks = Configuration.BLOCKLIST.parseString(material);
 
                             try {
                                 bucket = Configuration.BLOCK_BUCKET.parseString(material);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
index 291657454..680a77552 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
@@ -95,8 +95,7 @@ import java.util.Set;
             return false;
         }
         MainUtil.sendMessage(null, "Collecting region data...");
-        ArrayList<Plot> plots = new ArrayList<>();
-        plots.addAll(PlotSquared.get().getPlots(world));
+        ArrayList<Plot> plots = new ArrayList<>(PlotSquared.get().getPlots(world));
         if (ExpireManager.IMP != null) {
             plots.removeAll(ExpireManager.IMP.getPendingExpired());
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
index a8fb953d9..998edae06 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
@@ -25,15 +25,15 @@ public class AugmentedUtils {
         enabled = true;
     }
 
-    public static boolean generate(@NotNull final String world, final int cx, final int cz,
+    public static boolean generate(@NotNull final String world, final int chunkX, final int chunkZ,
         LocalBlockQueue queue) {
         if (!enabled) {
             return false;
         }
 
-        final int bx = cx << 4;
-        final int bz = cz << 4;
-        RegionWrapper region = new RegionWrapper(bx, bx + 15, bz, bz + 15);
+        final int blockX = chunkX << 4;
+        final int blockZ = chunkZ << 4;
+        RegionWrapper region = new RegionWrapper(blockX, blockX + 15, blockZ, blockZ + 15);
         Set<PlotArea> areas = PlotSquared.get().getPlotAreas(world, region);
         if (areas.isEmpty()) {
             return false;
@@ -62,10 +62,10 @@ public class AugmentedUtils {
             int tzz;
             // gen
             if (area.TYPE == 2) {
-                bxx = Math.max(0, area.getRegion().minX - bx);
-                bzz = Math.max(0, area.getRegion().minZ - bz);
-                txx = Math.min(15, area.getRegion().maxX - bx);
-                tzz = Math.min(15, area.getRegion().maxZ - bz);
+                bxx = Math.max(0, area.getRegion().minX - blockX);
+                bzz = Math.max(0, area.getRegion().minZ - blockZ);
+                txx = Math.min(15, area.getRegion().maxX - blockX);
+                tzz = Math.min(15, area.getRegion().maxZ - blockZ);
                 primaryMask = new DelegateLocalBlockQueue(queue) {
                     @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
                         if (area.contains(x, z)) {
@@ -94,8 +94,8 @@ public class AugmentedUtils {
                 boolean has = false;
                 for (int x = bxx; x <= txx; x++) {
                     for (int z = bzz; z <= tzz; z++) {
-                        int rx = x + bx;
-                        int rz = z + bz;
+                        int rx = x + blockX;
+                        int rz = z + blockZ;
                         boolean can = manager.getPlotId(area, rx, 0, rz) == null;
                         if (can) {
                             for (int y = 1; y < 128; y++) {
@@ -112,7 +112,7 @@ public class AugmentedUtils {
                 toReturn = true;
                 secondaryMask = new DelegateLocalBlockQueue(primaryMask) {
                     @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-                        if (canPlace[x - bx][z - bz]) {
+                        if (canPlace[x - blockX][z - blockZ]) {
                             return super.setBlock(x, y, z, id);
                         }
                         return false;
@@ -127,15 +127,15 @@ public class AugmentedUtils {
                 for (int x = bxx; x <= txx; x++) {
                     for (int z = bzz; z <= tzz; z++) {
                         for (int y = 1; y < 128; y++) {
-                            queue.setBlock(bx + x, y, bz + z, air);
+                            queue.setBlock(blockX + x, y, blockZ + z, air);
                         }
                     }
                 }
                 toReturn = true;
             }
-            ScopedLocalBlockQueue scoped =
-                new ScopedLocalBlockQueue(secondaryMask, new Location(area.worldname, bx, 0, bz),
-                    new Location(area.worldname, bx + 15, 255, bz + 15));
+            ScopedLocalBlockQueue scoped = new ScopedLocalBlockQueue(secondaryMask,
+                new Location(area.worldname, blockX, 0, blockZ),
+                new Location(area.worldname, blockX + 15, 255, blockZ + 15));
             generator.generateChunk(scoped, area);
             generator.populateChunk(scoped, area);
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index bd465a12f..2ae0ca358 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -249,7 +249,6 @@ public class ClassicPlotManager extends SquarePlotManager {
             .subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0,
                 plot.getMerged(Direction.NORTH) ? 0 : 1);
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
-        PseudoRandom random = new PseudoRandom();
         LocalBlockQueue queue = plotArea.getQueue(false);
         int y = dpw.WALL_HEIGHT + 1;
         if (!plot.getMerged(Direction.NORTH)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 78c7675d2..479bfb923 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -2410,9 +2410,7 @@ public class Plot {
         if (this.settings == null) {
             return Collections.singleton(this);
         }
-        boolean[] merged = this.getMerged();
-        int hash = MainUtil.hash(merged);
-        if (hash == 0) {
+        if (!this.isMerged()) {
             return Collections.singleton(this);
         }
         if (connected_cache != null && connected_cache.contains(this)) {
@@ -2425,7 +2423,7 @@ public class Plot {
         Plot tmp;
         HashSet<Object> queuecache = new HashSet<>();
         ArrayDeque<Plot> frontier = new ArrayDeque<>();
-        if (merged[0]) {
+        if (this.getMerged(Direction.NORTH)) {
             tmp = this.area.getPlotAbs(this.id.getRelative(Direction.NORTH));
             if (!tmp.getMerged(Direction.SOUTH)) {
                 // invalid merge
@@ -2441,7 +2439,7 @@ public class Plot {
             queuecache.add(tmp);
             frontier.add(tmp);
         }
-        if (merged[1]) {
+        if (this.getMerged(Direction.EAST)) {
             tmp = this.area.getPlotAbs(this.id.getRelative(Direction.EAST));
             if (!tmp.getMerged(Direction.WEST)) {
                 // invalid merge
@@ -2457,7 +2455,7 @@ public class Plot {
             queuecache.add(tmp);
             frontier.add(tmp);
         }
-        if (merged[2]) {
+        if (this.getMerged(Direction.SOUTH)) {
             tmp = this.area.getPlotAbs(this.id.getRelative(Direction.SOUTH));
             if (!tmp.getMerged(Direction.NORTH)) {
                 // invalid merge
@@ -2473,7 +2471,7 @@ public class Plot {
             queuecache.add(tmp);
             frontier.add(tmp);
         }
-        if (merged[3]) {
+        if (this.getMerged(Direction.WEST)) {
             tmp = this.area.getPlotAbs(this.id.getRelative(Direction.WEST));
             if (!tmp.getMerged(Direction.EAST)) {
                 // invalid merge
@@ -2500,29 +2498,28 @@ public class Plot {
             }
             tmpSet.add(current);
             queuecache.remove(current);
-            merged = current.getMerged();
-            if (merged[0]) {
+            if (current.getMerged(Direction.NORTH)) {
                 tmp = current.area.getPlotAbs(current.id.getRelative(Direction.NORTH));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
                 }
             }
-            if (merged[1]) {
+            if (current.getMerged(Direction.EAST)) {
                 tmp = current.area.getPlotAbs(current.id.getRelative(Direction.EAST));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
                 }
             }
-            if (merged[2]) {
+            if (current.getMerged(Direction.SOUTH)) {
                 tmp = current.area.getPlotAbs(current.id.getRelative(Direction.SOUTH));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
                     frontier.add(tmp);
                 }
             }
-            if (merged[3]) {
+            if (current.getMerged(Direction.WEST)) {
                 tmp = current.area.getPlotAbs(current.id.getRelative(Direction.WEST));
                 if (tmp != null && !queuecache.contains(tmp) && !tmpSet.contains(tmp)) {
                     queuecache.add(tmp);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index a7c39cf18..101ec301a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -1,13 +1,21 @@
 package com.github.intellectualsites.plotsquared.plot.util;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.RegionWrapper;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.github.intellectualsites.plotsquared.plot.util.block.ScopedLocalBlockQueue;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 public abstract class ChunkManager {
@@ -28,11 +36,11 @@ public abstract class ChunkManager {
         RunnableVal<ScopedLocalBlockQueue> add, String world, ChunkLoc loc) {
         LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false);
         if (PlotSquared.get().isAugmented(world)) {
-            int bx = loc.x << 4;
-            int bz = loc.z << 4;
+            int blockX = loc.x << 4;
+            int blockZ = loc.z << 4;
             ScopedLocalBlockQueue scoped =
-                new ScopedLocalBlockQueue(queue, new Location(world, bx, 0, bz),
-                    new Location(world, bx + 15, 255, bz + 15));
+                new ScopedLocalBlockQueue(queue, new Location(world, blockX, 0, blockZ),
+                    new Location(world, blockX + 15, 255, blockZ + 15));
             if (force != null) {
                 force.run(scoped);
             } else {
@@ -212,11 +220,11 @@ public abstract class ChunkManager {
         File folder =
             new File(PlotSquared.get().IMP.getWorldContainer(), world + File.separator + "region");
         File[] regionFiles = folder.listFiles();
-        HashSet<ChunkLoc> chunks = new HashSet<>();
         if (regionFiles == null) {
             throw new RuntimeException(
                 "Could not find worlds folder: " + folder + " ? (no read access?)");
         }
+        HashSet<ChunkLoc> chunks = new HashSet<>();
         for (File file : regionFiles) {
             String name = file.getName();
             if (name.endsWith("mca")) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index 282c21bc4..6bad71051 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -92,12 +92,12 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
             return false;
         }
         baseBlocks = true;
-        int cx = x >> 4;
-        int cz = z >> 4;
-        if (cx != lastX || cz != lastZ) {
-            lastX = cx;
-            lastZ = cz;
-            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
+        int chunkX = x >> 4;
+        int chunkZ = z >> 4;
+        if (chunkX != lastX || chunkZ != lastZ) {
+            lastX = chunkX;
+            lastZ = chunkZ;
+            long pair = (long) (chunkX) << 32 | (chunkZ) & 0xFFFFFFFFL;
             lastWrappedChunk = this.blockChunks.get(pair);
             if (lastWrappedChunk == null) {
                 lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
@@ -121,12 +121,12 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         } else if (y < 0) {
             return false;
         }
-        int cx = x >> 4;
-        int cz = z >> 4;
-        if (cx != lastX || cz != lastZ) {
-            lastX = cx;
-            lastZ = cz;
-            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
+        int chunkX = x >> 4;
+        int chunkZ = z >> 4;
+        if (chunkX != lastX || chunkZ != lastZ) {
+            lastX = chunkX;
+            lastZ = chunkZ;
+            long pair = (long) (chunkX) << 32 | (chunkZ) & 0xFFFFFFFFL;
             lastWrappedChunk = this.blockChunks.get(pair);
             if (lastWrappedChunk == null) {
                 lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
index 16538784f..87c0fec56 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
@@ -1,6 +1,10 @@
 package com.github.intellectualsites.plotsquared.plot.util.block;
 
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
+import com.github.intellectualsites.plotsquared.plot.object.ChunkLoc;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.SchematicHandler;
 import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
@@ -106,8 +110,6 @@ public abstract class LocalBlockQueue {
         for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
             for (int x = pos1.getX(); x <= pos2.getX(); x++) {
                 for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                    // int i = PseudoRandom.random.random(blocks.length);
-                    // PlotBlock block = blocks[i];
                     setBlock(x, y, z, blocks.getBlock());
                 }
             }

From 4e3a927323f0acf360024aed6a59aecfadb7a73e Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 17 May 2019 16:21:03 -0400
Subject: [PATCH 182/210] Modifications to the generator code

---
 .../plotsquared/bukkit/BukkitMain.java        |  6 +-
 .../generator/DelegatePlotGenerator.java      |  4 +-
 .../bukkit/util/block/BukkitLocalQueue.java   | 77 +++----------------
 .../plotsquared/plot/IPlotMain.java           |  3 +-
 .../plotsquared/plot/PlotSquared.java         |  2 +-
 .../plotsquared/plot/commands/Add.java        | 12 +--
 .../plotsquared/plot/commands/Area.java       |  2 +-
 .../plotsquared/plot/commands/Trim.java       |  8 +-
 .../plot/generator/ClassicPlotWorld.java      |  4 +-
 .../plot/generator/GridPlotWorld.java         |  3 +-
 .../plot/generator/HybridPlotWorld.java       |  7 +-
 .../plot/generator/SquarePlotWorld.java       |  3 +-
 .../plotsquared/plot/object/BlockBucket.java  |  3 +-
 .../plotsquared/plot/object/PlotArea.java     | 22 +-----
 .../plot/util/block/BasicLocalBlockQueue.java |  6 +-
 .../util/block/ScopedLocalBlockQueue.java     |  7 +-
 16 files changed, 57 insertions(+), 112 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index e473076ac..e7d67c3ef 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -53,6 +53,7 @@ import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
 import java.io.File;
@@ -564,7 +565,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
     }
 
     @Override @Nullable
-    public final ChunkGenerator getDefaultWorldGenerator(final String worldName, final String id) {
+    public final ChunkGenerator getDefaultWorldGenerator(@NotNull final String worldName,
+        final String id) {
         final IndependentPlotGenerator result;
         if (id != null && id.equalsIgnoreCase("single")) {
             result = new SingleWorldGenerator();
@@ -681,7 +683,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         getServer().getPluginManager().registerEvents(new WorldEvents(), this);
     }
 
-    @Override public IndependentPlotGenerator getDefaultGenerator() {
+    @NotNull @Override public IndependentPlotGenerator getDefaultGenerator() {
         return new HybridGen();
     }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
index 8c1d97947..762e809af 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@@ -18,6 +18,7 @@ import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Range;
 
 import java.util.Random;
 
@@ -73,7 +74,8 @@ import java.util.Random;
         Random random = new Random(MathMan.pair((short) chunkX, (short) chunkZ));
         try {
             ChunkGenerator.BiomeGrid grid = new ChunkGenerator.BiomeGrid() {
-                @Override public void setBiome(int x, int z, Biome biome) {
+                @Override public void setBiome(@Range(from = 0, to = 15) int x,
+                    @Range(from = 0, to = 15) int z, Biome biome) {
                     result.setBiome(x, z, biome.name());
                 }
 
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index 483fb51c0..97dfff961 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -6,7 +6,6 @@ import com.github.intellectualsites.plotsquared.plot.object.LegacyPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
-import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 import com.github.intellectualsites.plotsquared.plot.util.block.BasicLocalBlockQueue;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -20,15 +19,10 @@ import org.bukkit.block.Biome;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.Locale;
 
 public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
 
-    private Field fieldNeighbors;
-    private Method chunkGetHandle;
-
     public BukkitLocalQueue(String world) {
         super(world);
     }
@@ -55,7 +49,11 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
 
     @Override public void refreshChunk(int x, int z) {
         World worldObj = Bukkit.getWorld(getWorld());
-        worldObj.refreshChunk(x, z);
+        if (worldObj != null) {
+            worldObj.refreshChunk(x, z);
+        } else {
+            PlotSquared.debug("Error Refreshing Chunk");
+        }
     }
 
     @Override public void fixChunkLighting(int x, int z) {
@@ -64,7 +62,11 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
 
     @Override public final void regenChunk(int x, int z) {
         World worldObj = Bukkit.getWorld(getWorld());
-        worldObj.regenerateChunk(x, z);
+        if (worldObj != null) {
+            worldObj.regenerateChunk(x, z);
+        } else {
+            PlotSquared.debug("Error Regenerating Chunk");
+        }
     }
 
     @Override public final void setComponents(LocalChunk<T> lc) {
@@ -183,14 +185,12 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
             World worldObj = Bukkit.getWorld(getWorld());
             int bx = lc.getX() << 4;
             int bz = lc.getX() << 4;
-            String last = null;
-            Biome biome = null;
             for (int x = 0; x < lc.biomes.length; x++) {
                 String[] biomes2 = lc.biomes[x];
                 if (biomes2 != null) {
                     for (String biomeStr : biomes2) {
                         if (biomeStr != null) {
-                            biome = Biome.valueOf(biomeStr.toUpperCase());
+                            Biome biome = Biome.valueOf(biomeStr.toUpperCase());
                             worldObj.setBiome(bx, bz, biome);
                         }
                     }
@@ -199,59 +199,4 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
         }
     }
 
-    /**
-     * Exploiting a bug in the vanilla lighting algorithm for faster block placement
-     * - Could have been achieved without reflection by force unloading specific chunks
-     * - Much faster just setting the variable manually though
-     *
-     * @param chunk
-     * @return
-     */
-    protected Object[] disableLighting(Chunk chunk) {
-        try {
-            if (chunkGetHandle == null) {
-                chunkGetHandle = chunk.getClass().getDeclaredMethod("getHandle");
-                chunkGetHandle.setAccessible(true);
-            }
-            Object nmsChunk = chunkGetHandle.invoke(chunk);
-            if (fieldNeighbors == null) {
-                fieldNeighbors = nmsChunk.getClass().getDeclaredField("neighbors");
-                fieldNeighbors.setAccessible(true);
-            }
-            Object value = fieldNeighbors.get(nmsChunk);
-            fieldNeighbors.set(nmsChunk, 0);
-            return new Object[] {nmsChunk, value};
-        } catch (Throwable ignore) {
-        }
-        return null;
-    }
-
-    protected void disableLighting(Object[] disableResult) {
-        if (disableResult != null) {
-            try {
-                fieldNeighbors.set(disableResult[0], 0);
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    protected void resetLighting(Object[] disableResult) {
-        if (disableResult != null) {
-            try {
-                fieldNeighbors.set(disableResult[0], disableResult[1]);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    protected void enableLighting(Object[] disableResult) {
-        if (disableResult != null) {
-            try {
-                fieldNeighbors.set(disableResult[0], 0x739C0);
-            } catch (Throwable ignore) {
-            }
-        }
-    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
index 6ca241dcd..549da8c05 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -8,6 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.object.BlockRegistry;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.block.QueueProvider;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.List;
@@ -246,7 +247,7 @@ public interface IPlotMain extends ILogger {
      *
      * @return Default implementation generator
      */
-    IndependentPlotGenerator getDefaultGenerator();
+    @NotNull IndependentPlotGenerator getDefaultGenerator();
 
     /**
      * Gets the class that will manage player titles.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 7c94060fd..892a5bbe8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1333,8 +1333,8 @@ import java.util.zip.ZipInputStream;
                 }
                 String key = pair[0].toLowerCase();
                 String value = pair[1];
-                String base = "worlds." + world + ".";
                 try {
+                    String base = "worlds." + world + ".";
                     switch (key) {
                         case "s":
                         case "size":
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
index 5741fb7ba..57c910ea6 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
@@ -36,25 +36,25 @@ import java.util.UUID;
         checkTrue(args.length == 1, Captions.COMMAND_SYNTAX, getUsage());
         final Set<UUID> uuids = MainUtil.getUUIDsFromString(args[0]);
         checkTrue(!uuids.isEmpty(), Captions.INVALID_PLAYER, args[0]);
-        Iterator<UUID> iter = uuids.iterator();
+        Iterator<UUID> iterator = uuids.iterator();
         int size = plot.getTrusted().size() + plot.getMembers().size();
-        while (iter.hasNext()) {
-            UUID uuid = iter.next();
+        while (iterator.hasNext()) {
+            UUID uuid = iterator.next();
             if (uuid == DBFunc.EVERYONE && !(
                 Permissions.hasPermission(player, Captions.PERMISSION_TRUST_EVERYONE) || Permissions
                     .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_TRUST))) {
                 MainUtil.sendMessage(player, Captions.INVALID_PLAYER, MainUtil.getName(uuid));
-                iter.remove();
+                iterator.remove();
                 continue;
             }
             if (plot.isOwner(uuid)) {
                 MainUtil.sendMessage(player, Captions.ALREADY_OWNER, MainUtil.getName(uuid));
-                iter.remove();
+                iterator.remove();
                 continue;
             }
             if (plot.getMembers().contains(uuid)) {
                 MainUtil.sendMessage(player, Captions.ALREADY_ADDED, MainUtil.getName(uuid));
-                iter.remove();
+                iterator.remove();
                 continue;
             }
             size += plot.getTrusted().contains(uuid) ? 0 : 1;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
index bfd42f36e..ed6a4a3dc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Area.java
@@ -143,7 +143,6 @@ import java.util.Set;
                                 return true;
                         }
                     default: // Start creation
-                        final SetupObject object = new SetupObject();
                         String[] split = args[1].split(":");
                         String id;
                         if (split.length == 2) {
@@ -151,6 +150,7 @@ import java.util.Set;
                         } else {
                             id = null;
                         }
+                        final SetupObject object = new SetupObject();
                         object.world = split[0];
                         final HybridPlotWorld pa = new HybridPlotWorld(object.world, id,
                             PlotSquared.get().IMP.getDefaultGenerator(), null, null);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
index 680a77552..3b3504c24 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trim.java
@@ -197,11 +197,9 @@ import java.util.Set;
                         }
                     };
                 } else {
-                    regenTask = new Runnable() {
-                        @Override public void run() {
-                            Trim.TASK = false;
-                            player.sendMessage("Trim done!");
-                        }
+                    regenTask = () -> {
+                        Trim.TASK = false;
+                        player.sendMessage("Trim done!");
                     };
                 }
                 ChunkManager.manager.deleteRegionFiles(world, viable, regenTask);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
index 755f694d6..6bf38d22c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java
@@ -8,6 +8,7 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.BlockBucket;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 import java.lang.reflect.Field;
@@ -32,7 +33,8 @@ import java.util.Locale;
     // PlotBlock.get((short) 155, (byte) 0);
     public boolean PLOT_BEDROCK = true;
 
-    public ClassicPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+    public ClassicPlotWorld(String worldName, String id,
+        @NotNull IndependentPlotGenerator generator,
         PlotId min, PlotId max) {
         super(worldName, id, generator, min, max);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
index 34dbef203..b0cc10323 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotWorld.java
@@ -2,12 +2,13 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class GridPlotWorld extends PlotArea {
 
     public short SIZE;
 
-    public GridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+    public GridPlotWorld(String worldName, String id, @NotNull IndependentPlotGenerator generator,
         PlotId min, PlotId max) {
         super(worldName, id, generator, min, max);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index 880ddee35..e8f1ed06a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -21,6 +21,7 @@ import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.transform.AffineTransform;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.HashMap;
@@ -37,7 +38,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public int SCHEM_Y;
     private Location SIGN_LOCATION;
 
-    public HybridPlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+    public HybridPlotWorld(String worldName, String id, @NotNull IndependentPlotGenerator generator,
         PlotId min, PlotId max) {
         super(worldName, id, generator, min, max);
     }
@@ -119,8 +120,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
         try {
             setupSchematics();
-        } catch (Exception ignored) {
-            ignored.printStackTrace();
+        } catch (Exception event) {
+            event.printStackTrace();
             PlotSquared.debug("&c - road schematics are disabled for this world.");
         }
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
index 5401d221a..c2d1ddb31 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotWorld.java
@@ -3,6 +3,7 @@ package com.github.intellectualsites.plotsquared.plot.generator;
 import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import org.jetbrains.annotations.NotNull;
 
 public abstract class SquarePlotWorld extends GridPlotWorld {
 
@@ -11,7 +12,7 @@ public abstract class SquarePlotWorld extends GridPlotWorld {
     public int ROAD_OFFSET_X = 0;
     public int ROAD_OFFSET_Z = 0;
 
-    public SquarePlotWorld(String worldName, String id, IndependentPlotGenerator generator,
+    public SquarePlotWorld(String worldName, String id, @NotNull IndependentPlotGenerator generator,
         PlotId min, PlotId max) {
         super(worldName, id, generator, min, max);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
index 6900500f9..8dde0ee20 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -135,7 +136,7 @@ import java.util.Map.Entry;
         }
     }
 
-    @Override public Iterator<PlotBlock> iterator() {
+    @NotNull @Override public Iterator<PlotBlock> iterator() {
         return this.bucketIterator;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 253d74b40..785b20e1e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -21,6 +21,7 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -76,11 +77,11 @@ public abstract class PlotArea {
     private QuadMap<PlotCluster> clusters;
 
     public PlotArea(@Nonnull final String worldName, @Nullable final String id,
-        @Nullable IndependentPlotGenerator generator, @Nullable final PlotId min,
+        @NotNull IndependentPlotGenerator generator, @Nullable final PlotId min,
         @Nullable final PlotId max) {
         this.worldname = worldName;
         this.id = id;
-        this.manager = generator != null ? generator.getNewPlotManager() : null;
+        this.manager = generator.getNewPlotManager();
         this.generator = generator;
         if (min == null || max == null) {
             if (min != max) {
@@ -94,28 +95,13 @@ public abstract class PlotArea {
             this.max = max;
         }
         this.worldhash = worldName.hashCode();
-        if (Settings.Enabled_Components.PLOT_EXPIRY && generator != null) {
+        if (Settings.Enabled_Components.PLOT_EXPIRY) {
             blockBucketChunk = generator.generateBlockBucketChunk(this);
         } else {
             blockBucketChunk = null;
         }
     }
 
-    /**
-     * Create a new PlotArea object with no functionality/information.
-     * - Mainly used during startup before worlds are created as a temporary object
-     */
-    public static PlotArea createGeneric(@Nonnull final String world) {
-        return new PlotArea(world, null, null, null, null) {
-            @Override public void loadConfiguration(ConfigurationSection config) {
-            }
-
-            @Override public ConfigurationNode[] getSettingNodes() {
-                return null;
-            }
-        };
-    }
-
     public LocalBlockQueue getQueue(final boolean autoQueue) {
         return GlobalBlockQueue.IMP.getNewQueue(worldname, autoQueue);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index 6bad71051..e35e81f6b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -181,16 +181,16 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     }
 
 
-    public abstract class LocalChunk<T> {
+    public abstract class LocalChunk<B> {
         public final BasicLocalBlockQueue parent;
         public final int z;
         public final int x;
 
-        public T[] blocks;
+        public B[] blocks;
         public BaseBlock[][] baseblocks;
         public String[][] biomes;
 
-        public LocalChunk(BasicLocalBlockQueue<T> parent, int x, int z) {
+        public LocalChunk(BasicLocalBlockQueue<B> parent, int x, int z) {
             this.parent = parent;
             this.x = x;
             this.z = z;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
index 352465aea..c9065f65e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/ScopedLocalBlockQueue.java
@@ -1,7 +1,12 @@
 package com.github.intellectualsites.plotsquared.plot.util.block;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal3;
 import com.sk89q.worldedit.world.block.BaseBlock;
 
 public class ScopedLocalBlockQueue extends DelegateLocalBlockQueue {

From 5dd2610b5e11c91b230095a5d54195c932888d66 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 17 May 2019 18:49:09 -0400
Subject: [PATCH 183/210] Misc. changes and removal of title manager

---
 .../plotsquared/bukkit/BukkitMain.java        |  5 ----
 .../plotsquared/bukkit/chat/Reflection.java   | 12 ++--------
 .../bukkit/listeners/PlayerEvents.java        |  4 ++--
 .../bukkit/object/BukkitPlayer.java           |  9 +++----
 .../entity/ReplicatingEntityWrapper.java      | 19 ++++++++-------
 .../bukkit/titles/DefaultTitle.java           | 15 ------------
 .../plotsquared/plot/IPlotMain.java           |  7 ------
 .../plotsquared/plot/PlotSquared.java         |  2 --
 .../plotsquared/plot/commands/DebugExec.java  | 14 ++++++++---
 .../plotsquared/plot/commands/FlagCmd.java    | 18 ++++++++++----
 .../plotsquared/plot/commands/ListCmd.java    |  3 +--
 .../plotsquared/plot/commands/Merge.java      | 24 ++++++++++++-------
 .../plotsquared/plot/commands/Owner.java      | 10 +++++---
 .../plotsquared/plot/config/Captions.java     | 12 +++++-----
 .../plotsquared/plot/database/SQLManager.java |  6 +----
 .../plot/listener/PlotListener.java           |  9 +++++--
 .../plot/object/ConsolePlayer.java            |  4 ++++
 .../plotsquared/plot/object/Plot.java         |  4 +---
 .../plotsquared/plot/object/PlotPlayer.java   | 15 +++++++++++-
 .../plotsquared/plot/object/Rating.java       |  3 +--
 .../plotsquared/plot/util/AbstractTitle.java  | 20 ----------------
 .../plotsquared/plot/util/ChunkManager.java   |  2 +-
 .../plotsquared/plot/util/CommentManager.java |  8 +++++--
 .../plotsquared/plot/util/ConsoleColors.java  |  3 +--
 .../plotsquared/plot/util/EntityUtil.java     |  4 +---
 .../plot/util/LegacyConverter.java            |  6 ++---
 26 files changed, 112 insertions(+), 126 deletions(-)
 delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
 delete mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
index e7d67c3ef..68169328d 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java
@@ -7,7 +7,6 @@ import com.github.intellectualsites.plotsquared.bukkit.listeners.PlayerEvents;
 import com.github.intellectualsites.plotsquared.bukkit.listeners.PlotPlusListener;
 import com.github.intellectualsites.plotsquared.bukkit.listeners.SingleWorldListener;
 import com.github.intellectualsites.plotsquared.bukkit.listeners.WorldEvents;
-import com.github.intellectualsites.plotsquared.bukkit.titles.DefaultTitle;
 import com.github.intellectualsites.plotsquared.bukkit.util.*;
 import com.github.intellectualsites.plotsquared.bukkit.util.block.BukkitLocalQueue;
 import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper;
@@ -766,10 +765,6 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
         return new BukkitSchematicHandler();
     }
 
-    @Override public AbstractTitle initTitleManager() {
-        return new DefaultTitle();
-    }
-
     @Override @Nullable public PlotPlayer wrapPlayer(final Object player) {
         if (player instanceof Player) {
             return BukkitUtil.getPlayer((Player) player);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
index a92515221..f3f004284 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java
@@ -43,10 +43,6 @@ public final class Reflection {
      */
     public synchronized static String getVersion() {
         if (_versionString == null) {
-            if (Bukkit.getServer() == null) {
-                // The server hasn't started, static initializer call?
-                return null;
-            }
             String name = Bukkit.getServer().getClass().getPackage().getName();
             _versionString = name.substring(name.lastIndexOf('.') + 1) + ".";
         }
@@ -180,15 +176,11 @@ public final class Reflection {
      * @return A method object with the specified name declared by the specified class.
      */
     public synchronized static Method getMethod(Class<?> clazz, String name, Class<?>... args) {
-        if (!_loadedMethods.containsKey(clazz)) {
-            _loadedMethods.put(clazz, new HashMap<>());
-        }
+        _loadedMethods.computeIfAbsent(clazz, k -> new HashMap<>());
 
         Map<String, Map<ArrayWrapper<Class<?>>, Method>> loadedMethodNames =
             _loadedMethods.get(clazz);
-        if (!loadedMethodNames.containsKey(name)) {
-            loadedMethodNames.put(name, new HashMap<>());
-        }
+        loadedMethodNames.computeIfAbsent(name, k -> new HashMap<>());
 
         Map<ArrayWrapper<Class<?>>, Method> loadedSignatures = loadedMethodNames.get(name);
         ArrayWrapper<Class<?>> wrappedArg = new ArrayWrapper<>(args);
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 7a22be0fb..6c85a2265 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -999,7 +999,7 @@ import java.util.regex.Pattern;
             } else if (
                 (location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
                     && !Permissions
-                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+                    .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
                 event.setCancelled(true);
                 MainUtil.sendMessage(plotPlayer, Captions.HEIGHT_LIMIT.s()
                     .replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
@@ -2984,7 +2984,7 @@ import java.util.regex.Pattern;
         Plot plot = area.getPlot(location);
         if (plot != null) {
             if ((location.getY() > area.MAX_BUILD_HEIGHT || location.getY() < area.MIN_BUILD_HEIGHT)
-                && !Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+                && !Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
                 event.setCancelled(true);
                 MainUtil.sendMessage(pp, Captions.HEIGHT_LIMIT.s()
                     .replace("{limit}", String.valueOf(area.MAX_BUILD_HEIGHT)));
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
index 7b1ce2c54..7a8ad2fc5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java
@@ -84,6 +84,11 @@ public class BukkitPlayer extends PlotPlayer {
         return true;
     }
 
+    @Override
+    public void sendTitle(String title, String subtitle, int fadeIn, int stay, int fadeOut) {
+        player.sendTitle(title, subtitle, fadeIn, stay, fadeOut);
+    }
+
     private void callEvent(final Event event) {
         RegisteredListener[] listeners = event.getHandlers().getRegisteredListeners();
         for (RegisteredListener listener : listeners) {
@@ -219,8 +224,6 @@ public class BukkitPlayer extends PlotPlayer {
                 this.player.setPlayerWeather(WeatherType.DOWNFALL);
                 break;
             case RESET:
-                this.player.resetPlayerWeather();
-                break;
             default:
                 this.player.resetPlayerWeather();
                 break;
@@ -254,8 +257,6 @@ public class BukkitPlayer extends PlotPlayer {
                 this.player.setGameMode(GameMode.SPECTATOR);
                 break;
             case SURVIVAL:
-                this.player.setGameMode(GameMode.SURVIVAL);
-                break;
             default:
                 this.player.setGameMode(GameMode.SURVIVAL);
                 break;
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
index c7e0e04f6..769fcc9b3 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java
@@ -1,7 +1,12 @@
 package com.github.intellectualsites.plotsquared.bukkit.object.entity;
 
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
-import org.bukkit.*;
+import org.bukkit.Art;
+import org.bukkit.DyeColor;
+import org.bukkit.Location;
+import org.bukkit.Rotation;
+import org.bukkit.TreeSpecies;
+import org.bukkit.World;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.EntityEquipment;
@@ -576,14 +581,6 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 restoreAgeable((Ageable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
-            case GUARDIAN:
-            case ELDER_GUARDIAN:
-                restoreLiving((LivingEntity) entity);
-                return entity;
-            case SKELETON:
-            case WITHER_SKELETON:
-                restoreLiving((LivingEntity) entity);
-                return entity;
             case ARMOR_STAND:
                 // CHECK positions
                 ArmorStand stand = (ArmorStand) entity;
@@ -679,6 +676,10 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             case BLAZE:
             case SNOWMAN:
             case SHULKER:
+            case GUARDIAN:
+            case ELDER_GUARDIAN:
+            case SKELETON:
+            case WITHER_SKELETON:
                 restoreLiving((LivingEntity) entity);
                 return entity;
             case IRON_GOLEM:
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
deleted file mode 100644
index e91f8bcae..000000000
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/titles/DefaultTitle.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.github.intellectualsites.plotsquared.bukkit.titles;
-
-import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.AbstractTitle;
-import org.bukkit.entity.Player;
-
-public class DefaultTitle extends AbstractTitle {
-
-  @Override
-  public void sendTitle(PlotPlayer player, String head, String sub, int in, int delay, int out) {
-    final Player playerObj = ((BukkitPlayer) player).player;
-    playerObj.sendTitle(head, sub, in, delay, out);
-  }
-}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
index 549da8c05..e1eb152b5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/IPlotMain.java
@@ -249,13 +249,6 @@ public interface IPlotMain extends ILogger {
      */
     @NotNull IndependentPlotGenerator getDefaultGenerator();
 
-    /**
-     * Gets the class that will manage player titles.
-     *
-     * @return
-     */
-    AbstractTitle initTitleManager();
-
     List<String> getPluginIds();
 
     BlockRegistry<?> getBlockRegistry();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 892a5bbe8..122822ffa 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -188,8 +188,6 @@ import java.util.zip.ZipInputStream;
             ChunkManager.manager = this.IMP.initChunkManager();
             // Schematic handler
             SchematicHandler.manager = this.IMP.initSchematicHandler();
-            // Titles
-            AbstractTitle.TITLE_CLASS = this.IMP.initTitleManager();
             // Chat
             ChatManager.manager = this.IMP.initChatManager();
             // Commands
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
index 4e533fe61..76d060ed3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugExec.java
@@ -17,12 +17,21 @@ import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.PlotAnalysis;
 import com.google.common.io.Files;
 
-import javax.script.*;
+import javax.script.Bindings;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.script.SimpleScriptContext;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
 
 @CommandDeclaration(command = "debugexec", permission = "plots.admin",
     description = "Mutli-purpose debug command", aliases = {"exec", "$"},
@@ -107,7 +116,6 @@ import java.util.*;
             this.scope.put("WEManager", new WEManager());
         }
         this.scope.put("TaskManager", TaskManager.IMP);
-        this.scope.put("TitleManager", AbstractTitle.TITLE_CLASS);
         this.scope.put("ConsolePlayer", ConsolePlayer.getConsole());
         this.scope.put("SchematicHandler", SchematicHandler.manager);
         this.scope.put("ChunkManager", ChunkManager.manager);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
index a732df9a7..470d8d605 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/FlagCmd.java
@@ -5,12 +5,22 @@ import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.database.DBFunc;
-import com.github.intellectualsites.plotsquared.plot.flag.*;
+import com.github.intellectualsites.plotsquared.plot.flag.Flag;
+import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
+import com.github.intellectualsites.plotsquared.plot.flag.Flags;
+import com.github.intellectualsites.plotsquared.plot.flag.IntegerFlag;
+import com.github.intellectualsites.plotsquared.plot.flag.ListFlag;
+import com.github.intellectualsites.plotsquared.plot.flag.PlotBlockListFlag;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.MathMan;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.PlotWeather;
+import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
 
 import java.util.*;
 
@@ -284,9 +294,7 @@ import java.util.*;
                 HashMap<String, ArrayList<String>> flags = new HashMap<>();
                 for (Flag<?> flag1 : Flags.getFlags()) {
                     String type = flag1.getClass().getSimpleName();
-                    if (!flags.containsKey(type)) {
-                        flags.put(type, new ArrayList<>());
-                    }
+                    flags.computeIfAbsent(type, k -> new ArrayList<>());
                     flags.get(type).add(flag1.getName());
                 }
                 StringBuilder message = new StringBuilder();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
index bd4613409..81834c353 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/ListCmd.java
@@ -209,8 +209,7 @@ public class ListCmd extends SubCommand {
                     int p1s = p1.getSettings().getRatings().size();
                     int p2s = p2.getRatings().size();
                     if (!p1.getSettings().getRatings().isEmpty()) {
-                        v1 = p1.getRatings().entrySet().stream()
-                            .mapToDouble(entry -> entry.getValue().getAverageRating())
+                        v1 = p1.getRatings().values().stream().mapToDouble(Rating::getAverageRating)
                             .map(av -> av * av).sum();
                         v1 /= p1s;
                         v1 += p1s;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
index 970a0d35c..2e68b739c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Merge.java
@@ -3,8 +3,17 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
-import com.github.intellectualsites.plotsquared.plot.object.*;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.object.Expression;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
+import com.github.intellectualsites.plotsquared.plot.util.EconHandler;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.StringMan;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 
 import java.util.UUID;
 
@@ -59,8 +68,7 @@ public class Merge extends SubCommand {
             }
         }
         final PlotArea plotArea = plot.getArea();
-        Expression<Double> priceExr =
-            plotArea.PRICES.containsKey("merge") ? plotArea.PRICES.get("merge") : null;
+        Expression<Double> priceExr = plotArea.PRICES.getOrDefault("merge", null);
         final int size = plot.getConnectedPlots().size();
         final double price = priceExr == null ? 0d : priceExr.evaluate((double) size);
         if (EconHandler.manager != null && plotArea.USE_ECONOMY && price > 0d
@@ -97,9 +105,9 @@ public class Merge extends SubCommand {
                     terrain = "true".equalsIgnoreCase(args[1]);
                 }
                 if (!terrain && !Permissions
-                    .hasPermission(player, Captions.PERMISSION_MERGE_KEEPROAD)) {
+                    .hasPermission(player, Captions.PERMISSION_MERGE_KEEP_ROAD)) {
                     MainUtil.sendMessage(player, Captions.NO_PERMISSION,
-                        Captions.PERMISSION_MERGE_KEEPROAD.s());
+                        Captions.PERMISSION_MERGE_KEEP_ROAD.s());
                     return true;
                 }
                 if (plot.autoMerge(-1, maxSize, uuid, terrain)) {
@@ -134,9 +142,9 @@ public class Merge extends SubCommand {
         } else {
             terrain = true;
         }
-        if (!terrain && !Permissions.hasPermission(player, Captions.PERMISSION_MERGE_KEEPROAD)) {
+        if (!terrain && !Permissions.hasPermission(player, Captions.PERMISSION_MERGE_KEEP_ROAD)) {
             MainUtil.sendMessage(player, Captions.NO_PERMISSION,
-                Captions.PERMISSION_MERGE_KEEPROAD.s());
+                Captions.PERMISSION_MERGE_KEEP_ROAD.s());
             return true;
         }
         if (plot.autoMerge(direction, maxSize - size, uuid, terrain)) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
index 89416512f..8247c0e83 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
@@ -5,7 +5,11 @@ import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-import com.github.intellectualsites.plotsquared.plot.util.*;
+import com.github.intellectualsites.plotsquared.plot.util.CmdConfirm;
+import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
+import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
+import com.github.intellectualsites.plotsquared.plot.util.UUIDHandler;
 
 import java.util.Set;
 import java.util.UUID;
@@ -34,7 +38,7 @@ import java.util.UUID;
             if (value.equalsIgnoreCase("none") || value.equalsIgnoreCase("null") || value
                 .equalsIgnoreCase("-")) {
                 if (!Permissions
-                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SETOWNER.s(), true)) {
+                    .hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SET_OWNER.s(), true)) {
                     return false;
                 }
                 Set<Plot> connected = plot.getConnectedPlots();
@@ -54,7 +58,7 @@ import java.util.UUID;
             Captions.ALREADY_OWNER.send(player, MainUtil.getName(uuid));
             return false;
         }
-        if (!Permissions.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SETOWNER)) {
+        if (!Permissions.hasPermission(player, Captions.PERMISSION_ADMIN_COMMAND_SET_OWNER)) {
             if (other == null) {
                 Captions.INVALID_PLAYER_OFFLINE.send(player, value);
                 return false;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
index 0c6f501df..a606b5a3a 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java
@@ -60,8 +60,8 @@ public enum Captions {
     PERMISSION_ADMIN_ENTRY_DENIED("plots.admin.entry.denied", "static.permissions"),
     PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield", "static.permissions"),
     PERMISSION_COMMANDS_CHAT("plots.admin.command.chat", "static.permissions"),
-    PERMISSION_MERGE_OTHER("plots.merge.other", "static.permissions"),
-    PERMISSION_MERGE_KEEPROAD("plots.merge.keeproad", "static.permissions"),
+    PERMISSION_MERGE_OTHER("plots.merge.other", "static.permissions"), PERMISSION_MERGE_KEEP_ROAD(
+        "plots.merge.keeproad", "static.permissions"),
     PERMISSION_ADMIN_DESTROY_UNOWNED("plots.admin.destroy.unowned", "static.permissions"),
     PERMISSION_ADMIN_DESTROY_GROUNDLEVEL("plots.admin.destroy.groundlevel", "static.permissions"),
     PERMISSION_ADMIN_DESTROY_OTHER("plots.admin.destroy.other", "static.permissions"),
@@ -71,8 +71,8 @@ public enum Captions {
     PERMISSION_ADMIN_BUILD_OTHER("plots.admin.build.other", "static.permissions"),
     PERMISSION_ADMIN_INTERACT_ROAD("plots.admin.interact.road", "static.permissions"),
     PERMISSION_ADMIN_INTERACT_UNOWNED("plots.admin.interact.unowned", "static.permissions"),
-    PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other", "static.permissions"),
-    PERMISSION_ADMIN_BUILD_HEIGHTLIMIT("plots.admin.build.heightlimit", "static.permissions"),
+    PERMISSION_ADMIN_INTERACT_OTHER("plots.admin.interact.other", "static.permissions"), PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT(
+        "plots.admin.build.heightlimit", "static.permissions"),
     PERMISSION_ADMIN_UPDATE("plots.admin.command.update", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_RATE("plots.admin.command.rate", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_TRUST("plots.admin.command.trust", "static.permissions"),
@@ -141,8 +141,8 @@ public enum Captions {
     PERMISSION_LIST_FUZZY("plots.list.fuzzy", "static.permissions"),
     PERMISSION_LIST_AREA("plots.list.area", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_LOAD("plots.admin.command.load", "static.permissions"),
-    PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge", "static.permissions"),
-    PERMISSION_ADMIN_COMMAND_SETOWNER("plots.admin.command.setowner", "static.permissions"),
+    PERMISSION_ADMIN_COMMAND_MERGE("plots.admin.command.merge", "static.permissions"), PERMISSION_ADMIN_COMMAND_SET_OWNER(
+        "plots.admin.command.setowner", "static.permissions"),
     PERMISSION_COMMENT("plots.comment", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_REMOVE("plots.admin.command.remove", "static.permissions"),
     PERMISSION_ADMIN_COMMAND_SAVE("plots.admin.command.save", "static.permissions"),
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
index ed0eee71d..4ac78e122 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/database/SQLManager.java
@@ -2538,11 +2538,7 @@ import java.util.concurrent.atomic.AtomicInteger;
                     id = resultSet.getInt("id");
                     String areaid = resultSet.getString("world");
                     if (!areas.contains(areaid)) {
-                        if (noExist.containsKey(areaid)) {
-                            noExist.put(areaid, noExist.get(areaid) + 1);
-                        } else {
-                            noExist.put(areaid, 1);
-                        }
+                        noExist.merge(areaid, 1, Integer::sum);
                     }
                     owner = resultSet.getString("owner");
                     user = uuids.get(owner);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
index c56763a76..5f2260922 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/listener/PlotListener.java
@@ -5,7 +5,12 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.FlagManager;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
-import com.github.intellectualsites.plotsquared.plot.object.*;
+import com.github.intellectualsites.plotsquared.plot.object.Location;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
 import com.github.intellectualsites.plotsquared.plot.util.*;
 import com.github.intellectualsites.plotsquared.plot.util.expiry.ExpireManager;
 
@@ -171,7 +176,7 @@ public class PlotListener {
                                 .replaceFromMap(Captions.TITLE_ENTERED_PLOT.s(), replacements);
                             String sub = StringMan
                                 .replaceFromMap(Captions.TITLE_ENTERED_PLOT_SUB.s(), replacements);
-                            AbstractTitle.sendTitle(player, main, sub);
+                            player.sendTitle(main, sub);
                         }
                     }, 20);
                 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
index 6f386b3cb..9a2fb193b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ConsolePlayer.java
@@ -38,6 +38,10 @@ public class ConsolePlayer extends PlotPlayer {
         return true;
     }
 
+    @Override
+    public void sendTitle(String title, String subtitle, int fadeIn, int stay, int fadeOut) {
+    }
+
     @Override public Location getLocation() {
         return this.getMeta("location");
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 479bfb923..cd29dfe07 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1360,9 +1360,7 @@ public class Plot {
     public Map<UUID, Boolean> getLikes() {
         final Map<UUID, Boolean> map = new HashMap<>();
         final Map<UUID, Rating> ratings = this.getRatings();
-        ratings.forEach((uuid, rating) -> {
-            map.put(uuid, rating.getLike());
-        });
+        ratings.forEach((uuid, rating) -> map.put(uuid, rating.getLike()));
         return map;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index dd2dc28b5..0c7c4a936 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -16,7 +16,11 @@ import lombok.NonNull;
 
 import javax.annotation.Nonnull;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -340,6 +344,15 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
         return result;
     }
 
+    public void sendTitle(String title, String subtitle) {
+        sendTitle(title, subtitle, 1, 2, 1);
+    }
+
+    ;
+
+    public abstract void sendTitle(String title, String subtitle, int fadeIn, int stay,
+        int fadeOut);
+
     /**
      * Teleport this player to a location.
      *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
index 00fe5bcc2..911b2e6c5 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java
@@ -5,7 +5,6 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.stream.IntStream;
 
 public class Rating {
@@ -55,7 +54,7 @@ public class Rating {
         if (Settings.Ratings.USE_LIKES) {
             return getLike() ? 10 : 1;
         }
-        double total = this.ratingMap.entrySet().stream().mapToDouble(Entry::getValue).sum();
+        double total = this.ratingMap.values().stream().mapToDouble(v -> v).sum();
         return total / this.ratingMap.size();
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
deleted file mode 100644
index a5f75c96a..000000000
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/AbstractTitle.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.github.intellectualsites.plotsquared.plot.util;
-
-import com.github.intellectualsites.plotsquared.plot.object.ConsolePlayer;
-import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
-
-public abstract class AbstractTitle {
-    public static AbstractTitle TITLE_CLASS;
-
-    public static void sendTitle(PlotPlayer player, String head, String sub) {
-        if (player instanceof ConsolePlayer) {
-            return;
-        }
-        if (TITLE_CLASS != null && !player.getAttribute("disabletitles")) {
-            TITLE_CLASS.sendTitle(player, head, sub, 1, 2, 1);
-        }
-    }
-
-    public abstract void sendTitle(PlotPlayer player, String head, String sub, int in, int delay,
-        int out);
-}
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
index 101ec301a..a960bc6db 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ChunkManager.java
@@ -136,7 +136,7 @@ public abstract class ChunkManager {
     }
 
     /**
-     * The int[] will be in the form: [chunkx, chunkz, pos1x, pos1z, pos2x, pos2z, isedge] and will represent the bottom and top parts of the chunk
+     * The int[] will be in the form: [chunkX, chunkZ, pos1x, pos1z, pos2x, pos2z, isEdge] and will represent the bottom and top parts of the chunk
      *
      * @param pos1
      * @param pos2
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
index 416f0aa46..bd5356be1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/CommentManager.java
@@ -5,7 +5,11 @@ import com.github.intellectualsites.plotsquared.plot.config.Settings;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
-import com.github.intellectualsites.plotsquared.plot.object.comment.*;
+import com.github.intellectualsites.plotsquared.plot.object.comment.CommentInbox;
+import com.github.intellectualsites.plotsquared.plot.object.comment.InboxOwner;
+import com.github.intellectualsites.plotsquared.plot.object.comment.InboxPublic;
+import com.github.intellectualsites.plotsquared.plot.object.comment.InboxReport;
+import com.github.intellectualsites.plotsquared.plot.object.comment.PlotComment;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -40,7 +44,7 @@ public class CommentManager {
                             total = count.get();
                         }
                         if ((size.decrementAndGet() == 0) && (total > 0)) {
-                            AbstractTitle.sendTitle(player, "",
+                            player.sendTitle("",
                                 Captions.INBOX_NOTIFICATION.s().replaceAll("%s", "" + total));
                         }
                     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
index 5e9c87a7a..f8860887f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/ConsoleColors.java
@@ -34,8 +34,6 @@ public class ConsoleColors {
 
     public static ConsoleColor chatColor(final String color) {
         switch (color) {
-            case "&r":
-                return ConsoleColor.RESET;
             case "&7":
             case "&8":
                 return ConsoleColor.WHITE;
@@ -65,6 +63,7 @@ public class ConsoleColors {
                 return ConsoleColor.ITALIC;
             case "&l":
                 return ConsoleColor.BOLD;
+            case "&r":
             default:
                 return ConsoleColor.RESET;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
index fa543b21a..51e093d46 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/EntityUtil.java
@@ -15,9 +15,6 @@ import lombok.experimental.UtilityClass;
     private static int capNumeral(@NonNull final String flagName) {
         int i;
         switch (flagName) {
-            case "entity-cap":
-                i = 0;
-                break;
             case "mob-cap":
                 i = 3;
                 break;
@@ -33,6 +30,7 @@ import lombok.experimental.UtilityClass;
             case "misc-cap":
                 i = 5;
                 break;
+            case "entity-cap":
             default:
                 i = 0;
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
index 55d86ce5a..dfbc0b3eb 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/LegacyConverter.java
@@ -51,9 +51,7 @@ import java.util.Map;
     private BlockBucket blockListToBucket(@NonNull final PlotBlock[] blocks) {
         final Map<PlotBlock, Integer> counts = new HashMap<>();
         for (final PlotBlock block : blocks) {
-            if (!counts.containsKey(block)) {
-                counts.put(block, 0);
-            }
+            counts.putIfAbsent(block, 0);
             counts.put(block, counts.get(block) + 1);
         }
         boolean includeRatios = false;
@@ -66,7 +64,7 @@ import java.util.Map;
         final BlockBucket bucket = new BlockBucket();
         if (includeRatios) {
             for (final Map.Entry<PlotBlock, Integer> count : counts.entrySet()) {
-                bucket.addBlock(count.getKey(), (int) (count.getValue()));
+                bucket.addBlock(count.getKey(), count.getValue());
             }
         } else {
             counts.keySet().forEach(bucket::addBlock);

From 8ff833de36b0ffb223ce2d33cd21ba8355d47e1b Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 17 May 2019 18:50:24 -0400
Subject: [PATCH 184/210] Added Paper to Platform

---
 .../com/github/intellectualsites/plotsquared/plot/Platform.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
index 9dfbf2ffb..1736edf6f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/Platform.java
@@ -1,6 +1,6 @@
 package com.github.intellectualsites.plotsquared.plot;
 
 public enum Platform {
-    Bukkit, Sponge, Spigot
+    Bukkit, Sponge, Spigot, Paper
 
 }

From fe471c35716b0bd9adad66c942688bbd31cdbce1 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 21 May 2019 18:32:26 -0400
Subject: [PATCH 185/210] new library in gradle and another change I can't
 remember.

---
 Core/build.gradle                             |  2 +-
 .../plot/util/SchematicHandler.java           | 19 +++++++++----------
 build.gradle                                  |  1 +
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Core/build.gradle b/Core/build.gradle
index 82f6abd3a..3949c948e 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     testCompileOnly("org.projectlombok:lombok:1.18.6")
     annotationProcessor("org.projectlombok:lombok:1.18.6")
     testAnnotationProcessor("org.projectlombok:lombok:1.18.6")
-
+    implementation 'net.kyori:text-adapter-bukkit:3.0.2'
     implementation 'com.github.Sauilitired:Jenkins4J:2.0-SNAPSHOT'
     implementation 'com.squareup.okhttp3:okhttp:3.14.0'
     implementation 'com.squareup.okio:okio:2.2.2'
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
index d6df9d003..6ce59fe6c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/SchematicHandler.java
@@ -28,6 +28,7 @@ import com.sk89q.worldedit.extent.clipboard.io.MCEditSchematicReader;
 import com.sk89q.worldedit.extent.clipboard.io.SpongeSchematicReader;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.net.URL;
@@ -64,15 +65,16 @@ public abstract class SchematicHandler {
                 Iterator<Plot> i = plots.iterator();
                 final Plot plot = i.next();
                 i.remove();
-                String o = UUIDHandler.getName(plot.guessOwner());
-                if (o == null) {
-                    o = "unknown";
+                String owner = UUIDHandler.getName(plot.guessOwner());
+                if (owner == null) {
+                    owner = "unknown";
                 }
                 final String name;
                 if (namingScheme == null) {
-                    name = plot.getId().x + ";" + plot.getId().y + ',' + plot.getArea() + ',' + o;
+                    name =
+                        plot.getId().x + ";" + plot.getId().y + ',' + plot.getArea() + ',' + owner;
                 } else {
-                    name = namingScheme.replaceAll("%owner%", o)
+                    name = namingScheme.replaceAll("%owner%", owner)
                         .replaceAll("%id%", plot.getId().toString())
                         .replaceAll("%idx%", plot.getId().x + "")
                         .replaceAll("%idy%", plot.getId().y + "")
@@ -323,7 +325,7 @@ public abstract class SchematicHandler {
         return null;
     }
 
-    public Schematic getSchematic(URL url) {
+    public Schematic getSchematic(@NotNull URL url) {
         try {
             ReadableByteChannel rbc = Channels.newChannel(url.openStream());
             InputStream is = Channels.newInputStream(rbc);
@@ -334,10 +336,7 @@ public abstract class SchematicHandler {
         return null;
     }
 
-    public Schematic getSchematic(InputStream is) {
-        if (is == null) {
-            return null;
-        }
+    public Schematic getSchematic(@NotNull InputStream is) {
         try {
             SpongeSchematicReader ssr =
                 new SpongeSchematicReader(new NBTInputStream(new GZIPInputStream(is)));
diff --git a/build.gradle b/build.gradle
index dddfa3ffd..c96224e82 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,6 +67,7 @@ subprojects {
             exclude(module: 'mockito-core')
             exclude(module: 'dummypermscompat')
         }
+        implementation 'net.kyori:text-api:3.0.0'
         //Minecraft uses Guava 21 as of 1.13.
         compile 'com.google.guava:guava:21.0'
         compileOnly 'org.jetbrains:annotations:17.0.0'

From 1bd7c8ca5fa1133c0be162b55b7e7caece9fd3b9 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 21 May 2019 18:50:52 -0400
Subject: [PATCH 186/210] Variable renames

---
 .../plot/generator/HybridPlotManager.java        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 44e1d1705..93713ec9c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -67,13 +67,13 @@ public class HybridPlotManager extends ClassicPlotManager {
             return true;
         }
         LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2, true);
+        createSchemAbs(hpw, queue, pos1, pos2);
         queue.enqueue();
         return true;
     }
 
     private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
-        Location pos2, boolean clear) {
+        Location pos2) {
         int size = hpw.SIZE;
         int minY;
         if (Settings.Schematics.PASTE_ON_TOP) {
@@ -119,7 +119,7 @@ public class HybridPlotManager extends ClassicPlotManager {
             return true;
         }
         LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2, true);
+        createSchemAbs(hpw, queue, pos1, pos2);
         queue.enqueue();
         return true;
     }
@@ -134,9 +134,9 @@ public class HybridPlotManager extends ClassicPlotManager {
         pos1.setY(0);
         pos2.setY(Math.min(getWorldHeight(), 255));
         LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2, true);
+        createSchemAbs(hpw, queue, pos1, pos2);
         if (hpw.ROAD_SCHEMATIC_ENABLED) {
-            createSchemAbs(hpw, queue, pos1, pos2, true);
+            createSchemAbs(hpw, queue, pos1, pos2);
         }
         queue.enqueue();
         return true;
@@ -205,12 +205,12 @@ public class HybridPlotManager extends ClassicPlotManager {
         return true;
     }
 
-    public void pastePlotSchematic(HybridPlotWorld plotWorld, LocalBlockQueue queue, Location l1,
-        Location l2) {
+    public void pastePlotSchematic(HybridPlotWorld plotWorld, LocalBlockQueue queue,
+        Location bottom, Location top) {
         if (!plotWorld.PLOT_SCHEMATIC) {
             return;
         }
-        createSchemAbs(plotWorld, queue, l1, l2, false);
+        createSchemAbs(plotWorld, queue, bottom, top);
     }
 
     /**

From fb478de164eac4521bbf5eba6e6c82c62bd31055 Mon Sep 17 00:00:00 2001
From: zombachu <zombachu@gmail.com>
Date: Wed, 22 May 2019 06:09:31 -1000
Subject: [PATCH 187/210] Update outdated list of files to check on failed
 world load (#2365)

---
 .../github/intellectualsites/plotsquared/plot/PlotSquared.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index 7c94060fd..34c80de24 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -255,7 +255,7 @@ import java.util.zip.ZipInputStream;
                                 "&c`" + world + "` was not properly loaded - " + IMP.getPluginName()
                                     + " will now try to load it properly: ");
                             debug(
-                                "&8 - &7Are you trying to delete this world? Remember to remove it from the settings.yml, bukkit.yml and multiverse worlds.yml");
+                                "&8 - &7Are you trying to delete this world? Remember to remove it from the worlds.yml, bukkit.yml and multiverse worlds.yml");
                             debug(
                                 "&8 - &7Your world management plugin may be faulty (or non existent)");
                             PlotSquared.this.IMP.setGenerator(world);

From 95cb0d84f08e5782300a692314a971ca76d39006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Wed, 29 May 2019 13:01:29 +0200
Subject: [PATCH 188/210] Fix issue with road generation during unlink

Roads should always be created with respect to `current`.
---
 .../intellectualsites/plotsquared/plot/object/Plot.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index e2f83172e..1b5d6186c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -949,13 +949,13 @@ public class Plot {
             for (Plot current : plots) {
                 if (current.getMerged(Direction.EAST)) {
                     manager.createRoadEast(current.area, current);
-                    if (getMerged(Direction.SOUTH)) {
+                    if (current.getMerged(Direction.SOUTH)) {
                         manager.createRoadSouth(current.area, current);
-                        if (getMerged(Direction.SOUTHEAST)) {
+                        if (current.getMerged(Direction.SOUTHEAST)) {
                             manager.createRoadSouthEast(current.area, current);
                         }
                     }
-                } else if (getMerged(Direction.SOUTH)) {
+                } else if (current.getMerged(Direction.SOUTH)) {
                     manager.createRoadSouth(current.area, current);
                 }
             }

From 41299e685156311d74661fb9aefa90325dcd47c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Wed, 29 May 2019 14:49:27 +0200
Subject: [PATCH 189/210] Fix issue with plot border during merge

* `getExtendedTopAbs()` used wrong relative plot for calculating X position.
* Not running `finishPlotMerge()` after every merge led to broken roads during a `merge all`
---
 .../plotsquared/plot/object/Plot.java         | 34 ++++++++++++++++---
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 1b5d6186c..5f1b02e6f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -1669,7 +1669,7 @@ public class Plot {
             top.setZ(this.getRelative(Direction.SOUTH).getBottomAbs().getZ() - 1);
         }
         if (this.getMerged(Direction.EAST)) {
-            top.setX(this.getRelative(Direction.SOUTH).getBottomAbs().getX() - 1);
+            top.setX(this.getRelative(Direction.EAST).getBottomAbs().getX() - 1);
         }
         return top;
     }
@@ -2243,6 +2243,13 @@ public class Plot {
                     merged.add(current.getId());
                     merged.add(other.getId());
                     toReturn = true;
+
+                    if (removeRoads) {
+                        ArrayList<PlotId> ids = new ArrayList<>();
+                        ids.add(current.getId());
+                        ids.add(other.getId());
+                        this.getManager().finishPlotMerge(this.area, ids);
+                    }
                 }
             }
             if (max >= 0 && (dir == -1 || dir == 1) && !current.getMerged(Direction.EAST)) {
@@ -2255,6 +2262,13 @@ public class Plot {
                     merged.add(current.getId());
                     merged.add(other.getId());
                     toReturn = true;
+
+                    if (removeRoads) {
+                        ArrayList<PlotId> ids = new ArrayList<>();
+                        ids.add(current.getId());
+                        ids.add(other.getId());
+                        this.getManager().finishPlotMerge(this.area, ids);
+                    }
                 }
             }
             if (max >= 0 && (dir == -1 || dir == 2) && !getMerged(Direction.SOUTH)) {
@@ -2267,6 +2281,13 @@ public class Plot {
                     merged.add(current.getId());
                     merged.add(other.getId());
                     toReturn = true;
+
+                    if (removeRoads) {
+                        ArrayList<PlotId> ids = new ArrayList<>();
+                        ids.add(current.getId());
+                        ids.add(other.getId());
+                        this.getManager().finishPlotMerge(this.area, ids);
+                    }
                 }
             }
             if (max >= 0 && (dir == -1 || dir == 3) && !getMerged(Direction.WEST)) {
@@ -2279,13 +2300,16 @@ public class Plot {
                     merged.add(current.getId());
                     merged.add(other.getId());
                     toReturn = true;
+
+                    if (removeRoads) {
+                        ArrayList<PlotId> ids = new ArrayList<>();
+                        ids.add(current.getId());
+                        ids.add(other.getId());
+                        this.getManager().finishPlotMerge(this.area, ids);
+                    }
                 }
             }
         }
-        if (removeRoads && toReturn) {
-            ArrayList<PlotId> ids = new ArrayList<>(merged);
-            this.getManager().finishPlotMerge(this.area, ids);
-        }
         return toReturn;
     }
 

From 475e9b50e1ad1429fc1108b832edf93f3463ae9e Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 31 May 2019 12:00:44 -0400
Subject: [PATCH 190/210] Fixes #2380

---
 .../intellectualsites/plotsquared/plot/object/PlotPlayer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
index 0c7c4a936..23cf49e98 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotPlayer.java
@@ -345,7 +345,7 @@ public abstract class PlotPlayer implements CommandCaller, OfflinePlotPlayer {
     }
 
     public void sendTitle(String title, String subtitle) {
-        sendTitle(title, subtitle, 1, 2, 1);
+        sendTitle(title, subtitle, 10, 50, 10);
     }
 
     ;

From 427523644c6ba16df27af05b946293b2c135746b Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Fri, 31 May 2019 12:04:38 -0400
Subject: [PATCH 191/210] Removed unused imports

---
 .../plotsquared/bukkit/util/BukkitSetupUtils.java         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
index 6237f0ba3..958def626 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java
@@ -9,10 +9,12 @@ import com.github.intellectualsites.plotsquared.plot.generator.GeneratorWrapper;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.SetupObject;
 import com.github.intellectualsites.plotsquared.plot.util.SetupUtils;
-import com.onarandombox.MultiverseCore.MultiverseCore;
-import com.onarandombox.MultiverseCore.api.MultiverseCoreConfig;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
 import org.bukkit.World.Environment;
+import org.bukkit.WorldCreator;
+import org.bukkit.WorldType;
 import org.bukkit.entity.Player;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;

From 941821e453d7a506660a73c25058fcca0b2e5c3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Thu, 30 May 2019 13:21:26 +0200
Subject: [PATCH 192/210] Convert all PlotBlocks to BaseBlocks in the
 BasicLocalBlockQueue

The `BukkitLocalQueue` only supports using one of the sets (the removed `baseBlocks` variable in `BasicLocalBlockQueue` was the deciding factor for which one won out) which led to issues with missing blocks when trying to use both types at the same time, such as in the `HybridPlotManager`s `clearPlot` method, where `PlotBlock` is used to fill in the various layers, while the`createSchemAbs` method uses `BaseBlock` for its data.
---
 .../bukkit/util/block/BukkitLocalQueue.java   | 30 +-------
 .../plot/util/block/BasicLocalBlockQueue.java | 77 +++++--------------
 2 files changed, 22 insertions(+), 85 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index 97dfff961..f207ddbf5 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -70,11 +70,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
     }
 
     @Override public final void setComponents(LocalChunk<T> lc) {
-        if (isBaseBlocks()) {
-            setBaseBlocks(lc);
-        } else {
-            setBlocks(lc);
-        }
+        setBaseBlocks(lc);
     }
 
     public World getBukkitWorld() {
@@ -85,30 +81,6 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
         return getBukkitWorld().getChunkAt(x, z);
     }
 
-    public void setBlocks(LocalChunk<T> lc) {
-        World worldObj = Bukkit.getWorld(getWorld());
-        Chunk chunk = worldObj.getChunkAt(lc.getX(), lc.getZ());
-        chunk.load(true);
-        for (int layer = 0; layer < lc.blocks.length; layer++) {
-            PlotBlock[] blocksLayer = (PlotBlock[]) lc.blocks[layer];
-            if (blocksLayer != null) {
-                for (int j = 0; j < blocksLayer.length; j++) {
-                    if (blocksLayer[j] != null) {
-                        PlotBlock block = blocksLayer[j];
-                        int x = MainUtil.x_loc[layer][j];
-                        int y = MainUtil.y_loc[layer][j];
-                        int z = MainUtil.z_loc[layer][j];
-                        Block existing = chunk.getBlock(x, y, z);
-                        if (equals(block, existing)) {
-                            continue;
-                        }
-                        setMaterial(block, existing);
-                    }
-                }
-            }
-        }
-    }
-
     public void setBaseBlocks(LocalChunk<T> lc) {
         World worldObj = Bukkit.getWorld(getWorld());
         Chunk chunk = worldObj.getChunkAt(lc.getX(), lc.getZ());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index e35e81f6b..fa137d463 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -1,11 +1,15 @@
 package com.github.intellectualsites.plotsquared.plot.util.block;
 
+import com.github.intellectualsites.plotsquared.plot.object.LegacyPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.RunnableVal;
+import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
 import com.github.intellectualsites.plotsquared.plot.util.TaskManager;
 import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.world.registry.LegacyMapper;
 import lombok.Getter;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -20,7 +24,6 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     private LocalChunk lastWrappedChunk;
     private int lastX = Integer.MIN_VALUE;
     private int lastZ = Integer.MIN_VALUE;
-    @Getter private boolean baseBlocks = false;
 
     public BasicLocalBlockQueue(String world) {
         super(world);
@@ -91,13 +94,12 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         if ((y > 255) || (y < 0)) {
             return false;
         }
-        baseBlocks = true;
-        int chunkX = x >> 4;
-        int chunkZ = z >> 4;
-        if (chunkX != lastX || chunkZ != lastZ) {
-            lastX = chunkX;
-            lastZ = chunkZ;
-            long pair = (long) (chunkX) << 32 | (chunkZ) & 0xFFFFFFFFL;
+        int cx = x >> 4;
+        int cz = z >> 4;
+        if (cx != lastX || cz != lastZ) {
+            lastX = cx;
+            lastZ = cz;
+            long pair = (long) (cx) << 32 | (cz) & 0xFFFFFFFFL;
             lastWrappedChunk = this.blockChunks.get(pair);
             if (lastWrappedChunk == null) {
                 lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
@@ -116,32 +118,18 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     }
 
     @Override public boolean setBlock(int x, int y, int z, PlotBlock id) {
-        if (y > 255) {
-            return false;
-        } else if (y < 0) {
-            return false;
+        // Trying to mix PlotBlock and BaseBlock leads to all kinds of issues.
+        // Since BaseBlock has more features than PlotBlock, simply convert
+        // all PlotBlocks to BaseBlocks
+        if (id instanceof StringPlotBlock) {
+            StringPlotBlock stringPlotBlock = (StringPlotBlock) id;
+            return setBlock(x, y, z, BlockTypes.get(stringPlotBlock.getItemId()).getDefaultState().toBaseBlock());
+        } else if (id instanceof LegacyPlotBlock) {
+            LegacyPlotBlock legacyPlotBlock = (LegacyPlotBlock) id;
+            return setBlock(x, y, z, LegacyMapper.getInstance().getBlockFromLegacy(legacyPlotBlock.getId(), legacyPlotBlock.getData()).toBaseBlock());
+        } else {
+            throw new RuntimeException("Unknown PlotBock class: " + id.getClass().getName());
         }
-        int chunkX = x >> 4;
-        int chunkZ = z >> 4;
-        if (chunkX != lastX || chunkZ != lastZ) {
-            lastX = chunkX;
-            lastZ = chunkZ;
-            long pair = (long) (chunkX) << 32 | (chunkZ) & 0xFFFFFFFFL;
-            lastWrappedChunk = this.blockChunks.get(pair);
-            if (lastWrappedChunk == null) {
-                lastWrappedChunk = this.getLocalChunk(x >> 4, z >> 4);
-                lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
-                LocalChunk previous = this.blockChunks.put(pair, lastWrappedChunk);
-                if (previous == null) {
-                    chunks.add(lastWrappedChunk);
-                    return true;
-                }
-                this.blockChunks.put(pair, previous);
-                lastWrappedChunk = previous;
-            }
-        }
-        lastWrappedChunk.setBlock(x & 15, y, z & 15, id);
-        return true;
     }
 
     @Override public final boolean setBiome(int x, int z, String biome) {
@@ -186,7 +174,6 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         public final int z;
         public final int x;
 
-        public B[] blocks;
         public BaseBlock[][] baseblocks;
         public String[][] biomes;
 
@@ -213,8 +200,6 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
             return z;
         }
 
-        public abstract void setBlock(final int x, final int y, final int z, final PlotBlock block);
-
         public abstract void setBlock(final int x, final int y, final int z, final BaseBlock block);
 
         public void setBiome(int x, int z, String biome) {
@@ -241,24 +226,9 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     public class BasicLocalChunk extends LocalChunk<PlotBlock[]> {
         public BasicLocalChunk(BasicLocalBlockQueue parent, int x, int z) {
             super(parent, x, z);
-            blocks = new PlotBlock[16][];
             baseblocks = new BaseBlock[16][];
         }
 
-        @Override public void setBlock(int x, int y, int z, PlotBlock block) {
-            this.setInternal(x, y, z, block);
-        }
-
-        private void setInternal(final int x, final int y, final int z, final PlotBlock plotBlock) {
-            final int i = MainUtil.CACHE_I[y][x][z];
-            final int j = MainUtil.CACHE_J[y][x][z];
-            PlotBlock[] array = blocks[i];
-            if (array == null) {
-                array = (blocks[i] = new PlotBlock[4096]);
-            }
-            array[j] = plotBlock;
-        }
-
         @Override public void setBlock(int x, int y, int z, BaseBlock block) {
             this.setInternal(x, y, z, block);
         }
@@ -272,10 +242,5 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
             }
             array[j] = baseBlock;
         }
-
-        public void setBlock(final int x, final int y, final int z, final int id, final int data) {
-            final PlotBlock block = PlotBlock.get(id, data);
-            this.setInternal(x, y, z, block);
-        }
     }
 }

From b366b0d261c6508858f3d5c5b0543d673767ebca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Thu, 30 May 2019 13:22:21 +0200
Subject: [PATCH 193/210] Set unspecified blocks from the schematic to air

If this isn't done, any blocks not specified in the schematic will remain after a clear, which is obviously undesirable.
---
 .../plotsquared/plot/generator/HybridPlotManager.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 93713ec9c..0155f9cec 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -11,7 +11,7 @@ import com.github.intellectualsites.plotsquared.plot.util.block.GlobalBlockQueue
 import com.github.intellectualsites.plotsquared.plot.util.block.LocalBlockQueue;
 import com.google.common.collect.Sets;
 import com.sk89q.worldedit.world.block.BaseBlock;
-
+import com.sk89q.worldedit.world.block.BlockTypes;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -96,6 +96,9 @@ public class HybridPlotManager extends ClassicPlotManager {
                     for (int y = 0; y < blocks.length; y++) {
                         if (blocks[y] != null) {
                             queue.setBlock(x, minY + y, z, blocks[y]);
+                        } else {
+                            // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear
+                            queue.setBlock(x, minY + y, z, BlockTypes.AIR.getDefaultState().toBaseBlock());
                         }
                     }
                 }

From 19f8704cb49f0e9dde51f253f5c6a29a57cc089c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Thu, 30 May 2019 13:28:19 +0200
Subject: [PATCH 194/210] Remove leftovers from getting rid of PlotBlocks in
 LocalChunk

---
 .../bukkit/util/block/BukkitLocalQueue.java        | 12 ++++++------
 .../plot/util/block/BasicLocalBlockQueue.java      | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
index f207ddbf5..5d8f53355 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java
@@ -21,14 +21,14 @@ import org.bukkit.block.data.BlockData;
 
 import java.util.Locale;
 
-public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
+public class BukkitLocalQueue extends BasicLocalBlockQueue {
 
     public BukkitLocalQueue(String world) {
         super(world);
     }
 
-    @Override public LocalChunk<T> getLocalChunk(int x, int z) {
-        return (LocalChunk<T>) new BasicLocalChunk(this, x, z) {
+    @Override public LocalChunk getLocalChunk(int x, int z) {
+        return new BasicLocalChunk(this, x, z) {
             // Custom stuff?
         };
     }
@@ -69,7 +69,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
         }
     }
 
-    @Override public final void setComponents(LocalChunk<T> lc) {
+    @Override public final void setComponents(LocalChunk lc) {
         setBaseBlocks(lc);
     }
 
@@ -81,7 +81,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
         return getBukkitWorld().getChunkAt(x, z);
     }
 
-    public void setBaseBlocks(LocalChunk<T> lc) {
+    public void setBaseBlocks(LocalChunk lc) {
         World worldObj = Bukkit.getWorld(getWorld());
         Chunk chunk = worldObj.getChunkAt(lc.getX(), lc.getZ());
         chunk.load(true);
@@ -152,7 +152,7 @@ public class BukkitLocalQueue<T> extends BasicLocalBlockQueue<T> {
             legacyPlotBlock.id == 0 || legacyPlotBlock.data == block.getData());
     }
 
-    public void setBiomes(LocalChunk<T> lc) {
+    public void setBiomes(LocalChunk lc) {
         if (lc.biomes != null) {
             World worldObj = Bukkit.getWorld(getWorld());
             int bx = lc.getX() << 4;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index fa137d463..551a9c44b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -15,7 +15,7 @@ import lombok.Getter;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 
-public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
+public abstract class BasicLocalBlockQueue extends LocalBlockQueue {
 
     private final String world;
     private final ConcurrentHashMap<Long, LocalChunk> blockChunks = new ConcurrentHashMap<>();
@@ -35,7 +35,7 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
 
     @Override public abstract PlotBlock getBlock(int x, int y, int z);
 
-    public abstract void setComponents(LocalChunk<T> lc);
+    public abstract void setComponents(LocalChunk lc);
 
     @Override public final String getWorld() {
         return world;
@@ -62,7 +62,7 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         return false;
     }
 
-    public final boolean execute(final LocalChunk<T> lc) {
+    public final boolean execute(final LocalChunk lc) {
         if (lc == null) {
             return false;
         }
@@ -149,7 +149,7 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         return true;
     }
 
-    public final void setChunk(LocalChunk<T> chunk) {
+    public final void setChunk(LocalChunk chunk) {
         LocalChunk previous = this.blockChunks.put(chunk.longHash(), chunk);
         if (previous != null) {
             chunks.remove(previous);
@@ -169,7 +169,7 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     }
 
 
-    public abstract class LocalChunk<B> {
+    public abstract class LocalChunk {
         public final BasicLocalBlockQueue parent;
         public final int z;
         public final int x;
@@ -177,7 +177,7 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
         public BaseBlock[][] baseblocks;
         public String[][] biomes;
 
-        public LocalChunk(BasicLocalBlockQueue<B> parent, int x, int z) {
+        public LocalChunk(BasicLocalBlockQueue parent, int x, int z) {
             this.parent = parent;
             this.x = x;
             this.z = z;
@@ -223,7 +223,7 @@ public abstract class BasicLocalBlockQueue<T> extends LocalBlockQueue {
     }
 
 
-    public class BasicLocalChunk extends LocalChunk<PlotBlock[]> {
+    public class BasicLocalChunk extends LocalChunk {
         public BasicLocalChunk(BasicLocalBlockQueue parent, int x, int z) {
             super(parent, x, z);
             baseblocks = new BaseBlock[16][];

From bbff898073334a2cd7db4ea51953106ca0d1becd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Fri, 31 May 2019 06:06:09 +0200
Subject: [PATCH 195/210] Extract air block into variable to reduce unnecessary
 function calls

---
 .../plotsquared/plot/generator/HybridPlotManager.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 0155f9cec..9f77e56f7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -81,6 +81,7 @@ public class HybridPlotManager extends ClassicPlotManager {
         } else {
             minY = 1;
         }
+        BaseBlock airBlock = BlockTypes.AIR.getDefaultState().toBaseBlock();
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
             short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
             if (absX < 0) {
@@ -98,7 +99,7 @@ public class HybridPlotManager extends ClassicPlotManager {
                             queue.setBlock(x, minY + y, z, blocks[y]);
                         } else {
                             // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear
-                            queue.setBlock(x, minY + y, z, BlockTypes.AIR.getDefaultState().toBaseBlock());
+                            queue.setBlock(x, minY + y, z, airBlock);
                         }
                     }
                 }

From 908a5784a18eda1f5325a5867c328b4b0abf7914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Fri, 31 May 2019 20:16:39 +0200
Subject: [PATCH 196/210] Cache conversions to BaseBlock and fix leaky
 abstraction

---
 .../plotsquared/plot/object/LegacyPlotBlock.java     | 12 ++++++++++++
 .../plotsquared/plot/object/PlotBlock.java           |  2 ++
 .../plotsquared/plot/object/StringPlotBlock.java     | 10 +++++++++-
 .../plot/util/block/BasicLocalBlockQueue.java        | 10 +---------
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
index be551b372..38407a52f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LegacyPlotBlock.java
@@ -1,6 +1,10 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
+import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import com.sk89q.worldedit.world.registry.LegacyMapper;
 import lombok.Getter;
+import lombok.Setter;
 
 public class LegacyPlotBlock extends PlotBlock {
 
@@ -15,6 +19,7 @@ public class LegacyPlotBlock extends PlotBlock {
         }
     }
 
+    @Setter private BaseBlock baseBlock = null;
     @Getter public final short id;
     @Getter public final byte data;
 
@@ -27,6 +32,13 @@ public class LegacyPlotBlock extends PlotBlock {
         return this.id;
     }
 
+    @Override public BaseBlock getBaseBlock() {
+        if (baseBlock == null) {
+            baseBlock = LegacyMapper.getInstance().getBlockFromLegacy(id, data).toBaseBlock();
+        }
+        return baseBlock;
+    }
+
     @Override public boolean isAir() {
         return this.id == 0;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
index 79521908e..5b9de5852 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotBlock.java
@@ -133,4 +133,6 @@ public abstract class PlotBlock implements ConfigurationSerializable {
 
     public abstract Object getRawId();
 
+    public abstract BaseBlock getBaseBlock();
+
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
index 706d1ae06..d4119ae92 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringPlotBlock.java
@@ -1,6 +1,7 @@
 package com.github.intellectualsites.plotsquared.plot.object;
 
 import com.sk89q.worldedit.world.block.BaseBlock;
+import com.sk89q.worldedit.world.block.BlockTypes;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
@@ -15,7 +16,7 @@ public class StringPlotBlock extends PlotBlock {
     private static final Map<String, StringPlotBlock> STRING_PLOT_BLOCK_CACHE = new HashMap<>();
     @Getter private final String nameSpace;
     @Getter private final String itemId;
-    @Getter @Setter private BaseBlock baseBlock = null;
+    @Setter private BaseBlock baseBlock = null;
     private boolean isForeign = false;
 
     public StringPlotBlock(@NonNull final String nameSpace, @NonNull final String itemId) {
@@ -79,6 +80,13 @@ public class StringPlotBlock extends PlotBlock {
         return this.getItemId();
     }
 
+    @Override public BaseBlock getBaseBlock() {
+        if (baseBlock == null) {
+            baseBlock = BlockTypes.get(itemId).getDefaultState().toBaseBlock();
+        }
+        return baseBlock;
+    }
+
     @Override public boolean equals(Object obj) {
         if (this == obj) {
             return true;
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
index 551a9c44b..4ca62eb58 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/BasicLocalBlockQueue.java
@@ -121,15 +121,7 @@ public abstract class BasicLocalBlockQueue extends LocalBlockQueue {
         // Trying to mix PlotBlock and BaseBlock leads to all kinds of issues.
         // Since BaseBlock has more features than PlotBlock, simply convert
         // all PlotBlocks to BaseBlocks
-        if (id instanceof StringPlotBlock) {
-            StringPlotBlock stringPlotBlock = (StringPlotBlock) id;
-            return setBlock(x, y, z, BlockTypes.get(stringPlotBlock.getItemId()).getDefaultState().toBaseBlock());
-        } else if (id instanceof LegacyPlotBlock) {
-            LegacyPlotBlock legacyPlotBlock = (LegacyPlotBlock) id;
-            return setBlock(x, y, z, LegacyMapper.getInstance().getBlockFromLegacy(legacyPlotBlock.getId(), legacyPlotBlock.getData()).toBaseBlock());
-        } else {
-            throw new RuntimeException("Unknown PlotBock class: " + id.getClass().getName());
-        }
+        return setBlock(x, y, z, id.getBaseBlock());
     }
 
     @Override public final boolean setBiome(int x, int z, String biome) {

From 6b3960fc3f0f98391d37b0bc0cc7a384d56a676c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Fri, 31 May 2019 13:16:05 +0200
Subject: [PATCH 197/210] Pass the PlotArea into the PlotManager

---
 .../bukkit/generator/DelegatePlotGenerator.java     |  4 ++--
 .../plotsquared/plot/PlotSquared.java               |  2 +-
 .../plot/generator/ClassicPlotManager.java          | 13 ++++++++++++-
 .../plotsquared/plot/generator/GridPlotManager.java |  5 ++++-
 .../plotsquared/plot/generator/HybridGen.java       |  4 ++--
 .../plot/generator/HybridPlotManager.java           | 11 +++++++++++
 .../plot/generator/IndependentPlotGenerator.java    |  3 ++-
 .../plot/generator/SquarePlotManager.java           | 11 +++++++++++
 .../plotsquared/plot/object/PlotArea.java           |  2 +-
 .../plotsquared/plot/object/PlotManager.java        |  7 +++++++
 .../plot/object/worlds/SinglePlotManager.java       |  4 ++++
 .../plot/object/worlds/SingleWorldGenerator.java    |  4 ++--
 12 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
index 762e809af..f07c65cbf 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@@ -30,8 +30,8 @@ import java.util.Random;
     @Override public void initialize(PlotArea area) {
     }
 
-    @Override public PlotManager getNewPlotManager() {
-        return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotManager();
+    @Override public PlotManager getNewPlotManager(PlotArea plotArea) {
+        return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotManager(plotArea);
     }
 
     @Override public String getName() {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index a5d63d49b..e3164427c 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1086,7 +1086,7 @@ import java.util.zip.ZipInputStream;
             }
             // Conventional plot generator
             PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
-            PlotManager plotManager = plotGenerator.getNewPlotManager();
+            PlotManager plotManager = plotGenerator.getNewPlotManager(plotArea);
             PlotSquared.log(Captions.PREFIX + "&aDetected world load for '" + world + "'");
             PlotSquared
                 .log(Captions.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index 2ae0ca358..86836447b 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -13,8 +13,19 @@ import java.util.List;
  */
 public class ClassicPlotManager extends SquarePlotManager {
 
+    private final ClassicPlotWorld classicPlotWorld;
+
+    public ClassicPlotManager(PlotArea plotArea) {
+        super(plotArea);
+        if (plotArea instanceof ClassicPlotWorld){
+            classicPlotWorld = (ClassicPlotWorld)plotArea;
+        } else {
+            throw new RuntimeException("ClassicPlotManager requires plotArea to be an instance of ClassicPlotWorld");
+        }
+    }
+
     @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
-        BlockBucket blocks) {
+                                          BlockBucket blocks) {
         switch (component) {
             case "floor":
                 setFloor(plotArea, plotId, blocks);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
index 4ea841c3c..a0ed41226 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/GridPlotManager.java
@@ -1,10 +1,13 @@
 package com.github.intellectualsites.plotsquared.plot.generator;
 
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
 
 /**
  * A plot manager where plots tessellate in a grid formation symmetrical about x=z.
  */
 public abstract class GridPlotManager extends PlotManager {
-
+    public GridPlotManager(PlotArea plotArea) {
+        super(plotArea);
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index 66a32db4c..8d34f5d25 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -253,8 +253,8 @@ public class HybridGen extends IndependentPlotGenerator {
         return new HybridPlotWorld(world, id, this, min, max);
     }
 
-    @Override public PlotManager getNewPlotManager() {
-        return new HybridPlotManager();
+    @Override public PlotManager getNewPlotManager(PlotArea plotArea) {
+        return new HybridPlotManager(plotArea);
     }
 
     @Override public void initialize(PlotArea area) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 9f77e56f7..f3b6f6fe3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -21,6 +21,17 @@ public class HybridPlotManager extends ClassicPlotManager {
 
     public static boolean REGENERATIVE_CLEAR = true;
 
+    private final HybridPlotWorld hybridPlotWorld;
+
+    public HybridPlotManager(PlotArea plotArea) {
+        super(plotArea);
+        if (plotArea instanceof HybridPlotWorld){
+            hybridPlotWorld = (HybridPlotWorld)plotArea;
+        } else {
+            throw new RuntimeException("HybridPlotManager requires plotArea to be an instance of HybridPlotWorld");
+        }
+    }
+
     @Override public void exportTemplate(PlotArea plotArea) throws IOException {
         HashSet<FileBytes> files = Sets.newHashSet(
             new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml", Template.getBytes(plotArea)));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
index e06d7208e..44703be52 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
@@ -53,8 +53,9 @@ public abstract class IndependentPlotGenerator {
      * Return a new PlotManager object.
      *
      * @return
+     * @param plotArea
      */
-    public abstract PlotManager getNewPlotManager();
+    public abstract PlotManager getNewPlotManager(PlotArea plotArea);
 
     /**
      * If any additional setup options need to be changed before world creation.
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
index 5be65a394..f9b2f5437 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
@@ -14,6 +14,17 @@ import java.util.Iterator;
  */
 public abstract class SquarePlotManager extends GridPlotManager {
 
+    private final SquarePlotWorld squarePlotWorld;
+
+    public SquarePlotManager(PlotArea plotArea) {
+        super(plotArea);
+        if (plotArea instanceof SquarePlotWorld){
+            squarePlotWorld = (SquarePlotWorld)plotArea;
+        } else {
+            throw new RuntimeException("SquarePlotManager requires plotArea to be an instance of SquarePlotWorld");
+        }
+    }
+
     @Override
     public boolean clearPlot(PlotArea plotArea, final Plot plot, final Runnable whenDone) {
         final HashSet<RegionWrapper> regions = plot.getRegions();
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 785b20e1e..25b22c1bf 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -81,7 +81,7 @@ public abstract class PlotArea {
         @Nullable final PlotId max) {
         this.worldname = worldName;
         this.id = id;
-        this.manager = generator.getNewPlotManager();
+        this.manager = generator.getNewPlotManager(this);
         this.generator = generator;
         if (min == null || max == null) {
             if (min != max) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
index 7dc4185c8..32a1e0423 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
@@ -10,6 +10,13 @@ import java.util.List;
 
 public abstract class PlotManager {
 
+    private final PlotArea plotArea;
+
+    public PlotManager(PlotArea plotArea) {
+
+        this.plotArea = plotArea;
+    }
+
     /*
      * Plot locations (methods with Abs in them will not need to consider mega
      * plots).
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index 7146a898b..ab8a01078 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -10,6 +10,10 @@ import java.io.File;
 import java.util.List;
 
 public class SinglePlotManager extends PlotManager {
+    public SinglePlotManager(PlotArea plotArea) {
+        super(plotArea);
+    }
+
     @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
         return new PlotId(0, 0);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
index ba498f971..a821c03a4 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
@@ -81,8 +81,8 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
         return ((SinglePlotAreaManager) PlotSquared.get().getPlotAreaManager()).getArea();
     }
 
-    @Override public PlotManager getNewPlotManager() {
-        return new SinglePlotManager();
+    @Override public PlotManager getNewPlotManager(PlotArea plotArea) {
+        return new SinglePlotManager(plotArea);
     }
 
     @Override public void initialize(PlotArea area) {

From c5bca666188e6728a635340cf23b1cf5f69725b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Fri, 31 May 2019 15:05:37 +0200
Subject: [PATCH 198/210] Remove PlotArea parameter from PlotManager method
 calls

As per the previous commit, all PlotManagers now have a reference to their managed PlotArea.
---
 .../plot/commands/DebugClaimTest.java         |   2 +-
 .../plot/commands/DebugRoadRegen.java         |  16 +-
 .../plotsquared/plot/commands/Set.java        |   6 +-
 .../plotsquared/plot/commands/Template.java   |   2 +-
 .../plot/generator/AugmentedUtils.java        |   2 +-
 .../plot/generator/ClassicPlotManager.java    | 337 +++++++++---------
 .../plot/generator/HybridPlotManager.java     | 119 +++----
 .../plot/generator/HybridUtils.java           |   6 +-
 .../plot/generator/SquarePlotManager.java     |  81 ++---
 .../plotsquared/plot/object/Plot.java         |  62 ++--
 .../plotsquared/plot/object/PlotArea.java     |  16 +-
 .../plotsquared/plot/object/PlotCluster.java  |   6 +-
 .../plotsquared/plot/object/PlotManager.java  |  44 +--
 .../plot/object/worlds/SinglePlotManager.java |  42 +--
 14 files changed, 354 insertions(+), 387 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
index 9d5dc9d3d..41a5eda80 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugClaimTest.java
@@ -55,7 +55,7 @@ public class DebugClaimTest extends SubCommand {
                 MainUtil.sendMessage(player, " - &cDB Already contains: " + plot.getId());
                 continue;
             }
-            Location loc = manager.getSignLoc(area, plot);
+            Location loc = manager.getSignLoc(plot);
             ChunkLoc chunk = new ChunkLoc(loc.getX() >> 4, loc.getZ() >> 4);
             boolean result = ChunkManager.manager.loadChunk(area.worldname, chunk, false);
             if (!result) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
index fd0b29657..1880cd6b0 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
@@ -2,11 +2,9 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
-import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
-import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 
@@ -18,20 +16,16 @@ public class DebugRoadRegen extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         Location loc = player.getLocation();
-        PlotArea plotArea = loc.getPlotArea();
-        if (!(plotArea instanceof HybridPlotWorld)) {
-            return sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
-        }
+        PlotManager manager = loc.getPlotArea().getPlotManager();
         Plot plot = player.getCurrentPlot();
         if (plot == null) {
             Captions.NOT_IN_PLOT.send(player);
         } else if (plot.isMerged()) {
             Captions.REQUIRES_UNMERGED.send(player);
         } else {
-            HybridPlotManager manager = (HybridPlotManager) plotArea.getPlotManager();
-            manager.createRoadEast(plotArea, plot);
-            manager.createRoadSouth(plotArea, plot);
-            manager.createRoadSouthEast(plotArea, plot);
+            manager.createRoadEast(plot);
+            manager.createRoadSouth(plot);
+            manager.createRoadSouthEast(plot);
             MainUtil.sendMessage(player, "&6Regenerating plot south/east roads: " + plot.getId()
                 + "\n&6 - Result: &aSuccess");
             MainUtil.sendMessage(player, "&cTo regenerate all roads: /plot regenallroads");
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
index 8a3406cda..7b01f57e1 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Set.java
@@ -47,7 +47,7 @@ import java.util.stream.IntStream;
             @Override public boolean set(PlotPlayer player, final Plot plot, String value) {
                 PlotArea plotArea = player.getLocation().getPlotArea();
                 PlotManager manager = player.getLocation().getPlotManager();
-                String[] components = manager.getPlotComponents(plotArea, plot.getId());
+                String[] components = manager.getPlotComponents(plot.getId());
                 boolean allowUnsafe = DebugAllowUnsafe.unsafeAllowed.contains(player.getUUID());
 
                 String[] args = value.split(" ");
@@ -124,7 +124,7 @@ import java.util.stream.IntStream;
         Plot plot = player.getCurrentPlot();
         if (plot != null) {
             newValues.addAll(
-                Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
+                Arrays.asList(plot.getManager().getPlotComponents(plot.getId())));
         }
         MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.s() + StringMan
             .join(newValues, Captions.BLOCK_LIST_SEPARATER.formatted()));
@@ -151,7 +151,7 @@ import java.util.stream.IntStream;
         }
         // components
         HashSet<String> components = new HashSet<>(
-            Arrays.asList(plot.getManager().getPlotComponents(plot.getArea(), plot.getId())));
+            Arrays.asList(plot.getManager().getPlotComponents(plot.getId())));
         if (components.contains(args[0].toLowerCase())) {
             return this.component.onCommand(player, Arrays.copyOfRange(args, 0, args.length));
         }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
index 472542523..eb96f78cc 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Template.java
@@ -179,7 +179,7 @@ import java.util.zip.ZipOutputStream;
                 final PlotManager manager = area.getPlotManager();
                 TaskManager.runTaskAsync(() -> {
                     try {
-                        manager.exportTemplate(area);
+                        manager.exportTemplate();
                     } catch (Exception e) { // Must recover from any exception thrown a third party template manager
                         e.printStackTrace();
                         MainUtil.sendMessage(player, "Failed: " + e.getMessage());
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
index 998edae06..fe0a614a2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java
@@ -96,7 +96,7 @@ public class AugmentedUtils {
                     for (int z = bzz; z <= tzz; z++) {
                         int rx = x + blockX;
                         int rz = z + blockZ;
-                        boolean can = manager.getPlotId(area, rx, 0, rz) == null;
+                        boolean can = manager.getPlotId(rx, 0, rz) == null;
                         if (can) {
                             for (int y = 1; y < 128; y++) {
                                 queue.setBlock(rx, y, rz, air);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index 86836447b..a822c3243 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -24,55 +24,53 @@ public class ClassicPlotManager extends SquarePlotManager {
         }
     }
 
-    @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
+    @Override public boolean setComponent(PlotId plotId, String component,
                                           BlockBucket blocks) {
         switch (component) {
             case "floor":
-                setFloor(plotArea, plotId, blocks);
+                setFloor(plotId, blocks);
                 return true;
             case "wall":
-                setWallFilling(plotArea, plotId, blocks);
+                setWallFilling(plotId, blocks);
                 return true;
             case "all":
-                setAll(plotArea, plotId, blocks);
+                setAll(plotId, blocks);
                 return true;
             case "air":
-                setAir(plotArea, plotId, blocks);
+                setAir(plotId, blocks);
                 return true;
             case "main":
-                setMain(plotArea, plotId, blocks);
+                setMain(plotId, blocks);
                 return true;
             case "middle":
-                setMiddle(plotArea, plotId, blocks);
+                setMiddle(plotId, blocks);
                 return true;
             case "outline":
-                setOutline(plotArea, plotId, blocks);
+                setOutline(plotId, blocks);
                 return true;
             case "border":
-                setWall(plotArea, plotId, blocks);
+                setWall(plotId, blocks);
                 return true;
         }
         return false;
     }
 
-    @Override public boolean unClaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        setWallFilling(dpw, plot.getId(), dpw.WALL_FILLING);
-        setWall(dpw, plot.getId(), dpw.WALL_BLOCK);
+    @Override public boolean unClaimPlot(Plot plot, Runnable whenDone) {
+        setWallFilling(plot.getId(), classicPlotWorld.WALL_FILLING);
+        setWall(plot.getId(), classicPlotWorld.WALL_BLOCK);
         GlobalBlockQueue.IMP.addTask(whenDone);
         return true;
     }
 
-    public boolean setFloor(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
-        LocalBlockQueue queue = plotArea.getQueue(false);
+    public boolean setFloor(PlotId plotId, BlockBucket blocks) {
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         if (plot.isBasePlot()) {
-            ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
             for (RegionWrapper region : plot.getRegions()) {
                 Location pos1 =
-                    new Location(plotArea.worldname, region.minX, dpw.PLOT_HEIGHT, region.minZ);
+                    new Location(classicPlotWorld.worldname, region.minX, classicPlotWorld.PLOT_HEIGHT, region.minZ);
                 Location pos2 =
-                    new Location(plotArea.worldname, region.maxX, dpw.PLOT_HEIGHT, region.maxZ);
+                    new Location(classicPlotWorld.worldname, region.maxX, classicPlotWorld.PLOT_HEIGHT, region.maxZ);
                 queue.setCuboid(pos1, pos2, blocks);
             }
         }
@@ -80,87 +78,83 @@ public class ClassicPlotManager extends SquarePlotManager {
         return true;
     }
 
-    public boolean setAll(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
+    public boolean setAll(PlotId plotId, BlockBucket blocks) {
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         if (!plot.isBasePlot()) {
             return false;
         }
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        int maxY = getWorldHeight();
         for (RegionWrapper region : plot.getRegions()) {
-            Location pos1 = new Location(plotArea.worldname, region.minX, 1, region.minZ);
-            Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
+            Location pos1 = new Location(classicPlotWorld.worldname, region.minX, 1, region.minZ);
+            Location pos2 = new Location(classicPlotWorld.worldname, region.maxX, maxY, region.maxZ);
             queue.setCuboid(pos1, pos2, blocks);
         }
         queue.enqueue();
         return true;
     }
 
-    public boolean setAir(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
+    public boolean setAir(PlotId plotId, BlockBucket blocks) {
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         if (!plot.isBasePlot()) {
             return false;
         }
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        int maxY = getWorldHeight();
         for (RegionWrapper region : plot.getRegions()) {
             Location pos1 =
-                new Location(plotArea.worldname, region.minX, dpw.PLOT_HEIGHT + 1, region.minZ);
-            Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
+                new Location(classicPlotWorld.worldname, region.minX, classicPlotWorld.PLOT_HEIGHT + 1, region.minZ);
+            Location pos2 = new Location(classicPlotWorld.worldname, region.maxX, maxY, region.maxZ);
             queue.setCuboid(pos1, pos2, blocks);
         }
         queue.enqueue();
         return true;
     }
 
-    public boolean setMain(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
+    public boolean setMain(PlotId plotId, BlockBucket blocks) {
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         if (!plot.isBasePlot()) {
             return false;
         }
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        LocalBlockQueue queue = plotArea.getQueue(false);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         for (RegionWrapper region : plot.getRegions()) {
-            Location pos1 = new Location(plotArea.worldname, region.minX, 1, region.minZ);
+            Location pos1 = new Location(classicPlotWorld.worldname, region.minX, 1, region.minZ);
             Location pos2 =
-                new Location(plotArea.worldname, region.maxX, dpw.PLOT_HEIGHT - 1, region.maxZ);
+                new Location(classicPlotWorld.worldname, region.maxX, classicPlotWorld.PLOT_HEIGHT - 1, region.maxZ);
             queue.setCuboid(pos1, pos2, blocks);
         }
         queue.enqueue();
         return true;
     }
 
-    public boolean setMiddle(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        Plot plot = plotArea.getPlotAbs(plotId);
+    public boolean setMiddle(PlotId plotId, BlockBucket blocks) {
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         if (!plot.isBasePlot()) {
             return false;
         }
         Location[] corners = plot.getCorners();
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        LocalBlockQueue queue = plotArea.getQueue(false);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
 
         int x = MathMan.average(corners[0].getX(), corners[1].getX());
         int z = MathMan.average(corners[0].getZ(), corners[1].getZ());
-        queue.setBlock(x, dpw.PLOT_HEIGHT, z, blocks.getBlock());
+        queue.setBlock(x, classicPlotWorld.PLOT_HEIGHT, z, blocks.getBlock());
         queue.enqueue();
         return true;
     }
 
-    public boolean setOutline(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        if (dpw.ROAD_WIDTH == 0) {
+    public boolean setOutline(PlotId plotId, BlockBucket blocks) {
+        if (classicPlotWorld.ROAD_WIDTH == 0) {
             return false;
         }
-        Plot plot = plotArea.getPlotAbs(plotId);
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         Location bottom = plot.getBottomAbs();
         Location top = plot.getExtendedTopAbs();
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        int maxY = classicPlotWorld.getPlotManager().getWorldHeight();
         if (!plot.getMerged(Direction.NORTH)) {
             int z = bottom.getZ();
             for (int x = bottom.getX(); x <= top.getX(); x++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -168,7 +162,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.getMerged(Direction.WEST)) {
             int x = bottom.getX();
             for (int z = bottom.getZ(); z <= top.getZ(); z++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -177,7 +171,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.getMerged(Direction.SOUTH)) {
             int z = top.getZ();
             for (int x = bottom.getX(); x <= top.getX(); x++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -185,15 +179,15 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.getMerged(Direction.EAST)) {
             int x = top.getX();
             for (int z = bottom.getZ(); z <= top.getZ(); z++) {
-                for (int y = dpw.PLOT_HEIGHT; y <= maxY; y++) {
+                for (int y = classicPlotWorld.PLOT_HEIGHT; y <= maxY; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
         }
         if (plot.isBasePlot()) {
             for (RegionWrapper region : plot.getRegions()) {
-                Location pos1 = new Location(plotArea.worldname, region.minX, maxY, region.minZ);
-                Location pos2 = new Location(plotArea.worldname, region.maxX, maxY, region.maxZ);
+                Location pos1 = new Location(classicPlotWorld.worldname, region.minX, maxY, region.minZ);
+                Location pos2 = new Location(classicPlotWorld.worldname, region.maxX, maxY, region.maxZ);
                 queue.setCuboid(pos1, pos2, blocks);
             }
         }
@@ -201,21 +195,20 @@ public class ClassicPlotManager extends SquarePlotManager {
         return true;
     }
 
-    public boolean setWallFilling(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        if (dpw.ROAD_WIDTH == 0) {
+    public boolean setWallFilling(PlotId plotId, BlockBucket blocks) {
+        if (classicPlotWorld.ROAD_WIDTH == 0) {
             return false;
         }
-        Plot plot = plotArea.getPlotAbs(plotId);
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         Location bot = plot.getExtendedBottomAbs()
             .subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0,
                 plot.getMerged(Direction.NORTH) ? 0 : 1);
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
-        LocalBlockQueue queue = plotArea.getQueue(false);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         if (!plot.getMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -223,7 +216,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.getMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -232,7 +225,7 @@ public class ClassicPlotManager extends SquarePlotManager {
             int z = top.getZ();
             for (int x = bot.getX();
                  x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -241,7 +234,7 @@ public class ClassicPlotManager extends SquarePlotManager {
             int x = top.getX();
             for (int z = bot.getZ();
                  z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
-                for (int y = 1; y <= dpw.WALL_HEIGHT; y++) {
+                for (int y = 1; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks.getBlock());
                 }
             }
@@ -250,18 +243,17 @@ public class ClassicPlotManager extends SquarePlotManager {
         return true;
     }
 
-    public boolean setWall(PlotArea plotArea, PlotId plotId, BlockBucket blocks) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        if (dpw.ROAD_WIDTH == 0) {
+    public boolean setWall(PlotId plotId, BlockBucket blocks) {
+        if (classicPlotWorld.ROAD_WIDTH == 0) {
             return false;
         }
-        Plot plot = plotArea.getPlotAbs(plotId);
+        Plot plot = classicPlotWorld.getPlotAbs(plotId);
         Location bot = plot.getExtendedBottomAbs()
             .subtract(plot.getMerged(Direction.WEST) ? 0 : 1, 0,
                 plot.getMerged(Direction.NORTH) ? 0 : 1);
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int y = dpw.WALL_HEIGHT + 1;
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        int y = classicPlotWorld.WALL_HEIGHT + 1;
         if (!plot.getMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
@@ -295,145 +287,139 @@ public class ClassicPlotManager extends SquarePlotManager {
     /**
      * PLOT MERGING.
      */
-    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+    @Override public boolean createRoadEast(Plot plot) {
+        Location pos1 = getPlotBottomLocAbs(plot.getId());
+        Location pos2 = getPlotTopLocAbs(plot.getId());
         int sx = pos2.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int ex = sx + classicPlotWorld.ROAD_WIDTH - 1;
         int sz = pos1.getZ() - 2;
         int ez = pos2.getZ() + 2;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        int maxY = plotArea.getPlotManager().getWorldHeight();
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        int maxY = getWorldHeight();
         queue.setCuboid(
-            new Location(plotArea.worldname, sx, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1,
-                sz + 1), new Location(plotArea.worldname, ex, maxY, ez - 1),
+            new Location(classicPlotWorld.worldname, sx, Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
+                sz + 1), new Location(classicPlotWorld.worldname, ex, maxY, ez - 1),
             PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 0, sz + 1),
-            new Location(plotArea.worldname, ex, 0, ez - 1), PlotBlock.get((short) 7, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz + 1),
-            new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT, ez - 1), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT + 1, sz + 1),
-            new Location(plotArea.worldname, sx, dpw.WALL_HEIGHT + 1, ez - 1), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, ex, 1, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT, ez - 1), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT + 1, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.WALL_HEIGHT + 1, ez - 1), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, 0, sz + 1),
+            new Location(classicPlotWorld.worldname, ex, 0, ez - 1), PlotBlock.get((short) 7, (byte) 0));
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, 1, sz + 1),
+            new Location(classicPlotWorld.worldname, sx, classicPlotWorld.WALL_HEIGHT, ez - 1), classicPlotWorld.WALL_FILLING);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, classicPlotWorld.WALL_HEIGHT + 1, sz + 1),
+            new Location(classicPlotWorld.worldname, sx, classicPlotWorld.WALL_HEIGHT + 1, ez - 1), classicPlotWorld.WALL_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, ex, 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.WALL_HEIGHT, ez - 1), classicPlotWorld.WALL_FILLING);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, ex, classicPlotWorld.WALL_HEIGHT + 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.WALL_HEIGHT + 1, ez - 1), classicPlotWorld.WALL_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1), classicPlotWorld.ROAD_BLOCK);
         queue.enqueue();
         return true;
     }
 
-    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+    @Override public boolean createRoadSouth(Plot plot) {
+        Location pos1 = getPlotBottomLocAbs(plot.getId());
+        Location pos2 = getPlotTopLocAbs(plot.getId());
         int sz = pos2.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
+        int ez = sz + classicPlotWorld.ROAD_WIDTH - 1;
         int sx = pos1.getX() - 2;
         int ex = pos2.getX() + 2;
-        LocalBlockQueue queue = plotArea.getQueue(false);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         queue.setCuboid(
-            new Location(plotArea.worldname, sx + 1, Math.min(dpw.WALL_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+            new Location(classicPlotWorld.worldname, sx + 1, Math.min(classicPlotWorld.WALL_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
                 sz),
-            new Location(plotArea.worldname, ex - 1, plotArea.getPlotManager().getWorldHeight(),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.getPlotManager().getWorldHeight(),
                 ez), PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 0, sz),
-            new Location(plotArea.worldname, ex - 1, 0, ez), PlotBlock.get((short) 7, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT, sz), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.WALL_HEIGHT + 1, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT + 1, sz), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, ez),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT, ez), dpw.WALL_FILLING);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.WALL_HEIGHT + 1, ez),
-            new Location(plotArea.worldname, ex - 1, dpw.WALL_HEIGHT + 1, ez), dpw.WALL_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 0, sz),
+            new Location(classicPlotWorld.worldname, ex - 1, 0, ez), PlotBlock.get((short) 7, (byte) 0));
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 1, sz),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.WALL_HEIGHT, sz), classicPlotWorld.WALL_FILLING);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, classicPlotWorld.WALL_HEIGHT + 1, sz),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.WALL_HEIGHT + 1, sz), classicPlotWorld.WALL_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 1, ez),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.WALL_HEIGHT, ez), classicPlotWorld.WALL_FILLING);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, classicPlotWorld.WALL_HEIGHT + 1, ez),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.WALL_HEIGHT + 1, ez), classicPlotWorld.WALL_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1), classicPlotWorld.ROAD_BLOCK);
         queue.enqueue();
         return true;
     }
 
-    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+    @Override public boolean createRoadSouthEast(Plot plot) {
+        Location pos2 = getPlotTopLocAbs(plot.getId());
         int sx = pos2.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int ex = sx + classicPlotWorld.ROAD_WIDTH - 1;
         int sz = pos2.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.ROAD_HEIGHT + 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.getPlotManager().getWorldHeight(), ez - 1),
+        int ez = sz + classicPlotWorld.ROAD_WIDTH - 1;
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, classicPlotWorld.ROAD_HEIGHT + 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.getPlotManager().getWorldHeight(), ez - 1),
             PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 0, sz + 1),
-            new Location(plotArea.worldname, ex - 1, 0, ez - 1),
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 0, sz + 1),
+            new Location(classicPlotWorld.worldname, ex - 1, 0, ez - 1),
             PlotBlock.get((short) 7, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz + 1),
-            new Location(plotArea.worldname, ex - 1, dpw.ROAD_HEIGHT, ez - 1), dpw.ROAD_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.ROAD_HEIGHT, ez - 1), classicPlotWorld.ROAD_BLOCK);
         queue.enqueue();
         return true;
     }
 
-    @Override public boolean removeRoadEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+    @Override public boolean removeRoadEast(Plot plot) {
+        Location pos1 = getPlotBottomLocAbs(plot.getId());
+        Location pos2 = getPlotTopLocAbs(plot.getId());
         int sx = pos2.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int ex = sx + classicPlotWorld.ROAD_WIDTH - 1;
         int sz = pos1.getZ() - 1;
         int ez = pos2.getZ() + 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         queue.setCuboid(
-            new Location(plotArea.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+            new Location(classicPlotWorld.worldname, sx, Math.min(classicPlotWorld.PLOT_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
                 sz),
-            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
             PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.PLOT_HEIGHT - 1, ez - 1), dpw.MAIN_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.PLOT_HEIGHT, sz + 1),
-            new Location(plotArea.worldname, ex, dpw.PLOT_HEIGHT, ez - 1), dpw.TOP_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, 1, sz + 1),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.PLOT_HEIGHT - 1, ez - 1), classicPlotWorld.MAIN_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, classicPlotWorld.PLOT_HEIGHT, sz + 1),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.PLOT_HEIGHT, ez - 1), classicPlotWorld.TOP_BLOCK);
         queue.enqueue();
         return true;
     }
 
-    @Override public boolean removeRoadSouth(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location pos1 = getPlotBottomLocAbs(plotArea, plot.getId());
-        Location pos2 = getPlotTopLocAbs(plotArea, plot.getId());
+    @Override public boolean removeRoadSouth(Plot plot) {
+        Location pos1 = getPlotBottomLocAbs(plot.getId());
+        Location pos2 = getPlotTopLocAbs(plot.getId());
         int sz = pos2.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
+        int ez = sz + classicPlotWorld.ROAD_WIDTH - 1;
         int sx = pos1.getX() - 1;
         int ex = pos2.getX() + 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         queue.setCuboid(
-            new Location(plotArea.worldname, sx, Math.min(dpw.PLOT_HEIGHT, dpw.ROAD_HEIGHT) + 1,
+            new Location(classicPlotWorld.worldname, sx, Math.min(classicPlotWorld.PLOT_HEIGHT, classicPlotWorld.ROAD_HEIGHT) + 1,
                 sz),
-            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
             PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, 1, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.PLOT_HEIGHT - 1, ez), dpw.MAIN_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx + 1, dpw.PLOT_HEIGHT, sz),
-            new Location(plotArea.worldname, ex - 1, dpw.PLOT_HEIGHT, ez), dpw.TOP_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, 1, sz),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.PLOT_HEIGHT - 1, ez), classicPlotWorld.MAIN_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx + 1, classicPlotWorld.PLOT_HEIGHT, sz),
+            new Location(classicPlotWorld.worldname, ex - 1, classicPlotWorld.PLOT_HEIGHT, ez), classicPlotWorld.TOP_BLOCK);
         queue.enqueue();
         return true;
     }
 
-    @Override public boolean removeRoadSouthEast(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
-        Location location = getPlotTopLocAbs(dpw, plot.getId());
+    @Override public boolean removeRoadSouthEast(Plot plot) {
+        Location location = getPlotTopLocAbs(plot.getId());
         int sx = location.getX() + 1;
-        int ex = sx + dpw.ROAD_WIDTH - 1;
+        int ex = sx + classicPlotWorld.ROAD_WIDTH - 1;
         int sz = location.getZ() + 1;
-        int ez = sz + dpw.ROAD_WIDTH - 1;
-        LocalBlockQueue queue = plotArea.getQueue(false);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.ROAD_HEIGHT + 1, sz),
-            new Location(plotArea.worldname, ex, plotArea.getPlotManager().getWorldHeight(), ez),
+        int ez = sz + classicPlotWorld.ROAD_WIDTH - 1;
+        LocalBlockQueue queue = classicPlotWorld.getQueue(false);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, classicPlotWorld.ROAD_HEIGHT + 1, sz),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.getPlotManager().getWorldHeight(), ez),
             PlotBlock.get((short) 0, (byte) 0));
-        queue.setCuboid(new Location(plotArea.worldname, sx, 1, sz),
-            new Location(plotArea.worldname, ex, dpw.ROAD_HEIGHT - 1, ez), dpw.MAIN_BLOCK);
-        queue.setCuboid(new Location(plotArea.worldname, sx, dpw.ROAD_HEIGHT, sz),
-            new Location(plotArea.worldname, ex, dpw.ROAD_HEIGHT, ez), dpw.TOP_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, 1, sz),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.ROAD_HEIGHT - 1, ez), classicPlotWorld.MAIN_BLOCK);
+        queue.setCuboid(new Location(classicPlotWorld.worldname, sx, classicPlotWorld.ROAD_HEIGHT, sz),
+            new Location(classicPlotWorld.worldname, ex, classicPlotWorld.ROAD_HEIGHT, ez), classicPlotWorld.TOP_BLOCK);
         queue.enqueue();
         return true;
     }
@@ -441,48 +427,47 @@ public class ClassicPlotManager extends SquarePlotManager {
     /**
      * Finishing off plot merging by adding in the walls surrounding the plot (OPTIONAL)(UNFINISHED).
      */
-    @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
-        final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        plotIds.forEach(id -> setWall(plotArea, id, block));
+    @Override public boolean finishPlotMerge(List<PlotId> plotIds) {
+        final BlockBucket block = classicPlotWorld.CLAIMED_WALL_BLOCK;
+        plotIds.forEach(id -> setWall(id, block));
         if (Settings.General.MERGE_REPLACE_WALL) {
-            final BlockBucket wallBlock = ((ClassicPlotWorld) plotArea).WALL_FILLING;
-            plotIds.forEach(id -> setWallFilling(plotArea, id, wallBlock));
+            final BlockBucket wallBlock = classicPlotWorld.WALL_FILLING;
+            plotIds.forEach(id -> setWallFilling(id, wallBlock));
         }
         return true;
     }
 
-    @Override public boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
-        final BlockBucket block = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        plotIds.forEach(id -> setWall(plotArea, id, block));
+    @Override public boolean finishPlotUnlink(List<PlotId> plotIds) {
+        final BlockBucket block = classicPlotWorld.CLAIMED_WALL_BLOCK;
+        plotIds.forEach(id -> setWall(id, block));
         return true;
     }
 
-    @Override public boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+    @Override public boolean startPlotMerge(List<PlotId> plotIds) {
         return true;
     }
 
-    @Override public boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+    @Override public boolean startPlotUnlink(List<PlotId> plotIds) {
         return true;
     }
 
-    @Override public boolean claimPlot(PlotArea plotArea, Plot plot) {
-        final BlockBucket claim = ((ClassicPlotWorld) plotArea).CLAIMED_WALL_BLOCK;
-        setWall(plotArea, plot.getId(), claim);
+    @Override public boolean claimPlot(Plot plot) {
+        final BlockBucket claim = classicPlotWorld.CLAIMED_WALL_BLOCK;
+        setWall(plot.getId(), claim);
         return true;
     }
 
-    @Override public String[] getPlotComponents(PlotArea plotArea, PlotId plotId) {
+    @Override public String[] getPlotComponents(PlotId plotId) {
         return new String[] {"main", "floor", "air", "all", "border", "wall", "outline", "middle"};
     }
 
     /**
      * Remove sign for a plot.
      */
-    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
-        ClassicPlotWorld dpw = (ClassicPlotWorld) plotArea;
+    @Override public Location getSignLoc(Plot plot) {
         plot = plot.getBasePlot(false);
         Location bot = plot.getBottomAbs();
-        return new Location(plotArea.worldname, bot.getX() - 1, dpw.ROAD_HEIGHT + 1,
+        return new Location(classicPlotWorld.worldname, bot.getX() - 1, classicPlotWorld.ROAD_HEIGHT + 1,
             bot.getZ() - 2);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index f3b6f6fe3..0bbf67557 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -32,11 +32,11 @@ public class HybridPlotManager extends ClassicPlotManager {
         }
     }
 
-    @Override public void exportTemplate(PlotArea plotArea) throws IOException {
+    @Override public void exportTemplate() throws IOException {
         HashSet<FileBytes> files = Sets.newHashSet(
-            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml", Template.getBytes(plotArea)));
+            new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml", Template.getBytes(hybridPlotWorld)));
         String dir = "schematics" + File.separator + "GEN_ROAD_SCHEMATIC" + File.separator
-            + plotArea.worldname + File.separator;
+            + hybridPlotWorld.worldname + File.separator;
         try {
             File sideroad =
                 MainUtil.getFile(PlotSquared.get().IMP.getDirectory(), dir + "sideroad.schem");
@@ -59,51 +59,50 @@ public class HybridPlotManager extends ClassicPlotManager {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        Template.zipAll(plotArea.worldname, files);
+        Template.zipAll(hybridPlotWorld.worldname, files);
     }
 
-    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
-        super.createRoadEast(plotArea, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
+    @Override public boolean createRoadEast(Plot plot) {
+        super.createRoadEast(plot);
         PlotId id = plot.getId();
         PlotId id2 = new PlotId(id.x + 1, id.y);
-        Location bot = getPlotBottomLocAbs(hpw, id2);
-        Location top = getPlotTopLocAbs(hpw, id);
-        Location pos1 = new Location(plotArea.worldname, top.getX() + 1, 0, bot.getZ() - 1);
+        Location bot = getPlotBottomLocAbs(id2);
+        Location top = getPlotTopLocAbs(id);
+        Location pos1 = new Location(hybridPlotWorld.worldname, top.getX() + 1, 0, bot.getZ() - 1);
         Location pos2 =
-            new Location(plotArea.worldname, bot.getX(), Math.min(getWorldHeight(), 255),
+            new Location(hybridPlotWorld.worldname, bot.getX(), Math.min(getWorldHeight(), 255),
                 top.getZ() + 1);
-        MainUtil.resetBiome(plotArea, pos1, pos2);
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
+        MainUtil.resetBiome(hybridPlotWorld, pos1, pos2);
+        if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
             return true;
         }
-        LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2);
+        LocalBlockQueue queue = hybridPlotWorld.getQueue(false);
+        createSchemAbs(queue, pos1, pos2);
         queue.enqueue();
         return true;
     }
 
-    private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1,
+    private void createSchemAbs(LocalBlockQueue queue, Location pos1,
         Location pos2) {
-        int size = hpw.SIZE;
+        int size = hybridPlotWorld.SIZE;
         int minY;
         if (Settings.Schematics.PASTE_ON_TOP) {
-            minY = hpw.SCHEM_Y;
+            minY = hybridPlotWorld.SCHEM_Y;
         } else {
             minY = 1;
         }
         BaseBlock airBlock = BlockTypes.AIR.getDefaultState().toBaseBlock();
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-            short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size);
+            short absX = (short) ((x - hybridPlotWorld.ROAD_OFFSET_X) % size);
             if (absX < 0) {
                 absX += size;
             }
             for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
-                short absZ = (short) ((z - hpw.ROAD_OFFSET_Z) % size);
+                short absZ = (short) ((z - hybridPlotWorld.ROAD_OFFSET_Z) % size);
                 if (absZ < 0) {
                     absZ += size;
                 }
-                BaseBlock[] blocks = hpw.G_SCH.get(MathMan.pair(absX, absZ));
+                BaseBlock[] blocks = hybridPlotWorld.G_SCH.get(MathMan.pair(absX, absZ));
                 if (blocks != null) {
                     for (int y = 0; y < blocks.length; y++) {
                         if (blocks[y] != null) {
@@ -118,40 +117,38 @@ public class HybridPlotManager extends ClassicPlotManager {
         }
     }
 
-    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
-        super.createRoadSouth(plotArea, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
+    @Override public boolean createRoadSouth(Plot plot) {
+        super.createRoadSouth(plot);
         PlotId id = plot.getId();
         PlotId id2 = new PlotId(id.x, id.y + 1);
-        Location bot = getPlotBottomLocAbs(hpw, id2);
-        Location top = getPlotTopLocAbs(hpw, id);
-        Location pos1 = new Location(plotArea.worldname, bot.getX() - 1, 0, top.getZ() + 1);
+        Location bot = getPlotBottomLocAbs(id2);
+        Location top = getPlotTopLocAbs(id);
+        Location pos1 = new Location(hybridPlotWorld.worldname, bot.getX() - 1, 0, top.getZ() + 1);
         Location pos2 =
-            new Location(plotArea.worldname, top.getX() + 1, Math.min(getWorldHeight(), 255),
+            new Location(hybridPlotWorld.worldname, top.getX() + 1, Math.min(getWorldHeight(), 255),
                 bot.getZ());
-        MainUtil.resetBiome(plotArea, pos1, pos2);
-        if (!hpw.ROAD_SCHEMATIC_ENABLED) {
+        MainUtil.resetBiome(hybridPlotWorld, pos1, pos2);
+        if (!hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
             return true;
         }
-        LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2);
+        LocalBlockQueue queue = hybridPlotWorld.getQueue(false);
+        createSchemAbs(queue, pos1, pos2);
         queue.enqueue();
         return true;
     }
 
-    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
-        super.createRoadSouthEast(plotArea, plot);
-        HybridPlotWorld hpw = (HybridPlotWorld) plotArea;
+    @Override public boolean createRoadSouthEast(Plot plot) {
+        super.createRoadSouthEast(plot);
         PlotId id = plot.getId();
         PlotId id2 = new PlotId(id.x + 1, id.y + 1);
-        Location pos1 = getPlotTopLocAbs(hpw, id).add(1, 0, 1);
-        Location pos2 = getPlotBottomLocAbs(hpw, id2);
+        Location pos1 = getPlotTopLocAbs(id).add(1, 0, 1);
+        Location pos2 = getPlotBottomLocAbs(id2);
         pos1.setY(0);
         pos2.setY(Math.min(getWorldHeight(), 255));
-        LocalBlockQueue queue = hpw.getQueue(false);
-        createSchemAbs(hpw, queue, pos1, pos2);
-        if (hpw.ROAD_SCHEMATIC_ENABLED) {
-            createSchemAbs(hpw, queue, pos1, pos2);
+        LocalBlockQueue queue = hybridPlotWorld.getQueue(false);
+        createSchemAbs(queue, pos1, pos2);
+        if (hybridPlotWorld.ROAD_SCHEMATIC_ENABLED) {
+            createSchemAbs(queue, pos1, pos2);
         }
         queue.enqueue();
         return true;
@@ -164,27 +161,26 @@ public class HybridPlotManager extends ClassicPlotManager {
      * don't need to do something quite as complex unless you happen to have 512x512 sized plots.
      * </p>
      */
-    @Override public boolean clearPlot(final PlotArea plotArea, Plot plot,
-        final Runnable whenDone) {
-        final String world = plotArea.worldname;
-        final HybridPlotWorld dpw = (HybridPlotWorld) plotArea;
+    @Override public boolean clearPlot(Plot plot,
+                                       final Runnable whenDone) {
+        final String world = hybridPlotWorld.worldname;
         Location pos1 = plot.getBottomAbs();
         Location pos2 = plot.getExtendedTopAbs();
         // If augmented
         final boolean canRegen =
-            (plotArea.TYPE == 0) && (plotArea.TERRAIN == 0) && REGENERATIVE_CLEAR;
+            (hybridPlotWorld.TYPE == 0) && (hybridPlotWorld.TERRAIN == 0) && REGENERATIVE_CLEAR;
         // The component blocks
-        final BlockBucket plotfloor = dpw.TOP_BLOCK;
-        final BlockBucket filling = dpw.MAIN_BLOCK;
+        final BlockBucket plotfloor = hybridPlotWorld.TOP_BLOCK;
+        final BlockBucket filling = hybridPlotWorld.MAIN_BLOCK;
         final PlotBlock bedrock;
-        if (dpw.PLOT_BEDROCK) {
+        if (hybridPlotWorld.PLOT_BEDROCK) {
             bedrock = PlotBlock.get((short) 7, (byte) 0);
         } else {
             bedrock = PlotBlock.get((short) 0, (byte) 0);
         }
         final PlotBlock air = PlotBlock.get((short) 0, (byte) 0);
-        final String biome = dpw.PLOT_BIOME;
-        final LocalBlockQueue queue = plotArea.getQueue(false);
+        final String biome = hybridPlotWorld.PLOT_BIOME;
+        final LocalBlockQueue queue = hybridPlotWorld.getQueue(false);
         ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
             @Override public void run(int[] value) {
                 // If the chunk isn't near the edge and it isn't an augmented world we can just regen the whole chunk
@@ -201,16 +197,16 @@ public class HybridPlotManager extends ClassicPlotManager {
                 queue.setCuboid(bot, top, bedrock);
                 // Each component has a different layer
                 bot.setY(1);
-                top.setY(dpw.PLOT_HEIGHT);
+                top.setY(hybridPlotWorld.PLOT_HEIGHT);
                 queue.setCuboid(bot, top, filling);
-                bot.setY(dpw.PLOT_HEIGHT);
-                top.setY(dpw.PLOT_HEIGHT + 1);
+                bot.setY(hybridPlotWorld.PLOT_HEIGHT);
+                top.setY(hybridPlotWorld.PLOT_HEIGHT + 1);
                 queue.setCuboid(bot, top, plotfloor);
-                bot.setY(dpw.PLOT_HEIGHT + 1);
+                bot.setY(hybridPlotWorld.PLOT_HEIGHT + 1);
                 top.setY(getWorldHeight());
                 queue.setCuboid(bot, top, air);
                 // And finally set the schematic, the y value is unimportant for this function
-                pastePlotSchematic(dpw, queue, bot, top);
+                pastePlotSchematic(queue, bot, top);
             }
         }, () -> {
             queue.enqueue();
@@ -220,19 +216,18 @@ public class HybridPlotManager extends ClassicPlotManager {
         return true;
     }
 
-    public void pastePlotSchematic(HybridPlotWorld plotWorld, LocalBlockQueue queue,
+    public void pastePlotSchematic(LocalBlockQueue queue,
         Location bottom, Location top) {
-        if (!plotWorld.PLOT_SCHEMATIC) {
+        if (!hybridPlotWorld.PLOT_SCHEMATIC) {
             return;
         }
-        createSchemAbs(plotWorld, queue, bottom, top);
+        createSchemAbs(queue, bottom, top);
     }
 
     /**
      * Remove sign for a plot.
      */
-    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
-        HybridPlotWorld dpw = (HybridPlotWorld) plotArea;
-        return dpw.getSignLocation(plot);
+    @Override public Location getSignLoc(Plot plot) {
+        return hybridPlotWorld.getSignLocation(plot);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index de6c3390b..f98d6ae88 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -298,8 +298,8 @@ public abstract class HybridUtils {
             }
         }
         PlotManager manager = area.getPlotManager();
-        PlotId id1 = manager.getPlotId(plotWorld, x, 0, z);
-        PlotId id2 = manager.getPlotId(plotWorld, ex, 0, ez);
+        PlotId id1 = manager.getPlotId(x, 0, z);
+        PlotId id2 = manager.getPlotId(ex, 0, ez);
         x -= plotWorld.ROAD_OFFSET_X;
         z -= plotWorld.ROAD_OFFSET_Z;
         LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(plotWorld.worldname, false);
@@ -332,7 +332,7 @@ public abstract class HybridUtils {
                         boolean condition;
                         if (toCheck) {
                             condition = manager
-                                .getPlotId(plotWorld, x + X + plotWorld.ROAD_OFFSET_X, 1,
+                                .getPlotId(x + X + plotWorld.ROAD_OFFSET_X, 1,
                                     z + Z + plotWorld.ROAD_OFFSET_Z) == null;
                             //                            condition = MainUtil.isPlotRoad(new Location(plotworld.worldname, x + X, 1, z + Z));
                         } else {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
index f9b2f5437..967802b24 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
@@ -26,7 +26,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
     }
 
     @Override
-    public boolean clearPlot(PlotArea plotArea, final Plot plot, final Runnable whenDone) {
+    public boolean clearPlot(final Plot plot, final Runnable whenDone) {
         final HashSet<RegionWrapper> regions = plot.getRegions();
         Runnable run = new Runnable() {
             @Override public void run() {
@@ -48,39 +48,37 @@ public abstract class SquarePlotManager extends GridPlotManager {
         return true;
     }
 
-    @Override public Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+    @Override public Location getPlotTopLocAbs(PlotId plotId) {
         int px = plotId.x;
         int pz = plotId.y;
-        int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - (int) Math
-            .floor(dpw.ROAD_WIDTH / 2) - 1;
-        int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - (int) Math
-            .floor(dpw.ROAD_WIDTH / 2) - 1;
-        return new Location(plotArea.worldname, x, Math.min(getWorldHeight(), 255), z);
+        int x = (squarePlotWorld.ROAD_OFFSET_X + (px * (squarePlotWorld.ROAD_WIDTH + squarePlotWorld.PLOT_WIDTH))) - (int) Math
+            .floor(squarePlotWorld.ROAD_WIDTH / 2) - 1;
+        int z = (squarePlotWorld.ROAD_OFFSET_Z + (pz * (squarePlotWorld.ROAD_WIDTH + squarePlotWorld.PLOT_WIDTH))) - (int) Math
+            .floor(squarePlotWorld.ROAD_WIDTH / 2) - 1;
+        return new Location(squarePlotWorld.worldname, x, Math.min(getWorldHeight(), 255), z);
     }
 
-    @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-        if (dpw.ROAD_OFFSET_X != 0) {
-            x -= dpw.ROAD_OFFSET_X;
+    @Override public PlotId getPlotIdAbs(int x, int y, int z) {
+        if (squarePlotWorld.ROAD_OFFSET_X != 0) {
+            x -= squarePlotWorld.ROAD_OFFSET_X;
         }
-        if (dpw.ROAD_OFFSET_Z != 0) {
-            z -= dpw.ROAD_OFFSET_Z;
+        if (squarePlotWorld.ROAD_OFFSET_Z != 0) {
+            z -= squarePlotWorld.ROAD_OFFSET_Z;
         }
         int pathWidthLower;
         int end;
-        if (dpw.ROAD_WIDTH == 0) {
+        if (squarePlotWorld.ROAD_WIDTH == 0) {
             pathWidthLower = -1;
-            end = dpw.PLOT_WIDTH;
+            end = squarePlotWorld.PLOT_WIDTH;
         } else {
-            if ((dpw.ROAD_WIDTH % 2) == 0) {
-                pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
+            if ((squarePlotWorld.ROAD_WIDTH % 2) == 0) {
+                pathWidthLower = (squarePlotWorld.ROAD_WIDTH / 2) - 1;
             } else {
-                pathWidthLower = dpw.ROAD_WIDTH / 2;
+                pathWidthLower = squarePlotWorld.ROAD_WIDTH / 2;
             }
-            end = pathWidthLower + dpw.PLOT_WIDTH;
+            end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
         }
-        int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
+        int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
         int idx;
         if (x < 0) {
             idx = x / size;
@@ -128,27 +126,23 @@ public abstract class SquarePlotManager extends GridPlotManager {
         return new PlotId(idx, idz);
     }
 
-    @Override public PlotId getPlotId(PlotArea plotArea, int x, int y, int z) {
+    @Override public PlotId getPlotId(int x, int y, int z) {
         try {
-            SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
-            if (plotArea == null) {
-                return null;
-            }
-            x -= dpw.ROAD_OFFSET_X;
-            z -= dpw.ROAD_OFFSET_Z;
-            int size = dpw.PLOT_WIDTH + dpw.ROAD_WIDTH;
+            x -= squarePlotWorld.ROAD_OFFSET_X;
+            z -= squarePlotWorld.ROAD_OFFSET_Z;
+            int size = squarePlotWorld.PLOT_WIDTH + squarePlotWorld.ROAD_WIDTH;
             int pathWidthLower;
             int end;
-            if (dpw.ROAD_WIDTH == 0) {
+            if (squarePlotWorld.ROAD_WIDTH == 0) {
                 pathWidthLower = -1;
-                end = dpw.PLOT_WIDTH;
+                end = squarePlotWorld.PLOT_WIDTH;
             } else {
-                if ((dpw.ROAD_WIDTH % 2) == 0) {
-                    pathWidthLower = (dpw.ROAD_WIDTH / 2) - 1;
+                if ((squarePlotWorld.ROAD_WIDTH % 2) == 0) {
+                    pathWidthLower = (squarePlotWorld.ROAD_WIDTH / 2) - 1;
                 } else {
-                    pathWidthLower = dpw.ROAD_WIDTH / 2;
+                    pathWidthLower = squarePlotWorld.ROAD_WIDTH / 2;
                 }
-                end = pathWidthLower + dpw.PLOT_WIDTH;
+                end = pathWidthLower + squarePlotWorld.PLOT_WIDTH;
             }
             int dx;
             int rx;
@@ -176,7 +170,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
             if (hash == 0) {
                 return id;
             }
-            Plot plot = plotArea.getOwnedPlotAbs(id);
+            Plot plot = squarePlotWorld.getOwnedPlotAbs(id);
             // Not merged, and standing on road
             if (plot == null) {
                 return null;
@@ -210,7 +204,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
             PlotSquared.debug("invalid location: " + Arrays.toString(merged));
         } catch (Exception ignored) {
             PlotSquared.debug(
-                "Invalid plot / road width in settings.yml for world: " + plotArea.worldname);
+                "Invalid plot / road width in settings.yml for world: " + squarePlotWorld.worldname);
         }
         return null;
     }
@@ -218,14 +212,13 @@ public abstract class SquarePlotManager extends GridPlotManager {
     /**
      * Get the bottom plot loc (some basic math).
      */
-    @Override public Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId) {
-        SquarePlotWorld dpw = (SquarePlotWorld) plotArea;
+    @Override public Location getPlotBottomLocAbs(PlotId plotId) {
         int px = plotId.x;
         int pz = plotId.y;
-        int x = (dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH
-            - (int) Math.floor(dpw.ROAD_WIDTH / 2);
-        int z = (dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH))) - dpw.PLOT_WIDTH
-            - (int) Math.floor(dpw.ROAD_WIDTH / 2);
-        return new Location(plotArea.worldname, x, plotArea.MIN_BUILD_HEIGHT, z);
+        int x = (squarePlotWorld.ROAD_OFFSET_X + (px * (squarePlotWorld.ROAD_WIDTH + squarePlotWorld.PLOT_WIDTH))) - squarePlotWorld.PLOT_WIDTH
+            - (int) Math.floor(squarePlotWorld.ROAD_WIDTH / 2);
+        int z = (squarePlotWorld.ROAD_OFFSET_Z + (pz * (squarePlotWorld.ROAD_WIDTH + squarePlotWorld.PLOT_WIDTH))) - squarePlotWorld.PLOT_WIDTH
+            - (int) Math.floor(squarePlotWorld.ROAD_WIDTH / 2);
+        return new Location(squarePlotWorld.worldname, x, squarePlotWorld.MIN_BUILD_HEIGHT, z);
     }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
index 2b1f8259b..4c0d35cba 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java
@@ -854,9 +854,9 @@ public class Plot {
                     };
                     for (Plot current : plots) {
                         if (isDelete || current.owner == null) {
-                            manager.unClaimPlot(Plot.this.area, current, null);
+                            manager.unClaimPlot(current, null);
                         } else {
-                            manager.claimPlot(Plot.this.area, current);
+                            manager.claimPlot(current);
                         }
                     }
                     GlobalBlockQueue.IMP.addTask(run);
@@ -868,7 +868,7 @@ public class Plot {
                         .regenerateRegion(current.getBottomAbs(), current.getTopAbs(), false, this);
                     return;
                 }
-                manager.clearPlot(Plot.this.area, current, this);
+                manager.clearPlot(current, this);
             }
         };
         run.run();
@@ -943,20 +943,20 @@ public class Plot {
         }
         PlotManager manager = this.area.getPlotManager();
         if (createRoad) {
-            manager.startPlotUnlink(this.area, ids);
+            manager.startPlotUnlink(ids);
         }
         if (this.area.TERRAIN != 3 && createRoad) {
             for (Plot current : plots) {
                 if (current.getMerged(Direction.EAST)) {
-                    manager.createRoadEast(current.area, current);
+                    manager.createRoadEast(current);
                     if (current.getMerged(Direction.SOUTH)) {
-                        manager.createRoadSouth(current.area, current);
+                        manager.createRoadSouth(current);
                         if (current.getMerged(Direction.SOUTHEAST)) {
-                            manager.createRoadSouthEast(current.area, current);
+                            manager.createRoadSouthEast(current);
                         }
                     }
                 } else if (current.getMerged(Direction.SOUTH)) {
-                    manager.createRoadSouth(current.area, current);
+                    manager.createRoadSouth(current);
                 }
             }
         }
@@ -972,7 +972,7 @@ public class Plot {
             });
         }
         if (createRoad) {
-            manager.finishPlotUnlink(this.area, ids);
+            manager.finishPlotUnlink(ids);
         }
         return true;
     }
@@ -992,7 +992,7 @@ public class Plot {
         }
         PlotManager manager = this.area.getPlotManager();
         if (this.area.ALLOW_SIGNS) {
-            Location loc = manager.getSignLoc(this.area, this);
+            Location loc = manager.getSignLoc(this);
             String id = this.id.x + ";" + this.id.y;
             String[] lines =
                 new String[] {Captions.OWNER_SIGN_LINE_1.formatted().replaceAll("%id%", id),
@@ -1207,7 +1207,7 @@ public class Plot {
         int y =
             isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62;
         if (area.ALLOW_SIGNS) {
-            y = Math.max(y, getManager().getSignLoc(area, this).getY());
+            y = Math.max(y, getManager().getSignLoc(this).getY());
         }
         loc.setY(1 + y);
         return loc;
@@ -1220,7 +1220,7 @@ public class Plot {
         PlotManager manager = getManager();
         int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62;
         if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) {
-            y = Math.max(y, manager.getSignLoc(area, this).getY() - 1);
+            y = Math.max(y, manager.getSignLoc(this).getY() - 1);
         }
         return new Location(getWorldName(), x, y + 1, z);
     }
@@ -1413,7 +1413,7 @@ public class Plot {
         if (!this.area.ALLOW_SIGNS) {
             return;
         }
-        Location loc = manager.getSignLoc(this.area, this);
+        Location loc = manager.getSignLoc(this);
         LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(getWorldName(), false);
         queue.setBlock(loc.getX(), loc.getY(), loc.getZ(), PlotBlock.get("air"));
         queue.flush();
@@ -1496,7 +1496,7 @@ public class Plot {
                     }
                 });
         }
-        plotworld.getPlotManager().claimPlot(plotworld, this);
+        plotworld.getPlotManager().claimPlot(this);
         return true;
     }
 
@@ -1565,7 +1565,7 @@ public class Plot {
      * Returns the top location for the plot.
      */
     public Location getTopAbs() {
-        Location top = this.area.getPlotManager().getPlotTopLocAbs(this.area, this.id);
+        Location top = getManager().getPlotTopLocAbs(this.id);
         top.setWorld(getWorldName());
         return top;
     }
@@ -1576,7 +1576,7 @@ public class Plot {
      * Returns the bottom location for the plot.
      */
     public Location getBottomAbs() {
-        Location loc = this.area.getPlotManager().getPlotBottomLocAbs(this.area, this.id);
+        Location loc = getManager().getPlotBottomLocAbs(this.id);
         loc.setWorld(getWorldName());
         return loc;
     }
@@ -1724,7 +1724,7 @@ public class Plot {
             Location pos2 = new Location(this.getWorldName(), bot.getX(), MAX_HEIGHT, top.getZ());
             ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
         } else {
-            this.area.getPlotManager().removeRoadEast(this.area, this);
+            this.area.getPlotManager().removeRoadEast(this);
         }
     }
 
@@ -2124,7 +2124,7 @@ public class Plot {
             return null;
         }
         try {
-            final Location loc = this.getManager().getSignLoc(this.area, this);
+            final Location loc = this.getManager().getSignLoc(this);
             String[] lines = TaskManager.IMP.sync(new RunnableVal<String[]>() {
                 @Override public void run(String[] value) {
                     ChunkManager.manager.loadChunk(loc.getWorld(), loc.getChunkLoc(), false);
@@ -2193,7 +2193,7 @@ public class Plot {
             Location pos2 = new Location(this.getWorldName(), top.getX(), MAX_HEIGHT, bot.getZ());
             ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
         } else {
-            this.getManager().removeRoadSouth(this.area, this);
+            this.getManager().removeRoadSouth(this);
         }
     }
 
@@ -2246,7 +2246,7 @@ public class Plot {
                         ArrayList<PlotId> ids = new ArrayList<>();
                         ids.add(current.getId());
                         ids.add(other.getId());
-                        this.getManager().finishPlotMerge(this.area, ids);
+                        this.getManager().finishPlotMerge(ids);
                     }
                 }
             }
@@ -2265,7 +2265,7 @@ public class Plot {
                         ArrayList<PlotId> ids = new ArrayList<>();
                         ids.add(current.getId());
                         ids.add(other.getId());
-                        this.getManager().finishPlotMerge(this.area, ids);
+                        this.getManager().finishPlotMerge(ids);
                     }
                 }
             }
@@ -2284,7 +2284,7 @@ public class Plot {
                         ArrayList<PlotId> ids = new ArrayList<>();
                         ids.add(current.getId());
                         ids.add(other.getId());
-                        this.getManager().finishPlotMerge(this.area, ids);
+                        this.getManager().finishPlotMerge(ids);
                     }
                 }
             }
@@ -2303,7 +2303,7 @@ public class Plot {
                         ArrayList<PlotId> ids = new ArrayList<>();
                         ids.add(current.getId());
                         ids.add(other.getId());
-                        this.getManager().finishPlotMerge(this.area, ids);
+                        this.getManager().finishPlotMerge(ids);
                     }
                 }
             }
@@ -2372,7 +2372,7 @@ public class Plot {
             pos2.setY(MAX_HEIGHT);
             ChunkManager.manager.regenerateRegion(pos1, pos2, true, null);
         } else {
-            this.area.getPlotManager().removeRoadSouthEast(this.area, this);
+            this.area.getPlotManager().removeRoadSouthEast(this);
         }
     }
 
@@ -2813,15 +2813,15 @@ public class Plot {
      */
     public boolean setComponent(String component, BlockBucket blocks) {
         if (StringMan
-            .isEqualToAny(component, getManager().getPlotComponents(this.area, this.getId()))) {
+            .isEqualToAny(component, getManager().getPlotComponents(this.getId()))) {
             EventUtil.manager.callComponentSet(this, component);
         }
-        return this.getManager().setComponent(this.area, this.getId(), component, blocks);
+        return this.getManager().setComponent(this.getId(), component, blocks);
     }
 
     public int getDistanceFromOrigin() {
-        Location bot = getManager().getPlotBottomLocAbs(this.area, id);
-        Location top = getManager().getPlotTopLocAbs(this.area, id);
+        Location bot = getManager().getPlotBottomLocAbs(id);
+        Location top = getManager().getPlotTopLocAbs(id);
         return Math.max(Math.max(Math.abs(bot.getX()), Math.abs(bot.getZ())),
             Math.max(Math.abs(top.getX()), Math.abs(top.getZ())));
     }
@@ -2967,10 +2967,10 @@ public class Plot {
                     if (regions.isEmpty()) {
                         Plot plot = destination.getRelative(0, 0);
                         for (Plot current : plot.getConnectedPlots()) {
-                            getManager().claimPlot(current.getArea(), current);
+                            getManager().claimPlot(current);
                             Plot originPlot = originArea.getPlotAbs(
                                 new PlotId(current.id.x - offset.x, current.id.y - offset.y));
-                            originPlot.getManager().unClaimPlot(originArea, originPlot, null);
+                            originPlot.getManager().unClaimPlot(originPlot, null);
                         }
                         plot.setSign();
                         TaskManager.runTask(whenDone);
@@ -3056,7 +3056,7 @@ public class Plot {
             @Override public void run() {
                 if (regions.isEmpty()) {
                     for (Plot current : getConnectedPlots()) {
-                        destination.getManager().claimPlot(destination.getArea(), destination);
+                        destination.getManager().claimPlot(destination);
                     }
                     destination.setSign();
                     TaskManager.runTask(whenDone);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 25b22c1bf..885371c0e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -144,8 +144,8 @@ public abstract class PlotArea {
     private RegionWrapper getRegionAbs() {
         if (this.region == null) {
             if (this.min != null) {
-                Location bot = getPlotManager().getPlotBottomLocAbs(this, this.min);
-                Location top = getPlotManager().getPlotTopLocAbs(this, this.max);
+                Location bot = getPlotManager().getPlotBottomLocAbs(this.min);
+                Location top = getPlotManager().getPlotTopLocAbs(this.max);
                 this.region = new RegionWrapper(bot.getX() - 1, top.getX() + 1, bot.getZ() - 1,
                     top.getZ() + 1);
             }
@@ -422,7 +422,7 @@ public abstract class PlotArea {
      */
     @Nullable public Plot getPlotAbs(@Nonnull final Location location) {
         final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+            this.manager.getPlotId(location.getX(), location.getY(), location.getZ());
         if (pid == null) {
             return null;
         }
@@ -437,7 +437,7 @@ public abstract class PlotArea {
      */
     @Nullable public Plot getPlot(@Nonnull final Location location) {
         final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+            this.manager.getPlotId(location.getX(), location.getY(), location.getZ());
         if (pid == null) {
             return null;
         }
@@ -452,7 +452,7 @@ public abstract class PlotArea {
      */
     @Nullable public Plot getOwnedPlot(@Nonnull final Location location) {
         final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+            this.manager.getPlotId(location.getX(), location.getY(), location.getZ());
         if (pid == null) {
             return null;
         }
@@ -468,7 +468,7 @@ public abstract class PlotArea {
      */
     @Nullable public Plot getOwnedPlotAbs(@Nonnull final Location location) {
         final PlotId pid =
-            this.manager.getPlotId(this, location.getX(), location.getY(), location.getZ());
+            this.manager.getPlotId(location.getX(), location.getY(), location.getZ());
         if (pid == null) {
             return null;
         }
@@ -835,7 +835,7 @@ public abstract class PlotArea {
             return false;
         }
 
-        manager.startPlotMerge(this, plotIds);
+        manager.startPlotMerge(plotIds);
         final Set<UUID> trusted = new HashSet<>();
         final Set<UUID> members = new HashSet<>();
         final Set<UUID> denied = new HashSet<>();
@@ -887,7 +887,7 @@ public abstract class PlotArea {
                 }
             }
         }
-        manager.finishPlotMerge(this, plotIds);
+        manager.finishPlotMerge(plotIds);
         return true;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
index a1134cbce..0b9427839 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java
@@ -132,7 +132,7 @@ public class PlotCluster {
             toReturn = center.getHome();
             if (toReturn.getY() == 0) {
                 PlotManager manager = this.area.getPlotManager();
-                Location loc = manager.getSignLoc(this.area, center);
+                Location loc = manager.getSignLoc(center);
                 toReturn.setY(loc.getY());
             }
         } else {
@@ -157,12 +157,12 @@ public class PlotCluster {
 
     public Location getClusterBottom() {
         PlotManager manager = this.area.getPlotManager();
-        return manager.getPlotBottomLocAbs(this.area, getP1());
+        return manager.getPlotBottomLocAbs(getP1());
     }
 
     public Location getClusterTop() {
         PlotManager manager = this.area.getPlotManager();
-        return manager.getPlotTopLocAbs(this.area, getP2());
+        return manager.getPlotTopLocAbs(getP2());
     }
 
     public boolean intersects(PlotId pos1, PlotId pos2) {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
index 32a1e0423..f00fb40db 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
@@ -21,61 +21,61 @@ public abstract class PlotManager {
      * Plot locations (methods with Abs in them will not need to consider mega
      * plots).
      */
-    public abstract PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z);
+    public abstract PlotId getPlotIdAbs(int x, int y, int z);
 
-    public abstract PlotId getPlotId(PlotArea plotArea, int x, int y, int z);
+    public abstract PlotId getPlotId(int x, int y, int z);
 
     // If you have a circular plot, just return the corner if it were a square
-    public abstract Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId);
+    public abstract Location getPlotBottomLocAbs(PlotId plotId);
 
     // the same applies here
-    public abstract Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId);
+    public abstract Location getPlotTopLocAbs(PlotId plotId);
 
     /*
      * Plot clearing (return false if you do not support some method)
      */
-    public abstract boolean clearPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
+    public abstract boolean clearPlot(Plot plot, Runnable whenDone);
 
-    public abstract boolean claimPlot(PlotArea plotArea, Plot plot);
+    public abstract boolean claimPlot(Plot plot);
 
-    public abstract boolean unClaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone);
+    public abstract boolean unClaimPlot(Plot plot, Runnable whenDone);
 
-    public abstract Location getSignLoc(PlotArea plotArea, Plot plot);
+    public abstract Location getSignLoc(Plot plot);
 
     /*
      * Plot set functions (return false if you do not support the specific set
      * method).
      */
-    public abstract String[] getPlotComponents(PlotArea plotArea, PlotId plotId);
+    public abstract String[] getPlotComponents(PlotId plotId);
 
-    public abstract boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
-        BlockBucket blocks);
+    public abstract boolean setComponent(PlotId plotId, String component,
+                                         BlockBucket blocks);
 
     /*
      * PLOT MERGING (return false if your generator does not support plot
      * merging).
      */
-    public abstract boolean createRoadEast(PlotArea plotArea, Plot plot);
+    public abstract boolean createRoadEast(Plot plot);
 
-    public abstract boolean createRoadSouth(PlotArea plotArea, Plot plot);
+    public abstract boolean createRoadSouth(Plot plot);
 
-    public abstract boolean createRoadSouthEast(PlotArea plotArea, Plot plot);
+    public abstract boolean createRoadSouthEast(Plot plot);
 
-    public abstract boolean removeRoadEast(PlotArea plotArea, Plot plot);
+    public abstract boolean removeRoadEast(Plot plot);
 
-    public abstract boolean removeRoadSouth(PlotArea plotArea, Plot plot);
+    public abstract boolean removeRoadSouth(Plot plot);
 
-    public abstract boolean removeRoadSouthEast(PlotArea plotArea, Plot plot);
+    public abstract boolean removeRoadSouthEast(Plot plot);
 
-    public abstract boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds);
+    public abstract boolean startPlotMerge(List<PlotId> plotIds);
 
-    public abstract boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds);
+    public abstract boolean startPlotUnlink(List<PlotId> plotIds);
 
-    public abstract boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds);
+    public abstract boolean finishPlotMerge(List<PlotId> plotIds);
 
-    public abstract boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds);
+    public abstract boolean finishPlotUnlink(List<PlotId> plotIds);
 
-    public void exportTemplate(PlotArea plotArea) throws IOException {
+    public void exportTemplate() throws IOException {
         HashSet<FileBytes> files = new HashSet<>(Collections.singletonList(
             new FileBytes(Settings.Paths.TEMPLATES + "/tmp-data.yml",
                 Template.getBytes(plotArea))));
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index ab8a01078..9998f88f2 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -14,23 +14,23 @@ public class SinglePlotManager extends PlotManager {
         super(plotArea);
     }
 
-    @Override public PlotId getPlotIdAbs(PlotArea plotArea, int x, int y, int z) {
+    @Override public PlotId getPlotIdAbs(int x, int y, int z) {
         return new PlotId(0, 0);
     }
 
-    @Override public PlotId getPlotId(PlotArea plotArea, int x, int y, int z) {
+    @Override public PlotId getPlotId(int x, int y, int z) {
         return new PlotId(0, 0);
     }
 
-    @Override public Location getPlotBottomLocAbs(PlotArea plotArea, PlotId plotId) {
+    @Override public Location getPlotBottomLocAbs(PlotId plotId) {
         return new Location(plotId.toCommaSeparatedString(), -30000000, 0, -30000000);
     }
 
-    @Override public Location getPlotTopLocAbs(PlotArea plotArea, PlotId plotId) {
+    @Override public Location getPlotTopLocAbs(PlotId plotId) {
         return new Location(plotId.toCommaSeparatedString(), 30000000, 0, 30000000);
     }
 
-    @Override public boolean clearPlot(PlotArea plotArea, Plot plot, final Runnable whenDone) {
+    @Override public boolean clearPlot(Plot plot, final Runnable whenDone) {
         SetupUtils.manager.unload(plot.getWorldName(), false);
         final File worldFolder =
             new File(PlotSquared.get().IMP.getWorldContainer(), plot.getWorldName());
@@ -43,68 +43,68 @@ public class SinglePlotManager extends PlotManager {
         return true;
     }
 
-    @Override public boolean claimPlot(PlotArea plotArea, Plot plot) {
+    @Override public boolean claimPlot(Plot plot) {
         // TODO
         return true;
     }
 
-    @Override public boolean unClaimPlot(PlotArea plotArea, Plot plot, Runnable whenDone) {
+    @Override public boolean unClaimPlot(Plot plot, Runnable whenDone) {
         if (whenDone != null) {
             whenDone.run();
         }
         return true;
     }
 
-    @Override public Location getSignLoc(PlotArea plotArea, Plot plot) {
+    @Override public Location getSignLoc(Plot plot) {
         return null;
     }
 
-    @Override public String[] getPlotComponents(PlotArea plotArea, PlotId plotId) {
+    @Override public String[] getPlotComponents(PlotId plotId) {
         return new String[0];
     }
 
-    @Override public boolean setComponent(PlotArea plotArea, PlotId plotId, String component,
-        BlockBucket blocks) {
+    @Override public boolean setComponent(PlotId plotId, String component,
+                                          BlockBucket blocks) {
         return false;
     }
 
-    @Override public boolean createRoadEast(PlotArea plotArea, Plot plot) {
+    @Override public boolean createRoadEast(Plot plot) {
         return false;
     }
 
-    @Override public boolean createRoadSouth(PlotArea plotArea, Plot plot) {
+    @Override public boolean createRoadSouth(Plot plot) {
         return false;
     }
 
-    @Override public boolean createRoadSouthEast(PlotArea plotArea, Plot plot) {
+    @Override public boolean createRoadSouthEast(Plot plot) {
         return false;
     }
 
-    @Override public boolean removeRoadEast(PlotArea plotArea, Plot plot) {
+    @Override public boolean removeRoadEast(Plot plot) {
         return false;
     }
 
-    @Override public boolean removeRoadSouth(PlotArea plotArea, Plot plot) {
+    @Override public boolean removeRoadSouth(Plot plot) {
         return false;
     }
 
-    @Override public boolean removeRoadSouthEast(PlotArea plotArea, Plot plot) {
+    @Override public boolean removeRoadSouthEast(Plot plot) {
         return false;
     }
 
-    @Override public boolean startPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+    @Override public boolean startPlotMerge(List<PlotId> plotIds) {
         return false;
     }
 
-    @Override public boolean startPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+    @Override public boolean startPlotUnlink(List<PlotId> plotIds) {
         return false;
     }
 
-    @Override public boolean finishPlotMerge(PlotArea plotArea, List<PlotId> plotIds) {
+    @Override public boolean finishPlotMerge(List<PlotId> plotIds) {
         return false;
     }
 
-    @Override public boolean finishPlotUnlink(PlotArea plotArea, List<PlotId> plotIds) {
+    @Override public boolean finishPlotUnlink(List<PlotId> plotIds) {
         return false;
     }
 }

From d106262454f4b470ad3c6d0ffad3302e131a6052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Fri, 31 May 2019 15:32:24 +0200
Subject: [PATCH 199/210] Have PlotAreas create their own PlotManager

Leads to cleaner code, less need for instanceof and casting, as a PlotArea knows which kind of PlotManager it needs to make
---
 .../bukkit/generator/DelegatePlotGenerator.java        |  4 ----
 .../plotsquared/plot/PlotSquared.java                  |  2 +-
 .../plotsquared/plot/generator/ClassicPlotManager.java | 10 +++-------
 .../plotsquared/plot/generator/HybridGen.java          |  4 ----
 .../plotsquared/plot/generator/HybridPlotManager.java  | 10 +++-------
 .../plotsquared/plot/generator/HybridPlotWorld.java    |  6 ++++++
 .../plot/generator/IndependentPlotGenerator.java       |  8 --------
 .../plotsquared/plot/generator/SquarePlotManager.java  | 10 +++-------
 .../plotsquared/plot/object/PlotArea.java              |  4 +++-
 .../plotsquared/plot/object/PlotManager.java           |  1 -
 .../plotsquared/plot/object/worlds/SinglePlotArea.java |  5 +++++
 .../plot/object/worlds/SingleWorldGenerator.java       |  4 ----
 12 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
index f07c65cbf..c8b57dc78 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@@ -30,10 +30,6 @@ import java.util.Random;
     @Override public void initialize(PlotArea area) {
     }
 
-    @Override public PlotManager getNewPlotManager(PlotArea plotArea) {
-        return PlotSquared.get().IMP.getDefaultGenerator().getNewPlotManager(plotArea);
-    }
-
     @Override public String getName() {
         return this.chunkGenerator.getClass().getName();
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
index e3164427c..589309385 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
@@ -1086,7 +1086,7 @@ import java.util.zip.ZipInputStream;
             }
             // Conventional plot generator
             PlotArea plotArea = plotGenerator.getNewPlotArea(world, null, null, null);
-            PlotManager plotManager = plotGenerator.getNewPlotManager(plotArea);
+            PlotManager plotManager = plotArea.getPlotManager();
             PlotSquared.log(Captions.PREFIX + "&aDetected world load for '" + world + "'");
             PlotSquared
                 .log(Captions.PREFIX + "&3 - generator: &7" + baseGenerator + ">" + plotGenerator);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index a822c3243..6d5e159f8 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -15,13 +15,9 @@ public class ClassicPlotManager extends SquarePlotManager {
 
     private final ClassicPlotWorld classicPlotWorld;
 
-    public ClassicPlotManager(PlotArea plotArea) {
-        super(plotArea);
-        if (plotArea instanceof ClassicPlotWorld){
-            classicPlotWorld = (ClassicPlotWorld)plotArea;
-        } else {
-            throw new RuntimeException("ClassicPlotManager requires plotArea to be an instance of ClassicPlotWorld");
-        }
+    public ClassicPlotManager(ClassicPlotWorld classicPlotWorld) {
+        super(classicPlotWorld);
+        this.classicPlotWorld = classicPlotWorld;
     }
 
     @Override public boolean setComponent(PlotId plotId, String component,
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
index 8d34f5d25..81d76b929 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
@@ -253,10 +253,6 @@ public class HybridGen extends IndependentPlotGenerator {
         return new HybridPlotWorld(world, id, this, min, max);
     }
 
-    @Override public PlotManager getNewPlotManager(PlotArea plotArea) {
-        return new HybridPlotManager(plotArea);
-    }
-
     @Override public void initialize(PlotArea area) {
         // All initialization is done in the PlotArea class
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
index 0bbf67557..ac10f7aab 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java
@@ -23,13 +23,9 @@ public class HybridPlotManager extends ClassicPlotManager {
 
     private final HybridPlotWorld hybridPlotWorld;
 
-    public HybridPlotManager(PlotArea plotArea) {
-        super(plotArea);
-        if (plotArea instanceof HybridPlotWorld){
-            hybridPlotWorld = (HybridPlotWorld)plotArea;
-        } else {
-            throw new RuntimeException("HybridPlotManager requires plotArea to be an instance of HybridPlotWorld");
-        }
+    public HybridPlotManager(HybridPlotWorld hybridPlotWorld) {
+        super(hybridPlotWorld);
+        this.hybridPlotWorld = hybridPlotWorld;
     }
 
     @Override public void exportTemplate() throws IOException {
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
index e8f1ed06a..101b6fcb3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotWorld.java
@@ -7,6 +7,7 @@ import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotId;
+import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
 import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 import com.github.intellectualsites.plotsquared.plot.util.MathMan;
@@ -43,6 +44,11 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         super(worldName, id, generator, min, max);
     }
 
+    @Override
+    protected PlotManager createManager() {
+        return new HybridPlotManager(this);
+    }
+
     public static byte wrap(byte data, int start) {
         if ((data >= start) && (data < (start + 4))) {
             data = (byte) ((((data - start) + 2) & 3) + start);
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
index 44703be52..459aee272 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/IndependentPlotGenerator.java
@@ -49,14 +49,6 @@ public abstract class IndependentPlotGenerator {
      */
     public abstract PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max);
 
-    /**
-     * Return a new PlotManager object.
-     *
-     * @return
-     * @param plotArea
-     */
-    public abstract PlotManager getNewPlotManager(PlotArea plotArea);
-
     /**
      * If any additional setup options need to be changed before world creation.
      * - e.g. If setup doesn't support some standard options
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
index 967802b24..be19930fd 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/SquarePlotManager.java
@@ -16,13 +16,9 @@ public abstract class SquarePlotManager extends GridPlotManager {
 
     private final SquarePlotWorld squarePlotWorld;
 
-    public SquarePlotManager(PlotArea plotArea) {
-        super(plotArea);
-        if (plotArea instanceof SquarePlotWorld){
-            squarePlotWorld = (SquarePlotWorld)plotArea;
-        } else {
-            throw new RuntimeException("SquarePlotManager requires plotArea to be an instance of SquarePlotWorld");
-        }
+    public SquarePlotManager(SquarePlotWorld squarePlotWorld) {
+        super(squarePlotWorld);
+        this.squarePlotWorld = squarePlotWorld;
     }
 
     @Override
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
index 885371c0e..3ed1e2c95 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java
@@ -81,7 +81,7 @@ public abstract class PlotArea {
         @Nullable final PlotId max) {
         this.worldname = worldName;
         this.id = id;
-        this.manager = generator.getNewPlotManager(this);
+        this.manager = createManager();
         this.generator = generator;
         if (min == null || max == null) {
             if (min != max) {
@@ -102,6 +102,8 @@ public abstract class PlotArea {
         }
     }
 
+    protected abstract PlotManager createManager();
+
     public LocalBlockQueue getQueue(final boolean autoQueue) {
         return GlobalBlockQueue.IMP.getNewQueue(worldname, autoQueue);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
index f00fb40db..ac2a57058 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
@@ -13,7 +13,6 @@ public abstract class PlotManager {
     private final PlotArea plotArea;
 
     public PlotManager(PlotArea plotArea) {
-
         this.plotArea = plotArea;
     }
 
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
index e1f6505f6..41801c087 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java
@@ -26,6 +26,11 @@ public class SinglePlotArea extends GridPlotWorld {
         this.DEFAULT_HOME = new PlotLoc(Integer.MAX_VALUE, Integer.MAX_VALUE);
     }
 
+    @Override
+    protected PlotManager createManager() {
+        return new SinglePlotManager(this);
+    }
+
     @Override public void loadConfiguration(ConfigurationSection config) {
         VOID = config.getBoolean("void", false);
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
index a821c03a4..9ba3df278 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java
@@ -81,10 +81,6 @@ public class SingleWorldGenerator extends IndependentPlotGenerator {
         return ((SinglePlotAreaManager) PlotSquared.get().getPlotAreaManager()).getArea();
     }
 
-    @Override public PlotManager getNewPlotManager(PlotArea plotArea) {
-        return new SinglePlotManager(plotArea);
-    }
-
     @Override public void initialize(PlotArea area) {
 
     }

From a94c588a1727696ec6a744b7b1f63b4d834e40a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Fri, 31 May 2019 21:16:29 +0200
Subject: [PATCH 200/210] Check if location has PlotArea to avoid NPE

---
 .../plotsquared/plot/commands/DebugRoadRegen.java          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
index 1880cd6b0..7d69db823 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
@@ -4,6 +4,7 @@ import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
 import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
@@ -16,13 +17,17 @@ public class DebugRoadRegen extends SubCommand {
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
         Location loc = player.getLocation();
-        PlotManager manager = loc.getPlotArea().getPlotManager();
+        PlotArea area = loc.getPlotArea();
+        if (area == null) {
+            return sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
+        }
         Plot plot = player.getCurrentPlot();
         if (plot == null) {
             Captions.NOT_IN_PLOT.send(player);
         } else if (plot.isMerged()) {
             Captions.REQUIRES_UNMERGED.send(player);
         } else {
+            PlotManager manager = area.getPlotManager();
             manager.createRoadEast(plot);
             manager.createRoadSouth(plot);
             manager.createRoadSouthEast(plot);

From 7f404e1cf50f7a675d8334d9efd8630ae8233bda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Sat, 1 Jun 2019 14:43:29 +0200
Subject: [PATCH 201/210] Fix plot walls after running regenallroads

Also clears whatever was above the plot wall, such as pieces of the road.
---
 .../plot/generator/ClassicPlotManager.java    | 32 +++++++++++++++++++
 .../plot/generator/HybridUtils.java           |  8 +++++
 .../plotsquared/plot/object/PlotManager.java  |  2 ++
 .../plot/object/worlds/SinglePlotManager.java |  2 ++
 .../plot/util/block/LocalBlockQueue.java      | 24 ++++++++++----
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index 6d5e159f8..baa0575e3 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -250,17 +250,28 @@ public class ClassicPlotManager extends SquarePlotManager {
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
         LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         int y = classicPlotWorld.WALL_HEIGHT + 1;
+        StringPlotBlock air = PlotBlock.get("air");
         if (!plot.getMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
+            // Replace all blocks above the wall with air
+            queue.setCuboid(
+                    new Location(top.getWorld(), top.getX(), y + 1, bot.getZ()),
+                    new Location(bot.getWorld(), bot.getX(), 255, bot.getZ()),
+                    air);
         }
         if (!plot.getMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
+            // Replace all blocks above the wall with air
+            queue.setCuboid(
+                    new Location(top.getWorld(), bot.getX(), y + 1, top.getZ()),
+                    new Location(bot.getWorld(), bot.getX(), 255, bot.getZ()),
+                    air);
         }
         if (!plot.getMerged(Direction.SOUTH)) {
             int z = top.getZ();
@@ -268,6 +279,11 @@ public class ClassicPlotManager extends SquarePlotManager {
                  x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
+            // Replace all blocks above the wall with air
+            queue.setCuboid(
+                    new Location(top.getWorld(), top.getX(), y + 1, top.getZ()),
+                    new Location(bot.getWorld(), bot.getX(), 255, top.getZ()),
+                    air);
         }
         if (!plot.getMerged(Direction.EAST)) {
             int x = top.getX();
@@ -275,6 +291,11 @@ public class ClassicPlotManager extends SquarePlotManager {
                  z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
+            // Replace all blocks above the wall with air
+            queue.setCuboid(
+                    new Location(top.getWorld(), top.getX(), y + 1, top.getZ()),
+                    new Location(bot.getWorld(), top.getX(), 255, bot.getZ()),
+                    air);
         }
         queue.enqueue();
         return true;
@@ -439,6 +460,17 @@ public class ClassicPlotManager extends SquarePlotManager {
         return true;
     }
 
+    @Override public boolean regenerateAllPlotWalls() {
+        for (Plot plot : classicPlotWorld.getPlots()) {
+            if (plot.hasOwner()) {
+                setWall(plot.getId(), classicPlotWorld.CLAIMED_WALL_BLOCK);
+            } else {
+                setWall(plot.getId(), classicPlotWorld.WALL_BLOCK);
+            }
+        }
+        return true;
+    }
+
     @Override public boolean startPlotMerge(List<PlotId> plotIds) {
         return true;
     }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index f98d6ae88..a586af012 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -153,6 +153,9 @@ public abstract class HybridUtils {
                     PlotSquared.debug("PROGRESS: " + 100 * (2048 - chunks.size()) / 2048 + "%");
                 }
                 if (regions.isEmpty() && chunks.isEmpty()) {
+                    PlotSquared.debug("&3Regenerating plot walls");
+                    regeneratePlotWalls(area);
+
                     HybridUtils.UPDATE = false;
                     PlotSquared.debug(Captions.PREFIX.s() + "Finished road conversion");
                     // CANCEL TASK
@@ -377,4 +380,9 @@ public abstract class HybridUtils {
         }
         return false;
     }
+
+    public boolean regeneratePlotWalls(final PlotArea area) {
+        PlotManager plotManager = area.getPlotManager();
+        return plotManager.regenerateAllPlotWalls();
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
index ac2a57058..74f0eddb7 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java
@@ -85,4 +85,6 @@ public abstract class PlotManager {
         return 255;
     }
 
+    public abstract boolean regenerateAllPlotWalls();
+
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
index 9998f88f2..0c5a7e866 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java
@@ -107,4 +107,6 @@ public class SinglePlotManager extends PlotManager {
     @Override public boolean finishPlotUnlink(List<PlotId> plotIds) {
         return false;
     }
+
+    @Override public boolean regenerateAllPlotWalls() { return false; }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
index 87c0fec56..53196966e 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/util/block/LocalBlockQueue.java
@@ -97,9 +97,15 @@ public abstract class LocalBlockQueue {
     }
 
     public void setCuboid(Location pos1, Location pos2, PlotBlock block) {
-        for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
-            for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
+        int yMin = Math.min(pos1.getY(), pos2.getY());
+        int yMax = Math.min(255, Math.max(pos1.getY(), pos2.getY()));
+        int xMin = Math.min(pos1.getX(), pos2.getX());
+        int xMax = Math.max(pos1.getX(), pos2.getX());
+        int zMin = Math.min(pos1.getZ(), pos2.getZ());
+        int zMax = Math.max(pos1.getZ(), pos2.getZ());
+        for (int y = yMin; y <= yMax; y++) {
+            for (int x = xMin; x <= xMax; x++) {
+                for (int z = zMin; z <= zMax; z++) {
                     setBlock(x, y, z, block);
                 }
             }
@@ -107,9 +113,15 @@ public abstract class LocalBlockQueue {
     }
 
     public void setCuboid(Location pos1, Location pos2, BlockBucket blocks) {
-        for (int y = pos1.getY(); y <= Math.min(255, pos2.getY()); y++) {
-            for (int x = pos1.getX(); x <= pos2.getX(); x++) {
-                for (int z = pos1.getZ(); z <= pos2.getZ(); z++) {
+        int yMin = Math.min(pos1.getY(), pos2.getY());
+        int yMax = Math.min(255, Math.max(pos1.getY(), pos2.getY()));
+        int xMin = Math.min(pos1.getX(), pos2.getX());
+        int xMax = Math.max(pos1.getX(), pos2.getX());
+        int zMin = Math.min(pos1.getZ(), pos2.getZ());
+        int zMax = Math.max(pos1.getZ(), pos2.getZ());
+        for (int y = yMin; y <= yMax; y++) {
+            for (int x = xMin; x <= xMax; x++) {
+                for (int z = zMin; z <= zMax; z++) {
                     setBlock(x, y, z, blocks.getBlock());
                 }
             }

From d6401d1638c2a17b5044036b76504ee55b315b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20Kriv=C3=A1cs=20Schr=C3=B8der?=
 <alexschrod@gmail.com>
Date: Sat, 1 Jun 2019 14:45:36 +0200
Subject: [PATCH 202/210] Allow running the road regeneration on a single
 region

The plot-based road regeneration from before does not have the same behavior as the real road regeneration code. This new debug operation will regenerate the roads within the region the player is standing using the same code that regenerates all roads. This makes it much easier to tell if things are working correctly and as expected.
---
 .../plot/commands/DebugRoadRegen.java         | 73 ++++++++++++++++++-
 .../plot/generator/HybridUtils.java           | 10 +++
 2 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
index 7d69db823..d6029186f 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/DebugRoadRegen.java
@@ -2,6 +2,9 @@ package com.github.intellectualsites.plotsquared.plot.commands;
 
 import com.github.intellectualsites.plotsquared.commands.CommandDeclaration;
 import com.github.intellectualsites.plotsquared.plot.config.Captions;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotManager;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridPlotWorld;
+import com.github.intellectualsites.plotsquared.plot.generator.HybridUtils;
 import com.github.intellectualsites.plotsquared.plot.object.Location;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
@@ -9,13 +12,37 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotManager;
 import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
 import com.github.intellectualsites.plotsquared.plot.util.MainUtil;
 
-@CommandDeclaration(command = "debugroadregen", usage = "/plot debugroadregen",
+import java.util.Arrays;
+
+@CommandDeclaration(command = "debugroadregen", usage = DebugRoadRegen.USAGE,
     requiredType = RequiredType.NONE,
-    description = "Regenerate all roads based on the road schematic",
+    description = "Regenerate roads in the plot or region the user is, based on the road schematic",
     category = CommandCategory.DEBUG, permission = "plots.debugroadregen")
 public class DebugRoadRegen extends SubCommand {
+    public static final String USAGE = "/plot debugroadregen <plot|region [height]>";
 
     @Override public boolean onCommand(PlotPlayer player, String[] args) {
+        if (args.length < 1) {
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                DebugRoadRegen.USAGE);
+            return false;
+        }
+        String kind = args[0].toLowerCase();
+        switch (kind) {
+            case "plot":
+                return regenPlot(player);
+
+            case "region":
+                return regenRegion(player, Arrays.copyOfRange(args, 1, args.length));
+
+            default:
+                MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                    DebugRoadRegen.USAGE);
+                return false;
+        }
+    }
+
+    public boolean regenPlot(PlotPlayer player) {
         Location loc = player.getLocation();
         PlotArea area = loc.getPlotArea();
         if (area == null) {
@@ -37,4 +64,46 @@ public class DebugRoadRegen extends SubCommand {
         }
         return true;
     }
+
+    public boolean regenRegion(PlotPlayer player, String[] args) {
+        int height = 0;
+        if (args.length == 1) {
+            try {
+                height = Integer.parseInt(args[0]);
+            } catch (NumberFormatException ignored) {
+                MainUtil.sendMessage(player, Captions.NOT_VALID_NUMBER, "(0, 256)");
+                MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                    DebugRoadRegen.USAGE);
+                return false;
+            }
+        } else if (args.length != 0) {
+            MainUtil.sendMessage(player, Captions.COMMAND_SYNTAX,
+                DebugRoadRegen.USAGE);
+            return false;
+        }
+
+        Location loc = player.getLocation();
+        PlotArea area = loc.getPlotArea();
+        if (area == null) {
+            return sendMessage(player, Captions.NOT_IN_PLOT_WORLD);
+        }
+        Plot plot = player.getCurrentPlot();
+        PlotManager manager = area.getPlotManager();
+        if (!(manager instanceof HybridPlotManager)) {
+            MainUtil.sendMessage(player, Captions.NOT_VALID_PLOT_WORLD);
+            return true;
+        }
+        MainUtil
+            .sendMessage(player, "&cIf no schematic is set, the following will not do anything");
+        MainUtil.sendMessage(player,
+            "&7 - To set a schematic, stand in a plot and use &c/plot createroadschematic");
+        MainUtil.sendMessage(player, "&cTo regenerate all roads: /plot regenallroads");
+        boolean result = HybridUtils.manager.scheduleSingleRegionRoadUpdate(plot, height);
+        if (!result) {
+            MainUtil.sendMessage(player,
+                "&cCannot schedule mass schematic update! (Is one already in progress?)");
+            return false;
+        }
+        return true;
+    }
 }
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
index a586af012..a0b12d511 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java
@@ -130,6 +130,16 @@ public abstract class HybridUtils {
         return scheduleRoadUpdate(area, regions, extend);
     }
 
+    public boolean scheduleSingleRegionRoadUpdate(Plot plot, int extend) {
+        if (HybridUtils.UPDATE) {
+            return false;
+        }
+        HybridUtils.UPDATE = true;
+        Set<ChunkLoc> regions = new HashSet<>();
+        regions.add(ChunkManager.manager.getChunkChunk(plot.getCenter()));
+        return scheduleRoadUpdate(plot.getArea(), regions, extend);
+    }
+
     public boolean scheduleRoadUpdate(final PlotArea area, Set<ChunkLoc> rgs, final int extend) {
         HybridUtils.regions = rgs;
         HybridUtils.area = area;

From 485415c551d6b0a2afc6d4b2d4bda56a5696fdee Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Sun, 23 Jun 2019 14:17:44 +0100
Subject: [PATCH 203/210] 1.14 id support (#2403)

* Plausible fix for 1.14 support.
- Allow 1.14 blocks to be specified in LegacyBlocks, but only saved if the server version is 1.14.
- No snazzy config conversion, but it seems most people managed to figure it out on their own anyway

* Ignore the "severe" output because of new 1.13/14 blocks
---
 .../bukkit/util/BukkitLegacyMappings.java     | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index 061712d02..78b919672 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -1,5 +1,6 @@
 package com.github.intellectualsites.plotsquared.bukkit.util;
 
+import com.github.intellectualsites.plotsquared.bukkit.BukkitMain;
 import com.github.intellectualsites.plotsquared.plot.PlotSquared;
 import com.github.intellectualsites.plotsquared.plot.object.LegacyPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
@@ -126,7 +127,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(43, 6, "double_step", "smooth_quartz"),
             new LegacyBlock(43, 8, "double_step", "smooth_stone"),
             new LegacyBlock(43, 9, "double_step", "smooth_sandstone"),
-            new LegacyBlock(44, "step", "stone_slab"),
+            new LegacyBlock(44, "step", "stone_slab", "smooth_stone_slab"),
             new LegacyBlock(44, 1, "step", "sandstone_slab"),
             new LegacyBlock(44, 2, "step", "petrified_oak_slab"),
             new LegacyBlock(44, 3, "step", "cobblestone_slab"),
@@ -147,7 +148,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(58, "workbench", "crafting_table"),
             new LegacyBlock(59, "crops", "wheat"), new LegacyBlock(60, "soil", "farmland"),
             new LegacyBlock(61, "furnace"), new LegacyBlock(62, "burning_furnace"),
-            new LegacyBlock(63, "sign_post", "sign"),
+            new LegacyBlock(63, "sign_post", "sign", "oak_sign"),
             new LegacyBlock(64, "wooden_door", "oak_door"), new LegacyBlock(65, "ladder"),
             new LegacyBlock(66, "rails", "rail"), new LegacyBlock(67, "cobblestone_stairs"),
             new LegacyBlock(68, "wall_sign"), new LegacyBlock(69, "lever"),
@@ -688,9 +689,7 @@ public final class BukkitLegacyMappings extends LegacyMappings {
                     final LegacyBlock missingBlock =
                         new LegacyBlock(material.getId(), materialName, materialName);
                     missing.add(missingBlock);
-                } catch (Exception e) {
-                    Bukkit.getLogger().severe(
-                        "Error creating legacy block: " + materialName + ". Possibly a new block.");
+                } catch (Exception ignored) {
                 }
             }
         }
@@ -713,9 +712,8 @@ public final class BukkitLegacyMappings extends LegacyMappings {
                 try {
                     material = Material.getMaterial(legacyBlock.getLegacyName(), true);
                 } catch (NoSuchMethodError error) {
-                    PlotSquared.log(
-                        "You can't use this version of PlotSquared on a server "
-                            + "less than Minecraft 1.13.2");
+                    PlotSquared.log("You can't use this version of PlotSquared on a server "
+                        + "less than Minecraft 1.13.2");
                     Bukkit.shutdown();
                     break;
                 }
@@ -831,6 +829,20 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             this(numericalId, dataValue, legacyName, legacyName);
         }
 
+        LegacyBlock(final int numericalId, final int dataValue, @NonNull final String legacyName,
+            @NonNull final String newName, @NonNull final String new14Name) {
+            this(numericalId, dataValue, legacyName,
+                PlotSquared.get().IMP.getServerVersion()[1] == 13 ? newName : new14Name);
+        }
+
+        LegacyBlock(final int numericalId, @NonNull final String legacyName,
+            @NonNull final String newName, @NonNull final String new14Name) {
+            this(numericalId, 0, legacyName,
+                Bukkit.getBukkitVersion().split("-")[0].split("\\.")[1].equals("13") ?
+                    newName :
+                    new14Name);
+        }
+
         LegacyBlock(final int numericalId, @NonNull final String legacyName,
             @NonNull final String newName) {
             this(numericalId, 0, legacyName, newName);

From 83d1f1d629c193e8e3fc5982beea9a1728de6304 Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Mon, 24 Jun 2019 13:37:59 +0100
Subject: [PATCH 204/210] 1.14 id support (#2404)

* Plausible fix for 1.14 support.
- Allow 1.14 blocks to be specified in LegacyBlocks, but only saved if the server version is 1.14.
- No snazzy config conversion, but it seems most people managed to figure it out on their own anyway

* Ignore the "severe" output because of new 1.13/14 blocks

* fix oak_wall_sign for 1.14
---
 .../plotsquared/bukkit/util/BukkitLegacyMappings.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index 78b919672..2217c7eff 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -151,7 +151,8 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             new LegacyBlock(63, "sign_post", "sign", "oak_sign"),
             new LegacyBlock(64, "wooden_door", "oak_door"), new LegacyBlock(65, "ladder"),
             new LegacyBlock(66, "rails", "rail"), new LegacyBlock(67, "cobblestone_stairs"),
-            new LegacyBlock(68, "wall_sign"), new LegacyBlock(69, "lever"),
+            new LegacyBlock(68, "wall_sign", "wall_sign", "oak_wall_sign"),
+            new LegacyBlock(69, "lever"),
             new LegacyBlock(70, "stone_plate", "stone_pressure_plate"),
             new LegacyBlock(71, "iron_door_block", "iron_door"),
             new LegacyBlock(72, "wood_plate", "oak_pressure_plate"),

From 3074e45d2c8cc5105c709076ea20e99e622cb9c7 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Tue, 25 Jun 2019 11:43:28 +0200
Subject: [PATCH 205/210] Fixed #2325

The permission node does not exist on PlotMe anymore
---
 Bukkit/src/main/resources/plugin.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml
index d9cd4e9d4..4c6f33b10 100644
--- a/Bukkit/src/main/resources/plugin.yml
+++ b/Bukkit/src/main/resources/plugin.yml
@@ -251,9 +251,6 @@ permissions:
   plotme.limit.10:
     children:
       plots.plot.10: true
-  plotme.admin.home.other:
-    children:
-      plots.plot.: true
   plotme.admin.clear:
     children:
       plots.admin.command.clear: true

From 246845607f6a687125f5f0cc7276a6b95fb8522f Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Thu, 27 Jun 2019 15:18:54 +0100
Subject: [PATCH 206/210] Let's first test against Material.matchMaterial for
 material matching (: Also update some dependencies

---
 Bukkit/build.gradle                                         | 6 +++---
 .../plotsquared/bukkit/util/BukkitLegacyMappings.java       | 6 +++++-
 build.gradle                                                | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle
index 1d03fd0f8..1732ebb8b 100644
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@@ -11,10 +11,10 @@ repositories {
 dependencies {
     implementation project(':Core')
     compile project(':Core')
-    compile 'com.destroystokyo.paper:paper-api:1.14.1-R0.1-SNAPSHOT'
+    compile 'com.destroystokyo.paper:paper-api:1.14.3-R0.1-SNAPSHOT'
     //implementation 'com.onarandombox.multiversecore:Multiverse-Core:3.0.0-SNAPSHOT'
-    implementation 'org.spigotmc:spigot-api:1.14.1-R0.1-SNAPSHOT'
-    compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0-SNAPSHOT')
+    implementation 'org.spigotmc:spigot-api:1.14.3-R0.1-SNAPSHOT'
+    compile(group: 'com.sk89q.worldedit', name: 'worldedit-bukkit', version: '7.0.0')
     compile("net.milkbowl.vault:VaultAPI:1.7") {
         exclude module: 'bukkit'
     }
diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
index 2217c7eff..44c262b10 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitLegacyMappings.java
@@ -7,6 +7,7 @@ import com.github.intellectualsites.plotsquared.plot.object.PlotBlock;
 import com.github.intellectualsites.plotsquared.plot.object.StringPlotBlock;
 import com.github.intellectualsites.plotsquared.plot.util.LegacyMappings;
 import com.github.intellectualsites.plotsquared.plot.util.StringComparison;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -15,6 +16,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -769,7 +771,9 @@ public final class BukkitLegacyMappings extends LegacyMappings {
             idDataPair = new IdDataPair(Integer.parseInt(string), 0);
         }
         PlotBlock plotBlock;
-        if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.keySet().contains(workingString.toLowerCase())) {
+        if (Material.matchMaterial(workingString) != null) {
+            return PlotBlock.get(workingString);
+        } else if (NEW_STRING_TO_LEGACY_PLOT_BLOCK.keySet().contains(workingString.toLowerCase())) {
             return PlotBlock.get(workingString);
         } else if ((plotBlock = fromLegacyToString(idDataPair)) != null) {
             return plotBlock;
diff --git a/build.gradle b/build.gradle
index c96224e82..ce53e06c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,7 +62,7 @@ subprojects {
     }
 
     dependencies {
-        implementation('com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT') {
+        implementation('com.sk89q.worldedit:worldedit-core:7.0.0') {
             exclude(module: 'bukkit-classloader-check')
             exclude(module: 'mockito-core')
             exclude(module: 'dummypermscompat')

From 095dccd30f07af2f58775393704bb5a77434640a Mon Sep 17 00:00:00 2001
From: dordsor21 <dordsor21@gmail.com>
Date: Fri, 28 Jun 2019 13:59:57 +0100
Subject: [PATCH 207/210] Revert changes to intersection generation

---
 .../plot/generator/ClassicPlotManager.java    | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
index baa0575e3..118733f36 100644
--- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
+++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotManager.java
@@ -250,28 +250,17 @@ public class ClassicPlotManager extends SquarePlotManager {
         Location top = plot.getExtendedTopAbs().add(1, 0, 1);
         LocalBlockQueue queue = classicPlotWorld.getQueue(false);
         int y = classicPlotWorld.WALL_HEIGHT + 1;
-        StringPlotBlock air = PlotBlock.get("air");
         if (!plot.getMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
-            // Replace all blocks above the wall with air
-            queue.setCuboid(
-                    new Location(top.getWorld(), top.getX(), y + 1, bot.getZ()),
-                    new Location(bot.getWorld(), bot.getX(), 255, bot.getZ()),
-                    air);
         }
         if (!plot.getMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
-            // Replace all blocks above the wall with air
-            queue.setCuboid(
-                    new Location(top.getWorld(), bot.getX(), y + 1, top.getZ()),
-                    new Location(bot.getWorld(), bot.getX(), 255, bot.getZ()),
-                    air);
         }
         if (!plot.getMerged(Direction.SOUTH)) {
             int z = top.getZ();
@@ -279,11 +268,6 @@ public class ClassicPlotManager extends SquarePlotManager {
                  x < top.getX() + (plot.getMerged(Direction.EAST) ? 0 : 1); x++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
-            // Replace all blocks above the wall with air
-            queue.setCuboid(
-                    new Location(top.getWorld(), top.getX(), y + 1, top.getZ()),
-                    new Location(bot.getWorld(), bot.getX(), 255, top.getZ()),
-                    air);
         }
         if (!plot.getMerged(Direction.EAST)) {
             int x = top.getX();
@@ -291,11 +275,6 @@ public class ClassicPlotManager extends SquarePlotManager {
                  z < top.getZ() + (plot.getMerged(Direction.SOUTH) ? 0 : 1); z++) {
                 queue.setBlock(x, y, z, blocks.getBlock());
             }
-            // Replace all blocks above the wall with air
-            queue.setCuboid(
-                    new Location(top.getWorld(), top.getX(), y + 1, top.getZ()),
-                    new Location(bot.getWorld(), top.getX(), 255, bot.getZ()),
-                    air);
         }
         queue.enqueue();
         return true;

From 23b88a375da7587175c6662bdd3d9d96e7fe7060 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 12 Jul 2019 02:18:08 +1000
Subject: [PATCH 208/210] player interact ignore cancel

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 6c85a2265..f7210f108 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -1834,7 +1834,7 @@ import java.util.regex.Pattern;
         }
     }
 
-    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = false)
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onInteract(PlayerInteractEvent event) {
         Player player = event.getPlayer();
         PlotPlayer pp = BukkitUtil.getPlayer(player);

From e8df39d3c4b68847623281a9c58789cda97cb202 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Sun, 21 Jul 2019 20:40:04 -0400
Subject: [PATCH 209/210] Fixes #2435

---
 .../plotsquared/bukkit/listeners/PlayerEvents.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index f7210f108..84cfc2e04 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -2379,7 +2379,7 @@ import java.util.regex.Pattern;
                 Captions.PERMISSION_ADMIN_BUILD_UNOWNED);
             event.setCancelled(true);
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().getId(), 0))) {
+            if (Flags.USE.contains(plot, PlotBlock.get(event.getBucket().name()))) {
                 return;
             }
             if (Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_OTHER)) {

From d6779d977a8c767699a4847282ac2fd01f9fef88 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Sun, 21 Jul 2019 20:43:36 -0400
Subject: [PATCH 210/210] Fixes #2423

---
 .../plotsquared/bukkit/uuid/FileUUIDHandler.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
index 8d2726bfd..64a6db419 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java
@@ -210,14 +210,15 @@ public class FileUUIDHandler extends UUIDHandlerImplementation {
             }
 
             if (getUUIDMap().isEmpty()) {
-                for (OfflinePlotPlayer op : FileUUIDHandler.this.uuidWrapper.getOfflinePlayers()) {
-                    long last = op.getLastPlayed();
+                for (OfflinePlotPlayer offlinePlotPlayer : FileUUIDHandler.this.uuidWrapper
+                    .getOfflinePlayers()) {
+                    long last = offlinePlotPlayer.getLastPlayed();
                     if (last != 0) {
-                        String name = op.getName();
+                        String name = offlinePlotPlayer.getName();
                         StringWrapper wrap = new StringWrapper(name);
                         if (!toAdd.containsKey(wrap)) {
-                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(op);
-                            toAdd.put(wrap, uuid);
+                            UUID uuid = FileUUIDHandler.this.uuidWrapper.getUUID(offlinePlotPlayer);
+                            toAdd.putIfAbsent(wrap, uuid);
                             if (ExpireManager.IMP != null) {
                                 ExpireManager.IMP.storeDate(uuid, last);
                             }